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 a3a612b656..e85c990676 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
@@ -103,28 +103,24 @@ class SOPSettingView @JvmOverloads constructor(
* 限速数据来源开关
*/
tbRoadLimitSpeedSop.setOnCheckedChangeListener { _, isChecked ->
- //默认开启
+ //默认关闭
HmiBuildConfig.isShowObuLimitSpeedView = isChecked
}
/**
* obu V2V开关
*/
- tbObuV2vView.isChecked = HmiBuildConfig.isShowObuV2vView
tbObuV2vView.setOnCheckedChangeListener { _, isChecked ->
- //默认开启
+ //默认关闭
HmiBuildConfig.isShowObuV2vView = isChecked
-// Log.e("liyz", "---2222-- v2v = ${HmiBuildConfig.isShowObuV2vView}")
}
/**
* obu V2i开关
*/
- tbObuV2iView.isChecked = HmiBuildConfig.isShowObuV2iView
tbObuV2iView.setOnCheckedChangeListener { _, isChecked ->
//默认关闭
HmiBuildConfig.isShowObuV2iView = isChecked
-// Log.d("liyz", "---2--- v2i = ${HmiBuildConfig.isShowObuV2iView}")
}
/**
@@ -161,7 +157,10 @@ class SOPSettingView @JvmOverloads constructor(
// 演示模式,上一次勾选的数据
tbDemoMode.isChecked = FunctionBuildConfig.isDemoMode
// 演示模式
- tbDemoMode.setOnCheckedChangeListener { _, _ ->
+ tbDemoMode.setOnCheckedChangeListener { compoundButton, _ ->
+ if(!compoundButton.isPressed){
+ return@setOnCheckedChangeListener
+ }
FunctionBuildConfig.isDemoMode = !FunctionBuildConfig.isDemoMode
CallerHmiManager.updateStatusBarLeftView(FunctionBuildConfig.isDemoMode, "demoMode", DemoModeView(context))
CallerAutoPilotManager.setDemoMode(FunctionBuildConfig.isDemoMode)
@@ -179,7 +178,10 @@ class SOPSettingView @JvmOverloads constructor(
// 雨天模式,上一次勾选的数据
tbRainMode.isChecked = FunctionBuildConfig.isRainMode
//雨天模式
- tbRainMode.setOnCheckedChangeListener { _, isChecked ->
+ tbRainMode.setOnCheckedChangeListener { compoundButton, isChecked ->
+ if(!compoundButton.isPressed){
+ return@setOnCheckedChangeListener
+ }
CallerAutoPilotManager.setRainMode(isChecked)
FunctionBuildConfig.isRainMode = isChecked
}
@@ -191,8 +193,12 @@ class SOPSettingView @JvmOverloads constructor(
//OBU控制总开关
tbObu.isChecked = CallerOBUManager.isConnected()
tbObu.setOnCheckedChangeListener { _, isChecked ->
- if (isChecked) {
- CallerOBUManager.resetObuIpAddress("192.168.1.199")
+ if (!isChecked) {
+ if (AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode)) {
+ CallerOBUManager.resetObuIpAddress("192.168.1.199")
+ } else if (AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)) {
+ CallerOBUManager.resetObuIpAddress("192.168.1.199")
+ }
} else {
//断开链接
CallerOBUManager.disConnectObu()
@@ -268,11 +274,8 @@ class SOPSettingView @JvmOverloads constructor(
private val timerTaskRefresh = object : TimerTask(){
override fun run() {
UiThreadHandler.post{
- if(FunctionBuildConfig.isDemoMode){
- tbDemoMode.text = "关闭美化模式"
- }else{
- tbDemoMode.text = "开启美化模式"
- }
+ tbDemoMode.isChecked = FunctionBuildConfig.isDemoMode
+ tbRainMode.isChecked = FunctionBuildConfig.isRainMode
}
}
@@ -282,39 +285,27 @@ class SOPSettingView @JvmOverloads constructor(
when (type) {
FuncBizConfig.BIZ_BEAUTY_MODE -> {
tbDemoMode.isClickable = !lock
- val (left,top,right,bottom) = tbDemoMode.currentPadding()
- if (lock) {
- tbDemoMode.background =
- resources.getDrawable(R.drawable.radio_button_lock_background)
- } else {
- tbDemoMode.background =
- resources.getDrawable(R.drawable.radio_button_normal_background_right)
+ if(lock){
+ tbDemoMode.visibility = View.INVISIBLE
+ }else{
+ tbDemoMode.visibility = View.VISIBLE
}
- tbDemoMode.setPadding(left,top,right,bottom)
}
FuncBizConfig.BIZ_RAIN_MODE -> {
tbRainMode.isClickable = !lock
- val (left,top,right,bottom) = tbRainMode.currentPadding()
if (lock) {
- tbRainMode.background =
- resources.getDrawable(R.drawable.radio_button_lock_background)
+ tbRainMode.visibility = View.INVISIBLE
} else {
- tbRainMode.background =
- resources.getDrawable(R.drawable.radio_button_normal_background_right)
+ tbRainMode.visibility = View.VISIBLE
}
- tbRainMode.setPadding(left,top,right,bottom)
}
FuncBizConfig.BIZ_PNC_WARNING -> {
tbMarkingObstacles.isClickable = !lock
- val (left,top,right,bottom) = tbMarkingObstacles.currentPadding()
if (lock) {
- tbMarkingObstacles.background =
- resources.getDrawable(R.drawable.radio_button_lock_background)
+ tbMarkingObstacles.visibility = View.INVISIBLE
} else {
- tbMarkingObstacles.background =
- resources.getDrawable(R.drawable.radio_button_normal_background_right)
+ tbMarkingObstacles.visibility = View.VISIBLE
}
- tbMarkingObstacles.setPadding(left,top,right,bottom)
}
}
}
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 d6720d62b6..53f1efd8ba 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
@@ -16,205 +16,231 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
+
+
-
+
-
+
-
+
-
+
-
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
+ android:text="V2I事件"
+ android:paddingTop="25dp"
+ android:paddingBottom="25dp"
+ android:scaleY="1.2"
+ android:scaleX="1.2"
+ app:layout_constraintTop_toBottomOf="@id/tbRainMode"
+ app:layout_constraintLeft_toRightOf="@id/verticalGuideLine"
+ app:layout_constraintRight_toRightOf="parent"
+ />
+
+
+
+
+
+
+
+
+
+
@@ -278,16 +304,6 @@
android:layout_marginStart="10dp"
/>
-
-