BaseActionActivity

app/src/main/AndroidManifest.xml

@@ -238,6 +238,16 @@
             android:exported="false"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:launchMode="singleInstance" />
+        <activity
+            android:name=".Activity.SystemActivity"
+            android:exported="false"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:launchMode="singleInstance" />
+        <activity
+            android:name=".Activity.OpenCloseActivity"
+            android:exported="false"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:launchMode="singleInstance" />
     </application>
 
 </manifest>

app/src/main/java/com/xplora/xpsettings/Activity/AboutActivity.java

@@ -29,7 +29,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 
 
-public class AboutActivity extends BaseActivity {
+public class AboutActivity extends BaseActionActivity {
 
     private int mClickCount = 0;
 

app/src/main/java/com/xplora/xpsettings/Activity/AddWatchFaceActivity.java

@@ -8,7 +8,7 @@ import android.widget.Toast;
 import com.xplora.xpsettings.Data.DatabaseHelper;
 import com.xplora.xpsettings.R;
 
-public class AddWatchFaceActivity extends BaseActivity {
+public class AddWatchFaceActivity extends BaseActionActivity {
     EditText password;
     FrameLayout check;
 

app/src/main/java/com/xplora/xpsettings/Activity/AlertActivity.java

@@ -8,7 +8,7 @@ import android.widget.Button;
 
 import com.xplora.xpsettings.R;
 
-public class AlertActivity extends BaseActivity {
+public class AlertActivity extends BaseActionActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {

app/src/main/java/com/xplora/xpsettings/Activity/ApnDeleteActivity.java

@@ -22,7 +22,7 @@ import com.xplora.xpsettings.Utils.Constant;
 import java.util.ArrayList;
 import java.util.List;
 
-public class ApnDeleteActivity extends BaseActivity {
+public class ApnDeleteActivity extends BaseActionActivity {
     public ApnModel mApnModel = new ApnModel();
 
     @Override

app/src/main/java/com/xplora/xpsettings/Activity/ApnEditActivity.java

@@ -20,7 +20,7 @@ import com.xplora.xpsettings.R;
 import com.xplora.xpsettings.Utils.Constant;
 import com.xplora.xpsettings.Utils.ResUtils;
 
-public class ApnEditActivity extends BaseActivity implements Listener.ListViewListener {
+public class ApnEditActivity extends BaseActionActivity implements Listener.ListViewListener {
     public ApnModel mApnModel = new ApnModel();
     private ListView mListView = null;
     public int mType = 0; // 0：edit  1 : add

app/src/main/java/com/xplora/xpsettings/Activity/ApnListActivity.java

@@ -28,7 +28,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 
-public class ApnListActivity extends BaseActivity {
+public class ApnListActivity extends BaseActionActivity {
     List<ApnModel> mApnList = new ArrayList<>();
     @Override
     protected void onCreate(Bundle savedInstanceState) {

app/src/main/java/com/xplora/xpsettings/Activity/BaseActionActivity.java

@@ -22,40 +22,67 @@ import java.lang.reflect.Method;
 public class BaseActionActivity extends BaseActivity implements Listener.SelectFragmentListener {
     public int mActionType = 0;
 
+    public enum ACTION_TYPE {
+        AIRPLANE_MODE,
+        VIBRATE,
+        VOLTE,
+        MOBILE_DATA,
+        DATA_ROAMING,
+    };
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        mActionType = getIntent().getIntExtra(Constant.INTENT_VIEW_TYPE, 0);
+        mActionType = getIntent().getIntExtra(Constant.INTENT_ACTION_TYPE, 0);
+        Log.d(TAG, "onCreate: " + mActionType);
     }
 
     public String getActionTitle() {
-        switch (mActionType) {
-            case 0:
-                String[] stringList = ResUtils.getStringArray("sk_settings_title_array_", 5);
-                return stringList[0];
-            default:
-                break;
+        if (mActionType == ACTION_TYPE.AIRPLANE_MODE.ordinal()) {
+            String[] stringList = ResUtils.getStringArray("sk_settings_title_array_", 5);
+            return stringList[0];
+        } else if (mActionType == ACTION_TYPE.VIBRATE.ordinal()) {
+            String[] stringList = ResUtils.getStringArray("soundmode_title_array_", 2);
+            return stringList[1];
+        } else if (mActionType == ACTION_TYPE.VOLTE.ordinal()) {
+            String[] stringList = ResUtils.getStringArray("sk_connections_title_array_", 3);
+            return stringList[0];
+        } else if (mActionType == ACTION_TYPE.MOBILE_DATA.ordinal()) {
+            String[] stringList = ResUtils.getStringArray("sk_connections_title_array_", 3);
+            return stringList[1];
+        } else if (mActionType == ACTION_TYPE.DATA_ROAMING.ordinal()) {
+            String[] stringList = ResUtils.getStringArray("sk_connections_title_array_", 3);
+            return stringList[2];
         }
         return "";
     }
 
     public int getActionStatus() {
-        switch (mActionType) {
-            case 0:
-                return DataManager.getAirplaneMode();
-            default:
-                break;
+        if (mActionType == ACTION_TYPE.AIRPLANE_MODE.ordinal()) {
+            return DataManager.getAirplaneMode();
+        } else if (mActionType == ACTION_TYPE.VIBRATE.ordinal()) {
+            DataManager.getIsVibrate();
+        } else if (mActionType == ACTION_TYPE.VOLTE.ordinal()) {
+
+        } else if (mActionType == ACTION_TYPE.MOBILE_DATA.ordinal()) {
+
+        } else if (mActionType == ACTION_TYPE.DATA_ROAMING.ordinal()) {
+
         }
         return 0;
     }
 
     public void setActionStatus(int status) {
-        switch (mActionType) {
-            case 0:
-                changeAirplaneMode(status);
-                break;
-            default:
-                break;
+        if (mActionType == ACTION_TYPE.AIRPLANE_MODE.ordinal()) {
+            changeAirplaneMode(status);
+        } else if (mActionType == ACTION_TYPE.VIBRATE.ordinal()) {
+            DataManager.setIsVibrate(status);
+        } else if (mActionType == ACTION_TYPE.VOLTE.ordinal()) {
+
+        } else if (mActionType == ACTION_TYPE.MOBILE_DATA.ordinal()) {
+
+        } else if (mActionType == ACTION_TYPE.DATA_ROAMING.ordinal()) {
+
         }
     }
 

app/src/main/java/com/xplora/xpsettings/Activity/BlackDoorPasswordActivity.java

@@ -13,7 +13,7 @@ import android.widget.Toast;
 
 import com.xplora.xpsettings.R;
 
-public class BlackDoorPasswordActivity extends BaseActivity {
+public class BlackDoorPasswordActivity extends BaseActionActivity {
     public String mInput = "";
     private TextView mTextView1 = null;
     private TextView mTextView2 = null;

app/src/main/java/com/xplora/xpsettings/Activity/BluetoothActivity.java

@@ -34,7 +34,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 
-public class BluetoothActivity extends BaseActivity implements Listener.BluetoothInitCompleteListener {
+public class BluetoothActivity extends BaseActionActivity implements Listener.BluetoothInitCompleteListener {
     private final List<BluetoothModel> mDataList = new ArrayList<>();
     private BluetoothDevicesAdapter mListAdapter = null;
     private BtManager mBtManager = null;

app/src/main/java/com/xplora/xpsettings/Activity/CameraActivity.java

@@ -21,7 +21,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 
-public class CameraActivity extends BaseActivity {
+public class CameraActivity extends BaseActionActivity {
     private String[] valueList = null;
 
     @Override

app/src/main/java/com/xplora/xpsettings/Activity/CameraResolutionActivity.java

@@ -23,7 +23,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 
-public class CameraResolutionActivity extends BaseActivity {
+public class CameraResolutionActivity extends BaseActionActivity {
     public int mViewType = 0;
     public String mViewValue = "";
 

app/src/main/java/com/xplora/xpsettings/Activity/ChangeProgressActivity.java

@@ -21,7 +21,7 @@ import java.util.List;
 import java.util.Map;
 
 
-public class ChangeProgressActivity extends BaseActivity {
+public class ChangeProgressActivity extends BaseActionActivity {
     int mViewType = 0;
     int curValue = 0;
     int maxValue = 100;

app/src/main/java/com/xplora/xpsettings/Activity/ConnectionsActivity.java

@@ -27,7 +27,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 
-public class ConnectionsActivity extends BaseActivity {
+public class ConnectionsActivity extends BaseActionActivity {
     public BaseListAdapter adapter;
 
     @Override
@@ -97,6 +97,7 @@ public class ConnectionsActivity extends BaseActivity {
         listView.setDividerHeight(0);
         listView.setOnItemClickListener((adapterView, view, i, l) -> {
             Intent intent = new Intent(ConnectionsActivity.this, OpenCloseActivity.class);
+            intent.putExtra(Constant.INTENT_ACTION_TYPE, i + ACTION_TYPE.VOLTE.ordinal());
             startActivity(intent);
         });
     }

app/src/main/java/com/xplora/xpsettings/Activity/ConnectionsControlActivity.java

@@ -11,7 +11,7 @@ import com.xplora.xpsettings.Model.WifiModel;
 import com.xplora.xpsettings.R;
 
 
-public class ConnectionsControlActivity extends BaseActivity {
+public class ConnectionsControlActivity extends BaseActionActivity {
     public int mViewType = 0; //0:bt  1:wifi
     public String btname = "";
     public String address = "";

app/src/main/java/com/xplora/xpsettings/Activity/DataRoamingActivity.java

@@ -21,7 +21,7 @@ import com.xplora.xpsettings.Utils.ResUtils;
 import java.util.ArrayList;
 import java.util.List;
 
-public class DataRoamingActivity extends BaseActivity {
+public class DataRoamingActivity extends BaseActionActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {

app/src/main/java/com/xplora/xpsettings/Activity/DisplayActivity.java

@@ -27,7 +27,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 
-public class DisplayActivity extends BaseActivity {
+public class DisplayActivity extends BaseActionActivity {
     private final List<IconProgressModel> mDataList = new ArrayList<>();
 
     @Override

app/src/main/java/com/xplora/xpsettings/Activity/GotoWiFiActivity.java

@@ -9,7 +9,7 @@ import com.xplora.xpsettings.R;
 import com.xplora.xpsettings.Utils.ResUtils;
 
 
-public class GotoWiFiActivity extends BaseActivity {
+public class GotoWiFiActivity extends BaseActionActivity {
     String mErrorContent;
 
     @Override

app/src/main/java/com/xplora/xpsettings/Activity/LanguageActivity.java

@@ -16,7 +16,7 @@ import com.xplora.xpsettings.Utils.LanguageUtil;
 import java.util.ArrayList;
 
 
-public class LanguageActivity extends BaseActivity {
+public class LanguageActivity extends BaseActionActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);

app/src/main/java/com/xplora/xpsettings/Activity/PrivacyPolicyActivity.java

@@ -16,7 +16,7 @@ import android.widget.TextView;
 import com.xplora.xpsettings.R;
 import com.xplora.xpsettings.Utils.ResUtils;
 
-public class PrivacyPolicyActivity extends BaseActivity{
+public class PrivacyPolicyActivity extends BaseActionActivity{
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);

app/src/main/java/com/xplora/xpsettings/Activity/RestoreActivity.java

@@ -13,7 +13,7 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
 
-public class RestoreActivity extends BaseActivity {
+public class RestoreActivity extends BaseActionActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);

app/src/main/java/com/xplora/xpsettings/Activity/RingToneActivity.java

@@ -34,7 +34,7 @@ import java.util.Timer;
 import java.util.TimerTask;
 
 
-public class RingToneActivity extends BaseActivity implements Listener.ContentListener {
+public class RingToneActivity extends BaseActionActivity implements Listener.ContentListener {
     private ArrayList<RingtoneModel> mRingtoneList = new ArrayList<>();
     private int selectIndex = 0;
 

app/src/main/java/com/xplora/xpsettings/Activity/ScreenTimeActivity.java

@@ -30,7 +30,7 @@ import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 
 
-public class ScreenTimeActivity extends BaseActivity {
+public class ScreenTimeActivity extends BaseActionActivity {
     private int lastValue;
     private int initValue;
     private int[] timeValues;

app/src/main/java/com/xplora/xpsettings/Activity/SettingsActivity.java

@@ -35,7 +35,8 @@ public class SettingsActivity extends BaseActionActivity {
     protected void onCreate(Bundle savedInstanceState) {
         Log.d(TAG, "onCreate: ");
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_list);
+        setContentView(R.layout.activity_list_title);
+        setWatchTitle(getString(R.string.app_name));
         initData();
         initView();
     }
@@ -70,7 +71,7 @@ public class SettingsActivity extends BaseActionActivity {
             switch (i) {
                 case 0:
                     intent = new Intent(this, OpenCloseActivity.class);
-                    intent.putExtra(Constant.INTENT_VIEW_TYPE, 0);
+                    intent.putExtra(Constant.INTENT_ACTION_TYPE, ACTION_TYPE.AIRPLANE_MODE.ordinal());
                     startActivity(intent);
                     break;
                 case 1:

app/src/main/java/com/xplora/xpsettings/Activity/SoftwareUpdatingActivity.java

@@ -11,7 +11,7 @@ import android.widget.TextView;
 import com.xplora.xpsettings.R;
 
 
-public class SoftwareUpdatingActivity extends BaseActivity {
+public class SoftwareUpdatingActivity extends BaseActionActivity {
     int mViewType = 1;
     double mProgress = 0;
 

app/src/main/java/com/xplora/xpsettings/Activity/SoftwareVersionActivity.java

@@ -17,7 +17,7 @@ import com.xplora.xpsettings.Utils.ResUtils;
 import java.util.Objects;
 
 
-public class SoftwareVersionActivity extends BaseActivity {
+public class SoftwareVersionActivity extends BaseActionActivity {
     String mVersion;
     @Override
     protected void onCreate(Bundle savedInstanceState) {

app/src/main/java/com/xplora/xpsettings/Activity/SoundModeActivity.java

@@ -1,6 +1,8 @@
 package com.xplora.xpsettings.Activity;
 
 import android.content.Intent;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
 import android.media.AudioManager;
 import android.media.Ringtone;
 import android.os.Build;
@@ -29,7 +31,7 @@ import java.util.List;
 import java.util.Map;
 
 
-public class SoundModeActivity extends BaseActivity {
+public class SoundModeActivity extends BaseActionActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -67,7 +69,8 @@ public class SoundModeActivity extends BaseActivity {
         mAdapter = new BaseListAdapter(this, R.layout.item_xpstyle, mDataList, mHandler);
         ListView listView = findViewById(R.id.activity_listview);
         listView.setAdapter(mAdapter);
-
+        listView.setDivider(new ColorDrawable(Color.TRANSPARENT));
+        listView.setDividerHeight(0);
         listView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
@@ -97,6 +100,7 @@ public class SoundModeActivity extends BaseActivity {
                 break;
             case 1:
                 intent = new Intent(this, OpenCloseActivity.class);
+                intent.putExtra(Constant.INTENT_ACTION_TYPE, ACTION_TYPE.VIBRATE.ordinal());
                 startActivity(intent);
                 break;
             case 2:

app/src/main/java/com/xplora/xpsettings/Activity/SourceAnnouncementActivity.java

@@ -9,7 +9,7 @@ import android.widget.TextView;
 import com.xplora.xpsettings.R;
 import com.xplora.xpsettings.Utils.ResUtils;
 
-public class SourceAnnouncementActivity extends BaseActivity{
+public class SourceAnnouncementActivity extends BaseActionActivity{
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);

app/src/main/java/com/xplora/xpsettings/Activity/TestToolsActivity.java

@@ -25,7 +25,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
-public class TestToolsActivity extends BaseActivity implements Listener.SelectFragmentListener {
+public class TestToolsActivity extends BaseActionActivity implements Listener.SelectFragmentListener {
     private static final String CIT_PACKAGE_NAME = "com.xplora.factorymode";
     private static final String CIT_ACTIVITY_NAME = "com.xplora.factorymode.activity.LaunchActicvity";
     private static final String RUNNING_ACTIVITY_NAME = "com.xplora.factorymode.modules.runin.RuninMainActivity";

app/src/main/java/com/xplora/xpsettings/Activity/TimeFormatActivity.java

@@ -14,9 +14,7 @@ import android.widget.ListView;
 import com.xplora.xpsettings.Adapter.BaseListAdapter;
 import com.xplora.xpsettings.Data.DataManager;
 import com.xplora.xpsettings.Model.BaseModel;
-import com.xplora.xpsettings.Model.IconProgressModel;
 import com.xplora.xpsettings.R;
-import com.xplora.xpsettings.Activity.BaseActivity;
 import com.xplora.xpsettings.Utils.Constant;
 import com.xplora.xpsettings.Utils.ResUtils;
 
@@ -26,7 +24,7 @@ import android.content.Intent;
 
 import androidx.annotation.NonNull;
 
-public class TimeFormatActivity extends BaseActivity {
+public class TimeFormatActivity extends BaseActionActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);

app/src/main/java/com/xplora/xpsettings/Activity/VoLTEActivity.java

@@ -16,7 +16,7 @@ import com.xplora.xpsettings.R;
 import com.xplora.xpsettings.Utils.Constant;
 import com.xplora.xpsettings.Utils.ResUtils;
 
-public class VoLTEActivity extends BaseActivity {
+public class VoLTEActivity extends BaseActionActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {

app/src/main/java/com/xplora/xpsettings/Activity/VolumeActivity.java

@@ -27,7 +27,7 @@ import java.util.List;
 import java.util.Map;
 
 
-public class VolumeActivity extends BaseActivity {
+public class VolumeActivity extends BaseActionActivity {
     private final List<BaseModel> mDataList = new ArrayList<>();
 
     @Override

app/src/main/java/com/xplora/xpsettings/Activity/WiFiActivity.java

@@ -33,7 +33,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 
-public class WiFiActivity extends BaseActivity {
+public class WiFiActivity extends BaseActionActivity {
     private final List<WifiModel> mDataList = new ArrayList<>();
     private WifiManager wifiManager;
     List<ScanResult> list;

app/src/main/java/com/xplora/xpsettings/Activity/WifiLoginActivity.java

@@ -12,7 +12,7 @@ import android.widget.FrameLayout;
 
 import com.xplora.xpsettings.R;
 
-public class WifiLoginActivity extends BaseActivity {
+public class WifiLoginActivity extends BaseActionActivity {
     EditText password;
     FrameLayout check;
 

app/src/main/java/com/xplora/xpsettings/Utils/Constant.java

@@ -8,6 +8,7 @@ public class Constant {
     public static String INTENT_VIEW_TYPE = "intent_view_type";
     public static String INTENT_LIST_INDEX = "intent_list_index";
     public static String INTENT_VIEW_VALUE = "intent_view_value";
+    public static String INTENT_ACTION_TYPE = "intent_action_value";
     public static String INTENT_RESULT_ACTION = "intent_result_action";
     public static String INTENT_RESULT_ACTION_CANCEL = "intent_result_action_cancel";
     public static String INTENT_RESULT_ACTION_REMOVE = "intent_result_action_remove";

app/src/main/res/values-zh-rCN/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Settings</string>
+    <string name="app_name">设置</string>
     <string name="button_cancel">取消</string>
     <string name="button_no">不</string>
     <string name="button_yes">是的</string>