From 44423cdbb964efa4a2bef67cefa19b3fb2399d84 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Wed, 30 Oct 2024 16:04:26 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[6.7.0]=20[fix]=20[=E5=8F=B8=E6=9C=BA?= =?UTF-8?q?=E5=B1=8F=20=E6=8F=90=E5=8D=87logding=20=E7=9A=84=E9=AB=98?= =?UTF-8?q?=E5=BA=A6]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/layout/shuttle_weak_base_fragment.xml | 1 + .../src/main/res/layout/unmanned_taxi_base_fragment.xml | 1 + 2 files changed, 2 insertions(+) diff --git a/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_base_fragment.xml b/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_base_fragment.xml index b02379a4b6..bf26c36955 100644 --- a/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_base_fragment.xml +++ b/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_base_fragment.xml @@ -32,6 +32,7 @@ app:layout_constraintTop_toTopOf="parent" /> diff --git a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml index 4c2a2216a9..8c441aa673 100644 --- a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml +++ b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml @@ -64,6 +64,7 @@ app:layout_constraintRight_toRightOf="parent" /> From 869e09b32d19520d24b99523b3ddae8625a0d0e7 Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Wed, 30 Oct 2024 16:08:35 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[6.7.0]=E5=86=B7=E5=90=AF=E5=8A=A8=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/function/hmi/ui/widget/ColdStartView.kt | 11 ++++++++++- 1 file changed, 10 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 9dc8526d27..4ccbe398d2 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 @@ -67,6 +67,8 @@ class ColdStartView @JvmOverloads constructor( private var ssmConnectStatus = false //SSM连接状态，默认是未连接 private var coldStartStatus = false //冷启动状态，默认是未冷启动成功 + private var currentColdStartSuccess = false //冷启动成功状态，也是成功后动画完成状态 + private var ipcRotationAnim: ObjectAnimator?= null //域控连接状态动画 private var ssmRotationAnim: ObjectAnimator?= null //SSM连接状态动画 @@ -423,6 +425,7 @@ class ColdStartView @JvmOverloads constructor( ColdStartAnalyticsManager.coldStartStepAnalytics(ColdStartAnalyticsManager.ipcConnectSuccess,reason) ssmConnectStatus = false coldStartStatus = false + currentColdStartSuccess = false newColdStart = false } @@ -455,6 +458,7 @@ class ColdStartView @JvmOverloads constructor( ColdStartAnalyticsManager.coldStartStepAnalytics(ColdStartAnalyticsManager.ipcConnectFail,reason) ssmConnectStatus = false coldStartStatus = false + currentColdStartSuccess = false newColdStart = false } @@ -559,6 +563,7 @@ class ColdStartView @JvmOverloads constructor( //将SSM连接状态置为false ssmConnectStatus = false coldStartStatus = false + currentColdStartSuccess = false //取消连接SSM超时等待倒计时 connectSSMTimer?.cancel() //展示连接SSM失败视图 @@ -584,6 +589,7 @@ class ColdStartView @JvmOverloads constructor( override fun onFinish() { //将冷启动状态置为false coldStartStatus = false + currentColdStartSuccess = false //展示冷启动失败视图 showColdStartFailView() //冷启动失败埋点统计 @@ -625,7 +631,7 @@ class ColdStartView @JvmOverloads constructor( } fun getColdStartStatus(): Boolean{ - return coldStartStatus + return currentColdStartSuccess } /** @@ -635,6 +641,9 @@ class ColdStartView @JvmOverloads constructor( // 假设view是你想要淡出的视图 this@ColdStartView.animate().alpha(0.0f).setDuration(1000).start() coldStartResultListener?.coldStartSuccess() + UiThreadHandler.postDelayed({ + currentColdStartSuccess = true + }, 1000) } /**