Merge branch 'dev_robotaxi-d_240912_6.7.2_local'

OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/ui/widget/M2StatusBarView.kt

@@ -53,7 +53,7 @@ class M2StatusBarView @JvmOverloads constructor(
         super.onAttachedToWindow()
         post {
             val params: ViewGroup.LayoutParams = getLayoutParams()
-            params.height = AutoSizeUtils.dp2px(context,40f)
+            params.height = AutoSizeUtils.dp2px(context,60f)
             layoutParams = params
         }
         //添加view控制

OCH/shuttle/passenger_weaknet/src/main/res/m2/layout/shuttle_p_m2_view_status_bar.xml

@@ -1,46 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/dp_40"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout"
-    tools:ignore="MissingDefaultResource">
+    android:layout_height="@dimen/dp_60"
+    tools:ignore="MissingDefaultResource"
+    tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
 
     <!--Wifi状态-->
     <com.mogo.eagle.core.function.hmi.ui.widget.WifiStateView
         android:id="@+id/wifiStateView"
         android:layout_width="wrap_content"
         android:layout_height="@dimen/dp_28"
-        app:wifi_size="@dimen/dp_18"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
         android:layout_gravity="center"
-        android:layout_marginStart="@dimen/dp_40" />
+        android:layout_marginStart="@dimen/dp_40"
+        app:layout_constraintBottom_toBottomOf="@+id/iv_logon"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/iv_logon"
+        app:wifi_size="@dimen/dp_18" />
 
     <!--魔方连接状态 蓝牙-->
     <com.mogo.och.shuttle.weaknet.passenger.ui.widget.M2BlueToothView
         android:id="@+id/blueToothView"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/wifiStateView"
         android:layout_width="@dimen/dp_15"
         android:layout_height="@dimen/dp_22"
-        android:src="@drawable/shuttle_p_m2_blue_tooth_open"
         android:layout_gravity="center"
-        android:layout_marginStart="@dimen/dp_32" />
+        android:layout_marginStart="@dimen/dp_32"
+        android:src="@drawable/shuttle_p_m2_blue_tooth_open"
+        app:layout_constraintBottom_toBottomOf="@+id/iv_logon"
+        app:layout_constraintStart_toEndOf="@+id/wifiStateView"
+        app:layout_constraintTop_toTopOf="@+id/iv_logon" />
 
     <com.mogo.och.common.module.manager.scnner.ScannerStateView
         android:id="@+id/scannerStateView"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/blueToothView"
         android:layout_width="@dimen/dp_24"
         android:layout_height="@dimen/dp_24"
-        android:src="@drawable/driver_connect_statis"
         android:layout_gravity="center"
-        android:layout_marginStart="@dimen/dp_40"/>
+        android:layout_marginStart="@dimen/dp_40"
+        android:src="@drawable/driver_connect_statis"
+        app:layout_constraintBottom_toBottomOf="@+id/iv_logon"
+        app:layout_constraintStart_toEndOf="@+id/blueToothView"
+        app:layout_constraintTop_toTopOf="@+id/iv_logon" />
 
     <ProgressBar
         android:id="@+id/progress"
@@ -49,37 +49,36 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/dp_40"
         android:layout_marginEnd="@dimen/dp_7"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintRight_toLeftOf="@+id/tv_power_cos"
-        android:maxHeight="@dimen/dp_8"
-        android:minHeight="@dimen/dp_8"
         android:layout_marginRight="4dp"
         android:background="@null"
-        android:progressDrawable="@drawable/shuttle_p_m2_power_seekbar_style" />
+        android:maxHeight="@dimen/dp_8"
+        android:minHeight="@dimen/dp_8"
+        android:progressDrawable="@drawable/shuttle_p_m2_power_seekbar_style"
+        app:layout_constraintBottom_toBottomOf="@+id/iv_logon"
+        app:layout_constraintRight_toLeftOf="@+id/tv_power_cos"
+        app:layout_constraintTop_toTopOf="@+id/iv_logon" />
 
     <TextView
         android:id="@+id/tv_power_cos"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        android:textSize="@dimen/dp_18"
-        android:textColor="@color/shuttle_p_m2_power_tv_color"
-        android:layout_marginRight="@dimen/dp_40"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
+        android:layout_height="wrap_content"
+        android:layout_marginRight="@dimen/dp_40"
+        android:textColor="@color/shuttle_p_m2_power_tv_color"
+        android:textSize="@dimen/dp_18"
+        app:layout_constraintBottom_toBottomOf="@+id/iv_logon"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/iv_logon" />
 
     <ImageView
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
+        android:id="@+id/iv_logon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/dp_7"
         android:src="@drawable/shuttle_p_m2_status_bar_logo"
-        android:scaleType="fitXY"
-        android:layout_width="@dimen/dp_94"
-        android:layout_height="@dimen/dp_25"
-        app:isUseSkin="true"/>
+        app:isUseSkin="true"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
 
 
-
-</merge>
+</merge>