diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java index 827e00b570..0d4a626e29 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java @@ -9,8 +9,6 @@ import android.util.ArrayMap; import android.view.View; import android.view.ViewGroup; import android.view.ViewGroup.LayoutParams; -import android.view.animation.BounceInterpolator; -import android.view.animation.OvershootInterpolator; import android.widget.ImageView; import android.widget.TextView; @@ -21,7 +19,6 @@ import androidx.constraintlayout.widget.Group; import com.mogo.map.uicontroller.IMogoMapUIController; import com.mogo.module.common.map.MapCenterPointStrategy; import com.mogo.module.common.map.Scene; -import com.mogo.module.common.utils.CarSeries; import com.mogo.module.extensions.R; import com.mogo.module.extensions.navi.TopView; import com.mogo.service.windowview.IMogoTopViewStatusListener; @@ -662,7 +659,7 @@ public class TopViewAnimHelper { } private int computeNaviMarginTop(int height) { - int result = (int) (height - (getDimen(R.dimen.dp_350) - getDimen(R.dimen.dp_316))); + int result = (int) (height - (getDimen(R.dimen.module_ext_top_over_navi_height))); Logger.d(TAG, "computeNaviMarginTop: " + height + " result: " + result); return result; } diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi-1920x1000/module_ext_ic_navi_info1.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi-1920x1000/module_ext_ic_navi_info1.png new file mode 100644 index 0000000000..f9cfe3d8ba Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi-1920x1000/module_ext_ic_navi_info1.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi-1920x1000/module_ext_ic_navi_info2.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi-1920x1000/module_ext_ic_navi_info2.png new file mode 100644 index 0000000000..71cb049800 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi-1920x1000/module_ext_ic_navi_info2.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi-1920x1000/module_ext_ic_navi_info3.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi-1920x1000/module_ext_ic_navi_info3.png new file mode 100644 index 0000000000..2f3f0e54d9 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi-1920x1000/module_ext_ic_navi_info3.png differ diff --git a/modules/mogo-module-extensions/src/main/res/layout-xhdpi-1920x1000/include_navi_info_panle.xml b/modules/mogo-module-extensions/src/main/res/layout-xhdpi-1920x1000/include_navi_info_panle.xml new file mode 100644 index 0000000000..a861e90537 --- /dev/null +++ b/modules/mogo-module-extensions/src/main/res/layout-xhdpi-1920x1000/include_navi_info_panle.xml @@ -0,0 +1,229 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml index 023e4ea746..149046acd0 100644 --- a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml +++ b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml @@ -30,7 +30,7 @@ android:textSize="@dimen/module_ext_north_textSize" android:textStyle="bold" android:visibility="gone" - tools:visibility="gone" + tools:visibility="visible" app:layout_constraintRight_toRightOf="@+id/module_entrance_id_upload_road_condition" app:layout_constraintTop_toBottomOf="@+id/module_map_id_navi_bg" app:layout_goneMarginTop="@dimen/module_ext_north_goneMarginTop" /> diff --git a/modules/mogo-module-extensions/src/main/res/values-xhdpi-1920x1000/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-xhdpi-1920x1000/dimens.xml new file mode 100644 index 0000000000..169a5f6e4e --- /dev/null +++ b/modules/mogo-module-extensions/src/main/res/values-xhdpi-1920x1000/dimens.xml @@ -0,0 +1,143 @@ + + + + 90px + 32px + 2px + 16px + 26px + 26px + 32px + + 90px + 32px + 2px + 100px + 90px + 2px + 54px + 100px + 90px + + 180px + 180px + 2px + 60px + 60px + 28px + + 32px + 2px + + 120px + 32px + 60px + 92px + 24px + 48px + 2px + 120px + 120px + 120px + 40px + 30px + 32px + 32px + + 120px + 120px + 32px + 60px + 32px + 60px + 32px + 20px + + + 100px + 60px + 60px + 32px + 48px + 80px + 28px + 26px + 44px + 44px + 18px + 34px + 26px + 28px + 30px + 30px + 30px + 20px + + 103px + 103px + + + 1058px + 210px + 144px + 159px + 159px + 70px + 70px + 24px + 83px + 24px + 40px + 60px + 12px + 10px + 40px + 34px + 24px + 28px + 23px + 17px + 17px + 36px + 36px + -2px + + 30px + 40px + 40px + 15px + 15px + 5px + 50px + 56px + 30px + 56px + 30px + 56px + 30px + 15px + 15px + + + 1000px + 390px + 200px + 200px + 240px + 30px + 120px + 120px + 30px + 22px + 28px + 28px + 30px + 90px + 90px + 6dp + 15px + 10px + 20px + + 40px + \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml index 3f7fae420a..059f8fb764 100644 --- a/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml @@ -139,4 +139,5 @@ 10px 20px + 34px \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/values/dimens.xml b/modules/mogo-module-extensions/src/main/res/values/dimens.xml index 4d06184316..a55c7a34a9 100644 --- a/modules/mogo-module-extensions/src/main/res/values/dimens.xml +++ b/modules/mogo-module-extensions/src/main/res/values/dimens.xml @@ -142,4 +142,6 @@ 10px 6px 10px + + 19px \ No newline at end of file diff --git a/modules/mogo-module-left-panel/src/main/res/drawable-xhdpi-1920x1000/module_left_panel_normal_speed_bg.png b/modules/mogo-module-left-panel/src/main/res/drawable-xhdpi-1920x1000/module_left_panel_normal_speed_bg.png new file mode 100644 index 0000000000..8fd2088ff7 Binary files /dev/null and b/modules/mogo-module-left-panel/src/main/res/drawable-xhdpi-1920x1000/module_left_panel_normal_speed_bg.png differ diff --git a/modules/mogo-module-left-panel/src/main/res/drawable-xhdpi-1920x1000/module_left_panel_speed_container_bg.png b/modules/mogo-module-left-panel/src/main/res/drawable-xhdpi-1920x1000/module_left_panel_speed_container_bg.png new file mode 100644 index 0000000000..eed4ad9377 Binary files /dev/null and b/modules/mogo-module-left-panel/src/main/res/drawable-xhdpi-1920x1000/module_left_panel_speed_container_bg.png differ diff --git a/modules/mogo-module-left-panel/src/main/res/drawable-xhdpi-1920x1000/module_left_panel_warn_speed_bg.png b/modules/mogo-module-left-panel/src/main/res/drawable-xhdpi-1920x1000/module_left_panel_warn_speed_bg.png new file mode 100644 index 0000000000..11a4081a26 Binary files /dev/null and b/modules/mogo-module-left-panel/src/main/res/drawable-xhdpi-1920x1000/module_left_panel_warn_speed_bg.png differ diff --git a/modules/mogo-module-left-panel/src/main/res/values-xhdpi-1920x1000/dimens.xml b/modules/mogo-module-left-panel/src/main/res/values-xhdpi-1920x1000/dimens.xml new file mode 100644 index 0000000000..301d92c1e7 --- /dev/null +++ b/modules/mogo-module-left-panel/src/main/res/values-xhdpi-1920x1000/dimens.xml @@ -0,0 +1,8 @@ + + + 122px + 110px + 30px + 47px + + \ No newline at end of file diff --git a/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml b/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml index bcb2744c24..c3a6b4463d 100644 --- a/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml +++ b/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml @@ -43,10 +43,12 @@ + android:layout_gravity="right" + android:paddingRight="@dimen/module_main_entrance_fragment_container_padding" + android:paddingBottom="@dimen/module_main_entrance_fragment_container_padding" + android:paddingTop="@dimen/module_main_entrance_fragment_container_padding" /> + + + 350px + 10px + 660px + 690px + 60px + 211px + 30px + 30px + 15px + 270px + 660px + 600px + 599px + + 200px + 30px + 30px + 830px + 590px + 30px + 70px + + 585px + 1313px + + \ No newline at end of file diff --git a/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml index f05ec80366..9f6dd8ba91 100644 --- a/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml @@ -21,7 +21,8 @@ 830px 800px 30px + 30px 340px - + 1313px \ No newline at end of file diff --git a/modules/mogo-module-main/src/main/res/values/dimens.xml b/modules/mogo-module-main/src/main/res/values/dimens.xml index 5cec246a84..c3beffdebc 100644 --- a/modules/mogo-module-main/src/main/res/values/dimens.xml +++ b/modules/mogo-module-main/src/main/res/values/dimens.xml @@ -23,5 +23,8 @@ 444px 350px 16px + 16px + + 580px \ No newline at end of file diff --git a/modules/mogo-module-share/src/main/res/drawable-xhdpi-1920x1000/module_share_title_icon_left.png b/modules/mogo-module-share/src/main/res/drawable-xhdpi-1920x1000/module_share_title_icon_left.png new file mode 100644 index 0000000000..aba37467b6 Binary files /dev/null and b/modules/mogo-module-share/src/main/res/drawable-xhdpi-1920x1000/module_share_title_icon_left.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-xhdpi-1920x1000/module_share_title_icon_right.png b/modules/mogo-module-share/src/main/res/drawable-xhdpi-1920x1000/module_share_title_icon_right.png new file mode 100644 index 0000000000..719c121eea Binary files /dev/null and b/modules/mogo-module-share/src/main/res/drawable-xhdpi-1920x1000/module_share_title_icon_right.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-xhdpi-1920x1000/share_accident.png b/modules/mogo-module-share/src/main/res/drawable-xhdpi-1920x1000/share_accident.png new file mode 100644 index 0000000000..2af41503f9 Binary files /dev/null and b/modules/mogo-module-share/src/main/res/drawable-xhdpi-1920x1000/share_accident.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-xhdpi-1920x1000/share_block_up.png b/modules/mogo-module-share/src/main/res/drawable-xhdpi-1920x1000/share_block_up.png new file mode 100644 index 0000000000..c9eb6b0a18 Binary files /dev/null and b/modules/mogo-module-share/src/main/res/drawable-xhdpi-1920x1000/share_block_up.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-xhdpi-1920x1000/share_dense_fog.png b/modules/mogo-module-share/src/main/res/drawable-xhdpi-1920x1000/share_dense_fog.png new file mode 100644 index 0000000000..1336432e1d Binary files /dev/null and b/modules/mogo-module-share/src/main/res/drawable-xhdpi-1920x1000/share_dense_fog.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-xhdpi-1920x1000/share_real_time_traffic.png b/modules/mogo-module-share/src/main/res/drawable-xhdpi-1920x1000/share_real_time_traffic.png new file mode 100644 index 0000000000..709879f3e4 Binary files /dev/null and b/modules/mogo-module-share/src/main/res/drawable-xhdpi-1920x1000/share_real_time_traffic.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-xhdpi-1920x1000/share_road_closure.png b/modules/mogo-module-share/src/main/res/drawable-xhdpi-1920x1000/share_road_closure.png new file mode 100644 index 0000000000..bcd17dfa93 Binary files /dev/null and b/modules/mogo-module-share/src/main/res/drawable-xhdpi-1920x1000/share_road_closure.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-xhdpi-1920x1000/share_road_construction.png b/modules/mogo-module-share/src/main/res/drawable-xhdpi-1920x1000/share_road_construction.png new file mode 100644 index 0000000000..0122719438 Binary files /dev/null and b/modules/mogo-module-share/src/main/res/drawable-xhdpi-1920x1000/share_road_construction.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-xhdpi-1920x1000/share_road_icy.png b/modules/mogo-module-share/src/main/res/drawable-xhdpi-1920x1000/share_road_icy.png new file mode 100644 index 0000000000..6d249db767 Binary files /dev/null and b/modules/mogo-module-share/src/main/res/drawable-xhdpi-1920x1000/share_road_icy.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-xhdpi-1920x1000/share_seek_help.png b/modules/mogo-module-share/src/main/res/drawable-xhdpi-1920x1000/share_seek_help.png new file mode 100644 index 0000000000..e1d78a093d Binary files /dev/null and b/modules/mogo-module-share/src/main/res/drawable-xhdpi-1920x1000/share_seek_help.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-xhdpi-1920x1000/share_stagnant_water.png b/modules/mogo-module-share/src/main/res/drawable-xhdpi-1920x1000/share_stagnant_water.png new file mode 100644 index 0000000000..27acbbe17b Binary files /dev/null and b/modules/mogo-module-share/src/main/res/drawable-xhdpi-1920x1000/share_stagnant_water.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-xhdpi-1920x1000/share_traffic_check.png b/modules/mogo-module-share/src/main/res/drawable-xhdpi-1920x1000/share_traffic_check.png new file mode 100644 index 0000000000..4daa5cb903 Binary files /dev/null and b/modules/mogo-module-share/src/main/res/drawable-xhdpi-1920x1000/share_traffic_check.png differ diff --git a/modules/mogo-module-share/src/main/res/layout/launcher_dialog_share_2.xml b/modules/mogo-module-share/src/main/res/layout/launcher_dialog_share_2.xml index f5012a4dce..448fef5d09 100644 --- a/modules/mogo-module-share/src/main/res/layout/launcher_dialog_share_2.xml +++ b/modules/mogo-module-share/src/main/res/layout/launcher_dialog_share_2.xml @@ -39,132 +39,132 @@ android:layout_height="wrap_content" android:drawableTop="@drawable/share_block_up" android:text="拥堵" - android:textSize="@dimen/dp_32" + android:textSize="@dimen/share_module_btn_text_size" android:textColor="#fff" app:layout_constraintHorizontal_chainStyle="spread_inside" android:gravity="center" app:layout_constraintTop_toBottomOf="@+id/btn_share_title" app:layout_constraintRight_toLeftOf="@+id/tvTrafficCheck" app:layout_constraintLeft_toLeftOf="@+id/vBg" - android:layout_marginStart="@dimen/dp_116" - android:layout_marginTop="@dimen/dp_78" - android:drawablePadding="@dimen/dp_30" /> + android:layout_marginStart="@dimen/share_module_btn_margin_left_right" + android:layout_marginTop="@dimen/share_module_first_btn_margin_top" + android:drawablePadding="@dimen/share_module_drawable_padding" /> + android:drawablePadding="@dimen/share_module_drawable_padding" /> + android:drawablePadding="@dimen/share_module_drawable_padding" /> + android:drawablePadding="@dimen/share_module_drawable_padding" /> + android:drawablePadding="@dimen/share_module_drawable_padding" /> + android:layout_marginTop="@dimen/share_module_sec_btn_margin_top" + android:drawablePadding="@dimen/share_module_drawable_padding" /> + android:layout_marginTop="@dimen/share_module_sec_btn_margin_top" + android:drawablePadding="@dimen/share_module_drawable_padding" /> + android:layout_marginTop="@dimen/share_module_sec_btn_margin_top" + android:drawablePadding="@dimen/share_module_drawable_padding" /> + android:drawablePadding="@dimen/share_module_drawable_padding" /> + android:drawablePadding="@dimen/share_module_drawable_padding" /> \ No newline at end of file diff --git a/modules/mogo-module-share/src/main/res/values-xhdpi-1920x1000/dimens.xml b/modules/mogo-module-share/src/main/res/values-xhdpi-1920x1000/dimens.xml new file mode 100644 index 0000000000..4041b60f30 --- /dev/null +++ b/modules/mogo-module-share/src/main/res/values-xhdpi-1920x1000/dimens.xml @@ -0,0 +1,26 @@ + + + 1318px + 727px + 64px + 51px + 200px + 210px + 30px + 160px + 198px + 55px + 70px + 56px + 27px + 105px + + + 36px + 32px + 28px + 28px + + + + diff --git a/modules/mogo-module-share/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-share/src/main/res/values-xhdpi/dimens.xml index 0e3e0cf68a..566d8d9d02 100644 --- a/modules/mogo-module-share/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-share/src/main/res/values-xhdpi/dimens.xml @@ -10,11 +10,16 @@ 160px 198px 55px + 78px + 62px + 30px + 116px 40px 32px 28px + 32px diff --git a/modules/mogo-module-share/src/main/res/values/dimens.xml b/modules/mogo-module-share/src/main/res/values/dimens.xml index ff81f21386..0e92e92f36 100644 --- a/modules/mogo-module-share/src/main/res/values/dimens.xml +++ b/modules/mogo-module-share/src/main/res/values/dimens.xml @@ -11,10 +11,15 @@ 85px 110px 28px + 42.6px + 34px + 16.4px + 63.4px 22px 18px 15px + 17.5px \ No newline at end of file