庆祝界面

app/src/main/java/com/xplora/xponboarding/Activity/BaseActivatedActivity.java

@@ -1,6 +1,5 @@
 package com.xplora.xponboarding.Activity;
 
-import android.content.Intent;
 import android.database.ContentObserver;
 import android.net.Uri;
 import android.os.Handler;
@@ -24,16 +23,16 @@ public class BaseActivatedActivity extends BaseActivity {
         super.onResume();
         onResumeBase();
 
-        if (mBaseIntentFrom == 1) {
+        if (mBaseIntentFrom > 0) {
             return;
         }
 
+        checkActivated();
+
         //监听数据库
         mObserver = new SettingObserver();
         getContentResolver().registerContentObserver(
                 Settings.Global.getUriFor(MetaData.KEY_WATCH_ACTIVATED), false, mObserver);
-
-        checkActivated();
     }
 
     @Override
@@ -41,7 +40,7 @@ public class BaseActivatedActivity extends BaseActivity {
         super.onPause();
         onPauseBase();
 
-        if (mBaseIntentFrom == 1) {
+        if (mBaseIntentFrom > 0) {
             return;
         }
 
@@ -65,9 +64,7 @@ public class BaseActivatedActivity extends BaseActivity {
         int isActivated = DataManager.getIsWatchActivated();
         Log.d(TAG, "checkActivated: " + isActivated);
         if (isActivated == 1) {
-            Intent intent = new Intent(BaseActivatedActivity.this, CongratulationActivity.class);
-            startActivity(intent);
-            finish();
+            maybeFinish();
         }
     }
 }

app/src/main/java/com/xplora/xponboarding/Activity/BaseActivity.java

@@ -80,6 +80,7 @@ public class BaseActivity extends Activity {
 
             Intent i = new Intent();
             i.setComponent(componet);
+            i.putExtra("intent_from", 2);
             startActivityForResult(i, 100);
         } else {
             Log.d(TAG, "startQRCode: sim qrcode");
@@ -103,7 +104,7 @@ public class BaseActivity extends Activity {
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
         Log.d(TAG, "onKeyDown: ");
-        if (mBaseIntentFrom == 1) {
+        if (mBaseIntentFrom > 0) {
             return super.onKeyDown(keyCode, event);
         } else {
             if (isLockKey) {
@@ -119,8 +120,8 @@ public class BaseActivity extends Activity {
     @Override
     public boolean onKeyUp(int keyCode, KeyEvent event) {
         Log.d(TAG, "onKeyUp: ");
-        if (mBaseIntentFrom == 1) {
-            Log.d(TAG, "onKeyUp: mBaseIntentFrom == 1");
+        if (mBaseIntentFrom > 0) {
+            Log.d(TAG, "onKeyUp: mBaseIntentFrom > 0");
             return super.onKeyUp(keyCode, event);
         } else {
             if (!isLockKey) {

app/src/main/java/com/xplora/xponboarding/Activity/EsimUnactivationActivity.java

@@ -27,7 +27,7 @@ public class EsimUnactivationActivity extends BaseActivity {
             public void onClick(View v) {
                 startQRCode();
                 //如果是从桌面和setting过来
-                if (mBaseIntentFrom == 1)
+                if (mBaseIntentFrom  > 0)
                     finish();
             }
         });