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
This commit is contained in:
@@ -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 -> {
|
||||
|
||||
@@ -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(){
|
||||
|
||||
Reference in New Issue
Block a user