diff --git a/OCH/mogo-och-common-module/src/debug/java/com/mogo/och/common/module/debug/BizBroadcastReceiver.kt b/OCH/mogo-och-common-module/src/debug/java/com/mogo/och/common/module/debug/BizBroadcastReceiver.kt index b33df5e396..5bcaf39ad8 100644 --- a/OCH/mogo-och-common-module/src/debug/java/com/mogo/och/common/module/debug/BizBroadcastReceiver.kt +++ b/OCH/mogo-och-common-module/src/debug/java/com/mogo/och/common/module/debug/BizBroadcastReceiver.kt @@ -29,7 +29,7 @@ class BizBroadcastReceiver: BroadcastReceiver() { CallerLogger.d("${SceneConstant.M_OCHCOMMON}${TAG}", "类型：${type} 频率：${frequency} 命令所在文件:${sourceFilePath}" ) - DebugDataDispatch.disPathc(type,frequency,sourceFilePath) + DebugDataDispatch.disPathc(type,frequency,sourceFilePath,intent) } catch (e: Exception) { e.printStackTrace() } diff --git a/OCH/mogo-och-common-module/src/debug/java/com/mogo/och/common/module/debug/DebugDataDispatch.kt b/OCH/mogo-och-common-module/src/debug/java/com/mogo/och/common/module/debug/DebugDataDispatch.kt index ed7619f7b4..fcf51b39bf 100644 --- a/OCH/mogo-och-common-module/src/debug/java/com/mogo/och/common/module/debug/DebugDataDispatch.kt +++ b/OCH/mogo-och-common-module/src/debug/java/com/mogo/och/common/module/debug/DebugDataDispatch.kt @@ -1,12 +1,17 @@ package com.mogo.och.common.module.debug +import android.content.Intent import android.os.Environment +import chassis.Chassis.DoorNumber +import chassis.VehicleStateOuterClass import com.amap.api.maps.model.LatLng import com.google.gson.reflect.TypeToken import com.mogo.eagle.core.data.enums.DataSourceType import com.mogo.eagle.core.data.map.MogoLocation +import com.mogo.eagle.core.function.call.autopilot.CallerChassisDoorStateListenerManager import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager import com.mogo.eagle.core.function.call.autopilot.CallerPlanningRottingListenerManager +import com.mogo.eagle.core.utilcode.geometry.S2LaxPolygonShape.MultiList 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.util.GsonUtils @@ -26,12 +31,18 @@ object DebugDataDispatch { const val globalPathMock = "globalPath" const val locationMock = "location" + const val carDoorMock = "carDoor" + +// adb shell am broadcast -a com.mogo.launcher.debug -f 0x011000000 --es type "location" --es path "sy73_log.json" +// adb shell am broadcast -a com.mogo.launcher.debug -f 0x011000000 --es type "globalPath" --es path "sy73.json" +// adb shell am broadcast -a com.mogo.launcher.debug -f 0x011000000 --es type "carDoor" --ei doorPostion 1 --ei doorStatus 1 + val ROOT_PATH = Environment.getExternalStorageDirectory().absolutePath + File.separator + "MLog" + File.separator + "APPLog" + File.separator //程序外部存储跟目录 - fun disPathc(type: String?, frequency: Int, sourceFilePath: String?) { + fun disPathc(type: String?, frequency: Int, sourceFilePath: String?, intent: Intent) { when (type) { globalPathMock -> { sourceFilePath?.let { @@ -43,6 +54,20 @@ object DebugDataDispatch { getLocaitonByLog(ROOT_PATH+it) } } + carDoorMock -> { + // 1--5 + val intArrayExtra = intent.getIntExtra("doorPostion",0) + // 0 -1 + val booleanArrayExtra = intent.getIntExtra("doorStatus",0) + + val newBuilder = VehicleStateOuterClass.DoorStateV2.newBuilder() + newBuilder.number = DoorNumber.forNumber(intArrayExtra) + newBuilder.status = booleanArrayExtra + val multiList = mutableListOf() + multiList.add(newBuilder.build()) + + CallerChassisDoorStateListenerManager.invokeAutopilotDoorState(multiList) + } else -> {} } } 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 a0d0556852..3f565b80c2 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 @@ -23,6 +23,7 @@ import kotlinx.android.synthetic.main.taxi_p_start_autopilot_view.view.actv_fron import kotlinx.android.synthetic.main.taxi_p_start_autopilot_view.view.actv_orderinfo import kotlinx.android.synthetic.main.taxi_p_start_autopilot_view.view.actv_rear_left_door import kotlinx.android.synthetic.main.taxi_p_start_autopilot_view.view.actv_rear_right_door +import kotlinx.android.synthetic.main.taxi_p_start_autopilot_view.view.iv_xiaozhi_belt import kotlinx.android.synthetic.main.taxi_p_start_autopilot_view.view.starting_autopilot_view_close 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 @@ -53,6 +54,7 @@ class StartAutopilotView : WindowRelativeLayout, StartAutopilotViewModel.StartAu private var taxiPStartAutopilot: AnimationsContainer?=null private var taxiPStartAutopilotCar: AnimationsContainer?=null + private var taxiPXiaozhiBelt: AnimationsContainer?=null init { @@ -73,6 +75,12 @@ class StartAutopilotView : WindowRelativeLayout, StartAutopilotViewModel.StartAu CallerLogger.d(SceneConstant.M_TAXI_P + TAG, "动画暂停") } }) + taxiPXiaozhiBelt = AnimationsContainer(R.array.xiaozhi_belt, 15,iv_xiaozhi_belt) + taxiPXiaozhiBelt?.setOnAnimStopListener(object :AnimationsContainer.OnAnimationStoppedListener{ + override fun AnimationStopped() { + CallerLogger.d(SceneConstant.M_TAXI_P + TAG, "动画暂停") + } + }) } fun startAutopilotBgAnimatorDrawable(isStart: Boolean) { @@ -230,6 +238,7 @@ class StartAutopilotView : WindowRelativeLayout, StartAutopilotViewModel.StartAu v_xiaozhi_belt_info_bg.onClick { handleStartAutopilotBtnStatus(true) } + taxiPXiaozhiBelt?.start() } @@ -237,6 +246,7 @@ class StartAutopilotView : WindowRelativeLayout, StartAutopilotViewModel.StartAu isStarting = false clearStartingAnimFrame() clearBgAnimDrawable() + taxiPXiaozhiBelt?.stop() super.onDetachedFromWindow() } } \ No newline at end of file diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/startautopilot/StartAutopilotViewModel.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/startautopilot/StartAutopilotViewModel.kt index 5482ef3dda..969d3a59a3 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/startautopilot/StartAutopilotViewModel.kt +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/startautopilot/StartAutopilotViewModel.kt @@ -7,6 +7,7 @@ import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisDoorStateListener import com.mogo.eagle.core.function.call.autopilot.CallerChassisDoorStateListenerManager 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.util.UiThreadHandler import com.mogo.och.taxi.passenger.callback.IOCHTaxiPassengerOrderStatusCallback import com.mogo.och.taxi.passenger.model.AutopilotManager import com.mogo.och.taxi.passenger.model.TaxiPassengerModel @@ -34,29 +35,7 @@ class StartAutopilotViewModel : ViewModel(), IOCHTaxiPassengerOrderStatusCallbac val doorList = CallerChassisDoorStateListenerManager.getDoorList() CallerLogger.d(SceneConstant.M_TAXI_P + TAG, "门太变化初始化：${doorList}") doorList?.forEach { - when (it.number) { - DoorNumber.FRONT_LEFT -> { - viewCallback?.setDoorStatus(DoorPosition.FRONT_LEFT,it.status==1) - } - - DoorNumber.FRONT_RIGHT -> { - viewCallback?.setDoorStatus(DoorPosition.FRONT_RIGHT,it.status==1) - } - - DoorNumber.REAR_LEFT -> { - viewCallback?.setDoorStatus(DoorPosition.REAR_LEFT,it.status==1) - } - - DoorNumber.REAR_RIGHT -> { - viewCallback?.setDoorStatus(DoorPosition.REAR_RIGHT,it.status==1) - } - - DoorNumber.MIDDLE -> { - viewCallback?.setDoorStatus(DoorPosition.MIDDLE,it.status==1) - } - - else -> {} - } + exchangeEnum(it.number,it.status==1) } } @@ -100,31 +79,42 @@ class StartAutopilotViewModel : ViewModel(), IOCHTaxiPassengerOrderStatusCallbac override fun onAutopilotSingleDoorState(num: Chassis.DoorNumber, open: Boolean) { super.onAutopilotSingleDoorState(num, open) CallerLogger.d(SceneConstant.M_TAXI_P + TAG, "门太变化：${num}--${open}") + exchangeEnum(num,open) + } + + private fun exchangeEnum(num: Chassis.DoorNumber,open: Boolean){ when (num) { DoorNumber.FRONT_LEFT -> { - viewCallback?.setDoorStatus(DoorPosition.FRONT_LEFT,open) + runMain(DoorPosition.FRONT_LEFT,open) } DoorNumber.FRONT_RIGHT -> { - viewCallback?.setDoorStatus(DoorPosition.FRONT_RIGHT,open) + runMain(DoorPosition.FRONT_RIGHT,open) } DoorNumber.REAR_LEFT -> { - viewCallback?.setDoorStatus(DoorPosition.REAR_LEFT,open) + runMain(DoorPosition.REAR_LEFT,open) } DoorNumber.REAR_RIGHT -> { - viewCallback?.setDoorStatus(DoorPosition.REAR_RIGHT,open) + runMain(DoorPosition.REAR_RIGHT,open) } DoorNumber.MIDDLE -> { - viewCallback?.setDoorStatus(DoorPosition.MIDDLE,open) + runMain(DoorPosition.MIDDLE,open) } else -> {} } } + private fun runMain(posttion:DoorPosition,isOpen: Boolean){ + UiThreadHandler.post { + viewCallback?.setDoorStatus(posttion,isOpen) + } + } + + interface StartAutopilotCallback { fun handleStartAutopilotBtnStatus(isBoarded: Boolean) fun setOrderInfo(show: String) diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_map_car.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_map_car.png index 3dc7578590..560ba9a367 100644 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_map_car.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_map_car.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_map_car_light.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_map_car_light.png index c980c18981..3d4acc9951 100644 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_map_car_light.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_map_car_light.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_000.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_000.png new file mode 100755 index 0000000000..dc02d142fc Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_000.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_001.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_001.png new file mode 100755 index 0000000000..bbdea63868 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_001.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_002.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_002.png new file mode 100755 index 0000000000..2e47294ae0 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_002.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_003.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_003.png new file mode 100755 index 0000000000..cdf8848baa Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_003.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_004.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_004.png new file mode 100755 index 0000000000..428b2e6089 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_004.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_005.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_005.png new file mode 100755 index 0000000000..b5848a97f8 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_005.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_006.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_006.png new file mode 100755 index 0000000000..68f6057614 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_006.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_007.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_007.png new file mode 100755 index 0000000000..85f75927b0 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_007.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_008.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_008.png new file mode 100755 index 0000000000..8ff0c749ee Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_008.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_009.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_009.png new file mode 100755 index 0000000000..bce367e306 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_009.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_010.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_010.png new file mode 100755 index 0000000000..89e66f1d6a Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_010.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_011.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_011.png new file mode 100755 index 0000000000..149ab11fba Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_011.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_012.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_012.png new file mode 100755 index 0000000000..5e58823550 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_012.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_013.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_013.png new file mode 100755 index 0000000000..d3079ef2da Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_013.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_014.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_014.png new file mode 100755 index 0000000000..5f2524166a Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_014.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_015.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_015.png new file mode 100755 index 0000000000..216249be50 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_015.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_016.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_016.png new file mode 100755 index 0000000000..4465305efc Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_016.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_017.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_017.png new file mode 100755 index 0000000000..533a974f5b Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_017.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_018.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_018.png new file mode 100755 index 0000000000..8dce9ab91f Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_018.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_019.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_019.png new file mode 100755 index 0000000000..5aa9065b4f Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_019.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_020.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_020.png new file mode 100755 index 0000000000..9594926e7c Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_020.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_021.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_021.png new file mode 100755 index 0000000000..dc3ab0f50d Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_021.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_022.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_022.png new file mode 100755 index 0000000000..bb5e8ee278 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_022.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_023.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_023.png new file mode 100755 index 0000000000..9647352845 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_023.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_024.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_024.png new file mode 100755 index 0000000000..27aa8b213d Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_024.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_025.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_025.png new file mode 100755 index 0000000000..88e8fee290 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_025.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_026.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_026.png new file mode 100755 index 0000000000..718de44286 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_026.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_027.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_027.png new file mode 100755 index 0000000000..baef995016 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_027.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_028.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_028.png new file mode 100755 index 0000000000..51c492f00f Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_028.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_029.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_029.png new file mode 100755 index 0000000000..42ae9da6b9 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_029.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_030.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_030.png new file mode 100755 index 0000000000..8422896d73 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_030.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_031.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_031.png new file mode 100755 index 0000000000..2a92bba341 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_031.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_032.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_032.png new file mode 100755 index 0000000000..02081c5a36 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_032.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_033.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_033.png new file mode 100755 index 0000000000..673c1f8301 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_033.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_034.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_034.png new file mode 100755 index 0000000000..5ffe7bbb2c Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_034.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_035.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_035.png new file mode 100755 index 0000000000..89b156fc30 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_035.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_036.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_036.png new file mode 100755 index 0000000000..eb99f327c0 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_036.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_037.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_037.png new file mode 100755 index 0000000000..b002816e80 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_037.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_038.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_038.png new file mode 100755 index 0000000000..92b56f031b Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_038.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_039.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_039.png new file mode 100755 index 0000000000..ee1fd2d15e Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_039.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_040.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_040.png new file mode 100755 index 0000000000..efbebc1c84 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_040.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_041.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_041.png new file mode 100755 index 0000000000..a976070776 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_041.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_042.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_042.png new file mode 100755 index 0000000000..ca1edadfd7 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_042.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_043.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_043.png new file mode 100755 index 0000000000..7b255286bb Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_043.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_044.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_044.png new file mode 100755 index 0000000000..710755927c Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_044.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_045.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_045.png new file mode 100755 index 0000000000..7c9123c8bc Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_045.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_046.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_046.png new file mode 100755 index 0000000000..82fc0d5753 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_046.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_047.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_047.png new file mode 100755 index 0000000000..c7c91207c3 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_047.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_048.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_048.png new file mode 100755 index 0000000000..28032ff402 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_048.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_049.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_049.png new file mode 100755 index 0000000000..2c6830833f Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_049.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_050.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_050.png new file mode 100755 index 0000000000..04afd5754c Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_050.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_051.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_051.png new file mode 100755 index 0000000000..ba9e72c76f Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_051.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_052.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_052.png new file mode 100755 index 0000000000..3468c9dbe4 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_052.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_053.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_053.png new file mode 100755 index 0000000000..46da555c6f Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_053.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_054.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_054.png new file mode 100755 index 0000000000..15cf6b1a89 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_054.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_055.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_055.png new file mode 100755 index 0000000000..01903dda51 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_055.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_056.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_056.png new file mode 100755 index 0000000000..372bad7c5d Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_056.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_057.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_057.png new file mode 100755 index 0000000000..2d27f781a0 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_057.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_058.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_058.png new file mode 100755 index 0000000000..4812010741 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_058.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_059.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_059.png new file mode 100755 index 0000000000..47e92e74ce Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_059.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/font/din.ttf b/OCH/mogo-och-taxi-passenger/src/main/res/font/din.ttf index db558e4dbc..60e06cb75f 100644 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/font/din.ttf and b/OCH/mogo-och-taxi-passenger/src/main/res/font/din.ttf differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_bottom_bar.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_bottom_bar.xml index a43e39baef..160833677c 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_bottom_bar.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_bottom_bar.xml @@ -20,7 +20,6 @@ android:textColor="@color/taxi_p_111D2F" android:textSize="@dimen/dp_52" android:layout_marginStart="@dimen/dp_92" - android:letterSpacing="-0.05" android:layout_width="wrap_content" android:layout_height="match_parent"/> 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 29d38613a5..8390992694 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 @@ -141,9 +141,9 @@ android:id="@+id/iv_xiaozhi_belt" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" - android:layout_marginEnd="@dimen/dp_98" + android:layout_marginEnd="@dimen/dp_84" android:src="@drawable/xiaozhi_safety_belt" - android:layout_marginBottom="@dimen/dp_30" + android:layout_marginBottom="@dimen/dp_14" android:layout_width="wrap_content" android:layout_height="wrap_content"/> diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/values/arrays.xml b/OCH/mogo-och-taxi-passenger/src/main/res/values/arrays.xml index d72eb2b061..1776029165 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/values/arrays.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/values/arrays.xml @@ -186,4 +186,75 @@ @drawable/xiaozhi_love_058 @drawable/xiaozhi_love_059 + + + + @drawable/xiaozhi_belt_000 + @drawable/xiaozhi_belt_001 + @drawable/xiaozhi_belt_002 + @drawable/xiaozhi_belt_003 + @drawable/xiaozhi_belt_004 + @drawable/xiaozhi_belt_005 + @drawable/xiaozhi_belt_006 + @drawable/xiaozhi_belt_007 + @drawable/xiaozhi_belt_008 + @drawable/xiaozhi_belt_009 + + @drawable/xiaozhi_belt_010 + @drawable/xiaozhi_belt_011 + @drawable/xiaozhi_belt_012 + @drawable/xiaozhi_belt_013 + @drawable/xiaozhi_belt_014 + @drawable/xiaozhi_belt_015 + @drawable/xiaozhi_belt_016 + @drawable/xiaozhi_belt_017 + @drawable/xiaozhi_belt_018 + @drawable/xiaozhi_belt_019 + + @drawable/xiaozhi_belt_020 + @drawable/xiaozhi_belt_021 + @drawable/xiaozhi_belt_022 + @drawable/xiaozhi_belt_023 + @drawable/xiaozhi_belt_024 + @drawable/xiaozhi_belt_025 + @drawable/xiaozhi_belt_026 + @drawable/xiaozhi_belt_027 + @drawable/xiaozhi_belt_028 + @drawable/xiaozhi_belt_029 + + + @drawable/xiaozhi_belt_030 + @drawable/xiaozhi_belt_031 + @drawable/xiaozhi_belt_032 + @drawable/xiaozhi_belt_033 + @drawable/xiaozhi_belt_034 + @drawable/xiaozhi_belt_035 + @drawable/xiaozhi_belt_036 + @drawable/xiaozhi_belt_037 + @drawable/xiaozhi_belt_038 + @drawable/xiaozhi_belt_039 + + @drawable/xiaozhi_belt_040 + @drawable/xiaozhi_belt_041 + @drawable/xiaozhi_belt_042 + @drawable/xiaozhi_belt_043 + @drawable/xiaozhi_belt_044 + @drawable/xiaozhi_belt_045 + @drawable/xiaozhi_belt_046 + @drawable/xiaozhi_belt_047 + @drawable/xiaozhi_belt_048 + @drawable/xiaozhi_belt_049 + + + @drawable/xiaozhi_belt_050 + @drawable/xiaozhi_belt_051 + @drawable/xiaozhi_belt_052 + @drawable/xiaozhi_belt_053 + @drawable/xiaozhi_belt_054 + @drawable/xiaozhi_belt_055 + @drawable/xiaozhi_belt_056 + @drawable/xiaozhi_belt_057 + @drawable/xiaozhi_belt_058 + @drawable/xiaozhi_belt_059 + \ No newline at end of file