From 1d804914476c418ef923745304e04cae08be8f01 Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Thu, 17 Oct 2024 10:51:54 +0800 Subject: [PATCH 1/4] =?UTF-8?q?[6.7.0]=E5=A2=9E=E5=8A=A0=E9=95=BF=E6=8C=89?= =?UTF-8?q?=E5=86=B7=E5=90=AF=E5=8A=A8Title=E9=9A=90=E8=97=8FView=E8=BF=9B?= =?UTF-8?q?=E5=85=A5=E7=99=BB=E5=BD=95=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/eagle/core/function/hmi/ui/widget/ColdStartView.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ColdStartView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ColdStartView.kt index faab437b2d..41c5bd4b32 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ColdStartView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ColdStartView.kt @@ -74,7 +74,10 @@ class ColdStartView @JvmOverloads constructor( } private fun initView(){ - + tvSystemStartupTitle.setOnLongClickListener { + hideColdStartView() + true + } } override fun onAttachedToWindow() { From 90c0683b1b7e0687673c1c762c239f7d08d05780 Mon Sep 17 00:00:00 2001 From: EmArrow Date: Thu, 17 Oct 2024 11:29:57 +0800 Subject: [PATCH 2/4] [6.7.0] remove note --- .../com/mogo/eagle/core/function/hmi/bone/tab/CarInfoTabView.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/CarInfoTabView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/CarInfoTabView.kt index 870b9d249d..20450ac527 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/CarInfoTabView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/CarInfoTabView.kt @@ -177,7 +177,6 @@ class CarInfoTabView @JvmOverloads constructor( override fun invokeCarNo(no: String?) { super.invokeCarNo(no) UiThreadHandler.post { - // 监听工控的车牌信息，防止调试跳过无车牌内容(链接先后顺序不一致也会导致数据显示异常) if (!no.isNullOrEmpty()) { if (tvCarNo.text.isNotEmpty() && tvCarNo.text == no) { CallerLogger.i("$M_HMI$TAG", "已存在车牌号") From b6512bcbb13b860b0a3b0c7f96153f02b71d4950 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Thu, 17 Oct 2024 11:30:34 +0800 Subject: [PATCH 3/4] =?UTF-8?q?[6.7.0]=20[fea]=20[=E6=B7=BB=E5=8A=A0orderi?= =?UTF-8?q?d=E5=92=8Cflag]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../eagle/core/data/autopilot/AutopilotControlParameters.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotControlParameters.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotControlParameters.kt index 46940aecc6..4272ab7dd5 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotControlParameters.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotControlParameters.kt @@ -255,6 +255,8 @@ class AutopilotControlParameters { "routeID=$routeID, " + "routeName='$routeName', " + "isSpeakVoice=$isSpeakVoice, " + + "orderId=$orderId, " + + "firstAutopilotFlag=$firstAutopilotFlag, " + "autoPilotLine=$autoPilotLine)" } From 9ae0622592b8c77bf64ca2dfd1b5a935e6f5dd2c Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Thu, 17 Oct 2024 12:00:34 +0800 Subject: [PATCH 4/4] =?UTF-8?q?[6.7.0]=E5=A2=9E=E5=8A=A0=E4=B8=BB=E5=8A=A8?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=86=B7=E5=90=AF=E5=8A=A8=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../function/hmi/ui/widget/ColdStartView.kt | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ColdStartView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ColdStartView.kt index 41c5bd4b32..68727423b5 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ColdStartView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ColdStartView.kt @@ -14,6 +14,7 @@ import androidx.constraintlayout.widget.ConstraintLayout import androidx.core.content.ContextCompat import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener import com.mogo.eagle.core.function.api.autopilot.IMoGoColdStartStateListener +import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager import com.mogo.eagle.core.function.call.autopilot.CallerColdStartStateListenerManager import com.mogo.eagle.core.function.hmi.R @@ -84,6 +85,7 @@ class ColdStartView @JvmOverloads constructor( super.onAttachedToWindow() CallerAutoPilotStatusListenerManager.addListener(TAG, this) CallerColdStartStateListenerManager.addListener(TAG,this) + CallerAutoPilotControlManager.sendSsmFuncQueryColdStartState() } override fun onDetachedFromWindow() { @@ -319,6 +321,8 @@ class ColdStartView @JvmOverloads constructor( viewColdStartDivider.visibility = View.GONE ivColdStartStatus.visibility = View.GONE tvColdStartContent.visibility = View.GONE + //主动查询冷启动状态 + CallerAutoPilotControlManager.sendSsmFuncQueryColdStartState() } /** @@ -377,6 +381,8 @@ class ColdStartView @JvmOverloads constructor( } ssmConnectStatus = true coldStartStatus = false + //主动查询冷启动状态 + CallerAutoPilotControlManager.sendSsmFuncQueryColdStartState() } /** @@ -494,10 +500,13 @@ class ColdStartView @JvmOverloads constructor( * 隐藏冷启动视图 */ private fun hideColdStartView(){ - UiThreadHandler.postDelayed({ - this@ColdStartView.visibility = View.GONE - coldStartResultListener?.coldStartSuccess() - }, 2000) +// UiThreadHandler.postDelayed({ +// this@ColdStartView.visibility = View.GONE +// coldStartResultListener?.coldStartSuccess() +// }, 2000) + // 假设view是你想要淡出的视图 + this@ColdStartView.animate().alpha(0.0f).setDuration(1000).start() + coldStartResultListener?.coldStartSuccess() } /**