diff --git a/app/src/em4/AndroidManifest.xml b/app/src/em4/AndroidManifest.xml index 39c9d3833d..663efcea97 100644 --- a/app/src/em4/AndroidManifest.xml +++ b/app/src/em4/AndroidManifest.xml @@ -1,7 +1,7 @@ + package="com.mogo.launcher"> + \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java index 7607cca699..c9de4dc5cb 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java @@ -74,6 +74,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Random; +import static com.mogo.module.common.utils.SPConst.getSPGuideRecord; import static com.mogo.module.common.utils.SPConst.getSpGuide; import static com.mogo.module.share.constant.ShareConstants.KEY_CLICK_SHARE_BUTTON; import static com.mogo.module.share.constant.ShareConstants.KEY_CLICK_SHARE_TIME; @@ -382,8 +383,8 @@ public class EntranceFragment extends MvpFragment - 468px - 581px + 467px + 573px 352px @@ -61,7 +61,7 @@ 2px 3.2px - 332px + 338px 82px 60px 18px diff --git a/modules/mogo-module-tanlu/src/main/res/values/dimens.xml b/modules/mogo-module-tanlu/src/main/res/values/dimens.xml index af1c70909d..955ea90977 100644 --- a/modules/mogo-module-tanlu/src/main/res/values/dimens.xml +++ b/modules/mogo-module-tanlu/src/main/res/values/dimens.xml @@ -84,7 +84,7 @@ 45px 13px - 6px + 8px 7px 17px 3px diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail.xml index 022db7da53..a4df8026d8 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail.xml @@ -67,9 +67,9 @@ android:maxLines="1" android:textColor="@color/v2x_FFF_333" android:textSize="@dimen/dp_36" - app:layout_constraintEnd_toStartOf="@+id/ivEventHead" android:textStyle="bold" - app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintEnd_toStartOf="@+id/ivEventHead" + app:layout_constraintStart_toStartOf="@+id/tvEventTypeTitle" app:layout_constraintTop_toBottomOf="@+id/tvEventTypeTitle" tools:text="东城区北三环中路辅路小黄庄路口" /> diff --git a/modules/mogo-module-v2x/src/main/res/layout/window_road_event_detail.xml b/modules/mogo-module-v2x/src/main/res/layout/window_road_event_detail.xml index c34c2ce6dd..380e53446b 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/window_road_event_detail.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/window_road_event_detail.xml @@ -24,7 +24,7 @@ android:layout_width="@dimen/dp_88" android:layout_height="@dimen/dp_88" android:layout_marginEnd="@dimen/dp_28" - android:layout_marginBottom="@dimen/dp_65" + android:layout_marginBottom="@dimen/dp_40" android:background="@drawable/icon_window_close2" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintRight_toRightOf="parent" /> diff --git a/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml new file mode 100644 index 0000000000..c99bf31c73 --- /dev/null +++ b/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml @@ -0,0 +1,82 @@ + + + 445px + + 18px + 20px + 190px + 250px + 190px + 210px + + 136px + + 82px + + 54px + + 64px + + 156px + 234px + + + 34px + 22px + + 40px + + 6px + + 150px + 550px + 200px + 200px + 100px + 50px + 90px + 36px + 40px + 15px + 150px + 48px + 32px + 28px + 28px + 190px + 238px + 170px + 43px + 26px + 12px + 8px + 2px + 30px + 34px + + 12px + 16px + + 24px + 18px + 20px + 16px + + 82px + 16px + 117px + 50px + 17px + 16px + 36px + 16px + 20px + 34px + 15px + 29px + -8px + 84px + + 16px + 20px +