onboarding 中去除二维码

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

@@ -79,6 +79,11 @@ public class BaseActivity extends Activity {
         }
     }
 
+    public void startWelcome() {
+        Intent intent = new Intent(this, WelcomeActivity.class);
+        startActivity(intent);
+    }
+
     public void startQRCode() {
         if (DataManager.getIsSupportESIM()) {
             Log.d(TAG, "startQRCode: esim qrcode");

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

@@ -32,8 +32,7 @@ public class OnboardingActivity extends BaseActivatedActivity {
         if (isFactoryMode || isActivated >= 1) {
             maybeFinish();
         } else if (process == 1) {
-            //跳转到qrcode
-            startQRCode();
+            startWelcome();
         } else {
             setContentView(R.layout.activity_list);
             setWatchTitle(getString(R.string.select_languages));

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

@@ -14,7 +14,6 @@ import com.xplora.xponboarding.R;
 import com.xplora.xponboarding.broadcast.SimStateReceiver;
 
 public class SimInstallActivity extends BaseActivity {
-
     public SimStateReceiver mListener = null;
 
     @Override
@@ -22,7 +21,6 @@ public class SimInstallActivity extends BaseActivity {
         Log.d(TAG, "onCreate: ");
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_sim_install);
-
         initView();
         initBroadcast();
     }
@@ -42,7 +40,6 @@ public class SimInstallActivity extends BaseActivity {
         mListener = new SimStateReceiver();
         IntentFilter intentFilter = new IntentFilter(SimStateReceiver.ACTION_SIM_STATE_CHANGED);
         registerReceiver(mListener, intentFilter);
-
         mListener.setOnSimStateListener(new SimStateReceiver.OnSimStateChangeListener() {
             @Override
             public void onReceiveSimStateChangeBroadcast(int status) {
@@ -55,7 +52,7 @@ public class SimInstallActivity extends BaseActivity {
                     finish();
                 } else {
                     unregisterSimStateReceiver();
-                    startQRCode();
+                    maybeFinish();
                 }
             }
         });

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

@@ -81,8 +81,8 @@ public class TimeFormatActivity extends BaseActivatedActivity {
         button.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                Intent intent = new Intent(TimeFormatActivity.this, WelcomeActivity.class);
-                startActivity(intent);
+                DataManager.setOnboardingProcess(1);
+                startWelcome();
                 finish();
             }
         });

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

@@ -53,7 +53,7 @@ public class WelcomeActivity extends BaseActivatedActivity {
             startActivity(intent);
             finish();
         } else {
-            startQRCode();
+            maybeFinish();
         }
     }