Merge branch 'dev_robotaxi-d_250417_8.0.0_routing' into dev_robotaxi-d_250709_8.2.0_advideo
# Conflicts: # OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/MusicModel.kt # OCH/common/common/src/main/java/com/mogo/och/common/module/constant/OchCommonConst.kt
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
package com.mogo.eagle.core.function.datacenter.iot
|
||||
|
||||
import com.mogo.commons.AbsMogoApplication
|
||||
import com.mogo.commons.debug.DebugConfig
|
||||
import com.mogo.commons.env.ProjectUtils
|
||||
import com.mogo.commons.storage.SharedPrefsMgr
|
||||
import com.mogo.commons.utils.MogoAnalyticUtils
|
||||
@@ -67,17 +68,18 @@ object IotManager : IMoGoCloudListener, IWriteChainLogListener {
|
||||
paramIndexes = [0, 1, 2]
|
||||
)
|
||||
override fun onWriteChainLog(tag: String, title: String, info: String) {
|
||||
try {
|
||||
i("${tag}_${EVENT_KEY_HARDWARE_DEVICES}", "${title}_${info}")
|
||||
val params = HashMap<String, Any>()
|
||||
params["time"] = sdf.format(Date())
|
||||
params["tag"] = tag
|
||||
params["title"] = title
|
||||
params["info"] = info
|
||||
MogoAnalyticUtils.track(EVENT_KEY_HARDWARE_DEVICES, params)
|
||||
|
||||
} catch (e: Exception) {
|
||||
e.printStackTrace()
|
||||
if(DebugConfig.isDebug()) {
|
||||
try {
|
||||
i("${tag}_${EVENT_KEY_HARDWARE_DEVICES}", "${title}_${info}")
|
||||
val params = HashMap<String, Any>()
|
||||
params["time"] = sdf.format(Date())
|
||||
params["tag"] = tag
|
||||
params["title"] = title
|
||||
params["info"] = info
|
||||
MogoAnalyticUtils.track(EVENT_KEY_HARDWARE_DEVICES, params)
|
||||
} catch (e: Exception) {
|
||||
e.printStackTrace()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -37,7 +37,6 @@ import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWarningStatusListener
|
||||
import com.mogo.eagle.core.function.api.hmi.xiaozhi.event.Event
|
||||
import com.mogo.eagle.core.function.api.hmi.xiaozhi.listener.OnXiaoZhiStateChangeListener
|
||||
import com.mogo.eagle.core.function.api.hmi.xiaozhi.state.State
|
||||
import com.mogo.eagle.core.function.api.map.angle.Scene
|
||||
import com.mogo.eagle.core.function.api.och.toolkit.IToolKitItemClickListener
|
||||
import com.mogo.eagle.core.function.api.och.toolkit.ToolKitCustomItemAddParam
|
||||
import com.mogo.eagle.core.function.api.och.toolkit.ToolKitDefaultItemAddParam
|
||||
@@ -430,6 +429,10 @@ class MoGoHmiProvider : IMoGoHmiProvider {
|
||||
CallerTurnLightListenerManager.invokeHideTurnLightView()
|
||||
}
|
||||
|
||||
override fun isShuttleDriverPerformTask(): Boolean {
|
||||
return MogoStatusManager.getInstance().isShuttleDriverPerformTask
|
||||
}
|
||||
|
||||
override fun isTaxiUnmanedDriverPerformTask(): Boolean {
|
||||
return MogoStatusManager.getInstance().isTaxiUnmanedDriverPerformTask
|
||||
}
|
||||
|
||||
@@ -912,7 +912,7 @@ class OperatePanelLayout : LinearLayout {
|
||||
}
|
||||
}
|
||||
|
||||
class BusinessPreferenceFragmentCompat : OperatePanelDetailBase(), IReceivedMsgListener {
|
||||
class BusinessPreferenceFragmentCompat : OperatePanelDetailBase(), IReceivedMsgListener,ISopSettingListener {
|
||||
|
||||
companion object {
|
||||
private const val TAG = "BusinessPreferenceFragmentCompat"
|
||||
@@ -932,6 +932,7 @@ class OperatePanelLayout : LinearLayout {
|
||||
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
|
||||
super.onViewCreated(view, savedInstanceState)
|
||||
CallerTelematicListenerManager.addListener(TAG, this)
|
||||
CallerSopSettingManager.addListener(TAG,this)
|
||||
lifecycleScope.launchWhenResumed {
|
||||
val p = preferenceScreen.findPreferenceReal<SwitchPreferenceCompat>(KEY_DRIVE_SEAT_VIDEO_STREAM)?.also {
|
||||
CallerDevaToolsManager.driveSeatVideoProvider()?.requestVideoInfo({ data ->
|
||||
@@ -955,6 +956,11 @@ class OperatePanelLayout : LinearLayout {
|
||||
CallerTelematicListenerManager.removeListener(TAG)
|
||||
}
|
||||
|
||||
override fun onRoutingClickEvent(status: Boolean) {
|
||||
super.onRoutingClickEvent(status)
|
||||
preferenceScreen.findPreferenceReal<SwitchPreferenceCompat>(KEY_SELF_ROUTING_VERIFY_MODE)?.also { changeValue(it, status) }
|
||||
}
|
||||
|
||||
override fun getDefaultVal(pref: Preference): Any? {
|
||||
when (pref.key) {
|
||||
KEY_FAULT_REPORT_TIP -> {
|
||||
@@ -996,6 +1002,9 @@ class OperatePanelLayout : LinearLayout {
|
||||
return when (pref.key) {
|
||||
KEY_SELF_ROUTING_VERIFY_MODE -> {
|
||||
AppIdentityModeUtils.isTaxiDriver(FunctionBuildConfig.appIdentityMode)
|
||||
||AppIdentityModeUtils.isBusDriver(FunctionBuildConfig.appIdentityMode)
|
||||
||AppIdentityModeUtils.isShuttleDriver(FunctionBuildConfig.appIdentityMode)
|
||||
||AppIdentityModeUtils.isScheduled(FunctionBuildConfig.appIdentityMode)
|
||||
}
|
||||
KEY_LOOK_AROUND_360 -> {
|
||||
AppIdentityModeUtils.isM1(FunctionBuildConfig.appIdentityMode)
|
||||
@@ -1108,7 +1117,9 @@ class OperatePanelLayout : LinearLayout {
|
||||
KEY_SELF_ROUTING_VERIFY_MODE -> {
|
||||
val isChecked = newValue as? Boolean ?: false
|
||||
if (isChecked) {
|
||||
if (CallerHmiManager.isTaxiUnmanedDriverPerformTask()) {
|
||||
if (CallerHmiManager.isTaxiUnmanedDriverPerformTask()||
|
||||
CallerHmiManager.isShuttleDriverPerformTask()
|
||||
) {
|
||||
ToastUtils.showLong("请先结束当前任务")
|
||||
return false
|
||||
}
|
||||
|
||||
@@ -196,6 +196,12 @@ interface IMoGoHmiProvider :IProvider{
|
||||
*/
|
||||
fun hideTurnLightView()
|
||||
|
||||
/**
|
||||
* 小巴、接驳、包车 是否在执行任务中
|
||||
*/
|
||||
fun isShuttleDriverPerformTask(): Boolean
|
||||
|
||||
|
||||
/**
|
||||
* taxi无人化 是否在执行任务中(无人化模式和算路验证模式 都复用此变量)
|
||||
*/
|
||||
|
||||
@@ -30,4 +30,9 @@ interface ISopSettingListener {
|
||||
*/
|
||||
fun onCarApertureClickEvent(status: Boolean){}
|
||||
|
||||
/**
|
||||
* 验证算路模式
|
||||
*/
|
||||
fun onRoutingClickEvent(status: Boolean){}
|
||||
|
||||
}
|
||||
@@ -299,6 +299,13 @@ object CallerHmiManager {
|
||||
hmiProviderApi?.hideTurnLightView()
|
||||
}
|
||||
|
||||
/**
|
||||
* taxi无人化司机端 是否在执行任务中(无人化模式和算路验证模式 都复用此变量)
|
||||
*/
|
||||
fun isShuttleDriverPerformTask(): Boolean {
|
||||
return hmiProviderApi?.isShuttleDriverPerformTask() ?: false
|
||||
}
|
||||
|
||||
/**
|
||||
* taxi无人化司机端 是否在执行任务中(无人化模式和算路验证模式 都复用此变量)
|
||||
*/
|
||||
|
||||
@@ -55,4 +55,11 @@ object CallerSopSettingManager: CallerBase<ISopSettingListener>() {
|
||||
}
|
||||
}
|
||||
|
||||
fun invokeRoutingListener(status: Boolean){
|
||||
M_LISTENERS.forEach {
|
||||
val listener = it.value
|
||||
listener.onRoutingClickEvent(status)
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user