diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/MoGoAutopilotControlProvider.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/MoGoAutopilotControlProvider.kt index 6d1e589274..b2b2029787 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/MoGoAutopilotControlProvider.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/MoGoAutopilotControlProvider.kt @@ -649,6 +649,14 @@ class MoGoAutopilotControlProvider : return AdasManager.getInstance().sendBagManagerCmd(bagManager.build()) } + /** + * 控制V2N数据给车端PnC + * @param switchCmd true为发给PnC,false为不发给PnC + */ + override fun sendV2nToPncCmd(switchCmd: Boolean) { + AdasManager.getInstance().sendV2nToPncCmd(switchCmd) + } + /** * 向左变道 */ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt index a181ddf9ed..2572fe8dfe 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt @@ -87,6 +87,18 @@ internal class SOPSettingView @JvmOverloads constructor( HmiBuildConfig.isShowCloudWeaknessTrafficView = isChecked } + /** + * V2N场景进PNC + */ + tbV2nPnc.isChecked = FunctionBuildConfig.isV2NPnc + tbV2nPnc.setOnCheckedChangeListener{ compoundButton, isChecked -> + if(!compoundButton.isPressed){ + return@setOnCheckedChangeListener + } + CallerAutoPilotControlManager.sendV2nToPncCmd(isChecked) + FunctionBuildConfig.isV2NPnc = isChecked + } + /** * obu V2V开关,默认打开 */ @@ -239,29 +251,12 @@ internal class SOPSettingView @JvmOverloads constructor( CallerDevaToolsFuncConfigListenerManager.registerDevaToolsFuncConfigListener( FuncBizConfig.FOUNDATION, TAG, true, this ) - // 开启定时查询速度 - Timer().schedule(timerTaskRefresh, Date(), 500) } override fun onDetachedFromWindow() { super.onDetachedFromWindow() // 移除 业务配置监听 CallerDevaToolsFuncConfigListenerManager.unRegisterDevaToolsFuncConfigListener(FuncBizConfig.FOUNDATION, TAG) - try { - timerTaskRefresh.cancel() - } catch (e: Exception) { - e.printStackTrace() - } - } - - private val timerTaskRefresh = object : TimerTask(){ - override fun run() { - UiThreadHandler.post{ - tbDemoMode.isChecked = FunctionBuildConfig.isDemoMode - tbRainMode.isChecked = FunctionBuildConfig.isRainMode - } - } - } override fun updateBizView(type: String, lock: Boolean) { diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_sop_setting.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_sop_setting.xml index 79e9b2dd26..61553163b8 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_sop_setting.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_sop_setting.xml @@ -233,6 +233,20 @@ app:layout_constraintLeft_toLeftOf="parent" /> + +