diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/funcconfig/FuncConfigConst.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/funcconfig/FuncConfigConst.kt index b7a6c6728f..09fb1766d2 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/funcconfig/FuncConfigConst.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/funcconfig/FuncConfigConst.kt @@ -81,7 +81,7 @@ class FuncConfigConst { val foundationSubList = mutableListOf() foundationSubList.add(SubBiz(BIZ_BEAUTY_MODE, lock = false, state = false, dependNode = "", data = "")) foundationSubList.add(SubBiz(BIZ_RAIN_MODE, lock = false, state = false, dependNode = "", data = "")) - foundationSubList.add(SubBiz(BIZ_FULL_LOG, lock = false, state = false, dependNode = "", data = "")) + foundationSubList.add(SubBiz(BIZ_FULL_LOG, lock = false, state = true, dependNode = "", data = "")) foundationSubList.add(SubBiz(BIZ_TRACE_LOG, lock = false, state = true, dependNode = "", data = "")) foundationSubList.add(SubBiz(BIZ_BAG_RECORD, lock = false, state = true, dependNode = "", data = "")) foundationSubList.add(SubBiz(BIZ_WARNING_UPLOAD, lock = false, state = true, dependNode = "", data = "")) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt index 9a1a722122..c5d8aae365 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt @@ -1857,28 +1857,48 @@ class DebugSettingView @JvmOverloads constructor( override fun updateBizData(type: String, state: Boolean, lock: Boolean, data: String?) { when (type) { - BIZ_BEAUTY_MODE -> tbIsDemoMode.isClickable = !lock - BIZ_RAIN_MODE -> tbIsRainMode.isClickable = !lock - BIZ_WARNING_UPLOAD -> tbReportWarning.isClickable = !lock + BIZ_BEAUTY_MODE -> { + tbIsDemoMode.isClickable = !lock + if(lock){ + tbIsDemoMode.background = resources.getDrawable(R.drawable.radio_button_lock_background) + }else{ + tbIsDemoMode.background = resources.getDrawable(R.drawable.radio_button_normal_background_right) + } + } + BIZ_RAIN_MODE -> { + tbIsRainMode.isClickable = !lock + if(lock){ + tbIsRainMode.background = resources.getDrawable(R.drawable.radio_button_lock_background) + }else{ + tbIsRainMode.background = resources.getDrawable(R.drawable.radio_button_normal_background_right) + } + } + BIZ_WARNING_UPLOAD -> { + tbReportWarning.isClickable = !lock + if(lock){ + tbReportWarning.background = resources.getDrawable(R.drawable.radio_button_lock_background) + }else{ + tbReportWarning.background = resources.getDrawable(R.drawable.radio_button_normal_background_right) + } + } BIZ_BAG_RECORD -> { if (lock) { btnRecordBag.isClickable = false + btnRecordBag.background = resources.getDrawable(R.drawable.radio_button_lock_background) } else { btnRecordBag.isClickable = true btnRecordBag.requestFocus() + btnRecordBag.background = resources.getDrawable(R.drawable.radio_button_normal_background_right) } } BIZ_FULL_LOG -> { - if(state){ - tbLogCatch.visibility = View.VISIBLE - }else{ - tbLogCatch.visibility = View.GONE - } if (lock) { tbLogCatch.isClickable = false + tbLogCatch.background = resources.getDrawable(R.drawable.radio_button_lock_background) } else { tbLogCatch.isClickable = true tbLogCatch.requestFocus() + tbLogCatch.background = resources.getDrawable(R.drawable.radio_button_normal_background_right) } } } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/radio_button_lock_background.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/radio_button_lock_background.xml new file mode 100644 index 0000000000..db91c70905 --- /dev/null +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/radio_button_lock_background.xml @@ -0,0 +1,15 @@ + + + + + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml index 063ec5f432..dd2c4e65ea 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml @@ -46,12 +46,12 @@ style="@style/DebugSettingText" android:layout_width="0dp" android:layout_height="0dp" + android:gravity="center_vertical" app:layout_constraintBottom_toBottomOf="@id/tbReportMore" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@id/tbReportMore" app:layout_constraintTop_toBottomOf="@id/vReportLine" - app:layout_constraintTop_toTopOf="@id/tbReportMore" - android:gravity="center_vertical"/> + app:layout_constraintTop_toTopOf="@id/tbReportMore" /> + android:layout_height="wrap_content" /> + android:layout_height="wrap_content" /> + android:layout_height="wrap_content" /> + android:layout_height="wrap_content" /> + android:minLines="7" /> + android:textSize="@dimen/dp_24" /> + android:textSize="@dimen/dp_24" /> + android:textSize="@dimen/dp_24" /> @@ -273,10 +269,9 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="@dimen/dp_10" - android:text="重启IPC节点" - android:textSize="@dimen/dp_24" android:background="@drawable/radio_button_normal_background_right" - /> + android:text="重启IPC节点" + android:textSize="@dimen/dp_24" /> + android:textSize="14sp" /> - + android:text="复制" + android:textColor="#0000FF" + android:textSize="14sp" /> @@ -624,13 +616,12 @@ + android:visibility="gone" /> + app:layout_constraintTop_toBottomOf="@id/tvIpcInfo" />