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 d758473488..2d4be3d1d2 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 @@ -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控制 diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_status_bar_logo.png b/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_status_bar_logo.png index 1f6ea692f5..71d8a4bdaa 100644 Binary files a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_status_bar_logo.png and b/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_status_bar_logo.png differ 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 e98e87adc9..8d106b4337 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 @@ -1,46 +1,46 @@ + android:layout_height="@dimen/dp_60" + tools:ignore="MissingDefaultResource" + tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout"> + 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" /> + 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" /> + 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" /> + 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" /> + 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" /> + app:isUseSkin="true" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" /> - - \ No newline at end of file + diff --git a/skin/DeQing-skin/src/main/res/drawable-nodpi/shuttle_p_m2_status_bar_logo.png b/skin/DeQing-skin/src/main/res/drawable-nodpi/shuttle_p_m2_status_bar_logo.png new file mode 100644 index 0000000000..4253937d1c Binary files /dev/null and b/skin/DeQing-skin/src/main/res/drawable-nodpi/shuttle_p_m2_status_bar_logo.png differ diff --git a/skin/DeQing-skin/src/main/res/drawable-xhdpi/shuttle_p_m2_status_bar_logo.png b/skin/DeQing-skin/src/main/res/drawable-xhdpi/shuttle_p_m2_status_bar_logo.png deleted file mode 100644 index a944c4ef04..0000000000 Binary files a/skin/DeQing-skin/src/main/res/drawable-xhdpi/shuttle_p_m2_status_bar_logo.png and /dev/null differ diff --git a/skin/YiXin-skin/src/main/res/drawable-nodpi/shuttle_p_m2_status_bar_logo.png b/skin/YiXin-skin/src/main/res/drawable-nodpi/shuttle_p_m2_status_bar_logo.png new file mode 100644 index 0000000000..c4352c0ebe Binary files /dev/null and b/skin/YiXin-skin/src/main/res/drawable-nodpi/shuttle_p_m2_status_bar_logo.png differ diff --git a/skin/YiXin-skin/src/main/res/drawable-xhdpi/shuttle_p_m2_status_bar_logo.png b/skin/YiXin-skin/src/main/res/drawable-xhdpi/shuttle_p_m2_status_bar_logo.png deleted file mode 100644 index 6029163ee7..0000000000 Binary files a/skin/YiXin-skin/src/main/res/drawable-xhdpi/shuttle_p_m2_status_bar_logo.png and /dev/null differ