diff --git a/app/script/flavorfilter/flavors.json b/app/script/flavorfilter/flavors.json
index 79ed0e040c..fe359645e6 100644
--- a/app/script/flavorfilter/flavors.json
+++ b/app/script/flavorfilter/flavors.json
@@ -1,8 +1,8 @@
 {
   "mogo": {
     "C1":["driver"],
-    "B1":["driver","passenger","bailing"],
-    "B2":["driver","passenger"],
+    "B1":["driver","passenger"],
+    "B2":["driver","passenger","bailing"],
     "T1T2":["driver","passenger"],
     "ALL":["driver","passenger"]
   },
@@ -19,8 +19,8 @@
   },
   "saas": {
     "T1T2":["driver","passenger"],
-    "B1":["driver","passenger","bailing"],
-    "B2":["driver","passenger"],
+    "B1":["driver","passenger"],
+    "B2":["driver","passenger","bailing"],
     "M1":["driver","passenger"],
     "ALL":["driver","passenger"]
   }
diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/msgbox/DataManager.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/msgbox/DataManager.kt
index a7e4c52ff4..46a8a17644 100644
--- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/msgbox/DataManager.kt
+++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/msgbox/DataManager.kt
@@ -221,9 +221,9 @@ object DataManager {
      * 从本地数据库中查询数据
      */
     fun queryAllMessages(context: Context) {
-//        if (!ProcessUtils.isMainProcess(context)) {
-//            return
-//        }
+        if (!ProcessUtils.isMainProcess(context)) {
+            return
+        }
         clearMessageBoxTable(context)
         scope.launch {
             initCache()
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java
index cd38a30c3c..aaa5e660f9 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java
@@ -31,9 +31,9 @@ public abstract class MainMoGoApplication extends AbsMogoApplication {
     @Override
     public void onCreate() {
         super.onCreate();
-//        if (!shouldInit()) {
-//            return;
-//        }
+        if (!shouldInit()) {
+            return;
+        }
         start = System.currentTimeMillis();
         //启动业务
         CallerStartUpManager.initStageOne();
diff --git a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/ProcessUtils.java b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/ProcessUtils.java
index 913c2cd0e5..b2ed67d48d 100644
--- a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/ProcessUtils.java
+++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/ProcessUtils.java
@@ -272,7 +272,7 @@ public final class ProcessUtils {
         return processName;
     }
 
-    public static boolean isMainProcess( Context context ) {
+    public static boolean isMainProcess( Context context ) { //todo emArrow 多进程
         try {
             ActivityManager activityManager = ( ( ActivityManager ) context.getSystemService( Context.ACTIVITY_SERVICE ) );
             if ( activityManager == null ) {
diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java
index c59534156f..b66d7a3b87 100644
--- a/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java
+++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java
@@ -49,9 +49,9 @@ public abstract class AbsMogoApplication extends Application {
         if (DebugConfig.isDebug()) {
             KoomInitTask.INSTANCE.init(AbsMogoApplication.getApp());
         }
-//        if (!shouldInit()) {
-//            return;
-//        }
+        if (!shouldInit()) {
+            return;
+        }
         AppStateManager.INSTANCE.init(this);
         initRxJavaErrorHandler();
         FinalizeCrashFixer.fix();
diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpActivity.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpActivity.java
index 16f8e6b977..ef25e2967e 100644
--- a/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpActivity.java
+++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpActivity.java
@@ -35,9 +35,9 @@ public abstract class MvpActivity<V extends IView, P extends Presenter<V>> exten
         getWindow().setFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON,
                 WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
         super.onCreate(savedInstanceState);
-//        if (!ProcessUtils.isMainProcess(this)) {
-//            return;
-//        }
+        if (!ProcessUtils.isMainProcess(this)) {
+            return;
+        }
         setContentView(getLayoutId());
         initViews();
         mPresenter = createPresenter();