允许和运维同时启动mpres。并增加异常处理

4 weeks ago · c34a649fa5
parent cf557a599a
commit c34a649fa5
1 changed files with 8 additions and 6 deletions
--- a/app/src/main/java/com/xypower/mpapp/MainActivity.java
+++ b/app/src/main/java/com/xypower/mpapp/MainActivity.java
@ -136,13 +136,15 @@ public class MainActivity extends AppCompatActivity {
                }
                else {
                    Intent resIntent = getPackageManager().getLaunchIntentForPackage(MicroPhotoContext.PACKAGE_NAME_MPRES);
-                    resIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
-                    resIntent.putExtra("initres", 1);
-                    String sn = MicroPhotoService.getSerialNumber();
-                    if (!TextUtils.isEmpty(sn)) {
-                        resIntent.putExtra("sn", sn);
+                    if (resIntent != null) {
+                        resIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                        resIntent.putExtra("initres", 1);
+                        String sn = MicroPhotoService.getSerialNumber();
+                        if (!TextUtils.isEmpty(sn)) {
+                            resIntent.putExtra("sn", sn);
+                        }
+                        startActivity(resIntent);
                    }
-                    startActivity(resIntent);
                }
            }