From cd29f4075da57660e71dfcef8bbc3cbd47c48eba Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Wed, 13 Mar 2024 10:21:08 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[6.3.0]=E9=9B=A8=E5=A4=A9=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E8=A7=86=E5=9B=BE=E4=B8=BB=E7=BA=BF=E7=A8=8B?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../eagle/core/function/hmi/ui/widget/RainModeView.kt | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/RainModeView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/RainModeView.kt index 0b18a1c77a..141144dcab 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/RainModeView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/RainModeView.kt @@ -11,6 +11,7 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager import com.mogo.eagle.core.function.call.hmi.CallerHmiViewControlListenerManager import com.mogo.eagle.core.function.hmi.R import com.mogo.eagle.core.function.hmi.ui.utils.HmiActionLog +import com.mogo.eagle.core.utilcode.util.ThreadUtils /** * 雨天模式控件 @@ -45,10 +46,12 @@ class RainModeView @JvmOverloads constructor( override fun updateFuncMode(tag: String, boolean: Boolean) { if(tag == FUNC_MODE_RAIN){ - background = if(FunctionBuildConfig.isRainMode){ - this.context.getDrawable(R.drawable.rain_mode_open) - }else{ - this.context.getDrawable(R.drawable.rain_mode) + ThreadUtils.runOnUiThread { + background = if(FunctionBuildConfig.isRainMode){ + this.context.getDrawable(R.drawable.rain_mode_open) + }else{ + this.context.getDrawable(R.drawable.rain_mode) + } } } } From 92b4012967079cc3047118d73810f6a90940933d Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Wed, 13 Mar 2024 10:40:39 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[6.3.0]=E4=BF=AE=E5=A4=8D=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E8=BD=AC=E6=8D=A2=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo_core_function_devatools/badcase/BadCaseManager.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/BadCaseManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/BadCaseManager.kt index f840e60ae2..7628a110ae 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/BadCaseManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/BadCaseManager.kt @@ -401,8 +401,10 @@ internal object BadCaseManager : LifecycleEventObserver, IMoGoAutopilotRecordLis override fun onDataChanged(category: MsgCategory, msgBoxList: MsgBoxBean) { if(category == MsgCategory.SYS_INFO){ - //上报 - BadCaseConfig.newReportEntity = msgBoxList.bean as ReportEntity + if(msgBoxList.type == MsgBoxType.REPORT){ + //上报 + BadCaseConfig.newReportEntity = msgBoxList.bean as ReportEntity + } }else if(category == MsgCategory.FM_INFO){ //FM BadCaseConfig.newFMInfoMsg = msgBoxList.bean as FMInfoMsg