diff --git a/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_base_fragment.xml b/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_base_fragment.xml index 69625e4573..59722ee7ff 100644 --- a/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_base_fragment.xml +++ b/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_base_fragment.xml @@ -38,8 +38,8 @@ app:layout_constraintLeft_toLeftOf="parent" app:shadowColor="@color/bus_p_panel_edge_shadow" app:shadowRadius="@dimen/dp_30" - app:xOffset="0px" - app:yOffset="0px"> + app:xOffset="0dp" + app:yOffset="0dp"> @@ -107,7 +107,7 @@ + app:layout_goneMarginLeft="0dp" /> - 700px - 40px - 40px - 40px - 110px - 224px - 510px - 3px + 700dp + 40dp + 40dp + 40dp + 110dp + 224dp + 510dp + 3dp - 158px - 90px - 45px - 158px - 90px - 45px - 90px - 90px - 3px + 158dp + 90dp + 45dp + 158dp + 90dp + 45dp + 90dp + 90dp + 3dp - 224px - 50px - 50px - 44px - 130px - 38px + 224dp + 50dp + 50dp + 44dp + 130dp + 38dp - 36px + 36dp - 110px - 42px + 110dp + 42dp - 4px - 10px - 20px - 60px - 30px - 20px - 50px - 6px - 50px - 36px - 80px - 100px - 80px - 60px - 6px + 4dp + 10dp + 20dp + 60dp + 30dp + 20dp + 50dp + 6dp + 50dp + 36dp + 80dp + 100dp + 80dp + 60dp + 6dp - 685px - 309px - 50px - 10px - 44px - 55px - 40px + 685dp + 309dp + 50dp + 10dp + 44dp + 55dp + 40dp - 584px - 550px + 584dp + 550dp \ No newline at end of file diff --git a/OCH/mogo-och-bus-passenger/src/main/res/values/dimens.xml b/OCH/mogo-och-bus-passenger/src/main/res/values/dimens.xml index d4bfe96b27..19785202da 100644 --- a/OCH/mogo-och-bus-passenger/src/main/res/values/dimens.xml +++ b/OCH/mogo-och-bus-passenger/src/main/res/values/dimens.xml @@ -1,61 +1,61 @@ - 700px - 40px - 40px - 40px - 40px - 110px - 224px - 510px - 3px + 700dp + 40dp + 40dp + 40dp + 40dp + 110dp + 224dp + 510dp + 3dp - 158px - 90px - 45px - 158px - 90px - 45px - 90px - 90px - 3px + 158dp + 90dp + 45dp + 158dp + 90dp + 45dp + 90dp + 90dp + 3dp - 224px - 50px - 50px - 44px - 130px - 38px + 224dp + 50dp + 50dp + 44dp + 130dp + 38dp - 36px + 36dp - 110px - 42px + 110dp + 42dp - 4px - 10px - 20px - 60px - 30px - 20px - 50px - 6px - 50px - 36px - 80px - 100px - 80px - 60px - 6px + 4dp + 10dp + 20dp + 60dp + 30dp + 20dp + 50dp + 6dp + 50dp + 36dp + 80dp + 100dp + 80dp + 60dp + 6dp - 638px - 316px - 38px - 10px - 44px - 55px - 40px + 638dp + 316dp + 38dp + 10dp + 44dp + 55dp + 40dp - 584px - 550px + 584dp + 550dp \ No newline at end of file diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java index 4d02c0d64d..9d3d50eed4 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java @@ -6,6 +6,7 @@ import static com.mogo.och.bus.constant.BusConst.TIMER_START_AUTOPILOT_INTERVAL; import android.animation.ObjectAnimator; import android.content.Intent; import android.os.Bundle; +import android.util.DisplayMetrics; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/view/SlidePanelView.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/view/SlidePanelView.java index b9bb0b0c18..f04edddbdb 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/view/SlidePanelView.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/view/SlidePanelView.java @@ -21,8 +21,13 @@ import android.view.animation.DecelerateInterpolator; import androidx.annotation.Nullable; +import com.mogo.commons.AbsMogoApplication; +import com.mogo.eagle.core.utilcode.util.BitmapHelper; import com.mogo.och.bus.R; +import me.jessyan.autosize.AutoSizeConfig; +import me.jessyan.autosize.utils.AutoSizeUtils; + /** * 滑块滑动面板 * @@ -57,12 +62,12 @@ public class SlidePanelView extends View { private final Paint textPaint = new Paint(Paint.ANTI_ALIAS_FLAG); private static int textSize = 40; - private static int BLOCK_START_X = 15; - private static int BLOCK_START_Y = 15; - private static int NORMAL_TEXT_MARGIN_LEFT = 40; - private static int NORMAL_TEXT_MARGIN_RIGHT = 60; - private static int SHORT_TEXT_MARGIN_LEFT = 60; - private static int SHORT_TEXT_MARGIN_RIGHT = 70; + private static int BLOCK_START_X = AutoSizeUtils.dp2px(AbsMogoApplication.getApp(),15); + private static int BLOCK_START_Y = AutoSizeUtils.dp2px(AbsMogoApplication.getApp(),15); + private static int NORMAL_TEXT_MARGIN_LEFT = AutoSizeUtils.dp2px(AbsMogoApplication.getApp(),40); + private static int NORMAL_TEXT_MARGIN_RIGHT = AutoSizeUtils.dp2px(AbsMogoApplication.getApp(),60); + private static int SHORT_TEXT_MARGIN_LEFT = AutoSizeUtils.dp2px(AbsMogoApplication.getApp(),60);; + private static int SHORT_TEXT_MARGIN_RIGHT = AutoSizeUtils.dp2px(AbsMogoApplication.getApp(),70);; private int textMarginLeft = NORMAL_TEXT_MARGIN_LEFT; private int textMarginRight = NORMAL_TEXT_MARGIN_RIGHT; @@ -123,8 +128,11 @@ public class SlidePanelView extends View { textGradient.setLocalMatrix(gradientMatrix); textPaint.setShader(textGradient); textPaint.getFontMetrics(blockTextMetrics); - - bmBlock = BitmapFactory.decodeResource(getResources(), R.drawable.bus_base_slide_block); + int size = AutoSizeUtils.dp2px(getContext(), 120); + BitmapFactory.Options opts = new BitmapFactory.Options(); + opts.inDensity = (int) AutoSizeConfig.getInstance().getInitDensity(); + bmBlock = BitmapFactory.decodeResource(getResources(), R.drawable.bus_base_slide_block,opts); + bmBlock = Bitmap.createScaledBitmap(bmBlock, size, size, true); blockWidth = bmBlock.getWidth(); } diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/bus_no_line_icon.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/bus_no_line_icon.png deleted file mode 100755 index fc20dca73c..0000000000 Binary files a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/bus_no_line_icon.png and /dev/null differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_base_icon_not_in_autopilot.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_base_icon_not_in_autopilot.png deleted file mode 100644 index 927296d690..0000000000 Binary files a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_base_icon_not_in_autopilot.png and /dev/null differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_base_slide_block.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_base_slide_block.png deleted file mode 100644 index ed7b293b90..0000000000 Binary files a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_base_slide_block.png and /dev/null differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_disable_autopilot_icon.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_disable_autopilot_icon.png deleted file mode 100644 index 170f254cd1..0000000000 Binary files a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_disable_autopilot_icon.png and /dev/null differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_icon_arrived_station.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_icon_arrived_station.png deleted file mode 100644 index 8a065b66dd..0000000000 Binary files a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_icon_arrived_station.png and /dev/null differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_icon_arriving_station.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_icon_arriving_station.png deleted file mode 100644 index 4ed57a0e30..0000000000 Binary files a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_icon_arriving_station.png and /dev/null differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_light_green_nor.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_light_green_nor.png deleted file mode 100644 index bc9fed952d..0000000000 Binary files a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_light_green_nor.png and /dev/null differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_light_red_nor.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_light_red_nor.png deleted file mode 100644 index 8732508ded..0000000000 Binary files a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_light_red_nor.png and /dev/null differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_lightyellow_nor.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_lightyellow_nor.png deleted file mode 100644 index bae01408fd..0000000000 Binary files a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_lightyellow_nor.png and /dev/null differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_line_panel_bg.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_line_panel_bg.png deleted file mode 100755 index 3166d20e37..0000000000 Binary files a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_line_panel_bg.png and /dev/null differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_line_panel_bg_1.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_line_panel_bg_1.png deleted file mode 100755 index 09a9c252da..0000000000 Binary files a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_line_panel_bg_1.png and /dev/null differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_loading_autopilot_icon.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_loading_autopilot_icon.png deleted file mode 100644 index f21a1081f1..0000000000 Binary files a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_loading_autopilot_icon.png and /dev/null differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_och_dot_line.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_och_dot_line.png deleted file mode 100644 index a720a532ea..0000000000 Binary files a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_och_dot_line.png and /dev/null differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_right_autopilot_icon.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_right_autopilot_icon.png deleted file mode 100644 index cc2b18083d..0000000000 Binary files a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_right_autopilot_icon.png and /dev/null differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_selected_btn.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_selected_btn.png deleted file mode 100644 index 3f05565483..0000000000 Binary files a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_selected_btn.png and /dev/null differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_setting_btn_bg.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_setting_btn_bg.png deleted file mode 100644 index ba41bf3a53..0000000000 Binary files a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_setting_btn_bg.png and /dev/null differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_switch_line_close.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_switch_line_close.png deleted file mode 100644 index 370b61de38..0000000000 Binary files a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_switch_line_close.png and /dev/null differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_switch_map_long.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_switch_map_long.png deleted file mode 100755 index cf3e5a3778..0000000000 Binary files a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_switch_map_long.png and /dev/null differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_switch_map_medium.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_switch_map_medium.png deleted file mode 100755 index bdc2725468..0000000000 Binary files a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_switch_map_medium.png and /dev/null differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_unselect_btn.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_unselect_btn.png deleted file mode 100644 index 0114bb4f2b..0000000000 Binary files a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_unselect_btn.png and /dev/null differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_wrong_autopilot_icon.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_wrong_autopilot_icon.png deleted file mode 100644 index 0c8988acb3..0000000000 Binary files a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_wrong_autopilot_icon.png and /dev/null differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/end_maker_icon.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/end_maker_icon.png deleted file mode 100755 index 8acf113151..0000000000 Binary files a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/end_maker_icon.png and /dev/null differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/icon_ai_normal.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/icon_ai_normal.png deleted file mode 100755 index e98738b192..0000000000 Binary files a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/icon_ai_normal.png and /dev/null differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/icon_ai_select.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/icon_ai_select.png deleted file mode 100755 index d3e0107c02..0000000000 Binary files a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/icon_ai_select.png and /dev/null differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/icon_bad_case_normal.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/icon_bad_case_normal.png deleted file mode 100755 index c0a978fc2b..0000000000 Binary files a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/icon_bad_case_normal.png and /dev/null differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/icon_bad_case_select.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/icon_bad_case_select.png deleted file mode 100755 index ebacf3a11a..0000000000 Binary files a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/icon_bad_case_select.png and /dev/null differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/icon_station_start_end.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/icon_station_start_end.png deleted file mode 100644 index 04580a8f0d..0000000000 Binary files a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/icon_station_start_end.png and /dev/null differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/press_start_status.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/press_start_status.png deleted file mode 100755 index af32c20cb5..0000000000 Binary files a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/press_start_status.png and /dev/null differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/start_failure.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/start_failure.png deleted file mode 100755 index 5737f93ad8..0000000000 Binary files a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/start_failure.png and /dev/null differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/start_maker_icon.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/start_maker_icon.png deleted file mode 100644 index 9eca61e199..0000000000 Binary files a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/start_maker_icon.png and /dev/null differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/start_success.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/start_success.png deleted file mode 100755 index 84246fd323..0000000000 Binary files a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/start_success.png and /dev/null differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_switch_map_medium.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_switch_map_medium.png old mode 100644 new mode 100755 diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/img_bus_status_bg.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/img_bus_status_bg.png deleted file mode 100644 index 27cb9285d3..0000000000 Binary files a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/img_bus_status_bg.png and /dev/null differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable/bus_base_icon_in_autopilot.png b/OCH/mogo-och-bus/src/main/res/drawable/bus_base_icon_in_autopilot.png new file mode 100644 index 0000000000..75c26c3d71 Binary files /dev/null and b/OCH/mogo-och-bus/src/main/res/drawable/bus_base_icon_in_autopilot.png differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/bus_base_icon_not_in_autopilot.png b/OCH/mogo-och-bus/src/main/res/drawable/bus_base_icon_not_in_autopilot.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/bus_base_icon_not_in_autopilot.png rename to OCH/mogo-och-bus/src/main/res/drawable/bus_base_icon_not_in_autopilot.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable/bus_base_notice_box_bg.9.png b/OCH/mogo-och-bus/src/main/res/drawable/bus_base_notice_box_bg.9.png new file mode 100644 index 0000000000..8b4b579b56 Binary files /dev/null and b/OCH/mogo-och-bus/src/main/res/drawable/bus_base_notice_box_bg.9.png differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/bus_base_slide_block.png b/OCH/mogo-och-bus/src/main/res/drawable/bus_base_slide_block.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/bus_base_slide_block.png rename to OCH/mogo-och-bus/src/main/res/drawable/bus_base_slide_block.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/bus_disable_autopilot_icon.png b/OCH/mogo-och-bus/src/main/res/drawable/bus_disable_autopilot_icon.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/bus_disable_autopilot_icon.png rename to OCH/mogo-och-bus/src/main/res/drawable/bus_disable_autopilot_icon.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable/bus_dot_line.png b/OCH/mogo-och-bus/src/main/res/drawable/bus_dot_line.png new file mode 100644 index 0000000000..186001352c Binary files /dev/null and b/OCH/mogo-och-bus/src/main/res/drawable/bus_dot_line.png differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable/bus_ic_autopilot.png b/OCH/mogo-och-bus/src/main/res/drawable/bus_ic_autopilot.png new file mode 100644 index 0000000000..be978145dc Binary files /dev/null and b/OCH/mogo-och-bus/src/main/res/drawable/bus_ic_autopilot.png differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/bus_icon_arrived_station.png b/OCH/mogo-och-bus/src/main/res/drawable/bus_icon_arrived_station.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/bus_icon_arrived_station.png rename to OCH/mogo-och-bus/src/main/res/drawable/bus_icon_arrived_station.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/bus_icon_arriving_station.png b/OCH/mogo-och-bus/src/main/res/drawable/bus_icon_arriving_station.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/bus_icon_arriving_station.png rename to OCH/mogo-och-bus/src/main/res/drawable/bus_icon_arriving_station.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable/bus_icon_not_arrive_station.png b/OCH/mogo-och-bus/src/main/res/drawable/bus_icon_not_arrive_station.png new file mode 100644 index 0000000000..e0bb24c526 Binary files /dev/null and b/OCH/mogo-och-bus/src/main/res/drawable/bus_icon_not_arrive_station.png differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/bus_light_green_nor.png b/OCH/mogo-och-bus/src/main/res/drawable/bus_light_green_nor.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/bus_light_green_nor.png rename to OCH/mogo-och-bus/src/main/res/drawable/bus_light_green_nor.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/bus_light_red_nor.png b/OCH/mogo-och-bus/src/main/res/drawable/bus_light_red_nor.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/bus_light_red_nor.png rename to OCH/mogo-och-bus/src/main/res/drawable/bus_light_red_nor.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/bus_lightyellow_nor.png b/OCH/mogo-och-bus/src/main/res/drawable/bus_lightyellow_nor.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/bus_lightyellow_nor.png rename to OCH/mogo-och-bus/src/main/res/drawable/bus_lightyellow_nor.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/bus_line_panel_bg.png b/OCH/mogo-och-bus/src/main/res/drawable/bus_line_panel_bg.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/bus_line_panel_bg.png rename to OCH/mogo-och-bus/src/main/res/drawable/bus_line_panel_bg.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/bus_line_panel_bg_1.png b/OCH/mogo-och-bus/src/main/res/drawable/bus_line_panel_bg_1.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/bus_line_panel_bg_1.png rename to OCH/mogo-och-bus/src/main/res/drawable/bus_line_panel_bg_1.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/bus_loading_autopilot_icon.png b/OCH/mogo-och-bus/src/main/res/drawable/bus_loading_autopilot_icon.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/bus_loading_autopilot_icon.png rename to OCH/mogo-och-bus/src/main/res/drawable/bus_loading_autopilot_icon.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/bus_och_dot_line.png b/OCH/mogo-och-bus/src/main/res/drawable/bus_och_dot_line.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/bus_och_dot_line.png rename to OCH/mogo-och-bus/src/main/res/drawable/bus_och_dot_line.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable/bus_operation_status_bg.xml b/OCH/mogo-och-bus/src/main/res/drawable/bus_operation_status_bg.xml index 753d85e3ec..4d612cb98f 100644 --- a/OCH/mogo-och-bus/src/main/res/drawable/bus_operation_status_bg.xml +++ b/OCH/mogo-och-bus/src/main/res/drawable/bus_operation_status_bg.xml @@ -8,7 +8,7 @@ android:angle="315" /> \ No newline at end of file diff --git a/OCH/mogo-och-bus/src/main/res/drawable/bus_operation_status_select_bg.xml b/OCH/mogo-och-bus/src/main/res/drawable/bus_operation_status_select_bg.xml index 835c1fbaff..f617cd9fce 100644 --- a/OCH/mogo-och-bus/src/main/res/drawable/bus_operation_status_select_bg.xml +++ b/OCH/mogo-och-bus/src/main/res/drawable/bus_operation_status_select_bg.xml @@ -8,7 +8,7 @@ android:angle="225" /> \ No newline at end of file diff --git a/OCH/mogo-och-bus/src/main/res/drawable/bus_panel_anchor_bkg.xml b/OCH/mogo-och-bus/src/main/res/drawable/bus_panel_anchor_bkg.xml index 38fc28d893..21b39b7e37 100644 --- a/OCH/mogo-och-bus/src/main/res/drawable/bus_panel_anchor_bkg.xml +++ b/OCH/mogo-och-bus/src/main/res/drawable/bus_panel_anchor_bkg.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/OCH/mogo-och-bus/src/main/res/drawable/bus_panel_bkg.xml b/OCH/mogo-och-bus/src/main/res/drawable/bus_panel_bkg.xml index d7937835a0..69539ed40f 100644 --- a/OCH/mogo-och-bus/src/main/res/drawable/bus_panel_bkg.xml +++ b/OCH/mogo-och-bus/src/main/res/drawable/bus_panel_bkg.xml @@ -2,17 +2,17 @@ - + + android:bottom="3dp" + android:left="3dp" + android:right="3dp" + android:top="3dp"> - + diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/bus_right_autopilot_icon.png b/OCH/mogo-och-bus/src/main/res/drawable/bus_right_autopilot_icon.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/bus_right_autopilot_icon.png rename to OCH/mogo-och-bus/src/main/res/drawable/bus_right_autopilot_icon.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/bus_selected_btn.png b/OCH/mogo-och-bus/src/main/res/drawable/bus_selected_btn.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/bus_selected_btn.png rename to OCH/mogo-och-bus/src/main/res/drawable/bus_selected_btn.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/bus_setting_btn_bg.png b/OCH/mogo-och-bus/src/main/res/drawable/bus_setting_btn_bg.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/bus_setting_btn_bg.png rename to OCH/mogo-och-bus/src/main/res/drawable/bus_setting_btn_bg.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable/bus_setting_tip_red_cir_bg.xml b/OCH/mogo-och-bus/src/main/res/drawable/bus_setting_tip_red_cir_bg.xml index 0f456d52c7..203971340e 100644 --- a/OCH/mogo-och-bus/src/main/res/drawable/bus_setting_tip_red_cir_bg.xml +++ b/OCH/mogo-och-bus/src/main/res/drawable/bus_setting_tip_red_cir_bg.xml @@ -1,8 +1,8 @@ - - + + - + diff --git a/OCH/mogo-och-bus/src/main/res/drawable/bus_switch_line_btn_commit.xml b/OCH/mogo-och-bus/src/main/res/drawable/bus_switch_line_btn_commit.xml index 43f6d7af60..e94992d507 100644 --- a/OCH/mogo-och-bus/src/main/res/drawable/bus_switch_line_btn_commit.xml +++ b/OCH/mogo-och-bus/src/main/res/drawable/bus_switch_line_btn_commit.xml @@ -1,7 +1,7 @@ - + + android:bottomLeftRadius="130dp" + android:bottomRightRadius="30dp" + android:topLeftRadius="30dp" + android:topRightRadius="130dp" /> \ No newline at end of file diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/end_maker_icon.png b/OCH/mogo-och-bus/src/main/res/drawable/end_maker_icon.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/end_maker_icon.png rename to OCH/mogo-och-bus/src/main/res/drawable/end_maker_icon.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/icon_ai_normal.png b/OCH/mogo-och-bus/src/main/res/drawable/icon_ai_normal.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/icon_ai_normal.png rename to OCH/mogo-och-bus/src/main/res/drawable/icon_ai_normal.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/icon_ai_select.png b/OCH/mogo-och-bus/src/main/res/drawable/icon_ai_select.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/icon_ai_select.png rename to OCH/mogo-och-bus/src/main/res/drawable/icon_ai_select.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/icon_arrow_blue_bus.png b/OCH/mogo-och-bus/src/main/res/drawable/icon_arrow_blue_bus.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/icon_arrow_blue_bus.png rename to OCH/mogo-och-bus/src/main/res/drawable/icon_arrow_blue_bus.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/icon_arrow_green_bus.png b/OCH/mogo-och-bus/src/main/res/drawable/icon_arrow_green_bus.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/icon_arrow_green_bus.png rename to OCH/mogo-och-bus/src/main/res/drawable/icon_arrow_green_bus.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/icon_arrow_grey_bus.png b/OCH/mogo-och-bus/src/main/res/drawable/icon_arrow_grey_bus.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/icon_arrow_grey_bus.png rename to OCH/mogo-och-bus/src/main/res/drawable/icon_arrow_grey_bus.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/icon_bad_case_normal.png b/OCH/mogo-och-bus/src/main/res/drawable/icon_bad_case_normal.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/icon_bad_case_normal.png rename to OCH/mogo-och-bus/src/main/res/drawable/icon_bad_case_normal.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/icon_bad_case_select.png b/OCH/mogo-och-bus/src/main/res/drawable/icon_bad_case_select.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/icon_bad_case_select.png rename to OCH/mogo-och-bus/src/main/res/drawable/icon_bad_case_select.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/icon_no_bus_line.png b/OCH/mogo-och-bus/src/main/res/drawable/icon_no_bus_line.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/icon_no_bus_line.png rename to OCH/mogo-och-bus/src/main/res/drawable/icon_no_bus_line.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/icon_point_blue_bus.png b/OCH/mogo-och-bus/src/main/res/drawable/icon_point_blue_bus.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/icon_point_blue_bus.png rename to OCH/mogo-och-bus/src/main/res/drawable/icon_point_blue_bus.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/icon_point_green_bus.png b/OCH/mogo-och-bus/src/main/res/drawable/icon_point_green_bus.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/icon_point_green_bus.png rename to OCH/mogo-och-bus/src/main/res/drawable/icon_point_green_bus.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/icon_point_grey_bus.png b/OCH/mogo-och-bus/src/main/res/drawable/icon_point_grey_bus.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/icon_point_grey_bus.png rename to OCH/mogo-och-bus/src/main/res/drawable/icon_point_grey_bus.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/icon_station_start_end.png b/OCH/mogo-och-bus/src/main/res/drawable/icon_station_start_end.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/icon_station_start_end.png rename to OCH/mogo-och-bus/src/main/res/drawable/icon_station_start_end.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable/img_bus_status_bg.9.png b/OCH/mogo-och-bus/src/main/res/drawable/img_bus_status_bg.9.png deleted file mode 100644 index 0af2b9db73..0000000000 Binary files a/OCH/mogo-och-bus/src/main/res/drawable/img_bus_status_bg.9.png and /dev/null differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable/no_order_data.png b/OCH/mogo-och-bus/src/main/res/drawable/no_order_data.png new file mode 100644 index 0000000000..0e61996d3f Binary files /dev/null and b/OCH/mogo-och-bus/src/main/res/drawable/no_order_data.png differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/press_start_status.png b/OCH/mogo-och-bus/src/main/res/drawable/press_start_status.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/press_start_status.png rename to OCH/mogo-och-bus/src/main/res/drawable/press_start_status.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/start_failure.png b/OCH/mogo-och-bus/src/main/res/drawable/start_failure.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/start_failure.png rename to OCH/mogo-och-bus/src/main/res/drawable/start_failure.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/start_maker_icon.png b/OCH/mogo-och-bus/src/main/res/drawable/start_maker_icon.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/start_maker_icon.png rename to OCH/mogo-och-bus/src/main/res/drawable/start_maker_icon.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/start_success.png b/OCH/mogo-och-bus/src/main/res/drawable/start_success.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/start_success.png rename to OCH/mogo-och-bus/src/main/res/drawable/start_success.png diff --git a/OCH/mogo-och-bus/src/main/res/layout/activity_bus_switch_line.xml b/OCH/mogo-och-bus/src/main/res/layout/activity_bus_switch_line.xml index e5d7b2d7f5..703490ed83 100644 --- a/OCH/mogo-och-bus/src/main/res/layout/activity_bus_switch_line.xml +++ b/OCH/mogo-och-bus/src/main/res/layout/activity_bus_switch_line.xml @@ -30,8 +30,8 @@ @@ -44,7 +44,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:layout_marginLeft="28px" + android:layout_marginLeft="28dp" android:layout_toRightOf="@+id/bus_autopilot_btn_iv" android:text="自动驾驶" android:textColor="@color/bus_autopilot_text_color_normal" @@ -90,8 +90,8 @@ + android:layout_width="@dimen/dp_60" + android:layout_height="60dp" /> @@ -137,8 +137,8 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toRightOf="@id/bus_switch_model_layout"> @@ -156,8 +156,8 @@ app:layout_constraintLeft_toRightOf="@id/module_mogo_och_setting_layout"> @@ -175,8 +175,8 @@ app:layout_constraintLeft_toRightOf="@id/module_mogo_och_badcase_rl"> diff --git a/OCH/mogo-och-bus/src/main/res/layout/bus_no_data_common_view.xml b/OCH/mogo-och-bus/src/main/res/layout/bus_no_data_common_view.xml index b5a80553d0..e27a976e9b 100644 --- a/OCH/mogo-och-bus/src/main/res/layout/bus_no_data_common_view.xml +++ b/OCH/mogo-och-bus/src/main/res/layout/bus_no_data_common_view.xml @@ -9,8 +9,8 @@ + android:layout_marginTop="15dp"/> diff --git a/OCH/mogo-och-bus/src/main/res/values-xhdpi-2560x1440/dimens.xml b/OCH/mogo-och-bus/src/main/res/values-xhdpi-2560x1440/dimens.xml index dc56f53ed7..d38ff003b4 100644 --- a/OCH/mogo-och-bus/src/main/res/values-xhdpi-2560x1440/dimens.xml +++ b/OCH/mogo-och-bus/src/main/res/values-xhdpi-2560x1440/dimens.xml @@ -1,142 +1,142 @@ - 300px - 348px - 211px - 276px + 300dp + 348dp + 211dp + 276dp - 220px - 98px - 159px + 220dp + 98dp + 159dp - 32px - 20px - 40px - 42px + 32dp + 20dp + 40dp + 42dp - 15px + 15dp - 20px - 36px - 28px - 36px + 20dp + 36dp + 28dp + 36dp - 3px - 3px - 17px - 17px + 3dp + 3dp + 17dp + 17dp - 300px - 270px - 30px - 24px - 24px - 1px - 30px - 23px - 30px - 146px - 20px - 23px - 30px - 23px - 26px - 34px - 20px - 80px - 3px - 34px - 20px - 28px - 27px + 300dp + 270dp + 30dp + 24dp + 24dp + 1dp + 30dp + 23dp + 30dp + 146dp + 20dp + 23dp + 30dp + 23dp + 26dp + 34dp + 20dp + 80dp + 3dp + 34dp + 20dp + 28dp + 27dp - 28px - 20px - 20px - 64px - 16px + 28dp + 20dp + 20dp + 64dp + 16dp - 40px - 40px - 46px - 24px + 40dp + 40dp + 46dp + 24dp - 530px - 492px + 530dp + 492dp - 20px - 20px - 70px - 130px - 93px - 150px - 70px + 20dp + 20dp + 70dp + 130dp + 93dp + 150dp + 70dp - 24px - 616px - 180px + 24dp + 616dp + 180dp - 112px - 112px + 112dp + 112dp - 92px + 92dp - 30px - 618px - 754px + 30dp + 618dp + 754dp - 40px - 32px - 13px - 12px - 350px + 40dp + 32dp + 13dp + 12dp + 350dp - 460px - 30px + 460dp + 30dp - 110px - 40px - 320px - 20px - 40px - 320px - 320px - 70px - 616px - 130px - 30px - 279px - 112px - 22px - 36px - 50px - 60px + 110dp + 40dp + 320dp + 20dp + 40dp + 320dp + 320dp + 70dp + 616dp + 130dp + 30dp + 279dp + 112dp + 22dp + 36dp + 50dp + 60dp - 46px - 700px - 120px - 560px - 116px + 46dp + 700dp + 120dp + 560dp + 116dp - 20px + 20dp - 225px - 154px - 60px - 40px - 23px - 210px - 120px - 15px - 17px - 154px - 130px - 60px - 27px + 225dp + 154dp + 60dp + 40dp + 23dp + 210dp + 120dp + 15dp + 17dp + 154dp + 130dp + 60dp + 27dp \ No newline at end of file diff --git a/OCH/mogo-och-bus/src/main/res/values-xhdpi-2560x1600/dimens.xml b/OCH/mogo-och-bus/src/main/res/values-xhdpi-2560x1600/dimens.xml index 50b5675277..506b9cddc5 100644 --- a/OCH/mogo-och-bus/src/main/res/values-xhdpi-2560x1600/dimens.xml +++ b/OCH/mogo-och-bus/src/main/res/values-xhdpi-2560x1600/dimens.xml @@ -1,140 +1,140 @@ - 300px - 348px - 211px - 276px + 300dp + 348dp + 211dp + 276dp - 220px - 98px - 159px + 220dp + 98dp + 159dp - 32px - 20px - 40px - 42px + 32dp + 20dp + 40dp + 42dp - 15px + 15dp - 20px - 36px - 28px - 36px + 20dp + 36dp + 28dp + 36dp - 3px - 3px - 17px - 17px + 3dp + 3dp + 17dp + 17dp - 300px - 270px - 30px - 24px - 24px - 1px - 30px - 23px - 30px - 146px - 20px - 23px - 30px - 23px - 26px - 34px - 20px - 80px - 3px - 34px - 20px - 28px - 27px + 300dp + 270dp + 30dp + 24dp + 24dp + 1dp + 30dp + 23dp + 30dp + 146dp + 20dp + 23dp + 30dp + 23dp + 26dp + 34dp + 20dp + 80dp + 3dp + 34dp + 20dp + 28dp + 27dp - 25.6px - 20px - 20px - 64px - 16px + 25.6dp + 20dp + 20dp + 64dp + 16dp - 40px - 40px - 46px - 24px + 40dp + 40dp + 46dp + 24dp - 530px - 492px + 530dp + 492dp - 20px - 20px - 70px - 130px - 93px - 150px - 70px + 20dp + 20dp + 70dp + 130dp + 93dp + 150dp + 70dp - 24px - 616px - 180px + 24dp + 616dp + 180dp - 112px - 112px + 112dp + 112dp - 92px + 92dp - 30px - 618px - 754px + 30dp + 618dp + 754dp - 40px - 32px - 13px - 12px - 350px + 40dp + 32dp + 13dp + 12dp + 350dp - 460px - 30px + 460dp + 30dp - 110px - 40px - 320px - 20px - 40px - 320px - 460px - 70px - 460px - 130px - 30px - 276px - 112px - 22px - 36px - 50px - 60px + 110dp + 40dp + 320dp + 20dp + 40dp + 320dp + 460dp + 70dp + 460dp + 130dp + 30dp + 276dp + 112dp + 22dp + 36dp + 50dp + 60dp - 46px - 700px - 120px - 560px - 116px - 50px + 46dp + 700dp + 120dp + 560dp + 116dp + 50dp - 225px - 154px - 60px - 40px - 23px - 210px - 120px - 15px - 17px - 154px - 130px - 60px - 27px + 225dp + 154dp + 60dp + 40dp + 23dp + 210dp + 120dp + 15dp + 17dp + 154dp + 130dp + 60dp + 27dp \ No newline at end of file diff --git a/OCH/mogo-och-bus/src/main/res/values/dimens.xml b/OCH/mogo-och-bus/src/main/res/values/dimens.xml index 83e1b61a23..b867566659 100644 --- a/OCH/mogo-och-bus/src/main/res/values/dimens.xml +++ b/OCH/mogo-och-bus/src/main/res/values/dimens.xml @@ -1,157 +1,157 @@ - 300px - 348px - 211px - 276px + 300dp + 348dp + 211dp + 276dp - 220px - 98px - 159px + 220dp + 98dp + 159dp - 32px - 20px - 26px - 20px + 32dp + 20dp + 26dp + 20dp - 15px + 15dp - 20px - 36px - 28px - 36px + 20dp + 36dp + 28dp + 36dp - 3px - 3px - 17px - 17px + 3dp + 3dp + 17dp + 17dp - 300px - 270px - 30px - 24px - 24px - 1px - 30px - 23px - 30px - 146px - 20px - 23px - 30px - 23px - 26px - 20px - 20px - 80px - 3px - 27px - 20px - 28px - 27px + 300dp + 270dp + 30dp + 24dp + 24dp + 1dp + 30dp + 23dp + 30dp + 146dp + 20dp + 23dp + 30dp + 23dp + 26dp + 20dp + 20dp + 80dp + 3dp + 27dp + 20dp + 28dp + 27dp - 16px - 16px - 16px - 16px - 16px + 16dp + 16dp + 16dp + 16dp + 16dp - 40px - 40px - 46px - 24px + 40dp + 40dp + 46dp + 24dp - 345px - 492px + 345dp + 492dp - 15px - 15px - 40px - 50px - 50px - 70px - 40px + 15dp + 15dp + 40dp + 50dp + 50dp + 70dp + 40dp - 24px - 300px - 100px + 24dp + 300dp + 100dp - 100px - 100px + 100dp + 100dp - 35px + 35dp - 15px - 300px - 270px + 15dp + 300dp + 270dp - 30px - 30px - 13px - 12px - 288px + 30dp + 30dp + 13dp + 12dp + 288dp - 460px - 30px + 460dp + 30dp - 80px - 28px - 200px - 10px - 40px - 200px - 300px - 60px - 300px - 110px - 20px + 80dp + 28dp + 200dp + 10dp + 40dp + 200dp + 300dp + 60dp + 300dp + 110dp + 20dp #FFFFFF #4DFFFFFF #FFFFFF #323C6F - 10px - 20px - 200px - 52px - 65px - 20px - 50px - 20px - 38px - 33px - 368px - 76px - 38px - 190px - 76px - 16px - 24px - 35px - 822px + 10dp + 20dp + 200dp + 52dp + 65dp + 20dp + 50dp + 20dp + 38dp + 33dp + 368dp + 76dp + 38dp + 190dp + 76dp + 16dp + 24dp + 35dp + 822dp - 30px - 450px - 72px - 280px - 58px - 20px + 30dp + 450dp + 72dp + 280dp + 58dp + 20dp - 225px - 154px - 60px - 40px - 23px - 210px - 120px - 15px - 17px - 154px - 130px - 60px + 225dp + 154dp + 60dp + 40dp + 23dp + 210dp + 120dp + 15dp + 17dp + 154dp + 130dp + 60dp - 27px + 27dp \ No newline at end of file diff --git a/OCH/mogo-och-bus/src/main/res/xml/bus_switch_line_list_item_scene.xml b/OCH/mogo-och-bus/src/main/res/xml/bus_switch_line_list_item_scene.xml index 76ec386d95..587a6eccbe 100644 --- a/OCH/mogo-och-bus/src/main/res/xml/bus_switch_line_list_item_scene.xml +++ b/OCH/mogo-och-bus/src/main/res/xml/bus_switch_line_list_item_scene.xml @@ -37,7 +37,7 @@ motion:layout_constraintEnd_toEndOf="parent" motion:layout_constraintTop_toBottomOf="@+id/switch_line_end_station" android:layout_width="match_parent" - android:layout_height="1px"/> + android:layout_height="1dp"/> - + \ No newline at end of file diff --git a/OCH/mogo-och-common-module/src/main/res/drawable/taxi_login_phone_error.xml b/OCH/mogo-och-common-module/src/main/res/drawable/taxi_login_phone_error.xml index 58e5bb0706..488fcdd155 100644 --- a/OCH/mogo-och-common-module/src/main/res/drawable/taxi_login_phone_error.xml +++ b/OCH/mogo-och-common-module/src/main/res/drawable/taxi_login_phone_error.xml @@ -1,7 +1,7 @@ - + - + \ No newline at end of file diff --git a/OCH/mogo-och-common-module/src/main/res/drawable/taxi_login_phone_normal.xml b/OCH/mogo-och-common-module/src/main/res/drawable/taxi_login_phone_normal.xml index ec15e081b0..c36db380dc 100644 --- a/OCH/mogo-och-common-module/src/main/res/drawable/taxi_login_phone_normal.xml +++ b/OCH/mogo-och-common-module/src/main/res/drawable/taxi_login_phone_normal.xml @@ -1,7 +1,7 @@ - + - + \ No newline at end of file diff --git a/OCH/mogo-och-common-module/src/main/res/drawable/taxi_login_unenable.xml b/OCH/mogo-och-common-module/src/main/res/drawable/taxi_login_unenable.xml index c4b8483971..434093fa5e 100644 --- a/OCH/mogo-och-common-module/src/main/res/drawable/taxi_login_unenable.xml +++ b/OCH/mogo-och-common-module/src/main/res/drawable/taxi_login_unenable.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/OCH/mogo-och-common-module/src/main/res/layout/dialog_bus_commit.xml b/OCH/mogo-och-common-module/src/main/res/layout/dialog_bus_commit.xml index 9f65ffcb79..03cf6737e0 100644 --- a/OCH/mogo-och-common-module/src/main/res/layout/dialog_bus_commit.xml +++ b/OCH/mogo-och-common-module/src/main/res/layout/dialog_bus_commit.xml @@ -2,10 +2,10 @@ + app:roundLayoutRadius="32dp"> + android:layout_marginTop="50dp"/> @@ -28,27 +28,27 @@ android:id="@+id/actv_login_phone_title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="159px" + android:layout_marginTop="159dp" android:text="@string/module_och_taxi_login_get_phone_title" android:textColor="@color/taxi_878890" - android:textSize="40px" + android:textSize="40dp" app:layout_constraintStart_toStartOf="@+id/actv_welcome_login_title" app:layout_constraintTop_toBottomOf="@+id/actv_welcome_login_title" /> @@ -57,10 +57,10 @@ android:id="@+id/actv_phone_code_title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="75px" + android:layout_marginTop="75dp" android:text="@string/module_och_taxi_login_get_code_title" android:textColor="@color/taxi_878890" - android:textSize="40px" + android:textSize="40dp" app:layout_constraintStart_toStartOf="@+id/ace_login_phone_value" app:layout_constraintTop_toBottomOf="@+id/ace_login_phone_value" /> @@ -69,9 +69,9 @@ app:layout_constraintStart_toStartOf="@+id/ace_login_phone_value" app:layout_constraintTop_toBottomOf="@+id/actv_phone_code_title" android:background="@drawable/taxi_login_phone_normal" - android:layout_width="760px" - android:layout_height="136px" - android:layout_marginTop="40px"/> + android:layout_width="760dp" + android:layout_height="136dp" + android:layout_marginTop="40dp"/> + android:layout_width="518dp" + android:layout_height="136dp"/> + android:layout_height="136dp"/> + android:textSize="40dp" + android:layout_width="760dp" + android:layout_height="136dp"/> - + - + @@ -18,7 +18,7 @@ - + diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-v29/taxi_video_seekbar_style.xml b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-v29/taxi_video_seekbar_style.xml index aa3e77ed6e..4a771923d6 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-v29/taxi_video_seekbar_style.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-v29/taxi_video_seekbar_style.xml @@ -3,14 +3,14 @@ xmlns:android="http://schemas.android.com/apk/res/android"> - + - + @@ -18,7 +18,7 @@ - + diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_autopilot_status_bg.xml b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_autopilot_status_bg.xml index 9350652b43..e323eca4c3 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_autopilot_status_bg.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_autopilot_status_bg.xml @@ -2,13 +2,13 @@ - + - + diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_speed_selector.xml b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_speed_selector.xml index aaf1d9add3..c87ede1476 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_speed_selector.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_speed_selector.xml @@ -2,13 +2,13 @@ - + - + diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_check_input_background.xml b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_check_input_background.xml index a60d36d074..9e7e8385d0 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_check_input_background.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_check_input_background.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_video_bg.xml b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_video_bg.xml index e97ad25151..d38d49055a 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_video_bg.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_video_bg.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_video_bg_shape.xml b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_video_bg_shape.xml index d4125c5071..f4cf3c03ad 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_video_bg_shape.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_video_bg_shape.xml @@ -2,9 +2,9 @@ + android:bottomLeftRadius="38dp" + android:bottomRightRadius="36dp" + android:topLeftRadius="36dp" + android:topRightRadius="36dp" /> diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_autopilot_status_bg.xml b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_autopilot_status_bg.xml index 97ac9039cc..041d4e61c2 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_autopilot_status_bg.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_autopilot_status_bg.xml @@ -2,13 +2,13 @@ - + - + diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_operation_status_bg.xml b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_operation_status_bg.xml index dde09aaba4..f4769a12ce 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_operation_status_bg.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_operation_status_bg.xml @@ -1,7 +1,7 @@ - + - - + + + android:bottom="20dp" + android:left="20dp" + android:right="20dp" + android:top="20dp"> - + - + diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_map_bottom_shape.xml b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_map_bottom_shape.xml index 381f4772b8..0d57639296 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_map_bottom_shape.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_map_bottom_shape.xml @@ -1,7 +1,7 @@ - + - + - - + + - + - + - + @@ -18,7 +18,7 @@ - + diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_video_seekbar_style.xml b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_video_seekbar_style.xml index 203d9a5332..c7f6f83c1c 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_video_seekbar_style.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_video_seekbar_style.xml @@ -3,14 +3,14 @@ xmlns:android="http://schemas.android.com/apk/res/android"> - + - + @@ -18,7 +18,7 @@ - + diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/list_comment_item.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/list_comment_item.xml index cf40ec6064..728fcd91d0 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/list_comment_item.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/list_comment_item.xml @@ -4,16 +4,16 @@ android:id="@+id/tv_comment" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="30px" - android:layout_marginBottom="30px" - android:layout_marginStart="16px" - android:layout_marginEnd="16px" + android:layout_marginTop="30dp" + android:layout_marginBottom="30dp" + android:layout_marginStart="16dp" + android:layout_marginEnd="16dp" android:background="@drawable/taxi_p_comment_select" android:button="@null" - android:paddingStart="45px" - android:paddingTop="15px" - android:paddingEnd="45px" - android:paddingBottom="15px" + android:paddingStart="45dp" + android:paddingTop="15dp" + android:paddingEnd="45dp" + android:paddingBottom="15dp" android:textColor="@color/taxi_order_status_textColor" - android:textSize="46px" + android:textSize="46dp" tools:text="非常好" /> diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/list_video_item_normal.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/list_video_item_normal.xml index c69b23bfc8..bfee44609b 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/list_video_item_normal.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/list_video_item_normal.xml @@ -1,8 +1,8 @@ + android:layout_width="1620dp" + android:layout_height="940dp"> + android:layout_width="1560dp" + android:layout_height="876dp" /> diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_activity_serving_order_view.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_activity_serving_order_view.xml index f59ae55046..f75dec7ff4 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_activity_serving_order_view.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_activity_serving_order_view.xml @@ -96,7 +96,7 @@ + app:xOffset="0dp" + app:yOffset="0dp"> @@ -207,10 +207,10 @@ + android:layout_height="0dp"/> + app:xOffset="0dp" + app:yOffset="0dp"> @@ -24,8 +24,8 @@ app:layout_constraintBottom_toBottomOf="@+id/aciv_title_icon" app:layout_constraintStart_toEndOf="@+id/aciv_title_icon" android:text="蘑菇资讯" - android:textSize="48px" - android:layout_marginStart="34px" + android:textSize="48dp" + android:layout_marginStart="34dp" android:includeFontPadding="false" android:textColor="@color/taxi_order_status_textColor" android:layout_width="wrap_content" @@ -34,10 +34,10 @@ @@ -49,7 +49,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@+id/rv_video_playlist" - android:layout_marginTop="67px" + android:layout_marginTop="67dp" app:vpi_orientation="horizontal" app:vpi_slide_mode="scale" app:vpi_slider_checked_color="@color/taxi_p_traffic_light_red_color_up" diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml index 0cfb6db266..e7a1b4fc67 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml @@ -10,8 +10,8 @@ android:id="@+id/steering_wheel" android:layout_width="@dimen/dp_630" android:layout_height="@dimen/dp_630" - android:layout_marginLeft="-59px" - android:layout_marginTop="-40px" + android:layout_marginLeft="-59dp" + android:layout_marginTop="-40dp" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -20,8 +20,8 @@ android:layout_width="@dimen/module_mogo_och_operation_status_bg_width" android:layout_height="@dimen/module_mogo_och_operation_status_bg_height" android:layout_gravity="center_horizontal" - android:layout_marginLeft="40px" - android:layout_marginTop="48px" + android:layout_marginLeft="40dp" + android:layout_marginTop="48dp" android:scaleType="fitXY" android:src="@drawable/taxi_p_un_auto_nor" android:visibility="gone" @@ -33,8 +33,8 @@ android:layout_width="@dimen/module_mogo_och_operation_status_bg_width" android:layout_height="@dimen/module_mogo_och_operation_status_bg_height" android:layout_gravity="center" - android:layout_marginLeft="40px" - android:layout_marginTop="40px" + android:layout_marginLeft="40dp" + android:layout_marginTop="40dp" android:layout_marginBottom="@dimen/dp_50" android:background="@drawable/taxi_p_switch_map_medium" android:scaleType="fitXY" @@ -43,8 +43,8 @@ @@ -54,7 +54,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintBottom_toBottomOf="parent" - android:layout_marginBottom="172px" + android:layout_marginBottom="172dp" app:vpi_orientation="horizontal" app:vpi_slide_mode="scale" app:vpi_slider_checked_color="@color/taxi_p_traffic_light_red_color_up" @@ -67,8 +67,8 @@ app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" - android:layout_width="143px" - android:layout_height="308px"/> + android:layout_width="143dp" + android:layout_height="308dp"/> diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_navi_view.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_navi_view.xml index 49d6454265..f3dc5139bd 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_navi_view.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_navi_view.xml @@ -3,8 +3,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="wrap_content" android:layout_height="wrap_content" - app:cardCornerRadius="30px" - app:cardElevation="8px" + app:cardCornerRadius="30dp" + app:cardElevation="8dp" app:cardUseCompatPadding="true" app:cardPreventCornerOverlap="false" app:cardBackgroundColor="@android:color/transparent"> @@ -24,8 +24,8 @@ - - + + diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_passenger_check_panel.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_passenger_check_panel.xml index e7dc22f64a..3a1e8f0ee6 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_passenger_check_panel.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_passenger_check_panel.xml @@ -131,19 +131,19 @@ + app:shadowRadius="60dp" + app:xOffset="0dp" + app:yOffset="0dp"> diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_start_autopilot_view.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_start_autopilot_view.xml index 3416786abb..4ccfbd6a7c 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_start_autopilot_view.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_start_autopilot_view.xml @@ -27,8 +27,8 @@ @@ -47,8 +47,8 @@ app:layout_constraintEnd_toEndOf="parent" android:layout_width="wrap_content" android:layout_height="match_parent" - android:paddingEnd="40px" - android:paddingStart="93px" + android:paddingEnd="40dp" + android:paddingStart="93dp" android:src="@drawable/taxi_p_change_full" /> + android:textSize="38dp" /> @@ -98,21 +98,21 @@ android:gravity="bottom" android:text="02:23" android:textColor="@android:color/white" - android:textSize="36px" /> + android:textSize="36dp" /> @@ -125,8 +125,8 @@ app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" android:gravity="bottom" - android:layout_marginEnd="55px" - android:textSize="36px" + android:layout_marginEnd="55dp" + android:textSize="36dp" android:textColor="@android:color/white"/> @@ -136,7 +136,7 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" android:visibility="gone" - android:layout_width="143px" - android:layout_height="308px"/> + android:layout_width="143dp" + android:layout_height="308dp"/> diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_window_float_distance_info.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_window_float_distance_info.xml index 30067d11e4..e95cf77a24 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_window_float_distance_info.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_window_float_distance_info.xml @@ -17,10 +17,10 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:shadowColor="#80000000" - app:shadowRadius="60px" + app:shadowRadius="60dp" app:shadow_position="outer" - app:xOffset="0px" - app:yOffset="0px"> + app:xOffset="0dp" + app:yOffset="0dp"> @@ -27,15 +27,15 @@ app:layout_constraintBottom_toBottomOf="parent" android:orientation="horizontal" android:gravity="center_vertical" - android:layout_width="143px" - android:layout_height="308px"> + android:layout_width="143dp" + android:layout_height="308dp"> + android:layout_width="25dp" + android:layout_height="33dp"/> diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/values-sw320dp/dimens.xml b/OCH/mogo-och-taxi-passenger/src/main/res/values-sw320dp/dimens.xml index e7c921b084..1f2c737967 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/values-sw320dp/dimens.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/values-sw320dp/dimens.xml @@ -1,68 +1,68 @@ - 496px - 560px - 910px - 800px - 222px - 1120px - 162px - 446px - 400px - 160px - 432px - 64px - 616px - 132px - 300px - 240px - 400px - 160px - 280px - 120px + 496dp + 560dp + 910dp + 800dp + 222dp + 1120dp + 162dp + 446dp + 400dp + 160dp + 432dp + 64dp + 616dp + 132dp + 300dp + 240dp + 400dp + 160dp + 280dp + 120dp - 220px - 420px - 220px + 220dp + 420dp + 220dp - 624px - 984px + 624dp + 984dp - 225px - 154px - 60px - 40px - 23px - 210px - 120px - 15px - 17px - 154px - 130px - 60px + 225dp + 154dp + 60dp + 40dp + 23dp + 210dp + 120dp + 15dp + 17dp + 154dp + 130dp + 60dp - 31px - 110px - 10px - 70px - 120px - 39px - 20px - 30px + 31dp + 110dp + 10dp + 70dp + 120dp + 39dp + 20dp + 30dp - 82px - 42px + 82dp + 42dp - 144px - 32px - 32px - 36px - 50px - 34px - 28px + 144dp + 32dp + 32dp + 36dp + 50dp + 34dp + 28dp - 52px - 520px - 150px + 52dp + 520dp + 150dp \ No newline at end of file diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/values-xhdpi-2560x1440/dimens.xml b/OCH/mogo-och-taxi-passenger/src/main/res/values-xhdpi-2560x1440/dimens.xml index 5b3282e466..2234311daa 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/values-xhdpi-2560x1440/dimens.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/values-xhdpi-2560x1440/dimens.xml @@ -1,132 +1,132 @@ - 40px - 40px - 46px - 24px + 40dp + 40dp + 46dp + 24dp - 530px - 492px + 530dp + 492dp - 20px - 20px - 70px - 130px - 93px - 150px - 70px + 20dp + 20dp + 70dp + 130dp + 93dp + 150dp + 70dp - 24px - 460px - 140px + 24dp + 460dp + 140dp - 120px - 120px + 120dp + 120dp - 83px + 83dp - 40px - 466px - 414px + 40dp + 466dp + 414dp - - 46px - 13px - 12px - 350px + + 46dp + 13dp + 12dp + 350dp - 460px - 30px - 15px - 25px - 25px - 32px - 1px - 20px - 20px - 20px - 140px - 20px - 41px - 17px - 41px - 42px - 32px - 32px - 84px - 3px - 20px - 32px - 36px - 17px - 31.5px + 460dp + 30dp + 15dp + 25dp + 25dp + 32dp + 1dp + 20dp + 20dp + 20dp + 140dp + 20dp + 41dp + 17dp + 41dp + 42dp + 32dp + 32dp + 84dp + 3dp + 20dp + 32dp + 36dp + 17dp + 31.5dp - 496px - 560px - 910px - 800px - 222px - 1120px - 162px - 446px - 400px - 160px - 432px - 64px - 616px - 132px - 300px - 240px - 400px - 160px - 280px - 120px + 496dp + 560dp + 910dp + 800dp + 222dp + 1120dp + 162dp + 446dp + 400dp + 160dp + 432dp + 64dp + 616dp + 132dp + 300dp + 240dp + 400dp + 160dp + 280dp + 120dp - 220px - 420px - 220px + 220dp + 420dp + 220dp - 624px - 984px + 624dp + 984dp - 225px - 154px - 60px - 40px - 23px - 210px - 120px - 15px - 17px - 154px - 130px - 60px + 225dp + 154dp + 60dp + 40dp + 23dp + 210dp + 120dp + 15dp + 17dp + 154dp + 130dp + 60dp - 31px - 110px - 10px - 70px - 120px - 39px - 20px - 30px + 31dp + 110dp + 10dp + 70dp + 120dp + 39dp + 20dp + 30dp - 82px - 42px + 82dp + 42dp - 144px - 32px - 32px - 36px - 50px - 34px - 28px + 144dp + 32dp + 32dp + 36dp + 50dp + 34dp + 28dp - 52px - 520px - 150px + 52dp + 520dp + 150dp \ No newline at end of file diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/values/dimens.xml b/OCH/mogo-och-taxi-passenger/src/main/res/values/dimens.xml index 8218eb8018..7fade6492d 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/values/dimens.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/values/dimens.xml @@ -1,126 +1,126 @@ - 40px - 46px - 24px + 40dp + 46dp + 24dp - 345px - 492px + 345dp + 492dp - 15px - 15px - 40px - 50px - 50px - 70px - 40px + 15dp + 15dp + 40dp + 50dp + 50dp + 70dp + 40dp - 24px - 300px - 100px + 24dp + 300dp + 100dp - 100px - 100px + 100dp + 100dp - 35px + 35dp - 15px - 300px - 270px + 15dp + 300dp + 270dp - 30px - 13px - 12px - 288px + 30dp + 13dp + 12dp + 288dp - 460px - 30px - 5px - 20px - 20px - 20px - 1px - 20px - 20px - 20px - 140px - 20px - 20px - 17px - 20px - 26px - 20px - 20px - 64px - 3px - 20px - 20px - 24px - 17px - 22.5px + 460dp + 30dp + 5dp + 20dp + 20dp + 20dp + 1dp + 20dp + 20dp + 20dp + 140dp + 20dp + 20dp + 17dp + 20dp + 26dp + 20dp + 20dp + 64dp + 3dp + 20dp + 20dp + 24dp + 17dp + 22.5dp - 496px - 560px - 910px - 800px - 222px - 1120px - 162px - 446px - 400px - 160px - 432px - 64px - 616px - 132px - 300px - 240px - 400px - 160px - 280px - 120px + 496dp + 560dp + 910dp + 800dp + 222dp + 1120dp + 162dp + 446dp + 400dp + 160dp + 432dp + 64dp + 616dp + 132dp + 300dp + 240dp + 400dp + 160dp + 280dp + 120dp - 220px - 420px - 220px + 220dp + 420dp + 220dp - 624px - 984px + 624dp + 984dp - 225px - 154px - 60px - 40px - 23px - 210px - 120px - 15px - 17px - 154px - 130px - 60px + 225dp + 154dp + 60dp + 40dp + 23dp + 210dp + 120dp + 15dp + 17dp + 154dp + 130dp + 60dp - 30px - 110px - 10px - 70px - 120px - 39px - 20px - 30px + 30dp + 110dp + 10dp + 70dp + 120dp + 39dp + 20dp + 30dp - 82px - 42px + 82dp + 42dp - 144px - 32px - 32px - 36px - 50px - 34px - 28px + 144dp + 32dp + 32dp + 36dp + 50dp + 34dp + 28dp - 52px - 520px - 150px + 52dp + 520dp + 150dp \ No newline at end of file diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/values/styles.xml b/OCH/mogo-och-taxi-passenger/src/main/res/values/styles.xml index e50749e0fd..d031453b71 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/values/styles.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/values/styles.xml @@ -4,11 +4,11 @@ 18sp \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index f4b753b2c2..e83cec1b84 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -18,6 +18,12 @@ android:theme="@style/AppTheme.App" android:usesCleartextTraffic="true" tools:replace="android:label"> + + - 16px - 352px - 32px - 32px - 16.5px - 12px - 20px - 18px - 210px - 13px - 15px - 18px - 320px - 180px - 16px - 320px - 160px - 9px - 20px - 0px - 48px - 10px - 14px - 28px - 20px - 20px - 90px - 5px - 84px - 38px - 36px - 100px - 64px - 24px - 16px - 44px - 2px - 20px - 27px - 16px - 64px - 8px - 16px + 16dp + 352dp + 32dp + 32dp + 16.5dp + 12dp + 20dp + 18dp + 210dp + 13dp + 15dp + 18dp + 320dp + 180dp + 16dp + 320dp + 160dp + 9dp + 20dp + 0dp + 48dp + 10dp + 14dp + 28dp + 20dp + 20dp + 90dp + 5dp + 84dp + 38dp + 36dp + 100dp + 64dp + 24dp + 16dp + 44dp + 2dp + 20dp + 27dp + 16dp + 64dp + 8dp + 16dp - 22px - 27px - 14px - 1.5px - 24px - 10px - 8px - 560px - 194px - 266px - 178px - 8px - 12px - 16px - 19px - 30px - 16px - 8px - 17px - 19px - 16px - 11px - 6px - 18px - 10px - 17px - 10px - 8px - 242px - 270px - 374px - 24px - 19px - 8px - 328px - 164px - 15px - 150px - 20px - 0px - 310px - 350px - 60px - 2px - 2px - 8px - 28px - 16px - 16px - 12px - 5px - 118px - 86px - 8px + 22dp + 27dp + 14dp + 1.5dp + 24dp + 10dp + 8dp + 560dp + 194dp + 266dp + 178dp + 8dp + 12dp + 16dp + 19dp + 30dp + 16dp + 8dp + 17dp + 19dp + 16dp + 11dp + 6dp + 18dp + 10dp + 17dp + 10dp + 8dp + 242dp + 270dp + 374dp + 24dp + 19dp + 8dp + 328dp + 164dp + 15dp + 150dp + 20dp + 0dp + 310dp + 350dp + 60dp + 2dp + 2dp + 8dp + 28dp + 16dp + 16dp + 12dp + 5dp + 118dp + 86dp + 8dp \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/res/values-mdpi/dimens.xml b/core/function-impl/mogo-core-function-bindingcar/src/main/res/values-mdpi/dimens.xml index 1f1106b6c5..5f7d672f98 100644 --- a/core/function-impl/mogo-core-function-bindingcar/src/main/res/values-mdpi/dimens.xml +++ b/core/function-impl/mogo-core-function-bindingcar/src/main/res/values-mdpi/dimens.xml @@ -1,101 +1,101 @@ - 16px - 352px - 32px - 32px - 16.5px - 12px - 20px - 18px - 210px - 13px - 15px - 18px - 320px - 180px - 16px - 320px - 160px - 9px - 20px - 0px - 48px - 10px - 14px - 28px - 20px - 20px - 90px - 5px - 84px - 38px - 36px - 100px - 64px - 24px - 16px - 44px - 2px - 20px - 27px - 16px - 64px - 8px - 16px + 16dp + 352dp + 32dp + 32dp + 16.5dp + 12dp + 20dp + 18dp + 210dp + 13dp + 15dp + 18dp + 320dp + 180dp + 16dp + 320dp + 160dp + 9dp + 20dp + 0dp + 48dp + 10dp + 14dp + 28dp + 20dp + 20dp + 90dp + 5dp + 84dp + 38dp + 36dp + 100dp + 64dp + 24dp + 16dp + 44dp + 2dp + 20dp + 27dp + 16dp + 64dp + 8dp + 16dp - 22px - 27px - 14px - 1.5px - 24px - 10px - 8px - 560px - 194px - 266px - 178px - 8px - 12px - 16px - 19px - 30px - 16px - 8px - 17px - 19px - 16px - 11px - 6px - 18px - 10px - 17px - 10px - 8px - 242px - 270px - 374px - 24px - 19px - 8px - 328px - 164px - 15px - 150px - 20px - 0px - 310px - 350px - 60px - 2px - 2px - 8px - 28px - 16px - 16px - 12px - 5px - 118px - 86px - 8px + 22dp + 27dp + 14dp + 1.5dp + 24dp + 10dp + 8dp + 560dp + 194dp + 266dp + 178dp + 8dp + 12dp + 16dp + 19dp + 30dp + 16dp + 8dp + 17dp + 19dp + 16dp + 11dp + 6dp + 18dp + 10dp + 17dp + 10dp + 8dp + 242dp + 270dp + 374dp + 24dp + 19dp + 8dp + 328dp + 164dp + 15dp + 150dp + 20dp + 0dp + 310dp + 350dp + 60dp + 2dp + 2dp + 8dp + 28dp + 16dp + 16dp + 12dp + 5dp + 118dp + 86dp + 8dp \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/res/values-xhdpi-2560x1440/dimens.xml b/core/function-impl/mogo-core-function-bindingcar/src/main/res/values-xhdpi-2560x1440/dimens.xml index 4afc379245..30c6c01239 100644 --- a/core/function-impl/mogo-core-function-bindingcar/src/main/res/values-xhdpi-2560x1440/dimens.xml +++ b/core/function-impl/mogo-core-function-bindingcar/src/main/res/values-xhdpi-2560x1440/dimens.xml @@ -1,39 +1,39 @@ - 230px - 230px - 230px - 30px - 21px - 34px - 33px - 2px - 120px - 30px - 55px - 42px - 208px - 394px - 42px - 567px - 100px - 20px - 34px - 34px + 230dp + 230dp + 230dp + 30dp + 21dp + 34dp + 33dp + 2dp + 120dp + 30dp + 55dp + 42dp + 208dp + 394dp + 42dp + 567dp + 100dp + 20dp + 34dp + 34dp - 1200px - 763px - 32px - 107px - 107px - 40px - 54px - 56px - 1000px - 33px - 43px - 20px + 1200dp + 763dp + 32dp + 107dp + 107dp + 40dp + 54dp + 56dp + 1000dp + 33dp + 43dp + 20dp \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/res/values-xhdpi/dimens.xml b/core/function-impl/mogo-core-function-bindingcar/src/main/res/values-xhdpi/dimens.xml index c7e71bf8e5..10045d18f9 100644 --- a/core/function-impl/mogo-core-function-bindingcar/src/main/res/values-xhdpi/dimens.xml +++ b/core/function-impl/mogo-core-function-bindingcar/src/main/res/values-xhdpi/dimens.xml @@ -1,101 +1,101 @@ - 30px - 660px - 60px - 60px - 31px - 22px - 38px - 32px - 394px - 24px - 28px - 34px - 600px - 338px - 30px - 605px - 300px - 16px - 53px - 0px - 90px - 20px - 26px - 50px - 36px - 36px - 160px - 10px - 151px - 72px - 68px - 180px - 120px - 50px - 22px - 6px - 84px + 30dp + 660dp + 60dp + 60dp + 31dp + 22dp + 38dp + 32dp + 394dp + 24dp + 28dp + 34dp + 600dp + 338dp + 30dp + 605dp + 300dp + 16dp + 53dp + 0dp + 90dp + 20dp + 26dp + 50dp + 36dp + 36dp + 160dp + 10dp + 151dp + 72dp + 68dp + 180dp + 120dp + 50dp + 22dp + 6dp + 84dp - 40px - 52px - 28px - 120px - 11px - 26px - 42px - 51px - 27px - 3px - 45px - 20px - 16px - 1000px - 350px - 480px - 320px - 17px - 21px - 30px - 33px - 50px - 30px - 14px - 30px - 27px - 30px - 21px - 11px - 34px - 20px - 30px - 20px - 15px - 242px - 486px - 700px - 30px - 33px - 16px - 640px - 296px - 30px - 250px - 20px - 0px - 618px - 350px - 120px - 20px - 20px - 20px - 50px - 28px - 29px - 22px - 11px - 212px - 154px - 10px + 40dp + 52dp + 28dp + 120dp + 11dp + 26dp + 42dp + 51dp + 27dp + 3dp + 45dp + 20dp + 16dp + 1000dp + 350dp + 480dp + 320dp + 17dp + 21dp + 30dp + 33dp + 50dp + 30dp + 14dp + 30dp + 27dp + 30dp + 21dp + 11dp + 34dp + 20dp + 30dp + 20dp + 15dp + 242dp + 486dp + 700dp + 30dp + 33dp + 16dp + 640dp + 296dp + 30dp + 250dp + 20dp + 0dp + 618dp + 350dp + 120dp + 20dp + 20dp + 20dp + 50dp + 28dp + 29dp + 22dp + 11dp + 212dp + 154dp + 10dp \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/res/values/dimens.xml b/core/function-impl/mogo-core-function-bindingcar/src/main/res/values/dimens.xml index dc5f0d6635..12de544c7c 100644 --- a/core/function-impl/mogo-core-function-bindingcar/src/main/res/values/dimens.xml +++ b/core/function-impl/mogo-core-function-bindingcar/src/main/res/values/dimens.xml @@ -1,126 +1,126 @@ - 16px - 352px - 32px - 32px - 16.5px - 12px - 20px - 18px - 210px - 13px - 15px - 18px - 320px - 180px - 16px - 320px - 160px - 9px - 20px - 0px - 48px - 10px - 14px - 50px - 20px - 20px - 90px - 5px - 84px - 38px - 36px - 100px - 64px - 24px - 16px - 44px - 2px - 20px - 27px - 16px - 64px - 8px - 16px + 16dp + 352dp + 32dp + 32dp + 16.5dp + 12dp + 20dp + 18dp + 210dp + 13dp + 15dp + 18dp + 320dp + 180dp + 16dp + 320dp + 160dp + 9dp + 20dp + 0dp + 48dp + 10dp + 14dp + 50dp + 20dp + 20dp + 90dp + 5dp + 84dp + 38dp + 36dp + 100dp + 64dp + 24dp + 16dp + 44dp + 2dp + 20dp + 27dp + 16dp + 64dp + 8dp + 16dp - 22px - 27px - 14px - 1.5px - 24px - 10px - 8px - 560px - 194px - 266px - 178px - 8px - 12px - 16px - 19px - 30px - 16px - 8px - 17px - 19px - 16px - 11px - 6px - 18px - 10px - 17px - 10px - 8px - 242px - 270px - 374px - 24px - 19px - 8px - 328px - 164px - 15px - 150px - 20px - 0px - 310px - 350px - 60px - 2px - 2px - 8px - 28px - 16px - 16px - 12px - 5px - 118px - 86px - 8px + 22dp + 27dp + 14dp + 1.5dp + 24dp + 10dp + 8dp + 560dp + 194dp + 266dp + 178dp + 8dp + 12dp + 16dp + 19dp + 30dp + 16dp + 8dp + 17dp + 19dp + 16dp + 11dp + 6dp + 18dp + 10dp + 17dp + 10dp + 8dp + 242dp + 270dp + 374dp + 24dp + 19dp + 8dp + 328dp + 164dp + 15dp + 150dp + 20dp + 0dp + 310dp + 350dp + 60dp + 2dp + 2dp + 8dp + 28dp + 16dp + 16dp + 12dp + 5dp + 118dp + 86dp + 8dp - 34px - 567px - 100px + 34dp + 567dp + 100dp - 2px - 120px - 30px - 55px - 42px - 208px + 2dp + 120dp + 30dp + 55dp + 42dp + 208dp - 1200px - 763px - 32px - 107px - 107px - 40px - 54px - 56px - 1000px - 33px - 43px - 20px + 1200dp + 763dp + 32dp + 107dp + 107dp + 40dp + 54dp + 56dp + 1000dp + 33dp + 43dp + 20dp \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/values-hdpi/dimens.xml b/core/function-impl/mogo-core-function-chat/src/main/res/values-hdpi/dimens.xml index 40915903bf..5ac847ff56 100644 --- a/core/function-impl/mogo-core-function-chat/src/main/res/values-hdpi/dimens.xml +++ b/core/function-impl/mogo-core-function-chat/src/main/res/values-hdpi/dimens.xml @@ -1,10 +1,10 @@ - 300px - 100px - 27px - 18px - 10px - 100px - 63px + 300dp + 100dp + 27dp + 18dp + 10dp + 100dp + 63dp diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/values-xhdpi-2560x1440/dimens.xml b/core/function-impl/mogo-core-function-chat/src/main/res/values-xhdpi-2560x1440/dimens.xml index 8f264f035d..c65a228469 100644 --- a/core/function-impl/mogo-core-function-chat/src/main/res/values-xhdpi-2560x1440/dimens.xml +++ b/core/function-impl/mogo-core-function-chat/src/main/res/values-xhdpi-2560x1440/dimens.xml @@ -1,18 +1,18 @@ - 460px - 144px - 560px - 142px - 20px - 30px - 30px - 144px - 88px - 86px - 20px - 26px - 24px - 40px - 139px + 460dp + 144dp + 560dp + 142dp + 20dp + 30dp + 30dp + 144dp + 88dp + 86dp + 20dp + 26dp + 24dp + 40dp + 139dp \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/values-xhdpi/dimens.xml b/core/function-impl/mogo-core-function-chat/src/main/res/values-xhdpi/dimens.xml index ee096204b6..d370a2b9cf 100644 --- a/core/function-impl/mogo-core-function-chat/src/main/res/values-xhdpi/dimens.xml +++ b/core/function-impl/mogo-core-function-chat/src/main/res/values-xhdpi/dimens.xml @@ -1,15 +1,15 @@ - 20px + 20dp - 22px - 300px - 100px + 22dp + 300dp + 100dp - 18px - 27px - 16px - 9px - 100px + 18dp + 27dp + 16dp + 9dp + 100dp diff --git a/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_button.xml b/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_button.xml index d159511f69..10feb4527f 100644 --- a/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_button.xml +++ b/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_button.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_chage_color.xml b/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_chage_color.xml index b4ea5bed32..1cf9ce798b 100644 --- a/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_chage_color.xml +++ b/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_chage_color.xml @@ -1,7 +1,7 @@ - + - + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_dialog_back.xml b/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_dialog_back.xml index a13abbb080..5933d02ccf 100644 --- a/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_dialog_back.xml +++ b/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_dialog_back.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_little_btn.xml b/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_little_btn.xml index 6ea2fa4947..b584257e2d 100644 --- a/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_little_btn.xml +++ b/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_little_btn.xml @@ -8,7 +8,7 @@ //描边 \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_little_btn_green.xml b/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_little_btn_green.xml index 14b5651e19..da99e04d76 100644 --- a/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_little_btn_green.xml +++ b/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_little_btn_green.xml @@ -8,7 +8,7 @@ //描边 \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_recycler_shape.xml b/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_recycler_shape.xml index 5cc105603d..e175afcdb2 100644 --- a/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_recycler_shape.xml +++ b/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_recycler_shape.xml @@ -1,11 +1,11 @@ + android:bottom="2dp" + android:left="2dp" + android:right="2dp" + android:top="0dp" /> \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_top_item_left_shape.xml b/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_top_item_left_shape.xml index 3ec31635a6..13e18e78f0 100644 --- a/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_top_item_left_shape.xml +++ b/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_top_item_left_shape.xml @@ -7,9 +7,9 @@ + android:right="0dp" + android:top="0dp" + android:bottom="0dp"> diff --git a/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_top_item_no_line_shape.xml b/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_top_item_no_line_shape.xml index 3607a98983..19da5954b6 100644 --- a/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_top_item_no_line_shape.xml +++ b/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_top_item_no_line_shape.xml @@ -1,10 +1,10 @@ + android:bottom="0dp" + android:left="0dp" + android:right="0dp" + android:top="0dp"> diff --git a/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_top_item_shape.xml b/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_top_item_shape.xml index ec7b08a577..451ca5250a 100644 --- a/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_top_item_shape.xml +++ b/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_top_item_shape.xml @@ -1,11 +1,11 @@ + android:bottom="0dp" + android:left="2dp" + android:right="2dp" + android:top="2dp" /> \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-check/src/main/res/layout/check_dialog.xml b/core/function-impl/mogo-core-function-check/src/main/res/layout/check_dialog.xml index 9f1605c508..f93d5e811b 100644 --- a/core/function-impl/mogo-core-function-check/src/main/res/layout/check_dialog.xml +++ b/core/function-impl/mogo-core-function-check/src/main/res/layout/check_dialog.xml @@ -2,8 +2,8 @@ diff --git a/core/function-impl/mogo-core-function-check/src/main/res/layout/check_info_list.xml b/core/function-impl/mogo-core-function-check/src/main/res/layout/check_info_list.xml index 876115d399..216cf5055f 100644 --- a/core/function-impl/mogo-core-function-check/src/main/res/layout/check_info_list.xml +++ b/core/function-impl/mogo-core-function-check/src/main/res/layout/check_info_list.xml @@ -2,8 +2,8 @@ @@ -44,7 +44,7 @@ - 1900px - 730px - 30px - 38px - 133px - 50px - 50px - 1452px - 715px - 32px - 1078px - 1660px - 1162px - 570px + 1900dp + 730dp + 30dp + 38dp + 133dp + 50dp + 50dp + 1452dp + 715dp + 32dp + 1078dp + 1660dp + 1162dp + 570dp \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-check/src/main/res/values/dimens.xml b/core/function-impl/mogo-core-function-check/src/main/res/values/dimens.xml index e95624af5e..e4f1efc9ca 100644 --- a/core/function-impl/mogo-core-function-check/src/main/res/values/dimens.xml +++ b/core/function-impl/mogo-core-function-check/src/main/res/values/dimens.xml @@ -1,17 +1,17 @@ - 1900px - 730px - 30px - 38px - 133px - 50px - 50px - 1452px - 715px - 32px - 1078px - 1660px - 1162px - 570px + 1900dp + 730dp + 30dp + 38dp + 133dp + 50dp + 50dp + 1452dp + 715dp + 32dp + 1078dp + 1660dp + 1162dp + 570dp diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xxhdpi/icon_ai_normal.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_ai_normal.png similarity index 100% rename from core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xxhdpi/icon_ai_normal.png rename to core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_ai_normal.png diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xxhdpi/icon_ai_select.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_ai_select.png similarity index 100% rename from core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xxhdpi/icon_ai_select.png rename to core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_ai_select.png diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xxhdpi/icon_ap_badcase_check.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_ap_badcase_check.png similarity index 100% rename from core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xxhdpi/icon_ap_badcase_check.png rename to core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_ap_badcase_check.png diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xxhdpi/icon_ap_badcase_default.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_ap_badcase_default.png similarity index 100% rename from core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xxhdpi/icon_ap_badcase_default.png rename to core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_ap_badcase_default.png diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xxhdpi/icon_audio.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_audio.png similarity index 100% rename from core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xxhdpi/icon_audio.png rename to core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_audio.png diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xxhdpi/icon_audio_bg.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_audio_bg.png similarity index 100% rename from core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xxhdpi/icon_audio_bg.png rename to core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_audio_bg.png diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xxhdpi/icon_bad_case_audio_normal.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_bad_case_audio_normal.png similarity index 100% rename from core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xxhdpi/icon_bad_case_audio_normal.png rename to core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_bad_case_audio_normal.png diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xxhdpi/icon_bad_case_audio_select.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_bad_case_audio_select.png similarity index 100% rename from core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xxhdpi/icon_bad_case_audio_select.png rename to core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_bad_case_audio_select.png diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xxhdpi/icon_bad_case_normal.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_bad_case_normal.png similarity index 100% rename from core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xxhdpi/icon_bad_case_normal.png rename to core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_bad_case_normal.png diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xxhdpi/icon_bad_case_select.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_bad_case_select.png similarity index 100% rename from core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xxhdpi/icon_bad_case_select.png rename to core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_bad_case_select.png diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xxhdpi/icon_cancel_bg.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_cancel_bg.png similarity index 100% rename from core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xxhdpi/icon_cancel_bg.png rename to core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_cancel_bg.png diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xxhdpi/icon_dev_status_can_disable.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_can_disable.png similarity index 100% rename from core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xxhdpi/icon_dev_status_can_disable.png rename to core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_can_disable.png diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xxhdpi/icon_dev_status_can_enable.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_can_enable.png similarity index 100% rename from core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xxhdpi/icon_dev_status_can_enable.png rename to core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_can_enable.png diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xxhdpi/icon_dev_status_gps_disable.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_gps_disable.png similarity index 100% rename from core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xxhdpi/icon_dev_status_gps_disable.png rename to core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_gps_disable.png diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xxhdpi/icon_dev_status_gps_enable.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_gps_enable.png similarity index 100% rename from core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xxhdpi/icon_dev_status_gps_enable.png rename to core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_gps_enable.png diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xxhdpi/icon_dev_status_ipc_disable.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_ipc_disable.png similarity index 100% rename from core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xxhdpi/icon_dev_status_ipc_disable.png rename to core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_ipc_disable.png diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xxhdpi/icon_dev_status_ipc_enable.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_ipc_enable.png similarity index 100% rename from core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xxhdpi/icon_dev_status_ipc_enable.png rename to core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_ipc_enable.png diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xxhdpi/icon_dev_status_net_disable.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_net_disable.png similarity index 100% rename from core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xxhdpi/icon_dev_status_net_disable.png rename to core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_net_disable.png diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xxhdpi/icon_dev_status_net_enable.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_net_enable.png similarity index 100% rename from core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xxhdpi/icon_dev_status_net_enable.png rename to core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_net_enable.png diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xxhdpi/icon_dev_status_route_enable.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_route_enable.png similarity index 100% rename from core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xxhdpi/icon_dev_status_route_enable.png rename to core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_route_enable.png diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xxhdpi/icon_dev_status_rtk_error.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_rtk_error.png similarity index 100% rename from core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xxhdpi/icon_dev_status_rtk_error.png rename to core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_rtk_error.png diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xxhdpi/icon_dev_status_rtk_good.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_rtk_good.png similarity index 100% rename from core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xxhdpi/icon_dev_status_rtk_good.png rename to core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_rtk_good.png diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xxhdpi/icon_dev_status_rtk_inaccurate.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_rtk_inaccurate.png similarity index 100% rename from core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xxhdpi/icon_dev_status_rtk_inaccurate.png rename to core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_rtk_inaccurate.png diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xxhdpi/icon_dev_status_rtk_not_credible.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_rtk_not_credible.png similarity index 100% rename from core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xxhdpi/icon_dev_status_rtk_not_credible.png rename to core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_rtk_not_credible.png diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xxhdpi/icon_dev_status_rtk_unknow.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_rtk_unknow.png similarity index 100% rename from core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xxhdpi/icon_dev_status_rtk_unknow.png rename to core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_rtk_unknow.png diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xxhdpi/icon_dev_status_slam_good.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_slam_good.png similarity index 100% rename from core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xxhdpi/icon_dev_status_slam_good.png rename to core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_slam_good.png diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xxhdpi/icon_dev_status_trace_unkown.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_trace_unkown.png similarity index 100% rename from core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xxhdpi/icon_dev_status_trace_unkown.png rename to core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_trace_unkown.png diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xxhdpi/icon_dev_status_track_enable.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_track_enable.png similarity index 100% rename from core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xxhdpi/icon_dev_status_track_enable.png rename to core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_track_enable.png diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xxhdpi/icon_dev_status_un_fold.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_un_fold.png similarity index 100% rename from core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xxhdpi/icon_dev_status_un_fold.png rename to core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_un_fold.png diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xxhdpi/icon_expand.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_expand.png similarity index 100% rename from core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xxhdpi/icon_expand.png rename to core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_expand.png diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xxhdpi/icon_num_bg.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_num_bg.png similarity index 100% rename from core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xxhdpi/icon_num_bg.png rename to core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_num_bg.png diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/ai_collect_title_bg.xml b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/ai_collect_title_bg.xml index fbbee12698..405cfdcfff 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/ai_collect_title_bg.xml +++ b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/ai_collect_title_bg.xml @@ -5,5 +5,5 @@ android:endColor="#1B2966" android:angle="0" /> - + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/badcase_record_edit_bg.xml b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/badcase_record_edit_bg.xml index 37827cc2b1..b565a8ee8a 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/badcase_record_edit_bg.xml +++ b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/badcase_record_edit_bg.xml @@ -1,7 +1,7 @@ - + - + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/report_button_bg.xml b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/report_button_bg.xml index 15a6a5f307..e6263838e3 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/report_button_bg.xml +++ b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/report_button_bg.xml @@ -5,5 +5,5 @@ android:endColor="#0056FF" android:angle="0" /> - + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/save_button_bg.xml b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/save_button_bg.xml index e08d1fa939..c1a3517583 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/save_button_bg.xml +++ b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/save_button_bg.xml @@ -5,5 +5,5 @@ android:endColor="#0056FF" android:angle="0" /> - + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/layout/layout_badcase_collect.xml b/core/function-impl/mogo-core-function-devatools/src/main/res/layout/layout_badcase_collect.xml index 3e0e5ae2a7..d80bfd1432 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/res/layout/layout_badcase_collect.xml +++ b/core/function-impl/mogo-core-function-devatools/src/main/res/layout/layout_badcase_collect.xml @@ -9,20 +9,20 @@ @@ -31,10 +31,10 @@ android:id="@+id/title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="19px" + android:layout_marginStart="19dp" android:text="请选择本次接管原因" android:textColor="#ffffff" - android:textSize="42px" + android:textSize="42dp" app:layout_constraintBottom_toBottomOf="@+id/blue_block" app:layout_constraintStart_toEndOf="@+id/blue_block" app:layout_constraintTop_toTopOf="@+id/blue_block" /> @@ -43,10 +43,10 @@ android:id="@+id/time_of_take_over" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="113px" - android:layout_marginTop="10px" + android:layout_marginStart="113dp" + android:layout_marginTop="10dp" android:textColor="#A7B6F0" - android:textSize="32px" + android:textSize="32dp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/blue_block" tools:text="接管时间：2021.12.21 14:32" /> @@ -55,49 +55,49 @@ android:id="@+id/rv_take_over" android:layout_width="match_parent" android:layout_height="0dp" - android:layout_marginTop="101px" + android:layout_marginTop="101dp" android:overScrollMode="never" app:layout_constraintBottom_toTopOf="@+id/ok" - android:layout_marginBottom="20px" + android:layout_marginBottom="20dp" app:layout_constraintTop_toBottomOf="@+id/time_of_take_over" /> + android:layout_marginBottom="150dp"/> + android:layout_marginBottom="150dp"/> @@ -33,36 +33,36 @@ android:layout_height="wrap_content" android:text="Case上报" android:textColor="#FFFFFFFF" - android:textSize="42px" + android:textSize="42dp" app:layout_constraintTop_toTopOf="@id/viewConfigTitleLine" app:layout_constraintBottom_toBottomOf="@id/viewConfigTitleLine" app:layout_constraintLeft_toLeftOf="@id/viewConfigTitleLine" - android:layout_marginStart="50px" + android:layout_marginStart="50dp" /> @@ -79,7 +79,7 @@ android:layout_height="wrap_content" android:text="身份" android:textColor="#FFFFFFFF" - android:textSize="38px" + android:textSize="38dp" app:layout_constraintTop_toTopOf="parent" app:layout_constraintLeft_toLeftOf="parent" /> @@ -90,10 +90,10 @@ android:layout_height="wrap_content" android:text="安全员" android:textColor="#FFFFFFFF" - android:textSize="38px" + android:textSize="38dp" android:button="@null" android:drawableLeft="@drawable/badcase_radio_button_style" - android:drawablePadding="30px" + android:drawablePadding="30dp" android:paddingTop="@dimen/dp_30" android:paddingBottom="@dimen/dp_30" android:paddingEnd="@dimen/dp_30" @@ -107,10 +107,10 @@ android:layout_height="wrap_content" android:text="QA、研发" android:textColor="#FFFFFFFF" - android:textSize="38px" + android:textSize="38dp" android:button="@null" android:drawableLeft="@drawable/badcase_radio_button_style" - android:drawablePadding="30px" + android:drawablePadding="30dp" android:paddingTop="@dimen/dp_30" android:paddingBottom="@dimen/dp_30" android:paddingEnd="@dimen/dp_30" @@ -125,10 +125,10 @@ android:layout_height="wrap_content" android:text="产品、运营、演示" android:textColor="#FFFFFFFF" - android:textSize="38px" + android:textSize="38dp" android:button="@null" android:drawableLeft="@drawable/badcase_radio_button_style" - android:drawablePadding="30px" + android:drawablePadding="30dp" android:paddingTop="@dimen/dp_30" android:paddingBottom="@dimen/dp_30" android:paddingEnd="@dimen/dp_30" @@ -142,7 +142,7 @@ android:layout_height="wrap_content" android:text="录制窗口" android:textColor="#FFFFFFFF" - android:textSize="38px" + android:textSize="38dp" app:layout_constraintTop_toBottomOf="@id/rbProduct" app:layout_constraintLeft_toLeftOf="@id/rbProduct" android:layout_marginTop="@dimen/dp_50" @@ -154,7 +154,7 @@ android:layout_height="wrap_content" android:text="主动：" android:textColor="#FFA7B6F0" - android:textSize="38px" + android:textSize="38dp" app:layout_constraintTop_toBottomOf="@id/tvRecordTitle" app:layout_constraintLeft_toLeftOf="@id/tvRecordTitle" android:layout_marginTop="@dimen/dp_30" @@ -166,7 +166,7 @@ android:layout_height="wrap_content" android:text="前：" android:textColor="#FFFFFFFF" - android:textSize="38px" + android:textSize="38dp" app:layout_constraintTop_toBottomOf="@id/tvInitiativeTitle" app:layout_constraintLeft_toLeftOf="@id/tvInitiativeTitle" android:layout_marginTop="@dimen/dp_50" @@ -174,14 +174,14 @@ @@ -262,7 +262,7 @@ android:layout_height="wrap_content" android:text="后：" android:textColor="#FFFFFFFF" - android:textSize="38px" + android:textSize="38dp" app:layout_constraintTop_toBottomOf="@id/tvPassivePre" app:layout_constraintLeft_toLeftOf="@id/tvPassivePre" android:layout_marginTop="@dimen/dp_60" @@ -271,8 +271,8 @@ + tools:ignore="HardcodedText,dpUsage,ContentDescription"> + android:layout_width="70dp" + android:layout_height="70dp" + android:layout_marginStart="113dp" /> diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/layout/layout_fb.xml b/core/function-impl/mogo-core-function-devatools/src/main/res/layout/layout_fb.xml index 8de9952e92..0e990176e6 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/res/layout/layout_fb.xml +++ b/core/function-impl/mogo-core-function-devatools/src/main/res/layout/layout_fb.xml @@ -17,14 +17,14 @@ + tools:ignore="dpUsage" /> diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/layout/layout_fb_badcase.xml b/core/function-impl/mogo-core-function-devatools/src/main/res/layout/layout_fb_badcase.xml index ec0017f310..33eaff2573 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/res/layout/layout_fb_badcase.xml +++ b/core/function-impl/mogo-core-function-devatools/src/main/res/layout/layout_fb_badcase.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" - tools:ignore="HardcodedText,PxUsage"> + tools:ignore="HardcodedText,dpUsage"> + android:layout_marginEnd="19dp"/> @@ -44,8 +44,8 @@ app:dividerDrawable="@drawable/flex_divider" app:showDivider="middle" app:justifyContent="flex_start" - android:layout_marginStart="80px" - android:layout_marginTop="54px" /> + android:layout_marginStart="80dp" + android:layout_marginTop="54dp" /> + android:textSize="36dp" /> + android:layout_marginBottom="30dp"/> diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/layout/layout_status_bar_item.xml b/core/function-impl/mogo-core-function-devatools/src/main/res/layout/layout_status_bar_item.xml index ca92ba33fc..6258622aa4 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/res/layout/layout_status_bar_item.xml +++ b/core/function-impl/mogo-core-function-devatools/src/main/res/layout/layout_status_bar_item.xml @@ -1,5 +1,5 @@ \ No newline at end of file + android:layout_width="96dp" + android:layout_height="96dp" /> \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/layout/view_ai_data_collect.xml b/core/function-impl/mogo-core-function-devatools/src/main/res/layout/view_ai_data_collect.xml index 5c04822c7a..f06a6d117d 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/res/layout/view_ai_data_collect.xml +++ b/core/function-impl/mogo-core-function-devatools/src/main/res/layout/view_ai_data_collect.xml @@ -2,26 +2,26 @@ @@ -35,7 +35,7 @@ app:layout_constraintBottom_toBottomOf="@id/tvCollectNum" android:text="时间：14:23:10" android:textColor="#FFFFFFFF" - android:textSize="38px" + android:textSize="38dp" android:layout_marginStart="@dimen/dp_50" /> @@ -47,7 +47,7 @@ android:layout_height="wrap_content" android:text="大型车：大货、大巴、特种车辆" android:textColor="#FFFFFFFF" - android:textSize="34px" + android:textSize="34dp" android:button="@null" android:drawableLeft="@drawable/badcase_radio_button_style" android:drawablePadding="@dimen/dp_20" @@ -64,7 +64,7 @@ android:layout_height="wrap_content" android:text="交通灯：水平、箭头、雨天交通灯" android:textColor="#FFFFFFFF" - android:textSize="34px" + android:textSize="34dp" android:button="@null" android:drawableLeft="@drawable/badcase_radio_button_style" android:drawablePadding="@dimen/dp_20" @@ -79,7 +79,7 @@ android:layout_height="wrap_content" android:text="积水：距离10米内，面积大于1平米" android:textColor="#FFFFFFFF" - android:textSize="34px" + android:textSize="34dp" android:button="@null" android:drawableLeft="@drawable/badcase_radio_button_style" android:drawablePadding="@dimen/dp_20" @@ -94,7 +94,7 @@ android:layout_height="wrap_content" android:text="施工：锥桶、路障" android:textColor="#FFFFFFFF" - android:textSize="34px" + android:textSize="34dp" android:button="@null" android:drawableLeft="@drawable/badcase_radio_button_style" android:drawablePadding="@dimen/dp_20" @@ -109,7 +109,7 @@ android:layout_height="wrap_content" android:text="车祸路段：有三角板" android:textColor="#FFFFFFFF" - android:textSize="34px" + android:textSize="34dp" android:button="@null" android:drawableLeft="@drawable/badcase_radio_button_style" android:drawablePadding="@dimen/dp_20" @@ -125,7 +125,7 @@ android:layout_height="wrap_content" android:text="中雨交通流" android:textColor="#FFFFFFFF" - android:textSize="34px" + android:textSize="34dp" android:button="@null" android:drawableLeft="@drawable/badcase_radio_button_style" android:drawablePadding="@dimen/dp_20" @@ -140,7 +140,7 @@ android:layout_height="wrap_content" android:text="夜间交通流" android:textColor="#FFFFFFFF" - android:textSize="34px" + android:textSize="34dp" android:button="@null" android:drawableLeft="@drawable/badcase_radio_button_style" android:drawablePadding="@dimen/dp_20" @@ -151,29 +151,29 @@ \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/layout/view_initiative_bad_case.xml b/core/function-impl/mogo-core-function-devatools/src/main/res/layout/view_initiative_bad_case.xml index 8afe1d5e5c..515ca82ee0 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/res/layout/view_initiative_bad_case.xml +++ b/core/function-impl/mogo-core-function-devatools/src/main/res/layout/view_initiative_bad_case.xml @@ -2,26 +2,26 @@ @@ -35,7 +35,7 @@ app:layout_constraintBottom_toBottomOf="@id/tvInitiativeNum" android:text="时间：14:23:10" android:textColor="#FFFFFFFF" - android:textSize="38px" + android:textSize="38dp" android:layout_marginStart="@dimen/dp_50" /> @@ -48,7 +48,7 @@ app:layout_constraintRight_toRightOf="parent" android:text="身份：QA" android:textColor="#FFFFFFFF" - android:textSize="38px" + android:textSize="38dp" android:layout_marginEnd="@dimen/dp_50" /> @@ -58,7 +58,7 @@ android:layout_height="wrap_content" android:text="严重画龙" android:textColor="#FFFFFFFF" - android:textSize="34px" + android:textSize="34dp" android:button="@null" android:drawableLeft="@drawable/badcase_radio_button_style" android:drawablePadding="@dimen/dp_10" @@ -74,7 +74,7 @@ android:layout_height="wrap_content" android:text="速度过慢" android:textColor="#FFFFFFFF" - android:textSize="34px" + android:textSize="34dp" android:button="@null" android:drawableLeft="@drawable/badcase_radio_button_style" android:drawablePadding="@dimen/dp_10" @@ -90,7 +90,7 @@ android:layout_height="wrap_content" android:text="感知、定位、地图等其他" android:textColor="#FFFFFFFF" - android:textSize="34px" + android:textSize="34dp" android:button="@null" android:drawableLeft="@drawable/badcase_radio_button_style" android:drawablePadding="@dimen/dp_20" @@ -106,7 +106,7 @@ android:layout_height="wrap_content" android:text="速度过快" android:textColor="#FFFFFFFF" - android:textSize="34px" + android:textSize="34dp" android:button="@null" android:drawableLeft="@drawable/badcase_radio_button_style" android:drawablePadding="@dimen/dp_10" @@ -121,7 +121,7 @@ android:layout_height="wrap_content" android:text="存在碰撞风险" android:textColor="#FFFFFFFF" - android:textSize="34px" + android:textSize="34dp" android:button="@null" android:drawableLeft="@drawable/badcase_radio_button_style" android:drawablePadding="@dimen/dp_20" @@ -136,7 +136,7 @@ android:layout_height="wrap_content" android:text="点刹、顿挫" android:textColor="#FFFFFFFF" - android:textSize="34px" + android:textSize="34dp" android:button="@null" android:drawableLeft="@drawable/badcase_radio_button_style" android:drawablePadding="@dimen/dp_20" @@ -148,29 +148,29 @@ @@ -35,7 +35,7 @@ app:layout_constraintBottom_toBottomOf="@id/tvPassiveNum" android:text="时间：14:23:10" android:textColor="#FFFFFFFF" - android:textSize="38px" + android:textSize="38dp" android:layout_marginStart="@dimen/dp_50" /> @@ -48,35 +48,35 @@ app:layout_constraintRight_toRightOf="parent" android:text="身份：QA" android:textColor="#FFFFFFFF" - android:textSize="38px" + android:textSize="38dp" android:layout_marginEnd="@dimen/dp_50" /> - 1263px - 1173px - 32px - 38px - 48px - 42px - 55px - 219px - 288px - 415px - 484px - 621px - 690px - 100px - 852px - 86px - 80px - 700px - 140px - 70px + 1263dp + 1173dp + 32dp + 38dp + 48dp + 42dp + 55dp + 219dp + 288dp + 415dp + 484dp + 621dp + 690dp + 100dp + 852dp + 86dp + 80dp + 700dp + 140dp + 70dp - 950px - 540px - 32px - 48px - 55px - 38px - 179px - 54px - 251px - 152px - 474px - 20px - 46px - 24px + 950dp + 540dp + 32dp + 48dp + 55dp + 38dp + 179dp + 54dp + 251dp + 152dp + 474dp + 20dp + 46dp + 24dp \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-dispatch/src/main/res/values-xhdpi/dimens.xml b/core/function-impl/mogo-core-function-dispatch/src/main/res/values-xhdpi/dimens.xml index 731f5442c2..8ea3d8734d 100644 --- a/core/function-impl/mogo-core-function-dispatch/src/main/res/values-xhdpi/dimens.xml +++ b/core/function-impl/mogo-core-function-dispatch/src/main/res/values-xhdpi/dimens.xml @@ -1,40 +1,40 @@ - 947px - 880px - 24px - 28px - 36px - 30px - 41px - 164px - 216px - 311px - 363px - 466px - 519px - 125px - 639px - 100px - 60px - 525px - 105px - 52px + 947dp + 880dp + 24dp + 28dp + 36dp + 30dp + 41dp + 164dp + 216dp + 311dp + 363dp + 466dp + 519dp + 125dp + 639dp + 100dp + 60dp + 525dp + 105dp + 52dp - 712px - 405px - 24px - 36px - 41px - 28px - 134px - 40px - 188px - 114px - 355px - 15px - 35px - 18px + 712dp + 405dp + 24dp + 36dp + 41dp + 28dp + 134dp + 40dp + 188dp + 114dp + 355dp + 15dp + 35dp + 18dp \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-dispatch/src/main/res/values/dimens.xml b/core/function-impl/mogo-core-function-dispatch/src/main/res/values/dimens.xml index a010d3628a..92eb8ab032 100644 --- a/core/function-impl/mogo-core-function-dispatch/src/main/res/values/dimens.xml +++ b/core/function-impl/mogo-core-function-dispatch/src/main/res/values/dimens.xml @@ -1,39 +1,39 @@ - 1263px - 1173px - 32px - 38px - 48px - 42px - 55px - 219px - 288px - 415px - 484px - 621px - 690px - 100px - 852px - 86px - 80px - 700px - 140px - 70px + 1263dp + 1173dp + 32dp + 38dp + 48dp + 42dp + 55dp + 219dp + 288dp + 415dp + 484dp + 621dp + 690dp + 100dp + 852dp + 86dp + 80dp + 700dp + 140dp + 70dp - 950px - 540px - 32px - 48px - 55px - 38px - 179px - 54px - 251px - 152px - 474.5px - 20px - 46px - 24px + 950dp + 540dp + 32dp + 48dp + 55dp + 38dp + 179dp + 54dp + 251dp + 152dp + 474.5dp + 20dp + 46dp + 24dp \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/notification/widget/ParentFrameLayout.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/notification/widget/ParentFrameLayout.kt index c80e9b328a..505abf6dde 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/notification/widget/ParentFrameLayout.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/notification/widget/ParentFrameLayout.kt @@ -2,9 +2,12 @@ package com.mogo.eagle.core.function.hmi.notification.widget import android.annotation.SuppressLint import android.content.Context +import android.content.res.Resources import android.util.AttributeSet import android.widget.FrameLayout import com.mogo.eagle.core.function.hmi.notification.WarningNotificationConfig +import me.jessyan.autosize.AutoSizeCompat + /** * @author: donghongyu @@ -19,6 +22,12 @@ internal class ParentFrameLayout( defStyleAttr: Int = 0 ) : FrameLayout(context, attrs, defStyleAttr) { + private var mResources: Resources? = null + init { + val oldResources = super.getResources() + mResources = Resources(oldResources.assets, oldResources.displayMetrics, oldResources.configuration) + } + var layoutListener: OnLayoutListener? = null private var isCreated = false @@ -36,4 +45,8 @@ internal class ParentFrameLayout( } } + override fun getResources(): Resources? { + AutoSizeCompat.autoConvertDensityBaseOnWidth(mResources, 2560f); + return mResources; + } } \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt index 7dc0a07cd8..71cc1d4cc8 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt @@ -19,7 +19,6 @@ import androidx.core.view.* import androidx.lifecycle.lifecycleScope import com.alibaba.android.arouter.facade.annotation.Route import com.alibaba.android.arouter.launcher.ARouter -import com.kwai.koom.base.postOnMainThread import com.mogo.cloud.passport.MoGoAiCloudClient import com.mogo.commons.AbsMogoApplication import com.mogo.commons.debug.DebugConfig @@ -44,7 +43,6 @@ import com.mogo.eagle.core.data.notice.NoticeTrafficStylePushData import com.mogo.eagle.core.data.report.ReportEntity import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotRecordListener import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener -import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener.Companion.STATUS_AUTOPILOT_RUNNING import com.mogo.eagle.core.function.api.hmi.IMoGoHmiViewProxy import com.mogo.eagle.core.function.api.hmi.IMoGoHmiViewProxy.IViewNotificationProvider import com.mogo.eagle.core.function.api.hmi.view.IOchBusView @@ -55,7 +53,6 @@ import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWaringProvider import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWarningStatusListener import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager -import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotRecordListenerManager import com.mogo.eagle.core.function.call.bindingcar.CallerBindingcarManager import com.mogo.eagle.core.function.call.check.CallerCheckManager @@ -103,7 +100,6 @@ import kotlinx.android.synthetic.main.view_auto_pilot_check.view.* import kotlinx.android.synthetic.main.view_och_bus_operation.view.* import kotlinx.coroutines.* import mogo_msg.MogoReportMsg -import org.greenrobot.eventbus.EventBus import record_cache.RecordPanelOuterClass import java.util.* diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt index 9b8c6d67f0..2228ae2337 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt @@ -9,6 +9,7 @@ import android.graphics.Color import android.os.Build import android.text.Html import android.util.AttributeSet +import android.util.DisplayMetrics import android.util.Log import android.view.LayoutInflater import android.view.View diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/IPCReportAdapter.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/IPCReportAdapter.kt index b6ee309043..c59cc29f03 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/IPCReportAdapter.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/IPCReportAdapter.kt @@ -8,6 +8,7 @@ import androidx.recyclerview.widget.RecyclerView import com.mogo.eagle.core.data.report.ReportEntity import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager import com.mogo.eagle.core.function.hmi.R +import me.jessyan.autosize.AutoSizeCompat /** * @author XuXinChao @@ -29,6 +30,7 @@ class IPCReportAdapter: RecyclerView.Adapter() } override fun onBindViewHolder(holder: IPCReportHolder, position: Int) { + AutoSizeCompat.autoConvertDensityOfGlobal(holder.itemView.resources) data?.let {it -> val reportEntity = it[position] reportEntity.let { diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi-2560x1440/icon_bus_operation_status.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi-2560x1440/icon_bus_operation_status.png deleted file mode 100755 index 3bb32ec0aa..0000000000 Binary files a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi-2560x1440/icon_bus_operation_status.png and /dev/null differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi-2560x1440/icon_bus_operation_status_un.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi-2560x1440/icon_bus_operation_status_un.png deleted file mode 100755 index de0935fe4d..0000000000 Binary files a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi-2560x1440/icon_bus_operation_status_un.png and /dev/null differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi-2560x1440/wu1.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi-2560x1440/wu1.png deleted file mode 100644 index 0ab8e44e21..0000000000 Binary files a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi-2560x1440/wu1.png and /dev/null differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi-2560x1440/wu2.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi-2560x1440/wu2.png deleted file mode 100644 index aff4543048..0000000000 Binary files a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi-2560x1440/wu2.png and /dev/null differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/bg_auto.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/bg_auto.png similarity index 100% rename from core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/bg_auto.png rename to core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/bg_auto.png diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/bg_auto_bus.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/bg_auto_bus.png similarity index 100% rename from core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/bg_auto_bus.png rename to core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/bg_auto_bus.png diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/bg_auto_nor.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/bg_auto_nor.png similarity index 100% rename from core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/bg_auto_nor.png rename to core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/bg_auto_nor.png diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/check_car_nor.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/check_car_nor.png similarity index 100% rename from core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/check_car_nor.png rename to core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/check_car_nor.png diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/check_reboot.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/check_reboot.png similarity index 100% rename from core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/check_reboot.png rename to core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/check_reboot.png diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/check_shut_down.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/check_shut_down.png similarity index 100% rename from core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/check_shut_down.png rename to core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/check_shut_down.png diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/close_icon.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/close_icon.png similarity index 100% rename from core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/close_icon.png rename to core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/close_icon.png diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/close_nor.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/close_nor.png similarity index 100% rename from core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/close_nor.png rename to core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/close_nor.png diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/debug_icon_feedback.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/debug_icon_feedback.png similarity index 100% rename from core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/debug_icon_feedback.png rename to core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/debug_icon_feedback.png diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/debug_icon_nor.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/debug_icon_nor.png similarity index 100% rename from core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/debug_icon_nor.png rename to core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/debug_icon_nor.png diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi-2560x1440/hmi_light_green_nor.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/hmi_light_green_nor.png similarity index 100% rename from core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi-2560x1440/hmi_light_green_nor.png rename to core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/hmi_light_green_nor.png diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi-2560x1440/hmi_light_red_nor.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/hmi_light_red_nor.png similarity index 100% rename from core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi-2560x1440/hmi_light_red_nor.png rename to core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/hmi_light_red_nor.png diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi-2560x1440/hmi_lightyellow_nor.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/hmi_lightyellow_nor.png similarity index 100% rename from core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi-2560x1440/hmi_lightyellow_nor.png rename to core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/hmi_lightyellow_nor.png diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/icon_account_head.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_account_head.png similarity index 100% rename from core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/icon_account_head.png rename to core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_account_head.png diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/icon_ad.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_ad.png similarity index 100% rename from core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/icon_ad.png rename to core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_ad.png diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/icon_back.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_back.png similarity index 100% rename from core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/icon_back.png rename to core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_back.png diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/icon_bad_case_normal.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_bad_case_normal.png similarity index 100% rename from core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/icon_bad_case_normal.png rename to core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_bad_case_normal.png diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/icon_camera_nor.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_camera_nor.png similarity index 100% rename from core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/icon_camera_nor.png rename to core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_camera_nor.png diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi-2560x1440/icon_camera_selected.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_camera_selected.png similarity index 100% rename from core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi-2560x1440/icon_camera_selected.png rename to core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_camera_selected.png diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/icon_car_ap_badcase_entrance.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_car_ap_badcase_entrance.png similarity index 100% rename from core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/icon_car_ap_badcase_entrance.png rename to core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_car_ap_badcase_entrance.png diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/icon_down.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_down.png similarity index 100% rename from core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/icon_down.png rename to core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_down.png diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/icon_downloading.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_downloading.png similarity index 100% rename from core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/icon_downloading.png rename to core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_downloading.png diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/icon_drag.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_drag.png similarity index 100% rename from core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/icon_drag.png rename to core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_drag.png diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/icon_in_steering.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_in_steering.png similarity index 100% rename from core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/icon_in_steering.png rename to core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_in_steering.png diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/icon_ipc_close.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_ipc_close.png similarity index 100% rename from core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/icon_ipc_close.png rename to core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_ipc_close.png diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/icon_latest_version.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_latest_version.png similarity index 100% rename from core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/icon_latest_version.png rename to core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_latest_version.png diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/icon_pad.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_pad.png similarity index 100% rename from core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/icon_pad.png rename to core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_pad.png diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/icon_report_close.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_report_close.png similarity index 100% rename from core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/icon_report_close.png rename to core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_report_close.png diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/icon_rideo_nor.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_rideo_nor.png similarity index 100% rename from core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/icon_rideo_nor.png rename to core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_rideo_nor.png diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/icon_right.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_right.png similarity index 100% rename from core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/icon_right.png rename to core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_right.png diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/icon_search.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_search.png similarity index 100% rename from core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/icon_search.png rename to core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_search.png diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/icon_signal.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_signal.png similarity index 100% rename from core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/icon_signal.png rename to core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_signal.png diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi-2560x1440/icon_take_over_request.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_take_over_request.png similarity index 100% rename from core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi-2560x1440/icon_take_over_request.png rename to core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_take_over_request.png diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/icon_tools_nor.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_tools_nor.png similarity index 100% rename from core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/icon_tools_nor.png rename to core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_tools_nor.png diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/icon_upgrade_failed.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_upgrade_failed.png similarity index 100% rename from core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/icon_upgrade_failed.png rename to core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_upgrade_failed.png diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/icon_upgradeable.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_upgradeable.png similarity index 100% rename from core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/icon_upgradeable.png rename to core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_upgradeable.png diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/icon_upgrading.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_upgrading.png similarity index 100% rename from core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/icon_upgrading.png rename to core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_upgrading.png diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/road_video_bg.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/road_video_bg.png similarity index 100% rename from core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/road_video_bg.png rename to core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/road_video_bg.png diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/shadow_bottom.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/shadow_bottom.png similarity index 100% rename from core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/shadow_bottom.png rename to core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/shadow_bottom.png diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/steering_bg.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/steering_bg.png similarity index 100% rename from core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/steering_bg.png rename to core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/steering_bg.png diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/steering_bg_bus.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/steering_bg_bus.png similarity index 100% rename from core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/steering_bg_bus.png rename to core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/steering_bg_bus.png diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi-2560x1440/traffic_data_accelerator.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/traffic_data_accelerator.png similarity index 100% rename from core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi-2560x1440/traffic_data_accelerator.png rename to core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/traffic_data_accelerator.png diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi-2560x1440/traffic_data_back.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/traffic_data_back.png similarity index 100% rename from core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi-2560x1440/traffic_data_back.png rename to core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/traffic_data_back.png diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi-2560x1440/traffic_data_brake.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/traffic_data_brake.png similarity index 100% rename from core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi-2560x1440/traffic_data_brake.png rename to core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/traffic_data_brake.png diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi-2560x1440/traffic_data_empty.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/traffic_data_empty.png similarity index 100% rename from core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi-2560x1440/traffic_data_empty.png rename to core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/traffic_data_empty.png diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi-2560x1440/traffic_data_speed.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/traffic_data_speed.png similarity index 100% rename from core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi-2560x1440/traffic_data_speed.png rename to core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/traffic_data_speed.png diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi-2560x1440/traffic_data_speed_warning.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/traffic_data_speed_warning.png similarity index 100% rename from core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi-2560x1440/traffic_data_speed_warning.png rename to core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/traffic_data_speed_warning.png diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/wu1.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/wu1.png index e18fa37404..0ab8e44e21 100644 Binary files a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/wu1.png and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/wu1.png differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/wu2.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/wu2.png index db251b5c86..aff4543048 100644 Binary files a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/wu2.png and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/wu2.png differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/icon_bus_operation_status.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/icon_bus_operation_status.png deleted file mode 100755 index 3bb32ec0aa..0000000000 Binary files a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/icon_bus_operation_status.png and /dev/null differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/icon_bus_operation_status_un.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/icon_bus_operation_status_un.png deleted file mode 100755 index de0935fe4d..0000000000 Binary files a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/icon_bus_operation_status_un.png and /dev/null differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/icon_camera_selected.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/icon_camera_selected.png deleted file mode 100644 index 117d57346b..0000000000 Binary files a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/icon_camera_selected.png and /dev/null differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/bg_steering_outer_bus.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_steering_outer_bus.xml similarity index 91% rename from core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/bg_steering_outer_bus.xml rename to core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_steering_outer_bus.xml index 3beb7a701c..1b750d930d 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/bg_steering_outer_bus.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_steering_outer_bus.xml @@ -4,7 +4,7 @@ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/bg_steering_outer_taxi.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_steering_outer_taxi.xml similarity index 90% rename from core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/bg_steering_outer_taxi.xml rename to core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_steering_outer_taxi.xml index fe1a70a3c6..453850a0a8 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/bg_steering_outer_taxi.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_steering_outer_taxi.xml @@ -4,7 +4,7 @@ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/bg_steering_wheel_bus.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_steering_wheel_bus.xml similarity index 100% rename from core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/bg_steering_wheel_bus.xml rename to core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_steering_wheel_bus.xml diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/bg_steering_wheel_taxi.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_steering_wheel_taxi.xml similarity index 100% rename from core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/bg_steering_wheel_taxi.xml rename to core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_steering_wheel_taxi.xml diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/debug_setting_edit_bg.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/debug_setting_edit_bg.xml index 6ff813b9f3..fb18a3ae0f 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/debug_setting_edit_bg.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/debug_setting_edit_bg.xml @@ -1,7 +1,7 @@ - + - + diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/indicator_unselected_bg.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/indicator_unselected_bg.xml index 3c913bcc65..6631061e09 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/indicator_unselected_bg.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/indicator_unselected_bg.xml @@ -3,7 +3,7 @@ android:shape="oval" > - + diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/ipc_error_tab_normal_bg.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/ipc_error_tab_normal_bg.xml index 58a14ac5c7..4d5238e929 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/ipc_error_tab_normal_bg.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/ipc_error_tab_normal_bg.xml @@ -5,5 +5,5 @@ android:endColor="#0056FF" android:angle="0" /> - + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/ipc_error_tab_select_bg.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/ipc_error_tab_select_bg.xml index 4b7aeeb7b9..56d203b98b 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/ipc_error_tab_select_bg.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/ipc_error_tab_select_bg.xml @@ -5,5 +5,5 @@ android:endColor="#3A57C5" android:angle="0" /> - + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/pilot_speed_bg.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/pilot_speed_bg.xml index 91520788bf..ca81d0e010 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/pilot_speed_bg.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/pilot_speed_bg.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/pilot_speed_high_light_bg.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/pilot_speed_high_light_bg.xml index e4fe7e8614..d985d191f4 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/pilot_speed_high_light_bg.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/pilot_speed_high_light_bg.xml @@ -1,6 +1,6 @@ - - + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/radio_button_checked_background.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/radio_button_checked_background.xml index ed4277a9ed..3c2ac87949 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/radio_button_checked_background.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/radio_button_checked_background.xml @@ -3,11 +3,11 @@ android:shape="rectangle"> + android:bottom="1dp" + android:left="1dp" + android:right="1dp" + android:top="1dp"/> \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/radio_button_checked_background_left.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/radio_button_checked_background_left.xml index 56bd12713e..d0b7718908 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/radio_button_checked_background_left.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/radio_button_checked_background_left.xml @@ -3,13 +3,13 @@ android:shape="rectangle"> + android:bottom="1dp" + android:left="1dp" + android:right="1dp" + android:top="1dp" /> \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/radio_button_checked_background_middle.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/radio_button_checked_background_middle.xml index d21e7975e4..12b2b481cb 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/radio_button_checked_background_middle.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/radio_button_checked_background_middle.xml @@ -3,12 +3,12 @@ android:shape="rectangle"> + android:bottom="1dp" + android:left="1dp" + android:right="1dp" + android:top="1dp" /> \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/radio_button_checked_background_right.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/radio_button_checked_background_right.xml index 794e5fc1f1..1f071047ab 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/radio_button_checked_background_right.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/radio_button_checked_background_right.xml @@ -3,13 +3,13 @@ android:shape="rectangle"> + android:bottom="1dp" + android:left="1dp" + android:right="1dp" + android:top="1dp" /> \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/radio_button_lock_background.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/radio_button_lock_background.xml index db91c70905..a956aebda1 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/radio_button_lock_background.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/radio_button_lock_background.xml @@ -3,13 +3,13 @@ android:shape="rectangle"> + android:bottom="1dp" + android:left="1dp" + android:right="1dp" + android:top="1dp" /> \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/radio_button_normal_background.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/radio_button_normal_background.xml index c26aabf119..4e58a011d1 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/radio_button_normal_background.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/radio_button_normal_background.xml @@ -3,11 +3,11 @@ android:shape="rectangle"> + android:bottom="1dp" + android:left="1dp" + android:right="1dp" + android:top="1dp" /> \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/radio_button_normal_background_left.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/radio_button_normal_background_left.xml index a76ddb7ecd..5499009e80 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/radio_button_normal_background_left.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/radio_button_normal_background_left.xml @@ -3,13 +3,13 @@ android:shape="rectangle"> + android:bottom="1dp" + android:left="1dp" + android:right="1dp" + android:top="1dp" /> \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/radio_button_normal_background_middle.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/radio_button_normal_background_middle.xml index 40972a7b7a..c079f4e2e4 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/radio_button_normal_background_middle.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/radio_button_normal_background_middle.xml @@ -3,12 +3,12 @@ android:shape="rectangle"> + android:bottom="1dp" + android:left="1dp" + android:right="1dp" + android:top="1dp" /> \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/radio_button_normal_background_right.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/radio_button_normal_background_right.xml index 441f78ee32..cacee166bb 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/radio_button_normal_background_right.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/radio_button_normal_background_right.xml @@ -3,13 +3,13 @@ android:shape="rectangle"> + android:bottom="1dp" + android:left="1dp" + android:right="1dp" + android:top="1dp" /> \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/setting_toggle_button_background.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/setting_toggle_button_background.xml index f977e253e9..6dda1e9b28 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/setting_toggle_button_background.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/setting_toggle_button_background.xml @@ -3,13 +3,13 @@ android:shape="rectangle"> + android:bottom="1dp" + android:left="1dp" + android:right="1dp" + android:top="1dp" /> \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/taxi_loginout_bg.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/taxi_loginout_bg.xml index cab42294b4..3a3f8231d9 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/taxi_loginout_bg.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/taxi_loginout_bg.xml @@ -1,7 +1,7 @@ - + diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/autopilot_connect_status_item.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/autopilot_connect_status_item.xml index 8b32eb14ee..d27cc493f0 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/autopilot_connect_status_item.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/autopilot_connect_status_item.xml @@ -4,8 +4,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - android:minHeight="48px" - android:padding="12px"> + android:minHeight="48dp" + android:padding="12dp"> diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_ad_upgrade.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_ad_upgrade.xml index de8630c884..a2e114c763 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_ad_upgrade.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_ad_upgrade.xml @@ -2,10 +2,10 @@ + app:roundLayoutRadius="32dp"> @@ -22,10 +22,10 @@ android:id="@+id/tv_bindingcar_tips" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="50px" + android:layout_marginTop="50dp" android:text="@string/modify_binding_car" android:textColor="#FFFFFFFF" - android:textSize="43px" + android:textSize="43dp" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/tv_bindingcar_title" /> @@ -33,8 +33,8 @@ + app:roundLayoutRadius="32dp"> @@ -22,10 +22,10 @@ android:id="@+id/tv_bindingcar_tips" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="50px" + android:layout_marginTop="50dp" android:text="@string/to_binding_car" android:textColor="#FFFFFFFF" - android:textSize="43px" + android:textSize="43dp" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/tv_bindingcar_title" /> @@ -33,8 +33,8 @@ + app:roundLayoutRadius="32dp"> @@ -22,25 +22,25 @@ android:id="@+id/tv_upgrade_tips" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="30px" + android:layout_marginTop="30dp" android:text="@string/application_upgrade_confirm" android:textColor="#FFFFFFFF" - android:textSize="43px" + android:textSize="43dp" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/tv_upgrade_title" /> + android:paddingTop="72dp"> @@ -107,68 +107,68 @@ android:id="@+id/ivToolsIcon" android:layout_width="@dimen/module_hmi_check_size" android:layout_height="@dimen/module_hmi_check_size" - android:layout_marginLeft="25px" - android:layout_marginBottom="40px" + android:layout_marginLeft="25dp" + android:layout_marginBottom="40dp" android:background="@drawable/module_ext_check" android:elevation="@dimen/dp_10" android:scaleType="center" android:src="@drawable/icon_tools_nor" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@+id/viewPerspectiveSwitch" - app:layout_goneMarginStart="50px" /> + app:layout_goneMarginStart="50dp" /> @@ -176,7 +176,7 @@ android:id="@+id/turnLightView" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="42px" + android:layout_marginTop="42dp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -186,7 +186,7 @@ android:id="@+id/brakeView" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="42px" + android:layout_marginTop="42dp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -203,7 +203,7 @@ @@ -212,11 +212,11 @@ android:id="@+id/statusBarContainer" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginEnd="30px" + android:layout_marginEnd="30dp" app:layout_constraintEnd_toStartOf="@+id/viewLimitingVelocity" app:layout_constraintTop_toTopOf="@+id/viewLimitingVelocity" - app:layout_goneMarginEnd="40px" - app:layout_goneMarginTop="30px" /> + app:layout_goneMarginEnd="40dp" + app:layout_goneMarginTop="30dp" /> diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_steering_wheel_bus.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_steering_wheel_bus.xml index 238be77a81..d57659b22a 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_steering_wheel_bus.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_steering_wheel_bus.xml @@ -28,7 +28,7 @@ app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" - app:progWidth="12px" + app:progWidth="12dp" app:progress="0" /> diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_traffic_data.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_traffic_data.xml index 754b67fde0..532b8bfefa 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_traffic_data.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_traffic_data.xml @@ -21,7 +21,7 @@ android:id="@+id/speedTextView" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="80px" + android:layout_marginTop="80dp" android:text="0" android:textAlignment="center" android:textColor="#fff" diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_view_traffic_light.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_view_traffic_light.xml index 611771006c..f49e4c473d 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_view_traffic_light.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_view_traffic_light.xml @@ -33,7 +33,7 @@ android:textStyle="bold" app:layout_constraintTop_toTopOf="parent" app:layout_constraintLeft_toRightOf="@id/hmi_traffic_light_iv" - android:layout_marginStart="-30px" + android:layout_marginStart="-30dp" /> @@ -36,7 +36,7 @@ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/log_view.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/log_view.xml index fa44bafbb7..30111b863a 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/log_view.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/log_view.xml @@ -24,7 +24,7 @@ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/module_main_activity_main.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/module_main_activity_main.xml index 2bedffe09e..fc426304f5 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/module_main_activity_main.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/module_main_activity_main.xml @@ -89,8 +89,8 @@ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/notice_dialog_traffic_police.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/notice_dialog_traffic_police.xml index d4143332c9..4539a4d86e 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/notice_dialog_traffic_police.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/notice_dialog_traffic_police.xml @@ -96,7 +96,7 @@ + android:paddingTop="10dp"> + android:paddingStart="38dp" + android:paddingTop="27dp" + android:paddingEnd="38dp" + android:paddingBottom="27dp"> @@ -13,17 +13,17 @@ android:id="@+id/roundLayout" android:layout_width="wrap_content" android:layout_height="wrap_content" - app:roundLayoutRadius="30px" + app:roundLayoutRadius="30dp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" android:background="@drawable/road_video_bg" - android:minWidth="1736px" - android:minHeight="974px" + android:minWidth="1736dp" + android:minHeight="974dp" > @@ -34,25 +34,25 @@ android:layout_height="wrap_content" app:layout_constraintStart_toStartOf="parent" app:layout_constraintBottom_toBottomOf="parent" - android:layout_marginStart="61px" - android:layout_marginBottom="49px" + android:layout_marginStart="61dp" + android:layout_marginBottom="49dp" android:textColor="@color/v2x_white" - android:textSize="42px" + android:textSize="42dp" android:visibility="gone" /> @@ -70,10 +70,10 @@ @@ -54,19 +54,19 @@ + android:textSize="32dp" /> + android:textSize="32dp" /> + android:layout_marginStart="142dp"> + android:textSize="32dp" /> + android:layout_marginStart="142dp"> + android:textSize="32dp" /> + android:textSize="38dp" /> @@ -221,18 +221,18 @@ android:id="@+id/tvAcceleration" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="123px" - android:layout_marginTop="12px" + android:layout_marginStart="123dp" + android:layout_marginTop="12dp" android:textColor="#A7B6F0" - android:textSize="32px" + android:textSize="32dp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/llSpeedPosition" /> @@ -256,17 +256,17 @@ android:id="@+id/checkSystemView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="40px" + android:layout_marginTop="40dp" android:visibility="gone" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/tvSystemOperation" /> @@ -275,11 +275,11 @@ android:id="@+id/tvSystemVersion" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="113px" + android:layout_marginStart="113dp" android:gravity="center" android:text="@string/check_system_version" android:textColor="@color/color_FFFFFF" - android:textSize="42px" + android:textSize="42dp" app:layout_constraintBottom_toBottomOf="@id/viewSystemVersion" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="@id/viewSystemVersion" /> @@ -288,21 +288,21 @@ android:id="@+id/systemVersionView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="40px" - android:layout_marginBottom="40px" + android:layout_marginTop="40dp" + android:layout_marginBottom="40dp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/viewSystemVersion" /> diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_brake_light_status.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_brake_light_status.xml index e5d39649e5..d96d7dd100 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_brake_light_status.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_brake_light_status.xml @@ -25,7 +25,7 @@ android:id="@+id/image_brake" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginLeft="115px" + android:layout_marginLeft="115dp" android:layout_gravity="center_vertical" android:src="@drawable/module_light_nor" android:visibility="gone" @@ -39,7 +39,7 @@ android:layout_gravity="center_vertical" android:text="刹车中" android:textColor="#ffffff" - android:textSize="40px" + android:textSize="40dp" android:visibility="gone" app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toEndOf="@+id/image_brake" /> diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_brake_light_status_daytime.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_brake_light_status_daytime.xml index 1996b061ac..2be534da7a 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_brake_light_status_daytime.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_brake_light_status_daytime.xml @@ -23,7 +23,7 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:src="@drawable/bus_shache_nor_daytime" - android:layout_marginLeft="15px" + android:layout_marginLeft="15dp" android:visibility="gone" app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toStartOf="parent" /> @@ -35,7 +35,7 @@ android:layout_gravity="center_vertical" android:text="刹车中" android:textColor="#2D3E5F" - android:textSize="34px" + android:textSize="34dp" android:textStyle="bold" android:visibility="gone" app:layout_constraintTop_toTopOf="parent" diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_camera_list.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_camera_list.xml index 379e8e32d4..7de0b8b8a3 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_camera_list.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_camera_list.xml @@ -5,18 +5,18 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="@color/notice_check_dialog_bg_color" - android:minWidth="882px" - android:minHeight="550px" - app:roundLayoutRadius="30px"> + android:minWidth="882dp" + android:minHeight="550dp" + app:roundLayoutRadius="30dp"> @@ -68,8 +68,8 @@ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_check_system.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_check_system.xml index f3e63fd01e..b269b8d7e6 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_check_system.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_check_system.xml @@ -7,9 +7,9 @@ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml index 4b385e8fca..1eb9dc6d34 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml @@ -677,7 +677,7 @@ style="@style/DebugSettingText" android:layout_width="0dp" android:layout_height="match_parent" - android:layout_marginStart="90px" + android:layout_marginStart="90dp" android:layout_weight="1" android:background="@null" android:gravity="center" @@ -685,7 +685,7 @@ @@ -863,7 +863,7 @@ style="@style/DebugSettingText" android:layout_width="0dp" android:layout_height="match_parent" - android:layout_marginStart="90px" + android:layout_marginStart="90dp" android:layout_weight="1" android:background="@null" android:gravity="center" @@ -871,7 +871,7 @@ @@ -1129,7 +1129,7 @@ style="@style/DebugSettingText" android:layout_width="0dp" android:layout_height="match_parent" - android:layout_marginStart="90px" + android:layout_marginStart="90dp" android:layout_weight="1" android:background="@null" android:gravity="center" @@ -1137,7 +1137,7 @@ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_ipc_report.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_ipc_report.xml index 27ae6023ff..b80d3247c8 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_ipc_report.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_ipc_report.xml @@ -1,23 +1,23 @@ + app:roundLayoutRadius="40dp"> + android:textSize="42dp" /> + android:layout_marginTop="40dp"/> + android:layout_width="1dp" + android:layout_height="60dp"/> diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_system_version.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_system_version.xml index a3c3f0e935..ce0064ad18 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_system_version.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_system_version.xml @@ -7,11 +7,11 @@ \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_traffic_light_vr.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_traffic_light_vr.xml index e2e4038ef9..b126a36c74 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_traffic_light_vr.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_traffic_light_vr.xml @@ -6,21 +6,21 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="@drawable/bg_waring_traffic_light_vr" - android:paddingStart="10px" - android:paddingTop="10px" - android:paddingEnd="10px" - android:paddingBottom="10px" + android:paddingStart="10dp" + android:paddingTop="10dp" + android:paddingEnd="10dp" + android:paddingBottom="10dp" tools:visibility="visible"> @@ -48,8 +48,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="right|center_vertical" - android:layout_marginTop="3px" - android:layout_marginRight="13px" + android:layout_marginTop="3dp" + android:layout_marginRight="13dp" android:src="@drawable/module_arrow_right_select_nor" android:visibility="gone" /> diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_turn_light_status_daytime.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_turn_light_status_daytime.xml index 2563e7d157..55c8d1677f 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_turn_light_status_daytime.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_turn_light_status_daytime.xml @@ -22,7 +22,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="left|center_vertical" - android:layout_marginLeft="15px" + android:layout_marginLeft="15dp" android:src="@drawable/module_arrow_left_nor_daytime" /> @@ -48,8 +48,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="right|center_vertical" - android:layout_marginTop="2px" - android:layout_marginRight="13px" + android:layout_marginTop="2dp" + android:layout_marginRight="13dp" android:src="@drawable/module_arrow_right_select_nor_daytime" android:visibility="gone" /> diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/values-xhdpi-2560x1440/dimens.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/values-xhdpi-2560x1440/dimens.xml index bc1b90f4f5..b4d2f7a221 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/values-xhdpi-2560x1440/dimens.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/values-xhdpi-2560x1440/dimens.xml @@ -1,72 +1,72 @@ - 1700px - 1200px - 1400px - 788px - 900px - 506px - 1300px - 1210px - 1150px - 290px + 1700dp + 1200dp + 1400dp + 788dp + 900dp + 506dp + 1300dp + 1210dp + 1150dp + 290dp - 32px - 18px - 30px - 36px - 34px - 38px - 42px - 45px - 46px - 48px - 50px - 52px - 54px - 56px - 62px - 68px - 70px - 72px - 75px - 80px - 96px - 100px - 110px - 140px - 150px - 180px - 200px - 220px - 395px - 580px - 588px - 1066px + 32dp + 18dp + 30dp + 36dp + 34dp + 38dp + 42dp + 45dp + 46dp + 48dp + 50dp + 52dp + 54dp + 56dp + 62dp + 68dp + 70dp + 72dp + 75dp + 80dp + 96dp + 100dp + 110dp + 140dp + 150dp + 180dp + 200dp + 220dp + 395dp + 580dp + 588dp + 1066dp - 225px - 400px - 154px - 60px - 40px - 28px - 210px - 385px - 120px - 15px - 17px - 154px - 71px - 60px - 32px + 225dp + 400dp + 154dp + 60dp + 40dp + 28dp + 210dp + 385dp + 120dp + 15dp + 17dp + 154dp + 71dp + 60dp + 32dp - 150px - 150px - 42px - 40px - 46px + 150dp + 150dp + 42dp + 40dp + 46dp - 810px - 560px - 524px + 810dp + 560dp + 524dp \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/values-xhdpi-2560x1440/dimens_main.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/values-xhdpi-2560x1440/dimens_main.xml index 9538410c63..b040869a72 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/values-xhdpi-2560x1440/dimens_main.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/values-xhdpi-2560x1440/dimens_main.xml @@ -2,34 +2,34 @@ - 350px - 10px - 660px - 690px - 60px - 211px - 30px - 30px - 15px - 270px - 660px - 600px - 599px + 350dp + 10dp + 660dp + 690dp + 60dp + 211dp + 30dp + 30dp + 15dp + 270dp + 660dp + 600dp + 599dp - 200px - 20px - 30px - 830px - 590px - 30px - 70px + 200dp + 20dp + 30dp + 830dp + 590dp + 30dp + 70dp - 635px - 1263px - 20px - 20px - 20px - 1920px + 635dp + 1263dp + 20dp + 20dp + 20dp + 1920dp - 0px + 0dp \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/values/dimens.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/values/dimens.xml index 53e5d6676b..c1836b4947 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/values/dimens.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/values/dimens.xml @@ -1,72 +1,72 @@ - 1700px - 1200px - 1400px - 788px - 900px - 506px - 1300px - 1210px - 1150px - 290px + 1700dp + 1200dp + 1400dp + 788dp + 900dp + 506dp + 1300dp + 1210dp + 1150dp + 290dp - 32px - 18px - 30px - 36px - 38px - 42px - 45px - 46px - 50px - 52px - 54px - 56px - 62px - 80px - 100px - 140px - 150px - 180px - 200px - 220px - 395px - 580px - 588px - 1066px + 32dp + 18dp + 30dp + 36dp + 38dp + 42dp + 45dp + 46dp + 50dp + 52dp + 54dp + 56dp + 62dp + 80dp + 100dp + 140dp + 150dp + 180dp + 200dp + 220dp + 395dp + 580dp + 588dp + 1066dp - 60px - 275px - 120px - 460px - 120px - 220px - 120px + 60dp + 275dp + 120dp + 460dp + 120dp + 220dp + 120dp - 225px - 400px - 154px - 60px - 40px - 28px - 210px - 385px - 120px - 15px - 17px - 154px - 71px - 60px - 32px + 225dp + 400dp + 154dp + 60dp + 40dp + 28dp + 210dp + 385dp + 120dp + 15dp + 17dp + 154dp + 71dp + 60dp + 32dp - 150px - 150px - 42px - 40px - 46px + 150dp + 150dp + 42dp + 40dp + 46dp - 810px - 560px - 524px + 810dp + 560dp + 524dp \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/values/dimens_main.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/values/dimens_main.xml index 0e22ac8a00..540209153f 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/values/dimens_main.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/values/dimens_main.xml @@ -1,39 +1,39 @@ - 350px - 8px - 352px - 370px - 32px - 140.5px - 18px - 20px - 10px - 144px - 352px + 350dp + 8dp + 352dp + 370dp + 32dp + 140.5dp + 18dp + 20dp + 10dp + 144dp + 352dp - 320px - 319px + 320dp + 319dp - 110px - 6px - 15px - 460px - 444px - 350px - 10px - 16px - 658px - 8px - 2px - 1920px - 0px + 110dp + 6dp + 15dp + 460dp + 444dp + 350dp + 10dp + 16dp + 658dp + 8dp + 2dp + 1920dp + 0dp - 2px - 2px - 2px - 4px - 8px + 2dp + 2dp + 2dp + 4dp + 8dp \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/values/styles.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/values/styles.xml index 3b152e5033..126073b23f 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/values/styles.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/values/styles.xml @@ -11,7 +11,7 @@ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/xml/key.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/xml/key.xml index 05d655ef9d..14d4d7cd13 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/xml/key.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/xml/key.xml @@ -1,12 +1,12 @@ - + + android:keyHeight="122dp" + android:keyWidth="239dp" + android:horizontalGap="1dp" + android:verticalGap="1dp"> @@ -54,7 +54,7 @@ diff --git a/core/function-impl/mogo-core-function-map/src/main/res/drawable/bg_module_small_map_view_border.xml b/core/function-impl/mogo-core-function-map/src/main/res/drawable/bg_module_small_map_view_border.xml index 051d2de527..4f45cd6946 100644 --- a/core/function-impl/mogo-core-function-map/src/main/res/drawable/bg_module_small_map_view_border.xml +++ b/core/function-impl/mogo-core-function-map/src/main/res/drawable/bg_module_small_map_view_border.xml @@ -20,7 +20,7 @@ - + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-map/src/main/res/layout/module_small_map_fragment.xml b/core/function-impl/mogo-core-function-map/src/main/res/layout/module_small_map_fragment.xml index b994fca1a4..39ed764704 100644 --- a/core/function-impl/mogo-core-function-map/src/main/res/layout/module_small_map_fragment.xml +++ b/core/function-impl/mogo-core-function-map/src/main/res/layout/module_small_map_fragment.xml @@ -8,8 +8,8 @@ android:id="@+id/smallMapDirectionView" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginRight="30px" - android:layout_marginBottom="30px" + android:layout_marginRight="30dp" + android:layout_marginBottom="30dp" android:visibility="visible" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" /> diff --git a/core/function-impl/mogo-core-function-map/src/main/res/layout/view_maker_with_count.xml b/core/function-impl/mogo-core-function-map/src/main/res/layout/view_maker_with_count.xml index 0f80a366d3..ba981f64cf 100644 --- a/core/function-impl/mogo-core-function-map/src/main/res/layout/view_maker_with_count.xml +++ b/core/function-impl/mogo-core-function-map/src/main/res/layout/view_maker_with_count.xml @@ -2,33 +2,33 @@ diff --git a/core/function-impl/mogo-core-function-map/src/main/res/values-xhdpi/dimens.xml b/core/function-impl/mogo-core-function-map/src/main/res/values-xhdpi/dimens.xml index 5b648ef397..46af5b6835 100644 --- a/core/function-impl/mogo-core-function-map/src/main/res/values-xhdpi/dimens.xml +++ b/core/function-impl/mogo-core-function-map/src/main/res/values-xhdpi/dimens.xml @@ -1,19 +1,19 @@ - 977px - 249px - 61px - 80px + 977dp + 249dp + 61dp + 80dp - 1000px - 390px - 200px - 200px + 1000dp + 390dp + 200dp + 200dp - 40px - 400px - 550px - 360px + 40dp + 400dp + 550dp + 360dp \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-map/src/main/res/values/dimens.xml b/core/function-impl/mogo-core-function-map/src/main/res/values/dimens.xml index a4cebc3ea8..c4dd03deee 100644 --- a/core/function-impl/mogo-core-function-map/src/main/res/values/dimens.xml +++ b/core/function-impl/mogo-core-function-map/src/main/res/values/dimens.xml @@ -1,18 +1,18 @@ - 558px - 174px - 32px - 80px + 558dp + 174dp + 32dp + 80dp - 550px - 208px - 100px - 100px + 550dp + 208dp + 100dp + 100dp - 30px - 288px - 450px - 260px + 30dp + 288dp + 450dp + 260dp \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-monitoring/src/main/res/layout/dialog_navi_notice.xml b/core/function-impl/mogo-core-function-monitoring/src/main/res/layout/dialog_navi_notice.xml index 3c337fbd1f..5110e00657 100644 --- a/core/function-impl/mogo-core-function-monitoring/src/main/res/layout/dialog_navi_notice.xml +++ b/core/function-impl/mogo-core-function-monitoring/src/main/res/layout/dialog_navi_notice.xml @@ -12,7 +12,7 @@ android:layout_marginTop="@dimen/dp_134" android:text="是否退出导航？" android:textColor="#FFF" - android:textSize="@dimen/sp_40" + android:textSize="@dimen/dp_40" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" diff --git a/core/function-impl/mogo-core-function-notice/src/main/res/values-ldpi/dimens.xml b/core/function-impl/mogo-core-function-notice/src/main/res/values-ldpi/dimens.xml index 1f1106b6c5..5f7d672f98 100644 --- a/core/function-impl/mogo-core-function-notice/src/main/res/values-ldpi/dimens.xml +++ b/core/function-impl/mogo-core-function-notice/src/main/res/values-ldpi/dimens.xml @@ -1,101 +1,101 @@ - 16px - 352px - 32px - 32px - 16.5px - 12px - 20px - 18px - 210px - 13px - 15px - 18px - 320px - 180px - 16px - 320px - 160px - 9px - 20px - 0px - 48px - 10px - 14px - 28px - 20px - 20px - 90px - 5px - 84px - 38px - 36px - 100px - 64px - 24px - 16px - 44px - 2px - 20px - 27px - 16px - 64px - 8px - 16px + 16dp + 352dp + 32dp + 32dp + 16.5dp + 12dp + 20dp + 18dp + 210dp + 13dp + 15dp + 18dp + 320dp + 180dp + 16dp + 320dp + 160dp + 9dp + 20dp + 0dp + 48dp + 10dp + 14dp + 28dp + 20dp + 20dp + 90dp + 5dp + 84dp + 38dp + 36dp + 100dp + 64dp + 24dp + 16dp + 44dp + 2dp + 20dp + 27dp + 16dp + 64dp + 8dp + 16dp - 22px - 27px - 14px - 1.5px - 24px - 10px - 8px - 560px - 194px - 266px - 178px - 8px - 12px - 16px - 19px - 30px - 16px - 8px - 17px - 19px - 16px - 11px - 6px - 18px - 10px - 17px - 10px - 8px - 242px - 270px - 374px - 24px - 19px - 8px - 328px - 164px - 15px - 150px - 20px - 0px - 310px - 350px - 60px - 2px - 2px - 8px - 28px - 16px - 16px - 12px - 5px - 118px - 86px - 8px + 22dp + 27dp + 14dp + 1.5dp + 24dp + 10dp + 8dp + 560dp + 194dp + 266dp + 178dp + 8dp + 12dp + 16dp + 19dp + 30dp + 16dp + 8dp + 17dp + 19dp + 16dp + 11dp + 6dp + 18dp + 10dp + 17dp + 10dp + 8dp + 242dp + 270dp + 374dp + 24dp + 19dp + 8dp + 328dp + 164dp + 15dp + 150dp + 20dp + 0dp + 310dp + 350dp + 60dp + 2dp + 2dp + 8dp + 28dp + 16dp + 16dp + 12dp + 5dp + 118dp + 86dp + 8dp \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-notice/src/main/res/values-mdpi/dimens.xml b/core/function-impl/mogo-core-function-notice/src/main/res/values-mdpi/dimens.xml index 1f1106b6c5..5f7d672f98 100644 --- a/core/function-impl/mogo-core-function-notice/src/main/res/values-mdpi/dimens.xml +++ b/core/function-impl/mogo-core-function-notice/src/main/res/values-mdpi/dimens.xml @@ -1,101 +1,101 @@ - 16px - 352px - 32px - 32px - 16.5px - 12px - 20px - 18px - 210px - 13px - 15px - 18px - 320px - 180px - 16px - 320px - 160px - 9px - 20px - 0px - 48px - 10px - 14px - 28px - 20px - 20px - 90px - 5px - 84px - 38px - 36px - 100px - 64px - 24px - 16px - 44px - 2px - 20px - 27px - 16px - 64px - 8px - 16px + 16dp + 352dp + 32dp + 32dp + 16.5dp + 12dp + 20dp + 18dp + 210dp + 13dp + 15dp + 18dp + 320dp + 180dp + 16dp + 320dp + 160dp + 9dp + 20dp + 0dp + 48dp + 10dp + 14dp + 28dp + 20dp + 20dp + 90dp + 5dp + 84dp + 38dp + 36dp + 100dp + 64dp + 24dp + 16dp + 44dp + 2dp + 20dp + 27dp + 16dp + 64dp + 8dp + 16dp - 22px - 27px - 14px - 1.5px - 24px - 10px - 8px - 560px - 194px - 266px - 178px - 8px - 12px - 16px - 19px - 30px - 16px - 8px - 17px - 19px - 16px - 11px - 6px - 18px - 10px - 17px - 10px - 8px - 242px - 270px - 374px - 24px - 19px - 8px - 328px - 164px - 15px - 150px - 20px - 0px - 310px - 350px - 60px - 2px - 2px - 8px - 28px - 16px - 16px - 12px - 5px - 118px - 86px - 8px + 22dp + 27dp + 14dp + 1.5dp + 24dp + 10dp + 8dp + 560dp + 194dp + 266dp + 178dp + 8dp + 12dp + 16dp + 19dp + 30dp + 16dp + 8dp + 17dp + 19dp + 16dp + 11dp + 6dp + 18dp + 10dp + 17dp + 10dp + 8dp + 242dp + 270dp + 374dp + 24dp + 19dp + 8dp + 328dp + 164dp + 15dp + 150dp + 20dp + 0dp + 310dp + 350dp + 60dp + 2dp + 2dp + 8dp + 28dp + 16dp + 16dp + 12dp + 5dp + 118dp + 86dp + 8dp \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-notice/src/main/res/values-xhdpi-2560x1440/dimens.xml b/core/function-impl/mogo-core-function-notice/src/main/res/values-xhdpi-2560x1440/dimens.xml index 4afc379245..30c6c01239 100644 --- a/core/function-impl/mogo-core-function-notice/src/main/res/values-xhdpi-2560x1440/dimens.xml +++ b/core/function-impl/mogo-core-function-notice/src/main/res/values-xhdpi-2560x1440/dimens.xml @@ -1,39 +1,39 @@ - 230px - 230px - 230px - 30px - 21px - 34px - 33px - 2px - 120px - 30px - 55px - 42px - 208px - 394px - 42px - 567px - 100px - 20px - 34px - 34px + 230dp + 230dp + 230dp + 30dp + 21dp + 34dp + 33dp + 2dp + 120dp + 30dp + 55dp + 42dp + 208dp + 394dp + 42dp + 567dp + 100dp + 20dp + 34dp + 34dp - 1200px - 763px - 32px - 107px - 107px - 40px - 54px - 56px - 1000px - 33px - 43px - 20px + 1200dp + 763dp + 32dp + 107dp + 107dp + 40dp + 54dp + 56dp + 1000dp + 33dp + 43dp + 20dp \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-notice/src/main/res/values-xhdpi/dimens.xml b/core/function-impl/mogo-core-function-notice/src/main/res/values-xhdpi/dimens.xml index c7e71bf8e5..10045d18f9 100644 --- a/core/function-impl/mogo-core-function-notice/src/main/res/values-xhdpi/dimens.xml +++ b/core/function-impl/mogo-core-function-notice/src/main/res/values-xhdpi/dimens.xml @@ -1,101 +1,101 @@ - 30px - 660px - 60px - 60px - 31px - 22px - 38px - 32px - 394px - 24px - 28px - 34px - 600px - 338px - 30px - 605px - 300px - 16px - 53px - 0px - 90px - 20px - 26px - 50px - 36px - 36px - 160px - 10px - 151px - 72px - 68px - 180px - 120px - 50px - 22px - 6px - 84px + 30dp + 660dp + 60dp + 60dp + 31dp + 22dp + 38dp + 32dp + 394dp + 24dp + 28dp + 34dp + 600dp + 338dp + 30dp + 605dp + 300dp + 16dp + 53dp + 0dp + 90dp + 20dp + 26dp + 50dp + 36dp + 36dp + 160dp + 10dp + 151dp + 72dp + 68dp + 180dp + 120dp + 50dp + 22dp + 6dp + 84dp - 40px - 52px - 28px - 120px - 11px - 26px - 42px - 51px - 27px - 3px - 45px - 20px - 16px - 1000px - 350px - 480px - 320px - 17px - 21px - 30px - 33px - 50px - 30px - 14px - 30px - 27px - 30px - 21px - 11px - 34px - 20px - 30px - 20px - 15px - 242px - 486px - 700px - 30px - 33px - 16px - 640px - 296px - 30px - 250px - 20px - 0px - 618px - 350px - 120px - 20px - 20px - 20px - 50px - 28px - 29px - 22px - 11px - 212px - 154px - 10px + 40dp + 52dp + 28dp + 120dp + 11dp + 26dp + 42dp + 51dp + 27dp + 3dp + 45dp + 20dp + 16dp + 1000dp + 350dp + 480dp + 320dp + 17dp + 21dp + 30dp + 33dp + 50dp + 30dp + 14dp + 30dp + 27dp + 30dp + 21dp + 11dp + 34dp + 20dp + 30dp + 20dp + 15dp + 242dp + 486dp + 700dp + 30dp + 33dp + 16dp + 640dp + 296dp + 30dp + 250dp + 20dp + 0dp + 618dp + 350dp + 120dp + 20dp + 20dp + 20dp + 50dp + 28dp + 29dp + 22dp + 11dp + 212dp + 154dp + 10dp \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-notice/src/main/res/values/dimens.xml b/core/function-impl/mogo-core-function-notice/src/main/res/values/dimens.xml index dc5f0d6635..12de544c7c 100644 --- a/core/function-impl/mogo-core-function-notice/src/main/res/values/dimens.xml +++ b/core/function-impl/mogo-core-function-notice/src/main/res/values/dimens.xml @@ -1,126 +1,126 @@ - 16px - 352px - 32px - 32px - 16.5px - 12px - 20px - 18px - 210px - 13px - 15px - 18px - 320px - 180px - 16px - 320px - 160px - 9px - 20px - 0px - 48px - 10px - 14px - 50px - 20px - 20px - 90px - 5px - 84px - 38px - 36px - 100px - 64px - 24px - 16px - 44px - 2px - 20px - 27px - 16px - 64px - 8px - 16px + 16dp + 352dp + 32dp + 32dp + 16.5dp + 12dp + 20dp + 18dp + 210dp + 13dp + 15dp + 18dp + 320dp + 180dp + 16dp + 320dp + 160dp + 9dp + 20dp + 0dp + 48dp + 10dp + 14dp + 50dp + 20dp + 20dp + 90dp + 5dp + 84dp + 38dp + 36dp + 100dp + 64dp + 24dp + 16dp + 44dp + 2dp + 20dp + 27dp + 16dp + 64dp + 8dp + 16dp - 22px - 27px - 14px - 1.5px - 24px - 10px - 8px - 560px - 194px - 266px - 178px - 8px - 12px - 16px - 19px - 30px - 16px - 8px - 17px - 19px - 16px - 11px - 6px - 18px - 10px - 17px - 10px - 8px - 242px - 270px - 374px - 24px - 19px - 8px - 328px - 164px - 15px - 150px - 20px - 0px - 310px - 350px - 60px - 2px - 2px - 8px - 28px - 16px - 16px - 12px - 5px - 118px - 86px - 8px + 22dp + 27dp + 14dp + 1.5dp + 24dp + 10dp + 8dp + 560dp + 194dp + 266dp + 178dp + 8dp + 12dp + 16dp + 19dp + 30dp + 16dp + 8dp + 17dp + 19dp + 16dp + 11dp + 6dp + 18dp + 10dp + 17dp + 10dp + 8dp + 242dp + 270dp + 374dp + 24dp + 19dp + 8dp + 328dp + 164dp + 15dp + 150dp + 20dp + 0dp + 310dp + 350dp + 60dp + 2dp + 2dp + 8dp + 28dp + 16dp + 16dp + 12dp + 5dp + 118dp + 86dp + 8dp - 34px - 567px - 100px + 34dp + 567dp + 100dp - 2px - 120px - 30px - 55px - 42px - 208px + 2dp + 120dp + 30dp + 55dp + 42dp + 208dp - 1200px - 763px - 32px - 107px - 107px - 40px - 54px - 56px - 1000px - 33px - 43px - 20px + 1200dp + 763dp + 32dp + 107dp + 107dp + 40dp + 54dp + 56dp + 1000dp + 33dp + 43dp + 20dp \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable/bg_fatigue_driving.xml b/core/function-impl/mogo-core-function-v2x/src/main/res/drawable/bg_fatigue_driving.xml index a963da5710..283676867b 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable/bg_fatigue_driving.xml +++ b/core/function-impl/mogo-core-function-v2x/src/main/res/drawable/bg_fatigue_driving.xml @@ -1,7 +1,7 @@ - + - + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/footer_nomore_view.xml b/core/function-impl/mogo-core-function-v2x/src/main/res/layout/footer_nomore_view.xml index 9fc434c82f..1f78233f39 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/footer_nomore_view.xml +++ b/core/function-impl/mogo-core-function-v2x/src/main/res/layout/footer_nomore_view.xml @@ -11,8 +11,8 @@ diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/v2x_road_video_plyer_layout_vr.xml b/core/function-impl/mogo-core-function-v2x/src/main/res/layout/v2x_road_video_plyer_layout_vr.xml index 61c8b584da..b0f6e62018 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/v2x_road_video_plyer_layout_vr.xml +++ b/core/function-impl/mogo-core-function-v2x/src/main/res/layout/v2x_road_video_plyer_layout_vr.xml @@ -55,8 +55,8 @@ diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/view_history_empty.xml b/core/function-impl/mogo-core-function-v2x/src/main/res/layout/view_history_empty.xml index fd6d3658a8..f6eec98091 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/view_history_empty.xml +++ b/core/function-impl/mogo-core-function-v2x/src/main/res/layout/view_history_empty.xml @@ -8,7 +8,7 @@ android:id="@+id/ivEmptyView" android:layout_width="@dimen/dp_355" android:layout_height="@dimen/dp_355" - android:layout_marginTop="60px" + android:layout_marginTop="60dp" android:src="@drawable/icon_share_empty" app:layout_constraintBottom_toTopOf="@+id/tvTrip" app:layout_constraintEnd_toEndOf="parent" diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/view_marker_car_info.xml b/core/function-impl/mogo-core-function-v2x/src/main/res/layout/view_marker_car_info.xml index a0444b91fc..6a0b702d11 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/view_marker_car_info.xml +++ b/core/function-impl/mogo-core-function-v2x/src/main/res/layout/view_marker_car_info.xml @@ -40,7 +40,7 @@ android:minWidth="@dimen/dp_150" android:singleLine="true" android:textColor="#ffffff" - android:textSize="@dimen/sp_32" + android:textSize="@dimen/dp_32" app:layout_constraintEnd_toStartOf="@+id/ivIcon" app:layout_constraintStart_toEndOf="@+id/ivUserHead" app:layout_constraintTop_toTopOf="@+id/ivUserHead" @@ -53,7 +53,7 @@ android:layout_height="wrap_content" android:background="@drawable/v2x_map_marker_driver_type_blue_info" android:textColor="#ffffff" - android:textSize="@dimen/sp_20" + android:textSize="@dimen/dp_20" app:layout_constraintStart_toStartOf="@+id/tvMarkerContent" app:layout_constraintTop_toBottomOf="@+id/tvMarkerContent" tools:text="老司机" /> diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/view_v2x_optimal_speed_marker.xml b/core/function-impl/mogo-core-function-v2x/src/main/res/layout/view_v2x_optimal_speed_marker.xml index 61db0e4f33..a2641258f0 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/view_v2x_optimal_speed_marker.xml +++ b/core/function-impl/mogo-core-function-v2x/src/main/res/layout/view_v2x_optimal_speed_marker.xml @@ -6,7 +6,7 @@ android:layout_height="wrap_content" android:gravity="center" android:orientation="vertical" - android:padding="1px" + android:padding="1dp" tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout"> diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/values-ldpi/dimens.xml b/core/function-impl/mogo-core-function-v2x/src/main/res/values-ldpi/dimens.xml index a7c7e3c3dd..162b8df252 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/res/values-ldpi/dimens.xml +++ b/core/function-impl/mogo-core-function-v2x/src/main/res/values-ldpi/dimens.xml @@ -1,121 +1,121 @@ - 445px + 445dp - 18px - 20px + 18dp + 20dp - 190px - 210px + 190dp + 210dp - 82px + 82dp - 34px - 22px + 34dp + 22dp - 40px + 40dp - 6px + 6dp - 550px - 200px - 200px - 100px - 50px - 90px - 36px - 40px - 15px - 150px - 48px - 32px - 28px - 28px - 190px - 238px - 170px - 43px - 26px - 12px - 8px - 2px - 30px - 22px + 550dp + 200dp + 200dp + 100dp + 50dp + 90dp + 36dp + 40dp + 15dp + 150dp + 48dp + 32dp + 28dp + 28dp + 190dp + 238dp + 170dp + 43dp + 26dp + 12dp + 8dp + 2dp + 30dp + 22dp - 12px - 16px + 12dp + 16dp - 24px - 18px - 20px - 16px - 28px + 24dp + 18dp + 20dp + 16dp + 28dp - 82px - 16px - 117px - 50px - 17px - 14px - 36px - 22px - 16px - 20px - 15px - 34px - 15px - 29px - -8px - 84px + 82dp + 16dp + 117dp + 50dp + 17dp + 14dp + 36dp + 22dp + 16dp + 20dp + 15dp + 34dp + 15dp + 29dp + -8dp + 84dp - 16px - 20px - 6px + 16dp + 20dp + 6dp - 10px - 20px - 16px - 31px - 20px - 150px - 54px - 64px + 10dp + 20dp + 16dp + 31dp + 20dp + 150dp + 54dp + 64dp - 190px - 250px - 156px - 234px + 190dp + 250dp + 156dp + 234dp - 136px + 136dp - 41px - 18px - 14px - 44px - 19px + 41dp + 18dp + 14dp + 44dp + 19dp - 100px - 32px + 100dp + 32dp - 572px - 480px - 384px + 572dp + 480dp + 384dp - 460px - 370px - 380px - 84px - 26px - 14px + 460dp + 370dp + 380dp + 84dp + 26dp + 14dp diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/values-mdpi/dimens.xml b/core/function-impl/mogo-core-function-v2x/src/main/res/values-mdpi/dimens.xml index af1575dcd3..cd4b17da43 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/res/values-mdpi/dimens.xml +++ b/core/function-impl/mogo-core-function-v2x/src/main/res/values-mdpi/dimens.xml @@ -1,121 +1,121 @@ - 445px + 445dp - 18px - 20px + 18dp + 20dp - 190px - 210px + 190dp + 210dp - 82px + 82dp - 34px - 22px + 34dp + 22dp - 40px + 40dp - 6px + 6dp - 550px - 200px - 200px - 100px - 50px - 90px - 36px - 40px - 15px - 150px - 48px - 32px - 28px - 28px - 190px - 238px - 170px - 43px - 26px - 12px - 8px - 2px - 30px - 22px - 14px - 12px - 16px + 550dp + 200dp + 200dp + 100dp + 50dp + 90dp + 36dp + 40dp + 15dp + 150dp + 48dp + 32dp + 28dp + 28dp + 190dp + 238dp + 170dp + 43dp + 26dp + 12dp + 8dp + 2dp + 30dp + 22dp + 14dp + 12dp + 16dp - 24px - 18px - 20px - 16px - 28px + 24dp + 18dp + 20dp + 16dp + 28dp - 82px - 16px - 117px - 50px - 17px - 14px - 36px - 22px - 16px - 20px - 34px - 16px - 29px - -8px - 84pxw + 82dp + 16dp + 117dp + 50dp + 17dp + 14dp + 36dp + 22dp + 16dp + 20dp + 34dp + 16dp + 29dp + -8dp + 84dpw - 16px - 20px - 3px + 16dp + 20dp + 3dp - 10px - 20px - 16px - 31px - 20px - 150px - 54px - 64px + 10dp + 20dp + 16dp + 31dp + 20dp + 150dp + 54dp + 64dp - 190px - 250px - 156px - 234px + 190dp + 250dp + 156dp + 234dp - 136px + 136dp - 41px - 18px - 14px - 44px - 19px + 41dp + 18dp + 14dp + 44dp + 19dp - 100px - 32px + 100dp + 32dp - 572px - 486px - 384px + 572dp + 486dp + 384dp - 460px - 370px - 380px - 84px - 26px - 14px + 460dp + 370dp + 380dp + 84dp + 26dp + 14dp diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml b/core/function-impl/mogo-core-function-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml index b43ce52f75..55d6d11077 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml +++ b/core/function-impl/mogo-core-function-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml @@ -1,95 +1,95 @@ - 800px + 800dp - 32px - 32px + 32dp + 32dp - 390px - 410px + 390dp + 410dp - 160px + 160dp - 60px - 40px + 60dp + 40dp - 80px + 80dp - 15px - 550px - 200px - 200px - 100px - 90px - 162px - 64px - 80px - 26px - 270px - 86px - 58px - 48px - 48px - 349px - 465px - 306px - 77px - 50px - 28px - 16px - 5px - 80px - 22px + 15dp + 550dp + 200dp + 200dp + 100dp + 90dp + 162dp + 64dp + 80dp + 26dp + 270dp + 86dp + 58dp + 48dp + 48dp + 349dp + 465dp + 306dp + 77dp + 50dp + 28dp + 16dp + 5dp + 80dp + 22dp - 20px - 30px + 20dp + 30dp - 42px - 30px - 36px - 30px - 50px + 42dp + 30dp + 36dp + 30dp + 50dp - 120px + 120dp - 158px + 158dp - 20px - 36px - 28px - 55px - 36px - 310px - 110px - 120px + 20dp + 36dp + 28dp + 55dp + 36dp + 310dp + 110dp + 120dp - 270px - 480px - 330px - 450px + 270dp + 480dp + 330dp + 450dp - 200px + 200dp - 75px - 32px - 26px - 80px - 34px + 75dp + 32dp + 26dp + 80dp + 34dp - 100px - 32px + 100dp + 32dp - 940px - 701px - 150px - 46px - 26px + 940dp + 701dp + 150dp + 46dp + 26dp diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/values-xhdpi-2560x1440/dimens.xml b/core/function-impl/mogo-core-function-v2x/src/main/res/values-xhdpi-2560x1440/dimens.xml index 217d316789..8fa468641c 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/res/values-xhdpi-2560x1440/dimens.xml +++ b/core/function-impl/mogo-core-function-v2x/src/main/res/values-xhdpi-2560x1440/dimens.xml @@ -1,51 +1,51 @@ - 1100px - 227px - 187px - 30px - 133px - 133px - 38px - 42px - 12px - 40px + 1100dp + 227dp + 187dp + 30dp + 133dp + 133dp + 38dp + 42dp + 12dp + 40dp - 778px - 687px - 200px - 10px - 487px - 778px + 778dp + 687dp + 200dp + 10dp + 487dp + 778dp - 234px - 1067px - 187px - 28px + 234dp + 1067dp + 187dp + 28dp - 107px - 47px + 107dp + 47dp - 35px - 48px - 35px - 36px - 80px - 108px + 35dp + 48dp + 35dp + 36dp + 80dp + 108dp - 53px + 53dp - 200px - 854px - 187px - 133px - 133px - 480px - 42px - 40px + 200dp + 854dp + 187dp + 133dp + 133dp + 480dp + 42dp + 40dp - 133px - 42px + 133dp + 42dp \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/values-xhdpi/dimens.xml b/core/function-impl/mogo-core-function-v2x/src/main/res/values-xhdpi/dimens.xml index b4eb41ebb2..d24085079b 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/res/values-xhdpi/dimens.xml +++ b/core/function-impl/mogo-core-function-v2x/src/main/res/values-xhdpi/dimens.xml @@ -1,170 +1,170 @@ - 800px + 800dp - 615px - 32px - 32px - 1060px - 583px - 366px - 160px - 0px - 32px - 0px - 390px - 410px + 615dp + 32dp + 32dp + 1060dp + 583dp + 366dp + 160dp + 0dp + 32dp + 0dp + 390dp + 410dp - 670px - 526px - 20px + 670dp + 526dp + 20dp - 147px - 60px - 40px + 147dp + 60dp + 40dp - 80px + 80dp - 15px - 550px - 200px - 200px - 100px - 90px - 168px - 68px - 80px - 26px - 270px - 86px - 58px - 20px - 48px - 349px - 465px - 306px - 77px - 50px - 28px - 16px - 5px - 80px - 22px + 15dp + 550dp + 200dp + 200dp + 100dp + 90dp + 168dp + 68dp + 80dp + 26dp + 270dp + 86dp + 58dp + 20dp + 48dp + 349dp + 465dp + 306dp + 77dp + 50dp + 28dp + 16dp + 5dp + 80dp + 22dp - 20px - 30px + 20dp + 30dp - 42px - 30px - 36px - 30px - 50px + 42dp + 30dp + 36dp + 30dp + 50dp - 30px - 140px - 219px - 100px - 28px - 26px - 64px - 48px - 28px - 40px - 30px - 60px - 22px - 54px - -10px - 114px - 158px - 26px - 25px - 2px - 82px - 55px - 95px + 30dp + 140dp + 219dp + 100dp + 28dp + 26dp + 64dp + 48dp + 28dp + 40dp + 30dp + 60dp + 22dp + 54dp + -10dp + 114dp + 158dp + 26dp + 25dp + 2dp + 82dp + 55dp + 95dp - 16px - 36px - 28px - 55px - 36px - 310px - 98px - 130px + 16dp + 36dp + 28dp + 55dp + 36dp + 310dp + 98dp + 130dp - 80px - 882px - 182px - 64px - 60px + 80dp + 882dp + 182dp + 64dp + 60dp - 330px - 450px - 280px - 421px + 330dp + 450dp + 280dp + 421dp - 234px + 234dp - 75px - 32px - 26px - 80px - 34px + 75dp + 32dp + 26dp + 80dp + 34dp - 100px - 32px + 100dp + 32dp - 940px - 940px - 701px - 32px + 940dp + 940dp + 701dp + 32dp - 830px - 662px - 674px - 150px - 46px - 26px + 830dp + 662dp + 674dp + 150dp + 46dp + 26dp - 140px - 20px - 100px - 100px - 30px - 32px - 8px - 30px + 140dp + 20dp + 100dp + 100dp + 30dp + 32dp + 8dp + 30dp - 800px - 140px - 20px + 800dp + 140dp + 20dp - 80px - 35px + 80dp + 35dp - 27px - 40px - 27px - 24px - 42px - 80px - 40px - 150px - 640px - 140px - 100px - 100px - 480px - 32px - 30px + 27dp + 40dp + 27dp + 24dp + 42dp + 80dp + 40dp + 150dp + 640dp + 140dp + 100dp + 100dp + 480dp + 32dp + 30dp diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/values/dimens.xml b/core/function-impl/mogo-core-function-v2x/src/main/res/values/dimens.xml index 0a94e3dc59..cc4bd70221 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/res/values/dimens.xml +++ b/core/function-impl/mogo-core-function-v2x/src/main/res/values/dimens.xml @@ -1,106 +1,106 @@ - 445px + 445dp - 18px - 20px - 642px - 190px - 210px + 18dp + 20dp + 642dp + 190dp + 210dp - 670px + 670dp - 82px + 82dp - 34px - 22px + 34dp + 22dp - 40px + 40dp - 6px + 6dp - 550px - 200px - 200px - 100px - 50px - 168px - 68px - 40px - 15px - 150px - 48px - 32px - 28px - 28px - 190px - 170px - 43px - 26px - 12px - 8px - 2px - 30px - 22px + 550dp + 200dp + 200dp + 100dp + 50dp + 168dp + 68dp + 40dp + 15dp + 150dp + 48dp + 32dp + 28dp + 28dp + 190dp + 170dp + 43dp + 26dp + 12dp + 8dp + 2dp + 30dp + 22dp - 24px - 30px - 20px - 16px - 28px + 24dp + 30dp + 20dp + 16dp + 28dp - 82px - 16px - 117px - 200px - 17px - 14px - 36px - 22px - 16px - 20px - 20px - 34px - 15px - 29px - -8px - 84px - 67px - 45px - 52px + 82dp + 16dp + 117dp + 200dp + 17dp + 14dp + 36dp + 22dp + 16dp + 20dp + 20dp + 34dp + 15dp + 29dp + -8dp + 84dp + 67dp + 45dp + 52dp - 8px - 20px - 16px - 31px - 20px - 150px - 54px - 64px + 8dp + 20dp + 16dp + 31dp + 20dp + 150dp + 54dp + 64dp - 190px - 250px - 156px - 234px + 190dp + 250dp + 156dp + 234dp - 136px + 136dp - 41px - 18px - 14px - 44px - 34px + 41dp + 18dp + 14dp + 44dp + 34dp - 150px - 46px - 26px - 574px - 480px - 384px + 150dp + 46dp + 26dp + 574dp + 480dp + 384dp diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/values/strings.xml b/core/function-impl/mogo-core-function-v2x/src/main/res/values/strings.xml index d66b049f49..a6837f423e 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/res/values/strings.xml +++ b/core/function-impl/mogo-core-function-v2x/src/main/res/values/strings.xml @@ -13,7 +13,7 @@ 诶呀呀，周围没有可用路口实况直播 停车场推荐 线路推荐 - 26px + 26dp 前方路口暂无直播 此摄像头暂无直播 diff --git a/core/mogo-core-res/src/main/function-hmi-res/drawable/bg_waring_limiting_velocity.xml b/core/mogo-core-res/src/main/function-hmi-res/drawable/bg_waring_limiting_velocity.xml index 94f286340a..039320035e 100644 --- a/core/mogo-core-res/src/main/function-hmi-res/drawable/bg_waring_limiting_velocity.xml +++ b/core/mogo-core-res/src/main/function-hmi-res/drawable/bg_waring_limiting_velocity.xml @@ -6,15 +6,15 @@ + android:width="120dp" + android:height="120dp" /> diff --git a/core/mogo-core-res/src/main/function-hmi-res/drawable/bg_waring_traffic_light_vr.xml b/core/mogo-core-res/src/main/function-hmi-res/drawable/bg_waring_traffic_light_vr.xml index b397cfa010..bf4719674a 100644 --- a/core/mogo-core-res/src/main/function-hmi-res/drawable/bg_waring_traffic_light_vr.xml +++ b/core/mogo-core-res/src/main/function-hmi-res/drawable/bg_waring_traffic_light_vr.xml @@ -5,5 +5,5 @@ - + \ No newline at end of file diff --git a/core/mogo-core-res/src/main/function-hmi-res/drawable/bg_warning_bg.xml b/core/mogo-core-res/src/main/function-hmi-res/drawable/bg_warning_bg.xml index d247f7d96a..05d55ae29d 100644 --- a/core/mogo-core-res/src/main/function-hmi-res/drawable/bg_warning_bg.xml +++ b/core/mogo-core-res/src/main/function-hmi-res/drawable/bg_warning_bg.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/core/mogo-core-res/src/main/res/drawable-xxhdpi/bottom_left.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/bottom_left.png similarity index 100% rename from core/mogo-core-res/src/main/res/drawable-xxhdpi/bottom_left.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/bottom_left.png diff --git a/core/mogo-core-res/src/main/res/drawable-xxhdpi/bottom_right.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/bottom_right.png similarity index 100% rename from core/mogo-core-res/src/main/res/drawable-xxhdpi/bottom_right.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/bottom_right.png diff --git a/core/mogo-core-res/src/main/res/drawable-xxhdpi/icon_close_nor.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/icon_close_nor.png similarity index 100% rename from core/mogo-core-res/src/main/res/drawable-xxhdpi/icon_close_nor.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/icon_close_nor.png diff --git a/core/mogo-core-res/src/main/res/drawable-xxhdpi/top_left.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/top_left.png similarity index 100% rename from core/mogo-core-res/src/main/res/drawable-xxhdpi/top_left.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/top_left.png diff --git a/core/mogo-core-res/src/main/res/layout/item_notice_video.xml b/core/mogo-core-res/src/main/res/layout/item_notice_video.xml index 1cd2945794..9bb2686408 100644 --- a/core/mogo-core-res/src/main/res/layout/item_notice_video.xml +++ b/core/mogo-core-res/src/main/res/layout/item_notice_video.xml @@ -60,8 +60,8 @@ android:layout_gravity="bottom" android:layout_marginBottom="@dimen/notice_seekbar_bottom" android:max="100" - android:maxHeight="8px" - android:minHeight="8px" + android:maxHeight="8dp" + android:minHeight="8dp" android:progressDrawable="@drawable/notice_seekbar_style" android:thumb="@drawable/notice_player_ic_circle_nor" /> diff --git a/core/mogo-core-res/src/main/res/layout/item_notice_video_small.xml b/core/mogo-core-res/src/main/res/layout/item_notice_video_small.xml index c920e62237..56cb236a9f 100644 --- a/core/mogo-core-res/src/main/res/layout/item_notice_video_small.xml +++ b/core/mogo-core-res/src/main/res/layout/item_notice_video_small.xml @@ -60,8 +60,8 @@ android:layout_gravity="bottom" android:layout_marginBottom="@dimen/notice_seekbar_bottom" android:max="100" - android:maxHeight="8px" - android:minHeight="8px" + android:maxHeight="8dp" + android:minHeight="8dp" android:progressDrawable="@drawable/notice_seekbar_style" android:thumb="@drawable/notice_player_ic_circle_nor" /> diff --git a/core/mogo-core-res/src/main/res/layout/item_v2x_crossroad_live_video.xml b/core/mogo-core-res/src/main/res/layout/item_v2x_crossroad_live_video.xml index 938a27fd1b..3279c97398 100644 --- a/core/mogo-core-res/src/main/res/layout/item_v2x_crossroad_live_video.xml +++ b/core/mogo-core-res/src/main/res/layout/item_v2x_crossroad_live_video.xml @@ -14,8 +14,8 @@ - 460px - 460px - 70px + 460dp + 460dp + 70dp - 104px - 104px + 104dp + 104dp - 640px - 80px - 540px - 640px - 40px + 640dp + 80dp + 540dp + 640dp + 40dp - 30px - 130px + 30dp + 130dp - 40px - 320px - 320px - 20px - 110px - 40px + 40dp + 320dp + 320dp + 20dp + 110dp + 40dp - 74px - 92px + 74dp + 92dp - 460px - 140px - 40px - 30px - 92px - 44px - 28px + 460dp + 140dp + 40dp + 30dp + 92dp + 44dp + 28dp - 30px - 70px + 30dp + 70dp - 120px - 368px - 60px - 44px + 120dp + 368dp + 60dp + 44dp - 280px - 120px - 20px - 38px - 50px - 60px + 280dp + 120dp + 20dp + 38dp + 50dp + 60dp \ No newline at end of file diff --git a/core/mogo-core-res/src/main/res/values/dimens.xml b/core/mogo-core-res/src/main/res/values/dimens.xml index dfc124ac5d..46091d3de0 100644 --- a/core/mogo-core-res/src/main/res/values/dimens.xml +++ b/core/mogo-core-res/src/main/res/values/dimens.xml @@ -1,78 +1,78 @@ - 20px - 52px - 65px - 200px - 100px - 1200px - 1600px - 300px - 300px - 60px + 20dp + 52dp + 65dp + 200dp + 100dp + 1200dp + 1600dp + 300dp + 300dp + 60dp - 104px - 104px + 104dp + 104dp - 380px - 40px - 380px - 380px - 40px + 380dp + 40dp + 380dp + 380dp + 40dp - 20px - 110px + 20dp + 110dp - 40px - 200px - 200px - 10px - 80px - 28px + 40dp + 200dp + 200dp + 10dp + 80dp + 28dp - 46px - 60px + 46dp + 60dp - 300px - 100px - 40px - 30px - 20px - 30px - 18px + 300dp + 100dp + 40dp + 30dp + 20dp + 30dp + 18dp - 20px - 50px + 20dp + 50dp - 76px - 368px - 38px - 33px + 76dp + 368dp + 38dp + 33dp - 190px - 76px - 16px - 24px - 35px - 38px + 190dp + 76dp + 16dp + 24dp + 35dp + 38dp - 50px - 66px - 50px - 30px - 990px - 60px - 56px - 26px - 20px + 50dp + 66dp + 50dp + 30dp + 990dp + 60dp + 56dp + 26dp + 20dp - 35px - 26px - 600px - 30px - 20px - 30px + 35dp + 26dp + 600dp + 30dp + 20dp + 30dp \ No newline at end of file diff --git a/core/mogo-core-utils/build.gradle b/core/mogo-core-utils/build.gradle index 692a87bf80..cf28ac9c2a 100644 --- a/core/mogo-core-utils/build.gradle +++ b/core/mogo-core-utils/build.gradle @@ -65,6 +65,7 @@ dependencies { implementation rootProject.ext.dependencies.coroutinescore implementation rootProject.ext.dependencies.coroutinesandroid + implementation rootProject.ext.dependencies.androidautoSize api rootProject.ext.dependencies.mogoaicloudpassport api rootProject.ext.dependencies.mogoaicloudnetwork diff --git a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/ToastUtils.java b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/ToastUtils.java index 82b3414c46..27cc9154d6 100644 --- a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/ToastUtils.java +++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/ToastUtils.java @@ -41,6 +41,9 @@ import androidx.core.app.NotificationManagerCompat; import androidx.core.content.ContextCompat; import androidx.core.view.ViewCompat; +import me.jessyan.autosize.AutoSizeCompat; +import me.jessyan.autosize.AutoSizeConfig; + /** * 
  *     author: Blankj
diff --git a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/ViewUtils.java b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/ViewUtils.java
index 88a52c0859..d71bd88dbd 100644
--- a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/ViewUtils.java
+++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/ViewUtils.java
@@ -14,6 +14,8 @@ import java.util.Locale;
 import androidx.annotation.LayoutRes;
 import androidx.annotation.NonNull;
 
+import me.jessyan.autosize.AutoSizeCompat;
+
 /**
  * 
  *     author: Blankj
@@ -117,6 +119,7 @@ public class ViewUtils {
     public static View layoutId2View(@LayoutRes final int layoutId) {
         LayoutInflater inflate =
                 (LayoutInflater) Utils.getApp().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+        AutoSizeCompat.autoConvertDensity(inflate.getContext().getResources(), 2560, true);//如果有自定义需求就用这个方法
         return inflate.inflate(layoutId, null);
     }
 
diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpActivity.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpActivity.java
index a4dc498f2c..e148ff30d4 100644
--- a/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpActivity.java
+++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpActivity.java
@@ -22,7 +22,7 @@ import me.jessyan.autosize.internal.CancelAdapt;
  * 

  * mvp 的 activity
  */
