[6.1.0]

[charter]
[代码搬移]

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()

OCH/charter/driver/src/driverm1/AndroidManifest.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.magic.mogo.och.charter">
-
-</manifest>

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

OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/ICharterOCH.java

@@ -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);
-}

OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/base/CharterBaseFragment.kt

@@ -93,7 +93,7 @@ abstract class CharterBaseFragment<V : IView?, P : Presenter<V>?>() :
         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<View>(R.id.bus_arc) as TrafficDataView?
@@ -108,14 +108,14 @@ abstract class CharterBaseFragment<V : IView?, P : Presenter<V>?>() :
                         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<V : IView?, P : Presenter<V>?>() :
         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<V : IView?, P : Presenter<V>?>() :
         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<V : IView?, P : Presenter<V>?>() :
         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<V : IView?, P : Presenter<V>?>() :
         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<V : IView?, P : Presenter<V>?>() :
     @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)

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<DriverM1Fragment?, DriverM1Presente
             isReturn15MTip = false
             showOrHideOrderUI(true)
 
-            passenger_phone.text = String.format(resources.getString(R.string.passenger_phone)
+            passenger_phone.text = String.format(resources.getString(R.string.charter_passenger_phone)
                 ,orderStatus.passengerPhone)
 
-            during_time.text = String.format(resources.getString(R.string.during_time_tv),
+            during_time.text = String.format(resources.getString(R.string.charter_during_time_tv),
                 DateTimeUtil.formatLongToString(orderStatus.startTime,DateTimeUtil.HH_mm)
                         +"—"+DateTimeUtil.formatLongToString(orderStatus.endTime,DateTimeUtil.HH_mm))
 
@@ -94,7 +94,7 @@ class DriverM1Fragment : CharterBaseFragment<DriverM1Fragment?, DriverM1Presente
                 driverm1_line_name.text = "暂无"
                 group_stations_panel2.visibility = GONE
                 no_line_data_view.visibility = VISIBLE
-                no_order_data_tv.text = resources.getString(R.string.bus_task_wait_tip)
+                no_order_data_tv.text = resources.getString(R.string.charter_bus_task_wait_tip)
             }else{
                 driverm1_line_name.text = orderStatus.lineName
                 driverm1StationName1Tv.text = orderStatus.startSiteName
@@ -165,7 +165,7 @@ class DriverM1Fragment : CharterBaseFragment<DriverM1Fragment?, DriverM1Presente
     }
 
     override fun getStationPanelViewId(): Int {
-        return R.layout.fragment_driver_m1
+        return R.layout.charter_fragment_driver_m1
     }
 
     override fun restartAutopilot() {
@@ -194,8 +194,8 @@ class DriverM1Fragment : CharterBaseFragment<DriverM1Fragment?, DriverM1Presente
         }
         var builder = OCHCommitDialog.Builder()
         ochCommitDialog = builder.title(title).tips(content)
-            .confirmStr(getString(R.string.bus_dialog_confirm))
-            .cancelStr(getString(R.string.bus_dialog_cancel))
+            .confirmStr(getString(R.string.charter_dialog_confirm))
+            .cancelStr(getString(R.string.charter_dialog_cancel))
             .countdownValue(120)
             .build(requireContext())
         ochCommitDialog?.setClickListener(object : OCHCommitDialog.ClickListener {
@@ -215,7 +215,7 @@ class DriverM1Fragment : CharterBaseFragment<DriverM1Fragment?, DriverM1Presente
             isReturn15MTip = false
             group_stations_panel.visibility = GONE
             no_line_data_view.visibility = VISIBLE
-            no_order_data_tv.text = resources.getString(R.string.bus_no_task_tip)
+            no_order_data_tv.text = resources.getString(R.string.charter_bus_no_task_tip)
             if (returnSuccess){
                 slidePanelView?.visibility = GONE
             }else{
@@ -235,7 +235,7 @@ class DriverM1Fragment : CharterBaseFragment<DriverM1Fragment?, DriverM1Presente
                 val minute: Double = ceil(millisUntilFinished/1000/60.0)
 
                 driverm1_order_count_down.text = String.format(
-                    resources.getString(R.string.count_down_txt)
+                    resources.getString(R.string.charter_count_down_txt)
                     ,minute.roundToInt())
 
                 if(minute.roundToInt() == 15 && !isReturn15MTip){//还车提示

OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/presenter/DriverM1Presenter.kt

@@ -131,7 +131,7 @@ class DriverM1Presenter(view: DriverM1Fragment?) :
 
     fun carReturnTip(){ //提前 15分钟 提醒
         DriverM1Model.get().pushOperationalToMsgBox(DateTimeUtil.getCurrentTimeStamp()
-            ,context.getString(R.string.last_15_minutes))
+            ,context.getString(R.string.charter_last_15_minutes))
     }
 
     override fun onAutopilotGuardian(guardianInfo: MogoReportMsg.MogoReportMessage?) {

OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/view/SlidePanelView.kt

@@ -85,7 +85,7 @@ class SlidePanelView @JvmOverloads constructor(
         val size = AutoSizeUtils.dp2px(context, 120f)
         val opts = BitmapFactory.Options()
         opts.inDensity = AutoSizeConfig.getInstance().initDensity.toInt()
-        bmBlock = BitmapFactory.decodeResource(resources, R.drawable.bus_base_slide_block, opts) as Bitmap
+        bmBlock = BitmapFactory.decodeResource(resources, R.drawable.charter_base_slide_block, opts) as Bitmap
         bmBlock = Bitmap.createScaledBitmap(bmBlock!!, size, size, true) as Bitmap
         blockWidth = bmBlock!!.width
     }

OCH/charter/driver/src/main/res/color/charter_autopilot_text_color_selector.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/bus_autopilot_text_color_normal"/>
+    <item android:color="@color/charter_autopilot_text_color_normal"/>
 </selector>

OCH/charter/driver/src/main/res/drawable/bus_base_autopilot_status_icon_selector.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/bus_base_icon_in_autopilot" android:state_checked="true" />
-    <item android:drawable="@drawable/bus_base_icon_not_in_autopilot" />
-</selector>

OCH/charter/driver/src/main/res/drawable/bus_checkbox_selector.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/bus_selected_btn" android:state_checked="true"/>
-    <item android:drawable="@drawable/bus_unselect_btn" android:state_checked="false"/>
-    <item android:drawable="@drawable/bus_unselect_btn"/>
-
-</selector>

OCH/charter/driver/src/main/res/drawable/bus_operation_status_bg_selector.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/bus_operation_status_select_bg" android:state_focused="true" android:state_pressed="true" />
-    <item android:drawable="@drawable/bus_operation_status_select_bg" android:state_focused="false" android:state_pressed="true" />
-    <item android:drawable="@drawable/bus_operation_status_select_bg" android:state_selected="true" />
-    <item android:drawable="@drawable/bus_operation_status_select_bg" android:state_focused="true" />
-    <item android:drawable="@drawable/bus_operation_status_bg" >
-    </item>
-</selector>

OCH/charter/driver/src/main/res/drawable/bus_panel_anchor_bkg.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="#2B6EFF"/>
-    <corners android:radius="33dp"/>
-</shape>

OCH/charter/driver/src/main/res/drawable/bus_setting_tip_red_cir_bg.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval">
-    <size android:width="26dp" android:height="26dp"/>
-    <corners android:radius="13dp" />
-    <gradient
-        android:angle="225"
-        android:startColor="#FF0030"
-        android:endColor="#CF2E00"
-        android:type="linear" />
-
-</shape>

OCH/charter/driver/src/main/res/drawable/bus_shape_select_line_item_bg_normal.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <gradient
-        android:endColor="#660043FF"
-        android:startColor="#0028345E" />
-</shape>

OCH/charter/driver/src/main/res/drawable/bus_shape_select_line_item_bg_selected.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <gradient
-        android:endColor="#CC0043FF"
-        android:startColor="#0028345E" />
-</shape>

OCH/charter/driver/src/main/res/drawable/bus_shape_select_line_item_time_bg.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <stroke android:color="#A7B6F0" android:width="@dimen/dp_4"/>
-    <solid android:color="#1AA7B6F0" />
-    <corners android:radius="@dimen/dp_13"/>
-</shape>

OCH/charter/driver/src/main/res/drawable/bus_shape_select_line_item_time_bg_selected.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <gradient android:startColor="#029DFF" android:endColor="#F00056FF"/>
-    <corners android:radius="@dimen/dp_13"/>
-</shape>

OCH/charter/driver/src/main/res/drawable/bus_station_green_dash_line.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="line">
-    <stroke
-        android:width="6dp"
-        android:dashGap="5dp"
-        android:dashWidth="5dp"
-        android:color="@color/bus_current_station_notice_text_color" />
-    <gradient
-        android:startColor="#f00"
-        android:endColor="#0f0" />
-</shape>

OCH/charter/driver/src/main/res/drawable/bus_station_v_green_dash.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:left="-600dp"
-        android:right="-600dp">
-        <rotate
-            android:drawable="@drawable/bus_station_green_dash_line"
-            android:visible="true"
-            android:fromDegrees="90" />
-    </item>
-</layer-list>

OCH/charter/driver/src/main/res/drawable/bus_switch_line_btn.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="rectangle">
-
-            <corners android:bottomLeftRadius="40dp"
-                android:bottomRightRadius="40dp"/>
-            <gradient android:angle="180" android:endColor="#004DFF" android:startColor="#20AAFF" />
-        </shape>
-    </item>
-</selector>

OCH/charter/driver/src/main/res/drawable/bus_switch_line_btn_commit.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners android:radius="24dp" />
-    <gradient
-        android:angle="0"
-        android:endColor="#0056FF"
-        android:startColor="#029DFF"
-        android:type="linear" />
-</shape>

OCH/charter/driver/src/main/res/drawable/bus_switch_map_bg.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <corners android:radius="@dimen/bus_switch_image_circle" />
-
-    <solid android:color="@color/bus_switch_map_bg_c" />
-
-</shape>

OCH/charter/driver/src/main/res/drawable/bus_yi_biao_pan_bg_nor.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <gradient
-        android:endColor="#3B4577"
-        android:startColor="#3B4577" />
-    <!--    <stroke-->
-    <!--        android:width="1dp"-->
-    <!--        android:color="#182155" />-->
-<!--    <corners-->
-<!--        android:bottomLeftRadius="@dimen/dp_100"-->
-<!--        android:bottomRightRadius="@dimen/dp_20"-->
-<!--        android:topLeftRadius="@dimen/dp_20"-->
-<!--        android:topRightRadius="@dimen/dp_100" />-->
-    <corners
-        android:bottomLeftRadius="130dp"
-        android:bottomRightRadius="30dp"
-        android:topLeftRadius="30dp"
-        android:topRightRadius="130dp" />
-</shape>