浏览代码

TelephoneActivity

losion.liu@sikey.com.cn 5 月之前
父节点
当前提交
86cda9cd67

+ 1 - 1
app/src/main/AndroidManifest.xml

@@ -150,7 +150,7 @@
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:launchMode="singleInstance" />
         <activity
-            android:name=".Activity.ConnectionsActivity"
+            android:name=".Activity.TelephoneActivity"
             android:exported="true"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:launchMode="singleInstance" />

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

@@ -44,13 +44,13 @@ public class BaseActionActivity extends BaseActivity implements Listener.SelectF
             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);
+            String[] stringList = ResUtils.getStringArray("telephone_title_array_", 3);
             return stringList[0];
         } else if (mActionType == ACTION_TYPE.MOBILE_DATA.ordinal()) {
-            String[] stringList = ResUtils.getStringArray("sk_connections_title_array_", 3);
+            String[] stringList = ResUtils.getStringArray("telephone_title_array_", 3);
             return stringList[1];
         } else if (mActionType == ACTION_TYPE.DATA_ROAMING.ordinal()) {
-            String[] stringList = ResUtils.getStringArray("sk_connections_title_array_", 3);
+            String[] stringList = ResUtils.getStringArray("telephone_title_array_", 3);
             return stringList[2];
         }
         return "";

+ 2 - 16
app/src/main/java/com/xplora/xpsettings/Activity/SettingsActivity.java

@@ -1,32 +1,18 @@
 package com.xplora.xpsettings.Activity;
 
-import android.content.ComponentName;
-import android.content.Context;
 import android.content.Intent;
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
-import android.os.PowerManager;
 import android.util.Log;
-import android.view.View;
-import android.view.WindowManager;
 import android.widget.ListView;
-import android.widget.RelativeLayout;
 
 import com.xplora.xpsettings.Adapter.BaseListAdapter;
-import com.xplora.xpsettings.Data.DataManager;
-import com.xplora.xpsettings.Data.DatabaseHelper;
-import com.xplora.xpsettings.Fragment.SelectFragment;
-import com.xplora.xpsettings.Fragment.ShutdownningFragment;
-import com.xplora.xpsettings.Observer.Listener;
 import com.xplora.xpsettings.Model.BaseModel;
 import com.xplora.xpsettings.R;
 import com.xplora.xpsettings.Utils.Constant;
-import com.xplora.xpsettings.Utils.Macros;
 import com.xplora.xpsettings.Utils.ResUtils;
 
