diff --git a/app/productFlavors/fPadLenovo.gradle b/app/productFlavors/fPadLenovo.gradle index 33c6b2b39b..5ee026b077 100644 --- a/app/productFlavors/fPadLenovo.gradle +++ b/app/productFlavors/fPadLenovo.gradle @@ -18,9 +18,6 @@ project.android.productFlavors { // 高德地图鉴权信息 manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue, CHANNEL_VALUE: "fPadLenovo",ACTIVITY_ROOT:true] - // 是否基于地图 - buildConfigField 'boolean', 'IS_MAP_BASED', 'true' - // 是否需要实时上报坐标 buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true' // GPS数据提供源: 0-Android系统,1-工控机,2-OBU diff --git a/app/productFlavors/fPadLenovoOchBus.gradle b/app/productFlavors/fPadLenovoOchBus.gradle index d7516af64c..21b9880099 100644 --- a/app/productFlavors/fPadLenovoOchBus.gradle +++ b/app/productFlavors/fPadLenovoOchBus.gradle @@ -20,9 +20,6 @@ project.android.productFlavors { //高德地图鉴权信息 manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue, CHANNEL_VALUE: "fPadLenovoOchBus",ACTIVITY_ROOT:true] - // 是否基于地图 - buildConfigField 'boolean', 'IS_MAP_BASED', 'true' - // 是否需要实时上报坐标 buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true' // GPS数据提供源: 0-Android系统,1-工控机,2-OBU diff --git a/app/productFlavors/fPadLenovoOchBusPassenger.gradle b/app/productFlavors/fPadLenovoOchBusPassenger.gradle index 4588a7b67c..166fb3af3a 100644 --- a/app/productFlavors/fPadLenovoOchBusPassenger.gradle +++ b/app/productFlavors/fPadLenovoOchBusPassenger.gradle @@ -18,9 +18,6 @@ project.android.productFlavors { //高德地图鉴权信息 manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue, CHANNEL_VALUE: "fPadLenovoOchBusPassenger",ACTIVITY_ROOT:true] - // 是否基于地图 - buildConfigField 'boolean', 'IS_MAP_BASED', 'true' - // 是否需要实时上报坐标 buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true' // GPS数据提供源: 0-Android系统,1-工控机,2-OBU diff --git a/app/productFlavors/fPadLenovoOchSweeper.gradle b/app/productFlavors/fPadLenovoOchSweeper.gradle index 4b07e12cbb..cfdbb45b13 100644 --- a/app/productFlavors/fPadLenovoOchSweeper.gradle +++ b/app/productFlavors/fPadLenovoOchSweeper.gradle @@ -20,9 +20,6 @@ project.android.productFlavors { //高德地图鉴权信息 manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue, CHANNEL_VALUE: "fPadLenovoOchSweeper",ACTIVITY_ROOT:true] - // 是否基于地图 - buildConfigField 'boolean', 'IS_MAP_BASED', 'true' - // 是否需要实时上报坐标 buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true' // GPS数据提供源: 0-Android系统,1-工控机,2-OBU diff --git a/app/productFlavors/fPadLenovoOchTaxi.gradle b/app/productFlavors/fPadLenovoOchTaxi.gradle index 2946dc325c..6f51623cf2 100644 --- a/app/productFlavors/fPadLenovoOchTaxi.gradle +++ b/app/productFlavors/fPadLenovoOchTaxi.gradle @@ -21,9 +21,6 @@ project.android.productFlavors { //高德地图鉴权信息 manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue, CHANNEL_VALUE: "fPadLenovoOchTaxi",ACTIVITY_ROOT:true] - // 是否基于地图 - buildConfigField 'boolean', 'IS_MAP_BASED', 'true' - // 是否需要实时上报坐标 buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true' // GPS数据提供源: 0-Android系统,1-工控机,2-OBU diff --git a/app/productFlavors/fPadLenovoOchTaxiPassenger.gradle b/app/productFlavors/fPadLenovoOchTaxiPassenger.gradle index 973da7ef36..d56d66ef0b 100644 --- a/app/productFlavors/fPadLenovoOchTaxiPassenger.gradle +++ b/app/productFlavors/fPadLenovoOchTaxiPassenger.gradle @@ -20,9 +20,6 @@ project.android.productFlavors { //高德地图鉴权信息 manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue, CHANNEL_VALUE: "fPadLenovoOchTaxiPassenger",ACTIVITY_ROOT:false] - // 是否基于地图 - buildConfigField 'boolean', 'IS_MAP_BASED', 'true' - // 是否需要实时上报坐标 buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true' // GPS数据提供源: 0-Android系统,1-工控机,2-OBU diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index ebca79073b..d2e073d14b 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -54,10 +54,10 @@ public class MogoApplication extends MainMoGoApplication { .build(); } new StartupManager.Builder() + .addStartup(new HttpDnsStartUp()) + .addStartup(new APMStartup()) .addStartup(new ConfigStartUp()) .addStartup(new ARouterStartUp()) - .addStartup(new APMStartup()) - .addStartup(new HttpDnsStartUp()) .setConfig(config) .build(this) .start() diff --git a/app/src/main/java/com/mogo/launcher/stageone/ConfigStartUp.kt b/app/src/main/java/com/mogo/launcher/stageone/ConfigStartUp.kt index 74b7bba8fb..70ecbcf60c 100644 --- a/app/src/main/java/com/mogo/launcher/stageone/ConfigStartUp.kt +++ b/app/src/main/java/com/mogo/launcher/stageone/ConfigStartUp.kt @@ -44,17 +44,17 @@ class ConfigStartUp : AndroidStartup() { Log.d("ConfigStartUp", "ProcessUtils.getCurrentProcessName():" + ProcessUtils.getCurrentProcessName()) - // TODO:这里影响当前Activity的身份信息,多进程先保持与原来于洋, - if (ProcessUtils.getCurrentProcessName().contains(":sub")) { - if (AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)) { + // TODO:这里影响当前Activity的身份信息,多进程先保持与原来一样,主进程为司机端,:passenger 进程为乘客端 + if (ProcessUtils.getCurrentProcessName().contains(":passenger")) { + if (AppIdentityModeUtils.isBus(BuildConfig.APP_IDENTITY_MODE)) { FunctionBuildConfig.appIdentityMode = 0xA1 - } else if (AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode)) { + } else if (AppIdentityModeUtils.isTaxi(BuildConfig.APP_IDENTITY_MODE)) { FunctionBuildConfig.appIdentityMode = 0x01 } } else { - if (AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)) { + if (AppIdentityModeUtils.isBus(BuildConfig.APP_IDENTITY_MODE)) { FunctionBuildConfig.appIdentityMode = 0xA0 - } else if (AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode)) { + } else if (AppIdentityModeUtils.isTaxi(BuildConfig.APP_IDENTITY_MODE)) { FunctionBuildConfig.appIdentityMode = 0x00 } } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/AndroidManifest.xml b/core/function-impl/mogo-core-function-hmi/src/main/AndroidManifest.xml index 28ed89a7c9..05eac99081 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/AndroidManifest.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/AndroidManifest.xml @@ -76,7 +76,7 @@ android:stateNotNeeded="true" android:theme="@style/Main" android:exported="true" - android:process=":sub" + android:process=":passenger" android:windowSoftInputMode="adjustPan|stateHidden">