1

app/src/main/java/com/xplora/xplauncher/activity/MainActivity.java

@@ -184,11 +184,8 @@ public class MainActivity extends BaseActivity implements Listener.ButtonListene
     ContactsRecyclerAdapter.ContactItemOnClickListener onContactItemOnClickListener = new ContactsRecyclerAdapter.ContactItemOnClickListener() {
         @Override
         public void onClick(String phoneNumber, String userId) {
-//            //呼出
-//            Intent intent = new Intent();
-//            intent = intent.setClass(this, InCallActivity.class);
-//            intent.putExtra(MetaData.KEY_CONTACT_USERID, ContactBean.getUserId());
-//            startActivity(intent);
+            Intent intent_tel = new Intent("android.intent.action.CALL_PRIVILEGED", Uri.parse("tel:" + phoneNumber));
+            intent_tel.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         }
     };
 
@@ -450,14 +447,16 @@ public class MainActivity extends BaseActivity implements Listener.ButtonListene
         } else {
             String packageName = "com.xplora.xponboarding";
             String activity = "";
-            if (status == 1) {//no sim
+            if (status == 10) {//no sim
                 activity = packageName + ".Activity.SimInstallActivity";
-            }else if (status == 2) {//sim 被锁
+            }else if (status == 11) {//sim 被锁
                 activity = packageName + ".Activity.SimLockedActivity";
-            }  else if (status == 3) { //esim 未激活
-                activity = packageName + ".Activity.EsimUnactivationActivity";
-            } else if (status == 4) { //watch 未激活
+            }else if (status == 12) { //sim 未激活
                 activity = packageName + ".Activity.SimUnactivatedActivity";
+            } else if (status == 1) { //esim 未激活
+                activity = packageName + ".Activity.EsimUnactivationActivity";
+            } else if (status == 2) { //手表 未激活
+                activity = packageName + ".Activity.QRActivity";
             }
             ComponentName component = new ComponentName(packageName, activity);
             Intent intent = new Intent();

app/src/main/java/com/xplora/xplauncher/data/DataManager.java

@@ -283,16 +283,22 @@ public class DataManager extends Application {
     }
 
     public static int getWarningStatus() {
-        if (isSimAbsent() || isSimUnactivated())
-            return 1;
-        else if (isSimLocked() || isPinRequired() || isPukRequired())
-            return 2;
-        else if (isSupportESIM() && isESimUnactivated())
-            return 3;
-        else if (isWatchActivated() <= 0)
-            return 4;
-        else
-            return 0;
+        if (isSupportESIM()) {
+            if (isESimUnactivated())
+                return 2;
+            else if (isWatchActivated() <= 0)
+                return 1;
+        } else {
+            if (isSimAbsent())
+                return 10;
+            if (isSimUnactivated())
+                return 11;
+            else if (isSimLocked() || isPinRequired() || isPukRequired())
+                return 12;
+            else if (isWatchActivated() <= 0)
+                return 1;
+        }
+        return 0;
     }
 
     //是否有 sim 卡

app/src/main/java/com/xplora/xplauncher/utils/Macros.java

@@ -5,7 +5,7 @@ public class Macros {
     //TODO:测试使用,正式版本需要关闭false
     public static boolean DEBUG = true;
 
-    public static boolean DEBUG_DATABASE_RECENT = false; //模拟数据库中数据
+    public static boolean DEBUG_DATABASE_RECENT = true; //模拟数据库中数据
     public static boolean DEBUG_DATABASE_CONTACT = false; //模拟数据库中数据
     public static boolean DEBUG_SYSTEMPROVIDER = false; //模拟数据库中数据
 

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

@@ -6,8 +6,9 @@
     <string name="Contacts_Recent">Recent</string>
     <string name="Contacts_Contacts">Contacts</string>
 
-    <string name="sim_status_1">No SIM</string>
-    <string name="sim_status_2">SIM \nLocked</string>
-    <string name="sim_status_3">E-SIM \nUnactivated</string>
-    <string name="sim_status_4">Watch \nUnactivated</string>
+    <string name="sim_status_1">Watch \nUnactivated</string>
+    <string name="sim_status_2">E-SIM \nUnactivated</string>
+    <string name="sim_status_10">No SIM</string>
+    <string name="sim_status_11">SIM \nLocked</string>
+    <string name="sim_status_12">SIM \nUnactivated</string>
 </resources>