From d0241c0a97cd662aa33c1afcc0eb1160e691f0d8 Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Mon, 18 Sep 2023 16:07:33 +0800 Subject: [PATCH] =?UTF-8?q?[6.1.0]=E8=BF=90=E8=90=A5=E9=9D=A2=E6=9D=BF?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../function/hmi/ui/setting/SOPSettingView.kt | 61 ++++++++++++++++--- .../src/main/res/layout/view_sop_setting.xml | 4 +- 2 files changed, 56 insertions(+), 9 deletions(-) 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 757da05d56..99a7a4e955 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 @@ -81,33 +81,45 @@ internal class SOPSettingView @JvmOverloads constructor( scV2XSwitch.isChecked = FunctionBuildConfig.v2xMainSwitch scV2XSwitch.setOnCheckedChangeListener { _, isChecked -> FunctionBuildConfig.v2xMainSwitch = isChecked + hmiAction("SOP V2X总开关, ",isChecked) + Log.i(TAG,"SOP V2X总开关,$isChecked") if(isChecked){ //V2N总开关 scV2NSwitch.isChecked = FunctionBuildConfig.v2nMainSwitch hmiAction("SOP V2N总开关, ",FunctionBuildConfig.v2nMainSwitch) + Log.i(TAG,"SOP V2N总开关, ${FunctionBuildConfig.v2nMainSwitch}") //V2I总开关 scV2ISwitch.isChecked = HmiBuildConfig.isShowObuV2iView hmiAction("SOP V2I总开关, ",HmiBuildConfig.isShowObuV2iView) + Log.i(TAG,"SOP V2I总开关, ${HmiBuildConfig.isShowObuV2iView}") //V2V总开关 scObuV2vView.isChecked = HmiBuildConfig.isShowObuV2vView hmiAction("SOP V2V总开关, ",HmiBuildConfig.isShowObuV2vView) + Log.i(TAG,"SOP V2V总开关, ${HmiBuildConfig.isShowObuV2vView}") //obu总开关 scObu.isChecked = obuConnectStatus hmiAction("SOP obu总开关, ",obuConnectStatus) + Log.i(TAG,"SOP obu总开关, $obuConnectStatus") if(obuConnectStatus){ CallerObuApiManager.resetObuIpAddress(MogoObuConst.OBU_DEFAULT_IP) } }else{ //V2N总开关 scV2NSwitch.isChecked = false + hmiAction("SOP V2N总开关, ",false) + Log.i(TAG,"SOP V2N总开关, false") //V2I总开关 scV2ISwitch.isChecked = false + hmiAction("SOP V2I总开关, ",false) + Log.i(TAG,"SOP V2I总开关, false") //V2V总开关 scObuV2vView.isChecked = false - hmiAction("SOP obuV2V开关, ",false) + hmiAction("SOP V2V总开关, ",false) + Log.i(TAG,"SOP V2V总开关, false") //obu总开关 scObu.isChecked = false hmiAction("SOP OBU控制总开关, ",false) + Log.i(TAG,"SOP OBU控制总开关, false") //断开链接 CallerObuApiManager.disConnectObu() } @@ -131,25 +143,31 @@ internal class SOPSettingView @JvmOverloads constructor( //V2N新链路 scNewV2NData.isChecked = FunctionBuildConfig.isNewV2NData hmiAction("SOP 是否是V2N新链路(云->工控机->App)",FunctionBuildConfig.isNewV2NData) + Log.i(TAG,"SOP 是否是V2N新链路(云->工控机->App), ${FunctionBuildConfig.isNewV2NData}") //V2N场景进PNC scV2nPnc.isChecked = FunctionBuildConfig.isV2NPnc hmiAction("SOP V2N场景进PNC, ",FunctionBuildConfig.isV2NPnc) + Log.i(TAG,"SOP V2N场景进PNC, ${FunctionBuildConfig.isV2NPnc}") CallerAutoPilotControlManager.sendV2nToPncCmd(FunctionBuildConfig.isV2NPnc) //绿波通行 scGreenWaveSop.isChecked = HmiBuildConfig.isShowGreenWaveView hmiAction("SOP obu绿波通行, ",HmiBuildConfig.isShowGreenWaveView) + Log.i(TAG,"SOP obu绿波通行, ${HmiBuildConfig.isShowGreenWaveView}") CallerTelematicManager.sendMsgToAllClients(TelematicConstant.OBU_GREENWAVE_WARNING, "1".toByteArray()) }else{ //V2N新链路 scNewV2NData.isChecked = false hmiAction("SOP 是否是V2N新链路(云->工控机->App)",false) + Log.i(TAG,"SOP 是否是V2N新链路(云->工控机->App), false") //V2N场景进PNC scV2nPnc.isChecked = false hmiAction("SOP V2N场景进PNC, ",false) + Log.i(TAG,"SOP V2N场景进PNC, false") CallerAutoPilotControlManager.sendV2nToPncCmd(false) //绿波通行 scGreenWaveSop.isChecked = false hmiAction("SOP obu绿波通行, ",false) + Log.i(TAG,"SOP obu绿波通行, false") CallerTelematicManager.sendMsgToAllClients(TelematicConstant.OBU_GREENWAVE_WARNING, "0".toByteArray()) } scNewV2NData.isEnabled = isChecked @@ -172,28 +190,32 @@ internal class SOPSettingView @JvmOverloads constructor( //V2I场景进PNC scV2iPnc.isChecked = FunctionBuildConfig.isV2IPnc hmiAction("SOP V2I场景进PNC, ",FunctionBuildConfig.isV2IPnc) + Log.i(TAG,"SOP V2I场景进PNC,${FunctionBuildConfig.isV2IPnc}") CallerAutoPilotControlManager.sendV2iToPncCmd(FunctionBuildConfig.isV2IPnc) //闯红灯预警 scRunRedLightSop.isChecked = HmiBuildConfig.isShowRunRedLightView hmiAction("SOP obu闯红灯预警, ",HmiBuildConfig.isShowRunRedLightView) + Log.i(TAG,"SOP obu闯红灯预警, ${HmiBuildConfig.isShowRunRedLightView}") CallerTelematicManager.sendMsgToAllClients(TelematicConstant.OBU_RUNREDLIGHT_WARNING, "1".toByteArray()) //路侧弱势交通参与者 scObuWeaknessTrafficSop.isChecked = HmiBuildConfig.isShowObuWeaknessTrafficView hmiAction("SOP obu弱势交通控制, ",HmiBuildConfig.isShowObuWeaknessTrafficView) + Log.i(TAG,"SOP obu弱势交通控制, ${HmiBuildConfig.isShowObuWeaknessTrafficView}") }else{ //V2I场景进PNC scV2iPnc.isChecked = false CallerAutoPilotControlManager.sendV2iToPncCmd(false) hmiAction("SOP V2I场景进PNC, ",false) + Log.i(TAG,"SOP V2I场景进PNC, false") //闯红灯预警 scRunRedLightSop.isChecked = false hmiAction("SOP obu闯红灯预警, ",false) + Log.i(TAG,"SOP obu闯红灯预警, false") CallerTelematicManager.sendMsgToAllClients(TelematicConstant.OBU_RUNREDLIGHT_WARNING, "0".toByteArray()) - //路侧弱势交通参与者 scObuWeaknessTrafficSop.isChecked = false - hmiAction("SOP obu弱势交通控制, ",false) + Log.i(TAG,"SOP obu弱势交通控制, false") } scV2iPnc.isEnabled = isChecked scRunRedLightSop.isEnabled = isChecked @@ -211,6 +233,7 @@ internal class SOPSettingView @JvmOverloads constructor( return@setOnCheckedChangeListener } hmiAction("SOP 是否是V2N新链路(云->工控机->App)",isChecked) + Log.i(TAG,"SOP 是否是V2N新链路(云->工控机->App) ${isChecked}") FunctionBuildConfig.isNewV2NData = isChecked } @@ -221,6 +244,7 @@ internal class SOPSettingView @JvmOverloads constructor( return@setOnCheckedChangeListener } hmiAction("SOP V2N场景进PNC, ",isChecked) + Log.i(TAG,"SOP V2N场景进PNC, $isChecked") CallerAutoPilotControlManager.sendV2nToPncCmd(isChecked) FunctionBuildConfig.isV2NPnc = isChecked } @@ -232,6 +256,7 @@ internal class SOPSettingView @JvmOverloads constructor( return@setOnCheckedChangeListener } hmiAction("SOP obu绿波通行, ",isChecked) + Log.i(TAG,"SOP obu绿波通行, $isChecked") HmiBuildConfig.isShowGreenWaveView = isChecked if (HmiBuildConfig.isShowGreenWaveView) { CallerTelematicManager.sendMsgToAllClients(TelematicConstant.OBU_GREENWAVE_WARNING, "1".toByteArray()) @@ -247,6 +272,7 @@ internal class SOPSettingView @JvmOverloads constructor( return@setOnCheckedChangeListener } hmiAction("SOP V2I场景进PNC, ",isChecked) + Log.i(TAG,"SOP V2I场景进PNC, $isChecked") CallerAutoPilotControlManager.sendV2iToPncCmd(isChecked) FunctionBuildConfig.isV2IPnc = isChecked } @@ -258,6 +284,7 @@ internal class SOPSettingView @JvmOverloads constructor( return@setOnCheckedChangeListener } hmiAction("SOP obu闯红灯预警, ",isChecked) + Log.i(TAG,"SOP obu闯红灯预警, $isChecked") HmiBuildConfig.isShowRunRedLightView = isChecked if (HmiBuildConfig.isShowRunRedLightView) { CallerTelematicManager.sendMsgToAllClients(TelematicConstant.OBU_RUNREDLIGHT_WARNING, "1".toByteArray()) @@ -273,6 +300,7 @@ internal class SOPSettingView @JvmOverloads constructor( return@setOnCheckedChangeListener } hmiAction("SOP obu弱势交通控制, ",isChecked) + Log.i(TAG,"SOP obu弱势交通控制, $isChecked") HmiBuildConfig.isShowObuWeaknessTrafficView = isChecked } @@ -283,6 +311,7 @@ internal class SOPSettingView @JvmOverloads constructor( return@setOnCheckedChangeListener } hmiAction("SOP obuV2V开关, ",isChecked) + Log.i(TAG,"SOP obuV2V开关, $isChecked") HmiBuildConfig.isShowObuV2vView = isChecked } @@ -294,6 +323,7 @@ internal class SOPSettingView @JvmOverloads constructor( return@setOnCheckedChangeListener } hmiAction("SOP OBU控制总开关, ",isChecked) + Log.i(TAG,"SOP OBU控制总开关, $isChecked") if (isChecked) { CallerObuApiManager.resetObuIpAddress(MogoObuConst.OBU_DEFAULT_IP) } else { @@ -311,7 +341,8 @@ internal class SOPSettingView @JvmOverloads constructor( //危险障碍物颜色标记开关 scMarkingObstacles.isChecked = FunctionBuildConfig.isPNCWarning scMarkingObstacles.setOnCheckedChangeListener { _, isChecked -> - hmiAction("SOP 危险障碍物颜色标记开关",isChecked) + hmiAction("SOP 危险障碍物颜色标记开关, ",isChecked) + Log.i(TAG,"SOP 危险障碍物颜色标记开关, $isChecked") FunctionBuildConfig.isPNCWarning = isChecked } if (AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)) { @@ -321,7 +352,8 @@ internal class SOPSettingView @JvmOverloads constructor( //引导线动态效果 scRouteDynamicEffect.isChecked = HmiBuildConfig.isShowRouteStrategy scRouteDynamicEffect.setOnCheckedChangeListener { _, isChecked -> - hmiAction("SOP 引导线动态效果",isChecked) + hmiAction("SOP 引导线动态效果, ",isChecked) + Log.i(TAG,"SOP 引导线动态效果, $isChecked") HmiBuildConfig.isShowRouteStrategy = isChecked } @@ -333,6 +365,8 @@ internal class SOPSettingView @JvmOverloads constructor( CallerAutoPilotControlManager.setIsDrawPointCloud(isChecked) FunctionBuildConfig.isDrawPointCloudData = isChecked CallerMapUIServiceManager.getMapUIController()?.setIsDrawPointCloud(isChecked) + hmiAction("SOP 是否渲染点云数据, ",isChecked) + Log.i(TAG,"SOP 是否渲染点云数据, $isChecked") } //自车光圈 @@ -340,6 +374,8 @@ internal class SOPSettingView @JvmOverloads constructor( scCarAperture.setOnCheckedChangeListener { _, isChecked -> CallerMapUIServiceManager.getMapUIController()?.setDisplayAnimEnable(isChecked) FunctionBuildConfig.isDisplayAnimEnable = isChecked + hmiAction("SOP 是否展示自车光圈，",isChecked) + Log.i(TAG,"SOP 是否展示自车光圈，$isChecked") } } @@ -350,7 +386,8 @@ internal class SOPSettingView @JvmOverloads constructor( //绕障类功能 scObstacleAvoidance.isChecked = FunctionBuildConfig.isDetouring scObstacleAvoidance.setOnCheckedChangeListener { _, isChecked -> - hmiAction("SOP 绕障类功能开关",isChecked) + hmiAction("SOP 绕障类功能开关, ",isChecked) + Log.i(TAG,"SOP 绕障类功能开关, $isChecked") CallerAutoPilotControlManager.sendDetouring(isChecked) FunctionBuildConfig.isDetouring = isChecked } @@ -362,6 +399,7 @@ internal class SOPSettingView @JvmOverloads constructor( return@setOnCheckedChangeListener } hmiAction("SOP 演示模式开关, ",!FunctionBuildConfig.isDemoMode) + Log.i(TAG,"SOP 演示模式开关, ${!FunctionBuildConfig.isDemoMode}") FunctionBuildConfig.isDemoMode = !FunctionBuildConfig.isDemoMode CallerAutoPilotControlManager.setDemoMode(FunctionBuildConfig.isDemoMode) CallerHmiViewControlListenerManager.invokeFuncMode(FUNC_MODE_DEMO, FunctionBuildConfig.isDemoMode) @@ -382,13 +420,14 @@ internal class SOPSettingView @JvmOverloads constructor( return@setOnCheckedChangeListener } hmiAction("SOP 雨天模式开关, ",isChecked) + Log.i(TAG,"SOP 雨天模式开关, $isChecked") FunctionBuildConfig.isRainMode = isChecked CallerAutoPilotControlManager.setRainMode(isChecked) CallerHmiViewControlListenerManager.invokeFuncMode(FUNC_MODE_RAIN, isChecked) } //雨天模式按钮只在司机屏生效，乘客屏不显示 if (AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) { - scRainMode.visibility = View.GONE + scRainMode.isEnabled = false } //弱网减速停车 @@ -397,6 +436,7 @@ internal class SOPSettingView @JvmOverloads constructor( FunctionBuildConfig.isWeakNetSlowDown = isChecked CallerAutoPilotControlManager.sendWeakNetSlowDown(isChecked) hmiAction("SOP 弱网减速停车, ",isChecked) + Log.i(TAG,"SOP 弱网减速停车, $isChecked") } //故障减速停车 @@ -405,6 +445,7 @@ internal class SOPSettingView @JvmOverloads constructor( FunctionBuildConfig.isFaultSlowDown = isChecked CallerAutoPilotControlManager.sendBreakdownSlowDown(isChecked) hmiAction("SOP 故障减速停车, ",isChecked) + Log.i(TAG,"SOP 故障减速停车, $isChecked") } //融合模式 rgFusionMode.setOnCheckedChangeListener { _, p1 -> @@ -430,6 +471,8 @@ internal class SOPSettingView @JvmOverloads constructor( FunctionBuildConfig.fusionMode = 5 } } + hmiAction("SOP 融合模式, ",FunctionBuildConfig.fusionMode) + Log.i(TAG,"SOP 融合模式, ${FunctionBuildConfig.fusionMode}") CallerAutoPilotControlManager.sendFusionMode(FunctionBuildConfig.fusionMode) } } @@ -442,6 +485,7 @@ internal class SOPSettingView @JvmOverloads constructor( scTrafficLight.isChecked = !HmiBuildConfig.isShowTrafficLightView scTrafficLight.setOnCheckedChangeListener { _, isChecked -> hmiAction("SOP 红绿灯标识开关, ",isChecked) + Log.i(TAG,"SOP 红绿灯标识开关, $isChecked") if (isChecked) { CallerHmiManager.showTrafficLightView() } else { @@ -453,6 +497,7 @@ internal class SOPSettingView @JvmOverloads constructor( scSpeedLimit.isChecked = HmiBuildConfig.isShowLimitingVelocityView scSpeedLimit.setOnCheckedChangeListener { _, isChecked -> hmiAction("SOP 限速标识开关, ",isChecked) + Log.i(TAG,"SOP 限速标识开关, $isChecked") if (isChecked) { HmiBuildConfig.isShowLimitingVelocityView = true CallerHmiViewControlListenerManager.invokeVisible(IViewControlListener.LimitingVelocityView_TAG,View.VISIBLE) @@ -466,6 +511,7 @@ internal class SOPSettingView @JvmOverloads constructor( scIPCReport.isChecked = FunctionBuildConfig.isReportWarning scIPCReport.setOnCheckedChangeListener { _, isChecked -> hmiAction("SOP 是否开启异常上报, ",isChecked) + Log.i(TAG,"SOP 是否开启异常上报, $isChecked") FunctionBuildConfig.isReportWarning = isChecked } @@ -491,6 +537,7 @@ internal class SOPSettingView @JvmOverloads constructor( scShowBagRecordWindow.setOnCheckedChangeListener{_, isChecked -> FunctionBuildConfig.isShowBagRecordWindow = isChecked hmiAction("SOP 是否展示被动触发的录包弹窗, ",isChecked) + Log.i(TAG,"SOP 是否展示被动触发的录包弹窗, $isChecked") } //变道绕障的目标障碍物速度阈值 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 3550ce2a70..5121d303f6 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 @@ -184,7 +184,7 @@ android:id="@+id/scObu" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="obu总开关" + android:text="OBU总开关" android:textSize="@dimen/sp_28" android:scaleX="1.2" android:scaleY="1.2" @@ -425,7 +425,7 @@ app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/scFaultSlowDown" - android:layout_marginStart="@dimen/dp_30" + android:layout_marginStart="@dimen/dp_40" android:layout_marginTop="@dimen/dp_10" >