losion.liu@sikey.com.cn 6 月之前
父节点
当前提交
30cacb46b7

+ 5 - 23
app/src/main/java/com/xplora/xpsettings/Activity/AboutActivity.java

@@ -43,52 +43,34 @@ public class AboutActivity extends BaseActivity {
 
     private void initData() {
         String modelName = Build.MODEL;
-        String cpu = "MSM8909W";
-        String ram = getTotalMemory(this);
-        String storage = getTotalInternalMemorySize(this);
-        String softwareVersion = Build.ID; //SystemProperties.get("ro.product.version.release");
-        String firmwareVersion = SystemProperties.get("ro.product.hw.version");
-        String imei = DataManager.getIMEI();
         String sn = DataManager.getSN();
-        String wifi = DataManager.getWifiMac();
-        String bt = DataManager.getBTMac();
-        String eid = DataManager.getEsimEid();
+        String softwareVersion = Build.ID; //SystemProperties.get("ro.product.version.release");
 
-        String[] stringList = ResUtils.getStringArray("about_title_array_", 13);
-        String[] valueList = {modelName, cpu, ram, storage, softwareVersion, firmwareVersion, imei, eid, sn, wifi, bt, "", ""};
+        String[] stringList = ResUtils.getStringArray("about_title_array_", 4);
+        String[] valueList = {modelName, sn, softwareVersion, "", ""};
 
         for (int i = 0; i < stringList.length; i++) {
             BaseModel model = new BaseModel();
             model.title = stringList[i].trim();
             model.subTitle = valueList[i];
             model.isShowArrow = false;
-            if (i == stringList.length-1 || i == stringList.length - 2) {
+            if (i == stringList.length-1) {
                 model.cellType = Constant.CellType.TITLE;
             } else {
                 model.cellType = Constant.CellType.TITLE_SUBTITLE;
             }
             mDataList.add(model);
         }
-
-        //非esim版本不显示index = 7 的eid,
-        if (!DataManager.getIsSupportESIM()) {
-            mDataList.remove(7);
-        }
     }
 
     private void initView() {
         mAdapter = new BaseListAdapter(AboutActivity.this, 0, mDataList);
         ListView listView = findViewById(R.id.activity_listview);
         listView.setAdapter(mAdapter);
-
         listView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                if (position == mDataList.size()-2) {
-                    openSourceAnnouncement();
-                } else if (position == mDataList.size()-1) {
-                    openPrivacyPolicy();
-                } else if (position == 4) {
+                if (position == 2) {
                     mClickCount++;
                     if (mClickCount >= 10) {
                         mClickCount = 0;

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

@@ -28,7 +28,7 @@ import com.xplora.xpsettings.Utils.ResUtils;
 import java.lang.reflect.Method;
 
 
-public class SettingsActivity extends BaseActivity implements Listener.SelectFragmentListener {
+public class SettingsActivity extends BaseActivity {
     private boolean isLockClick = false; //防止快速多次点击不同item
 
     @Override
@@ -84,11 +84,9 @@ public class SettingsActivity extends BaseActivity implements Listener.SelectFra
                 case 3:
                     intent = new Intent(this, DisplayActivity.class);
                     startActivity(intent);
-//                    intent = new Intent(this, CameraActivity.class);
-//                    startActivity(intent);
                     break;
                 case 4:
-                    intent = new Intent(this, TimeFormatActivity.class);
+                    intent = new Intent(this, SystemActivity.class);
                     startActivity(intent);
                     break;
                 case 5:
@@ -135,27 +133,6 @@ public class SettingsActivity extends BaseActivity implements Listener.SelectFra
         });
     }
 
-    @Override
-    public void onCancelFragment() {
-        isLockClick = false;
-    }
-
-    @Override
-    public void onSelectFragment(int type) {
-        if (type == 100) {
-            restart();
-        } else if (type == 101) {
-            shutdown();
-        }
-
-        //状态栏不显示
-        getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
-
-        //黑背景,防止关机中看到setting界面
-        ShutdownningFragment fragment = ShutdownningFragment.newInstance(this);
-        fragment.show(this.getFragmentManager(), Constant.PACKAGE_NAME);
-    }
-
     public void gotoQRcode() {
         Log.d(TAG, "gotoQRcode: " + DataManager.getIsSupportESIM());
         if (DataManager.getIsSupportESIM()) {
@@ -196,61 +173,6 @@ public class SettingsActivity extends BaseActivity implements Listener.SelectFra
         startActivity(intent);
     }
 
-    public void restart() {
-        if (Macros.DEBUG_RESTART) {
-            new Thread(new Runnable() {
-                @Override
-                public void run() {
-                    try {
-                        PowerManager pManager = (PowerManager) getSystemService(Context.POWER_SERVICE);
-                        pManager.reboot("userrequested");
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
-                }
-            }).start();
-        } else {
-            String pkg = "com.sikey.commonservice";
-            String cls = pkg + ".modules.callbacks.LocalReceiver";
-            ComponentName componet = new ComponentName(pkg, cls);
-
-            Intent intent = new Intent("com.xplora.action.POWER_STATUS");
-            intent.putExtra("type", 1);  //0:power off  1:reboot  2:factory reset
-            intent.setComponent(componet);
-            sendBroadcast(intent, "com.xplora.receiver");
-            Log.d(TAG, "restart: ");
-        }
-    }
-
-    public void shutdown() {
-        if (Macros.DEBUG_RESTART) {
-            new Thread(new Runnable() {
-                @Override
-                public void run() {
-                    try {
-                        PowerManager pManager = (PowerManager)getSystemService(Context.POWER_SERVICE);
-                        if (pManager != null) {
-                            Method method = pManager.getClass().getMethod("shutdown", boolean.class, String.class, boolean.class);
-                            method.invoke(pManager, false, "userrequested", false);
-                        }
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
-                }
-            }).start();
-        } else {
-            String pkg = "com.sikey.commonservice";
-            String cls = pkg + ".modules.callbacks.LocalReceiver";
-            ComponentName componet = new ComponentName(pkg, cls);
-
-            Intent intent = new Intent("com.xplora.action.POWER_STATUS");
-            intent.putExtra("type", 0);  //0:power off  1:reboot  2:factory reset
-            intent.setComponent(componet);
-            sendBroadcast(intent, "com.xplora.receiver");
-            Log.d(TAG, "shutdown: ");
-        }
-    }
-
     @Override
     protected void onResume() {
         super.onResume();

+ 195 - 0
app/src/main/java/com/xplora/xpsettings/Activity/SystemActivity.java

@@ -0,0 +1,195 @@
+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.Handler;
+import android.os.Looper;
+import android.os.Message;
+import android.os.PowerManager;
+import android.util.Log;
+import android.view.WindowManager;
+import android.widget.ListView;
+
+import androidx.annotation.NonNull;
+
+import com.xplora.xpsettings.Adapter.BaseListAdapter;
+import com.xplora.xpsettings.Data.DataManager;
+import com.xplora.xpsettings.Fragment.SelectFragment;
+import com.xplora.xpsettings.Fragment.ShutdownningFragment;
+import com.xplora.xpsettings.Model.IconProgressModel;
+import com.xplora.xpsettings.Observer.Listener;
+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;
+import java.util.ArrayList;
+import java.util.List;
+
+
+public class SystemActivity extends BaseActivity implements Listener.SelectFragmentListener {
+    private final List<IconProgressModel> mDataList = new ArrayList<>();
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_list);
+        initView();
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+
+        mDataList.clear();
+        initData();
+
+        mAdapter.setBaseObjects(mDataList);
+        mAdapter.notifyDataSetInvalidated();
+    }
+
+    private void initData() {
+        String[] stringList = ResUtils.getStringArray("system_title_array_", 5);
+        for (int i = 0; i < stringList.length; i++) {
+            IconProgressModel model = new IconProgressModel();
+            model.title = stringList[i].trim();
+            model.isShowArrow = false;
+            model.cellType = Constant.CellType.TITLE;
+            mDataList.add(model);
+        }
+    }
+
+    private void initView() {
+        ListView listView = findViewById(R.id.activity_listview);
+        mAdapter = new BaseListAdapter(this, R.layout.item_xpstyle, mDataList);
+        listView.setAdapter(mAdapter);
+        listView.setDivider(new ColorDrawable(Color.TRANSPARENT));
+        listView.setDividerHeight(1);
+        listView.setOnItemClickListener((adapterView, view, i, l) -> {
+            Intent intent;
+            switch (i) {
+                case 0:
+                    gotoUpdate();
+                    break;
+                case 1:
+                    intent = new Intent(this, AboutActivity.class);
+                    startActivity(intent);
+                    break;
+                case 2:
+                    break;
+                case 3:
+                    //Monkey测试时,屏蔽关机
+                    if (DataManager.getLockShutDown() == 1)
+                        break;
+                    SelectFragment fragment7 = SelectFragment.newInstance(this);
+                    fragment7.setItemInfo(101, getString(R.string.shut_down), getString(R.string.confirm_to_shut_down));
+                    fragment7.show(this.getFragmentManager(), Constant.PACKAGE_NAME);
+                    break;
+                case 4:
+                    //Monkey测试时,屏蔽关机
+                    if (DataManager.getLockShutDown() == 1)
+                        break;
+                    SelectFragment fragment6 = SelectFragment.newInstance(this);
+                    fragment6.setItemInfo(100, getString(R.string.restart), getString(R.string.confirm_to_restart));
+                    fragment6.show(this.getFragmentManager(), Constant.PACKAGE_NAME);
+                    break;
+                default:
+                    break;
+            }
+        });
+    }
+
+    @Override
+    public void onSelectFragment(int type) {
+        if (type == 100) {
+            restart();
+        } else if (type == 101) {
+            shutdown();
+        }
+
+        //状态栏不显示
+        getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
+
+        //黑背景,防止关机中看到setting界面
+        ShutdownningFragment fragment = ShutdownningFragment.newInstance(this);
+        fragment.show(this.getFragmentManager(), Constant.PACKAGE_NAME);
+    }
+
+    @Override
+    public void onCancelFragment() {
+
+    }
+
+    public void restart() {
+        if (Macros.DEBUG_RESTART) {
+            new Thread(new Runnable() {
+                @Override
+                public void run() {
+                    try {
+                        PowerManager pManager = (PowerManager) getSystemService(Context.POWER_SERVICE);
+                        pManager.reboot("userrequested");
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                }
+            }).start();
+        } else {
+            String pkg = "com.sikey.commonservice";
+            String cls = pkg + ".modules.callbacks.LocalReceiver";
+            ComponentName componet = new ComponentName(pkg, cls);
+
+            Intent intent = new Intent("com.xplora.action.POWER_STATUS");
+            intent.putExtra("type", 1);  //0:power off  1:reboot  2:factory reset
+            intent.setComponent(componet);
+            sendBroadcast(intent, "com.xplora.receiver");
+            Log.d(TAG, "restart: ");
+        }
+    }
+
+    public void shutdown() {
+        if (Macros.DEBUG_RESTART) {
+            new Thread(new Runnable() {
+                @Override
+                public void run() {
+                    try {
+                        PowerManager pManager = (PowerManager)getSystemService(Context.POWER_SERVICE);
+                        if (pManager != null) {
+                            Method method = pManager.getClass().getMethod("shutdown", boolean.class, String.class, boolean.class);
+                            method.invoke(pManager, false, "userrequested", false);
+                        }
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                }
+            }).start();
+        } else {
+            String pkg = "com.sikey.commonservice";
+            String cls = pkg + ".modules.callbacks.LocalReceiver";
+            ComponentName componet = new ComponentName(pkg, cls);
+
+            Intent intent = new Intent("com.xplora.action.POWER_STATUS");
+            intent.putExtra("type", 0);  //0:power off  1:reboot  2:factory reset
+            intent.setComponent(componet);
+            sendBroadcast(intent, "com.xplora.receiver");
+            Log.d(TAG, "shutdown: ");
+        }
+    }
+
+    public void gotoUpdate() {
+        //该应用的包名
+        String pkg = "com.sikey.commonservice";
+        //应用的主activity类
+        String cls = pkg + ".ui.activity.OtaCheckActivity";
+        ComponentName componet = new ComponentName(pkg, cls);
+
+        Intent intent = new Intent();
+        intent.putExtra("intent_from", 1);
+        intent.setComponent(componet);
+        startActivity(intent);
+    }
+}

+ 13 - 10
app/src/main/res/layout/item_title_subtitle.xml

@@ -1,31 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    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="wrap_content"
+        android:layout_height="60dp"
+        android:background="@drawable/bg_gray"
         >
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:orientation="vertical"
-            android:layout_marginStart="20dp"
+            android:layout_marginStart="10dp"
             >
 
             <TextView
                 android:id="@+id/item_title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="2dp"
+                android:layout_marginTop="8dp"
                 android:layout_marginEnd="20dp"
                 android:fontFamily="Roboto"
                 android:textColor="@color/white"
-                android:textFontWeight="500"
-                android:textSize="12sp"
+                android:textFontWeight="400"
+                android:textSize="17sp"
                 android:ellipsize="end"
                 android:maxLines="1"
                 />
@@ -34,12 +38,11 @@
                 android:id="@+id/item_subtitle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="2dp"
-                android:layout_marginBottom="2dp"
+                android:layout_marginBottom="8dp"
                 android:layout_marginEnd="5dp"
                 android:fontFamily="Roboto"
                 android:textColor="#B2FFFFFF"
-                android:textSize="12sp"
+                android:textSize="15sp"
                 android:textFontWeight="400"
                 />
         </LinearLayout>

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

@@ -135,18 +135,9 @@
     <string name="screen_time_value_array_3">1分钟</string>
     <string name="screen_time_value_array_4">5分钟</string>
     <string name="about_title_array_0">型号</string>
-    <string name="about_title_array_1">处理器</string>
-    <string name="about_title_array_2">内存</string>
-    <string name="about_title_array_3">存储空间</string>
-    <string name="about_title_array_4">软件版本</string>
-    <string name="about_title_array_5">硬件版本</string>
-    <string name="about_title_array_6">IMEI</string>
-    <string name="about_title_array_7">EID</string>
-    <string name="about_title_array_8">SN</string>
-    <string name="about_title_array_9">无线网络地址</string>
-    <string name="about_title_array_10">蓝牙地址</string>
-    <string name="about_title_array_11">开源协议</string>
-    <string name="about_title_array_12">隐私政策</string>
+    <string name="about_title_array_1">序列号</string>
+    <string name="about_title_array_2">版本</string>
+    <string name="about_title_array_3">监管信息</string>
     <string name="camera_title_array_0">照片分辨率</string>
     <string name="camera_title_array_1">视频分辨率</string>
     <string name="apn_title_array_0">姓名</string>
@@ -183,4 +174,9 @@
     <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="system_title_array_0">系统升级</string>
+    <string name="system_title_array_1">关于本机</string>
+    <string name="system_title_array_2">恢复出厂设置</string>
+    <string name="system_title_array_3">关机</string>
+    <string name="system_title_array_4">重启</string>
 </resources>

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

@@ -134,19 +134,10 @@
     <string name="screen_time_value_array_2">30秒</string>
     <string name="screen_time_value_array_3">1分钟</string>
     <string name="screen_time_value_array_4">5分钟</string>
-    <string name="about_title_array_0">型號</string>
-    <string name="about_title_array_1">處理器</string>
-    <string name="about_title_array_2">記憶體</string>
-    <string name="about_title_array_3">儲存空間</string>
-    <string name="about_title_array_4">軟體版本</string>
-    <string name="about_title_array_5">硬體版本</string>
-    <string name="about_title_array_6">IMEI</string>
-    <string name="about_title_array_7">EID</string>
-    <string name="about_title_array_8">SN</string>
-    <string name="about_title_array_9">無線網路位址</string>
-    <string name="about_title_array_10">藍牙位址</string>
-    <string name="about_title_array_11">開源協議</string>
-    <string name="about_title_array_12">隱私權政策</string>
+    <string name="about_title_array_0">型号</string>
+    <string name="about_title_array_1">序列号</string>
+    <string name="about_title_array_2">版本</string>
+    <string name="about_title_array_3">监管信息</string>
     <string name="camera_title_array_0">照片分辨率</string>
     <string name="camera_title_array_1">視訊解析度</string>
     <string name="apn_title_array_0">姓名</string>
@@ -180,4 +171,9 @@
     <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="system_title_array_0">系统升级</string>
+    <string name="system_title_array_1">关于本机</string>
+    <string name="system_title_array_2">恢复出厂设置</string>
+    <string name="system_title_array_3">关机</string>
+    <string name="system_title_array_4">重启</string>
 </resources>

+ 9 - 12
app/src/main/res/values/strings.xml

@@ -135,18 +135,9 @@
     <string name="screen_time_value_array_3">1 minute</string>
     <string name="screen_time_value_array_4">5 minute</string>
     <string name="about_title_array_0">Model</string>
-    <string name="about_title_array_1">CPU</string>
-    <string name="about_title_array_2">RAM</string>
-    <string name="about_title_array_3">Storage</string>
-    <string name="about_title_array_4">SW Version</string>
-    <string name="about_title_array_5">HW Version</string>
-    <string name="about_title_array_6">IMEI</string>
-    <string name="about_title_array_7">EID</string>
-    <string name="about_title_array_8">SN</string>
-    <string name="about_title_array_9">Wi-Fi MAC</string>
-    <string name="about_title_array_10">Bluetooth MAC</string>
-    <string name="about_title_array_11">Open Source Announcement</string>
-    <string name="about_title_array_12">Privacy Policy</string>
+    <string name="about_title_array_1">SN</string>
+    <string name="about_title_array_2">Version</string>
+    <string name="about_title_array_3">Regulatory Information</string>
     <string name="camera_title_array_0">Photo Resolution</string>
     <string name="camera_title_array_1">Video Resolution</string>
     <string name="apn_title_array_0">Name</string>
@@ -194,4 +185,10 @@
     <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="system_title_array_0">系统升级</string>
+    <string name="system_title_array_1">关于本机</string>
+    <string name="system_title_array_2">恢复出厂设置</string>
+    <string name="system_title_array_3">关机</string>
+    <string name="system_title_array_4">重启</string>
+
 </resources>