diff --git a/OCH/bus/driver/src/main/res/drawable/bus_autopilot_status_bg_check.png b/OCH/bus/driver/src/main/res/drawable-nodpi/bus_autopilot_status_bg_check.png
similarity index 100%
rename from OCH/bus/driver/src/main/res/drawable/bus_autopilot_status_bg_check.png
rename to OCH/bus/driver/src/main/res/drawable-nodpi/bus_autopilot_status_bg_check.png
diff --git a/OCH/bus/driver/src/main/res/drawable/bus_autopilot_status_bg_nor.png b/OCH/bus/driver/src/main/res/drawable-nodpi/bus_autopilot_status_bg_nor.png
similarity index 100%
rename from OCH/bus/driver/src/main/res/drawable/bus_autopilot_status_bg_nor.png
rename to OCH/bus/driver/src/main/res/drawable-nodpi/bus_autopilot_status_bg_nor.png
diff --git a/OCH/bus/driver/src/main/res/drawable-xhdpi/bus_base_icon_in_autopilot.png b/OCH/bus/driver/src/main/res/drawable-nodpi/bus_base_icon_in_autopilot.png
similarity index 100%
rename from OCH/bus/driver/src/main/res/drawable-xhdpi/bus_base_icon_in_autopilot.png
rename to OCH/bus/driver/src/main/res/drawable-nodpi/bus_base_icon_in_autopilot.png
diff --git a/OCH/bus/driver/src/main/res/drawable-xhdpi/bus_base_icon_not_in_autopilot.png b/OCH/bus/driver/src/main/res/drawable-nodpi/bus_base_icon_not_in_autopilot.png
similarity index 100%
rename from OCH/bus/driver/src/main/res/drawable-xhdpi/bus_base_icon_not_in_autopilot.png
rename to OCH/bus/driver/src/main/res/drawable-nodpi/bus_base_icon_not_in_autopilot.png
diff --git a/OCH/bus/driver/src/main/res/drawable-xhdpi/bus_base_notice_box_bg.9.png b/OCH/bus/driver/src/main/res/drawable-nodpi/bus_base_notice_box_bg.9.png
similarity index 100%
rename from OCH/bus/driver/src/main/res/drawable-xhdpi/bus_base_notice_box_bg.9.png
rename to OCH/bus/driver/src/main/res/drawable-nodpi/bus_base_notice_box_bg.9.png
diff --git a/OCH/bus/driver/src/main/res/drawable-xhdpi/bus_disable_autopilot_icon.png b/OCH/bus/driver/src/main/res/drawable-nodpi/bus_disable_autopilot_icon.png
similarity index 100%
rename from OCH/bus/driver/src/main/res/drawable-xhdpi/bus_disable_autopilot_icon.png
rename to OCH/bus/driver/src/main/res/drawable-nodpi/bus_disable_autopilot_icon.png
diff --git a/OCH/bus/driver/src/main/res/drawable-xhdpi/bus_dot_line.png b/OCH/bus/driver/src/main/res/drawable-nodpi/bus_dot_line.png
similarity index 100%
rename from OCH/bus/driver/src/main/res/drawable-xhdpi/bus_dot_line.png
rename to OCH/bus/driver/src/main/res/drawable-nodpi/bus_dot_line.png
diff --git a/OCH/bus/driver/src/main/res/drawable-xhdpi/bus_ic_autopilot.png b/OCH/bus/driver/src/main/res/drawable-nodpi/bus_ic_autopilot.png
similarity index 100%
rename from OCH/bus/driver/src/main/res/drawable-xhdpi/bus_ic_autopilot.png
rename to OCH/bus/driver/src/main/res/drawable-nodpi/bus_ic_autopilot.png
diff --git a/OCH/bus/driver/src/main/res/drawable-xhdpi/bus_icon_arrived_station.png b/OCH/bus/driver/src/main/res/drawable-nodpi/bus_icon_arrived_station.png
similarity index 100%
rename from OCH/bus/driver/src/main/res/drawable-xhdpi/bus_icon_arrived_station.png
rename to OCH/bus/driver/src/main/res/drawable-nodpi/bus_icon_arrived_station.png
diff --git a/OCH/bus/driver/src/main/res/drawable-xhdpi/bus_icon_arriving_station.png b/OCH/bus/driver/src/main/res/drawable-nodpi/bus_icon_arriving_station.png
similarity index 100%
rename from OCH/bus/driver/src/main/res/drawable-xhdpi/bus_icon_arriving_station.png
rename to OCH/bus/driver/src/main/res/drawable-nodpi/bus_icon_arriving_station.png
diff --git a/OCH/bus/driver/src/main/res/drawable-xhdpi/bus_icon_not_arrive_station.png b/OCH/bus/driver/src/main/res/drawable-nodpi/bus_icon_not_arrive_station.png
similarity index 100%
rename from OCH/bus/driver/src/main/res/drawable-xhdpi/bus_icon_not_arrive_station.png
rename to OCH/bus/driver/src/main/res/drawable-nodpi/bus_icon_not_arrive_station.png
diff --git a/OCH/bus/driver/src/main/res/drawable-xhdpi/bus_light_green_nor.png b/OCH/bus/driver/src/main/res/drawable-nodpi/bus_light_green_nor.png
similarity index 100%
rename from OCH/bus/driver/src/main/res/drawable-xhdpi/bus_light_green_nor.png
rename to OCH/bus/driver/src/main/res/drawable-nodpi/bus_light_green_nor.png
diff --git a/OCH/bus/driver/src/main/res/drawable-xhdpi/bus_light_red_nor.png b/OCH/bus/driver/src/main/res/drawable-nodpi/bus_light_red_nor.png
similarity index 100%
rename from OCH/bus/driver/src/main/res/drawable-xhdpi/bus_light_red_nor.png
rename to OCH/bus/driver/src/main/res/drawable-nodpi/bus_light_red_nor.png
diff --git a/OCH/bus/driver/src/main/res/drawable-xhdpi/bus_lightyellow_nor.png b/OCH/bus/driver/src/main/res/drawable-nodpi/bus_lightyellow_nor.png
similarity index 100%
rename from OCH/bus/driver/src/main/res/drawable-xhdpi/bus_lightyellow_nor.png
rename to OCH/bus/driver/src/main/res/drawable-nodpi/bus_lightyellow_nor.png
diff --git a/OCH/bus/driver/src/main/res/drawable-xhdpi/bus_line_panel_bg.png b/OCH/bus/driver/src/main/res/drawable-nodpi/bus_line_panel_bg.png
similarity index 100%
rename from OCH/bus/driver/src/main/res/drawable-xhdpi/bus_line_panel_bg.png
rename to OCH/bus/driver/src/main/res/drawable-nodpi/bus_line_panel_bg.png
diff --git a/OCH/bus/driver/src/main/res/drawable-xhdpi/bus_line_panel_bg_1.png b/OCH/bus/driver/src/main/res/drawable-nodpi/bus_line_panel_bg_1.png
similarity index 100%
rename from OCH/bus/driver/src/main/res/drawable-xhdpi/bus_line_panel_bg_1.png
rename to OCH/bus/driver/src/main/res/drawable-nodpi/bus_line_panel_bg_1.png
diff --git a/OCH/bus/driver/src/main/res/drawable-xhdpi/bus_line_task_arrow.png b/OCH/bus/driver/src/main/res/drawable-nodpi/bus_line_task_arrow.png
similarity index 100%
rename from OCH/bus/driver/src/main/res/drawable-xhdpi/bus_line_task_arrow.png
rename to OCH/bus/driver/src/main/res/drawable-nodpi/bus_line_task_arrow.png
diff --git a/OCH/bus/driver/src/main/res/drawable-xhdpi/bus_loading_autopilot_icon.png b/OCH/bus/driver/src/main/res/drawable-nodpi/bus_loading_autopilot_icon.png
similarity index 100%
rename from OCH/bus/driver/src/main/res/drawable-xhdpi/bus_loading_autopilot_icon.png
rename to OCH/bus/driver/src/main/res/drawable-nodpi/bus_loading_autopilot_icon.png
diff --git a/OCH/bus/driver/src/main/res/drawable-xhdpi/bus_no_line_icon.png b/OCH/bus/driver/src/main/res/drawable-nodpi/bus_no_line_icon.png
similarity index 100%
rename from OCH/bus/driver/src/main/res/drawable-xhdpi/bus_no_line_icon.png
rename to OCH/bus/driver/src/main/res/drawable-nodpi/bus_no_line_icon.png
diff --git a/OCH/bus/driver/src/main/res/drawable-xhdpi/bus_och_dot_line.png b/OCH/bus/driver/src/main/res/drawable-nodpi/bus_och_dot_line.png
similarity index 100%
rename from OCH/bus/driver/src/main/res/drawable-xhdpi/bus_och_dot_line.png
rename to OCH/bus/driver/src/main/res/drawable-nodpi/bus_och_dot_line.png
diff --git a/OCH/bus/driver/src/main/res/drawable-xhdpi/bus_operation_status_bg.png b/OCH/bus/driver/src/main/res/drawable-nodpi/bus_operation_status_bg.png
similarity index 100%
rename from OCH/bus/driver/src/main/res/drawable-xhdpi/bus_operation_status_bg.png
rename to OCH/bus/driver/src/main/res/drawable-nodpi/bus_operation_status_bg.png
diff --git a/OCH/bus/driver/src/main/res/drawable-xhdpi/bus_operation_status_select_bg.png b/OCH/bus/driver/src/main/res/drawable-nodpi/bus_operation_status_select_bg.png
similarity index 100%
rename from OCH/bus/driver/src/main/res/drawable-xhdpi/bus_operation_status_select_bg.png
rename to OCH/bus/driver/src/main/res/drawable-nodpi/bus_operation_status_select_bg.png
diff --git a/OCH/bus/driver/src/main/res/drawable-xhdpi/bus_right_autopilot_icon.png b/OCH/bus/driver/src/main/res/drawable-nodpi/bus_right_autopilot_icon.png
similarity index 100%
rename from OCH/bus/driver/src/main/res/drawable-xhdpi/bus_right_autopilot_icon.png
rename to OCH/bus/driver/src/main/res/drawable-nodpi/bus_right_autopilot_icon.png
diff --git a/OCH/bus/driver/src/main/res/drawable-xhdpi/bus_selected_btn.png b/OCH/bus/driver/src/main/res/drawable-nodpi/bus_selected_btn.png
similarity index 100%
rename from OCH/bus/driver/src/main/res/drawable-xhdpi/bus_selected_btn.png
rename to OCH/bus/driver/src/main/res/drawable-nodpi/bus_selected_btn.png
diff --git a/OCH/bus/driver/src/main/res/drawable-xhdpi/bus_setting_btn_bg.png b/OCH/bus/driver/src/main/res/drawable-nodpi/bus_setting_btn_bg.png
similarity index 100%
rename from OCH/bus/driver/src/main/res/drawable-xhdpi/bus_setting_btn_bg.png
rename to OCH/bus/driver/src/main/res/drawable-nodpi/bus_setting_btn_bg.png
diff --git a/OCH/bus/driver/src/main/res/drawable-xhdpi/bus_switch_line_close.png b/OCH/bus/driver/src/main/res/drawable-nodpi/bus_switch_line_close.png
similarity index 100%
rename from OCH/bus/driver/src/main/res/drawable-xhdpi/bus_switch_line_close.png
rename to OCH/bus/driver/src/main/res/drawable-nodpi/bus_switch_line_close.png
diff --git a/OCH/bus/driver/src/main/res/drawable-xhdpi/bus_switch_map_long.png b/OCH/bus/driver/src/main/res/drawable-nodpi/bus_switch_map_long.png
similarity index 100%
rename from OCH/bus/driver/src/main/res/drawable-xhdpi/bus_switch_map_long.png
rename to OCH/bus/driver/src/main/res/drawable-nodpi/bus_switch_map_long.png
diff --git a/OCH/bus/driver/src/main/res/drawable-xhdpi/bus_switch_map_medium.png b/OCH/bus/driver/src/main/res/drawable-nodpi/bus_switch_map_medium.png
similarity index 100%
rename from OCH/bus/driver/src/main/res/drawable-xhdpi/bus_switch_map_medium.png
rename to OCH/bus/driver/src/main/res/drawable-nodpi/bus_switch_map_medium.png
diff --git a/OCH/bus/driver/src/main/res/drawable-xhdpi/bus_unselect_btn.png b/OCH/bus/driver/src/main/res/drawable-nodpi/bus_unselect_btn.png
similarity index 100%
rename from OCH/bus/driver/src/main/res/drawable-xhdpi/bus_unselect_btn.png
rename to OCH/bus/driver/src/main/res/drawable-nodpi/bus_unselect_btn.png
diff --git a/OCH/bus/driver/src/main/res/drawable-xhdpi/bus_wrong_autopilot_icon.png b/OCH/bus/driver/src/main/res/drawable-nodpi/bus_wrong_autopilot_icon.png
similarity index 100%
rename from OCH/bus/driver/src/main/res/drawable-xhdpi/bus_wrong_autopilot_icon.png
rename to OCH/bus/driver/src/main/res/drawable-nodpi/bus_wrong_autopilot_icon.png
diff --git a/OCH/bus/driver/src/main/res/drawable-xhdpi/end_maker_icon.png b/OCH/bus/driver/src/main/res/drawable-nodpi/end_maker_icon.png
similarity index 100%
rename from OCH/bus/driver/src/main/res/drawable-xhdpi/end_maker_icon.png
rename to OCH/bus/driver/src/main/res/drawable-nodpi/end_maker_icon.png
diff --git a/OCH/bus/driver/src/main/res/drawable-xhdpi/icon_ai_collect.png b/OCH/bus/driver/src/main/res/drawable-nodpi/icon_ai_collect.png
similarity index 100%
rename from OCH/bus/driver/src/main/res/drawable-xhdpi/icon_ai_collect.png
rename to OCH/bus/driver/src/main/res/drawable-nodpi/icon_ai_collect.png
diff --git a/OCH/bus/driver/src/main/res/drawable-xhdpi/icon_ai_normal.png b/OCH/bus/driver/src/main/res/drawable-nodpi/icon_ai_normal.png
similarity index 100%
rename from OCH/bus/driver/src/main/res/drawable-xhdpi/icon_ai_normal.png
rename to OCH/bus/driver/src/main/res/drawable-nodpi/icon_ai_normal.png
diff --git a/OCH/bus/driver/src/main/res/drawable-xhdpi/icon_ai_select.png b/OCH/bus/driver/src/main/res/drawable-nodpi/icon_ai_select.png
similarity index 100%
rename from OCH/bus/driver/src/main/res/drawable-xhdpi/icon_ai_select.png
rename to OCH/bus/driver/src/main/res/drawable-nodpi/icon_ai_select.png
diff --git a/OCH/bus/driver/src/main/res/drawable-xhdpi/icon_arrow_blue_bus.png b/OCH/bus/driver/src/main/res/drawable-nodpi/icon_arrow_blue_bus.png
similarity index 100%
rename from OCH/bus/driver/src/main/res/drawable-xhdpi/icon_arrow_blue_bus.png
rename to OCH/bus/driver/src/main/res/drawable-nodpi/icon_arrow_blue_bus.png
diff --git a/OCH/bus/driver/src/main/res/drawable-xhdpi/icon_arrow_green_bus.png b/OCH/bus/driver/src/main/res/drawable-nodpi/icon_arrow_green_bus.png
similarity index 100%
rename from OCH/bus/driver/src/main/res/drawable-xhdpi/icon_arrow_green_bus.png
rename to OCH/bus/driver/src/main/res/drawable-nodpi/icon_arrow_green_bus.png
diff --git a/OCH/bus/driver/src/main/res/drawable-xhdpi/icon_arrow_grey_bus.png b/OCH/bus/driver/src/main/res/drawable-nodpi/icon_arrow_grey_bus.png
similarity index 100%
rename from OCH/bus/driver/src/main/res/drawable-xhdpi/icon_arrow_grey_bus.png
rename to OCH/bus/driver/src/main/res/drawable-nodpi/icon_arrow_grey_bus.png
diff --git a/OCH/bus/driver/src/main/res/drawable-xhdpi/icon_bad_case.png b/OCH/bus/driver/src/main/res/drawable-nodpi/icon_bad_case.png
similarity index 100%
rename from OCH/bus/driver/src/main/res/drawable-xhdpi/icon_bad_case.png
rename to OCH/bus/driver/src/main/res/drawable-nodpi/icon_bad_case.png
diff --git a/OCH/bus/driver/src/main/res/drawable-xhdpi/icon_bad_case_normal.png b/OCH/bus/driver/src/main/res/drawable-nodpi/icon_bad_case_normal.png
similarity index 100%
rename from OCH/bus/driver/src/main/res/drawable-xhdpi/icon_bad_case_normal.png
rename to OCH/bus/driver/src/main/res/drawable-nodpi/icon_bad_case_normal.png
diff --git a/OCH/bus/driver/src/main/res/drawable-xhdpi/icon_bad_case_select.png b/OCH/bus/driver/src/main/res/drawable-nodpi/icon_bad_case_select.png
similarity index 100%
rename from OCH/bus/driver/src/main/res/drawable-xhdpi/icon_bad_case_select.png
rename to OCH/bus/driver/src/main/res/drawable-nodpi/icon_bad_case_select.png
diff --git a/OCH/bus/driver/src/main/res/drawable-xhdpi/icon_no_bus_line.png b/OCH/bus/driver/src/main/res/drawable-nodpi/icon_no_bus_line.png
similarity index 100%
rename from OCH/bus/driver/src/main/res/drawable-xhdpi/icon_no_bus_line.png
rename to OCH/bus/driver/src/main/res/drawable-nodpi/icon_no_bus_line.png
diff --git a/OCH/bus/driver/src/main/res/drawable-xhdpi/icon_point_blue_bus.png b/OCH/bus/driver/src/main/res/drawable-nodpi/icon_point_blue_bus.png
similarity index 100%
rename from OCH/bus/driver/src/main/res/drawable-xhdpi/icon_point_blue_bus.png
rename to OCH/bus/driver/src/main/res/drawable-nodpi/icon_point_blue_bus.png
diff --git a/OCH/bus/driver/src/main/res/drawable-xhdpi/icon_point_green_bus.png b/OCH/bus/driver/src/main/res/drawable-nodpi/icon_point_green_bus.png
similarity index 100%
rename from OCH/bus/driver/src/main/res/drawable-xhdpi/icon_point_green_bus.png
rename to OCH/bus/driver/src/main/res/drawable-nodpi/icon_point_green_bus.png
diff --git a/OCH/bus/driver/src/main/res/drawable-xhdpi/icon_point_grey_bus.png b/OCH/bus/driver/src/main/res/drawable-nodpi/icon_point_grey_bus.png
similarity index 100%
rename from OCH/bus/driver/src/main/res/drawable-xhdpi/icon_point_grey_bus.png
rename to OCH/bus/driver/src/main/res/drawable-nodpi/icon_point_grey_bus.png
diff --git a/OCH/bus/driver/src/main/res/drawable-xhdpi/icon_station_start_end.png b/OCH/bus/driver/src/main/res/drawable-nodpi/icon_station_start_end.png
similarity index 100%
rename from OCH/bus/driver/src/main/res/drawable-xhdpi/icon_station_start_end.png
rename to OCH/bus/driver/src/main/res/drawable-nodpi/icon_station_start_end.png
diff --git a/OCH/bus/driver/src/main/res/drawable-xhdpi/no_order_data.png b/OCH/bus/driver/src/main/res/drawable-nodpi/no_order_data.png
similarity index 100%
rename from OCH/bus/driver/src/main/res/drawable-xhdpi/no_order_data.png
rename to OCH/bus/driver/src/main/res/drawable-nodpi/no_order_data.png
diff --git a/OCH/bus/driver/src/main/res/drawable-xhdpi/pingxingjiashi.png b/OCH/bus/driver/src/main/res/drawable-nodpi/pingxingjiashi.png
similarity index 100%
rename from OCH/bus/driver/src/main/res/drawable-xhdpi/pingxingjiashi.png
rename to OCH/bus/driver/src/main/res/drawable-nodpi/pingxingjiashi.png
diff --git a/OCH/bus/driver/src/main/res/drawable-xhdpi/press_start_status.png b/OCH/bus/driver/src/main/res/drawable-nodpi/press_start_status.png
similarity index 100%
rename from OCH/bus/driver/src/main/res/drawable-xhdpi/press_start_status.png
rename to OCH/bus/driver/src/main/res/drawable-nodpi/press_start_status.png
diff --git a/OCH/bus/driver/src/main/res/drawable-xhdpi/start_failure.png b/OCH/bus/driver/src/main/res/drawable-nodpi/start_failure.png
similarity index 100%
rename from OCH/bus/driver/src/main/res/drawable-xhdpi/start_failure.png
rename to OCH/bus/driver/src/main/res/drawable-nodpi/start_failure.png
diff --git a/OCH/bus/driver/src/main/res/drawable-xhdpi/start_maker_icon.png b/OCH/bus/driver/src/main/res/drawable-nodpi/start_maker_icon.png
similarity index 100%
rename from OCH/bus/driver/src/main/res/drawable-xhdpi/start_maker_icon.png
rename to OCH/bus/driver/src/main/res/drawable-nodpi/start_maker_icon.png
diff --git a/OCH/bus/driver/src/main/res/drawable-xhdpi/start_success.png b/OCH/bus/driver/src/main/res/drawable-nodpi/start_success.png
similarity index 100%
rename from OCH/bus/driver/src/main/res/drawable-xhdpi/start_success.png
rename to OCH/bus/driver/src/main/res/drawable-nodpi/start_success.png
diff --git a/OCH/bus/driver/src/main/res/drawable/bus_base_icon_in_autopilot.png b/OCH/bus/driver/src/main/res/drawable/bus_base_icon_in_autopilot.png
deleted file mode 100644
index 75c26c3d71..0000000000
Binary files a/OCH/bus/driver/src/main/res/drawable/bus_base_icon_in_autopilot.png and /dev/null differ
diff --git a/OCH/bus/driver/src/main/res/drawable/bus_base_icon_not_in_autopilot.png b/OCH/bus/driver/src/main/res/drawable/bus_base_icon_not_in_autopilot.png
deleted file mode 100644
index 927296d690..0000000000
Binary files a/OCH/bus/driver/src/main/res/drawable/bus_base_icon_not_in_autopilot.png and /dev/null differ
diff --git a/OCH/bus/driver/src/main/res/drawable/bus_base_notice_box_bg.9.png b/OCH/bus/driver/src/main/res/drawable/bus_base_notice_box_bg.9.png
deleted file mode 100644
index 8b4b579b56..0000000000
Binary files a/OCH/bus/driver/src/main/res/drawable/bus_base_notice_box_bg.9.png and /dev/null differ
diff --git a/OCH/bus/driver/src/main/res/drawable/bus_disable_autopilot_icon.png b/OCH/bus/driver/src/main/res/drawable/bus_disable_autopilot_icon.png
deleted file mode 100644
index 170f254cd1..0000000000
Binary files a/OCH/bus/driver/src/main/res/drawable/bus_disable_autopilot_icon.png and /dev/null differ
diff --git a/OCH/bus/driver/src/main/res/drawable/bus_dot_line.png b/OCH/bus/driver/src/main/res/drawable/bus_dot_line.png
deleted file mode 100644
index 186001352c..0000000000
Binary files a/OCH/bus/driver/src/main/res/drawable/bus_dot_line.png and /dev/null differ
diff --git a/OCH/bus/driver/src/main/res/drawable/bus_ic_autopilot.png b/OCH/bus/driver/src/main/res/drawable/bus_ic_autopilot.png
deleted file mode 100644
index be978145dc..0000000000
Binary files a/OCH/bus/driver/src/main/res/drawable/bus_ic_autopilot.png and /dev/null differ
diff --git a/OCH/bus/driver/src/main/res/drawable/bus_icon_arrived_station.png b/OCH/bus/driver/src/main/res/drawable/bus_icon_arrived_station.png
deleted file mode 100644
index 8a065b66dd..0000000000
Binary files a/OCH/bus/driver/src/main/res/drawable/bus_icon_arrived_station.png and /dev/null differ
diff --git a/OCH/bus/driver/src/main/res/drawable/bus_icon_arriving_station.png b/OCH/bus/driver/src/main/res/drawable/bus_icon_arriving_station.png
deleted file mode 100644
index 4ed57a0e30..0000000000
Binary files a/OCH/bus/driver/src/main/res/drawable/bus_icon_arriving_station.png and /dev/null differ
diff --git a/OCH/bus/driver/src/main/res/drawable/bus_icon_not_arrive_station.png b/OCH/bus/driver/src/main/res/drawable/bus_icon_not_arrive_station.png
deleted file mode 100644
index e0bb24c526..0000000000
Binary files a/OCH/bus/driver/src/main/res/drawable/bus_icon_not_arrive_station.png and /dev/null differ
diff --git a/OCH/bus/driver/src/main/res/drawable/bus_light_green_nor.png b/OCH/bus/driver/src/main/res/drawable/bus_light_green_nor.png
deleted file mode 100644
index bc9fed952d..0000000000
Binary files a/OCH/bus/driver/src/main/res/drawable/bus_light_green_nor.png and /dev/null differ
diff --git a/OCH/bus/driver/src/main/res/drawable/bus_light_red_nor.png b/OCH/bus/driver/src/main/res/drawable/bus_light_red_nor.png
deleted file mode 100644
index 8732508ded..0000000000
Binary files a/OCH/bus/driver/src/main/res/drawable/bus_light_red_nor.png and /dev/null differ
diff --git a/OCH/bus/driver/src/main/res/drawable/bus_lightyellow_nor.png b/OCH/bus/driver/src/main/res/drawable/bus_lightyellow_nor.png
deleted file mode 100644
index bae01408fd..0000000000
Binary files a/OCH/bus/driver/src/main/res/drawable/bus_lightyellow_nor.png and /dev/null differ
diff --git a/OCH/bus/driver/src/main/res/drawable/bus_line_panel_bg.png b/OCH/bus/driver/src/main/res/drawable/bus_line_panel_bg.png
deleted file mode 100755
index 3166d20e37..0000000000
Binary files a/OCH/bus/driver/src/main/res/drawable/bus_line_panel_bg.png and /dev/null differ
diff --git a/OCH/bus/driver/src/main/res/drawable/bus_line_panel_bg_1.png b/OCH/bus/driver/src/main/res/drawable/bus_line_panel_bg_1.png
deleted file mode 100755
index 09a9c252da..0000000000
Binary files a/OCH/bus/driver/src/main/res/drawable/bus_line_panel_bg_1.png and /dev/null differ
diff --git a/OCH/bus/driver/src/main/res/drawable/bus_loading_autopilot_icon.png b/OCH/bus/driver/src/main/res/drawable/bus_loading_autopilot_icon.png
deleted file mode 100644
index f21a1081f1..0000000000
Binary files a/OCH/bus/driver/src/main/res/drawable/bus_loading_autopilot_icon.png and /dev/null differ
diff --git a/OCH/bus/driver/src/main/res/drawable/bus_och_dot_line.png b/OCH/bus/driver/src/main/res/drawable/bus_och_dot_line.png
deleted file mode 100644
index a720a532ea..0000000000
Binary files a/OCH/bus/driver/src/main/res/drawable/bus_och_dot_line.png and /dev/null differ
diff --git a/OCH/bus/driver/src/main/res/drawable/bus_right_autopilot_icon.png b/OCH/bus/driver/src/main/res/drawable/bus_right_autopilot_icon.png
deleted file mode 100644
index cc2b18083d..0000000000
Binary files a/OCH/bus/driver/src/main/res/drawable/bus_right_autopilot_icon.png and /dev/null differ
diff --git a/OCH/bus/driver/src/main/res/drawable/bus_selected_btn.png b/OCH/bus/driver/src/main/res/drawable/bus_selected_btn.png
deleted file mode 100644
index 3f05565483..0000000000
Binary files a/OCH/bus/driver/src/main/res/drawable/bus_selected_btn.png and /dev/null differ
diff --git a/OCH/bus/driver/src/main/res/drawable/bus_setting_btn_bg.png b/OCH/bus/driver/src/main/res/drawable/bus_setting_btn_bg.png
deleted file mode 100644
index ba41bf3a53..0000000000
Binary files a/OCH/bus/driver/src/main/res/drawable/bus_setting_btn_bg.png and /dev/null differ
diff --git a/OCH/bus/driver/src/main/res/drawable/bus_switch_line_close.png b/OCH/bus/driver/src/main/res/drawable/bus_switch_line_close.png
deleted file mode 100644
index 370b61de38..0000000000
Binary files a/OCH/bus/driver/src/main/res/drawable/bus_switch_line_close.png and /dev/null differ
diff --git a/OCH/bus/driver/src/main/res/drawable/bus_switch_map_long.png b/OCH/bus/driver/src/main/res/drawable/bus_switch_map_long.png
deleted file mode 100755
index cf3e5a3778..0000000000
Binary files a/OCH/bus/driver/src/main/res/drawable/bus_switch_map_long.png and /dev/null differ
diff --git a/OCH/bus/driver/src/main/res/drawable/bus_switch_map_medium.png b/OCH/bus/driver/src/main/res/drawable/bus_switch_map_medium.png
deleted file mode 100755
index bdc2725468..0000000000
Binary files a/OCH/bus/driver/src/main/res/drawable/bus_switch_map_medium.png and /dev/null differ
diff --git a/OCH/bus/driver/src/main/res/drawable/bus_unselect_btn.png b/OCH/bus/driver/src/main/res/drawable/bus_unselect_btn.png
deleted file mode 100644
index 0114bb4f2b..0000000000
Binary files a/OCH/bus/driver/src/main/res/drawable/bus_unselect_btn.png and /dev/null differ
diff --git a/OCH/bus/driver/src/main/res/drawable/bus_wrong_autopilot_icon.png b/OCH/bus/driver/src/main/res/drawable/bus_wrong_autopilot_icon.png
deleted file mode 100644
index 0c8988acb3..0000000000
Binary files a/OCH/bus/driver/src/main/res/drawable/bus_wrong_autopilot_icon.png and /dev/null differ
diff --git a/OCH/bus/driver/src/main/res/drawable/end_maker_icon.png b/OCH/bus/driver/src/main/res/drawable/end_maker_icon.png
deleted file mode 100755
index 8acf113151..0000000000
Binary files a/OCH/bus/driver/src/main/res/drawable/end_maker_icon.png and /dev/null differ
diff --git a/OCH/bus/driver/src/main/res/drawable/icon_ai_normal.png b/OCH/bus/driver/src/main/res/drawable/icon_ai_normal.png
deleted file mode 100755
index e98738b192..0000000000
Binary files a/OCH/bus/driver/src/main/res/drawable/icon_ai_normal.png and /dev/null differ
diff --git a/OCH/bus/driver/src/main/res/drawable/icon_ai_select.png b/OCH/bus/driver/src/main/res/drawable/icon_ai_select.png
deleted file mode 100755
index d3e0107c02..0000000000
Binary files a/OCH/bus/driver/src/main/res/drawable/icon_ai_select.png and /dev/null differ
diff --git a/OCH/bus/driver/src/main/res/drawable/icon_arrow_blue_bus.png b/OCH/bus/driver/src/main/res/drawable/icon_arrow_blue_bus.png
deleted file mode 100755
index 026c36086f..0000000000
Binary files a/OCH/bus/driver/src/main/res/drawable/icon_arrow_blue_bus.png and /dev/null differ
diff --git a/OCH/bus/driver/src/main/res/drawable/icon_arrow_green_bus.png b/OCH/bus/driver/src/main/res/drawable/icon_arrow_green_bus.png
deleted file mode 100755
index 06bebc7013..0000000000
Binary files a/OCH/bus/driver/src/main/res/drawable/icon_arrow_green_bus.png and /dev/null differ
diff --git a/OCH/bus/driver/src/main/res/drawable/icon_arrow_grey_bus.png b/OCH/bus/driver/src/main/res/drawable/icon_arrow_grey_bus.png
deleted file mode 100755
index f4f9b2bca2..0000000000
Binary files a/OCH/bus/driver/src/main/res/drawable/icon_arrow_grey_bus.png and /dev/null differ
diff --git a/OCH/bus/driver/src/main/res/drawable/icon_bad_case_normal.png b/OCH/bus/driver/src/main/res/drawable/icon_bad_case_normal.png
deleted file mode 100755
index c0a978fc2b..0000000000
Binary files a/OCH/bus/driver/src/main/res/drawable/icon_bad_case_normal.png and /dev/null differ
diff --git a/OCH/bus/driver/src/main/res/drawable/icon_bad_case_select.png b/OCH/bus/driver/src/main/res/drawable/icon_bad_case_select.png
deleted file mode 100755
index ebacf3a11a..0000000000
Binary files a/OCH/bus/driver/src/main/res/drawable/icon_bad_case_select.png and /dev/null differ
diff --git a/OCH/bus/driver/src/main/res/drawable/icon_no_bus_line.png b/OCH/bus/driver/src/main/res/drawable/icon_no_bus_line.png
deleted file mode 100755
index fc20dca73c..0000000000
Binary files a/OCH/bus/driver/src/main/res/drawable/icon_no_bus_line.png and /dev/null differ
diff --git a/OCH/bus/driver/src/main/res/drawable/icon_point_blue_bus.png b/OCH/bus/driver/src/main/res/drawable/icon_point_blue_bus.png
deleted file mode 100755
index dc4c4f6f0d..0000000000
Binary files a/OCH/bus/driver/src/main/res/drawable/icon_point_blue_bus.png and /dev/null differ
diff --git a/OCH/bus/driver/src/main/res/drawable/icon_point_green_bus.png b/OCH/bus/driver/src/main/res/drawable/icon_point_green_bus.png
deleted file mode 100755
index ed3b871338..0000000000
Binary files a/OCH/bus/driver/src/main/res/drawable/icon_point_green_bus.png and /dev/null differ
diff --git a/OCH/bus/driver/src/main/res/drawable/icon_point_grey_bus.png b/OCH/bus/driver/src/main/res/drawable/icon_point_grey_bus.png
deleted file mode 100755
index d43e34bb26..0000000000
Binary files a/OCH/bus/driver/src/main/res/drawable/icon_point_grey_bus.png and /dev/null differ
diff --git a/OCH/bus/driver/src/main/res/drawable/icon_station_start_end.png b/OCH/bus/driver/src/main/res/drawable/icon_station_start_end.png
deleted file mode 100644
index 04580a8f0d..0000000000
Binary files a/OCH/bus/driver/src/main/res/drawable/icon_station_start_end.png and /dev/null differ
diff --git a/OCH/bus/driver/src/main/res/drawable/no_order_data.png b/OCH/bus/driver/src/main/res/drawable/no_order_data.png
deleted file mode 100644
index 0e61996d3f..0000000000
Binary files a/OCH/bus/driver/src/main/res/drawable/no_order_data.png and /dev/null differ
diff --git a/OCH/bus/driver/src/main/res/drawable/press_start_status.png b/OCH/bus/driver/src/main/res/drawable/press_start_status.png
deleted file mode 100755
index af32c20cb5..0000000000
Binary files a/OCH/bus/driver/src/main/res/drawable/press_start_status.png and /dev/null differ
diff --git a/OCH/bus/driver/src/main/res/drawable/start_failure.png b/OCH/bus/driver/src/main/res/drawable/start_failure.png
deleted file mode 100755
index 5737f93ad8..0000000000
Binary files a/OCH/bus/driver/src/main/res/drawable/start_failure.png and /dev/null differ
diff --git a/OCH/bus/driver/src/main/res/drawable/start_maker_icon.png b/OCH/bus/driver/src/main/res/drawable/start_maker_icon.png
deleted file mode 100644
index 9eca61e199..0000000000
Binary files a/OCH/bus/driver/src/main/res/drawable/start_maker_icon.png and /dev/null differ
diff --git a/OCH/bus/driver/src/main/res/drawable/start_success.png b/OCH/bus/driver/src/main/res/drawable/start_success.png
deleted file mode 100755
index 84246fd323..0000000000
Binary files a/OCH/bus/driver/src/main/res/drawable/start_success.png and /dev/null differ
diff --git a/OCH/bus/driver/src/main/res/layout/bug_fragment_och.xml b/OCH/bus/driver/src/main/res/layout/bug_fragment_och.xml
index 731ca8cc2b..c1a8d6958d 100644
--- a/OCH/bus/driver/src/main/res/layout/bug_fragment_och.xml
+++ b/OCH/bus/driver/src/main/res/layout/bug_fragment_och.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/module_och_bus_order_status_stationInfo"
-    android:layout_width="@dimen/module_mogo_och_autopilot_order_bg_width"
+    android:layout_width="@dimen/dp_616"
     android:layout_height="wrap_content"
     android:paddingBottom="@dimen/dp_28"
     android:background="@drawable/bus_line_panel_bg"
