[opt 3.0]

[Change]
[1、先关闭了多个终端身份的启动逻辑，先适配「鹰眼」+宣传片的场景]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>

app/productFlavors/fPadLenovoOchBusPassenger.gradle

@@ -31,6 +31,6 @@ project.android.productFlavors {
         buildConfigField 'boolean', 'IS_DEMO_MODE', 'false'
 
         // 构建 是否支持多屏异显异交互
-        buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false'
+        buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'true'
     }
 }

app/src/main/java/com/mogo/launcher/stageone/ConfigStartUp.kt

@@ -43,23 +43,25 @@ class ConfigStartUp : AndroidStartup<Boolean>() {
 //        FunctionBuildConfig.gpsProvider = 2
         // 演示模式,上一次勾选的数据
         FunctionBuildConfig.isDemoMode = BuildConfig.IS_DEMO_MODE
+//        // app安装的身份信息
+        FunctionBuildConfig.appIdentityMode = BuildConfig.APP_IDENTITY_MODE
 
         Log.d("ConfigStartUp", "ProcessUtils.getCurrentProcessName():" + ProcessUtils.getCurrentProcessName())
 
-        // 这里影响当前Activity的身份信息，多进程先保持与原来一样，主进程为司机端，:passenger 进程为乘客端
-        if (ProcessUtils.getCurrentProcessName().contains(":passenger")) {
-            if (AppIdentityModeUtils.isBus(BuildConfig.APP_IDENTITY_MODE)) {
-                FunctionBuildConfig.appIdentityMode = 0xA1
-            } else if (AppIdentityModeUtils.isTaxi(BuildConfig.APP_IDENTITY_MODE)) {
-                FunctionBuildConfig.appIdentityMode = 0x01
-            }
-        } else {
-            if (AppIdentityModeUtils.isBus(BuildConfig.APP_IDENTITY_MODE)) {
-                FunctionBuildConfig.appIdentityMode = 0xA0
-            } else if (AppIdentityModeUtils.isTaxi(BuildConfig.APP_IDENTITY_MODE)) {
-                FunctionBuildConfig.appIdentityMode = 0x00
-            }
-        }
+//        // 这里影响当前Activity的身份信息，多进程先保持与原来一样，主进程为司机端，:passenger 进程为乘客端 TODO 暂时不启用，仅做洱海交付，独立乘客屏+宣传视频
+//        if (ProcessUtils.getCurrentProcessName().contains(":passenger")) {
+//            if (AppIdentityModeUtils.isBus(BuildConfig.APP_IDENTITY_MODE)) {
+//                FunctionBuildConfig.appIdentityMode = 0xA1
+//            } else if (AppIdentityModeUtils.isTaxi(BuildConfig.APP_IDENTITY_MODE)) {
+//                FunctionBuildConfig.appIdentityMode = 0x01
+//            }
+//        } else {
+//            if (AppIdentityModeUtils.isBus(BuildConfig.APP_IDENTITY_MODE)) {
+//                FunctionBuildConfig.appIdentityMode = 0xA0
+//            } else if (AppIdentityModeUtils.isTaxi(BuildConfig.APP_IDENTITY_MODE)) {
+//                FunctionBuildConfig.appIdentityMode = 0x00
+//            }
+//        }
         // 不同身份对应不同的IP地址
         FunctionBuildConfig.adasConnectIP = BuildConfig.ADAS_CONNECT_IP
     }

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java

@@ -157,9 +157,8 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
         }
         // 处理一个机器多个屏幕方案
         else {
-            // 这里先加载司机端
             ochProvider = (IMoGoFunctionProvider) ARouter.getInstance()
-                    .build("/driver/api")
+                    .build("/passenger/api")
                     .navigation(getContext());
 //
 //            // 启动乘客端Act