-public abstract class MvpActivity> extends AppCompatActivity implements IView, CancelAdapt {
+public abstract class MvpActivity> extends AppCompatActivity implements IView {
 
     protected static final String TAG = "MvpActivity";
 
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 9b375a9143..591f7795de 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
@@ -11,7 +11,7 @@ public class ScreenHelper {
      */
     public static void setScreenConfig(Context context) {
         AutoSizeConfig.getInstance()
-                .setBaseOnWidth(false)
+                .setBaseOnWidth(true)
                 .setCustomFragment(true)
                 .setDesignWidthInDp(2560)
                 .setDesignHeightInDp(1600);
diff --git a/foudations/mogo-commons/src/main/res/values-xhdpi/dimens.xml b/foudations/mogo-commons/src/main/res/values-xhdpi/dimens.xml
index ddb78a45af..ac7346cb58 100644
--- a/foudations/mogo-commons/src/main/res/values-xhdpi/dimens.xml
+++ b/foudations/mogo-commons/src/main/res/values-xhdpi/dimens.xml
@@ -1,18 +1,18 @@
 
 
-    63px
-    30px
-    63px
-    32px
-    32px
-    19px
-    19px
-    40px
-    698px
-    900px
-    130px
-    94px
-    21px
+    63dp
+    30dp
+    63dp
+    32dp
+    32dp
+    19dp
+    19dp
+    40dp
+    698dp
+    900dp
+    130dp
+    94dp
+    21dp
 
 
 
diff --git a/foudations/mogo-commons/src/main/res/values/dimens.xml b/foudations/mogo-commons/src/main/res/values/dimens.xml
index 4056fd470a..72fd8d4ceb 100644
--- a/foudations/mogo-commons/src/main/res/values/dimens.xml
+++ b/foudations/mogo-commons/src/main/res/values/dimens.xml
@@ -1,16 +1,16 @@
 
 
-    33px
-    17px
-    33px
-    16px
-    16px
-    10px
-    10px
-    22px
-    371px
-    500px
-    72px
-    50px
-    10px
+    33dp
+    17dp
+    33dp
+    16dp
+    16dp
+    10dp
+    10dp
+    22dp
+    371dp
+    500dp
+    72dp
+    50dp
+    10dp
 
\ No newline at end of file
diff --git a/modules/mogo-module-common/src/main/res/layout/modudle_camera_layout_info.xml b/modules/mogo-module-common/src/main/res/layout/modudle_camera_layout_info.xml
index 39535e2391..003c48eb44 100644
--- a/modules/mogo-module-common/src/main/res/layout/modudle_camera_layout_info.xml
+++ b/modules/mogo-module-common/src/main/res/layout/modudle_camera_layout_info.xml
@@ -6,7 +6,7 @@
     android:layout_height="wrap_content"
     android:gravity="center"
     android:orientation="vertical"
-    android:padding="1px"
+    android:padding="1dp"
     tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
 
     
 
     
+    android:padding="1dp">
 
     
+            android:textSize="@dimen/dp_32" />
     
 
     
 
     
 
-    18px
-    16px
-    120px
-    150px
-    48px
-    17.5000px
+    18dp
+    16dp
+    120dp
+    150dp
+    48dp
+    17.5000dp
 
 
     16dp
     2dp
-    70px
-    76px
-    35px
-    35px
-    4px
+    70dp
+    76dp
+    35dp
+    35dp
+    4dp
 
-    550px
-    208px
-    100px
-    100px
-    100px
-    10px
-    54px
-    44px
-    44px
-    14px
-    12px
-    64px
-    6.5px
-    10px
+    550dp
+    208dp
+    100dp
+    100dp
+    100dp
+    10dp
+    54dp
+    44dp
+    44dp
+    14dp
+    12dp
+    64dp
+    6.5dp
+    10dp
 
-    2px
-    2px
-    6px
-    28px
-    16px
+    2dp
+    2dp
+    6dp
+    28dp
+    16dp
 
-    20px
-    28px
-    20px
-    84px
-    18px
-    58px
-    14px
-    16px
-    18px
-    5px
-    20px
-    13px
-    42px
-    8.89px
-    13px
-    16px
-    25px
-    13px
-    26px
-    40px
-    18px
-    28px
-    108px
-    12.5px
+    20dp
+    28dp
+    20dp
+    84dp
+    18dp
+    58dp
+    14dp
+    16dp
+    18dp
+    5dp
+    20dp
+    13dp
+    42dp
+    8.89dp
+    13dp
+    16dp
+    25dp
+    13dp
+    26dp
+    40dp
+    18dp
+    28dp
+    108dp
+    12.5dp
 
\ No newline at end of file
diff --git a/modules/mogo-module-common/src/main/res/values-xhdpi-2560x1440/dimens.xml b/modules/mogo-module-common/src/main/res/values-xhdpi-2560x1440/dimens.xml
index 1d6dc7be07..9975673934 100644
--- a/modules/mogo-module-common/src/main/res/values-xhdpi-2560x1440/dimens.xml
+++ b/modules/mogo-module-common/src/main/res/values-xhdpi-2560x1440/dimens.xml
@@ -1,20 +1,20 @@
 
 
-    12px
-    14px
-    20px
-    22px
-    43px
-    50px
-    57px
-    60px
-    72px
-    80px
-    88px
-    26px
-    30px
-    270px
-    320px
-    616px
-    630px
+    12dp
+    14dp
+    20dp
+    22dp
+    43dp
+    50dp
+    57dp
+    60dp
+    72dp
+    80dp
+    88dp
+    26dp
+    30dp
+    270dp
+    320dp
+    616dp
+    630dp
 
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
index 13f48cd860..7a3649cb09 100644
--- 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
@@ -1,26 +1,26 @@
 
 
-    12px
-    42px
-    628px
-    188px
-    120px
-    26px
-    37px
-    435px
-    186px
-    120px
-    37px
-    27px
-    20px
-    22px
-    88px
-    90px
-    144px
-    186px
-    300px
-    328px
-    730px
-    1600px
-    630px
+    12dp
+    42dp
+    628dp
+    188dp
+    120dp
+    26dp
+    37dp
+    435dp
+    186dp
+    120dp
+    37dp
+    27dp
+    20dp
+    22dp
+    88dp
+    90dp
+    144dp
+    186dp
+    300dp
+    328dp
+    730dp
+    1600dp
+    630dp
 
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
deleted file mode 100644
index 82a150691f..0000000000
--- a/modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml
+++ /dev/null
@@ -1,1143 +0,0 @@
-
-
-
-    
-    
-    -60px
-    -30px
-    -20px
-    -12px
-    -10px
-    -8px
-    -5px
-    -2px
-    -1px
-    0px
-    0.1px
-    0.5px
-    1px
-    1.5px
-    2px
-    2.5px
-    3px
-    3.5px
-    4px
-    4.5px
-    5px
-    6px
-    7px
-    7.5px
-    8px
-    9px
-    10px
-    11px
-    12px
-    13px
-    14px
-    15px
-    16px
-    17px
-    18px
-    19px
-    20px
-    21px
-    22px
-    23px
-    24px
-    25px
-    26px
-    27px
-    28px
-    29px
-    30px
-    31px
-    32px
-    33px
-    34px
-    35px
-    36px
-    37px
-    38px
-    39px
-    40px
-    41px
-    42px
-    43px
-    44px
-    45px
-    46px
-    47px
-    48px
-    49px
-    50px
-    51px
-    52px
-    53px
-    54px
-    55px
-    56px
-    57px
-    58px
-    59px
-    60px
-    61px
-    62px
-    63px
-    64px
-    65px
-    66px
-    67px
-    68px
-    69px
-    70px
-    71px
-    72px
-    73px
-    74px
-    75px
-    76px
-    77px
-    78px
-    79px
-    80px
-    81px
-    82px
-    83px
-    84px
-    85px
-    86px
-    87px
-    88px
-    89px
-    90px
-    91px
-    92px
-    93px
-    94px
-    95px
-    96px
-    97px
-    98px
-    99px
-    100px
-    101px
-    102px
-    103px
-    104px
-    104.5px
-    105px
-    106px
-    107px
-    108px
-    109px
-    110px
-    111px
-    112px
-    113px
-    114px
-    115px
-    116px
-    117px
-    118px
-    119px
-    120px
-    121px
-    122px
-    123px
-    124px
-    125px
-    126px
-    127px
-    128px
-    129px
-    130px
-    131px
-    132px
-    133px
-    134px
-    134.5px
-    135px
-    136px
-    137px
-    138px
-    139px
-    140px
-    141px
-    142px
-    143px
-    144px
-    145px
-    146px
-    147px
-    148px
-    149px
-    150px
-    151px
-    152px
-    153px
-    154px
-    155px
-    156px
-    157px
-    158px
-    159px
-    160px
-    161px
-    162px
-    163px
-    164px
-    165px
-    166px
-    167px
-    168px
-    169px
-    170px
-    171px
-    172px
-    173px
-    174px
-    175px
-    176px
-    177px
-    178px
-    179px
-    180px
-    181px
-    182px
-    183px
-    184px
-    185px
-    186px
-    187px
-    188px
-    189px
-    190px
-    191px
-    191.25px
-    192px
-    193px
-    194px
-    195px
-    196px
-    197px
-    198px
-    199px
-    200px
-    201px
-    202px
-    203px
-    204px
-    205px
-    206px
-    207px
-    208px
-    209px
-    210px
-    211px
-    212px
-    213px
-    214px
-    215px
-    216px
-    217px
-    218px
-    219px
-    220px
-    221px
-    222px
-    223px
-    224px
-    225px
-    226px
-    227px
-    228px
-    229px
-    230px
-    231px
-    232px
-    233px
-    234px
-    235px
-    236px
-    237px
-    238px
-    239px
-    240px
-    241px
-    242px
-    243px
-    244px
-    245px
-    246px
-    247px
-    248px
-    249px
-    250px
-    251px
-    252px
-    253px
-    254px
-    255px
-    256px
-    257px
-    258px
-    259px
-    260px
-    261px
-    262px
-    263px
-    264px
-    265px
-    266px
-    267px
-    268px
-    269px
-    270px
-    271px
-    272px
-    273px
-    274px
-    275px
-    276px
-    277px
-    278px
-    279px
-    280px
-    281px
-    282px
-    283px
-    284px
-    285px
-    286px
-    287px
-    288px
-    289px
-    290px
-    291px
-    292px
-    293px
-    294px
-    295px
-    296px
-    297px
-    298px
-    299px
-    300px
-    301px
-    302px
-    303px
-    304px
-    305px
-    306px
-    307px
-    308px
-    309px
-    310px
-    311px
-    312px
-    313px
-    314px
-    315px
-    316px
-    317px
-    318px
-    319px
-    320px
-    321px
-    322px
-    323px
-    324px
-    325px
-    326px
-    327px
-    328px
-    329px
-    330px
-    331px
-    332px
-    333px
-    334px
-    335px
-    336px
-    337px
-    338px
-    339px
-    340px
-    341px
-    342px
-    343px
-    344px
-    345px
-    346px
-    347px
-    348px
-    349px
-    350px
-    351px
-    352px
-    353px
-    354px
-    355px
-    356px
-    357px
-    358px
-    359px
-    366px
-    367px
-    368px
-    369px
-    370px
-    371px
-    372px
-    373px
-    374px
-    375px
-    376px
-    377px
-    378px
-    379px
-    380px
-    381px
-    382px
-    383px
-    384px
-    385px
-    386px
-    387px
-    388px
-    389px
-    390px
-    391px
-    392px
-    393px
-    394px
-    395px
-    396px
-    397px
-    398px
-    399px
-    400px
-    401px
-    402px
-    403px
-    404px
-    405px
-    406px
-    407px
-    408px
-    409px
-    410px
-    411px
-    412px
-    413px
-    414px
-    415px
-    416px
-    417px
-    418px
-    419px
-    420px
-    421px
-    422px
-    423px
-    424px
-    425px
-    426px
-    427px
-    428px
-    429px
-    430px
-    431px
-    432px
-    433px
-    434px
-    435px
-    436px
-    437px
-    438px
-    439px
-    440px
-    441px
-    442px
-    443px
-    444px
-    445px
-    446px
-    447px
-    448px
-    449px
-    450px
-    451px
-    452px
-    453px
-    454px
-    455px
-    456px
-    457px
-    458px
-    459px
-    460px
-    461px
-    462px
-    463px
-    464px
-    465px
-    466px
-    467px
-    468px
-    469px
-    470px
-    471px
-    472px
-    473px
-    474px
-    475px
-    476px
-    477px
-    478px
-    479px
-    480px
-    481px
-    482px
-    483px
-    484px
-    485px
-    486px
-    487px
-    488px
-    489px
-    490px
-    491px
-    492px
-    493px
-    494px
-    495px
-    496px
-    497px
-    498px
-    499px
-    500px
-    501px
-    502px
-    503px
-    504px
-    505px
-    506px
-    507px
-    508px
-    509px
-    510px
-    511px
-    512px
-    513px
-    514px
-    515px
-    516px
-    517px
-    518px
-    519px
-    520px
-    521px
-    522px
-    523px
-    524px
-    525px
-    526px
-    527px
-    528px
-    529px
-    530px
-    531px
-    532px
-    533px
-    534px
-    535px
-    536px
-    537px
-    538px
-    539px
-    540px
-    541px
-    542px
-    543px
-    544px
-    545px
-    546px
-    547px
-    548px
-    549px
-    550px
-    551px
-    552px
-    553px
-    554px
-    555px
-    556px
-    557px
-    558px
-    559px
-    560px
-    561px
-    562px
-    563px
-    564px
-    565px
-    566px
-    567px
-    568px
-    569px
-    570px
-    571px
-    572px
-    573px
-    574px
-    575px
-    576px
-    577px
-    578px
-    579px
-    580px
-    581px
-    582px
-    583px
-    584px
-    585px
-    586px
-    587px
-    588px
-    589px
-    590px
-    591px
-    592px
-    593px
-    594px
-    595px
-    596px
-    597px
-    598px
-    599px
-    600px
-    601px
-    602px
-    603px
-    604px
-    605px
-    606px
-    607px
-    608px
-    609px
-    610px
-    611px
-    612px
-    613px
-    614px
-    615px
-    616px
-    617px
-    618px
-    619px
-    620px
-    621px
-    622px
-    623px
-    624px
-    625px
-    626px
-    627px
-    628px
-    629px
-    630px
-    631px
-    632px
-    633px
-    634px
-    635px
-    636px
-    637px
-    638px
-    639px
-    640px
-    641px
-    642px
-    643px
-    644px
-    645px
-    646px
-    647px
-    648px
-    649px
-    650px
-    651px
-    652px
-    653px
-    654px
-    655px
-    656px
-    657px
-    658px
-    659px
-    660px
-    661px
-    662px
-    663px
-    664px
-    665px
-    666px
-    667px
-    668px
-    669px
-    670px
-    671px
-    672px
-    673px
-    674px
-    675px
-    676px
-    677px
-    678px
-    679px
-    680px
-    681px
-    682px
-    683px
-    684px
-    685px
-    686px
-    687px
-    688px
-    689px
-    690px
-    691px
-    692px
-    693px
-    694px
-    695px
-    696px
-    697px
-    698px
-    699px
-    700px
-    701px
-    702px
-    703px
-    704px
-    705px
-    706px
-    707px
-    708px
-    709px
-    710px
-    711px
-    712px
-    713px
-    714px
-    715px
-    716px
-    717px
-    718px
-    719px
-    720px
-    721px
-    722px
-    723px
-    724px
-    725px
-    726px
-    727px
-    728px
-    729px
-    730px
-    731px
-    732px
-    733px
-    734px
-    735px
-    736px
-    737px
-    738px
-    739px
-    740px
-    741px
-    742px
-    743px
-    744px
-    745px
-    746px
-    747px
-    748px
-    749px
-    750px
-    751px
-    752px
-    753px
-    754px
-    755px
-    756px
-    757px
-    758px
-    759px
-    760px
-    761px
-    762px
-    763px
-    764px
-    765px
-    766px
-    767px
-    768px
-    769px
-    770px
-    771px
-    772px
-    773px
-    774px
-    775px
-    776px
-    777px
-    778px
-    779px
-    780px
-    781px
-    782px
-    783px
-    784px
-    785px
-    786px
-    787px
-    788px
-    789px
-    790px
-    791px
-    792px
-    793px
-    794px
-    795px
-    796px
-    797px
-    798px
-    799px
-    800px
-    801px
-    802px
-    803px
-    804px
-    805px
-    806px
-    807px
-    808px
-    809px
-    810px
-    811px
-    812px
-    813px
-    814px
-    815px
-    816px
-    817px
-    818px
-    819px
-    820px
-    821px
-    822px
-    823px
-    824px
-    825px
-    826px
-    827px
-    828px
-    829px
-    830px
-    831px
-    832px
-    833px
-    834px
-    835px
-    836px
-    837px
-    838px
-    839px
-    840px
-    841px
-    842px
-    843px
-    844px
-    845px
-    846px
-    847px
-    848px
-    849px
-    850px
-    851px
-    852px
-    853px
-    854px
-    855px
-    856px
-    857px
-    858px
-    859px
-    860px
-    861px
-    862px
-    863px
-    864px
-    865px
-    866px
-    867px
-    868px
-    869px
-    870px
-    871px
-    872px
-    873px
-    874px
-    875px
-    876px
-    877px
-    878px
-    879px
-    880px
-    881px
-    882px
-    883px
-    884px
-    885px
-    886px
-    887px
-    888px
-    889px
-    890px
-    891px
-    892px
-    893px
-    894px
-    895px
-    896px
-    897px
-    898px
-    899px
-    900px
-    901px
-    902px
-    903px
-    904px
-    905px
-    906px
-    907px
-    908px
-    909px
-    910px
-    911px
-    912px
-    913px
-    914px
-    915px
-    916px
-    917px
-    918px
-    919px
-    920px
-    921px
-    922px
-    923px
-    924px
-    925px
-    926px
-    927px
-    928px
-    929px
-    930px
-    931px
-    932px
-    933px
-    934px
-    935px
-    936px
-    937px
-    938px
-    939px
-    940px
-    941px
-    942px
-    943px
-    944px
-    945px
-    946px
-    947px
-    948px
-    949px
-    950px
-    951px
-    952px
-    953px
-    954px
-    955px
-    956px
-    957px
-    958px
-    959px
-    960px
-    961px
-    962px
-    963px
-    964px
-    965px
-    966px
-    967px
-    968px
-    969px
-    970px
-    971px
-    972px
-    973px
-    974px
-    975px
-    976px
-    977px
-    978px
-    979px
-    980px
-    981px
-    982px
-    983px
-    984px
-    985px
-    986px
-    987px
-    988px
-    989px
-    990px
-    991px
-    992px
-    993px
-    994px
-    995px
-    996px
-    997px
-    998px
-    999px
-    1000px
-    1100px
-    1200px
-    1300px
-    1920px
-
-
-
-    
-    6px
-    7px
-    8px
-    9px
-    10px
-    11px
-    12px
-    13px
-    14px
-    15px
-    16px
-    17px
-    18px
-    19px
-    20px
-    21px
-    22px
-    23px
-    24px
-    25px
-    28px
-    30px
-    32px
-    34px
-    36px
-    38px
-    40px
-    42px
-    46px
-    48px
-    76px
-    120px
-    -10px
-    10px
-    34px
-    30px
-    300px
-    281px
-    90px
-    32px
-    26px
-
-    20dp
-    4dp
-    120px
-    55px
-    130px
-    69px
-    60px
-    60px
-    35px
-    35px
-    8px
-
-    
-    1000px
-    390px
-    200px
-    200px
-    10px
-    10px
-    100px
-    80px
-    80px
-    24px
-    20px
-    120px
-    20px
-
-    20px
-    20px
-    20px
-    50px
-    28px
-
-    36px
-    50px
-    36px
-    151px
-    33px
-    102px
-    26px
-    30px
-    34px
-    9px
-    40px
-    20px
-    70px
-    16px
-    21px
-    28px
-    45px
-    22px
-    42px
-    20px
-    34px
-    28px
-    60px
-    22.5px
-
-    360px
-    63px
-    96px
-    470px
-    140px
-    100px
-    28px
-    30px
-    28px
-    320px
-    140px
-    28px
-    20px
-    100px
-
-
diff --git a/modules/mogo-module-common/src/main/res/values/dimens.xml b/modules/mogo-module-common/src/main/res/values/dimens.xml
index d966a043df..6542d90436 100644
--- a/modules/mogo-module-common/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-common/src/main/res/values/dimens.xml
@@ -1,1116 +1,1111 @@
 
 
-	-32.8125px
-	-16.4062px
-	-10.9375px
-	-6.5625px
-	-5.4688px
-	-4.3750px
-	-2.7344px
-	-1.0938px
-	-0.5469px
-	0.0000px
-	0.0547px
-	0.2734px
-	0.5469px
-	0.8203px
-	1.0938px
-	1.3672px
-	1.6406px
-	1.9141px
-	2.1875px
-	2.4609px
-	2.7344px
-	3.2812px
-	3.8281px
-	4.1016px
-	4.3750px
-	4.9219px
-	5.4688px
-	6.0156px
-	6.5625px
-	7.1094px
-	7.6562px
-	8.2031px
-	8.7500px
-	9.2969px
-	9.8438px
-	10.3906px
-	10.9375px
-	11.4844px
-	12.0312px
-	12.5781px
-	13.1250px
-	13.6719px
-	14px
-	14.7656px
-	15.3125px
-	15.8594px
-	16.4062px
-	16.9531px
-	17.5000px
-	18.0469px
-	18.5938px
-	19.1406px
-	19.6875px
-	20.2344px
-	20.7812px
-	21.3281px
-	21.8750px
-	22.4219px
-	22.9688px
-	23.5156px
-	24.0625px
-	24.6094px
-	25.1562px
-	25.7031px
-	26.2500px
-	26.7969px
-	27.3438px
-	27.8906px
-	28.4375px
-	28.9844px
-	29.5312px
-	30.0781px
-	30.6250px
-	31.1719px
-	31.7188px
-	32.2656px
-	32.8125px
-	33.3594px
-	33.9062px
-	34.4531px
-	35.0000px
-	35.5469px
-	36.0938px
-	36.6406px
-	37.1875px
-	37.7344px
-	38.2812px
-	38.8281px
-	39.3750px
-	39.9219px
-	40.4688px
-	41.0156px
-	41.5625px
-	42.1094px
-	42.6562px
-	43.2031px
-	43.7500px
-	44.2969px
-	44.8438px
-	45.3906px
-	45.9375px
-	46.4844px
-	47.0312px
-	47.5781px
-	48.1250px
-	48.6719px
-	49.2188px
-	49.7656px
-	50.3125px
-	50.8594px
-	51.4062px
-	51.9531px
-	52.5000px
-	53.0469px
-	53.5938px
-	54.1406px
-	54.6875px
-	55.2344px
-	55.7812px
-	56.3281px
-	56.8750px
-	57.1484px
-	57.4219px
-	57.9688px
-	58.5156px
-	59.0625px
-	59.6094px
-	60.1562px
-	60.7031px
-	61.2500px
-	61.7969px
-	62.3438px
-	62.8906px
-	63.4375px
-	63.9844px
-	64.5312px
-	65.0781px
-	65.6250px
-	66.1719px
-	66.7188px
-	67.2656px
-	67.8125px
-	68.3594px
-	68.9062px
-	69.4531px
-	70.0000px
-	70.5469px
-	71.0938px
-	71.6406px
-	72.1875px
-	72.7344px
-	73.2812px
-	73.5547px
-	73.8281px
-	74.3750px
-	74.9219px
-	75.4688px
-	76.0156px
-	76.5625px
-	77.1094px
-	77.6562px
-	78.2031px
-	78.7500px
-	79.2969px
-	79.8438px
-	80.3906px
-	80.9375px
-	81.4844px
-	82.0312px
-	82.5781px
-	83.1250px
-	83.6719px
-	84.2188px
-	84.7656px
-	85.3125px
-	85.8594px
-	86.4062px
-	86.9531px
-	87.5000px
-	88.0469px
-	88.5938px
-	89.1406px
-	89.6875px
-	90.2344px
-	90.7812px
-	91.3281px
-	91.8750px
-	92.4219px
-	92.9688px
-	93.5156px
-	94.0625px
-	94.6094px
-	95.1562px
-	95.7031px
-	96.2500px
-	96.7969px
-	97.3438px
-	97.8906px
-	98.4375px
-	98.9844px
-	99.5312px
-	100.0781px
-	100.6250px
-	101.1719px
-	101.7188px
-	102.2656px
-	102.8125px
-	103.3594px
-	103.9062px
-	104.4531px
-	104.5898px
-	105.0000px
-	105.5469px
-	106.0938px
-	106.6406px
-	107.1875px
-	107.7344px
-	108.2812px
-	108.8281px
-	109.3750px
-	109.9219px
-	110.4688px
-	111.0156px
-	111.5625px
-	112.1094px
-	112.6562px
-	113.2031px
-	113.7500px
-	114.2969px
-	114.8438px
-	115.3906px
-	115.9375px
-	116.4844px
-	117.0312px
-	117.5781px
-	118.1250px
-	118.6719px
-	119.2188px
-	119.7656px
-	120.3125px
-	120.8594px
-	121.4062px
-	121.9531px
-	122.5000px
-	123.0469px
-	123.5938px
-	124.1406px
-	124.6875px
-	125.2344px
-	125.7812px
-	126.3281px
-	126.8750px
-	127.4219px
-	127.9688px
-	128.5156px
-	129.0625px
-	129.6094px
-	130.1562px
-	130.7031px
-	131.2500px
-	131.7969px
-	132.3438px
-	132.8906px
-	133.4375px
-	133.9844px
-	134.5312px
-	135.0781px
-	135.6250px
-	136.1719px
-	136.7188px
-	137.2656px
-	137.8125px
-	138.3594px
-	138.9062px
-	139.4531px
-	140.0000px
-	140.5469px
-	141.0938px
-	141.6406px
-	142.1875px
-	142.7344px
-	143.2812px
-	143.8281px
-	144.3750px
-	144.9219px
-	145.4688px
-	146.0156px
-	146.5625px
-	147.1094px
-	147.6562px
-	148.2031px
-	148.7500px
-	149.2969px
-	149.8438px
-	150.3906px
-	150.9375px
-	151.4844px
-	152.0312px
-	152.5781px
-	153.1250px
-	153.6719px
-	154.2188px
-	154.7656px
-	155.3125px
-	155.8594px
-	156.4062px
-	156.9531px
-	157.5000px
-	158.0469px
-	158.5938px
-	159.1406px
-	159.6875px
-	160.2344px
-	160.7812px
-	161.3281px
-	161.8750px
-	162.4219px
-	162.9688px
-	163.5156px
-	164.0625px
-	164.6094px
-	165.1562px
-	165.7031px
-	166.2500px
-	166.7969px
-	167.3438px
-	167.8906px
-	168.4375px
-	168.9844px
-	169.5312px
-	170.0781px
-	170.6250px
-	171.1719px
-	171.7188px
-	172.2656px
-	172.8125px
-	173.3594px
-	173.9062px
-	174.4531px
-	175.0000px
-	175.5469px
-	176.0938px
-	176.6406px
-	177.1875px
-	177.7344px
-	178.2812px
-	178.8281px
-	179.3750px
-	179.9219px
-	180.4688px
-	181.0156px
-	181.5625px
-	182.1094px
-	182.6562px
-	183.2031px
-	183.7500px
-	184.2969px
-	184.8438px
-	185.3906px
-	185.9375px
-	186.4844px
-	187.0312px
-	187.5781px
-	188.1250px
-	188.6719px
-	189.2188px
-	189.7656px
-	190.3125px
-	190.8594px
-	191.4062px
-	191.9531px
-	192.5000px
-	193.0469px
-	193.5938px
-	194.1406px
-	194.6875px
-	195.2344px
-	195.7812px
-	196.3281px
-	200.1562px
-	200.7031px
-	201.2500px
-	201.7969px
-	202.3438px
-	202.8906px
-	203.4375px
-	203.9844px
-	204.5312px
-	205.0781px
-	205.6250px
-	206.1719px
-	206.7188px
-	207.2656px
-	207.8125px
-	208.3594px
-	208.9062px
-	209.4531px
-	210.0000px
-	210.5469px
-	211.0938px
-	211.6406px
-	212.1875px
-	212.7344px
-	213.2812px
-	213.8281px
-	214.3750px
-	214.9219px
-	215.4688px
-	216.0156px
-	216.5625px
-	217.1094px
-	217.6562px
-	218.2031px
-	218.7500px
-	219.2969px
-	219.8438px
-	220.3906px
-	220.9375px
-	221.4844px
-	222.0312px
-	222.5781px
-	223.1250px
-	223.6719px
-	224.2188px
-	224.7656px
-	225.3125px
-	225.8594px
-	226.4062px
-	226.9531px
-	227.5000px
-	228.0469px
-	228.5938px
-	229.1406px
-	229.6875px
-	230.2344px
-	230.7812px
-	231.3281px
-	231.8750px
-	232.4219px
-	232.9688px
-	233.5156px
-	234.0625px
-	234.6094px
-	235.1562px
-	235.7031px
-	236.2500px
-	236.7969px
-	237.3438px
-	237.8906px
-	238.4375px
-	238.9844px
-	239.5312px
-	240.0781px
-	240.6250px
-	241.1719px
-	241.7188px
-	242.2656px
-	242.8125px
-	243.3594px
-	243.9062px
-	244.4531px
-	245.0000px
-	245.5469px
-	246.0938px
-	246.6406px
-	247.1875px
-	247.7344px
-	248.2812px
-	248.8281px
-	249.3750px
-	249.9219px
-	250.4688px
-	251.0156px
-	251.5625px
-	252.1094px
-	252.6562px
-	253.2031px
-	253.7500px
-	254.2969px
-	254.8438px
-	255.3906px
-	255.9375px
-	256.4844px
-	257.0312px
-	257.5781px
-	258.1250px
-	258.6719px
-	259.2188px
-	259.7656px
-	260.3125px
-	260.8594px
-	261.4062px
-	261.9531px
-	262.5000px
-	263.0469px
-	263.5938px
-	264.1406px
-	264.6875px
-	265.2344px
-	265.7812px
-	266.3281px
-	266.8750px
-	267.4219px
-	267.9688px
-	268.5156px
-	269.0625px
-	269.6094px
-	270.1562px
-	270.7031px
-	271.2500px
-	271.7969px
-	272.3438px
-	272.8906px
-	273.4375px
-	273.9844px
-	274.5312px
-	275.0781px
-	275.6250px
-	276.1719px
-	276.7188px
-	277.2656px
-	277.8125px
-	278.3594px
-	278.9062px
-	279.4531px
-	280.0000px
-	280.5469px
-	281.0938px
-	281.6406px
-	282.1875px
-	282.7344px
-	283.2812px
-	283.8281px
-	284.3750px
-	284.9219px
-	285.4688px
-	286.0156px
-	286.5625px
-	287.1094px
-	287.6562px
-	288.2031px
-	288.7500px
-	289.2969px
-	289.8438px
-	290.3906px
-	290.9375px
-	291.4844px
-	292.0312px
-	292.5781px
-	293.1250px
-	293.6719px
-	294.2188px
-	294.7656px
-	295.3125px
-	295.8594px
-	296.4062px
-	296.9531px
-	297.5000px
-	298.0469px
-	298.5938px
-	299.1406px
-	299.6875px
-	300.2344px
-	300.7812px
-	301.3281px
-	301.8750px
-	302.4219px
-	302.9688px
-	303.5156px
-	304.0625px
-	304.6094px
-	305.1562px
-	305.7031px
-	306.2500px
-	306.7969px
-	307.3438px
-	307.8906px
-	308.4375px
-	308.9844px
-	309.5312px
-	310.0781px
-	310.6250px
-	311.1719px
-	311.7188px
-	312.2656px
-	312.8125px
-	313.3594px
-	313.9062px
-	314.4531px
-	315.0000px
-	315.5469px
-	316.0938px
-	316.6406px
-	317.1875px
-	317.7344px
-	318.2812px
-	318.8281px
-	319.3750px
-	319.9219px
-	320.4688px
-	321.0156px
-	321.5625px
-	322.1094px
-	322.6562px
-	323.2031px
-	323.7500px
-	324.2969px
-	324.8438px
-	325.3906px
-	325.9375px
-	326.4844px
-	327.0312px
-	327.5781px
-	328.1250px
-	328.6719px
-	329.2188px
-	329.7656px
-	330.3125px
-	330.8594px
-	331.4062px
-	331.9531px
-	332.5000px
-	333.0469px
-	333.5938px
-	334.1406px
-	334.6875px
-	335.2344px
-	335.7812px
-	336.3281px
-	336.8750px
-	337.4219px
-	337.9688px
-	338.5156px
-	339.0625px
-	339.6094px
-	340.1562px
-	340.7031px
-	341.2500px
-	341.7969px
-	342.3438px
-	342.8906px
-	343.4375px
-	343.9844px
-	344.5312px
-	345.0781px
-	345.6250px
-	346.1719px
-	346.7188px
-	347.2656px
-	347.8125px
-	348.3594px
-	348.9062px
-	349.4531px
-	350.0000px
-	350.5469px
-	351.0938px
-	351.6406px
-	352.1875px
-	352.7344px
-	353.2812px
-	353.8281px
-	354.3750px
-	354.9219px
-	355.4688px
-	356.0156px
-	356.5625px
-	357.1094px
-	357.6562px
-	358.2031px
-	358.7500px
-	359.2969px
-	359.8438px
-	360.3906px
-	360.9375px
-	361.4844px
-	362.0312px
-	362.5781px
-	363.1250px
-	363.6719px
-	364.2188px
-	364.7656px
-	365.3125px
-	365.8594px
-	366.4062px
-	366.9531px
-	367.5000px
-	368.0469px
-	368.5938px
-	369.1406px
-	369.6875px
-	370.2344px
-	370.7812px
-	371.3281px
-	371.8750px
-	372.4219px
-	372.9688px
-	373.5156px
-	374.0625px
-	374.6094px
-	375.1562px
-	375.7031px
-	376.2500px
-	376.7969px
-	377.3438px
-	377.8906px
-	378.4375px
-	378.9844px
-	379.5312px
-	380.0781px
-	380.6250px
-	381.1719px
-	381.7188px
-	382.2656px
-	382.8125px
-	383.3594px
-	383.9062px
-	384.4531px
-	385.0000px
-	385.5469px
-	386.0938px
-	386.6406px
-	387.1875px
-	387.7344px
-	388.2812px
-	388.8281px
-	389.3750px
-	389.9219px
-	390.4688px
-	391.0156px
-	391.5625px
-	392.1094px
-	392.6562px
-	393.2031px
-	393.7500px
-	394.2969px
-	394.8438px
-	395.3906px
-	395.9375px
-	396.4844px
-	397.0312px
-	397.5781px
-	398.1250px
-	398.6719px
-	399.2188px
-	399.7656px
-	400.3125px
-	400.8594px
-	401.4062px
-	401.9531px
-	402.5000px
-	403.0469px
-	403.5938px
-	404.1406px
-	404.6875px
-	405.2344px
-	405.7812px
-	406.3281px
-	406.8750px
-	407.4219px
-	407.9688px
-	408.5156px
-	409.0625px
-	409.6094px
-	410.1562px
-	410.7031px
-	411.2500px
-	411.7969px
-	412.3438px
-	412.8906px
-	413.4375px
-	413.9844px
-	414.5312px
-	415.0781px
-	415.6250px
-	416.1719px
-	416.7188px
-	417.2656px
-	417.8125px
-	418.3594px
-	418.9062px
-	419.4531px
-	420.0000px
-	420.5469px
-	421.0938px
-	421.6406px
-	422.1875px
-	422.7344px
-	423.2812px
-	423.8281px
-	424.3750px
-	424.9219px
-	425.4688px
-	426.0156px
-	426.5625px
-	427.1094px
-	427.6562px
-	428.2031px
-	428.7500px
-	429.2969px
-	429.8438px
-	430.3906px
-	430.9375px
-	431.4844px
-	432.0312px
-	432.5781px
-	433.1250px
-	433.6719px
-	434.2188px
-	434.7656px
-	435.3125px
-	435.8594px
-	436.4062px
-	436.9531px
-	437.5000px
-	438.0469px
-	438.5938px
-	439.1406px
-	439.6875px
-	440.2344px
-	440.7812px
-	441.3281px
-	441.8750px
-	442.4219px
-	442.9688px
-	443.5156px
-	444.0625px
-	444.6094px
-	445.1562px
-	445.7031px
-	446.2500px
-	446.7969px
-	447.3438px
-	447.8906px
-	448.4375px
-	448.9844px
-	449.5312px
-	450.0781px
-	450.6250px
-	451.1719px
-	451.7188px
-	452.2656px
-	452.8125px
-	453.3594px
-	453.9062px
-	454.4531px
-	455.0000px
-	455.5469px
-	456.0938px
-	456.6406px
-	457.1875px
-	457.7344px
-	458.2812px
-	458.8281px
-	459.3750px
-	459.9219px
-	460.4688px
-	461.0156px
-	461.5625px
-	462.1094px
-	462.6562px
-	463.2031px
-	463.7500px
-	464.2969px
-	464.8438px
-	465.3906px
-	465.9375px
-	466.4844px
-	467.0312px
-	467.5781px
-	468.1250px
-	468.6719px
-	469.2188px
-	469.7656px
-	470.3125px
-	470.8594px
-	471.4062px
-	471.9531px
-	472.5000px
-	473.0469px
-	473.5938px
-	474.1406px
-	474.6875px
-	475.2344px
-	475.7812px
-	476.3281px
-	476.8750px
-	477.4219px
-	477.9688px
-	478.5156px
-	479.0625px
-	479.6094px
-	480.1562px
-	480.7031px
-	481.2500px
-	481.7969px
-	482.3438px
-	482.8906px
-	483.4375px
-	483.9844px
-	484.5312px
-	485.0781px
-	485.6250px
-	486.1719px
-	486.7188px
-	487.2656px
-	487.8125px
-	488.3594px
-	488.9062px
-	489.4531px
-	490.0000px
-	490.5469px
-	491.0938px
-	491.6406px
-	492.1875px
-	492.7344px
-	493.2812px
-	493.8281px
-	494.3750px
-	494.9219px
-	495.4688px
-	496.0156px
-	496.5625px
-	497.1094px
-	497.6562px
-	498.2031px
-	498.7500px
-	499.2969px
-	499.8438px
-	500.3906px
-	500.9375px
-	501.4844px
-	502.0312px
-	502.5781px
-	503.1250px
-	503.6719px
-	504.2188px
-	504.7656px
-	505.3125px
-	505.8594px
-	506.4062px
-	506.9531px
-	507.5000px
-	508.0469px
-	508.5938px
-	509.1406px
-	509.6875px
-	510.2344px
-	510.7812px
-	511.3281px
-	511.8750px
-	512.4219px
-	512.9688px
-	513.5156px
-	514.0625px
-	514.6094px
-	515.1562px
-	515.7031px
-	516.2500px
-	516.7969px
-	517.3438px
-	517.8906px
-	518.4375px
-	518.9844px
-	519.5312px
-	520.0781px
-	520.6250px
-	521.1719px
-	521.7188px
-	522.2656px
-	522.8125px
-	523.3594px
-	523.9062px
-	524.4531px
-	525.0000px
-	525.5469px
-	526.0938px
-	526.6406px
-	527.1875px
-	527.7344px
-	528.2812px
-	528.8281px
-	529.3750px
-	529.9219px
-	530.4688px
-	531.0156px
-	531.5625px
-	532.1094px
-	532.6562px
-	533.2031px
-	533.7500px
-	534.2969px
-	534.8438px
-	535.3906px
-	535.9375px
-	536.4844px
-	537.0312px
-	537.5781px
-	538.1250px
-	538.6719px
-	539.2188px
-	539.7656px
-	540.3125px
-	540.8594px
-	541.4062px
-	541.9531px
-	542.5000px
-	543.0469px
-	543.5938px
-	544.1406px
-	544.6875px
-	545.2344px
-	545.7812px
-	546.3281px
-	601.5624px
-	656.250px
-	710.9375px
-	3.2812px
-	3.8281px
-	4.3750px
-	4.9219px
-	5.4688px
-	6.0156px
-	6.5625px
-	7.1094px
-	7.6562px
-	8.2031px
-	8.7500px
-	9.2969px
-	9.8438px
-	10.3906px
-	10.9375px
-	11.4844px
-	12.0312px
-	12.5781px
-	13.1250px
-	13.6719px
-	15.3125px
-	16.4062px
-	17.5000px
-	18.5938px
-	19.6875px
-	20.7812px
-	21.8750px
-	22.9688px
-	26.2500px
-	-8px
-	8px
-	18px
-	16px
-	120px
-	150px
-	48px
-	17.5000px
-	15.3125px
-	6px
 
-	16dp
-	2dp
-	70px
-	76px
-	35px
-	35px
-	4px
+    
+    
+    -60dp
+    -30dp
+    -20dp
+    -12dp
+    -10dp
+    -8dp
+    -5dp
+    -2dp
+    -1dp
+    0dp
+    0.1dp
+    0.5dp
+    1dp
+    1.5dp
+    2dp
+    2.5dp
+    3dp
+    3.5dp
+    4dp
+    4.5dp
+    5dp
+    6dp
+    7dp
+    7.5dp
+    8dp
+    9dp
+    10dp
+    11dp
+    12dp
+    13dp
+    14dp
+    15dp
+    16dp
+    17dp
+    18dp
+    19dp
+    20dp
+    21dp
+    22dp
+    23dp
+    24dp
+    25dp
+    26dp
+    27dp
+    28dp
+    29dp
+    30dp
+    31dp
+    32dp
+    33dp
+    34dp
+    35dp
+    36dp
+    37dp
+    38dp
+    39dp
+    40dp
+    41dp
+    42dp
+    43dp
+    44dp
+    45dp
+    46dp
+    47dp
+    48dp
+    49dp
+    50dp
+    51dp
+    52dp
+    53dp
+    54dp
+    55dp
+    56dp
+    57dp
+    58dp
+    59dp
+    60dp
+    61dp
+    62dp
+    63dp
+    64dp
+    65dp
+    66dp
+    67dp
+    68dp
+    69dp
+    70dp
+    71dp
+    72dp
+    73dp
+    74dp
+    75dp
+    76dp
+    77dp
+    78dp
+    79dp
+    80dp
+    81dp
+    82dp
+    83dp
+    84dp
+    85dp
+    86dp
+    87dp
+    88dp
+    89dp
+    90dp
+    91dp
+    92dp
+    93dp
+    94dp
+    95dp
+    96dp
+    97dp
+    98dp
+    99dp
+    100dp
+    101dp
+    102dp
+    103dp
+    104dp
+    104.5dp
+    105dp
+    106dp
+    107dp
+    108dp
+    109dp
+    110dp
+    111dp
+    112dp
+    113dp
+    114dp
+    115dp
+    116dp
+    117dp
+    118dp
+    119dp
+    120dp
+    121dp
+    122dp
+    123dp
+    124dp
+    125dp
+    126dp
+    127dp
+    128dp
+    129dp
+    130dp
+    131dp
+    132dp
+    133dp
+    134dp
+    134.5dp
+    135dp
+    136dp
+    137dp
+    138dp
+    139dp
+    140dp
+    141dp
+    142dp
+    143dp
+    144dp
+    145dp
+    146dp
+    147dp
+    148dp
+    149dp
+    150dp
+    151dp
+    152dp
+    153dp
+    154dp
+    155dp
+    156dp
+    157dp
+    158dp
+    159dp
+    160dp
+    161dp
+    162dp
+    163dp
+    164dp
+    165dp
+    166dp
+    167dp
+    168dp
+    169dp
+    170dp
+    171dp
+    172dp
+    173dp
+    174dp
+    175dp
+    176dp
+    177dp
+    178dp
+    179dp
+    180dp
+    181dp
+    182dp
+    183dp
+    184dp
+    185dp
+    186dp
+    187dp
+    188dp
+    189dp
+    190dp
+    191dp
+    191.25dp
+    192dp
+    193dp
+    194dp
+    195dp
+    196dp
+    197dp
+    198dp
+    199dp
+    200dp
+    201dp
+    202dp
+    203dp
+    204dp
+    205dp
+    206dp
+    207dp
+    208dp
+    209dp
+    210dp
+    211dp
+    212dp
+    213dp
+    214dp
+    215dp
+    216dp
+    217dp
+    218dp
+    219dp
+    220dp
+    221dp
+    222dp
+    223dp
+    224dp
+    225dp
+    226dp
+    227dp
+    228dp
+    229dp
+    230dp
+    231dp
+    232dp
+    233dp
+    234dp
+    235dp
+    236dp
+    237dp
+    238dp
+    239dp
+    240dp
+    241dp
+    242dp
+    243dp
+    244dp
+    245dp
+    246dp
+    247dp
+    248dp
+    249dp
+    250dp
+    251dp
+    252dp
+    253dp
+    254dp
+    255dp
+    256dp
+    257dp
+    258dp
+    259dp
+    260dp
+    261dp
+    262dp
+    263dp
+    264dp
+    265dp
+    266dp
+    267dp
+    268dp
+    269dp
+    270dp
+    271dp
+    272dp
+    273dp
+    274dp
+    275dp
+    276dp
+    277dp
+    278dp
+    279dp
+    280dp
+    281dp
+    282dp
+    283dp
+    284dp
+    285dp
+    286dp
+    287dp
+    288dp
+    289dp
+    290dp
+    291dp
+    292dp
+    293dp
+    294dp
+    295dp
+    296dp
+    297dp
+    298dp
+    299dp
+    300dp
+    301dp
+    302dp
+    303dp
+    304dp
+    305dp
+    306dp
+    307dp
+    308dp
+    309dp
+    310dp
+    311dp
+    312dp
+    313dp
+    314dp
+    315dp
+    316dp
+    317dp
+    318dp
+    319dp
+    320dp
+    321dp
+    322dp
+    323dp
+    324dp
+    325dp
+    326dp
+    327dp
+    328dp
+    329dp
+    330dp
+    331dp
+    332dp
+    333dp
+    334dp
+    335dp
+    336dp
+    337dp
+    338dp
+    339dp
+    340dp
+    341dp
+    342dp
+    343dp
+    344dp
+    345dp
+    346dp
+    347dp
+    348dp
+    349dp
+    350dp
+    351dp
+    352dp
+    353dp
+    354dp
+    355dp
+    356dp
+    357dp
+    358dp
+    359dp
+    366dp
+    367dp
+    368dp
+    369dp
+    370dp
+    371dp
+    372dp
+    373dp
+    374dp
+    375dp
+    376dp
+    377dp
+    378dp
+    379dp
+    380dp
+    381dp
+    382dp
+    383dp
+    384dp
+    385dp
+    386dp
+    387dp
+    388dp
+    389dp
+    390dp
+    391dp
+    392dp
+    393dp
+    394dp
+    395dp
+    396dp
+    397dp
+    398dp
+    399dp
+    400dp
+    401dp
+    402dp
+    403dp
+    404dp
+    405dp
+    406dp
+    407dp
+    408dp
+    409dp
+    410dp
+    411dp
+    412dp
+    413dp
+    414dp
+    415dp
+    416dp
+    417dp
+    418dp
+    419dp
+    420dp
+    421dp
+    422dp
+    423dp
+    424dp
+    425dp
+    426dp
+    427dp
+    428dp
+    429dp
+    430dp
+    431dp
+    432dp
+    433dp
+    434dp
+    435dp
+    436dp
+    437dp
+    438dp
+    439dp
+    440dp
+    441dp
+    442dp
+    443dp
+    444dp
+    445dp
+    446dp
+    447dp
+    448dp
+    449dp
+    450dp
+    451dp
+    452dp
+    453dp
+    454dp
+    455dp
+    456dp
+    457dp
+    458dp
+    459dp
+    460dp
+    461dp
+    462dp
+    463dp
+    464dp
+    465dp
+    466dp
+    467dp
+    468dp
+    469dp
+    470dp
+    471dp
+    472dp
+    473dp
+    474dp
+    475dp
+    476dp
+    477dp
+    478dp
+    479dp
+    480dp
+    481dp
+    482dp
+    483dp
+    484dp
+    485dp
+    486dp
+    487dp
+    488dp
+    489dp
+    490dp
+    491dp
+    492dp
+    493dp
+    494dp
+    495dp
+    496dp
+    497dp
+    498dp
+    499dp
+    500dp
+    501dp
+    502dp
+    503dp
+    504dp
+    505dp
+    506dp
+    507dp
+    508dp
+    509dp
+    510dp
+    511dp
+    512dp
+    513dp
+    514dp
+    515dp
+    516dp
+    517dp
+    518dp
+    519dp
+    520dp
+    521dp
+    522dp
+    523dp
+    524dp
+    525dp
+    526dp
+    527dp
+    528dp
+    529dp
+    530dp
+    531dp
+    532dp
+    533dp
+    534dp
+    535dp
+    536dp
+    537dp
+    538dp
+    539dp
+    540dp
+    541dp
+    542dp
+    543dp
+    544dp
+    545dp
+    546dp
+    547dp
+    548dp
+    549dp
+    550dp
+    551dp
+    552dp
+    553dp
+    554dp
+    555dp
+    556dp
+    557dp
+    558dp
+    559dp
+    560dp
+    561dp
+    562dp
+    563dp
+    564dp
+    565dp
+    566dp
+    567dp
+    568dp
+    569dp
+    570dp
+    571dp
+    572dp
+    573dp
+    574dp
+    575dp
+    576dp
+    577dp
+    578dp
+    579dp
+    580dp
+    581dp
+    582dp
+    583dp
+    584dp
+    585dp
+    586dp
+    587dp
+    588dp
+    589dp
+    590dp
+    591dp
+    592dp
+    593dp
+    594dp
+    595dp
+    596dp
+    597dp
+    598dp
+    599dp
+    600dp
+    601dp
+    602dp
+    603dp
+    604dp
+    605dp
+    606dp
+    607dp
+    608dp
+    609dp
+    610dp
+    611dp
+    612dp
+    613dp
+    614dp
+    615dp
+    616dp
+    617dp
+    618dp
+    619dp
+    620dp
+    621dp
+    622dp
+    623dp
+    624dp
+    625dp
+    626dp
+    627dp
+    628dp
+    629dp
+    630dp
+    631dp
+    632dp
+    633dp
+    634dp
+    635dp
+    636dp
+    637dp
+    638dp
+    639dp
+    640dp
+    641dp
+    642dp
+    643dp
+    644dp
+    645dp
+    646dp
+    647dp
+    648dp
+    649dp
+    650dp
+    651dp
+    652dp
+    653dp
+    654dp
+    655dp
+    656dp
+    657dp
+    658dp
+    659dp
+    660dp
+    661dp
+    662dp
+    663dp
+    664dp
+    665dp
+    666dp
+    667dp
+    668dp
+    669dp
+    670dp
+    671dp
+    672dp
+    673dp
+    674dp
+    675dp
+    676dp
+    677dp
+    678dp
+    679dp
+    680dp
+    681dp
+    682dp
+    683dp
+    684dp
+    685dp
+    686dp
+    687dp
+    688dp
+    689dp
+    690dp
+    691dp
+    692dp
+    693dp
+    694dp
+    695dp
+    696dp
+    697dp
+    698dp
+    699dp
+    700dp
+    701dp
+    702dp
+    703dp
+    704dp
+    705dp
+    706dp
+    707dp
+    708dp
+    709dp
+    710dp
+    711dp
+    712dp
+    713dp
+    714dp
+    715dp
+    716dp
+    717dp
+    718dp
+    719dp
+    720dp
+    721dp
+    722dp
+    723dp
+    724dp
+    725dp
+    726dp
+    727dp
+    728dp
+    729dp
+    730dp
+    731dp
+    732dp
+    733dp
+    734dp
+    735dp
+    736dp
+    737dp
+    738dp
+    739dp
+    740dp
+    741dp
+    742dp
+    743dp
+    744dp
+    745dp
+    746dp
+    747dp
+    748dp
+    749dp
+    750dp
+    751dp
+    752dp
+    753dp
+    754dp
+    755dp
+    756dp
+    757dp
+    758dp
+    759dp
+    760dp
+    761dp
+    762dp
+    763dp
+    764dp
+    765dp
+    766dp
+    767dp
+    768dp
+    769dp
+    770dp
+    771dp
+    772dp
+    773dp
+    774dp
+    775dp
+    776dp
+    777dp
+    778dp
+    779dp
+    780dp
+    781dp
+    782dp
+    783dp
+    784dp
+    785dp
+    786dp
+    787dp
+    788dp
+    789dp
+    790dp
+    791dp
+    792dp
+    793dp
+    794dp
+    795dp
+    796dp
+    797dp
+    798dp
+    799dp
+    800dp
+    801dp
+    802dp
+    803dp
+    804dp
+    805dp
+    806dp
+    807dp
+    808dp
+    809dp
+    810dp
+    811dp
+    812dp
+    813dp
+    814dp
+    815dp
+    816dp
+    817dp
+    818dp
+    819dp
+    820dp
+    821dp
+    822dp
+    823dp
+    824dp
+    825dp
+    826dp
+    827dp
+    828dp
+    829dp
+    830dp
+    831dp
+    832dp
+    833dp
+    834dp
+    835dp
+    836dp
+    837dp
+    838dp
+    839dp
+    840dp
+    841dp
+    842dp
+    843dp
+    844dp
+    845dp
+    846dp
+    847dp
+    848dp
+    849dp
+    850dp
+    851dp
+    852dp
+    853dp
+    854dp
+    855dp
+    856dp
+    857dp
+    858dp
+    859dp
+    860dp
+    861dp
+    862dp
+    863dp
+    864dp
+    865dp
+    866dp
+    867dp
+    868dp
+    869dp
+    870dp
+    871dp
+    872dp
+    873dp
+    874dp
+    875dp
+    876dp
+    877dp
+    878dp
+    879dp
+    880dp
+    881dp
+    882dp
+    883dp
+    884dp
+    885dp
+    886dp
+    887dp
+    888dp
+    889dp
+    890dp
+    891dp
+    892dp
+    893dp
+    894dp
+    895dp
+    896dp
+    897dp
+    898dp
+    899dp
+    900dp
+    901dp
+    902dp
+    903dp
+    904dp
+    905dp
+    906dp
+    907dp
+    908dp
+    909dp
+    910dp
+    911dp
+    912dp
+    913dp
+    914dp
+    915dp
+    916dp
+    917dp
+    918dp
+    919dp
+    920dp
+    921dp
+    922dp
+    923dp
+    924dp
+    925dp
+    926dp
+    927dp
+    928dp
+    929dp
+    930dp
+    931dp
+    932dp
+    933dp
+    934dp
+    935dp
+    936dp
+    937dp
+    938dp
+    939dp
+    940dp
+    941dp
+    942dp
+    943dp
+    944dp
+    945dp
+    946dp
+    947dp
+    948dp
+    949dp
+    950dp
+    951dp
+    952dp
+    953dp
+    954dp
+    955dp
+    956dp
+    957dp
+    958dp
+    959dp
+    960dp
+    961dp
+    962dp
+    963dp
+    964dp
+    965dp
+    966dp
+    967dp
+    968dp
+    969dp
+    970dp
+    971dp
+    972dp
+    973dp
+    974dp
+    975dp
+    976dp
+    977dp
+    978dp
+    979dp
+    980dp
+    981dp
+    982dp
+    983dp
+    984dp
+    985dp
+    986dp
+    987dp
+    988dp
+    989dp
+    990dp
+    991dp
+    992dp
+    993dp
+    994dp
+    995dp
+    996dp
+    997dp
+    998dp
+    999dp
+    1000dp
+    1100dp
+    1200dp
+    1300dp
+    1920dp
 
-	550px
-	208px
-	100px
-	100px
-	100px
-	10px
-	54px
-	44px
-	44px
-	14px
-	12px
-	64px
-	6.5px
-	10px
 
-	2px
-	2px
-	0px
-	28px
-	16px
+	76dp
+	35dp
 
-	20px
-	28px
-	20px
-	84px
-	18px
-	58px
-	14px
-	16px
-	18px
-	5px
-	20px
-	13px
-	42px
-	8.89px
-	13px
-	16px
-	25px
-	13px
-	26px
-	20px
-	18px
-	17px
-	60px
-	12.5px
+	550dp
+	208dp
+	100dp
+	100dp
+	100dp
+	10dp
+	54dp
+	44dp
+	44dp
+	14dp
+	12dp
+	64dp
+	6.5dp
+	10dp
 
-	36px
-	53px
-	194px
+
+    -8dp
+    8dp
+    18dp
+    16dp
+    120dp
+    150dp
+    48dp
+    17.5000dp
+    15.3125dp
+    6dp
+    
+    20dp
+    20dp
+    20dp
+    50dp
+    28dp
+
+    36dp
+    50dp
+    36dp
+    151dp
+    33dp
+    102dp
+    26dp
+    30dp
+    34dp
+    9dp
+    40dp
+    20dp
+    70dp
+    16dp
+    21dp
+    28dp
+    45dp
+    22dp
+    42dp
+    20dp
+    34dp
+    28dp
+    60dp
+    22.5dp
+
+    360dp
+    63dp
+    96dp
+    470dp
+    140dp
+    100dp
+    28dp
+    30dp
+    28dp
+    320dp
+    140dp
+    28dp
+    20dp
+    100dp
+
+    20dp
+    4dp
+    120dp
+    55dp
+    69dp
+    60dp
+    35dp
+    35dp
+    8dp
 
diff --git a/modules/mogo-module-service/src/main/res/layout/modudle_services_marker_info_window_layout.xml b/modules/mogo-module-service/src/main/res/layout/modudle_services_marker_info_window_layout.xml
index a1f1d3dafb..b02de1e515 100644
--- a/modules/mogo-module-service/src/main/res/layout/modudle_services_marker_info_window_layout.xml
+++ b/modules/mogo-module-service/src/main/res/layout/modudle_services_marker_info_window_layout.xml
@@ -23,7 +23,7 @@
             android:id="@+id/module_service_id_user_header"
             android:layout_width="@dimen/module_service_user_header_width"
             android:layout_height="@dimen/module_service_user_header_height"
-            android:layout_marginLeft="2.5px"
+            android:layout_marginLeft="2.5dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
@@ -51,7 +51,7 @@
             android:id="@+id/module_service_id_tag"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="5px"
+            android:layout_marginTop="5dp"
             android:background="@drawable/module_services_driver_type_blue_info"
             android:textColor="#ffffff"
             android:textSize="@dimen/module_service_tag_textSize"
diff --git a/modules/mogo-module-service/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-service/src/main/res/values-mdpi/dimens.xml
index 0b0ce58fe0..ee98b49144 100644
--- a/modules/mogo-module-service/src/main/res/values-mdpi/dimens.xml
+++ b/modules/mogo-module-service/src/main/res/values-mdpi/dimens.xml
@@ -1,19 +1,19 @@
 
 
 
-    550px
-    208px
-    100px
-    100px
-    100px
-    10px
-    54px
-    44px
-    44px
-    14px
-    12px
-    64px
-    6.5px
-    10px
+    550dp
+    208dp
+    100dp
+    100dp
+    100dp
+    10dp
+    54dp
+    44dp
+    44dp
+    14dp
+    12dp
+    64dp
+    6.5dp
+    10dp
 
 
\ No newline at end of file
diff --git a/modules/mogo-module-service/src/main/res/values-xhdpi-1920x1000/dimens.xml b/modules/mogo-module-service/src/main/res/values-xhdpi-1920x1000/dimens.xml
index f3c6319576..d1ca7d5b8e 100644
--- a/modules/mogo-module-service/src/main/res/values-xhdpi-1920x1000/dimens.xml
+++ b/modules/mogo-module-service/src/main/res/values-xhdpi-1920x1000/dimens.xml
@@ -2,18 +2,18 @@
 
 
     
-    1000px
-    390px
-    200px
-    200px
-    10px
-    10px
-    100px
-    80px
-    80px
-    24px
-    20px
-    120px
-    20px
+    1000dp
+    390dp
+    200dp
+    200dp
+    10dp
+    10dp
+    100dp
+    80dp
+    80dp
+    24dp
+    20dp
+    120dp
+    20dp
 
 
\ No newline at end of file
diff --git a/modules/mogo-module-service/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-service/src/main/res/values-xhdpi/dimens.xml
index 68aefd5e5e..0d6091d8b9 100644
--- a/modules/mogo-module-service/src/main/res/values-xhdpi/dimens.xml
+++ b/modules/mogo-module-service/src/main/res/values-xhdpi/dimens.xml
@@ -2,18 +2,18 @@
 
 
     
-    1000px
-    390px
-    200px
-    200px
-    10px
-    10px
-    100px
-    80px
-    80px
-    24px
-    20px
-    120px
-    20px\
+    1000dp
+    390dp
+    200dp
+    200dp
+    10dp
+    10dp
+    100dp
+    80dp
+    80dp
+    24dp
+    20dp
+    120dp
+    20dp\
 
 
diff --git a/modules/mogo-module-service/src/main/res/values/dimens.xml b/modules/mogo-module-service/src/main/res/values/dimens.xml
index a9ff73ff8f..b0dc96cc92 100644
--- a/modules/mogo-module-service/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-service/src/main/res/values/dimens.xml
@@ -1,18 +1,18 @@
 
 
     
-    1000px
-    390px
-    200px
-    200px
-    10px
-    10px
-    100px
-    80px
-    80px
-    24px
-    20px
-    120px
-    20px
+    1000dp
+    390dp
+    200dp
+    200dp
+    10dp
+    10dp
+    100dp
+    80dp
+    80dp
+    24dp
+    20dp
+    120dp
+    20dp
 
 
\ No newline at end of file