网络

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

@@ -14,6 +14,7 @@ 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;
@@ -27,7 +28,7 @@ import java.util.List;
 
 
 public class ConnectionsActivity extends BaseActivity {
-    public ConnectionsAdapter adapter;
+    public BaseListAdapter adapter;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -39,14 +40,11 @@ public class ConnectionsActivity extends BaseActivity {
     }
 
     private void initData() {
-        String[] stringList = ResUtils.getStringArray("connections_title_array_", 4);
+        String[] stringList = ResUtils.getStringArray("sk_connections_title_array_", 3);
         for (int i = 0; i < stringList.length; i++) {
             BaseModel model = new BaseModel();
             model.title = stringList[i].trim();
-
-            //by lzx, 根据需求，去掉votle
-            boolean isDisable = (i == 1 && DataManager.getIsDisableWifi()) || (i == 3);
-            model.cellType = isDisable ? Constant.CellType.GONE : Constant.CellType.XPSTYLE;
+            model.cellType =  Constant.CellType.TITLE;
             mDataList.add(model);
         }
     }
@@ -91,42 +89,14 @@ public class ConnectionsActivity extends BaseActivity {
     }
 
     private void initView() {
-        adapter = new ConnectionsAdapter(ConnectionsActivity.this, R.layout.item_xpstyle, mDataList);
+        adapter = new BaseListAdapter(ConnectionsActivity.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;
-            switch (i) {
-                case 0:
-                    intent = new Intent(ConnectionsActivity.this, BluetoothActivity.class);
-                    startActivityForResult(intent, 0);
-                    break;
-                case 1:
-                    intent = new Intent(ConnectionsActivity.this, WiFiActivity.class);
-                    startActivityForResult(intent, 0);
-                    break;
-                case 2:
-                    intent = new Intent(ConnectionsActivity.this, DataRoamingActivity.class);
-                    startActivityForResult(intent, 0);
-                    break;
-                case 3:
-                    intent = new Intent(ConnectionsActivity.this, VoLTEActivity.class);
-                    startActivityForResult(intent, 0);
-                    break;
-                default:
-                    break;
-            }
+            Intent intent = new Intent(ConnectionsActivity.this, OpenCloseActivity.class);
+            startActivity(intent);
         });
     }
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-        initValue();
-        adapter.setBaseObjects(mDataList);
-        adapter.notifyDataSetInvalidated();
-    }
 }

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

@@ -178,4 +178,7 @@
     <string name="sk_settings_title_array_5">语言设置</string>
     <string name="sk_settings_title_array_6">设备二维码</string>
     <string name="sk_settings_title_array_7">PWS</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>
 </resources>

app/src/main/res/values/strings.xml

@@ -189,4 +189,7 @@
     <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>
 </resources>