添加 open close view

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

@@ -0,0 +1,55 @@
+package com.xplora.xpsettings.Activity;
+
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.ListView;
+
+import com.xplora.xpsettings.Adapter.BaseListAdapter;
+import com.xplora.xpsettings.Model.BaseModel;
+import com.xplora.xpsettings.R;
+import com.xplora.xpsettings.Utils.Constant;
+import com.xplora.xpsettings.Utils.ResUtils;
+
+public class OpenCloseActivity extends BaseActivity {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_list);
+        initData();
+        initView();
+    }
+
+    private void initData() {
+        String[] stringList = ResUtils.getStringArray("sk_openclose_title_array_", 2);
+        for (int i = 0; i < stringList.length; i++) {
+            BaseModel model = new BaseModel();
+            model.title = stringList[i].trim();
+            model.cellType = Constant.CellType.CHECKBOX;
+            mDataList.add(model);
+        }
+    }
+
+    private void initView() {
+        mAdapter = new BaseListAdapter(this, 0, mDataList);
+        ListView listView = findViewById(R.id.activity_listview);
+        listView.setAdapter(mAdapter);
+        listView.setDivider(new ColorDrawable(Color.TRANSPARENT));
+        listView.setDividerHeight(1);
+        listView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+            @Override
+            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+
+                //界面
+                for (int i = 0; i < mDataList.size(); i++) {
+                    BaseModel model = mDataList.get(i);
+                    model.isOn = position == i;
+                }
+                mAdapter.setBaseObjects(mDataList);
+                mAdapter.notifyDataSetInvalidated();
+            }
+        });
+    }
+}

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

@@ -41,13 +41,13 @@ public class SettingsActivity extends BaseActivity implements Listener.SelectFra
     }
 
     private void initData() {
-        String[] stringList = ResUtils.getStringArray("settings_title_array_", 13);
+        String[] stringList = ResUtils.getStringArray("sk_settings_title_array_", 8);
         for (int i = 0; i < stringList.length; i++) {
             BaseModel model = new BaseModel();
             model.backgroundImage = ResUtils.getImageId("settings_bg_", i);
             model.title = stringList[i].trim();
             model.icon = ResUtils.getImageId("settings_icon_", i);
-            model.cellType = i == 11 ? Constant.CellType.GONE : Constant.CellType.XPSTYLE2;
+            model.cellType = i == 11 ? Constant.CellType.GONE : Constant.CellType.ICON_TITLE;
             mDataList.add(model);
         }
     }