@@ -96,8 +96,9 @@
         android:id="@+id/switch_line_btn"
         android:layout_width="@dimen/bus_switch_line_btn_width_1"
         android:layout_height="@dimen/bus_switch_line_btn_height_1"
-        android:layout_marginLeft="@dimen/dp_28"
         android:layout_marginTop="@dimen/dp_40"
+        android:layout_marginStart="@dimen/dp_29"
+        android:layout_marginEnd ="@dimen/dp_27"
         app:layout_goneMarginTop="@dimen/dp_600"
         android:background="@drawable/bus_switch_line_btn"
         android:gravity="center"
diff --git a/OCH/bus/driver/src/main/res/layout/bus_base_fragment.xml b/OCH/bus/driver/src/main/res/layout/bus_base_fragment.xml
index da0491e98c..34ffb18583 100644
--- a/OCH/bus/driver/src/main/res/layout/bus_base_fragment.xml
+++ b/OCH/bus/driver/src/main/res/layout/bus_base_fragment.xml
@@ -37,7 +37,7 @@
 <!--    </FrameLayout>-->
     <FrameLayout
         android:id="@+id/fl_speed"
-        android:layout_width="@dimen/dp_624"
+        android:layout_width="@dimen/dp_618"
         android:layout_height="@dimen/dp_269"
         android:layout_marginStart="@dimen/dp_10"
         app:layout_constraintLeft_toLeftOf="parent"
