esim 二维码重启

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

@@ -80,7 +80,7 @@ public class BaseActivity extends Activity {
 
             Intent i = new Intent();
             i.setComponent(componet);
-            startActivity(i);
+            startActivityForResult(i, 100);
         } else {
             Log.d(TAG, "startQRCode: sim qrcode");
             Intent intent = new Intent(this, QRActivity.class);
@@ -91,6 +91,15 @@ public class BaseActivity extends Activity {
         DataManager.setOnboardingProcess(1);
     }
 
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        Log.d(TAG, "onActivityResult: requestCode: " + requestCode + " resultCode: " + resultCode);
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == 100) {
+            maybeFinish();
+        }
+    }
+
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
         Log.d(TAG, "onKeyDown: ");

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

@@ -12,7 +12,7 @@ public class EsimUnactivationActivity extends BaseActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_esim_activation);
-
+        mBaseIntentFrom = getIntent().getIntExtra("intent_from", 0);
         initView();
     }
 
@@ -26,6 +26,9 @@ public class EsimUnactivationActivity extends BaseActivity {
             @Override
             public void onClick(View v) {
                 startQRCode();
+                //如果是从桌面和setting过来
+                if (mBaseIntentFrom == 1)
+                    finish();
             }
         });
     }