From 9b8350ce7caf7e49a960b8e40196c7e3d5647357 Mon Sep 17 00:00:00 2001 From: xuxinchao <13522809046@163.com> Date: Tue, 15 Feb 2022 15:35:41 +0800 Subject: [PATCH 1/5] ad upgrade fix bug --- .../core/function/hmi/ui/widget/SystemVersionView.kt | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SystemVersionView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SystemVersionView.kt index 99c48fe348..cab7baf628 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SystemVersionView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SystemVersionView.kt @@ -15,6 +15,7 @@ import com.mogo.eagle.core.function.hmi.ui.tools.AdUpgradeDialog import com.mogo.eagle.core.utilcode.mogo.logger.Logger import com.mogo.eagle.core.utilcode.util.AppUtils import com.mogo.eagle.core.utilcode.util.ToastUtils +import com.mogo.eagle.core.utilcode.util.UiThreadHandler import kotlinx.android.synthetic.main.view_system_version.view.* import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.GlobalScope @@ -207,10 +208,12 @@ class SystemVersionView @JvmOverloads constructor( * 展示当前工控机版本 */ private fun showCurrentAdVersion(){ - tvAdVersionContent?.let { + UiThreadHandler.post { + tvAdVersionContent?.let { // it.text = AdasManager.getInstance().getAdasConfig().getDockVersion()) - if(!dockerVersion.isNullOrEmpty()){ - it.text = dockerVersion + if(!dockerVersion.isNullOrEmpty()){ + it.text = dockerVersion + } } } } @@ -229,6 +232,7 @@ class SystemVersionView @JvmOverloads constructor( connectStatus = autoPilotStatusInfo.connectStatus dockerVersion = autoPilotStatusInfo.dockVersion autopilotStatus = autoPilotStatusInfo.state + Logger.i(TAG,"onAutopilotStatusResponse connectStatus="+connectStatus+" dockerVersion="+dockerVersion+" autopilotStatus="+autopilotStatus) setViewStatus() } From b46f0f6c27ca5686642808cd029fe74979caae0a Mon Sep 17 00:00:00 2001 From: donghongyu Date: Tue, 15 Feb 2022 16:02:37 +0800 Subject: [PATCH 2/5] =?UTF-8?q?[Change]=20=E4=BC=98=E5=8C=96=E8=B0=83?= =?UTF-8?q?=E8=AF=95=E9=9D=A2=E6=9D=BF=E5=8A=9F=E8=83=BD=E6=8E=92=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: donghongyu --- .../adapter/MoGoHandAdasMsgManager.java | 2 + .../hmi/ui/setting/DebugSettingView.kt | 34 +- .../main/res/layout/view_debug_setting.xml | 447 +++++++++--------- .../core/data/config/FunctionBuildConfig.kt | 8 + .../common/drawer/IdentifyDataDrawer.java | 18 +- 5 files changed, 268 insertions(+), 241 deletions(-) diff --git a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java index f05e957166..319a1a79c7 100644 --- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java +++ b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java @@ -64,6 +64,8 @@ public class MoGoHandAdasMsgManager implements ThreadUtils.getSinglePool().execute(() -> IdentifyDataDrawer.getInstance().renderAdasRecognizedResult(trafficData) ); + } else { + IdentifyDataDrawer.getInstance().clearOldMarker(); } } catch (Exception e) { e.printStackTrace(); 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 468b46abf3..f08fd8433a 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 @@ -238,26 +238,16 @@ class DebugSettingView @JvmOverloads constructor( } } - // 初始化 感知数据是否绘制 选择情况 - rgIsDrawIdentifyData.check( - when (FunctionBuildConfig.isDrawIdentifyData) { - true -> { - R.id.rbDraw - } - false -> { - R.id.rbDoNotDraw - } - } - ) - rgIsDrawIdentifyData.setOnCheckedChangeListener { group, checkedId -> - when (checkedId) { - R.id.rbDraw -> { - FunctionBuildConfig.isDrawIdentifyData = true - } - R.id.rbDoNotDraw -> { - FunctionBuildConfig.isDrawIdentifyData = false - } - } + // 初始化 ADAS感知数据是否绘制 选择情况 + tbIsDrawIdentifyData.isChecked = FunctionBuildConfig.isDrawIdentifyData + tbIsDrawIdentifyData.setOnCheckedChangeListener { buttonView, isChecked -> + FunctionBuildConfig.isDrawIdentifyData = isChecked + } + + // 初始化 OBU感知数据是否绘制 选择情况 + tbIsDrawOBUIdentifyData.isChecked = FunctionBuildConfig.isDrawObuIdentifyData + tbIsDrawOBUIdentifyData.setOnCheckedChangeListener { buttonView, isChecked -> + FunctionBuildConfig.isDrawObuIdentifyData = isChecked } // 演示模式,上一次勾选的数据 @@ -269,9 +259,9 @@ class DebugSettingView @JvmOverloads constructor( val isDemoMode = SharedPrefsMgr.getInstance(context).getBoolean(MoGoConfig.IS_DEMO_MODE, false) CallerAutoPilotManager.setDemoMode(isDemoMode) - rbIsDemoMode.isChecked = isDemoMode + tbIsDemoMode.isChecked = isDemoMode // 演示模式 - rbIsDemoMode.setOnCheckedChangeListener { buttonView, isChecked -> + tbIsDemoMode.setOnCheckedChangeListener { buttonView, isChecked -> CallerAutoPilotManager.setDemoMode(isChecked) FunctionBuildConfig.isDemoMode = isChecked SharedPrefsMgr.getInstance(context).putBoolean(MoGoConfig.IS_DEMO_MODE, isChecked) 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 49881fa8ef..4e048d8fbe 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 @@ -28,7 +28,7 @@ android:padding="@dimen/dp_10" android:text="鹰眼应用信息" android:textColor="#000" - android:textSize="@dimen/dp_34" + android:textSize="@dimen/dp_24" android:textStyle="bold" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + android:textSize="@dimen/dp_24" /> + android:textSize="@dimen/dp_24" /> + android:textSize="@dimen/dp_24" /> + android:textSize="@dimen/dp_24" /> - + - + android:orientation="horizontal"> - + - +