yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[2.13.0]

Browse Source 
[Change]
[修复应用身份的配置问题导致Bus无法区分]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
This commit is contained in:
donghongyu
2022-11-29 16:01:36 +08:00
parent 47161b4648
commit ee44bc0470
12 changed files with 26 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/productFlavors/fPadLenovo.gradle
View File

@@ -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

3
app/productFlavors/fPadLenovoOchBus.gradle
View File

@@ -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

3
app/productFlavors/fPadLenovoOchBusPassenger.gradle
View File

@@ -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

3
app/productFlavors/fPadLenovoOchSweeper.gradle
View File

@@ -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

3
app/productFlavors/fPadLenovoOchTaxi.gradle
View File

@@ -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

3
app/productFlavors/fPadLenovoOchTaxiPassenger.gradle
View File

@@ -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

4
app/src/main/java/com/mogo/launcher/MogoApplication.java
View File

@@ -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()

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

@@ -44,17 +44,17 @@ class ConfigStartUp : AndroidStartup<Boolean>() {
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
}
}