1

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

@@ -293,6 +293,22 @@ public class MainActivity extends BaseActivity {
         finish();
     }
 
+    public void addQuickApps(int viewIndex, int appIndex, String packageName) {
+        AppModel appModel = DataManager.getAppModel(packageName);
+        DataManager.replaceQuickApps(viewIndex, appIndex, appModel);
+        List<AppModel> quickAppsApps = DataManager.getQuickAppsWithIndex(viewIndex);
+        AppsPager pager = (AppsPager)mPagerViews.get(2+viewIndex);
+        pager.refreshApp(quickAppsApps);
+    }
+
+    public void removeQuickApps(int viewIndex, int appIndex, AppModel appModel) {
+        appModel.setEmptyStatus();
+        DataManager.replaceQuickApps(viewIndex, appIndex, appModel);
+        List<AppModel> quickAppsApps = DataManager.getQuickAppsWithIndex(viewIndex);
+        AppsPager pager = (AppsPager)mPagerViews.get(2+viewIndex);
+        pager.refreshApp(quickAppsApps);
+    }
+
     public void changeFace(int index) {
         DataManager.setFaceIndex(index);
 
@@ -319,20 +335,11 @@ public class MainActivity extends BaseActivity {
         }
     }
 
-    public void addQuickApps(int viewIndex, int appIndex, String packageName) {
-        AppModel appModel = DataManager.getAppModel(packageName);
-        DataManager.replaceQuickApps(viewIndex, appIndex, appModel);
-        List<AppModel> quickAppsApps = DataManager.getQuickAppsWithIndex(viewIndex);
-        AppsPager pager = (AppsPager)mPagerViews.get(2+viewIndex);
-        pager.refreshApp(quickAppsApps);
-    }
-
-    public void removeQuickApps(int viewIndex, int appIndex, AppModel appModel) {
-        appModel.setEmptyStatus();
-        DataManager.replaceQuickApps(viewIndex, appIndex, appModel);
-        List<AppModel> quickAppsApps = DataManager.getQuickAppsWithIndex(viewIndex);
-        AppsPager pager = (AppsPager)mPagerViews.get(2+viewIndex);
-        pager.refreshApp(quickAppsApps);
+    public void changeWarningStatus() {
+        int status = DataManager.getWarningStatus();
+        String content = status >= 1 ? getString(ResUtils.getStringId("sim_status_", status)) : "";
+        HomePager homeView = (HomePager)mPagerViews.get(1);
+        homeView.refreshWarningButton(status, content);
     }
 
     //更改是否显示删除按钮
@@ -409,9 +416,7 @@ public class MainActivity extends BaseActivity {
         mSimListener.setOnSimStateListener(new SimStateReceiver.OnSimStateChangeListener() {
             @Override
             public void onReceiveSimStateChangeBroadcast(int status) {
-                String content = status >= 1 ? getString(ResUtils.getStringId("sim_status_", status)) : "";
-                HomePager homeView = (HomePager)mPagerViews.get(1);
-                homeView.refreshWarningButton(status, content);
+                changeWarningStatus();
             }
         });
     }
@@ -452,18 +457,30 @@ public class MainActivity extends BaseActivity {
         getContentResolver().unregisterContentObserver(mRecentObserver);
     }
 
+    @Override
+    protected void onStart() {
+        Log.d(TAG, "onStart: ");
+        super.onStart();
+    }
+
     @Override
     protected void onResume() {
         Log.d(TAG, "onResume");
         super.onResume();
 
         changeAppNameType();
+        changeWarningStatus();
 
         initTimeChangeBroadcast();
-
         registerContentObserver();
     }
 
+    @Override
+    protected void onStop() {
+        Log.d(TAG, "onStop: ");
+        super.onStop();
+    }
+
     @Override
     protected void onPause() {
         Log.d(TAG, "onPause");
@@ -498,12 +515,14 @@ public class MainActivity extends BaseActivity {
 
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
+        Log.d(TAG, "onKeyDown");
         isKeyDown = true;
         return super.onKeyDown(keyCode, event);
     }
 
     @Override
     public boolean onKeyUp(int keyCode, KeyEvent event) {
+        Log.d(TAG, "onKeyUp: ");
         //恢复初始状态
         reset();
 

app/src/main/java/com/xplora/xplauncher/adapter/ContactsRecyclerAdapter.java

@@ -54,7 +54,7 @@ public class ContactsRecyclerAdapter extends RecyclerView.Adapter<ContactItemVie
             ContactBean contactBean = recentBean.contactBean;
             if (viewHolder.mIcon != null) {
                 String profilePath = contactBean != null?  contactBean.profilePath : "";
-                DataManager.setImageView(viewHolder.mIcon, profilePath, 0, R.drawable.default_contact);
+                ToolsUtils.setImageView(viewHolder.mIcon, profilePath, 0, R.drawable.default_contact);
             }
             if (viewHolder.mTitle != null) {
                 String name = contactBean != null ? contactBean.name : recentBean.caller;
@@ -71,7 +71,7 @@ public class ContactsRecyclerAdapter extends RecyclerView.Adapter<ContactItemVie
         } else {
             ContactBean contactBean = (ContactBean)baseBean;
             if (viewHolder.mIcon != null) {
-                DataManager.setImageView(viewHolder.mIcon, contactBean.profilePath, 0, R.drawable.default_contact);
+                ToolsUtils.setImageView(viewHolder.mIcon, contactBean.profilePath, 0, R.drawable.default_contact);
             }
             if (viewHolder.mTitle != null) {
                 viewHolder.mTitle.setText(contactBean.name);

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

@@ -271,14 +271,25 @@ public class DataManager extends Application {
         return appModelList;
     }
 
-    public static int getSimStatus() {
-        if (isSimAbsent())
+    public static int getWatchStatus() {
+        int isActivated = isWatchActivated();
+        int networkStatus = NetworkUtil.getConnectivityStatus(sContext);
+        if (isActivated <= 0)
+            return -1;
+//        else if (networkStatus == NetworkUtil.TYPE_NOT_CONNECTED)
+//            return -2;
+        else
+            return 0;
+    }
+
+    public static int getWarningStatus() {
+        if (isSimAbsent() || isSimUnactivated())
             return 1;
-        else if (isWatchActivated() <= 0)
+        else if (isSimLocked() || isPinRequired() || isPukRequired())
             return 2;
         else if (isESimUnactivated())
             return 3;
-        else if (isSimLocked())
+        else if (isWatchActivated() <= 0)
             return 4;
         else
             return 0;
@@ -352,17 +363,6 @@ public class DataManager extends Application {
         return SystemProperties.getBoolean("persist.sys.factoryimage", false);
     }
 
-    public static int getWatchStatus() {
-        int isActivated = isWatchActivated();
-        int networkStatus = NetworkUtil.getConnectivityStatus(sContext);
-        if (isActivated <= 0)
-            return -1;
-//        else if (networkStatus == NetworkUtil.TYPE_NOT_CONNECTED)
-//            return -2;
-        else
-            return 0;
-    }
-
     public static boolean getIsAppNeedActivated(AppModel appModel) {
         String[] strings = sContext.getResources().getStringArray(R.array.xp_app_need_activated);
         for (String s: strings) {
@@ -384,19 +384,4 @@ public class DataManager extends Application {
     public static int getFaceCount() {
         return 6;
     }
-
-    public static void setImageView(ImageView imageView, String imagePath, int resId, int defaultId) {
-        if (resId > 0) {
-            imageView.setImageResource(resId);
-        } else if(imagePath == null || imagePath.length() <= 1) {
-            imageView.setImageResource(defaultId);
-        } else {
-            Bitmap loacalImage = ToolsUtils.getLoacalBitmap(imagePath);
-            if(null == loacalImage){
-                imageView.setImageResource(defaultId);
-            } else {
-                imageView.setImageBitmap(ToolsUtils.toCircleBitmap(loacalImage));
-            }
-        }
-    }
 }

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

@@ -8,6 +8,7 @@ import android.graphics.PorterDuff;
 import android.graphics.PorterDuffXfermode;
 import android.graphics.Rect;
 import android.graphics.RectF;
+import android.widget.ImageView;
 
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -165,4 +166,19 @@ public class ToolsUtils {
 
         return output;
     }
+
+    public static void setImageView(ImageView imageView, String imagePath, int resId, int defaultId) {
+        if (resId > 0) {
+            imageView.setImageResource(resId);
+        } else if(imagePath == null || imagePath.length() <= 1) {
+            imageView.setImageResource(defaultId);
+        } else {
+            Bitmap loacalImage = ToolsUtils.getLoacalBitmap(imagePath);
+            if(null == loacalImage){
+                imageView.setImageResource(defaultId);
+            } else {
+                imageView.setImageBitmap(ToolsUtils.toCircleBitmap(loacalImage));
+            }
+        }
+    }
 }

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

@@ -7,7 +7,7 @@
     <string name="Contacts_Contacts">Contacts</string>
 
     <string name="sim_status_1">No SIM</string>
-    <string name="sim_status_2">Watch \nUnactivated</string>
+    <string name="sim_status_2">SIM \nLocked</string>
     <string name="sim_status_3">E-SIM \nUnactivated</string>
-    <string name="sim_status_4">SIM \nLocked</string>
+    <string name="sim_status_4">Watch \nUnactivated</string>
 </resources>