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 7f1f5eb6b9..cd642c9efc 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 @@ -18,6 +18,7 @@ import kotlinx.android.synthetic.main.taxi_p_start_autopilot_view.view.starting_ import kotlinx.android.synthetic.main.taxi_p_start_autopilot_view.view.taxi_p_autopilot_btn_bg import kotlinx.android.synthetic.main.taxi_p_start_autopilot_view.view.taxi_p_autopilot_starting import kotlinx.android.synthetic.main.taxi_p_start_autopilot_view.view.taxi_p_start_autopilot +import kotlinx.android.synthetic.main.taxi_p_start_autopilot_view.view.v_xiaozhi_belt_info_bg import java.util.Arrays /** @@ -66,13 +67,7 @@ class StartAutopilotView : WindowRelativeLayout, StartAutopilotViewModel.StartAu R.drawable.image_00062, R.drawable.image_00063, R.drawable.image_00064, R.drawable.image_00065, R.drawable.image_00066, R.drawable.image_00067, R.drawable.image_00068, R.drawable.image_00069, R.drawable.image_00070, R.drawable.image_00071, R.drawable.image_00072, R.drawable.image_00073, - R.drawable.image_00074, R.drawable.image_00075, R.drawable.image_00076, R.drawable.image_00077, - R.drawable.image_00078, R.drawable.image_00079, R.drawable.image_00080, R.drawable.image_00081, - R.drawable.image_00082, R.drawable.image_00083, R.drawable.image_00084, R.drawable.image_00085, - R.drawable.image_00086, R.drawable.image_00087, R.drawable.image_00088, R.drawable.image_00089, - R.drawable.image_00090, R.drawable.image_00091, R.drawable.image_00092, R.drawable.image_00093, - R.drawable.image_00094, R.drawable.image_00095, R.drawable.image_00096, R.drawable.image_00097, - R.drawable.image_00098, R.drawable.image_00099 + R.drawable.image_00074 ) init { @@ -222,6 +217,9 @@ class StartAutopilotView : WindowRelativeLayout, StartAutopilotViewModel.StartAu starting_autopilot_view_close.onClick { closeAllAnimsAndView() } + v_xiaozhi_belt_info_bg.onClick { + handleStartAutopilotBtnStatus(true) + } } diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_arrived_close.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_arrived_close.png index 2d9221c90e..77bac9388b 100644 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_arrived_close.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_arrived_close.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/anmi_flow.xml b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/anmi_flow.xml index c8e2cecfca..e9a68b40b3 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/anmi_flow.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/anmi_flow.xml @@ -227,79 +227,5 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00000.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00000.png index a87ce28353..a0dfa7f8f7 100755 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00000.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00000.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00001.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00001.png index ed4d3febae..680759b4d9 100755 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00001.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00001.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00002.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00002.png index 978dc8cbea..1c7f3cc086 100755 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00002.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00002.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00003.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00003.png index b41c810c2b..ce0c8d198f 100755 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00003.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00003.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00004.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00004.png index 15180e4954..55e12fd9d8 100755 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00004.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00004.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00005.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00005.png index 128c2b10d5..d962401364 100755 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00005.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00005.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00006.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00006.png index dcb1b8db55..4de8aba9bb 100755 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00006.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00006.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00007.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00007.png index d980c36eb3..db098cf18a 100755 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00007.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00007.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00008.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00008.png index 041bb2aca4..b1e83c861c 100755 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00008.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00008.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00009.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00009.png index 4516a22b5c..34e683dfd4 100755 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00009.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00009.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00010.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00010.png index e60876958b..6270cedfc5 100755 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00010.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00010.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00011.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00011.png index 330a294670..c00eeb72f2 100755 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00011.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00011.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00012.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00012.png index b09f0594f8..c8a45c47c9 100755 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00012.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00012.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00013.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00013.png index 201cc1c734..a99c7f9478 100755 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00013.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00013.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00014.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00014.png index 020e85e414..d3d74602cf 100755 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00014.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00014.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00015.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00015.png index a6234edea5..36eb509d99 100755 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00015.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00015.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00016.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00016.png index 2909dba853..5eb0973d43 100755 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00016.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00016.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00017.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00017.png index ae44921498..4d81785469 100755 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00017.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00017.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00018.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00018.png index b2d383af4f..9a62e2361c 100755 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00018.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00018.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00019.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00019.png index 143aa7cebf..5e3714b4f3 100755 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00019.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00019.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00020.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00020.png index cfa12dffeb..6d49b97801 100755 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00020.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00020.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00021.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00021.png index 504524e687..1dd8d65e53 100755 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00021.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00021.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00022.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00022.png index 01d2a11339..f341f65981 100755 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00022.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00022.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00023.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00023.png index ef12f3bcc2..5a4add9da6 100755 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00023.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00023.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00024.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00024.png index bfd526d29d..e959fddcc5 100755 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00024.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00024.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00025.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00025.png index f71f6f8f67..f3f8e37dd6 100755 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00025.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00025.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00026.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00026.png index 93b68757d2..30180ea84f 100755 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00026.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00026.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00027.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00027.png index e24cae142d..56709e2288 100755 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00027.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00027.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00028.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00028.png index 563899a67c..8891a817eb 100755 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00028.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00028.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00029.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00029.png index eba1e12d7f..7e5ec387ea 100755 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00029.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00029.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00030.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00030.png index 754efe49f3..7f7d07109f 100755 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00030.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00030.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00031.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00031.png index b7a9549bfb..6ff1d0c92d 100755 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00031.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00031.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00032.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00032.png index fffdf50984..4a1f910ed7 100755 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00032.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00032.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00033.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00033.png index 1155c66997..724914c5ae 100755 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00033.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00033.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00034.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00034.png index 6db7d709b8..faf19546ee 100755 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00034.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00034.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00035.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00035.png index 3935487014..10c9d2963f 100755 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00035.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00035.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00036.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00036.png index 115ebdf8af..4d312ca7ac 100755 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00036.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00036.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00037.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00037.png index c98ebf4193..16e45f0260 100755 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00037.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00037.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00038.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00038.png index c264ceffb7..0dc8f5e210 100755 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00038.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00038.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00039.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00039.png index 669efb8d98..3ad2991766 100755 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00039.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00039.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00040.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00040.png index 2c6e016b9f..7e3d5c2d45 100755 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00040.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00040.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00041.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00041.png index e538dd53cb..edb9b5d6ac 100755 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00041.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00041.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00042.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00042.png index bc36edd235..fc14a5cebd 100755 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00042.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00042.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00043.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00043.png index b29f386a92..88fc486a43 100755 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00043.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00043.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00044.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00044.png index d736ccb16a..4352edc42b 100755 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00044.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00044.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00045.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00045.png index 218e22c9a6..394d83a0c4 100755 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00045.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00045.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00046.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00046.png index b200be7006..50ed643a21 100755 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00046.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00046.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00047.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00047.png index 0a470eea86..564b42295d 100755 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00047.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00047.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00048.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00048.png index d0779a8a7e..d1d71fdf4e 100755 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00048.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00048.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00049.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00049.png index e50740e8f4..1fa95d2165 100755 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00049.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00049.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00050.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00050.png index 53210cf36b..8e113713b7 100755 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00050.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00050.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00051.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00051.png index 34134d06c2..3266319123 100755 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00051.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00051.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00052.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00052.png index 7a5302f935..6a79b83ba0 100755 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00052.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00052.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00053.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00053.png index 8eb919b142..151f20d442 100755 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00053.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00053.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00054.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00054.png index 14ab151b49..a1d880a08f 100755 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00054.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00054.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00055.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00055.png index f11a308e8a..550a0854db 100755 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00055.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00055.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00056.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00056.png index c024ce35fd..9beb224940 100755 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00056.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00056.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00057.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00057.png index a976742cf4..cfc8177cd5 100755 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00057.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00057.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00058.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00058.png index ff13384b26..882dc0f1f9 100755 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00058.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00058.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00059.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00059.png index 5143406284..9cfcd54ee6 100755 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00059.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00059.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00060.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00060.png index 5bab1626c4..b3675fb728 100755 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00060.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00060.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00061.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00061.png index 4d0c7e8722..fd08f1e40c 100755 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00061.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00061.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00062.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00062.png index 166e930576..84ee81b396 100755 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00062.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00062.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00063.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00063.png index dd7d56e8a2..ae628696ef 100755 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00063.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00063.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00064.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00064.png index 17b9be0d8a..992da81503 100755 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00064.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00064.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00065.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00065.png index f49f9d380f..7b9c99a960 100755 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00065.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00065.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00066.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00066.png index 69aa04e719..f137b9a4ea 100755 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00066.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00066.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00067.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00067.png index 331b058002..ece0a97a47 100755 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00067.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00067.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00068.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00068.png index 6a98bda7ba..43a9155a3f 100755 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00068.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00068.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00069.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00069.png index 5f27ad1be8..dc1270b18f 100755 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00069.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00069.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00070.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00070.png index 79d0ac3e8f..2f79f9ae68 100755 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00070.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00070.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00071.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00071.png index 313a84a454..7f11b0d4cc 100755 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00071.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00071.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00072.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00072.png index cb1a5e4413..e8c888ba66 100755 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00072.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00072.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00073.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00073.png index 8888c9e9b0..5e2ad3e6d3 100755 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00073.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00073.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00074.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00074.png index 2372d3e02e..28a135c02a 100755 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00074.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00074.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00075.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00075.png deleted file mode 100755 index 1e0a555772..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00075.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00076.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00076.png deleted file mode 100755 index e14570c663..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00076.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00077.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00077.png deleted file mode 100755 index d0e8ea44b9..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00077.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00078.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00078.png deleted file mode 100755 index 76acdb2656..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00078.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00079.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00079.png deleted file mode 100755 index d6b7f2f763..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00079.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00080.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00080.png deleted file mode 100755 index 23e27dd5fc..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00080.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00081.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00081.png deleted file mode 100755 index ff98b43352..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00081.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00082.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00082.png deleted file mode 100755 index 5d4f9a02b0..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00082.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00083.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00083.png deleted file mode 100755 index f055ccbe7f..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00083.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00084.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00084.png deleted file mode 100755 index 5ab712a882..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00084.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00085.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00085.png deleted file mode 100755 index a22dc3cbf8..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00085.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00086.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00086.png deleted file mode 100755 index 5c09770aaf..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00086.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00087.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00087.png deleted file mode 100755 index 87ac76f7e3..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00087.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00088.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00088.png deleted file mode 100755 index 9a3f190563..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00088.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00089.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00089.png deleted file mode 100755 index 80f112da1d..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00089.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00090.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00090.png deleted file mode 100755 index 9850e77781..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00090.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00091.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00091.png deleted file mode 100755 index 616b646b62..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00091.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00092.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00092.png deleted file mode 100755 index a43e39ea97..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00092.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00093.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00093.png deleted file mode 100755 index 7778157981..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00093.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00094.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00094.png deleted file mode 100755 index 8c99dbdf76..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00094.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00095.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00095.png deleted file mode 100755 index f14091c81c..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00095.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00096.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00096.png deleted file mode 100755 index ed6966a4a8..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00096.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00097.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00097.png deleted file mode 100755 index 96bb2b66dc..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00097.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00098.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00098.png deleted file mode 100755 index b8231a865d..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00098.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00099.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00099.png deleted file mode 100755 index b9bb05078b..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00099.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_xiaozhibelt_info.xml b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_xiaozhibelt_info.xml new file mode 100644 index 0000000000..a5287f9968 --- /dev/null +++ b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_xiaozhibelt_info.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_xiaozhibelt_info_ball.xml b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_xiaozhibelt_info_ball.xml new file mode 100644 index 0000000000..f5013dd9f1 --- /dev/null +++ b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_xiaozhibelt_info_ball.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_safety_belt.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_safety_belt.png new file mode 100644 index 0000000000..1f44f3d499 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_safety_belt.png 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 3fab5b9ecb..f4bef17cc3 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 @@ -70,4 +70,50 @@ android:layout_width="wrap_content" android:layout_height="wrap_content"/> + + + + + + + + + + + + \ No newline at end of file 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 ad32b49845..16275cba98 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 @@ -301,6 +301,15 @@ + + diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_start_autopilot_view.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_start_autopilot_view.xml index a9b12cf7c2..cd73b5e294 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_start_autopilot_view.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_start_autopilot_view.xml @@ -30,7 +30,6 @@ android:layout_width="1000dp" android:layout_height="500dp" android:clickable="false" - android:layout_marginBottom="@dimen/dp_143" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" /> @@ -40,7 +39,7 @@ android:layout_width="@dimen/taxi_p_start_autopilot_btn_width" android:layout_height="@dimen/taxi_p_start_autopilot_btn_height" android:gravity="center" - android:layout_marginBottom="@dimen/dp_106" + android:layout_marginBottom="@dimen/dp_185" android:text="@string/taxi_p_start_autopilot_txt" android:textColor="@color/taxi_p_start_autopilot_txt_color" android:textSize="@dimen/taxi_p_start_autopilot_txt_size" @@ -63,4 +62,78 @@ android:layout_width="wrap_content" android:layout_height="wrap_content"/> + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/values/colors.xml b/OCH/mogo-och-taxi-passenger/src/main/res/values/colors.xml index 51df6b2b6f..4e58750549 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/values/colors.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/values/colors.xml @@ -78,6 +78,8 @@ #121842 #242C65 #76D7FF + #255BAA + #80F8FF