1

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

@@ -55,18 +55,26 @@ public class MainActivity extends BaseActivity {
 
     @Override
     protected void onCreateBase() {
-        setContentView(R.layout.activity_main);
+        //判断是否从Onboarding返回   0:不是  1:从Onboarding返回
+        int appFrom = getIntent().getIntExtra("inent_from", 0);
+        //判断是否激活
+        int isActivated = DataManager.getIsWatchActivated();
+        Log.d(TAG, "onCreate: isActivated: " + isActivated + " appFrom: " + appFrom);
+        if (appFrom == 0 && isActivated == 0) {
+            //启动引导
+            startOnboarding();
+        } else {
+            setContentView(R.layout.activity_main);
+            initData();
+            initView();
+        }
     }
 
-    @Override
-    protected void initDataBase() {
-        super.initDataBase();
+    protected void initData() {
         mAppNameType = DataManager.getAppNameType();
     }
 
-    @Override
-    protected void initViewBase() {
-        super.initViewBase();
+    protected void initView() {
         initViewPager();
         initTimeChangeBroadcast();
         initSimStateBroadcast();
@@ -280,6 +288,8 @@ public class MainActivity extends BaseActivity {
         Intent i = new Intent();
         i.setComponent(componet);
         startActivity(i);
+
+        finish();
     }
 
     public void changeFace(int index) {

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

@@ -29,7 +29,7 @@ public class MetaData {
     public static final String KEY_APP_NAME = "app_name";
     public static final String KEY_WATCH_FACE = "watch_face";
     public static final String KEY_QUICK_APP = "quick_app";
-    public static final String KEY_WATCH_ACTIVATED = "status";
+    public static final String KEY_WATCH_ACTIVATED = "active_status";
     public static final String KEY_RESOLUTION_PHOTO = "photo_resolution";
     public static final String KEY_RESOLUTION_VIDEO = "video_resolution";
 }