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

@@ -42,8 +42,8 @@ class MoGoAutopilotProvider :
         Logger.d(TAG, "初始化工控机连接……")
         mContext = context
         // 初始化ADAS 域控制器
-        CupidLogUtils.setEnableLog(false)
-        CupidLogUtils.setIsWriteLog(false)
+        //CupidLogUtils.setEnableLog(false)
+        //CupidLogUtils.setIsWriteLog(false)
         // TODO 临时方案，根据不同的身份标识，连接不同的工控机IP
         when (FunctionBuildConfig.appIdentityMode) {
             0 -> // 司机
@@ -156,4 +156,17 @@ class MoGoAutopilotProvider :
     override fun setIPCUpgradeCancel() {
         AdasManager.getInstance().sendBaseInfo(IPCUpgradeInfo.cancel());
     }
+
+    /**
+     * 演示模式（美化模式）
+     * isEnable = true  开启
+     * isEnable = false 关闭
+     */
+    override fun setDemoMode(isEnable: Boolean) {
+        if (isEnable) {
+            AdasManager.getInstance().enableDemoMode()
+        } else {
+            AdasManager.getInstance().disableDemoMode()
+        }
+    }
 }

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt

@@ -268,9 +268,11 @@ class DebugSettingView @JvmOverloads constructor(
         // 演示模式,上一次勾选的数据
         val isDemoMode =
                 SharedPrefsMgr.getInstance(context).getBoolean(MoGoConfig.IS_DEMO_MODE, false)
+        CallerAutoPilotManager.setDemoMode(isDemoMode)
         rbIsDemoMode.isChecked = isDemoMode
         // 演示模式
         rbIsDemoMode.setOnCheckedChangeListener { buttonView, isChecked ->
+            CallerAutoPilotManager.setDemoMode(isChecked)
             FunctionBuildConfig.isDemoMode = isChecked
             SharedPrefsMgr.getInstance(context).putBoolean(MoGoConfig.IS_DEMO_MODE, isChecked)
         }

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SpeedPanelView.kt

@@ -8,7 +8,6 @@ import android.view.Gravity
 import android.widget.FrameLayout
 import com.alibaba.android.arouter.launcher.ARouter
 import com.mogo.eagle.core.data.constants.MogoServicePaths
-import com.mogo.eagle.core.data.map.MogoLatLng
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
 import com.mogo.eagle.core.function.hmi.R
 import com.mogo.eagle.core.utilcode.mogo.logger.Logger
@@ -99,10 +98,6 @@ class SpeedPanelView @JvmOverloads constructor(
     }
 
 
-    override fun onCarLocationChanged(latLng: MogoLatLng?) {
-
-    }
-
     override fun onCarLocationChanged2(latLng: Location) {
         mLatLng = latLng
     }

core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/redlightwarning/RedLightWarningManager.kt

@@ -203,10 +203,6 @@ class RedLightWarningManager : IMoGoTrafficLightListener, IMoGoVipSetListener,
         )
     }
 
-    override fun onCarLocationChanged(latLng: MogoLatLng?) {
-
-    }
-
     override fun onCarLocationChanged2(latLng: Location?) {
         latLng?.let {
             mLocation = it

core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/speedlimit/SpeedLimitDataManager.java

@@ -1,9 +1,7 @@
 package com.mogo.eagle.core.function.v2x.speedlimit;
 
-import android.content.Context;
 import android.location.Location;
 
-import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager;
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
 import com.mogo.map.navi.IMogoCarLocationChangedListener2;
@@ -58,8 +56,4 @@ public class SpeedLimitDataManager implements IMogoCarLocationChangedListener2 {
         mLocation = latLng;
     }
 
-    @Override
-    public void onCarLocationChanged(MogoLatLng latLng) {
-
-    }
 }

core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/core/MogoTrafficLightManager.kt

@@ -4,7 +4,6 @@ import android.content.Context
 import android.location.Location
 import android.os.Handler
 import android.os.Looper
-import com.mogo.eagle.core.data.map.MogoLatLng
 import com.mogo.eagle.core.data.trafficlight.RoadIDResult
 import com.mogo.eagle.core.data.trafficlight.TrafficLightDetail
 import com.mogo.eagle.core.data.trafficlight.TrafficLightResult
@@ -163,10 +162,6 @@ class MogoTrafficLightManager : IMogoCarLocationChangedListener2 {
         )
     }
 
-    override fun onCarLocationChanged(latLng: MogoLatLng?) {
-
-    }
-
     override fun onCarLocationChanged2(latLng: Location?) {
         latLng?.let {
             mLocation = latLng