Merge branch 'refs/heads/dev_robotaxi-d_240912_6.7.0' into dev_robotaxi-d_240912_6.7.2_local

# Conflicts:
#	OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/LoadingMapStatusView.kt

core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/telematic/TeleMsgHandler.kt

@@ -146,9 +146,8 @@ class TeleMsgHandler : IMsgHandler {
                     val content = String(it.body, Charset.defaultCharset())
                     Log.d(TAG, "乘客屏收到司机屏转发的新链路开关 --- 2 ---:$content")
                     val data = GsonUtils.fromJson(content, Map::class.java)
-                    val f1 = data["f1"] as Boolean
-                    val f2 = data["f2"] as Boolean
-                    Log.d(TAG, "乘客屏收到司机屏转发的新链路开关 --- 3 ---:$data, f1: $f1, f2:$f2")
+                    val f1 = data["f1"] as? Boolean ?: false
+                    Log.d(TAG, "乘客屏收到司机屏转发的新链路开关 --- 3 ---:$data, f1: $f1")
                     FunctionBuildConfig.v2nTotalSwitch = f1
                 } catch (t: Throwable) {
                     t.printStackTrace()

core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/coldstart/ColdStartManager.kt

@@ -28,6 +28,7 @@ object ColdStartManager: IMoGoAutopilotStatusListener, IDataCenterBizListener {
     private var coldStartNowDay = millis2String(ColdStartConfig.getColdStartNowTime(), TimeUtils.getMdFormat())
     //获取当天是否冷启动成功
     private var coldStartSuccessDay = millis2String(ColdStartConfig.getColdStartSuccessTime(), TimeUtils.getMdFormat())
+    private var firstDisConnectIpc = false
 
     fun init(context: Context){
         CallerAutoPilotStatusListenerManager.addListener(TAG, this)
@@ -40,8 +41,9 @@ object ColdStartManager: IMoGoAutopilotStatusListener, IDataCenterBizListener {
     ){
         //冷启动只上司机屏
         if(AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)){
-            //域控连接异常
-            if(status != AdasConstants.IpcConnectionStatus.CONNECTED){
+            //域控连接正常
+            if(status == AdasConstants.IpcConnectionStatus.CONNECTED){
+                firstDisConnectIpc = true
                 coldStartNowDay = millis2String(ColdStartConfig.getColdStartNowTime(), TimeUtils.getMdFormat())
                 if(coldStartNowDay == currentDay){
                     isColdStartNow = true
@@ -65,7 +67,10 @@ object ColdStartManager: IMoGoAutopilotStatusListener, IDataCenterBizListener {
                     }
                 }
             }else{
-                ipcConnectedTime = System.currentTimeMillis()
+                if(firstDisConnectIpc){
+                    ipcConnectedTime = System.currentTimeMillis()
+                    firstDisConnectIpc = false
+                }
             }
         }
     }

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/operate/OperatePanelLayout.kt

@@ -59,6 +59,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.Logger
 import com.mogo.eagle.core.utilcode.mogo.vehicle.SweeperVehicleConfigUtils
 import com.mogo.eagle.core.utilcode.rv.divider.CommonDividerItemDecoration
 import com.mogo.eagle.core.utilcode.util.AppStateManager
+import com.mogo.eagle.core.utilcode.util.GsonUtils.*
 import com.mogo.eagle.core.utilcode.util.ToastUtils
 import com.zhjt.mogo.adas.data.AdasConstants
 import com.zhjt.mogo.adas.data.bean.AdasParam
@@ -397,6 +398,10 @@ class OperatePanelLayout : LinearLayout {
                         preferenceScreen.findPreferenceReal<SwitchPreferenceCompat>(KEY_V2N_NEW_LINKED_TO_PNC)?.also { changeValue(it, false) }
                         preferenceScreen.findPreferenceReal<SwitchPreferenceCompat>(KEY_V2N_NEW_LINKED_GREEN_WAVE)?.also { changeValue(it, false) }
                     }
+                    val map = HashMap<String, Boolean>().also {
+                        it["f1"] = isChecked
+                    }
+                    CallerTelematicManager.sendMsgToAllClients(TelematicConstant.V2N_NEW_LINK_SWITCH, toJson(map).toByteArray())
                     return true
                 }
                 KEY_V2N_NEW_LINKED_TO_PNC -> {

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

@@ -219,6 +219,11 @@ class ColdStartView @JvmOverloads constructor(
             if(status.hasAutoPilotReady() && status.autoPilotReady && !coldStartStatus){
                 coldStartStatus = true
                 showColdStartSuccessView()
+                //冷启动成功埋点统计
+                reason = "冷启动成功"
+                ColdStartAnalyticsManager.coldStartStepAnalytics(ColdStartAnalyticsManager.coldStartSuccess,reason)
+                //记录冷启动成功时间
+                ColdStartConfig.setColdStartSuccessTime(System.currentTimeMillis())
             }
         }
     }
@@ -448,6 +453,9 @@ class ColdStartView @JvmOverloads constructor(
         //域控连接失败埋点统计
         this.reason = "域控连接失败：$failReason"
         ColdStartAnalyticsManager.coldStartStepAnalytics(ColdStartAnalyticsManager.ipcConnectFail,reason)
+        ssmConnectStatus = false
+        coldStartStatus = false
+        newColdStart = false
     }
 
     private fun showIPCConnecting(){

core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/TravelRealityView.kt

@@ -1726,7 +1726,7 @@ class TravelRealityView @JvmOverloads constructor(
                     hideStartEndMarker()
                 }
             } else {
-                drawStartEndMarker(emptyList())
+                drawStartEndMarker(ArrayList())
             }
         }
     }