From 0bc581a394fe29da88fdd3d979fed09c72546a17 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Tue, 1 Nov 2022 17:21:42 +0800 Subject: [PATCH] =?UTF-8?q?[2.8.0-f]=20bus=20busp=20taxi=20=E9=80=82?= =?UTF-8?q?=E9=85=8D=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/res/layout/bus_p_base_fragment.xml | 8 +- .../res/layout/bus_p_no_data_common_view.xml | 4 +- .../main/res/layout/bus_p_route_fragment.xml | 4 +- .../res/layout/bus_p_stations_common_item.xml | 8 +- .../src/main/res/layout/bus_base_fragment.xml | 12 +- .../src/main/res/layout/bus_no_line_view.xml | 4 +- .../res/layout/bus_stations_common_item.xml | 12 +- .../res/layout/bus_switch_line_list_item.xml | 4 +- .../src/main/res/layout/bus_test_bar_view.xml | 5 + .../main/res/layout/item_och_bus_station.xml | 58 -- .../src/main/res/layout/taxi_login_view.xml | 1 + .../com/mogo/och/taxi/ui/TaxiFragment.java | 8 +- .../och/taxi/ui/TaxiGrabOrderFragment.java | 3 +- .../och/taxi/ui/TaxiOrderCancelDialog.java | 4 +- .../taxi/ui/TaxiPersonalDialogFragment.java | 6 +- .../och/taxi/ui/TaxiServerOrdersFragment.java | 12 +- .../end_maker_icon.png | Bin 5154 -> 0 bytes .../icon_ai_normal.png | Bin 4840 -> 0 bytes .../icon_ai_select.png | Bin 5310 -> 0 bytes .../icon_bad_case_normal.png | Bin 7086 -> 0 bytes .../icon_bad_case_select.png | Bin 6901 -> 0 bytes .../icon_station_start_end.png | Bin 102348 -> 0 bytes .../order_drive_mode_bg.png | Bin 72035 -> 0 bytes .../start_maker_icon.png | Bin 4305 -> 0 bytes .../taxi_autopilot_status_bg.xml | 16 - .../taxi_back_btn.png | Bin 2479 -> 0 bytes .../taxi_base_icon_not_in_autopilot.png | Bin 2342 -> 0 bytes .../taxi_close_navi_icon.png | Bin 2198 -> 0 bytes .../taxi_dot_line.png | Bin 1004 -> 0 bytes .../taxi_ic_autopilot.png | Bin 2097 -> 0 bytes .../taxi_ic_autopilot_bg.png | Bin 83550 -> 0 bytes .../taxi_ic_autopilot_bg_pressed.png | Bin 80635 -> 0 bytes .../taxi_ic_autopilot_disable.png | Bin 2407 -> 0 bytes .../taxi_ic_autopilot_failed.png | Bin 3362 -> 0 bytes .../taxi_ic_autopilot_loading.png | Bin 2380 -> 0 bytes .../taxi_ic_autopilot_success.png | Bin 2951 -> 0 bytes .../taxi_icon_arrived_station.png | Bin 1420 -> 0 bytes .../taxi_icon_arriving_station.png | Bin 1349 -> 0 bytes .../taxi_light_green_nor.png | Bin 32523 -> 0 bytes .../taxi_light_red_nor.png | Bin 26992 -> 0 bytes .../taxi_lightyellow_nor.png | Bin 25840 -> 0 bytes .../drawable-xhdpi-2560x1440/taxi_masking.png | Bin 23646 -> 0 bytes .../taxi_navi_arrow_icon.png | Bin 2663 -> 0 bytes .../taxi_navi_direction_icon.png | Bin 11547 -> 0 bytes .../taxi_navi_icon.png | Bin 4019 -> 0 bytes .../taxi_navi_line_icon.png | Bin 542 -> 0 bytes .../drawable-xhdpi-2560x1440/taxi_out_btn.png | Bin 2445 -> 0 bytes .../taxi_personal_btn.png | Bin 4124 -> 0 bytes .../taxi_setting_btn_bg.png | Bin 1883 -> 0 bytes .../taxi_speed_bg.png | Bin 54273 -> 0 bytes .../taxi_switch_map_long.png | Bin 5864 -> 0 bytes .../taxi_switch_map_medium.png | Bin 5578 -> 0 bytes .../end_maker_icon.png | Bin 5154 -> 0 bytes .../icon_ai_normal.png | Bin 4840 -> 0 bytes .../icon_ai_select.png | Bin 5310 -> 0 bytes .../icon_bad_case_normal.png | Bin 7086 -> 0 bytes .../icon_bad_case_select.png | Bin 6901 -> 0 bytes .../icon_station_start_end.png | Bin 102348 -> 0 bytes .../order_drive_mode_bg.png | Bin 72035 -> 0 bytes .../start_maker_icon.png | Bin 4305 -> 0 bytes .../taxi_autopilot_bg_selector.xml | 5 - .../taxi_autopilot_status_bg.xml | 16 - .../taxi_back_btn.png | Bin 2479 -> 0 bytes .../taxi_base_icon_not_in_autopilot.png | Bin 2342 -> 0 bytes .../taxi_close_navi_icon.png | Bin 2198 -> 0 bytes .../taxi_dot_line.png | Bin 1004 -> 0 bytes .../taxi_ic_autopilot.png | Bin 2097 -> 0 bytes .../taxi_ic_autopilot_bg.png | Bin 83550 -> 0 bytes .../taxi_ic_autopilot_bg_pressed.png | Bin 80635 -> 0 bytes .../taxi_ic_autopilot_disable.png | Bin 2407 -> 0 bytes .../taxi_ic_autopilot_failed.png | Bin 3362 -> 0 bytes .../taxi_ic_autopilot_loading.png | Bin 2380 -> 0 bytes .../taxi_ic_autopilot_success.png | Bin 2951 -> 0 bytes .../taxi_icon_arrived_station.png | Bin 1420 -> 0 bytes .../taxi_icon_arriving_station.png | Bin 1349 -> 0 bytes .../taxi_light_green_nor.png | Bin 32523 -> 0 bytes .../taxi_light_red_nor.png | Bin 26992 -> 0 bytes .../taxi_lightyellow_nor.png | Bin 25840 -> 0 bytes .../drawable-xhdpi-2560x1600/taxi_masking.png | Bin 23646 -> 0 bytes .../taxi_navi_arrow_icon.png | Bin 2663 -> 0 bytes .../taxi_navi_direction_icon.png | Bin 11547 -> 0 bytes .../taxi_navi_icon.png | Bin 4019 -> 0 bytes .../taxi_navi_line_icon.png | Bin 542 -> 0 bytes .../drawable-xhdpi-2560x1600/taxi_out_btn.png | Bin 2445 -> 0 bytes .../taxi_personal_btn.png | Bin 4124 -> 0 bytes .../taxi_setting_btn_bg.png | Bin 1883 -> 0 bytes .../taxi_speed_bg.png | Bin 54273 -> 0 bytes .../taxi_speed_selector.xml | 16 - .../taxi_switch_map_long.png | Bin 5864 -> 0 bytes .../taxi_switch_map_medium.png | Bin 5578 -> 0 bytes .../res/drawable/shape_size_grab_order_bt.xml | 7 + .../drawable/shape_size_operation_back.xml | 7 + .../res/drawable/shape_size_operation_out.xml | 7 + .../res/drawable/shape_size_see_all_order.xml | 7 + .../drawable/shape_size_taxi_selected_btn.xml | 7 + .../shape_size_taxi_unselected_btn.xml | 7 + .../taxi_autopilot_bg_selector.xml | 0 .../res/drawable/taxi_autopilot_status_bg.xml | 4 +- .../taxi_speed_selector.xml | 0 .../res/layout/auto_or_manual_btn_view.xml | 4 +- .../main/res/layout/taxi_base_fragment.xml | 40 +- .../src/main/res/layout/taxi_being_order.xml | 14 +- .../res/layout/taxi_no_data_common_view.xml | 6 +- .../layout/taxi_operation_data_item_view.xml | 4 +- .../layout/taxi_operation_tab_item_custom.xml | 6 +- .../res/layout/taxi_order_cancel_view.xml | 15 +- .../res/layout/taxi_order_checkbox_item.xml | 2 +- .../main/res/layout/taxi_order_grab_view.xml | 28 +- .../taxi_order_list_boot_no_data_view.xml | 2 +- .../res/layout/taxi_order_reserve_item.xml | 14 +- .../res/layout/taxi_orders_list_day_item.xml | 2 +- .../main/res/layout/taxi_orders_list_item.xml | 22 +- .../main/res/layout/taxi_orders_list_view.xml | 6 +- .../src/main/res/layout/taxi_panel.xml | 14 +- .../res/layout/taxi_server_orders_panel.xml | 6 +- .../main/res/layout/taxi_tab_item_custom.xml | 2 +- .../src/main/res/values-sw320dp/dimens.xml | 106 ---- .../res/values-xhdpi-2560x1440/dimens.xml | 106 ---- .../src/main/res/values/dimens.xml | 88 ++-- .../src/main/res/values/styles.xml | 2 +- .../hmi/ui/tools/AutoPilotAndCheckView.kt | 4 + .../main/res/layout/view_debug_setting.xml | 4 +- .../amap_bus_corner.png | Bin 42264 -> 0 bytes .../amap_bus_smooth_route.png | Bin 879 -> 0 bytes .../amap_custom_smooth_route.png | Bin 215 -> 0 bytes .../arrow_arrived_img.png | Bin 443 -> 0 bytes .../res/drawable-xhdpi-2560x1440/count_bg.png | Bin 1739 -> 0 bytes .../drawable-xhdpi-2560x1440/map_bus_icon.png | Bin 7059 -> 0 bytes .../drawable-xhdpi-2560x1440/map_car_icon.png | Bin 7318 -> 0 bytes .../module_small_map_view_border_north.png | Bin 29440 -> 0 bytes ...module_small_map_view_my_location_logo.png | Bin 8870 -> 0 bytes .../taxi_map_arrow_arrived.png | Bin 783 -> 0 bytes .../taxi_map_arrow_un_arrive.png | Bin 588 -> 0 bytes .../video_icon_left.png | Bin 8276 -> 0 bytes .../video_icon_right.png | Bin 8321 -> 0 bytes .../amap_custom_corner.png | Bin .../amap_custom_pass_route.png | Bin .../amap_reset.png | Bin .../amap_reset_bus.png | Bin .../amap_reset_passenger.png | Bin .../custtexture_bad.png | Bin .../custtexture_grayred.png | Bin .../custtexture_green.png | Bin .../custtexture_no.png | Bin .../custtexture_slow.png | Bin .../jianbian.png | Bin .../module_small_map_navi_direction.png | Bin .../module_small_map_view_dir_end.png | Bin .../module_small_map_view_dir_pass_route.png | Bin .../module_small_map_view_dir_start.png | Bin .../module_small_map_view_end.png | Bin ...module_small_map_view_my_location_logo.png | Bin 4527 -> 8870 bytes .../module_small_map_view_start.png | Bin .../res/layout/camera_push_live_video.xml | 4 +- .../camera_view_video_layout_normal.xml | 4 +- .../src/main/res/layout/module_push_item.xml | 2 +- .../res/layout/module_push_item_vertical.xml | 135 ----- .../res/layout/module_push_message_item.xml | 4 +- .../main/res/layout/dialog_v2x_seek_help.xml | 56 -- .../main/res/layout/footer_nomore_view.xml | 42 -- .../main/res/layout/item_v2x_event_detail.xml | 286 ---------- .../res/layout/item_v2x_event_detail_vr.xml | 300 ----------- .../layout/item_v2x_event_share_load_more.xml | 21 - .../main/res/layout/item_v2x_event_ugc.xml | 58 -- .../res/layout/item_v2x_fatigue_driving.xml | 91 ---- .../main/res/layout/item_v2x_fault_help.xml | 121 ----- .../res/layout/item_v2x_fault_help_vr.xml | 115 ---- .../res/layout/item_v2x_illegal_parking.xml | 89 ---- .../layout/item_v2x_illegal_parking_vr.xml | 104 ---- .../main/res/layout/item_v2x_live_video.xml | 37 -- .../res/layout/item_v2x_live_video_vr.xml | 37 -- .../res/layout/item_v2x_push_event_detail.xml | 127 ----- .../res/layout/item_v2x_push_live_video.xml | 23 - .../layout/item_v2x_push_live_video_vr.xml | 25 - .../res/layout/item_v2x_recommend_route.xml | 75 --- .../layout/item_v2x_road_live_car_detail.xml | 50 -- .../item_v2x_road_live_car_detail_vr.xml | 50 -- .../res/layout/item_v2x_scennario_history.xml | 106 ---- .../item_v2x_scennario_history_other_help.xml | 132 ----- .../item_v2x_see_crossroad_live_video.xml | 53 -- .../item_v2x_see_frontcar_live_video.xml | 51 -- .../item_v2x_see_frontcar_live_video_vr.xml | 51 -- .../layout/view_v2x_optimal_speed_marker.xml | 25 - .../main/res/layout/vr_window_top_tips.xml | 38 -- .../src/main/res/layout/window_animation.xml | 29 - .../res/layout/window_carforhelp_detail.xml | 63 --- .../src/main/res/layout/window_fault_help.xml | 12 - .../res/layout/window_push_event_detail.xml | 12 - .../res/layout/window_road_video_layout.xml | 52 -- .../layout/window_road_video_layout_vr.xml | 53 -- .../res/layout/window_see_carlive_video.xml | 25 - .../layout/window_see_carlive_video_vr.xml | 26 - .../layout/window_see_crossroadlive_video.xml | 14 - .../window_simple_obu_event_detail_vr.xml | 55 -- .../main/res/layout/window_test_console.xml | 495 ------------------ .../com/mogo/commons/mvp/MvpActivity.java | 10 +- .../src/main/res/layout/dialog_camera.xml | 1 + .../src/main/res/layout/listitem_device.xml | 2 +- ...das_permission_long_background_running.xml | 3 + .../res/layout/modudle_camera_layout_info.xml | 4 +- .../layout/modudle_services_marker_layout.xml | 4 +- .../modudle_services_marker_layout_info.xml | 4 +- .../modudle_services_marker_vr_layout.xml | 4 +- .../res/layout/module_commons_layout_car.xml | 12 - 204 files changed, 279 insertions(+), 3662 deletions(-) delete mode 100644 OCH/mogo-och-bus/src/main/res/layout/item_och_bus_station.xml delete mode 100755 OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/end_maker_icon.png delete mode 100755 OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/icon_ai_normal.png delete mode 100755 OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/icon_ai_select.png delete mode 100755 OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/icon_bad_case_normal.png delete mode 100755 OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/icon_bad_case_select.png delete mode 100644 OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/icon_station_start_end.png delete mode 100644 OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/order_drive_mode_bg.png delete mode 100644 OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/start_maker_icon.png delete mode 100644 OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_autopilot_status_bg.xml delete mode 100644 OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_back_btn.png delete mode 100644 OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_base_icon_not_in_autopilot.png delete mode 100644 OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_close_navi_icon.png delete mode 100644 OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_dot_line.png delete mode 100644 OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_ic_autopilot.png delete mode 100644 OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_ic_autopilot_bg.png delete mode 100644 OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_ic_autopilot_bg_pressed.png delete mode 100644 OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_ic_autopilot_disable.png delete mode 100644 OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_ic_autopilot_failed.png delete mode 100644 OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_ic_autopilot_loading.png delete mode 100644 OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_ic_autopilot_success.png delete mode 100644 OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_icon_arrived_station.png delete mode 100644 OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_icon_arriving_station.png delete mode 100644 OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_light_green_nor.png delete mode 100644 OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_light_red_nor.png delete mode 100644 OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_lightyellow_nor.png delete mode 100644 OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_masking.png delete mode 100644 OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_navi_arrow_icon.png delete mode 100755 OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_navi_direction_icon.png delete mode 100644 OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_navi_icon.png delete mode 100644 OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_navi_line_icon.png delete mode 100644 OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_out_btn.png delete mode 100644 OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_personal_btn.png delete mode 100644 OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_setting_btn_bg.png delete mode 100644 OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_speed_bg.png delete mode 100755 OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_switch_map_long.png delete mode 100755 OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_switch_map_medium.png delete mode 100755 OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/end_maker_icon.png delete mode 100755 OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/icon_ai_normal.png delete mode 100755 OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/icon_ai_select.png delete mode 100755 OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/icon_bad_case_normal.png delete mode 100755 OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/icon_bad_case_select.png delete mode 100644 OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/icon_station_start_end.png delete mode 100644 OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/order_drive_mode_bg.png delete mode 100644 OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/start_maker_icon.png delete mode 100644 OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_autopilot_bg_selector.xml delete mode 100644 OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_autopilot_status_bg.xml delete mode 100644 OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_back_btn.png delete mode 100644 OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_base_icon_not_in_autopilot.png delete mode 100644 OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_close_navi_icon.png delete mode 100644 OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_dot_line.png delete mode 100644 OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_ic_autopilot.png delete mode 100644 OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_ic_autopilot_bg.png delete mode 100644 OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_ic_autopilot_bg_pressed.png delete mode 100644 OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_ic_autopilot_disable.png delete mode 100644 OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_ic_autopilot_failed.png delete mode 100644 OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_ic_autopilot_loading.png delete mode 100644 OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_ic_autopilot_success.png delete mode 100644 OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_icon_arrived_station.png delete mode 100644 OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_icon_arriving_station.png delete mode 100644 OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_light_green_nor.png delete mode 100644 OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_light_red_nor.png delete mode 100644 OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_lightyellow_nor.png delete mode 100644 OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_masking.png delete mode 100644 OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_navi_arrow_icon.png delete mode 100755 OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_navi_direction_icon.png delete mode 100644 OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_navi_icon.png delete mode 100644 OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_navi_line_icon.png delete mode 100644 OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_out_btn.png delete mode 100644 OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_personal_btn.png delete mode 100644 OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_setting_btn_bg.png delete mode 100644 OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_speed_bg.png delete mode 100644 OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_speed_selector.xml delete mode 100755 OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_switch_map_long.png delete mode 100755 OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_switch_map_medium.png create mode 100644 OCH/mogo-och-taxi/src/main/res/drawable/shape_size_grab_order_bt.xml create mode 100644 OCH/mogo-och-taxi/src/main/res/drawable/shape_size_operation_back.xml create mode 100644 OCH/mogo-och-taxi/src/main/res/drawable/shape_size_operation_out.xml create mode 100644 OCH/mogo-och-taxi/src/main/res/drawable/shape_size_see_all_order.xml create mode 100644 OCH/mogo-och-taxi/src/main/res/drawable/shape_size_taxi_selected_btn.xml create mode 100644 OCH/mogo-och-taxi/src/main/res/drawable/shape_size_taxi_unselected_btn.xml rename OCH/mogo-och-taxi/src/main/res/{drawable-xhdpi-2560x1440 => drawable}/taxi_autopilot_bg_selector.xml (100%) rename OCH/mogo-och-taxi/src/main/res/{drawable-xhdpi-2560x1440 => drawable}/taxi_speed_selector.xml (100%) delete mode 100644 OCH/mogo-och-taxi/src/main/res/values-sw320dp/dimens.xml delete mode 100644 OCH/mogo-och-taxi/src/main/res/values-xhdpi-2560x1440/dimens.xml delete mode 100644 core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/amap_bus_corner.png delete mode 100644 core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/amap_bus_smooth_route.png delete mode 100644 core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/amap_custom_smooth_route.png delete mode 100644 core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/arrow_arrived_img.png delete mode 100644 core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/count_bg.png delete mode 100644 core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/map_bus_icon.png delete mode 100644 core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/map_car_icon.png delete mode 100644 core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_border_north.png delete mode 100644 core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_my_location_logo.png delete mode 100644 core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/taxi_map_arrow_arrived.png delete mode 100644 core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/taxi_map_arrow_un_arrive.png delete mode 100755 core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/video_icon_left.png delete mode 100644 core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/video_icon_right.png rename core/function-impl/mogo-core-function-map/src/main/res/{drawable-xhdpi-2560x1440 => drawable-xhdpi}/amap_custom_corner.png (100%) rename core/function-impl/mogo-core-function-map/src/main/res/{drawable-xhdpi-2560x1440 => drawable-xhdpi}/amap_custom_pass_route.png (100%) rename core/function-impl/mogo-core-function-map/src/main/res/{drawable-xhdpi-2560x1440 => drawable-xhdpi}/amap_reset.png (100%) rename core/function-impl/mogo-core-function-map/src/main/res/{drawable-xhdpi-2560x1440 => drawable-xhdpi}/amap_reset_bus.png (100%) rename core/function-impl/mogo-core-function-map/src/main/res/{drawable-xhdpi-2560x1440 => drawable-xhdpi}/amap_reset_passenger.png (100%) rename core/function-impl/mogo-core-function-map/src/main/res/{drawable-xhdpi-2560x1440 => drawable-xhdpi}/custtexture_bad.png (100%) rename core/function-impl/mogo-core-function-map/src/main/res/{drawable-xhdpi-2560x1440 => drawable-xhdpi}/custtexture_grayred.png (100%) rename core/function-impl/mogo-core-function-map/src/main/res/{drawable-xhdpi-2560x1440 => drawable-xhdpi}/custtexture_green.png (100%) rename core/function-impl/mogo-core-function-map/src/main/res/{drawable-xhdpi-2560x1440 => drawable-xhdpi}/custtexture_no.png (100%) rename core/function-impl/mogo-core-function-map/src/main/res/{drawable-xhdpi-2560x1440 => drawable-xhdpi}/custtexture_slow.png (100%) rename core/function-impl/mogo-core-function-map/src/main/res/{drawable-xhdpi-2560x1440 => drawable-xhdpi}/jianbian.png (100%) rename core/function-impl/mogo-core-function-map/src/main/res/{drawable-xhdpi-2560x1440 => drawable-xhdpi}/module_small_map_navi_direction.png (100%) rename core/function-impl/mogo-core-function-map/src/main/res/{drawable-xhdpi-2560x1440 => drawable-xhdpi}/module_small_map_view_dir_end.png (100%) rename core/function-impl/mogo-core-function-map/src/main/res/{drawable-xhdpi-2560x1440 => drawable-xhdpi}/module_small_map_view_dir_pass_route.png (100%) rename core/function-impl/mogo-core-function-map/src/main/res/{drawable-xhdpi-2560x1440 => drawable-xhdpi}/module_small_map_view_dir_start.png (100%) rename core/function-impl/mogo-core-function-map/src/main/res/{drawable-xhdpi-2560x1440 => drawable-xhdpi}/module_small_map_view_end.png (100%) rename core/function-impl/mogo-core-function-map/src/main/res/{drawable-xhdpi-2560x1440 => drawable-xhdpi}/module_small_map_view_start.png (100%) delete mode 100644 core/function-impl/mogo-core-function-notice/src/main/res/layout/module_push_item_vertical.xml delete mode 100644 core/function-impl/mogo-core-function-v2x/src/main/res/layout/dialog_v2x_seek_help.xml delete mode 100644 core/function-impl/mogo-core-function-v2x/src/main/res/layout/footer_nomore_view.xml delete mode 100644 core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_event_detail.xml delete mode 100644 core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_event_detail_vr.xml delete mode 100644 core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_event_share_load_more.xml delete mode 100644 core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_event_ugc.xml delete mode 100644 core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_fatigue_driving.xml delete mode 100644 core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_fault_help.xml delete mode 100644 core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_fault_help_vr.xml delete mode 100644 core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_illegal_parking.xml delete mode 100644 core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_illegal_parking_vr.xml delete mode 100644 core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_live_video.xml delete mode 100644 core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_live_video_vr.xml delete mode 100644 core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_push_event_detail.xml delete mode 100644 core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_push_live_video.xml delete mode 100644 core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_push_live_video_vr.xml delete mode 100644 core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_recommend_route.xml delete mode 100644 core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_road_live_car_detail.xml delete mode 100644 core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_road_live_car_detail_vr.xml delete mode 100644 core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_scennario_history.xml delete mode 100644 core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml delete mode 100644 core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_see_crossroad_live_video.xml delete mode 100644 core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_see_frontcar_live_video.xml delete mode 100644 core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_see_frontcar_live_video_vr.xml delete mode 100644 core/function-impl/mogo-core-function-v2x/src/main/res/layout/view_v2x_optimal_speed_marker.xml delete mode 100644 core/function-impl/mogo-core-function-v2x/src/main/res/layout/vr_window_top_tips.xml delete mode 100644 core/function-impl/mogo-core-function-v2x/src/main/res/layout/window_animation.xml delete mode 100644 core/function-impl/mogo-core-function-v2x/src/main/res/layout/window_carforhelp_detail.xml delete mode 100644 core/function-impl/mogo-core-function-v2x/src/main/res/layout/window_fault_help.xml delete mode 100644 core/function-impl/mogo-core-function-v2x/src/main/res/layout/window_push_event_detail.xml delete mode 100644 core/function-impl/mogo-core-function-v2x/src/main/res/layout/window_road_video_layout.xml delete mode 100644 core/function-impl/mogo-core-function-v2x/src/main/res/layout/window_road_video_layout_vr.xml delete mode 100644 core/function-impl/mogo-core-function-v2x/src/main/res/layout/window_see_carlive_video.xml delete mode 100644 core/function-impl/mogo-core-function-v2x/src/main/res/layout/window_see_carlive_video_vr.xml delete mode 100644 core/function-impl/mogo-core-function-v2x/src/main/res/layout/window_see_crossroadlive_video.xml delete mode 100644 core/function-impl/mogo-core-function-v2x/src/main/res/layout/window_simple_obu_event_detail_vr.xml delete mode 100644 core/function-impl/mogo-core-function-v2x/src/main/res/layout/window_test_console.xml delete mode 100644 modules/mogo-module-common/src/main/res/layout/module_commons_layout_car.xml 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 59722ee7ff..be1ab181c1 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 @@ -76,8 +76,8 @@ app:layout_constraintLeft_toLeftOf="@+id/bus_p_cur_station_title" app:layout_constraintTop_toBottomOf="@+id/bus_p_cur_station_title" /> @@ -206,7 +206,7 @@ android:layout_height="wrap_content" android:background="#f00" android:text="Disable" - android:textSize="30sp" + android:textSize="@dimen/dp_60" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -216,7 +216,7 @@ android:layout_height="wrap_content" android:background="#0f0" android:text="Enable" - android:textSize="30sp" + android:textSize="@dimen/dp_60" app:layout_constraintRight_toRightOf="@id/btnAutopilotDisable" app:layout_constraintTop_toBottomOf="@id/btnAutopilotDisable" /> @@ -226,7 +226,7 @@ android:layout_height="wrap_content" android:background="#00f" android:text="Running" - android:textSize="30sp" + android:textSize="@dimen/dp_60" app:layout_constraintRight_toRightOf="@id/btnAutopilotDisable" app:layout_constraintTop_toBottomOf="@id/btnAutopilotEnable" /> @@ -236,7 +236,7 @@ android:layout_height="wrap_content" android:background="#f00" android:text="Arrived" - android:textSize="30sp" + android:textSize="@dimen/dp_60" app:layout_constraintRight_toRightOf="@id/btnAutopilotDisable" app:layout_constraintTop_toBottomOf="@id/btnAutopilotRunning" />