diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt index 5be1d097af..ab3d2e9a95 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt @@ -9,7 +9,6 @@ import com.mogo.eagle.core.function.call.hmi.CallerHmiManager import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager import com.mogo.eagle.core.utilcode.kotlin.onClick import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger -import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_TAXI_P import com.mogo.eagle.core.utilcode.util.DeviceUtils import com.mogo.eagle.core.utilcode.util.OverlayViewUtils @@ -25,7 +24,6 @@ import com.mogo.och.taxi.passenger.ui.arrived.ArrivedView import com.mogo.och.taxi.passenger.ui.check.TaxiPassengerCheckView import com.mogo.och.taxi.passenger.ui.startautopilot.StartAutopilotView import kotlinx.android.synthetic.main.taxi_p_base_fragment.* -import kotlinx.android.synthetic.main.taxi_p_base_fragment.* import java.lang.ref.WeakReference /** @@ -98,6 +96,7 @@ class TaxiPassengerBaseFragment() : pcnActionView.visibility = View.VISIBLE CallerHmiManager.showTrafficLightView() infoVideoView.visibility = View.GONE + CallerHmiManager.showTurnLightView() } BottomBar.SelectView.OVERMAPVIEW -> { overMapView.visibility = View.VISIBLE @@ -110,6 +109,7 @@ class TaxiPassengerBaseFragment() : pcnActionView.visibility = View.VISIBLE CallerHmiManager.showTrafficLightView() infoVideoView.visibility = View.GONE + CallerHmiManager.showTurnLightView() } BottomBar.SelectView.VIDEO -> { overMapView.visibility = View.GONE @@ -122,6 +122,7 @@ class TaxiPassengerBaseFragment() : pcnActionView.visibility = View.GONE CallerHmiManager.hideTrafficLightView() infoVideoView.visibility = View.VISIBLE + CallerHmiManager.hideTurnLightView() } else -> {} @@ -140,8 +141,8 @@ class TaxiPassengerBaseFragment() : // 切换缩放到中视角 controller.changeZoom2(0.8f) } - showOrHideArrivedEndLayout(true) -// showOrHideStartAutopilotView(true) +// showOrHideArrivedEndLayout(true) + showOrHideStartAutopilotView(true) } BottomBar.SelectView.OVERMAPVIEW -> { overMapView.displayCustomOverView() @@ -265,8 +266,6 @@ class TaxiPassengerBaseFragment() : * ④ debug 使用 * * @param isShow true 展示 false 隐藏 - * @param arrivedEndStation 目的地 - * @param orderNo 订单No */ fun showOrHideArrivedEndLayout(isShow: Boolean) { if (isShow) { diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/startautopilot/StartAutopilotView.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/startautopilot/StartAutopilotView.kt index cd642c9efc..585d97353c 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/startautopilot/StartAutopilotView.kt +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/startautopilot/StartAutopilotView.kt @@ -93,7 +93,7 @@ class StartAutopilotView : WindowRelativeLayout, StartAutopilotViewModel.StartAu @SuppressLint("UseCompatLoadingForDrawables") override fun handleStartAutopilotBtnStatus(isClickable: Boolean) { - taxi_p_autopilot_starting?.setImageResource(R.drawable.light_00000) + taxi_p_autopilot_starting?.setImageResource(R.drawable.light_00003) updateStartAutopilotBtnStatus(isClickable) if (isClickable) { //高亮可点击状态下动画一直进行 startAutopilotBgAnimatorDrawable(true) @@ -151,7 +151,7 @@ class StartAutopilotView : WindowRelativeLayout, StartAutopilotViewModel.StartAu if (mCarAnimationDrawable != null) { mCarAnimationDrawable!!.stop() } - taxi_p_autopilot_starting!!.setImageResource(R.drawable.light_00000) + taxi_p_autopilot_starting!!.setImageResource(R.drawable.light_00003) } } diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_blue_tooth_close.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_blue_tooth_close.png index e547bddbb2..55896f8433 100644 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_blue_tooth_close.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_blue_tooth_close.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/light_00000.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/light_00000.png old mode 100755 new mode 100644 index 383fd3ce6a..a3f6f47ae9 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/light_00000.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/light_00000.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/light_00001.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/light_00001.png old mode 100755 new mode 100644 index 9017b26f03..51a351d7ec Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/light_00001.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/light_00001.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/light_00002.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/light_00002.png old mode 100755 new mode 100644 index 485d79cc9c..afa614db38 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/light_00002.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/light_00002.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/light_00003.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/light_00003.png old mode 100755 new mode 100644 index 283b069fcf..b0f967849a Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/light_00003.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/light_00003.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/light_00004.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/light_00004.png old mode 100755 new mode 100644 index 9690363efc..9eb3679dbd Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/light_00004.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/light_00004.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/light_00005.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/light_00005.png old mode 100755 new mode 100644 index d066263bce..a68bb04890 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/light_00005.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/light_00005.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/light_00006.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/light_00006.png old mode 100755 new mode 100644 index de9763c559..9474a4052d Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/light_00006.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/light_00006.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/light_00007.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/light_00007.png old mode 100755 new mode 100644 index bcab58b3a9..57feb25dd3 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/light_00007.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/light_00007.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/light_00008.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/light_00008.png old mode 100755 new mode 100644 index 9c5f0994d3..08be70100f Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/light_00008.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/light_00008.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/light_00009.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/light_00009.png old mode 100755 new mode 100644 index b543a650cd..6b31156a28 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/light_00009.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/light_00009.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/light_00010.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/light_00010.png old mode 100755 new mode 100644 index e51ae88287..ca34b46de9 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/light_00010.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/light_00010.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/light_00011.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/light_00011.png old mode 100755 new mode 100644 index 426caaa5d6..e57389e542 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/light_00011.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/light_00011.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/light_00012.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/light_00012.png old mode 100755 new mode 100644 index 64cbc675c6..b7292d22b9 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/light_00012.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/light_00012.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/light_00013.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/light_00013.png old mode 100755 new mode 100644 index 6f272fa759..e9d45b62f5 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/light_00013.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/light_00013.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_xioazhi_normal.xml b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_xioazhi_normal.xml index 9d33730891..a19a723558 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_xioazhi_normal.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_xioazhi_normal.xml @@ -3,78 +3,64 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal002.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal002.png new file mode 100644 index 0000000000..e63b3cb7b9 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal002.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal004.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal004.png new file mode 100644 index 0000000000..b39834a198 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal004.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal006.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal006.png new file mode 100644 index 0000000000..c4cbb40526 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal006.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal008.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal008.png new file mode 100644 index 0000000000..416a8665c3 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal008.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal010.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal010.png new file mode 100644 index 0000000000..6a38aeb8e0 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal010.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal012.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal012.png new file mode 100644 index 0000000000..06eb10800b Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal012.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal014.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal014.png new file mode 100644 index 0000000000..d48e6cbe70 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal014.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal016.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal016.png new file mode 100644 index 0000000000..e786d4b41f Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal016.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal018.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal018.png new file mode 100644 index 0000000000..7900e79379 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal018.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal020.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal020.png new file mode 100644 index 0000000000..b9a8ae92ce Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal020.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal022.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal022.png new file mode 100644 index 0000000000..36ca5da348 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal022.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal024.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal024.png new file mode 100644 index 0000000000..e9cb163747 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal024.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal026.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal026.png new file mode 100644 index 0000000000..94cc5f7df7 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal026.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal028.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal028.png new file mode 100644 index 0000000000..445363dd80 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal028.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal030.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal030.png new file mode 100644 index 0000000000..eb1fb46582 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal030.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal032.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal032.png new file mode 100644 index 0000000000..f6436dbe62 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal032.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal034.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal034.png new file mode 100644 index 0000000000..0d7ffa6f5c Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal034.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal036.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal036.png new file mode 100644 index 0000000000..750d393cc2 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal036.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal038.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal038.png new file mode 100644 index 0000000000..16bebd99b5 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal038.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal040.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal040.png new file mode 100644 index 0000000000..46b5c85769 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal040.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal042.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal042.png new file mode 100644 index 0000000000..2880a9ab5c Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal042.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal044.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal044.png new file mode 100644 index 0000000000..da44cf10e2 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal044.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal046.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal046.png new file mode 100644 index 0000000000..4862630569 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal046.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal048.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal048.png new file mode 100644 index 0000000000..e93ff4d347 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal048.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal050.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal050.png new file mode 100644 index 0000000000..81e82d6527 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal050.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal052.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal052.png new file mode 100644 index 0000000000..a6533bdc14 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal052.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal054.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal054.png new file mode 100644 index 0000000000..b27fd34e9c Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal054.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal056.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal056.png new file mode 100644 index 0000000000..01464dc11d Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal056.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal058.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal058.png new file mode 100644 index 0000000000..602a56d2ea Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal058.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal060.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal060.png new file mode 100644 index 0000000000..7d3d5974fc Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal060.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal062.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal062.png new file mode 100644 index 0000000000..ed9f89a59d Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal062.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal064.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal064.png new file mode 100644 index 0000000000..c24cdf0e5a Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal064.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal066.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal066.png new file mode 100644 index 0000000000..f2df04fae5 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal066.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal068.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal068.png new file mode 100644 index 0000000000..7158f54df7 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal068.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal070.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal070.png new file mode 100644 index 0000000000..c3ccf74bb1 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal070.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal072.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal072.png new file mode 100644 index 0000000000..77087a9982 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal072.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal074.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal074.png new file mode 100644 index 0000000000..0c2632a433 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal074.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal076.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal076.png new file mode 100644 index 0000000000..bb51e91c61 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal076.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal078.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal078.png new file mode 100644 index 0000000000..243dba5acb Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal078.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal080.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal080.png new file mode 100644 index 0000000000..c90b9dcc3a Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal080.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal082.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal082.png new file mode 100644 index 0000000000..493d4ac1e7 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal082.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal084.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal084.png new file mode 100644 index 0000000000..a88c93cbc1 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal084.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal086.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal086.png new file mode 100644 index 0000000000..217e937ff9 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal086.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal088.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal088.png new file mode 100644 index 0000000000..522e076acd Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal088.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal090.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal090.png new file mode 100644 index 0000000000..6b380c897d Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal090.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal092.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal092.png new file mode 100644 index 0000000000..cbff642fce Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal092.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal094.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal094.png new file mode 100644 index 0000000000..1665bfc1b3 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal094.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal096.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal096.png new file mode 100644 index 0000000000..7bfc5e05aa Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal096.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal098.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal098.png new file mode 100644 index 0000000000..2d4ebc3e36 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal098.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal100.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal100.png new file mode 100644 index 0000000000..62090b59f2 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal100.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal102.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal102.png new file mode 100644 index 0000000000..4dd808daf9 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal102.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal104.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal104.png new file mode 100644 index 0000000000..ccd7dff56b Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal104.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal106.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal106.png new file mode 100644 index 0000000000..1cf753a89c Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal106.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal108.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal108.png new file mode 100644 index 0000000000..aed8878498 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal108.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal110.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal110.png new file mode 100644 index 0000000000..260778dd97 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal110.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal112.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal112.png new file mode 100644 index 0000000000..28166faff3 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal112.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal114.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal114.png new file mode 100644 index 0000000000..368e33cc77 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal114.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal116.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal116.png new file mode 100644 index 0000000000..0ff0fd051b Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal116.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal118.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal118.png new file mode 100644 index 0000000000..ba86b3e81e Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal118.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_001.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_001.png deleted file mode 100644 index 14bc96edde..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_001.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_002.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_002.png deleted file mode 100644 index a36b1da62b..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_002.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_003.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_003.png deleted file mode 100644 index 87b553eb8c..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_003.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_004.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_004.png deleted file mode 100644 index f2d0e78377..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_004.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_005.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_005.png deleted file mode 100644 index 6aa005a055..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_005.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_006.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_006.png deleted file mode 100644 index 4b1e9a9de5..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_006.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_007.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_007.png deleted file mode 100644 index bf68dac47a..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_007.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_008.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_008.png deleted file mode 100644 index fd712a4095..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_008.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_009.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_009.png deleted file mode 100644 index 05b17f3cd3..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_009.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_010.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_010.png deleted file mode 100644 index 025b42e2ab..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_010.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_011.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_011.png deleted file mode 100644 index 8969af2617..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_011.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_012.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_012.png deleted file mode 100644 index e7471586b0..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_012.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_013.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_013.png deleted file mode 100644 index dd6fcc7786..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_013.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_014.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_014.png deleted file mode 100644 index 08536db05a..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_014.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_015.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_015.png deleted file mode 100644 index 2d4231035b..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_015.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_016.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_016.png deleted file mode 100644 index 7f48db0506..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_016.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_017.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_017.png deleted file mode 100644 index 954ed2def0..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_017.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_018.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_018.png deleted file mode 100644 index eda4e15a9d..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_018.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_019.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_019.png deleted file mode 100644 index 1b0a34c76d..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_019.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_020.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_020.png deleted file mode 100644 index 681bd1645f..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_020.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_021.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_021.png deleted file mode 100644 index f3ef6b2dc4..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_021.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_022.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_022.png deleted file mode 100644 index 43295566fd..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_022.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_023.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_023.png deleted file mode 100644 index bfb89ede83..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_023.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_024.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_024.png deleted file mode 100644 index 8cc2c71b46..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_024.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_025.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_025.png deleted file mode 100644 index deb5204f2e..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_025.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_026.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_026.png deleted file mode 100644 index a85cb6b3d9..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_026.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_027.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_027.png deleted file mode 100644 index bb8fddcd13..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_027.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_028.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_028.png deleted file mode 100644 index 2fc95f1c41..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_028.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_029.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_029.png deleted file mode 100644 index f83ca099a1..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_029.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_030.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_030.png deleted file mode 100644 index 27b215d5b9..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_030.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_031.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_031.png deleted file mode 100644 index 7693a6d1f1..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_031.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_032.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_032.png deleted file mode 100644 index ff2ed7db69..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_032.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_033.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_033.png deleted file mode 100644 index 1fc080a11e..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_033.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_034.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_034.png deleted file mode 100644 index 518acd262d..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_034.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_035.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_035.png deleted file mode 100644 index 4331a45174..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_035.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_036.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_036.png deleted file mode 100644 index 5c588a63bb..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_036.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_037.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_037.png deleted file mode 100644 index b201614624..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_037.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_038.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_038.png deleted file mode 100644 index d1786ec29e..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_038.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_039.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_039.png deleted file mode 100644 index 7fe6b0b652..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_039.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_040.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_040.png deleted file mode 100644 index 6fc6ff93ec..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_040.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_041.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_041.png deleted file mode 100644 index 1036f21e96..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_041.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_042.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_042.png deleted file mode 100644 index b5120ea601..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_042.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_043.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_043.png deleted file mode 100644 index 1895b6d113..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_043.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_044.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_044.png deleted file mode 100644 index 9074c1a86c..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_044.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_045.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_045.png deleted file mode 100644 index 5040da3c8d..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_045.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_046.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_046.png deleted file mode 100644 index c84424d4ea..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_046.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_047.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_047.png deleted file mode 100644 index 46bd5d50bf..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_047.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_048.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_048.png deleted file mode 100644 index d0150d4136..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_048.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_049.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_049.png deleted file mode 100644 index 05ee2a8f21..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_049.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_050.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_050.png deleted file mode 100644 index 43ef587987..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_050.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_051.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_051.png deleted file mode 100644 index edee75dd1f..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_051.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_052.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_052.png deleted file mode 100644 index 86fe1610ad..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_052.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_053.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_053.png deleted file mode 100644 index 427333dbd1..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_053.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_054.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_054.png deleted file mode 100644 index ef05391406..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_054.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_055.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_055.png deleted file mode 100644 index fe5a759b61..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_055.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_056.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_056.png deleted file mode 100644 index a9e5aab6ec..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_056.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_057.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_057.png deleted file mode 100644 index 64aa4c945e..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_057.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_058.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_058.png deleted file mode 100644 index ad3747d97a..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_058.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_059.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_059.png deleted file mode 100644 index ee07110d07..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_059.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_060.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_060.png deleted file mode 100644 index e24b93d5ec..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_060.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_061.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_061.png deleted file mode 100644 index b65e9e9646..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_061.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_062.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_062.png deleted file mode 100644 index 8fbf30603a..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_062.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_063.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_063.png deleted file mode 100644 index 5148d07e06..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_063.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_064.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_064.png deleted file mode 100644 index a20393e74d..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_064.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_065.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_065.png deleted file mode 100644 index 967f5ec3f0..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_065.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_end_panel.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_end_panel.xml index 960552ebf9..14a60f8b6e 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_end_panel.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_end_panel.xml @@ -110,7 +110,7 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" android:layout_marginEnd="@dimen/dp_98" - android:src="@drawable/xiaozhi_normal_001" + android:src="@drawable/xiaozhi_normal002" android:layout_marginBottom="@dimen/dp_30" android:layout_width="@dimen/dp_216" android:layout_height="@dimen/dp_216"/> diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_blue_tooth.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_blue_tooth.xml index 26243e5e87..fce1c38ed9 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_blue_tooth.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_blue_tooth.xml @@ -1,13 +1,13 @@ + android:layout_width="@dimen/dp_54" + android:layout_height="@dimen/dp_54"> diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_passenger_check_panel.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_passenger_check_panel.xml index 16275cba98..2a733abe20 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_passenger_check_panel.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_passenger_check_panel.xml @@ -305,7 +305,7 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" android:layout_marginEnd="@dimen/dp_82" - android:src="@drawable/xiaozhi_normal_001" + android:src="@drawable/xiaozhi_normal002" android:layout_marginBottom="@dimen/dp_28" android:layout_width="wrap_content" android:layout_height="wrap_content"/>