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

[2.13.0]

Browse Source 
[Change]
[完成多物理设备和单设备多屏幕的工程适配；
待解决，需要处理两个身份通讯问题适配]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
This commit is contained in:
donghongyu
2022-11-28 22:35:19 +08:00
parent 5f1ecdd51f
commit 47161b4648
20 changed files with 249 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -76,6 +76,7 @@ class ConfigStartUp : AndroidStartup<Boolean>() {
DebugConfig.setCarMachineType(BuildConfig.CAR_MACHINE_TYPE)
DebugConfig.setProductFlavor(BuildConfig.FLAVOR_product)
DebugConfig.setSocketAppId(BuildConfig.SOCKET_APP_ID)
DebugConfig.setMultiDisplay(BuildConfig.IS_MULTI_DISPLAY)
DebugConfig.setScheduleCalculateNotHomeCompanyDistanceForPush(BuildConfig.IS_SUPPORT_SCHEDULE_CALCULATE_NOT_HOME_COMPANY_DISTANCE_FOR_PUSH)
DebugConfig.setNeedUploadCoordinatesInTime(BuildConfig.IS_NEED_UPLOAD_COORDINATES_IN_TIME)
DebugConfig.setObuType(
@@ -87,11 +88,8 @@ class ConfigStartUp : AndroidStartup<Boolean>() {
// 配置BuglyAppID：MoGoEagleEye
CrashReportConstants.buglyAppID = "ac71228f85"
// TODO: @王明君 ，这里判断方式可以替换为使用 AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)等进行替换
if (DebugConfig.getProductFlavor() == "fPadLenovoOchTaxi" || DebugConfig.getProductFlavor() == "fPadLenovoOchBus"
|| DebugConfig.getProductFlavor() == "fPadLenovoOchTaxiPassenger"
|| DebugConfig.getProductFlavor() == "fPadLenovoOchBusPassenger"
|| DebugConfig.getProductFlavor() == "fPadLenovoOchSweeper") {
if (AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode)||
AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)) {
//控制HMI展示元素 将不用手动调用setXXXXXViewVisibility
HmiBuildConfig.isShowSpeedView = false
HmiBuildConfig.isShowAutopilotStatusView = false
@@ -101,32 +99,14 @@ class ConfigStartUp : AndroidStartup<Boolean>() {
HmiBuildConfig.isShowUpgradeTipsView = false
}
if (DebugConfig.getProductFlavor() == "fPadLenovoOchTaxi" || DebugConfig.getProductFlavor() == "fPadLenovoOchTaxiPassenger") {
if (AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode)) {
HdMapBuildConfig.currentCarVrIconRes = R.raw.chuzuche
} else if (DebugConfig.getProductFlavor() == "fPadLenovoOchBus" || DebugConfig.getProductFlavor() == "fPadLenovoOchBusPassenger"
|| DebugConfig.getProductFlavor() == "fPadLenovoOchSweeper") {
} else if (AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)) {
HdMapBuildConfig.currentCarVrIconRes = R.raw.xiaobache
HmiBuildConfig.isShowBrakeLightView = false
HmiBuildConfig.isShowTurnLightView = false
}
if (DebugConfig.getProductFlavor() == "fPadLenovoOchTaxiPassenger") {
//是否显示 红绿等
HmiBuildConfig.isShowTrafficLightView = false
//是否显示 限速UI
HmiBuildConfig.isShowLimitingVelocityView = false
//是否显示 路侧监控
HmiBuildConfig.isShowCameraView = false
} else if (DebugConfig.getProductFlavor() == "fPadLenovoOchBusPassenger") {
//是否显示 红绿等
HmiBuildConfig.isShowTrafficLightView = false
//是否显示 限速UI
HmiBuildConfig.isShowLimitingVelocityView = false
//是否显示 路侧监控
HmiBuildConfig.isShowCameraView = false
//白天模式
FunctionBuildConfig.skinMode = 1
}
if (AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) {
if (AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)) {
//是否显示 红绿等

4
app/src/main/java/com/mogo/launcher/stageone/HttpDnsStartUp.kt
View File

@@ -40,6 +40,7 @@ import com.mogo.eagle.core.utilcode.util.ThreadPoolService
import com.mogo.eagle.core.utilcode.util.TimeUtils
import com.mogo.map.location.GDLocationClient
import com.mogo.eagle.core.data.constants.HostConst
import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
import com.rousetime.android_startup.AndroidStartup
import com.zhjt.mogo_core_function_devatools.env.EnvChangeManager
import com.zhjt.service.chain.ChainLog
@@ -365,7 +366,8 @@ class HttpDnsStartUp : AndroidStartup<Boolean>() {
private fun initCloudClientConfig() {
// 使用旧Socket链路 true = 旧链路，false = 新链路
if (DebugConfig.getProductFlavor() == "fPadLenovoOchTaxi" || DebugConfig.getProductFlavor() == "fPadLenovoOchBus" || DebugConfig.getProductFlavor() == "fPadLenovoOchTaxiPassenger" || DebugConfig.getProductFlavor() == "fPadLenovoOchBusPassenger") {
if (AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode)||
AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)) {
clientConfig.isUseOriginSocket = true
}
}