diff --git a/OCH/charter/driver/build.gradle b/OCH/charter/driver/build.gradle index 1a5c722e44..92631f28d4 100644 --- a/OCH/charter/driver/build.gradle +++ b/OCH/charter/driver/build.gradle @@ -63,6 +63,8 @@ dependencies { implementation project(":OCH:mogo-och-common-module") compileOnly project(":libraries:mogo-map") + + testImplementation 'junit:junit:4.12' } apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString() \ No newline at end of file diff --git a/OCH/charter/driver/src/driverm1/AndroidManifest.xml b/OCH/charter/driver/src/driverm1/AndroidManifest.xml deleted file mode 100644 index f9cccd9894..0000000000 --- a/OCH/charter/driver/src/driverm1/AndroidManifest.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/CharterProvider.kt b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/CharterProvider.kt index 10dea5a459..6c915054a7 100644 --- a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/CharterProvider.kt +++ b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/CharterProvider.kt @@ -6,6 +6,7 @@ import androidx.fragment.app.FragmentActivity import com.alibaba.android.arouter.facade.annotation.Route import com.magic.mogo.och.charter.constant.CharterConst import com.magic.mogo.och.charter.fragment.DriverM1Fragment +import com.mogo.eagle.core.function.api.base.IMoGoFunctionProvider import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d @@ -14,14 +15,12 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d * @date: 2023/2/22 */ @Route(path = CharterConst.PATH) -class CharterProvider: ICharterOCH{ +class CharterProvider: IMoGoFunctionProvider{ private var mActivity: FragmentActivity? = null private var mContainerId: Int? = 0 private var driverM1Fragment: Fragment? = null - override fun createCoverage(activity: FragmentActivity?, containerId: Int) {} - override fun createCoverage(fragmentActivity: FragmentActivity?, integer: Int?): Fragment? { this.mContainerId = integer this.mActivity = fragmentActivity diff --git a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/ICharterOCH.java b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/ICharterOCH.java deleted file mode 100644 index 2f8ecd62bb..0000000000 --- a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/ICharterOCH.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.magic.mogo.och.charter; - -import androidx.annotation.IdRes; -import androidx.fragment.app.FragmentActivity; - -import com.mogo.eagle.core.function.api.base.IMoGoFunctionProvider; - -/** - * @author congtaowang - * @since 2021/1/15 - * - * 网约车抽象接口 - */ -public interface ICharterOCH extends IMoGoFunctionProvider { - - /** - * 初始化网约车容器 - * - * @param activity - * @param containerId 容器ID - */ - void createCoverage(FragmentActivity activity, @IdRes int containerId); -} diff --git a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/base/CharterBaseFragment.kt b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/base/CharterBaseFragment.kt index 2953cd6fe3..04355d8e1d 100644 --- a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/base/CharterBaseFragment.kt +++ b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/base/CharterBaseFragment.kt @@ -93,7 +93,7 @@ abstract class CharterBaseFragment?>() : flStationPanelContainer = findViewById(R.id.module_mogo_och_station_panel_container) slidePanelView = findViewById(R.id.charter_slide_panel) - slidePanelView?.setText(resources.getString(R.string.back_car)) + slidePanelView?.setText(resources.getString(R.string.charter_back_car)) slidePanelView?.setOnSlidePanelMoveToEndListener(onSlideToEndListener) mTrafficDataView = findViewById(R.id.bus_arc) as TrafficDataView? @@ -108,14 +108,14 @@ abstract class CharterBaseFragment?>() : if (ui.currentMapVisualAngle.isLongSight) { ui.setLockMode(true) ui.changeMapVisualAngle(VisualAngleMode.MODE_MEDIUM_SIGHT, null) - mSwitchMapModeImage!!.setImageResource(R.drawable.bus_switch_map_medium) + mSwitchMapModeImage!!.setImageResource(R.drawable.charter_switch_map_medium) } else if (ui.currentMapVisualAngle.isMediumSight) { ui.setLockMode(false) ui.changeMapVisualAngle(VisualAngleMode.MODE_LONG_SIGHT, null) - mSwitchMapModeImage!!.setImageResource(R.drawable.bus_switch_map_long) + mSwitchMapModeImage!!.setImageResource(R.drawable.charter_switch_map_long) } else { ui.changeMapVisualAngle(VisualAngleMode.MODE_MEDIUM_SIGHT, null) - mSwitchMapModeImage!!.setImageResource(R.drawable.bus_switch_map_medium) + mSwitchMapModeImage!!.setImageResource(R.drawable.charter_switch_map_medium) } } } @@ -248,9 +248,9 @@ abstract class CharterBaseFragment?>() : requireActivity().runOnUiThread { module_mogo_och_arrived_tv.isEnabled = isClickable if (isClickable) { - module_mogo_och_arrived_tv.setTextColor(resources.getColor(R.color.bus_white)) + module_mogo_och_arrived_tv.setTextColor(resources.getColor(android.R.color.white)) } else { - module_mogo_och_arrived_tv.setTextColor(resources.getColor(R.color.bus_arrived_btn_un_clickable_color)) + module_mogo_och_arrived_tv.setTextColor(resources.getColor(R.color.charter_arrived_btn_un_clickable_color)) } } } @@ -266,11 +266,11 @@ abstract class CharterBaseFragment?>() : mapBizView?.let { it.getUI()?.let { ui -> if (ui.currentMapVisualAngle.isLongSight) { - mSwitchMapModeImage!!.setImageResource(R.drawable.bus_switch_map_long) + mSwitchMapModeImage!!.setImageResource(R.drawable.charter_switch_map_long) } else if (ui.currentMapVisualAngle.isMediumSight) { - mSwitchMapModeImage!!.setImageResource(R.drawable.bus_switch_map_medium) + mSwitchMapModeImage!!.setImageResource(R.drawable.charter_switch_map_medium) } else { - mSwitchMapModeImage!!.setImageResource(R.drawable.bus_switch_map_medium) + mSwitchMapModeImage!!.setImageResource(R.drawable.charter_switch_map_medium) } } } @@ -326,29 +326,29 @@ abstract class CharterBaseFragment?>() : if (IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE == autopilotStatus ) { //0不可用 - ctvAutopilotStatusTv!!.setTextColor(resources.getColor(R.color.bus_autopilot_text_color_disable)) + ctvAutopilotStatusTv!!.setTextColor(resources.getColor(R.color.charter_autopilot_text_color_disable)) ctvAutopilotStatusTv!!.text = - resources.getString(R.string.bus_loading_autopilot_runnig_tv) - ctvAutopilotStatusIv!!.setImageResource(R.drawable.bus_disable_autopilot_icon) + resources.getString(R.string.charter_loading_autopilot_runnig_tv) + ctvAutopilotStatusIv!!.setImageResource(R.drawable.charter_disable_autopilot_icon) // ctvAutopilotStatus!!.isSelected = false ctvAutopilotStatus!!.isClickable = true - ctvAutopilotStatus!!.background = getDrawable(R.drawable.bus_autopilot_0_1_status_bg) + ctvAutopilotStatus!!.background = getDrawable(R.drawable.charter_autopilot_0_1_status_bg) }else{ - ctvAutopilotStatusTv!!.setTextColor(resources.getColor(R.color.bus_autopilot_text_color_normal)) - ctvAutopilotStatusIv!!.setImageResource(R.drawable.bus_ic_autopilot) + ctvAutopilotStatusTv!!.setTextColor(resources.getColor(R.color.charter_autopilot_text_color_normal)) + ctvAutopilotStatusIv!!.setImageResource(R.drawable.charter_ic_autopilot) ctvAutopilotStatusTv!!.text = - resources.getString(R.string.bus_loading_autopilot_runnig_tv) + resources.getString(R.string.charter_loading_autopilot_runnig_tv) ctvAutopilotStatus!!.isClickable = true if (IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE == autopilotStatus) { //1可用 - ctvAutopilotStatus!!.background = getDrawable(R.drawable.bus_autopilot_0_1_status_bg) + ctvAutopilotStatus!!.background = getDrawable(R.drawable.charter_autopilot_0_1_status_bg) } else if (IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING == autopilotStatus) { - ctvAutopilotStatus!!.background = getDrawable(R.drawable.bus_autopilot_2_status_bg) + ctvAutopilotStatus!!.background = getDrawable(R.drawable.charter_autopilot_2_status_bg) } else if (IMoGoAutopilotStatusListener.STATUS_PARALLEL_DRIVING == autopilotStatus){ ctvAutopilotStatusTv!!.text = - resources.getString(R.string.bus_loading_autopilot_pingxing_tv) + resources.getString(R.string.charter_loading_autopilot_pingxing_tv) ctvAutopilotStatus!!.isClickable = false - ctvAutopilotStatus!!.background = getDrawable(R.drawable.pingxingjiashi) + ctvAutopilotStatus!!.background = getDrawable(R.drawable.charter_pingxingjiashi) } } } @@ -357,17 +357,17 @@ abstract class CharterBaseFragment?>() : if (IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING == autopilotStatus ) { //2 running - ctvAutopilotStatusIv!!.setImageResource(R.drawable.bus_right_autopilot_icon) - ctvAutopilotStatusTv!!.setTextColor(resources.getColor(R.color.bus_autopilot_text_color_normal)) + ctvAutopilotStatusIv!!.setImageResource(R.drawable.charter_right_autopilot_icon) + ctvAutopilotStatusTv!!.setTextColor(resources.getColor(R.color.charter_autopilot_text_color_normal)) ctvAutopilotStatusTv!!.text = - resources.getString(R.string.bus_loading_autopilot_success_tv) + resources.getString(R.string.charter_loading_autopilot_success_tv) // ctvAutopilotStatus!!.isSelected = false ctvAutopilotStatus!!.isClickable = false } else { - ctvAutopilotStatusIv!!.setImageResource(R.drawable.bus_wrong_autopilot_icon) - ctvAutopilotStatusTv!!.setTextColor(resources.getColor(R.color.bus_autopilot_text_color_normal)) + ctvAutopilotStatusIv!!.setImageResource(R.drawable.charter_wrong_autopilot_icon) + ctvAutopilotStatusTv!!.setTextColor(resources.getColor(R.color.charter_autopilot_text_color_normal)) ctvAutopilotStatusTv!!.text = - resources.getString(R.string.bus_loading_autopilot_failure_tv) + resources.getString(R.string.charter_loading_autopilot_failure_tv) ctvAutopilotStatus!!.isClickable = false // ctvAutopilotStatus!!.isSelected = false } @@ -427,11 +427,11 @@ abstract class CharterBaseFragment?>() : @SuppressLint("ObjectAnimatorBinding") open fun startAutopilotAnimation() { isAnimateRunning = true - ctvAutopilotStatusTv!!.text = resources.getString(R.string.bus_loading_autopilot_tv) - ctvAutopilotStatusTv!!.setTextColor(resources.getColor(R.color.bus_autopilot_text_color_normal)) + ctvAutopilotStatusTv!!.text = resources.getString(R.string.charter_loading_autopilot_tv) + ctvAutopilotStatusTv!!.setTextColor(resources.getColor(R.color.charter_autopilot_text_color_normal)) // ctvAutopilotStatus!!.isSelected = false ctvAutopilotStatus!!.isClickable = true - ctvAutopilotStatusIv!!.setImageResource(R.drawable.bus_loading_autopilot_icon) + ctvAutopilotStatusIv!!.setImageResource(R.drawable.charter_loading_autopilot_icon) if (autopilotLoadingAnimator == null) { autopilotLoadingAnimator = ObjectAnimator.ofFloat(ctvAutopilotStatusIv, "rotation", 0f, 360f) diff --git a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/fragment/DriverM1Fragment.kt b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/fragment/DriverM1Fragment.kt index 894b3341e3..ecf8215f7a 100644 --- a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/fragment/DriverM1Fragment.kt +++ b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/fragment/DriverM1Fragment.kt @@ -25,16 +25,16 @@ import com.mogo.och.common.module.utils.DateTimeUtil import com.mogo.och.common.module.utils.createQRCodeWithPicture import com.mogo.och.common.module.wigets.BindQRCodeDialog import com.mogo.och.common.module.wigets.OCHCommitDialog -import kotlinx.android.synthetic.main.bus_no_line_view.no_line_data_view -import kotlinx.android.synthetic.main.bus_no_line_view.no_order_data_tv -import kotlinx.android.synthetic.main.fragment_driver_m1.driverm1StationName1Tv -import kotlinx.android.synthetic.main.fragment_driver_m1.driverm1StationName2Tv -import kotlinx.android.synthetic.main.fragment_driver_m1.driverm1_line_name -import kotlinx.android.synthetic.main.fragment_driver_m1.driverm1_order_count_down -import kotlinx.android.synthetic.main.fragment_driver_m1.during_time -import kotlinx.android.synthetic.main.fragment_driver_m1.group_stations_panel -import kotlinx.android.synthetic.main.fragment_driver_m1.group_stations_panel2 -import kotlinx.android.synthetic.main.fragment_driver_m1.passenger_phone +import kotlinx.android.synthetic.main.charter_fragment_driver_m1.driverm1StationName1Tv +import kotlinx.android.synthetic.main.charter_fragment_driver_m1.driverm1StationName2Tv +import kotlinx.android.synthetic.main.charter_fragment_driver_m1.driverm1_line_name +import kotlinx.android.synthetic.main.charter_fragment_driver_m1.driverm1_order_count_down +import kotlinx.android.synthetic.main.charter_fragment_driver_m1.during_time +import kotlinx.android.synthetic.main.charter_fragment_driver_m1.group_stations_panel +import kotlinx.android.synthetic.main.charter_fragment_driver_m1.group_stations_panel2 +import kotlinx.android.synthetic.main.charter_fragment_driver_m1.passenger_phone +import kotlinx.android.synthetic.main.charter_no_line_view.no_line_data_view +import kotlinx.android.synthetic.main.charter_no_line_view.no_order_data_tv import me.jessyan.autosize.utils.AutoSizeUtils import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode @@ -83,10 +83,10 @@ class DriverM1Fragment : CharterBaseFragment - + \ No newline at end of file diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/bus_base_notice_box_bg.9.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/bus_base_notice_box_bg.9.png deleted file mode 100644 index 8b4b579b56..0000000000 Binary files a/OCH/charter/driver/src/main/res/drawable-xhdpi/bus_base_notice_box_bg.9.png and /dev/null differ diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/bus_dot_line.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/bus_dot_line.png deleted file mode 100644 index 186001352c..0000000000 Binary files a/OCH/charter/driver/src/main/res/drawable-xhdpi/bus_dot_line.png and /dev/null differ diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/bus_icon_arrived_station.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/bus_icon_arrived_station.png deleted file mode 100644 index 8a065b66dd..0000000000 Binary files a/OCH/charter/driver/src/main/res/drawable-xhdpi/bus_icon_arrived_station.png and /dev/null differ diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/bus_icon_arriving_station.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/bus_icon_arriving_station.png deleted file mode 100644 index 4ed57a0e30..0000000000 Binary files a/OCH/charter/driver/src/main/res/drawable-xhdpi/bus_icon_arriving_station.png and /dev/null differ diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/bus_icon_not_arrive_station.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/bus_icon_not_arrive_station.png deleted file mode 100644 index e0bb24c526..0000000000 Binary files a/OCH/charter/driver/src/main/res/drawable-xhdpi/bus_icon_not_arrive_station.png and /dev/null differ diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/bus_light_green_nor.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/bus_light_green_nor.png deleted file mode 100644 index bc9fed952d..0000000000 Binary files a/OCH/charter/driver/src/main/res/drawable-xhdpi/bus_light_green_nor.png and /dev/null differ diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/bus_light_red_nor.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/bus_light_red_nor.png deleted file mode 100644 index 8732508ded..0000000000 Binary files a/OCH/charter/driver/src/main/res/drawable-xhdpi/bus_light_red_nor.png and /dev/null differ diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/bus_lightyellow_nor.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/bus_lightyellow_nor.png deleted file mode 100644 index bae01408fd..0000000000 Binary files a/OCH/charter/driver/src/main/res/drawable-xhdpi/bus_lightyellow_nor.png and /dev/null differ diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/bus_line_panel_bg_1.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/bus_line_panel_bg_1.png deleted file mode 100755 index 09a9c252da..0000000000 Binary files a/OCH/charter/driver/src/main/res/drawable-xhdpi/bus_line_panel_bg_1.png and /dev/null differ diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/bus_line_task_arrow.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/bus_line_task_arrow.png deleted file mode 100644 index b32f0693a6..0000000000 Binary files a/OCH/charter/driver/src/main/res/drawable-xhdpi/bus_line_task_arrow.png and /dev/null differ diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/bus_switch_line_close.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/bus_switch_line_close.png deleted file mode 100644 index 370b61de38..0000000000 Binary files a/OCH/charter/driver/src/main/res/drawable-xhdpi/bus_switch_line_close.png and /dev/null differ diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/icon_ai_collect.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_ai_collect.png similarity index 100% rename from OCH/charter/driver/src/main/res/drawable-xhdpi/icon_ai_collect.png rename to OCH/charter/driver/src/main/res/drawable-xhdpi/charter_ai_collect.png diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/icon_bad_case.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_bad_case.png similarity index 100% rename from OCH/charter/driver/src/main/res/drawable-xhdpi/icon_bad_case.png rename to OCH/charter/driver/src/main/res/drawable-xhdpi/charter_bad_case.png diff --git a/OCH/charter/driver/src/main/res/drawable/icon_bad_case_normal.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_bad_case_normal.png similarity index 100% rename from OCH/charter/driver/src/main/res/drawable/icon_bad_case_normal.png rename to OCH/charter/driver/src/main/res/drawable-xhdpi/charter_bad_case_normal.png diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/bus_base_icon_in_autopilot.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_base_icon_in_autopilot.png similarity index 100% rename from OCH/charter/driver/src/main/res/drawable-xhdpi/bus_base_icon_in_autopilot.png rename to OCH/charter/driver/src/main/res/drawable-xhdpi/charter_base_icon_in_autopilot.png diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/bus_base_icon_not_in_autopilot.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_base_icon_not_in_autopilot.png similarity index 100% rename from OCH/charter/driver/src/main/res/drawable-xhdpi/bus_base_icon_not_in_autopilot.png rename to OCH/charter/driver/src/main/res/drawable-xhdpi/charter_base_icon_not_in_autopilot.png diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/bus_base_slide_block.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_base_slide_block.png similarity index 100% rename from OCH/charter/driver/src/main/res/drawable-xhdpi/bus_base_slide_block.png rename to OCH/charter/driver/src/main/res/drawable-xhdpi/charter_base_slide_block.png diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/bus_disable_autopilot_icon.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_disable_autopilot_icon.png similarity index 100% rename from OCH/charter/driver/src/main/res/drawable-xhdpi/bus_disable_autopilot_icon.png rename to OCH/charter/driver/src/main/res/drawable-xhdpi/charter_disable_autopilot_icon.png diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/bus_ic_autopilot.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_ic_autopilot.png similarity index 100% rename from OCH/charter/driver/src/main/res/drawable-xhdpi/bus_ic_autopilot.png rename to OCH/charter/driver/src/main/res/drawable-xhdpi/charter_ic_autopilot.png diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/bus_line_panel_bg.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_line_panel_bg.png similarity index 100% rename from OCH/charter/driver/src/main/res/drawable-xhdpi/bus_line_panel_bg.png rename to OCH/charter/driver/src/main/res/drawable-xhdpi/charter_line_panel_bg.png diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/bus_loading_autopilot_icon.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_loading_autopilot_icon.png similarity index 100% rename from OCH/charter/driver/src/main/res/drawable-xhdpi/bus_loading_autopilot_icon.png rename to OCH/charter/driver/src/main/res/drawable-xhdpi/charter_loading_autopilot_icon.png diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/bus_no_line_icon.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_no_bus_line.png similarity index 100% rename from OCH/charter/driver/src/main/res/drawable-xhdpi/bus_no_line_icon.png rename to OCH/charter/driver/src/main/res/drawable-xhdpi/charter_no_bus_line.png diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/icon_no_bus_line.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_no_line_icon.png similarity index 100% rename from OCH/charter/driver/src/main/res/drawable-xhdpi/icon_no_bus_line.png rename to OCH/charter/driver/src/main/res/drawable-xhdpi/charter_no_line_icon.png diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/bus_och_dot_line.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_och_dot_line.png similarity index 100% rename from OCH/charter/driver/src/main/res/drawable-xhdpi/bus_och_dot_line.png rename to OCH/charter/driver/src/main/res/drawable-xhdpi/charter_och_dot_line.png diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/bus_operation_status_bg.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_operation_status_bg.png similarity index 100% rename from OCH/charter/driver/src/main/res/drawable-xhdpi/bus_operation_status_bg.png rename to OCH/charter/driver/src/main/res/drawable-xhdpi/charter_operation_status_bg.png diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/bus_operation_status_select_bg.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_operation_status_select_bg.png similarity index 100% rename from OCH/charter/driver/src/main/res/drawable-xhdpi/bus_operation_status_select_bg.png rename to OCH/charter/driver/src/main/res/drawable-xhdpi/charter_operation_status_select_bg.png diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/pingxingjiashi.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_pingxingjiashi.png similarity index 100% rename from OCH/charter/driver/src/main/res/drawable-xhdpi/pingxingjiashi.png rename to OCH/charter/driver/src/main/res/drawable-xhdpi/charter_pingxingjiashi.png diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/icon_point_blue_bus.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_point_blue_bus.png similarity index 100% rename from OCH/charter/driver/src/main/res/drawable-xhdpi/icon_point_blue_bus.png rename to OCH/charter/driver/src/main/res/drawable-xhdpi/charter_point_blue_bus.png diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/icon_point_green_bus.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_point_green_bus.png similarity index 100% rename from OCH/charter/driver/src/main/res/drawable-xhdpi/icon_point_green_bus.png rename to OCH/charter/driver/src/main/res/drawable-xhdpi/charter_point_green_bus.png diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/press_start_status.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_press_start_status.png similarity index 100% rename from OCH/charter/driver/src/main/res/drawable-xhdpi/press_start_status.png rename to OCH/charter/driver/src/main/res/drawable-xhdpi/charter_press_start_status.png diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/bus_right_autopilot_icon.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_right_autopilot_icon.png similarity index 100% rename from OCH/charter/driver/src/main/res/drawable-xhdpi/bus_right_autopilot_icon.png rename to OCH/charter/driver/src/main/res/drawable-xhdpi/charter_right_autopilot_icon.png diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/bus_selected_btn.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_selected_btn.png similarity index 100% rename from OCH/charter/driver/src/main/res/drawable-xhdpi/bus_selected_btn.png rename to OCH/charter/driver/src/main/res/drawable-xhdpi/charter_selected_btn.png diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/bus_setting_btn_bg.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_setting_btn_bg.png similarity index 100% rename from OCH/charter/driver/src/main/res/drawable-xhdpi/bus_setting_btn_bg.png rename to OCH/charter/driver/src/main/res/drawable-xhdpi/charter_setting_btn_bg.png diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/start_failure.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_start_failure.png similarity index 100% rename from OCH/charter/driver/src/main/res/drawable-xhdpi/start_failure.png rename to OCH/charter/driver/src/main/res/drawable-xhdpi/charter_start_failure.png diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/start_success.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_start_success.png similarity index 100% rename from OCH/charter/driver/src/main/res/drawable-xhdpi/start_success.png rename to OCH/charter/driver/src/main/res/drawable-xhdpi/charter_start_success.png diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/icon_station_start_end.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_station_start_end.png similarity index 100% rename from OCH/charter/driver/src/main/res/drawable-xhdpi/icon_station_start_end.png rename to OCH/charter/driver/src/main/res/drawable-xhdpi/charter_station_start_end.png diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/bus_switch_map_long.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_switch_map_long.png similarity index 100% rename from OCH/charter/driver/src/main/res/drawable-xhdpi/bus_switch_map_long.png rename to OCH/charter/driver/src/main/res/drawable-xhdpi/charter_switch_map_long.png diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/bus_switch_map_medium.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_switch_map_medium.png similarity index 100% rename from OCH/charter/driver/src/main/res/drawable-xhdpi/bus_switch_map_medium.png rename to OCH/charter/driver/src/main/res/drawable-xhdpi/charter_switch_map_medium.png diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/bus_unselect_btn.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_unselect_btn.png similarity index 100% rename from OCH/charter/driver/src/main/res/drawable-xhdpi/bus_unselect_btn.png rename to OCH/charter/driver/src/main/res/drawable-xhdpi/charter_unselect_btn.png diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/bus_wrong_autopilot_icon.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_wrong_autopilot_icon.png similarity index 100% rename from OCH/charter/driver/src/main/res/drawable-xhdpi/bus_wrong_autopilot_icon.png rename to OCH/charter/driver/src/main/res/drawable-xhdpi/charter_wrong_autopilot_icon.png diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/end_maker_icon.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/end_maker_icon.png deleted file mode 100755 index 8acf113151..0000000000 Binary files a/OCH/charter/driver/src/main/res/drawable-xhdpi/end_maker_icon.png and /dev/null differ diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/icon_ai_normal.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/icon_ai_normal.png deleted file mode 100755 index e98738b192..0000000000 Binary files a/OCH/charter/driver/src/main/res/drawable-xhdpi/icon_ai_normal.png and /dev/null differ diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/icon_ai_select.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/icon_ai_select.png deleted file mode 100755 index d3e0107c02..0000000000 Binary files a/OCH/charter/driver/src/main/res/drawable-xhdpi/icon_ai_select.png and /dev/null differ diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/icon_arrow_blue_bus.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/icon_arrow_blue_bus.png deleted file mode 100755 index 026c36086f..0000000000 Binary files a/OCH/charter/driver/src/main/res/drawable-xhdpi/icon_arrow_blue_bus.png and /dev/null differ diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/icon_arrow_green_bus.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/icon_arrow_green_bus.png deleted file mode 100755 index 06bebc7013..0000000000 Binary files a/OCH/charter/driver/src/main/res/drawable-xhdpi/icon_arrow_green_bus.png and /dev/null differ diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/icon_arrow_grey_bus.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/icon_arrow_grey_bus.png deleted file mode 100755 index f4f9b2bca2..0000000000 Binary files a/OCH/charter/driver/src/main/res/drawable-xhdpi/icon_arrow_grey_bus.png and /dev/null differ diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/icon_point_grey_bus.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/icon_point_grey_bus.png deleted file mode 100755 index d43e34bb26..0000000000 Binary files a/OCH/charter/driver/src/main/res/drawable-xhdpi/icon_point_grey_bus.png and /dev/null differ diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/no_order_data.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/no_order_data.png deleted file mode 100644 index 0e61996d3f..0000000000 Binary files a/OCH/charter/driver/src/main/res/drawable-xhdpi/no_order_data.png and /dev/null differ diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/start_maker_icon.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/start_maker_icon.png deleted file mode 100644 index 9eca61e199..0000000000 Binary files a/OCH/charter/driver/src/main/res/drawable-xhdpi/start_maker_icon.png and /dev/null differ diff --git a/OCH/charter/driver/src/main/res/drawable/bus_autopilot_status_bg_check.png b/OCH/charter/driver/src/main/res/drawable/bus_autopilot_status_bg_check.png deleted file mode 100644 index 28857974b5..0000000000 Binary files a/OCH/charter/driver/src/main/res/drawable/bus_autopilot_status_bg_check.png and /dev/null differ diff --git a/OCH/charter/driver/src/main/res/drawable/bus_autopilot_status_bg_nor.png b/OCH/charter/driver/src/main/res/drawable/bus_autopilot_status_bg_nor.png deleted file mode 100644 index f7d4f92c4b..0000000000 Binary files a/OCH/charter/driver/src/main/res/drawable/bus_autopilot_status_bg_nor.png and /dev/null differ diff --git a/OCH/charter/driver/src/main/res/drawable/bus_base_autopilot_status_icon_selector.xml b/OCH/charter/driver/src/main/res/drawable/bus_base_autopilot_status_icon_selector.xml deleted file mode 100644 index 94555d78cc..0000000000 --- a/OCH/charter/driver/src/main/res/drawable/bus_base_autopilot_status_icon_selector.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/OCH/charter/driver/src/main/res/drawable/bus_base_icon_in_autopilot.png b/OCH/charter/driver/src/main/res/drawable/bus_base_icon_in_autopilot.png deleted file mode 100644 index 75c26c3d71..0000000000 Binary files a/OCH/charter/driver/src/main/res/drawable/bus_base_icon_in_autopilot.png and /dev/null differ diff --git a/OCH/charter/driver/src/main/res/drawable/bus_base_icon_not_in_autopilot.png b/OCH/charter/driver/src/main/res/drawable/bus_base_icon_not_in_autopilot.png deleted file mode 100644 index 927296d690..0000000000 Binary files a/OCH/charter/driver/src/main/res/drawable/bus_base_icon_not_in_autopilot.png and /dev/null differ diff --git a/OCH/charter/driver/src/main/res/drawable/bus_base_notice_box_bg.9.png b/OCH/charter/driver/src/main/res/drawable/bus_base_notice_box_bg.9.png deleted file mode 100644 index 8b4b579b56..0000000000 Binary files a/OCH/charter/driver/src/main/res/drawable/bus_base_notice_box_bg.9.png and /dev/null differ diff --git a/OCH/charter/driver/src/main/res/drawable/bus_base_slide_block.png b/OCH/charter/driver/src/main/res/drawable/bus_base_slide_block.png deleted file mode 100644 index ed7b293b90..0000000000 Binary files a/OCH/charter/driver/src/main/res/drawable/bus_base_slide_block.png and /dev/null differ diff --git a/OCH/charter/driver/src/main/res/drawable/bus_checkbox_selector.xml b/OCH/charter/driver/src/main/res/drawable/bus_checkbox_selector.xml deleted file mode 100644 index d95e931160..0000000000 --- a/OCH/charter/driver/src/main/res/drawable/bus_checkbox_selector.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/OCH/charter/driver/src/main/res/drawable/bus_disable_autopilot_icon.png b/OCH/charter/driver/src/main/res/drawable/bus_disable_autopilot_icon.png deleted file mode 100644 index 170f254cd1..0000000000 Binary files a/OCH/charter/driver/src/main/res/drawable/bus_disable_autopilot_icon.png and /dev/null differ diff --git a/OCH/charter/driver/src/main/res/drawable/bus_dot_line.png b/OCH/charter/driver/src/main/res/drawable/bus_dot_line.png deleted file mode 100644 index 186001352c..0000000000 Binary files a/OCH/charter/driver/src/main/res/drawable/bus_dot_line.png and /dev/null differ diff --git a/OCH/charter/driver/src/main/res/drawable/bus_ic_autopilot.png b/OCH/charter/driver/src/main/res/drawable/bus_ic_autopilot.png deleted file mode 100644 index be978145dc..0000000000 Binary files a/OCH/charter/driver/src/main/res/drawable/bus_ic_autopilot.png and /dev/null differ diff --git a/OCH/charter/driver/src/main/res/drawable/bus_icon_arrived_station.png b/OCH/charter/driver/src/main/res/drawable/bus_icon_arrived_station.png deleted file mode 100644 index 8a065b66dd..0000000000 Binary files a/OCH/charter/driver/src/main/res/drawable/bus_icon_arrived_station.png and /dev/null differ diff --git a/OCH/charter/driver/src/main/res/drawable/bus_icon_arriving_station.png b/OCH/charter/driver/src/main/res/drawable/bus_icon_arriving_station.png deleted file mode 100644 index 4ed57a0e30..0000000000 Binary files a/OCH/charter/driver/src/main/res/drawable/bus_icon_arriving_station.png and /dev/null differ diff --git a/OCH/charter/driver/src/main/res/drawable/bus_icon_not_arrive_station.png b/OCH/charter/driver/src/main/res/drawable/bus_icon_not_arrive_station.png deleted file mode 100644 index e0bb24c526..0000000000 Binary files a/OCH/charter/driver/src/main/res/drawable/bus_icon_not_arrive_station.png and /dev/null differ diff --git a/OCH/charter/driver/src/main/res/drawable/bus_light_green_nor.png b/OCH/charter/driver/src/main/res/drawable/bus_light_green_nor.png deleted file mode 100644 index bc9fed952d..0000000000 Binary files a/OCH/charter/driver/src/main/res/drawable/bus_light_green_nor.png and /dev/null differ diff --git a/OCH/charter/driver/src/main/res/drawable/bus_light_red_nor.png b/OCH/charter/driver/src/main/res/drawable/bus_light_red_nor.png deleted file mode 100644 index 8732508ded..0000000000 Binary files a/OCH/charter/driver/src/main/res/drawable/bus_light_red_nor.png and /dev/null differ diff --git a/OCH/charter/driver/src/main/res/drawable/bus_lightyellow_nor.png b/OCH/charter/driver/src/main/res/drawable/bus_lightyellow_nor.png deleted file mode 100644 index bae01408fd..0000000000 Binary files a/OCH/charter/driver/src/main/res/drawable/bus_lightyellow_nor.png and /dev/null differ diff --git a/OCH/charter/driver/src/main/res/drawable/bus_line_panel_bg.png b/OCH/charter/driver/src/main/res/drawable/bus_line_panel_bg.png deleted file mode 100755 index 3166d20e37..0000000000 Binary files a/OCH/charter/driver/src/main/res/drawable/bus_line_panel_bg.png and /dev/null differ diff --git a/OCH/charter/driver/src/main/res/drawable/bus_line_panel_bg_1.png b/OCH/charter/driver/src/main/res/drawable/bus_line_panel_bg_1.png deleted file mode 100755 index 09a9c252da..0000000000 Binary files a/OCH/charter/driver/src/main/res/drawable/bus_line_panel_bg_1.png and /dev/null differ diff --git a/OCH/charter/driver/src/main/res/drawable/bus_loading_autopilot_icon.png b/OCH/charter/driver/src/main/res/drawable/bus_loading_autopilot_icon.png deleted file mode 100644 index f21a1081f1..0000000000 Binary files a/OCH/charter/driver/src/main/res/drawable/bus_loading_autopilot_icon.png and /dev/null differ diff --git a/OCH/charter/driver/src/main/res/drawable/bus_och_dot_line.png b/OCH/charter/driver/src/main/res/drawable/bus_och_dot_line.png deleted file mode 100644 index a720a532ea..0000000000 Binary files a/OCH/charter/driver/src/main/res/drawable/bus_och_dot_line.png and /dev/null differ diff --git a/OCH/charter/driver/src/main/res/drawable/bus_operation_status_bg_selector.xml b/OCH/charter/driver/src/main/res/drawable/bus_operation_status_bg_selector.xml deleted file mode 100755 index c992e49c31..0000000000 --- a/OCH/charter/driver/src/main/res/drawable/bus_operation_status_bg_selector.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/OCH/charter/driver/src/main/res/drawable/bus_panel_anchor_bkg.xml b/OCH/charter/driver/src/main/res/drawable/bus_panel_anchor_bkg.xml deleted file mode 100644 index 21b39b7e37..0000000000 --- a/OCH/charter/driver/src/main/res/drawable/bus_panel_anchor_bkg.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/OCH/charter/driver/src/main/res/drawable/bus_right_autopilot_icon.png b/OCH/charter/driver/src/main/res/drawable/bus_right_autopilot_icon.png deleted file mode 100644 index cc2b18083d..0000000000 Binary files a/OCH/charter/driver/src/main/res/drawable/bus_right_autopilot_icon.png and /dev/null differ diff --git a/OCH/charter/driver/src/main/res/drawable/bus_selected_btn.png b/OCH/charter/driver/src/main/res/drawable/bus_selected_btn.png deleted file mode 100644 index 3f05565483..0000000000 Binary files a/OCH/charter/driver/src/main/res/drawable/bus_selected_btn.png and /dev/null differ diff --git a/OCH/charter/driver/src/main/res/drawable/bus_setting_btn_bg.png b/OCH/charter/driver/src/main/res/drawable/bus_setting_btn_bg.png deleted file mode 100644 index ba41bf3a53..0000000000 Binary files a/OCH/charter/driver/src/main/res/drawable/bus_setting_btn_bg.png and /dev/null differ diff --git a/OCH/charter/driver/src/main/res/drawable/bus_setting_tip_red_cir_bg.xml b/OCH/charter/driver/src/main/res/drawable/bus_setting_tip_red_cir_bg.xml deleted file mode 100644 index 203971340e..0000000000 --- a/OCH/charter/driver/src/main/res/drawable/bus_setting_tip_red_cir_bg.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/OCH/charter/driver/src/main/res/drawable/bus_shape_select_line_item_bg_normal.xml b/OCH/charter/driver/src/main/res/drawable/bus_shape_select_line_item_bg_normal.xml deleted file mode 100644 index 272e718cce..0000000000 --- a/OCH/charter/driver/src/main/res/drawable/bus_shape_select_line_item_bg_normal.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - \ No newline at end of file diff --git a/OCH/charter/driver/src/main/res/drawable/bus_shape_select_line_item_bg_selected.xml b/OCH/charter/driver/src/main/res/drawable/bus_shape_select_line_item_bg_selected.xml deleted file mode 100644 index e5faafb27b..0000000000 --- a/OCH/charter/driver/src/main/res/drawable/bus_shape_select_line_item_bg_selected.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - \ No newline at end of file diff --git a/OCH/charter/driver/src/main/res/drawable/bus_shape_select_line_item_time_bg.xml b/OCH/charter/driver/src/main/res/drawable/bus_shape_select_line_item_time_bg.xml deleted file mode 100644 index ee8088637c..0000000000 --- a/OCH/charter/driver/src/main/res/drawable/bus_shape_select_line_item_time_bg.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/OCH/charter/driver/src/main/res/drawable/bus_shape_select_line_item_time_bg_selected.xml b/OCH/charter/driver/src/main/res/drawable/bus_shape_select_line_item_time_bg_selected.xml deleted file mode 100644 index e2b482ee5f..0000000000 --- a/OCH/charter/driver/src/main/res/drawable/bus_shape_select_line_item_time_bg_selected.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/OCH/charter/driver/src/main/res/drawable/bus_station_green_dash_line.xml b/OCH/charter/driver/src/main/res/drawable/bus_station_green_dash_line.xml deleted file mode 100644 index fe46ef2228..0000000000 --- a/OCH/charter/driver/src/main/res/drawable/bus_station_green_dash_line.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - \ No newline at end of file diff --git a/OCH/charter/driver/src/main/res/drawable/bus_station_v_green_dash.xml b/OCH/charter/driver/src/main/res/drawable/bus_station_v_green_dash.xml deleted file mode 100644 index 376e0a472c..0000000000 --- a/OCH/charter/driver/src/main/res/drawable/bus_station_v_green_dash.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/OCH/charter/driver/src/main/res/drawable/bus_switch_line_btn.xml b/OCH/charter/driver/src/main/res/drawable/bus_switch_line_btn.xml deleted file mode 100644 index 8b066b0ce8..0000000000 --- a/OCH/charter/driver/src/main/res/drawable/bus_switch_line_btn.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/OCH/charter/driver/src/main/res/drawable/bus_switch_line_btn_commit.xml b/OCH/charter/driver/src/main/res/drawable/bus_switch_line_btn_commit.xml deleted file mode 100644 index e94992d507..0000000000 --- a/OCH/charter/driver/src/main/res/drawable/bus_switch_line_btn_commit.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - \ No newline at end of file diff --git a/OCH/charter/driver/src/main/res/drawable/bus_switch_line_close.png b/OCH/charter/driver/src/main/res/drawable/bus_switch_line_close.png deleted file mode 100644 index 370b61de38..0000000000 Binary files a/OCH/charter/driver/src/main/res/drawable/bus_switch_line_close.png and /dev/null differ diff --git a/OCH/charter/driver/src/main/res/drawable/bus_switch_map_bg.xml b/OCH/charter/driver/src/main/res/drawable/bus_switch_map_bg.xml deleted file mode 100644 index b34021d977..0000000000 --- a/OCH/charter/driver/src/main/res/drawable/bus_switch_map_bg.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/OCH/charter/driver/src/main/res/drawable/bus_switch_map_long.png b/OCH/charter/driver/src/main/res/drawable/bus_switch_map_long.png deleted file mode 100755 index cf3e5a3778..0000000000 Binary files a/OCH/charter/driver/src/main/res/drawable/bus_switch_map_long.png and /dev/null differ diff --git a/OCH/charter/driver/src/main/res/drawable/bus_switch_map_medium.png b/OCH/charter/driver/src/main/res/drawable/bus_switch_map_medium.png deleted file mode 100755 index bdc2725468..0000000000 Binary files a/OCH/charter/driver/src/main/res/drawable/bus_switch_map_medium.png and /dev/null differ diff --git a/OCH/charter/driver/src/main/res/drawable/bus_unselect_btn.png b/OCH/charter/driver/src/main/res/drawable/bus_unselect_btn.png deleted file mode 100644 index 0114bb4f2b..0000000000 Binary files a/OCH/charter/driver/src/main/res/drawable/bus_unselect_btn.png and /dev/null differ diff --git a/OCH/charter/driver/src/main/res/drawable/bus_wrong_autopilot_icon.png b/OCH/charter/driver/src/main/res/drawable/bus_wrong_autopilot_icon.png deleted file mode 100644 index 0c8988acb3..0000000000 Binary files a/OCH/charter/driver/src/main/res/drawable/bus_wrong_autopilot_icon.png and /dev/null differ diff --git a/OCH/charter/driver/src/main/res/drawable/bus_yi_biao_pan_bg_nor.xml b/OCH/charter/driver/src/main/res/drawable/bus_yi_biao_pan_bg_nor.xml deleted file mode 100644 index 2ef90e60f7..0000000000 --- a/OCH/charter/driver/src/main/res/drawable/bus_yi_biao_pan_bg_nor.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/OCH/charter/driver/src/main/res/drawable/bus_yi_biao_pan_bg_speeding.xml b/OCH/charter/driver/src/main/res/drawable/bus_yi_biao_pan_bg_speeding.xml deleted file mode 100644 index dea7a88bb6..0000000000 --- a/OCH/charter/driver/src/main/res/drawable/bus_yi_biao_pan_bg_speeding.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/OCH/charter/driver/src/main/res/drawable/bus_autopilot_2_status_bg.xml b/OCH/charter/driver/src/main/res/drawable/charter_autopilot_0_1_status_bg.xml similarity index 69% rename from OCH/charter/driver/src/main/res/drawable/bus_autopilot_2_status_bg.xml rename to OCH/charter/driver/src/main/res/drawable/charter_autopilot_0_1_status_bg.xml index 1b95919363..62d3a1173a 100644 --- a/OCH/charter/driver/src/main/res/drawable/bus_autopilot_2_status_bg.xml +++ b/OCH/charter/driver/src/main/res/drawable/charter_autopilot_0_1_status_bg.xml @@ -1,8 +1,8 @@ - + - + diff --git a/OCH/charter/driver/src/main/res/drawable/bus_autopilot_0_1_status_bg.xml b/OCH/charter/driver/src/main/res/drawable/charter_autopilot_2_status_bg.xml similarity index 69% rename from OCH/charter/driver/src/main/res/drawable/bus_autopilot_0_1_status_bg.xml rename to OCH/charter/driver/src/main/res/drawable/charter_autopilot_2_status_bg.xml index 21c3611ffe..fda939cf28 100644 --- a/OCH/charter/driver/src/main/res/drawable/bus_autopilot_0_1_status_bg.xml +++ b/OCH/charter/driver/src/main/res/drawable/charter_autopilot_2_status_bg.xml @@ -1,8 +1,8 @@ - + - + diff --git a/OCH/charter/driver/src/main/res/drawable/charter_base_autopilot_status_icon_selector.xml b/OCH/charter/driver/src/main/res/drawable/charter_base_autopilot_status_icon_selector.xml new file mode 100644 index 0000000000..6bfd144f39 --- /dev/null +++ b/OCH/charter/driver/src/main/res/drawable/charter_base_autopilot_status_icon_selector.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/OCH/charter/driver/src/main/res/drawable/charter_checkbox_selector.xml b/OCH/charter/driver/src/main/res/drawable/charter_checkbox_selector.xml new file mode 100644 index 0000000000..e16f45419f --- /dev/null +++ b/OCH/charter/driver/src/main/res/drawable/charter_checkbox_selector.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/OCH/charter/driver/src/main/res/drawable/bus_line_dividing_line1_selector.xml b/OCH/charter/driver/src/main/res/drawable/charter_line_dividing_line1_selector.xml similarity index 100% rename from OCH/charter/driver/src/main/res/drawable/bus_line_dividing_line1_selector.xml rename to OCH/charter/driver/src/main/res/drawable/charter_line_dividing_line1_selector.xml diff --git a/OCH/charter/driver/src/main/res/drawable/bus_line_dividing_line2_selector.xml b/OCH/charter/driver/src/main/res/drawable/charter_line_dividing_line2_selector.xml similarity index 100% rename from OCH/charter/driver/src/main/res/drawable/bus_line_dividing_line2_selector.xml rename to OCH/charter/driver/src/main/res/drawable/charter_line_dividing_line2_selector.xml diff --git a/OCH/charter/driver/src/main/res/drawable/charter_operation_status_bg_selector.xml b/OCH/charter/driver/src/main/res/drawable/charter_operation_status_bg_selector.xml new file mode 100755 index 0000000000..8f063ff827 --- /dev/null +++ b/OCH/charter/driver/src/main/res/drawable/charter_operation_status_bg_selector.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/OCH/charter/driver/src/main/res/drawable/bus_panel_bkg.xml b/OCH/charter/driver/src/main/res/drawable/charter_panel_bkg.xml similarity index 100% rename from OCH/charter/driver/src/main/res/drawable/bus_panel_bkg.xml rename to OCH/charter/driver/src/main/res/drawable/charter_panel_bkg.xml diff --git a/OCH/charter/driver/src/main/res/drawable/bus_task_time_bg.xml b/OCH/charter/driver/src/main/res/drawable/charter_task_time_bg.xml similarity index 73% rename from OCH/charter/driver/src/main/res/drawable/bus_task_time_bg.xml rename to OCH/charter/driver/src/main/res/drawable/charter_task_time_bg.xml index 3aa5bedc06..eea1942115 100644 --- a/OCH/charter/driver/src/main/res/drawable/bus_task_time_bg.xml +++ b/OCH/charter/driver/src/main/res/drawable/charter_task_time_bg.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/OCH/charter/driver/src/main/res/drawable/bg_bus_traffic_light_background.xml b/OCH/charter/driver/src/main/res/drawable/charter_traffic_light_background.xml similarity index 72% rename from OCH/charter/driver/src/main/res/drawable/bg_bus_traffic_light_background.xml rename to OCH/charter/driver/src/main/res/drawable/charter_traffic_light_background.xml index e0b90b9c55..5a27da20e0 100644 --- a/OCH/charter/driver/src/main/res/drawable/bg_bus_traffic_light_background.xml +++ b/OCH/charter/driver/src/main/res/drawable/charter_traffic_light_background.xml @@ -3,5 +3,5 @@ android:shape="rectangle"> - + \ No newline at end of file diff --git a/OCH/charter/driver/src/main/res/drawable/end_maker_icon.png b/OCH/charter/driver/src/main/res/drawable/end_maker_icon.png deleted file mode 100755 index 8acf113151..0000000000 Binary files a/OCH/charter/driver/src/main/res/drawable/end_maker_icon.png and /dev/null differ diff --git a/OCH/charter/driver/src/main/res/drawable/icon_arrow_blue_bus.png b/OCH/charter/driver/src/main/res/drawable/icon_arrow_blue_bus.png deleted file mode 100755 index 026c36086f..0000000000 Binary files a/OCH/charter/driver/src/main/res/drawable/icon_arrow_blue_bus.png and /dev/null differ diff --git a/OCH/charter/driver/src/main/res/drawable/icon_arrow_green_bus.png b/OCH/charter/driver/src/main/res/drawable/icon_arrow_green_bus.png deleted file mode 100755 index 06bebc7013..0000000000 Binary files a/OCH/charter/driver/src/main/res/drawable/icon_arrow_green_bus.png and /dev/null differ diff --git a/OCH/charter/driver/src/main/res/drawable/icon_arrow_grey_bus.png b/OCH/charter/driver/src/main/res/drawable/icon_arrow_grey_bus.png deleted file mode 100755 index f4f9b2bca2..0000000000 Binary files a/OCH/charter/driver/src/main/res/drawable/icon_arrow_grey_bus.png and /dev/null differ diff --git a/OCH/charter/driver/src/main/res/drawable/icon_no_bus_line.png b/OCH/charter/driver/src/main/res/drawable/icon_no_bus_line.png deleted file mode 100755 index fc20dca73c..0000000000 Binary files a/OCH/charter/driver/src/main/res/drawable/icon_no_bus_line.png and /dev/null differ diff --git a/OCH/charter/driver/src/main/res/drawable/icon_point_blue_bus.png b/OCH/charter/driver/src/main/res/drawable/icon_point_blue_bus.png deleted file mode 100755 index dc4c4f6f0d..0000000000 Binary files a/OCH/charter/driver/src/main/res/drawable/icon_point_blue_bus.png and /dev/null differ diff --git a/OCH/charter/driver/src/main/res/drawable/icon_point_green_bus.png b/OCH/charter/driver/src/main/res/drawable/icon_point_green_bus.png deleted file mode 100755 index ed3b871338..0000000000 Binary files a/OCH/charter/driver/src/main/res/drawable/icon_point_green_bus.png and /dev/null differ diff --git a/OCH/charter/driver/src/main/res/drawable/icon_point_grey_bus.png b/OCH/charter/driver/src/main/res/drawable/icon_point_grey_bus.png deleted file mode 100755 index d43e34bb26..0000000000 Binary files a/OCH/charter/driver/src/main/res/drawable/icon_point_grey_bus.png and /dev/null differ diff --git a/OCH/charter/driver/src/main/res/drawable/icon_station_start_end.png b/OCH/charter/driver/src/main/res/drawable/icon_station_start_end.png deleted file mode 100644 index 04580a8f0d..0000000000 Binary files a/OCH/charter/driver/src/main/res/drawable/icon_station_start_end.png and /dev/null differ diff --git a/OCH/charter/driver/src/main/res/drawable/no_order_data.png b/OCH/charter/driver/src/main/res/drawable/no_order_data.png deleted file mode 100644 index 0e61996d3f..0000000000 Binary files a/OCH/charter/driver/src/main/res/drawable/no_order_data.png and /dev/null differ diff --git a/OCH/charter/driver/src/main/res/drawable/press_start_status.png b/OCH/charter/driver/src/main/res/drawable/press_start_status.png deleted file mode 100755 index af32c20cb5..0000000000 Binary files a/OCH/charter/driver/src/main/res/drawable/press_start_status.png and /dev/null differ diff --git a/OCH/charter/driver/src/main/res/drawable/start_failure.png b/OCH/charter/driver/src/main/res/drawable/start_failure.png deleted file mode 100755 index 5737f93ad8..0000000000 Binary files a/OCH/charter/driver/src/main/res/drawable/start_failure.png and /dev/null differ diff --git a/OCH/charter/driver/src/main/res/drawable/start_maker_icon.png b/OCH/charter/driver/src/main/res/drawable/start_maker_icon.png deleted file mode 100644 index 9eca61e199..0000000000 Binary files a/OCH/charter/driver/src/main/res/drawable/start_maker_icon.png and /dev/null differ diff --git a/OCH/charter/driver/src/main/res/drawable/start_success.png b/OCH/charter/driver/src/main/res/drawable/start_success.png deleted file mode 100755 index 84246fd323..0000000000 Binary files a/OCH/charter/driver/src/main/res/drawable/start_success.png and /dev/null differ diff --git a/OCH/charter/driver/src/main/res/layout/charter_base_fragment.xml b/OCH/charter/driver/src/main/res/layout/charter_base_fragment.xml index f4f2a8558c..8c828cb2a1 100644 --- a/OCH/charter/driver/src/main/res/layout/charter_base_fragment.xml +++ b/OCH/charter/driver/src/main/res/layout/charter_base_fragment.xml @@ -57,8 +57,8 @@ + android:src="@drawable/charter_ic_autopilot" /> @@ -200,12 +200,12 @@ android:layout_marginLeft="@dimen/dp_13" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toBottomOf="@id/module_mogo_och_autopilot_status" - app:layout_goneMarginTop="@dimen/module_mogo_och_station_panel_container_margin_top_no_call" /> + app:layout_goneMarginTop="@dimen/dp_530" /> @@ -232,7 +232,7 @@ android:id="@+id/bus_switch_model_layout" android:layout_width="@dimen/dp_172" android:layout_height="@dimen/dp_172" - android:background="@drawable/bus_operation_status_bg" + android:background="@drawable/charter_operation_status_bg" android:gravity="center" android:orientation="horizontal" app:layout_constraintBottom_toBottomOf="parent" @@ -248,7 +248,7 @@ android:id="@+id/module_mogo_och_setting_layout" android:layout_width="@dimen/dp_172" android:layout_height="@dimen/dp_172" - android:background="@drawable/bus_operation_status_bg" + android:background="@drawable/charter_operation_status_bg" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toRightOf="@id/bus_switch_model_layout"> @@ -257,7 +257,7 @@ android:layout_height="@dimen/dp_80" android:layout_centerInParent="true" android:layout_gravity="center" - android:background="@drawable/bus_setting_btn_bg" /> + android:background="@drawable/charter_setting_btn_bg" /> @@ -265,7 +265,7 @@ android:id="@+id/module_mogo_och_badcase_rl" android:layout_width="@dimen/dp_172" android:layout_height="@dimen/dp_172" - android:background="@drawable/bus_operation_status_bg_selector" + android:background="@drawable/charter_operation_status_bg_selector" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toRightOf="@id/module_mogo_och_setting_layout"> @@ -274,7 +274,7 @@ android:layout_height="@dimen/dp_80" android:layout_centerInParent="true" android:layout_gravity="center" - android:src="@drawable/icon_bad_case" /> + android:src="@drawable/charter_bad_case" /> @@ -282,7 +282,7 @@ android:id="@+id/module_mogo_och_ai_collet_rl" android:layout_width="@dimen/dp_172" android:layout_height="@dimen/dp_172" - android:background="@drawable/bus_operation_status_bg_selector" + android:background="@drawable/charter_operation_status_bg_selector" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toRightOf="@id/module_mogo_och_badcase_rl"> @@ -291,7 +291,7 @@ android:layout_height="@dimen/dp_80" android:layout_centerInParent="true" android:layout_gravity="center" - android:src="@drawable/icon_ai_collect" /> + android:src="@drawable/charter_ai_collect" />