1

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

@@ -25,6 +25,7 @@ import androidx.fragment.app.FragmentTransaction;
 import com.xplora.xplauncher.R;
 import com.xplora.xplauncher.activity.MainActivity;
 import com.xplora.xplauncher.data.DataManager;
+import com.xplora.xplauncher.observer.Listener;
 import com.xplora.xplauncher.utils.Constant;
 import com.xplora.xplauncher.utils.ResUtils;
 import com.xplora.xplauncher.utils.ToolsUtils;
@@ -53,7 +54,6 @@ public class HomePager extends BasePager implements CustomSlidingDrawer.OnDrawer
 
     //warning
     private Button mWarningButton = null;
-    private int mWarningStatus = 1; //表盘界面，是否显示 warning 及状态， 0：不显示; >0 显示
 
     private int mFaceIndex = 0;
     private float mStartRawY = 0;
@@ -115,24 +115,8 @@ public class HomePager extends BasePager implements CustomSlidingDrawer.OnDrawer
         button.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                if (mWarningStatus <= 0)
-                    return;
-
-                String packageName = "com.xplora.xponboarding";
-                String activity = "";
-                if (mWarningStatus == 1) {//no sim
-                    activity = packageName + ".Activity.SimInstallActivity";
-                } else if (mWarningStatus == 2) { //watch 未激活
-                    activity = packageName + ".Activity.SimUnactivatedActivity";
-                } else if (mWarningStatus == 3) { //esim 未激活
-                    activity = packageName + ".Activity.EsimActivationActivity";
-                } else if (mWarningStatus == 4) {//sim 被锁
-                    activity = packageName + ".Activity.SimLockedActivity";
-                }
-                ComponentName component = new ComponentName(packageName, activity);
-                Intent intent = new Intent();
-                intent.setComponent(component);
-                mContext.startActivity(intent);
+                Listener.ButtonListener listener = (Listener.ButtonListener)mContext;
+                listener.onClickWarningButton();
             }
         });
 
@@ -155,7 +139,6 @@ public class HomePager extends BasePager implements CustomSlidingDrawer.OnDrawer
     }
 
     public void refreshWarningButton(int status, String content) {
-        mWarningStatus = status;
         mWarningButton.setVisibility(status >= 1 ? View.VISIBLE : View.GONE);
         mWarningButton.setText(content);
     }
@@ -246,7 +229,7 @@ public class HomePager extends BasePager implements CustomSlidingDrawer.OnDrawer
                     break;
                 case MotionEvent.ACTION_UP:
                     if (event.getRawY() - mStartRawY > 60) {
-                        mSlidingDrawer.animateClose();
+                        setGadgetsAutoClosed();
                     }
                     mStartRawY = 0;
                     break;

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

@@ -21,6 +21,7 @@ import com.xplora.xplauncher.R;
 import com.xplora.xplauncher.adapter.ContactsRecyclerAdapter;
 import com.xplora.xplauncher.adapter.RecyclerAdapter;
 import com.xplora.xplauncher.adapter.ViewPagerAdapter;
+import com.xplora.xplauncher.observer.Listener;
 import com.xplora.xplauncher.utils.MetaData;
 import com.xplora.xplauncher.observer.ContactContentObserver;
 import com.xplora.xplauncher.observer.NetworkChangeReceiver;
@@ -37,7 +38,7 @@ import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.List;
 
-public class MainActivity extends BaseActivity {
+public class MainActivity extends BaseActivity implements Listener.ButtonListener {
     private int mCurrentPagerIndex = Constant.HOME_INDEX;
     private int mAppNameType = 1;
     private int mDeleteBtnStatus = 0;
@@ -440,6 +441,31 @@ public class MainActivity extends BaseActivity {
         });
     }
 
+    @Override
+    public void onClickWarningButton() {
+        //表盘界面，是否显示 warning 及状态， 0：不显示; >0 显示
+        int status = DataManager.getWarningStatus();
+        if (status == 0) {
+            changeWarningStatus();
+        } else {
+            String packageName = "com.xplora.xponboarding";
+            String activity = "";
+            if (status == 1) {//no sim
+                activity = packageName + ".Activity.SimInstallActivity";
+            }else if (status == 2) {//sim 被锁
+                activity = packageName + ".Activity.SimLockedActivity";
+            }  else if (status == 3) { //esim 未激活
+                activity = packageName + ".Activity.EsimActivationActivity";
+            } else if (status == 4) { //watch 未激活
+                activity = packageName + ".Activity.SimUnactivatedActivity";
+            }
+            ComponentName component = new ComponentName(packageName, activity);
+            Intent intent = new Intent();
+            intent.setComponent(component);
+            startActivity(intent);
+        }
+    }
+
     private void registerContentObserver() {
         if (Macros.DEBUG_DATABASE)
             return;

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

@@ -287,7 +287,7 @@ public class DataManager extends Application {
             return 1;
         else if (isSimLocked() || isPinRequired() || isPukRequired())
             return 2;
-        else if (isESimUnactivated())
+        else if (isSupportESIM() && isESimUnactivated())
             return 3;
         else if (isWatchActivated() <= 0)
             return 4;
@@ -358,6 +358,11 @@ public class DataManager extends Application {
         return Settings.Global.getInt(sContext.getContentResolver(), MetaData.KEY_WATCH_ACTIVATED, 0);
     }
 
+    //true:ESIM false: nano sim
+    public static boolean isSupportESIM() {
+        return SystemProperties.getBoolean("ro.product.support.esim", false);
+    }
+
     public static boolean isFactoryMode() {
         //是否为产线模式
         return SystemProperties.getBoolean("persist.sys.factoryimage", false);

app/src/main/java/com/xplora/xplauncher/observer/Listener.java

@@ -0,0 +1,8 @@
+package com.xplora.xplauncher.observer;
+
+public class Listener {
+    public interface ButtonListener {
+        void onClickWarningButton();
+    }
+}
+