MpApp和MpMaster各自初始化

mpres/src/main/java/com/xypower/mpres/MainActivity.java

@@ -38,7 +38,7 @@ public class MainActivity extends AppCompatActivity {
 
         Intent intent = getIntent();
         int initres = intent.getIntExtra("initres", 0);
-        if (initres != 0) {
+        if (initres == 1) {
             mHandler = new Handler();
             final String sn = intent.getStringExtra("sn");
             final Context context = getApplicationContext();
@@ -48,10 +48,6 @@ public class MainActivity extends AppCompatActivity {
                 public void run() {
 
                     try {
-                        if (initMpMasterConfigurations(context)) {
-                            restartMpMasterApp(context);
-                        }
-
                         restartMpApp(getApplicationContext(), "FIRST Config Init");
                         sleep(100);
                         System.exit(0);
@@ -61,6 +57,14 @@ public class MainActivity extends AppCompatActivity {
                 }
             };
             initMpAppConfigurations(context, mHandler, sn, runnable);
+        } else if (initres == 2) {
+            mHandler = new Handler();
+            final String sn = intent.getStringExtra("sn");
+            final Context context = getApplicationContext();
+
+            if (initMpMasterConfigurations(context)) {
+                restartMpMasterApp(context);
+            }
         }
     }