diff --git a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2StatusBarView.kt b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2StatusBarView.kt index 3a19937dc3..ba3c2697ed 100644 --- a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2StatusBarView.kt +++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2StatusBarView.kt @@ -40,7 +40,7 @@ class M2StatusBarView @JvmOverloads constructor( super.onAttachedToWindow() post { val params: ViewGroup.LayoutParams = getLayoutParams() - params.height = AutoSizeUtils.dp2px(context,47f) + params.height = AutoSizeUtils.dp2px(context,40f) layoutParams = params } //添加view控制 diff --git a/OCH/mogo-och-bus-passenger/src/m2/res/layout/p_m2_fragment.xml b/OCH/mogo-och-bus-passenger/src/m2/res/layout/p_m2_fragment.xml index b474ea5160..0531cd6727 100644 --- a/OCH/mogo-och-bus-passenger/src/m2/res/layout/p_m2_fragment.xml +++ b/OCH/mogo-och-bus-passenger/src/m2/res/layout/p_m2_fragment.xml @@ -9,18 +9,20 @@ android:id="@+id/driving_fragment" android:layout_width="match_parent" android:layout_height="0dp" + app:layout_constraintWidth_percent="0.29" app:layout_constraintTop_toTopOf="parent" - app:layout_constraintLeft_toLeftOf="parent" - app:layout_constraintHeight_percent="0.290"/> + app:layout_constraintBottom_toTopOf="@+id/hd_map_fragment" + app:layout_constraintLeft_toLeftOf="parent"/> + app:layout_constraintBottom_toTopOf="@+id/video_fragment" + app:layout_constraintLeft_toLeftOf="parent"/> @@ -29,8 +31,9 @@ android:id="@+id/video_fragment" android:layout_width="match_parent" android:layout_height="0dp" + app:layout_constraintWidth_percent="0.294" app:layout_constraintTop_toBottomOf="@+id/hd_map_fragment" - app:layout_constraintLeft_toLeftOf="parent" - app:layout_constraintHeight_percent="0.294"/> + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintLeft_toLeftOf="parent"/> \ No newline at end of file diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/screen/ScreenHelper.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/screen/ScreenHelper.java index f70d4b06e2..d9d9338019 100644 --- a/foudations/mogo-commons/src/main/java/com/mogo/commons/screen/ScreenHelper.java +++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/screen/ScreenHelper.java @@ -19,14 +19,18 @@ public class ScreenHelper { int baseWidth = 2560; int baseHeight = 1600; + boolean baseOnWidth = true; - if (AppIdentityModeUtils.isM1(FunctionBuildConfig.appIdentityMode) || AppIdentityModeUtils.isM1(FunctionBuildConfig.appIdentityMode)) { + if (AppIdentityModeUtils.isM1(FunctionBuildConfig.appIdentityMode)) { baseWidth = 1920; baseHeight = 1080; + } else if (AppIdentityModeUtils.isM2(FunctionBuildConfig.appIdentityMode)) { + baseWidth = 1080; + baseHeight = 1920; } AutoSizeConfig.getInstance() - .setBaseOnWidth(false) + .setBaseOnWidth(baseOnWidth) .setCustomFragment(true) .setDesignWidthInDp(baseWidth) .setDesignHeightInDp(baseHeight)