From bf90f5431af273e6c4e8568b33f808a8d0cd1f54 Mon Sep 17 00:00:00 2001 From: aibingbing Date: Tue, 23 Aug 2022 15:45:49 +0800 Subject: [PATCH] fix: gradle build error, copy code from branch 2110; --- .../MoGoAdasMsgConnectStatusListenerImpl.kt | 29 ++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt index 669a626baa..0c70354af5 100644 --- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt +++ b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt @@ -3,6 +3,7 @@ package com.mogo.eagle.core.function.autopilot.adapter import android.annotation.SuppressLint import com.mogo.cloud.passport.MoGoAiCloudClientConfig import com.mogo.commons.debug.DebugConfig +import com.mogo.commons.debug.DebugConfig.* import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener @@ -11,6 +12,7 @@ import com.mogo.eagle.core.function.autopilot.network.AdasServiceModel import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager import com.mogo.eagle.core.function.call.cloud.CallerCloudListenerManager +import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_ADAS_IMPL import com.mogo.eagle.core.utilcode.util.ToastUtils @@ -18,6 +20,9 @@ import com.zhidao.support.adas.high.AdasManager import com.zhidao.support.adas.high.OnAdasConnectStatusListener import com.zhidao.support.adas.high.bean.VersionCompatibility import com.zhidao.support.adas.high.common.Constants +import com.zhidao.support.adas.high.common.Constants.ENVIRONMENT.* +import com.zhidao.support.adas.high.common.Constants.TERMINAL_ROLE.DRIVER +import com.zhidao.support.adas.high.common.Constants.TERMINAL_ROLE.PASSENGER import io.reactivex.Flowable import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.schedulers.Schedulers @@ -133,7 +138,29 @@ class MoGoAdasMsgConnectStatusListenerImpl : OnAdasConnectStatusListener, CallerLogger.d("$M_ADAS_IMPL$TAG", "同步PAD的SN给工控机……") // 设置PAD-SN给工控,网络环境 AdasManager.getInstance() - .sendBasicInfoResp(MoGoAiCloudClientConfig.getInstance().sn, DebugConfig.getNetMode()) + .sendBasicInfoResp( + MoGoAiCloudClientConfig.getInstance().sn, + getEnvironment(), + getTerminalRole() + ) + } + + private fun getEnvironment(): Int { + return when (getNetMode()) { + NET_MODE_DEV -> DEVELOP + NET_MODE_QA -> TEST + NET_MODE_RELEASE -> PRODUCTION + NET_MODE_DEMO -> DEMO + else -> PRODUCTION + } + } + + private fun getTerminalRole(): Int { + return when { + AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode) -> DRIVER + AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode) -> PASSENGER + else -> DRIVER + } } /**