losion.liu@sikey.com.cn 6 сар өмнө
parent
commit
ca71a933dd

+ 7 - 7
app/src/main/java/com/xplora/xpsettings/Activity/BaseActionActivity.java

@@ -61,13 +61,13 @@ public class BaseActionActivity extends BaseActivity implements Listener.SelectF
         if (mActionType == ACTION_TYPE.AIRPLANE_MODE.ordinal()) {
             return DataManager.getAirplaneMode();
         } else if (mActionType == ACTION_TYPE.VIBRATE.ordinal()) {
-            DataManager.getIsVibrate();
+            return DataManager.getIsVibrate();
         } else if (mActionType == ACTION_TYPE.VOLTE.ordinal()) {
-
+            return DataManager.getVoLTE();
         } else if (mActionType == ACTION_TYPE.MOBILE_DATA.ordinal()) {
-
+            return DataManager.isMobileDataEnabled() ? 1: 0;
         } else if (mActionType == ACTION_TYPE.DATA_ROAMING.ordinal()) {
-
+            return DataManager.getDataRoamingType();
         }
         return 0;
     }
@@ -78,11 +78,11 @@ public class BaseActionActivity extends BaseActivity implements Listener.SelectF
         } else if (mActionType == ACTION_TYPE.VIBRATE.ordinal()) {
             DataManager.setIsVibrate(status);
         } else if (mActionType == ACTION_TYPE.VOLTE.ordinal()) {
-
+            DataManager.setVoLET(status);
         } else if (mActionType == ACTION_TYPE.MOBILE_DATA.ordinal()) {
-
+            DataManager.setMobileDataEnabled(status == 1);
         } else if (mActionType == ACTION_TYPE.DATA_ROAMING.ordinal()) {
-
+            DataManager.setDataRoamingType(status);
         }
     }
 

+ 0 - 40
app/src/main/java/com/xplora/xpsettings/Activity/ConnectionsActivity.java

@@ -37,7 +37,6 @@ public class ConnectionsActivity extends BaseActionActivity {
         String[] stringList = ResUtils.getStringArray("sk_settings_title_array_", 8);
         setWatchTitle(stringList[2]);
         initData();
-        initValue();
         initView();
     }
 
@@ -52,45 +51,6 @@ public class ConnectionsActivity extends BaseActionActivity {
         }
     }
 
