diff --git a/OCH/mogo-och-bus-passenger/src/main/res/values-sw320dp/dimens.xml b/OCH/mogo-och-bus-passenger/src/main/res/values-sw320dp/dimens.xml deleted file mode 100644 index 71d34a83e6..0000000000 --- a/OCH/mogo-och-bus-passenger/src/main/res/values-sw320dp/dimens.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - 700dp - 40dp - 40dp - 40dp - 110dp - 224dp - 510dp - 3dp - - 158dp - 90dp - 45dp - 158dp - 90dp - 45dp - 90dp - 90dp - 3dp - - 224dp - 50dp - 50dp - 44dp - 130dp - 38dp - - 36dp - - 110dp - 42dp - - 4dp - 10dp - 20dp - 60dp - 30dp - 20dp - 50dp - 6dp - 50dp - 36dp - 80dp - 100dp - 80dp - 60dp - 6dp - - 685dp - 309dp - 50dp - 10dp - 44dp - 55dp - 40dp - - 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 19785202da..e738022b0d 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 @@ -48,9 +48,9 @@ 60dp 6dp - 638dp - 316dp - 38dp + 685dp + 309dp + 50dp 10dp 44dp 55dp diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_no_line_icon.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_no_line_icon.png deleted file mode 100755 index fc20dca73c..0000000000 Binary files a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_no_line_icon.png and /dev/null differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/icon_arrow_blue_bus.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/icon_arrow_blue_bus.png deleted file mode 100755 index 026c36086f..0000000000 Binary files a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/icon_arrow_blue_bus.png and /dev/null differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/icon_arrow_green_bus.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/icon_arrow_green_bus.png deleted file mode 100755 index 06bebc7013..0000000000 Binary files a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/icon_arrow_green_bus.png and /dev/null differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/icon_arrow_grey_bus.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/icon_arrow_grey_bus.png deleted file mode 100755 index f4f9b2bca2..0000000000 Binary files a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/icon_arrow_grey_bus.png and /dev/null differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/icon_no_bus_line.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/icon_no_bus_line.png deleted file mode 100755 index fc20dca73c..0000000000 Binary files a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/icon_no_bus_line.png and /dev/null differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/icon_point_blue_bus.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/icon_point_blue_bus.png deleted file mode 100755 index dc4c4f6f0d..0000000000 Binary files a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/icon_point_blue_bus.png and /dev/null differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/icon_point_green_bus.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/icon_point_green_bus.png deleted file mode 100755 index ed3b871338..0000000000 Binary files a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/icon_point_green_bus.png and /dev/null differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/icon_point_grey_bus.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/icon_point_grey_bus.png deleted file mode 100755 index d43e34bb26..0000000000 Binary files a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/icon_point_grey_bus.png and /dev/null differ 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 deleted file mode 100644 index d38ff003b4..0000000000 --- a/OCH/mogo-och-bus/src/main/res/values-xhdpi-2560x1440/dimens.xml +++ /dev/null @@ -1,142 +0,0 @@ - - - - 300dp - 348dp - 211dp - 276dp - - - 220dp - 98dp - 159dp - - 32dp - 20dp - 40dp - 42dp - - 15dp - - 20dp - 36dp - 28dp - 36dp - - 3dp - 3dp - 17dp - 17dp - - - 300dp - 270dp - 30dp - 24dp - 24dp - 1dp - 30dp - 23dp - 30dp - 146dp - 20dp - 23dp - 30dp - 23dp - 26dp - 34dp - 20dp - 80dp - 3dp - 34dp - 20dp - 28dp - 27dp - - - 28dp - 20dp - 20dp - 64dp - 16dp - - 40dp - 40dp - 46dp - 24dp - - 530dp - 492dp - - 20dp - 20dp - 70dp - 130dp - 93dp - 150dp - 70dp - - 24dp - 616dp - 180dp - - 112dp - 112dp - - 92dp - - 30dp - 618dp - 754dp - - - 40dp - 32dp - 13dp - 12dp - 350dp - - 460dp - 30dp - - 110dp - 40dp - 320dp - 20dp - 40dp - 320dp - 320dp - 70dp - 616dp - 130dp - 30dp - 279dp - 112dp - 22dp - 36dp - 50dp - 60dp - - - 46dp - 700dp - 120dp - 560dp - 116dp - - 20dp - - 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 deleted file mode 100644 index 506b9cddc5..0000000000 --- a/OCH/mogo-och-bus/src/main/res/values-xhdpi-2560x1600/dimens.xml +++ /dev/null @@ -1,140 +0,0 @@ - - - - 300dp - 348dp - 211dp - 276dp - - - 220dp - 98dp - 159dp - - 32dp - 20dp - 40dp - 42dp - - 15dp - - 20dp - 36dp - 28dp - 36dp - - 3dp - 3dp - 17dp - 17dp - - - 300dp - 270dp - 30dp - 24dp - 24dp - 1dp - 30dp - 23dp - 30dp - 146dp - 20dp - 23dp - 30dp - 23dp - 26dp - 34dp - 20dp - 80dp - 3dp - 34dp - 20dp - 28dp - 27dp - - - 25.6dp - 20dp - 20dp - 64dp - 16dp - - 40dp - 40dp - 46dp - 24dp - - 530dp - 492dp - - 20dp - 20dp - 70dp - 130dp - 93dp - 150dp - 70dp - - 24dp - 616dp - 180dp - - 112dp - 112dp - - 92dp - - 30dp - 618dp - 754dp - - - 40dp - 32dp - 13dp - 12dp - 350dp - - 460dp - 30dp - - 110dp - 40dp - 320dp - 20dp - 40dp - 320dp - 460dp - 70dp - 460dp - 130dp - 30dp - 276dp - 112dp - 22dp - 36dp - 50dp - 60dp - - 46dp - 700dp - 120dp - 560dp - 116dp - 50dp - - 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/colors.xml b/OCH/mogo-och-bus/src/main/res/values/colors.xml index 38419e0daa..2851302580 100644 --- a/OCH/mogo-och-bus/src/main/res/values/colors.xml +++ b/OCH/mogo-och-bus/src/main/res/values/colors.xml @@ -52,4 +52,9 @@ #8E9DD4 #2B6EFF #00FFF8 + + #FFFFFF + #4DFFFFFF + #FFFFFF + #323C6F \ 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 b867566659..fd1ec0cd92 100644 --- a/OCH/mogo-och-bus/src/main/res/values/dimens.xml +++ b/OCH/mogo-och-bus/src/main/res/values/dimens.xml @@ -1,6 +1,87 @@ + 460dp + 30dp + + 110dp + 40dp + 320dp + 20dp + 40dp + 320dp + 460dp + 70dp + 460dp + 130dp + 30dp + + #FFFFFF + #4DFFFFFF + #FFFFFF + #323C6F + 10dp + 20dp + 200dp + 52dp + 65dp + 20dp + 50dp + 20dp + 38dp + 33dp + 368dp + 76dp + 60dp + 276dp + 112dp + 22dp + 36dp + 50dp + 822dp + + 46dp + 700dp + 120dp + 560dp + 116dp + 50dp + + 225dp + 154dp + 60dp + 40dp + 23dp + 210dp + 120dp + 15dp + 17dp + 154dp + 130dp + 60dp + + 27dp + + + 40dp + 32dp + 13dp + 12dp + 350dp + + 30dp + 618dp + 754dp + + 92dp + + 112dp + 112dp + + + + + 300dp 348dp 211dp @@ -13,8 +94,8 @@ 32dp 20dp - 26dp - 20dp + 40dp + 42dp 15dp @@ -44,19 +125,20 @@ 30dp 23dp 26dp - 20dp + 34dp 20dp 80dp 3dp - 27dp + 34dp 20dp 28dp 27dp - 16dp - 16dp - 16dp - 16dp + + 25.6dp + 20dp + 20dp + 64dp 16dp 40dp @@ -64,94 +146,20 @@ 46dp 24dp - 345dp + 530dp 492dp - 15dp - 15dp - 40dp - 50dp - 50dp - 70dp - 40dp + 20dp + 20dp + 70dp + 130dp + 93dp + 150dp + 70dp 24dp - 300dp - 100dp + 616dp + 180dp - 100dp - 100dp - 35dp - - 15dp - 300dp - 270dp - - 30dp - 30dp - 13dp - 12dp - 288dp - - 460dp - 30dp - - 80dp - 28dp - 200dp - 10dp - 40dp - 200dp - 300dp - 60dp - 300dp - 110dp - 20dp - - #FFFFFF - #4DFFFFFF - #FFFFFF - #323C6F - 10dp - 20dp - 200dp - 52dp - 65dp - 20dp - 50dp - 20dp - 38dp - 33dp - 368dp - 76dp - 38dp - 190dp - 76dp - 16dp - 24dp - 35dp - 822dp - - 30dp - 450dp - 72dp - 280dp - 58dp - 20dp - - 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-sweeper/src/main/res/drawable-xhdpi-2560x1440/end_maker_icon.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/end_maker_icon.png deleted file mode 100755 index 8acf113151..0000000000 Binary files a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/end_maker_icon.png and /dev/null differ diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/icon_ai_normal.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/icon_ai_normal.png deleted file mode 100755 index e98738b192..0000000000 Binary files a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/icon_ai_normal.png and /dev/null differ diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/icon_ai_select.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/icon_ai_select.png deleted file mode 100755 index d3e0107c02..0000000000 Binary files a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/icon_ai_select.png and /dev/null differ diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/icon_bad_case_normal.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/icon_bad_case_normal.png deleted file mode 100755 index c0a978fc2b..0000000000 Binary files a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/icon_bad_case_normal.png and /dev/null differ diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/icon_bad_case_select.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/icon_bad_case_select.png deleted file mode 100755 index ebacf3a11a..0000000000 Binary files a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/icon_bad_case_select.png and /dev/null differ diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/icon_station_start_end.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/icon_station_start_end.png deleted file mode 100644 index 04580a8f0d..0000000000 Binary files a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/icon_station_start_end.png and /dev/null differ diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/press_start_status.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/press_start_status.png deleted file mode 100755 index af32c20cb5..0000000000 Binary files a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/press_start_status.png and /dev/null differ diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/start_failure.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/start_failure.png deleted file mode 100755 index 5737f93ad8..0000000000 Binary files a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/start_failure.png and /dev/null differ diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/start_maker_icon.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/start_maker_icon.png deleted file mode 100644 index 9eca61e199..0000000000 Binary files a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/start_maker_icon.png and /dev/null differ diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/start_success.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/start_success.png deleted file mode 100755 index 84246fd323..0000000000 Binary files a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/start_success.png and /dev/null differ diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_base_icon_not_in_autopilot.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_base_icon_not_in_autopilot.png deleted file mode 100644 index 927296d690..0000000000 Binary files a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_base_icon_not_in_autopilot.png and /dev/null differ diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_base_slide_block.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_base_slide_block.png deleted file mode 100644 index ed7b293b90..0000000000 Binary files a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_base_slide_block.png and /dev/null differ diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_disable_autopilot_icon.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_disable_autopilot_icon.png deleted file mode 100644 index 170f254cd1..0000000000 Binary files a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_disable_autopilot_icon.png and /dev/null differ diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_icon_arrived_station.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_icon_arrived_station.png deleted file mode 100644 index 8a065b66dd..0000000000 Binary files a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_icon_arrived_station.png and /dev/null differ diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_icon_arriving_station.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_icon_arriving_station.png deleted file mode 100644 index 4ed57a0e30..0000000000 Binary files a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_icon_arriving_station.png and /dev/null differ diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_light_green_nor.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_light_green_nor.png deleted file mode 100644 index bc9fed952d..0000000000 Binary files a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_light_green_nor.png and /dev/null differ diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_light_red_nor.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_light_red_nor.png deleted file mode 100644 index 8732508ded..0000000000 Binary files a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_light_red_nor.png and /dev/null differ diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_lightyellow_nor.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_lightyellow_nor.png deleted file mode 100644 index bae01408fd..0000000000 Binary files a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_lightyellow_nor.png and /dev/null differ diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_line_panel_bg.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_line_panel_bg.png deleted file mode 100755 index 3166d20e37..0000000000 Binary files a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_line_panel_bg.png and /dev/null differ diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_line_panel_bg_1.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_line_panel_bg_1.png deleted file mode 100755 index 09a9c252da..0000000000 Binary files a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_line_panel_bg_1.png and /dev/null differ diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_loading_autopilot_icon.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_loading_autopilot_icon.png deleted file mode 100644 index f21a1081f1..0000000000 Binary files a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_loading_autopilot_icon.png and /dev/null differ diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_och_dot_line.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_och_dot_line.png deleted file mode 100644 index a720a532ea..0000000000 Binary files a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_och_dot_line.png and /dev/null differ diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_right_autopilot_icon.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_right_autopilot_icon.png deleted file mode 100644 index cc2b18083d..0000000000 Binary files a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_right_autopilot_icon.png and /dev/null differ diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_selected_btn.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_selected_btn.png deleted file mode 100644 index 3f05565483..0000000000 Binary files a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_selected_btn.png and /dev/null differ diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_setting_btn_bg.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_setting_btn_bg.png deleted file mode 100644 index ba41bf3a53..0000000000 Binary files a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_setting_btn_bg.png and /dev/null differ diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_switch_line_close.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_switch_line_close.png deleted file mode 100644 index 370b61de38..0000000000 Binary files a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_switch_line_close.png and /dev/null differ diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_switch_map_long.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_switch_map_long.png deleted file mode 100755 index cf3e5a3778..0000000000 Binary files a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_switch_map_long.png and /dev/null differ diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_switch_map_medium.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_switch_map_medium.png deleted file mode 100755 index bdc2725468..0000000000 Binary files a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_switch_map_medium.png and /dev/null differ diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_unselect_btn.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_unselect_btn.png deleted file mode 100644 index 0114bb4f2b..0000000000 Binary files a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_unselect_btn.png and /dev/null differ diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_wrong_autopilot_icon.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_wrong_autopilot_icon.png deleted file mode 100644 index 0c8988acb3..0000000000 Binary files a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_wrong_autopilot_icon.png and /dev/null differ diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/end_maker_icon.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/end_maker_icon.png deleted file mode 100755 index 8acf113151..0000000000 Binary files a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/end_maker_icon.png and /dev/null differ diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/icon_ai_normal.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/icon_ai_normal.png deleted file mode 100755 index e98738b192..0000000000 Binary files a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/icon_ai_normal.png and /dev/null differ diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/icon_ai_select.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/icon_ai_select.png deleted file mode 100755 index d3e0107c02..0000000000 Binary files a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/icon_ai_select.png and /dev/null differ diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/icon_bad_case_normal.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/icon_bad_case_normal.png deleted file mode 100755 index c0a978fc2b..0000000000 Binary files a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/icon_bad_case_normal.png and /dev/null differ diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/icon_bad_case_select.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/icon_bad_case_select.png deleted file mode 100755 index ebacf3a11a..0000000000 Binary files a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/icon_bad_case_select.png and /dev/null differ diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/icon_station_start_end.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/icon_station_start_end.png deleted file mode 100644 index 04580a8f0d..0000000000 Binary files a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/icon_station_start_end.png and /dev/null differ diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/press_start_status.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/press_start_status.png deleted file mode 100755 index af32c20cb5..0000000000 Binary files a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/press_start_status.png and /dev/null differ diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/start_failure.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/start_failure.png deleted file mode 100755 index 5737f93ad8..0000000000 Binary files a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/start_failure.png and /dev/null differ diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/start_maker_icon.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/start_maker_icon.png deleted file mode 100644 index 9eca61e199..0000000000 Binary files a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/start_maker_icon.png and /dev/null differ diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/start_success.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/start_success.png deleted file mode 100755 index 84246fd323..0000000000 Binary files a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/start_success.png and /dev/null differ diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_base_icon_not_in_autopilot.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_base_icon_not_in_autopilot.png deleted file mode 100644 index 927296d690..0000000000 Binary files a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_base_icon_not_in_autopilot.png and /dev/null differ diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_base_slide_block.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_base_slide_block.png deleted file mode 100644 index ed7b293b90..0000000000 Binary files a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_base_slide_block.png and /dev/null differ diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_disable_autopilot_icon.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_disable_autopilot_icon.png deleted file mode 100644 index 170f254cd1..0000000000 Binary files a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_disable_autopilot_icon.png and /dev/null differ diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_icon_arrived_station.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_icon_arrived_station.png deleted file mode 100644 index 8a065b66dd..0000000000 Binary files a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_icon_arrived_station.png and /dev/null differ diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_icon_arriving_station.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_icon_arriving_station.png deleted file mode 100644 index 4ed57a0e30..0000000000 Binary files a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_icon_arriving_station.png and /dev/null differ diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_light_green_nor.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_light_green_nor.png deleted file mode 100644 index bc9fed952d..0000000000 Binary files a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_light_green_nor.png and /dev/null differ diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_light_red_nor.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_light_red_nor.png deleted file mode 100644 index 8732508ded..0000000000 Binary files a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_light_red_nor.png and /dev/null differ diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_lightyellow_nor.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_lightyellow_nor.png deleted file mode 100644 index bae01408fd..0000000000 Binary files a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_lightyellow_nor.png and /dev/null differ diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_line_panel_bg.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_line_panel_bg.png deleted file mode 100755 index 3166d20e37..0000000000 Binary files a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_line_panel_bg.png and /dev/null differ diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_line_panel_bg_1.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_line_panel_bg_1.png deleted file mode 100755 index 09a9c252da..0000000000 Binary files a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_line_panel_bg_1.png and /dev/null differ diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_loading_autopilot_icon.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_loading_autopilot_icon.png deleted file mode 100644 index f21a1081f1..0000000000 Binary files a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_loading_autopilot_icon.png and /dev/null differ diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_och_dot_line.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_och_dot_line.png deleted file mode 100644 index a720a532ea..0000000000 Binary files a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_och_dot_line.png and /dev/null differ diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_right_autopilot_icon.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_right_autopilot_icon.png deleted file mode 100644 index cc2b18083d..0000000000 Binary files a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_right_autopilot_icon.png and /dev/null differ diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_selected_btn.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_selected_btn.png deleted file mode 100644 index 3f05565483..0000000000 Binary files a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_selected_btn.png and /dev/null differ diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_setting_btn_bg.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_setting_btn_bg.png deleted file mode 100644 index ba41bf3a53..0000000000 Binary files a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_setting_btn_bg.png and /dev/null differ diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_switch_line_close.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_switch_line_close.png deleted file mode 100644 index 370b61de38..0000000000 Binary files a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_switch_line_close.png and /dev/null differ diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_switch_map_long.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_switch_map_long.png deleted file mode 100755 index cf3e5a3778..0000000000 Binary files a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_switch_map_long.png and /dev/null differ diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_switch_map_medium.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_switch_map_medium.png deleted file mode 100755 index bdc2725468..0000000000 Binary files a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_switch_map_medium.png and /dev/null differ diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_unselect_btn.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_unselect_btn.png deleted file mode 100644 index 0114bb4f2b..0000000000 Binary files a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_unselect_btn.png and /dev/null differ diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_wrong_autopilot_icon.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_wrong_autopilot_icon.png deleted file mode 100644 index 0c8988acb3..0000000000 Binary files a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_wrong_autopilot_icon.png and /dev/null differ diff --git a/OCH/mogo-och-sweeper/src/main/res/values-xhdpi-2560x1440/dimens.xml b/OCH/mogo-och-sweeper/src/main/res/values-xhdpi-2560x1440/dimens.xml deleted file mode 100644 index 40a71f82e2..0000000000 --- a/OCH/mogo-och-sweeper/src/main/res/values-xhdpi-2560x1440/dimens.xml +++ /dev/null @@ -1,140 +0,0 @@ - - - - 300px - 348px - 211px - 276px - - - 220px - 98px - 159px - - 32px - 20px - 40px - 42px - - 15px - - 20px - 36px - 28px - 36px - - 3px - 3px - 17px - 17px - - - 300px - 270px - 30px - 24px - 24px - 1px - 30px - 23px - 30px - 146px - 20px - 23px - 30px - 23px - 26px - 34px - 20px - 80px - 3px - 34px - 20px - 28px - 27px - - - 28px - 20px - 20px - 64px - 16px - - 40px - 40px - 46px - 24px - - 530px - 492px - - 20px - 20px - 70px - 130px - 93px - 150px - 70px - - 24px - 616px - 180px - - 112px - 112px - - 92px - - 30px - 616px - 754px - - - 40px - 13px - 12px - 350px - - 460px - 30px - - 110px - 40px - 320px - 20px - 40px - 320px - 320px - 70px - 616px - 130px - 30px - 279px - 112px - 22px - 36px - 50px - 60px - - - 46px - 700px - 120px - 560px - 116px - - 20px - - 225px - 154px - 60px - 40px - 23px - 210px - 120px - 15px - 17px - 154px - 130px - 60px - \ No newline at end of file diff --git a/OCH/mogo-och-sweeper/src/main/res/values-xhdpi-2560x1600/dimens.xml b/OCH/mogo-och-sweeper/src/main/res/values-xhdpi-2560x1600/dimens.xml deleted file mode 100644 index 85035d4a73..0000000000 --- a/OCH/mogo-och-sweeper/src/main/res/values-xhdpi-2560x1600/dimens.xml +++ /dev/null @@ -1,138 +0,0 @@ - - - - 300px - 348px - 211px - 276px - - - 220px - 98px - 159px - - 32px - 20px - 40px - 42px - - 15px - - 20px - 36px - 28px - 36px - - 3px - 3px - 17px - 17px - - - 300px - 270px - 30px - 24px - 24px - 1px - 30px - 23px - 30px - 146px - 20px - 23px - 30px - 23px - 26px - 34px - 20px - 80px - 3px - 34px - 20px - 28px - 27px - - - 25.6px - 20px - 20px - 64px - 16px - - 40px - 40px - 46px - 24px - - 530px - 492px - - 20px - 20px - 70px - 130px - 93px - 150px - 70px - - 24px - 616px - 180px - - 112px - 112px - - 92px - - 30px - 616px - 754px - - - 40px - 13px - 12px - 350px - - 460px - 30px - - 110px - 40px - 320px - 20px - 40px - 320px - 460px - 70px - 460px - 130px - 30px - 276px - 112px - 22px - 36px - 50px - 60px - - 46px - 700px - 120px - 560px - 116px - 50px - - 225px - 154px - 60px - 40px - 23px - 210px - 120px - 15px - 17px - 154px - 130px - 60px - \ No newline at end of file diff --git a/OCH/mogo-och-sweeper/src/main/res/values/dimens.xml b/OCH/mogo-och-sweeper/src/main/res/values/dimens.xml index 8cbd5c847a..c55f7c1ec5 100644 --- a/OCH/mogo-och-sweeper/src/main/res/values/dimens.xml +++ b/OCH/mogo-och-sweeper/src/main/res/values/dimens.xml @@ -44,19 +44,19 @@ 30px 23px 26px - 20px + 34px 20px 80px 3px - 27px + 34px 20px 28px 27px - 16px - 16px - 16px - 16px + 25.6px + 20px + 20px + 64px 16px 40px @@ -64,54 +64,50 @@ 46px 24px - 345px + 530px 492px - 15px - 15px - 40px - 50px - 50px - 70px - 40px + 20px + 20px + 70px + 130px + 93px + 150px + 70px 24px - 300px - 100px + 616px + 180px - 100px - 100px + 112px + 112px - 35px + 92px - 15px - 300px - 270px + 30px + 616px + 754px - 30px + 40px 13px 12px - 288px + 350px 460px 30px - 80px - 28px - 200px - 10px + 110px + 40px + 320px + 20px 40px - 200px - 300px - 60px - 300px - 110px - 20px + 320px + 460px + 70px + 460px + 130px + 30px - #FFFFFF - #4DFFFFFF - #FFFFFF - #323C6F 10px 20px 200px @@ -124,20 +120,21 @@ 33px 368px 76px - 38px - 190px - 76px - 16px - 24px - 35px + 60px + + 276px + 112px + 22px + 36px + 50px 822px - 30px - 450px - 72px - 280px - 58px - 20px + 46px + 700px + 120px + 560px + 116px + 50px 225px 154px 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 deleted file mode 100644 index 1f2c737967..0000000000 --- a/OCH/mogo-och-taxi-passenger/src/main/res/values-sw320dp/dimens.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - - 496dp - 560dp - 910dp - 800dp - 222dp - 1120dp - 162dp - 446dp - 400dp - 160dp - 432dp - 64dp - 616dp - 132dp - 300dp - 240dp - 400dp - 160dp - 280dp - 120dp - - 220dp - 420dp - 220dp - - 624dp - 984dp - - 225dp - 154dp - 60dp - 40dp - 23dp - 210dp - 120dp - 15dp - 17dp - 154dp - 130dp - 60dp - - 31dp - 110dp - 10dp - 70dp - 120dp - 39dp - 20dp - 30dp - - 82dp - 42dp - - 144dp - 32dp - 32dp - 36dp - 50dp - 34dp - 28dp - - 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 deleted file mode 100644 index 2234311daa..0000000000 --- a/OCH/mogo-och-taxi-passenger/src/main/res/values-xhdpi-2560x1440/dimens.xml +++ /dev/null @@ -1,132 +0,0 @@ - - - - 40dp - 40dp - 46dp - 24dp - - 530dp - 492dp - - 20dp - 20dp - 70dp - 130dp - 93dp - 150dp - 70dp - - 24dp - 460dp - 140dp - - 120dp - 120dp - - 83dp - - 40dp - 466dp - 414dp - - - - 46dp - 13dp - 12dp - 350dp - - 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 - - - 496dp - 560dp - 910dp - 800dp - 222dp - 1120dp - 162dp - 446dp - 400dp - 160dp - 432dp - 64dp - 616dp - 132dp - 300dp - 240dp - 400dp - 160dp - 280dp - 120dp - - 220dp - 420dp - 220dp - - 624dp - 984dp - - 225dp - 154dp - 60dp - 40dp - 23dp - 210dp - 120dp - 15dp - 17dp - 154dp - 130dp - 60dp - - 31dp - 110dp - 10dp - 70dp - 120dp - 39dp - 20dp - 30dp - - 82dp - 42dp - - 144dp - 32dp - 32dp - 36dp - 50dp - 34dp - 28dp - - 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 7fade6492d..9619be8593 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 @@ -4,9 +4,6 @@ 46dp 24dp - 345dp - 492dp - 15dp 15dp 40dp @@ -100,7 +97,7 @@ 130dp 60dp - 30dp + 31dp 110dp 10dp 70dp diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/BadCaseManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/BadCaseManager.kt index 875437c81c..1b65d8c4ce 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/BadCaseManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/BadCaseManager.kt @@ -35,6 +35,7 @@ import com.zhjt.mogo_core_function_devatools.ext.enqueuePop import com.zhjt.mogo_core_function_devatools.ext.toast import kotlinx.coroutines.* import kotlinx.coroutines.channels.Channel +import me.jessyan.autosize.utils.AutoSizeUtils import record_cache.RecordPanelOuterClass import java.lang.ref.WeakReference import java.util.concurrent.TimeUnit @@ -93,7 +94,7 @@ internal object BadCaseManager : LifecycleEventObserver { hideFloat = null } }) - context.enqueuePop(badCaseConfigView,960.PX, WindowManager.LayoutParams.MATCH_PARENT, key = "BadCaseConfigView").also { + context.enqueuePop(badCaseConfigView,AutoSizeUtils.dp2px(context,960f), WindowManager.LayoutParams.MATCH_PARENT, key = "BadCaseConfigView").also { hideFloat = it } } diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/badcase_radio_button_style.xml b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/badcase_radio_button_style.xml index 79a363b597..2b50242af5 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/badcase_radio_button_style.xml +++ b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/badcase_radio_button_style.xml @@ -2,8 +2,8 @@ + android:drawable="@drawable/shape_size_check_false" /> + android:drawable="@drawable/shape_size_check_true" /> \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/shape_size_check_false.xml b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/shape_size_check_false.xml new file mode 100644 index 0000000000..e15bf88f42 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/shape_size_check_false.xml @@ -0,0 +1,7 @@ + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/shape_size_check_true.xml b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/shape_size_check_true.xml new file mode 100644 index 0000000000..50ce551e98 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/shape_size_check_true.xml @@ -0,0 +1,7 @@ + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/layout/layout_status_bar.xml b/core/function-impl/mogo-core-function-devatools/src/main/res/layout/layout_status_bar.xml index 4a963b0af8..0ce9082586 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/res/layout/layout_status_bar.xml +++ b/core/function-impl/mogo-core-function-devatools/src/main/res/layout/layout_status_bar.xml @@ -9,7 +9,7 @@ (), .setGravity(Gravity.LEFT) .setImmersionStatusBar(true) .setWindowHeight(LayoutParams.MATCH_PARENT) + .setWindowWidth(AutoSizeUtils.dp2px(context,960f)) .setAnimator(object : DefaultAnimator() { override fun enterAnim( view: View, @@ -717,6 +718,8 @@ class MoGoHmiFragment : MvpFragment(), .setSidePattern(side) .setGravity(gravity, offsetY = 70) .setImmersionStatusBar(true) + .setWindowWidth(AutoSizeUtils.dp2px(context,800f)) + .setWindowHeight(AutoSizeUtils.dp2px(context,1100f)) .setAnimator(object : DefaultAnimator() { override fun enterAnim( view: View, diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_auto_pilot_check.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_auto_pilot_check.xml index 0a9b87fd82..b12bf6b09d 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_auto_pilot_check.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_auto_pilot_check.xml @@ -154,17 +154,17 @@ app:layout_constraintLeft_toLeftOf="@id/checkLayout"> @@ -254,14 +254,14 @@