Merge branch 'dev_robotaxi-d-app-module_251_220125_2.5.1' into dev_MogoAP_eagle-220_211207_8.0.17_merge

core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt

@@ -15,7 +15,6 @@ import com.mogo.eagle.core.function.autopilot.adapter.MoGoAdasListenerImpl
 import com.mogo.eagle.core.function.autopilot.adapter.MoGoAdasMsgConnectStatusListenerImpl
 import com.mogo.eagle.core.function.autopilot.adapter.MoGoHandAdasMsgManager
 import com.mogo.eagle.core.function.autopilot.server.AsyncDataToAutopilotServer
-import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager
 import com.mogo.eagle.core.function.call.map.CallerMapDataCollectorManager
 import com.mogo.eagle.core.utilcode.mogo.logger.Logger
 import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr
@@ -60,7 +59,7 @@ class MoGoAutopilotProvider :
         CupidLogUtils.setIsWriteLog(false)
         // TODO 临时方案，根据不同的身份标识，连接不同的工控机IP
         when (FunctionBuildConfig.appIdentityMode) {
-            0 -> // 司机
+            0x00 -> // 司机
             {
                 // 注册地图采集功能
                 CallerMapDataCollectorManager.registerOnMapCollectTaskListener(this)
@@ -95,7 +94,7 @@ class MoGoAutopilotProvider :
                     }
                 })
             }
-            1 -> // 乘客
+            0x01 -> // 乘客
             {
                 // 乘客端默认接收绘制全局路径+引导线
                 FunctionBuildConfig.isDemoMode = true
@@ -167,7 +166,7 @@ class MoGoAutopilotProvider :
         // 同步数据给工控机的服务
         AsyncDataToAutopilotServer.INSTANCE.initServer()
         // 同步是否开启美化模式
-        CallerAutoPilotManager.setDemoMode(FunctionBuildConfig.isDemoMode)
+        setDemoMode(FunctionBuildConfig.isDemoMode)
     }
 
     /**