From ddafb900cbd27b75db67d884c01111959fbb29ed Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Wed, 20 Nov 2024 17:04:08 +0800
Subject: [PATCH] =?UTF-8?q?[6.8.0]=20[fea]=20[=E7=94=B5=E9=87=8F=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E4=BC=98=E5=8C=96]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../passenger/ui/widget/M2StatusBarView.kt        |   7 +++++--
 .../drawable-nodpi/shuttle_p_m2_electricity.png   | Bin 0 -> 424 bytes
 .../m2/layout/shuttle_p_m2_view_status_bar.xml    |  10 ++++++++++
 3 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_electricity.png

diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/ui/widget/M2StatusBarView.kt b/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/ui/widget/M2StatusBarView.kt
index 2d4be3d1d2..808ae4f02a 100644
--- a/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/ui/widget/M2StatusBarView.kt
+++ b/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/ui/widget/M2StatusBarView.kt
@@ -19,6 +19,7 @@ import com.mogo.eagle.core.utilcode.kotlin.*
 import com.mogo.eagle.core.utilcode.util.ClickUtils
 import com.mogo.eagle.core.utilcode.util.ThreadUtils
 import com.mogo.och.shuttle.weaknet.passenger.R
+import kotlinx.android.synthetic.main.shuttle_p_m2_view_status_bar.view.aciv_wait_ele
 import kotlinx.android.synthetic.main.shuttle_p_m2_view_status_bar.view.progress
 import kotlinx.android.synthetic.main.shuttle_p_m2_view_status_bar.view.tv_power_cos
 import kotlinx.coroutines.*
@@ -64,10 +65,11 @@ class M2StatusBarView @JvmOverloads constructor(
         CallerChassisStatesListenerManager.addListener(TAG,this)
 
         progress?.also {
-            it.progress = 50
+            it.progress = 0
+            aciv_wait_ele.visibility = VISIBLE
         }
         tv_power_cos?.also {
-            it.text = "50%"
+            it.text = "检测中"
         }
     }
 
@@ -104,6 +106,7 @@ class M2StatusBarView @JvmOverloads constructor(
                             progress?.also { it.progress = power }
                             tv_power_cos?.also {it.text = "$power%" }
                         }
+                        aciv_wait_ele.visibility = GONE
                     }
                 }
             } finally {
diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_electricity.png b/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_electricity.png
new file mode 100644
index 0000000000000000000000000000000000000000..4a27ff437f00252e124eb300d2d9d9c7c87596b4
GIT binary patch
literal 424
zcmeAS@N?(olHy`uVBq!ia0vp^JU}eO!3HGrSK5O(jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(<kvw#`S76K_ebLa9tpfVv(7sn6{
z(bAyZSxk;1wwpIzRu$CQB6!3ub_4g4OPBmVh^w^P3k2PWioDtJU%+GHevXJtb&n5?
zw^rPlQ<{GLZY595vpb(9-ksxn5V`5#Y;UfZB{>&e8s>R#W>V6)V9}iLjw?dO|9?W~
zn+w}qCO^2d-XuQ1(N=5Oyw{m^iwY}^i_dq?RGVcU$Ccc)>s{T`hE>Nts_j@MkS$tj
zvzNWq^W1~Hwnmx2#g$L4>3)-W&?NNocg8ezRWXZ)#&Vgx0{j}wgIGkQ*36$0{9=WB
z&C<P`KVoBRlbvjQOJ4h{GtED?`B=Toj`<({HN0qeV7u#_%7eR>=jMEUYns9uxzOWt
v<JB{t;?A^RUsU<PbOsZ%{;!#{h5j*K;f)XbHGK~gD3m;1{an^LB{Ts5fm)rS

literal 0
HcmV?d00001

diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/layout/shuttle_p_m2_view_status_bar.xml b/OCH/shuttle/passenger_weaknet/src/main/res/m2/layout/shuttle_p_m2_view_status_bar.xml
index 8d106b4337..0cf568ac02 100644
--- a/OCH/shuttle/passenger_weaknet/src/main/res/m2/layout/shuttle_p_m2_view_status_bar.xml
+++ b/OCH/shuttle/passenger_weaknet/src/main/res/m2/layout/shuttle_p_m2_view_status_bar.xml
@@ -58,6 +58,16 @@
         app:layout_constraintRight_toLeftOf="@+id/tv_power_cos"
         app:layout_constraintTop_toTopOf="@+id/iv_logon" />
 
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/aciv_wait_ele"
+        android:src="@drawable/shuttle_p_m2_electricity"
+        app:layout_constraintTop_toTopOf="@+id/progress"
+        app:layout_constraintBottom_toBottomOf="@+id/progress"
+        app:layout_constraintStart_toStartOf="@+id/progress"
+        app:layout_constraintEnd_toEndOf="@+id/progress"
+        android:layout_width="@dimen/dp_12"
+        android:layout_height="@dimen/dp_18"/>
+
     <TextView
         android:id="@+id/tv_power_cos"
         android:layout_width="wrap_content"