@@ -69,7 +69,7 @@ public class SettingsActivity extends BaseActivity implements Listener.SelectFra
             Intent intent;
             switch (i) {
                 case 0:
-                    intent = new Intent(this, ConnectionsActivity.class);
+                    intent = new Intent(this, OpenCloseActivity.class);
                     startActivity(intent);
                     break;
                 case 1:
@@ -77,8 +77,11 @@ public class SettingsActivity extends BaseActivity implements Listener.SelectFra
                     startActivity(intent);
                     break;
                 case 2:
-                    intent = new Intent(this, DisplayActivity.class);
+                    intent = new Intent(this, ConnectionsActivity.class);
                     startActivity(intent);
+
+//                    intent = new Intent(this, DisplayActivity.class);
+//                    startActivity(intent);
                     break;
                 case 3:
                     intent = new Intent(this, CameraActivity.class);

app/src/main/res/drawable-xhdpi/bg_gray.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <!-- 填充的颜色 -->
+    <solid android:color="@color/sk_gray" />
+
+    <!-- 圆角的半径 -->
+    <corners android:radius="5dp" />
+</shape>

app/src/main/res/layout/item_checkbox.xml

@@ -1,38 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="40dp">
+    android:layout_height="wrap_content"
+    android:paddingTop="2dp"
+    android:paddingBottom="2dp"
+    android:paddingStart="5dp"
+    android:paddingEnd="5dp"
+    >
 
     <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="40dp"
+        android:layout_height="50dp"
+        android:background="@drawable/bg_gray"
         >
 
+        <TextView
+            android:id="@+id/item_title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginStart="10dp"
+            android:fontFamily="Roboto"
+            android:textColor="@color/white"
+            android:textSize="17sp" />
+
         <CheckBox
             android:id="@+id/item_checkbox"
-            android:layout_width="28dp"
-            android:layout_height="28dp"
-            android:layout_marginStart="20dp"
+            android:layout_width="25dp"
+            android:layout_height="25dp"
             android:layout_centerVertical="true"
-            android:background="@drawable/xp_checkbox"
+            android:layout_alignParentEnd="true"
+            android:layout_marginEnd="10dp"
+            android:background="@drawable/sk_checkbox"
             android:clickable="false"
             android:button="@null"
             >
         </CheckBox>
 
-        <TextView
-            android:id="@+id/item_title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_toEndOf="@id/item_checkbox"
-            android:layout_marginStart="0dp"
-            android:layout_centerVertical="true"
-            android:layout_alignParentEnd="true"
-            android:textAlignment="center"
-            android:fontFamily="Roboto"
-            android:textColor="@color/white"
-            android:textSize="13sp" />
-
     </RelativeLayout>
 
 </LinearLayout>

app/src/main/res/layout/item_icon_title.xml

@@ -2,21 +2,25 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="40dp">
+    android:layout_height="wrap_content"
+    android:paddingTop="2dp"
+    android:paddingBottom="2dp"
+    android:paddingStart="5dp"
+    android:paddingEnd="5dp"
+    >
 
     <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="35dp"
-        android:layout_marginLeft="5dp"
-        android:layout_marginRight="5dp"
+        android:layout_height="50dp"
+        android:background="@drawable/bg_gray"
         >
 
         <ImageView
             android:id="@+id/item_icon"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
+            android:layout_width="31dp"
+            android:layout_height="31dp"
             android:layout_centerVertical="true"
-            android:layout_marginStart="7.5dp"
+            android:layout_marginStart="8dp"
             />
 
         <TextView
@@ -24,13 +28,13 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_toEndOf="@+id/item_icon"
-            android:layout_marginStart="10dp"
+            android:layout_marginStart="8dp"
             android:layout_toStartOf="@+id/item_detail"
             android:layout_marginEnd="8dp"
             android:fontFamily="Roboto"
             android:layout_centerVertical="true"
             android:textColor="@color/white"
-            android:textSize="13sp"
+            android:textSize="17sp"
             android:ellipsize="marquee"
             android:marqueeRepeatLimit="marquee_forever"
             android:singleLine="true"

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

@@ -170,4 +170,12 @@
     <string name="software_wifi_error_array_1">请先打开Wi-Fi</string>
     <string name="timeformat_title_array_0">12小时</string>
     <string name="timeformat_title_array_1">24小时</string>
+    <string name="sk_settings_title_array_0">飞行设置</string>
+    <string name="sk_settings_title_array_1">声音与震动</string>
+    <string name="sk_settings_title_array_2">通话与网络</string>
+    <string name="sk_settings_title_array_3">显示与亮度</string>
+    <string name="sk_settings_title_array_4">系统设置</string>
+    <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>
 </resources>

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

@@ -28,7 +28,7 @@
     <string name="bt_pairing">正在配對…</string>
     <string name="bt_paired">配對</string>
     <string name="bt_notpaired">未配對</string>
-    <string name="apn_hint">請點選“+”新增APN</string>
+    <string name="apn_hint">請點選"+"新增APN</string>
     <string name="apn_delete_content">您真的要刪除此APN嗎？</string>
     <string name="hour_time">24小時制</string>
     <string name="restart">重新啟動</string>
@@ -69,8 +69,8 @@
     <string name="cpp_content_2">–我們收集數據，告訴我們您孩子智慧型裝置的位置。</string>
     <string name="cpp_title_3">唯一識別符</string>
     <string name="cpp_content_3">–我們收集裝置和網路識別碼–基本上，這是我們判斷網路上哪個智慧型裝置是您孩子的方式。</string>
-    <string name="cpp_title_4">客戶專有網路資訊（“CPNI”）</string>
-    <string name="cpp_content_4">–由您的孩子使用我們的無線語音通訊服務產生。您孩子使用我們的產品、服務和網路（以及在國內或國際漫遊時其他運營商的網路）的信息，如連接運營商和互聯網服務提供商的使用情況、互聯網協議（“IP”）地址、短信和數據使用歷史記錄、內容互動（例如，您使用應用程式的時間）、語言設定以及其他網路和裝置分析以及Wi-Fi連接和使用數據。</string>
+    <string name="cpp_title_4">客戶專有網路資訊（"CPNI"）</string>
+    <string name="cpp_content_4">–由您的孩子使用我們的無線語音通訊服務產生。您孩子使用我們的產品、服務和網路（以及在國內或國際漫遊時其他運營商的網路）的信息，如連接運營商和互聯網服務提供商的使用情況、互聯網協議（"IP"）地址、短信和數據使用歷史記錄、內容互動（例如，您使用應用程式的時間）、語言設定以及其他網路和裝置分析以及Wi-Fi連接和使用數據。</string>
     <string name="cpp_title_5">設備及服務效能及診斷訊息</string>
     <string name="cpp_content_5">–這包括來自孩子設備的關於訊號強度、速度、應用程式和服務性能、斷線、呼叫和數據故障、地理位置資訊和設備數據的報告。</string>
     <string name="cpp_title_6">備份訊息</string>
@@ -170,4 +170,12 @@
     <string name="software_wifi_error_array_1">請先開啟Wi-Fi</string>
     <string name="timeformat_title_array_0">12小時</string>
     <string name="timeformat_title_array_1">24小時</string>
+    <string name="sk_settings_title_array_0">飛行設定</string>
+    <string name="sk_settings_title_array_1">聲音與震動</string>
+    <string name="sk_settings_title_array_2">通話與網絡</string>
+    <string name="sk_settings_title_array_3">顯示與亮度</string>
+    <string name="sk_settings_title_array_4">系統設置</string>
+    <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>
 </resources>

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

@@ -13,4 +13,5 @@
     <color name="transparent">#00FFFFFF</color>
     <color name="xp_gray">#FF999999</color>
     <color name="xp_item_highlight">#99FFFFFF</color>
+    <color name="sk_gray">#303030</color>
 </resources>

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

@@ -179,4 +179,14 @@
     <string name="apn_value_array_6">IPv4/IPv6</string>
     <string name="apn_value_array_7">IPv4/IPv6</string>
     <string name="apn_value_array_8">Not specified</string>
+    <string name="sk_settings_title_array_0">飞行设置</string>
+    <string name="sk_settings_title_array_1">声音与震动</string>
+    <string name="sk_settings_title_array_2">通话与网络</string>
+    <string name="sk_settings_title_array_3">显示与亮度</string>
+    <string name="sk_settings_title_array_4">系统设置</string>
+    <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_openclose_title_array_0">打开</string>
+    <string name="sk_openclose_title_array_1">关闭</string>
 </resources>