[3.4.0]

[样式修改]

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

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<VehicleStateOuterClass.DoorStateV2>()
+                multiList.add(newBuilder.build())
+
+                CallerChassisDoorStateListenerManager.invokeAutopilotDoorState(multiList)
+            }
             else -> {}
         }
     }

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

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)

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"/>
 

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"/>
 

OCH/mogo-och-taxi-passenger/src/main/res/values/arrays.xml

@@ -186,4 +186,75 @@
         <item>@drawable/xiaozhi_love_058</item>
         <item>@drawable/xiaozhi_love_059</item>
     </string-array>
+
+
+    <string-array name="xiaozhi_belt">
+        <item>@drawable/xiaozhi_belt_000</item>
+        <item>@drawable/xiaozhi_belt_001</item>
+        <item>@drawable/xiaozhi_belt_002</item>
+        <item>@drawable/xiaozhi_belt_003</item>
+        <item>@drawable/xiaozhi_belt_004</item>
+        <item>@drawable/xiaozhi_belt_005</item>
+        <item>@drawable/xiaozhi_belt_006</item>
+        <item>@drawable/xiaozhi_belt_007</item>
+        <item>@drawable/xiaozhi_belt_008</item>
+        <item>@drawable/xiaozhi_belt_009</item>
+
+        <item>@drawable/xiaozhi_belt_010</item>
+        <item>@drawable/xiaozhi_belt_011</item>
+        <item>@drawable/xiaozhi_belt_012</item>
+        <item>@drawable/xiaozhi_belt_013</item>
+        <item>@drawable/xiaozhi_belt_014</item>
+        <item>@drawable/xiaozhi_belt_015</item>
+        <item>@drawable/xiaozhi_belt_016</item>
+        <item>@drawable/xiaozhi_belt_017</item>
+        <item>@drawable/xiaozhi_belt_018</item>
+        <item>@drawable/xiaozhi_belt_019</item>
+
+        <item>@drawable/xiaozhi_belt_020</item>
+        <item>@drawable/xiaozhi_belt_021</item>
+        <item>@drawable/xiaozhi_belt_022</item>
+        <item>@drawable/xiaozhi_belt_023</item>
+        <item>@drawable/xiaozhi_belt_024</item>
+        <item>@drawable/xiaozhi_belt_025</item>
+        <item>@drawable/xiaozhi_belt_026</item>
+        <item>@drawable/xiaozhi_belt_027</item>
+        <item>@drawable/xiaozhi_belt_028</item>
+        <item>@drawable/xiaozhi_belt_029</item>
+
+
+        <item>@drawable/xiaozhi_belt_030</item>
+        <item>@drawable/xiaozhi_belt_031</item>
+        <item>@drawable/xiaozhi_belt_032</item>
+        <item>@drawable/xiaozhi_belt_033</item>
+        <item>@drawable/xiaozhi_belt_034</item>
+        <item>@drawable/xiaozhi_belt_035</item>
+        <item>@drawable/xiaozhi_belt_036</item>
+        <item>@drawable/xiaozhi_belt_037</item>
+        <item>@drawable/xiaozhi_belt_038</item>
+        <item>@drawable/xiaozhi_belt_039</item>
+
+        <item>@drawable/xiaozhi_belt_040</item>
+        <item>@drawable/xiaozhi_belt_041</item>
+        <item>@drawable/xiaozhi_belt_042</item>
+        <item>@drawable/xiaozhi_belt_043</item>
+        <item>@drawable/xiaozhi_belt_044</item>
+        <item>@drawable/xiaozhi_belt_045</item>
+        <item>@drawable/xiaozhi_belt_046</item>
+        <item>@drawable/xiaozhi_belt_047</item>
+        <item>@drawable/xiaozhi_belt_048</item>
+        <item>@drawable/xiaozhi_belt_049</item>
+
+
+        <item>@drawable/xiaozhi_belt_050</item>
+        <item>@drawable/xiaozhi_belt_051</item>
+        <item>@drawable/xiaozhi_belt_052</item>
+        <item>@drawable/xiaozhi_belt_053</item>
+        <item>@drawable/xiaozhi_belt_054</item>
+        <item>@drawable/xiaozhi_belt_055</item>
+        <item>@drawable/xiaozhi_belt_056</item>
+        <item>@drawable/xiaozhi_belt_057</item>
+        <item>@drawable/xiaozhi_belt_058</item>
+        <item>@drawable/xiaozhi_belt_059</item>
+    </string-array>
 </resources>