yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[6.6.2] fix ui bug

Browse Source
This commit is contained in:
EmArrow
2024-09-13 23:49:30 +08:00
parent f0a5adac29
commit ec6b4d6798
4 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt
View File

@@ -138,7 +138,7 @@ class MoGoAdasMsgConnectStatusListenerImpl :
//每次工控机连接成功后，需同步当前设置的雨天模式状态
CallerAutoPilotControlManager.setRainMode(FunctionBuildConfig.isRainMode)
// 6.6.2 版本默认开启
CallerAutoPilotControlManager.sendFusionMode(FunctionBuildConfig.fusionMode)
CallerAutoPilotControlManager.sendFusionMode(1)
connectToast("域控已连接")
}

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

@@ -69,6 +69,7 @@ import com.mogo.eagle.core.function.api.datacenter.obu.IMoGoObuInfoListener
import com.mogo.eagle.core.function.api.devatools.IMoGoDevaToolsFuncConfigListener
import com.mogo.eagle.core.function.api.devatools.IMoGoDevaToolsListener
import com.mogo.eagle.core.function.api.hmi.view.IViewControlListener
import com.mogo.eagle.core.function.api.hmi.view.IViewControlListener.Companion.FUNC_FUSION_COLOR
import com.mogo.eagle.core.function.api.hmi.view.IViewControlListener.Companion.FUNC_MODE_DEMO
import com.mogo.eagle.core.function.api.hmi.view.IViewControlListener.Companion.FUNC_MODE_RAIN
import com.mogo.eagle.core.function.api.setting.ISopSettingListener
@@ -453,6 +454,8 @@ internal class DebugSettingView @JvmOverloads constructor(
//雨天、美化、点云设置同步
CallerSopSettingManager.addListener(TAG, this)
CallerHmiViewControlListenerManager.addListener(TAG, this)
//添加 业务配置监听
CallerDevaToolsFuncConfigListenerManager.registerDevaToolsFuncConfigListener(
FuncBizConfig.FOUNDATION, TAG, true, this
@@ -495,6 +498,7 @@ internal class DebugSettingView @JvmOverloads constructor(
//雨天、美化、点云设置同步
CallerSopSettingManager.removeListener(TAG)
CallerHmiViewControlListenerManager.removeListener(TAG)
// 移除 业务配置监听
CallerDevaToolsFuncConfigListenerManager.unRegisterDevaToolsFuncConfigListener(
@@ -2668,7 +2672,10 @@ internal class DebugSettingView @JvmOverloads constructor(
tbIsDemoMode.isChecked = FunctionBuildConfig.isDemoMode
}
if (tag == FUNC_MODE_RAIN) {
tbIsDemoMode.isChecked = FunctionBuildConfig.isRainMode
tbIsRainMode.isChecked = FunctionBuildConfig.isRainMode
}
if(tag == FUNC_FUSION_COLOR){
btnDrawFusion.isChecked = FunctionBuildConfig.isFusionColor
}
}

8
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt
View File

@@ -15,6 +15,7 @@ import com.mogo.eagle.core.function.api.autopilot.IMoGoGetParamResponseListener
import com.mogo.eagle.core.function.api.devatools.IMoGoDevaToolsFuncConfigListener
import com.mogo.eagle.core.function.api.devatools.mofang.IMoGoMoFangProvider
import com.mogo.eagle.core.function.api.hmi.view.IViewControlListener
import com.mogo.eagle.core.function.api.hmi.view.IViewControlListener.Companion.FUNC_FUSION_COLOR
import com.mogo.eagle.core.function.api.hmi.view.IViewControlListener.Companion.FUNC_MODE_DEMO
import com.mogo.eagle.core.function.api.hmi.view.IViewControlListener.Companion.FUNC_MODE_RAIN
import com.mogo.eagle.core.function.api.setting.ISopSettingListener
@@ -250,7 +251,9 @@ internal class SOPSettingView @JvmOverloads constructor(
if (isChecked) {
//V2I场景进PNC
scV2iPnc.isChecked = FunctionBuildConfig.v2iToPNC
FunctionBuildConfig.isFusionColor = true //6.6.2版本基于运营需求-产品设计-开启v2i进pnc,开启感知目标颜色替换
if(FunctionBuildConfig.isV2IPnc){
FunctionBuildConfig.isFusionColor = true //6.6.2版本基于运营需求-产品设计-开启v2i进pnc,开启感知目标颜色替换
}
hmiAction("SOP V2I场景进PNC, ", FunctionBuildConfig.v2iToPNC)
CallerAutoPilotControlManager.sendV2iToPncCmd(FunctionBuildConfig.v2iToPNC)
//闯红灯预警
@@ -347,6 +350,8 @@ internal class SOPSettingView @JvmOverloads constructor(
}
clickEventAnalytics("V2I场景进PNC",isChecked)
hmiAction("SOP V2I场景进PNC, ", isChecked)
FunctionBuildConfig.isFusionColor = isChecked //6.6.2版本基于运营需求-产品设计-v2i进pnc,感知目标颜色替换
CallerHmiViewControlListenerManager.invokeFuncMode(FUNC_FUSION_COLOR,isChecked)
CallerAutoPilotControlManager.sendV2iToPncCmd(isChecked)
FunctionBuildConfig.v2iToPNC = isChecked
}
@@ -602,6 +607,7 @@ internal class SOPSettingView @JvmOverloads constructor(
clickEventAnalytics("考试功能面板",isChecked)
}
CallerAutoPilotControlManager.sendFusionMode(1)
//融合模式
rgFusionMode.setOnCheckedChangeListener { _, p1 ->
when (p1) {

1
core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/hmi/view/IViewControlListener.kt
View File

@@ -10,6 +10,7 @@ interface IViewControlListener {
const val V2X_EVENT_TAG = "V2X_EVENT_TAG"
const val FUNC_MODE_DEMO = "demoMode"
const val FUNC_MODE_RAIN = "rainMode"
const val FUNC_FUSION_COLOR = "fusionColor"
}
/** --------- View --------- **/