@@ -170,9 +170,10 @@
 
     <RelativeLayout
         android:id="@+id/module_mogo_och_autopilot_status"
-        android:layout_width="@dimen/module_mogo_och_autopilot_status_bg_width"
-        android:layout_height="@dimen/module_mogo_och_autopilot_status_bg_height"
-        android:layout_marginLeft="@dimen/dp_13"
+        android:layout_width="@dimen/dp_616"
+        android:layout_height="@dimen/dp_180"
+        android:layout_marginStart="@dimen/dp_10"
+        android:layout_marginTop="@dimen/dp_m_1"
         android:background="@drawable/bus_autopilot_0_1_status_bg"
         android:gravity="center"
         app:layout_constraintLeft_toLeftOf="parent"
diff --git a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/errorview/ErrorInfoView.kt b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/errorview/ErrorInfoView.kt
index 69cb14b5fb..edb87f884e 100644
--- a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/errorview/ErrorInfoView.kt
+++ b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/errorview/ErrorInfoView.kt
@@ -112,7 +112,11 @@ class ErrorInfoView : ConstraintLayout, ErrorInfoViewModel.IErrorInfoViewCallbac
 
     fun showErrinfo(errorInfo: String) {
         actv_error_head?.text = errorInfo
-        actv_error_body?.text = "${FlavorUtils.getInfo()} 司机SN:${LoginLanPassengerSocket.driverSn}"
+        if(AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)){
+            actv_error_body?.text = FlavorUtils.getInfo()
+        }else  if(AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)){
+            actv_error_body?.text = "${FlavorUtils.getInfo()} 司机SN:${LoginLanPassengerSocket.driverSn}"
+        }
     }
 
 }
\ No newline at end of file