-import java.lang.reflect.Method;
-
 
 public class SettingsActivity extends BaseActionActivity {
     private boolean isLockClick = false; //防止快速多次点击不同item
@@ -70,7 +56,7 @@ public class SettingsActivity extends BaseActionActivity {
             Intent intent;
             switch (i) {
                 case 0:
-                    intent = new Intent(this, ConnectionsActivity.class);
+                    intent = new Intent(this, TelephoneActivity.class);
                     startActivity(intent);
                     break;
                 case 1:
@@ -78,7 +64,7 @@ public class SettingsActivity extends BaseActionActivity {
                     startActivity(intent);
                     break;
                 case 2:
-                    intent = new Intent(this, ConnectionsActivity.class);
+                    intent = new Intent(this, TelephoneActivity.class);
                     startActivity(intent);
                     break;
                 case 3:

+ 4 - 18
app/src/main/java/com/xplora/xpsettings/Activity/ConnectionsActivity.java → app/src/main/java/com/xplora/xpsettings/Activity/TelephoneActivity.java

@@ -1,33 +1,19 @@
 package com.xplora.xpsettings.Activity;
 
-import android.bluetooth.BluetoothAdapter;
-import android.content.Context;
 import android.content.Intent;
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
-import android.net.wifi.SupplicantState;
-import android.net.wifi.WifiInfo;
-import android.net.wifi.WifiManager;
 import android.os.Bundle;
-import android.os.ParcelUuid;
-import android.provider.ContactsContract;
-import android.util.Log;
 import android.widget.ListView;
 
 import com.xplora.xpsettings.Adapter.BaseListAdapter;
-import com.xplora.xpsettings.Adapter.ConnectionsAdapter;
-import com.xplora.xpsettings.Data.DataManager;
 import com.xplora.xpsettings.Model.BaseModel;
 import com.xplora.xpsettings.R;
 import com.xplora.xpsettings.Utils.Constant;
-import com.xplora.xpsettings.Utils.Macros;
 import com.xplora.xpsettings.Utils.ResUtils;
 
-import java.util.ArrayList;
-import java.util.List;
 
-
-public class ConnectionsActivity extends BaseActionActivity {
+public class TelephoneActivity extends BaseActionActivity {
     public BaseListAdapter adapter;
 
     @Override
@@ -41,7 +27,7 @@ public class ConnectionsActivity extends BaseActionActivity {
     }
 
     private void initData() {
-        String[] stringList = ResUtils.getStringArray("sk_connections_title_array_", 3);
+        String[] stringList = ResUtils.getStringArray("telephone_title_array_", 3);
         for (int i = 0; i < stringList.length; i++) {
             BaseModel model = new BaseModel();
             model.title = stringList[i].trim();
@@ -52,13 +38,13 @@ public class ConnectionsActivity extends BaseActionActivity {
     }
 
     private void initView() {
-        adapter = new BaseListAdapter(ConnectionsActivity.this, 0, mDataList);
+        adapter = new BaseListAdapter(TelephoneActivity.this, 0, mDataList);
         ListView listView = findViewById(R.id.activity_listview);
         listView.setAdapter(adapter);
         listView.setDivider(new ColorDrawable(Color.TRANSPARENT));
         listView.setDividerHeight(0);
         listView.setOnItemClickListener((adapterView, view, i, l) -> {
-            Intent intent = new Intent(ConnectionsActivity.this, OpenCloseActivity.class);
+            Intent intent = new Intent(TelephoneActivity.this, OpenCloseActivity.class);
             intent.putExtra(Constant.INTENT_ACTION_TYPE, i + ACTION_TYPE.VOLTE.ordinal());
             startActivity(intent);
         });

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

@@ -173,9 +173,9 @@
     <string name="sk_settings_title_array_7">PWS</string>
     <string name="sk_openclose_title_array_0">关闭</string>
     <string name="sk_openclose_title_array_1">打开</string>
-    <string name="sk_connections_title_array_0">VoLTE通话</string>
-    <string name="sk_connections_title_array_1">移动数据</string>
-    <string name="sk_connections_title_array_2">数据漫游</string>
+    <string name="telephone_title_array_0">VoLTE通话</string>
+    <string name="telephone_title_array_1">移动数据</string>
+    <string name="telephone_title_array_2">数据漫游</string>
     <string name="system_title_array_0">系统升级</string>
     <string name="system_title_array_1">关于本机</string>
     <string name="system_title_array_2">恢复出厂设置</string>

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

@@ -183,9 +183,9 @@
     <string name="sk_settings_title_array_7">PWS</string>
     <string name="sk_openclose_title_array_0">关闭</string>
     <string name="sk_openclose_title_array_1">打开</string>
-    <string name="sk_connections_title_array_0">VoLTE</string>
-    <string name="sk_connections_title_array_1">Mobile Data</string>
-    <string name="sk_connections_title_array_2">Data Roaming</string>
+    <string name="telephone_title_array_0">VoLTE</string>
+    <string name="telephone_title_array_1">Mobile Data</string>
+    <string name="telephone_title_array_2">Data Roaming</string>
     <string name="system_title_array_0">系统升级</string>
     <string name="system_title_array_1">关于本机</string>
     <string name="system_title_array_2">恢复出厂设置</string>