From 752c96897ea3b2d1a11f85f1579306024847220d Mon Sep 17 00:00:00 2001 From: yangyakun Date: Tue, 7 May 2024 16:10:22 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[6.4.0]=20[=E6=A0=B7=E5=BC=8F=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=20=E9=BB=98=E8=AE=A4=E9=9A=90=E8=97=8F=20=E5=88=B0?= =?UTF-8?q?=E4=B8=8B=E4=B8=80=E7=AB=99=E7=9A=84=E8=B7=9D=E7=A6=BB=E5=92=8C?= =?UTF-8?q?=E6=97=B6=E9=97=B4]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/m2/layout/bus_p_m2_driving_info_fragment.xml | 1 + .../main/res/m2/layout/shuttle_p_m2_driving_info_fragment.xml | 1 + 2 files changed, 2 insertions(+) diff --git a/OCH/bus/passenger/src/main/res/m2/layout/bus_p_m2_driving_info_fragment.xml b/OCH/bus/passenger/src/main/res/m2/layout/bus_p_m2_driving_info_fragment.xml index a290ef869b..d8b3726702 100644 --- a/OCH/bus/passenger/src/main/res/m2/layout/bus_p_m2_driving_info_fragment.xml +++ b/OCH/bus/passenger/src/main/res/m2/layout/bus_p_m2_driving_info_fragment.xml @@ -168,6 +168,7 @@ android:id="@+id/clg_distance_left_time" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:visibility="gone" app:constraint_referenced_ids="bg_distance_lefttime,bg_distance_lefttime_split,tv_distance,tv_left_time" /> Date: Tue, 7 May 2024 16:47:20 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[6.4.0][Fix]=E7=BC=93=E5=AD=98=E4=B8=8B?= =?UTF-8?q?=E5=8F=B8=E6=9C=BA=E5=B1=8F=E5=8F=91=E9=80=81=E8=BF=87=E6=9D=A5?= =?UTF-8?q?=E7=9A=84SN=E5=B9=B6=E9=87=8D=E6=96=B0=E5=8F=91=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../call/telematic/CallerTelematicListenerManager.kt | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/telematic/CallerTelematicListenerManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/telematic/CallerTelematicListenerManager.kt index 45c9c16f6c..29f51e01be 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/telematic/CallerTelematicListenerManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/telematic/CallerTelematicListenerManager.kt @@ -9,6 +9,15 @@ object CallerTelematicListenerManager: CallerBase() { private const val TAG = "CallerTelematicListenerManager" + private var sn: String? = null + + override fun doSomeAfterAddListener(tag: String, listener: IReceivedMsgListener) { + super.doSomeAfterAddListener(tag, listener) + if (!sn.isNullOrEmpty()) { + listener.onReceivedServerSn(sn) + } + } + fun invokeReceivedMsg(type: Int, byteArray: ByteArray) { M_LISTENERS.forEach { val listener = it.value @@ -21,6 +30,7 @@ object CallerTelematicListenerManager: CallerBase() { } fun dispatchServerSn(sn: String?) { + this.sn = sn M_LISTENERS.forEach { val listener = it.value try { From df5099635526508e0d61dbbc56af8c53452d9c19 Mon Sep 17 00:00:00 2001 From: EmArrow Date: Tue, 7 May 2024 16:50:33 +0800 Subject: [PATCH 3/3] [6.4.0] fix bug of thread --- .../function/hmi/ui/setting/StatusSummaryView.kt | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/StatusSummaryView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/StatusSummaryView.kt index 4faa82f169..49cfb3ced5 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/StatusSummaryView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/StatusSummaryView.kt @@ -235,26 +235,27 @@ class StatusSummaryView @JvmOverloads constructor( override fun authCrtFile(device: String, root: String) { super.authCrtFile(device, root) - UiThreadHandler.post { + UiThreadHandler.post ({ if (data.size < 6) return@post data[5].desc = "本机证书已下载" data[5].isException = false adapter?.notifyItemChanged(5) - } + }, UiThreadHandler.MODE.QUEUE) } override fun authCrtError(errorMsg: String) { super.authCrtError(errorMsg) - UiThreadHandler.post { + UiThreadHandler.post ({ if (data.size < 6) return@post data[5].desc = "本机证书下载异常:$errorMsg" data[5].isException = true adapter?.notifyItemChanged(5) - } + }, UiThreadHandler.MODE.QUEUE) } override fun onCertificationResult(msg: String) { super.onCertificationResult(msg) +// Log.i("emArrow","onCertificationResult : $msg") if (!SharedPrefsMgr.getInstance().getBoolean( "${MoGoConfig.AUTOPILOT_CERTIFICATION}-${DebugConfig.getNetMode()}", MoGoConfig.AUTOPILOT_CERTIFICATION_DEFAULT_VALUE @@ -262,11 +263,11 @@ class StatusSummaryView @JvmOverloads constructor( ) { return } - UiThreadHandler.post { + UiThreadHandler.post ({ if (data.size < 6) return@post data[5].desc = msg data[5].isException = !msg.contains("成功校验") adapter?.notifyItemChanged(5) - } + }, UiThreadHandler.MODE.QUEUE) } } \ No newline at end of file