Merge branch 'dev_robotaxi-d-app-module_240_230131_2.14.0' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_robotaxi-d-app-module_240_230131_2.14.0

core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/trace/SyncConfig.kt

@@ -10,6 +10,7 @@ import com.mogo.eagle.core.data.deva.chain.ChainConstant
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager
 import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager
 import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
+import com.mogo.eagle.core.utilcode.mogo.getMisChannelCode
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_DEVA
 import com.mogo.eagle.core.utilcode.util.NetworkUtils
@@ -38,6 +39,7 @@ object SyncConfig {
         AppConfigInfo.mapSdkOptVersion = DebugConfig.getMapOptVersion()
         AppConfigInfo.isConnectNet = NetworkUtils.isConnected(context)
         AppConfigInfo.isConnectSocket = MogoStatusManager.getInstance().isSocketOnLine
+        AppConfigInfo.role = AppIdentityModeUtils.getMisChannelCode(FunctionBuildConfig.appIdentityMode)
         when {
             AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode) -> {// 司机端
                 AppConfigInfo.isDriver = true

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/pnc/PncActionsView.kt

@@ -74,16 +74,23 @@ class PncActionsView @JvmOverloads constructor(
     override fun pncActions(planningActionMsg: MessagePad.PlanningActionMsg) {
         try {
             mAutoPilotStatusInfo?.let { it ->
-                if (it.state == STATUS_AUTOPILOT_RUNNING) {
-                    UiThreadHandler.post {
+                UiThreadHandler.post {
+                    if (it.state == STATUS_AUTOPILOT_RUNNING) {
                         var actions: String? = null
                         planningActionMsg.actionMsg?.let {
-                            actions = PncActionsHelper.getAction(it.drivingState.number, it.drivingAction.number)
+                            actions = PncActionsHelper.getAction(
+                                it.drivingState.number,
+                                it.drivingAction.number
+                            )
 
                             //如果是存在云端红绿灯数据条件下，设置云端数据
-                            if (PncActionsHelper.isWaitingTrafficlight(it.drivingState.number, it.drivingAction.number)
+                            if (PncActionsHelper.isWaitingTrafficlight(
+                                    it.drivingState.number,
+                                    it.drivingAction.number
+                                )
                                 && mTrafficLightResult != null
-                                && getWaitTrafficlightTime().isNotBlank()) {
+                                && getWaitTrafficlightTime().isNotBlank()
+                            ) {
                                 actions += ",预计${getWaitTrafficlightTime()}秒后通过"
                             } else {
                                 mTrafficLightResult = null
@@ -94,16 +101,18 @@ class PncActionsView @JvmOverloads constructor(
                             this.background = null
                             tvHmiPncActions.text = ""
                         } else {
-                            this.background = AppCompatResources.getDrawable(context, R.drawable.pnc_actions_bg)
+                            this.background =
+                                AppCompatResources.getDrawable(context, R.drawable.pnc_actions_bg)
                             tvHmiPncActions.text = actions
                         }
+
+                    } else {
+                        this.background = null
+                        tvHmiPncActions.text = ""
                     }
-                }else{
-                    this.background = null
-                    tvHmiPncActions.text = ""
                 }
             }
-        }catch (e:Exception){
+        } catch (e: Exception) {
             e.printStackTrace()
         }
     }

core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/app/AppConfigInfo.kt

@@ -58,7 +58,7 @@ object AppConfigInfo {
     var netMode: Int = 3
 
     // 角色
-    var role: Int = AppIdentityModeUtils.getMisChannelCode(FunctionBuildConfig.appIdentityMode)
+    var role: Int = 0
 
     // 是否可以网络连接
     var isConnectNet: Boolean = false