-    public void initValue() {
-        if (Macros.DEBUG) {
-            mDataList.get(0).isOn = false;
-            mDataList.get(1).isOn = false;
-            mDataList.get(1).subTitle = "";
-        } else {
-            BluetoothAdapter bluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
-            boolean isBluetoothOn = bluetoothAdapter.isEnabled();
-            mDataList.get(0).isOn = isBluetoothOn;
-
-            WifiManager wifiManager = (WifiManager) getApplicationContext().getSystemService(Context.WIFI_SERVICE);
-            boolean isWifiOn = wifiManager.isWifiEnabled();
-            WifiInfo info = wifiManager.getConnectionInfo();
-            boolean isConnected = info.getSupplicantState() == SupplicantState.COMPLETED;
-            String ssid = info.getSSID();
-            String subTitle = "";
-            if (ssid == null || ssid.trim().isEmpty() || ssid.contains("<unknown ssid>")) {
-                ssid = info.getBSSID();
-            } else {
-                ssid = ssid.replace("\"", "");
-            }
-            subTitle = isConnected ? (ssid == null ? "" : ssid) : "";
-
-            mDataList.get(1).isOn = isWifiOn;
-            mDataList.get(1).subTitle = subTitle;
-        }
-
-        boolean isRoamingOn = DataManager.getDataRoamingType() == 1;
-        if (mDataList.size() > 2) {
-            mDataList.get(2).isOn = isRoamingOn;
-            Log.d(TAG, "isRoamingOn: " + isRoamingOn);
-        }
-
-        int value = DataManager.getVoLTE();
-        if (mDataList.size() > 3) {
-            mDataList.get(3).isOn = value == 1;
-        }
-    }
-
     private void initView() {
         adapter = new BaseListAdapter(ConnectionsActivity.this, 0, mDataList);
         ListView listView = findViewById(R.id.activity_listview);

+ 1 - 1
app/src/main/java/com/xplora/xpsettings/Activity/ScreenTimeActivity.java

@@ -81,7 +81,7 @@ public class ScreenTimeActivity extends BaseActionActivity {
     public int getCurrentIndex() {
         int value = DataManager.getScreenTime();
         if (value == Integer.MAX_VALUE) {
-            return timeValues.length; //size + 1,
+            return timeValues.length-1; //size + 1,
         } else {
             int screentime = DataManager.getScreenTime() / 1000;
             for (int i = 0; i < timeValues.length; i++) {

+ 25 - 0
app/src/main/java/com/xplora/xpsettings/Data/DataManager.java

@@ -10,6 +10,7 @@ import android.database.Cursor;
 import android.media.AudioManager;
 import android.media.Ringtone;
 import android.media.RingtoneManager;
+import android.net.ConnectivityManager;
 import android.net.Uri;
 import android.os.Build;
 import android.os.LocaleList;
@@ -659,6 +660,30 @@ public class DataManager extends Application {
         }
     }
 
+    public static boolean isMobileDataEnabled() {
+        try {
+            ConnectivityManager connectivityManager = (ConnectivityManager)sContext.getSystemService(Context.CONNECTIVITY_SERVICE);
+            Method getMobileDataEnabledMethod = ConnectivityManager.class.getDeclaredMethod("getMobileDataEnabled");
+            getMobileDataEnabledMethod.setAccessible(true);
+            return (boolean) getMobileDataEnabledMethod.invoke(connectivityManager);
+        } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
+            e.printStackTrace();
+        }
+        return false;
+    }
+
+    public static void setMobileDataEnabled(boolean enabled) {
+        try {
+            // 获取 ConnectivityManager 实例
+            ConnectivityManager connectivityManager = (ConnectivityManager)sContext.getSystemService(Context.CONNECTIVITY_SERVICE);
+            Method setMobileDataEnabledMethod = ConnectivityManager.class.getDeclaredMethod("setMobileDataEnabled", boolean.class);
+            setMobileDataEnabledMethod.setAccessible(true);
+            setMobileDataEnabledMethod.invoke(connectivityManager, enabled);
+        } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
+            e.printStackTrace();
+        }
+    }
+
     //0:关闭 1:已开启
     public static int getAirplaneMode() {
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR1) {

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

@@ -104,7 +104,7 @@
     <string name="cpp_title_26">重要提示:</string>
     <string name="cpp_content_26">我们需要收集您孩子的数据(如上所述)以提供相关产品或服务。如果您改变了同意或要求我们删除您孩子的数据的想法,该产品或服务可能不再有效。</string>
     <string name="settings_title_array_0">连接</string>
-    <string name="settings_title_array_1">铃声振动</string>
+    <string name="settings_title_array_1">声音与震动</string>
     <string name="settings_title_array_2">显示</string>
     <string name="settings_title_array_3">照相机</string>
     <string name="settings_title_array_4">时间格式</string>
@@ -124,8 +124,8 @@
     <string name="display_title_array_1">应用程序名称</string>
     <string name="display_title_array_2">表盘</string>
     <string name="display_title_array_3">屏幕睡眠</string>
-    <string name="soundmode_title_array_0">音量</string>
-    <string name="soundmode_title_array_1">动</string>
+    <string name="soundmode_title_array_0">总体音量</string>
+    <string name="soundmode_title_array_1">动</string>
     <string name="soundmode_title_array_2">铃声</string>
     <string name="volume_title_array_0">系统</string>
     <string name="volume_title_array_1">媒体</string>