diff --git a/modules/mogo-module-common/src/main/res/values-xhdpi-2560x1600/dimens.xml b/modules/mogo-module-common/src/main/res/values-xhdpi-2560x1600/dimens.xml new file mode 100644 index 0000000000..b693e5557c --- /dev/null +++ b/modules/mogo-module-common/src/main/res/values-xhdpi-2560x1600/dimens.xml @@ -0,0 +1,9 @@ + + + 42px + 628px + 188px + 106px + 52px + 37px + diff --git a/modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml index eae48600b3..c81c22f39e 100644 --- a/modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml @@ -1123,5 +1123,11 @@ 360px 63px 96px + 470px + 140px + 100px + 28px + 28px + diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xxhdpi/v2x_road_front_car_warning.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/v2x_road_front_car_warning.png similarity index 100% rename from modules/mogo-module-v2x/src/main/res/drawable-xxhdpi/v2x_road_front_car_warning.png rename to modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/v2x_road_front_car_warning.png diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xxhdpi/v2x_road_front_dead_zone.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/v2x_road_front_dead_zone.png similarity index 100% rename from modules/mogo-module-v2x/src/main/res/drawable-xxhdpi/v2x_road_front_dead_zone.png rename to modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/v2x_road_front_dead_zone.png diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xxhdpi/v2x_road_front_m_warning.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/v2x_road_front_m_warning.png similarity index 100% rename from modules/mogo-module-v2x/src/main/res/drawable-xxhdpi/v2x_road_front_m_warning.png rename to modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/v2x_road_front_m_warning.png diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xxhdpi/v2x_road_front_p_warning.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/v2x_road_front_p_warning.png similarity index 100% rename from modules/mogo-module-v2x/src/main/res/drawable-xxhdpi/v2x_road_front_p_warning.png rename to modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/v2x_road_front_p_warning.png diff --git a/modules/mogo-module-v2x/src/main/res/layout/v2x_road_front_warning_vr.xml b/modules/mogo-module-v2x/src/main/res/layout/v2x_road_front_warning_vr.xml index 1bce72aaed..f6e3f5199f 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/v2x_road_front_warning_vr.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/v2x_road_front_warning_vr.xml @@ -1,16 +1,16 @@ @@ -21,7 +21,7 @@ android:layout_alignParentRight="true" android:layout_centerVertical="true" android:layout_marginRight="@dimen/dp_28" - android:maxWidth="@dimen/dp_100" + android:maxWidth="@dimen/module_v2n_tip_text_width" android:text="1.2米" android:textColor="@color/v2x_FF3036" android:textSize="@dimen/dp_32" /> @@ -33,7 +33,7 @@ android:layout_alignEnd="@+id/warning_distance" android:layout_centerVertical="true" android:layout_marginLeft="@dimen/dp_20" - android:layout_marginRight="@dimen/dp_20" + android:layout_marginRight="@dimen/module_v2n_tip_text_margin_right" android:layout_toRightOf="@+id/warning_type_image" android:text="前车碰撞预警" android:textColor="#FFFFFF"