Merge remote-tracking branch 'origin/dev_robotaxi-d_230711_3.4.0' into dev_robotaxi-d_230711_3.4.0

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

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

OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_xioazhi_normal.xml

@@ -3,78 +3,64 @@
 <animation-list xmlns:android="http://schemas.android.com/apk/res/android" android:visible="true"
 android:oneshot="false">
 
-    <item android:drawable="@drawable/xiaozhi_normal_001" android:duration="60"/>
-    <item android:drawable="@drawable/xiaozhi_normal_002" android:duration="60"/>
-    <item android:drawable="@drawable/xiaozhi_normal_003" android:duration="60"/>
-    <item android:drawable="@drawable/xiaozhi_normal_004" android:duration="60"/>
-    <item android:drawable="@drawable/xiaozhi_normal_005" android:duration="60"/>
-    <item android:drawable="@drawable/xiaozhi_normal_006" android:duration="60"/>
-    <item android:drawable="@drawable/xiaozhi_normal_007" android:duration="60"/>
-    <item android:drawable="@drawable/xiaozhi_normal_008" android:duration="60"/>
-    <item android:drawable="@drawable/xiaozhi_normal_009" android:duration="60"/>
-    <item android:drawable="@drawable/xiaozhi_normal_010" android:duration="60"/>
-
-    <item android:drawable="@drawable/xiaozhi_normal_010" android:duration="60"/>
-    <item android:drawable="@drawable/xiaozhi_normal_011" android:duration="60"/>
-    <item android:drawable="@drawable/xiaozhi_normal_012" android:duration="60"/>
-    <item android:drawable="@drawable/xiaozhi_normal_013" android:duration="60"/>
-    <item android:drawable="@drawable/xiaozhi_normal_014" android:duration="60"/>
-    <item android:drawable="@drawable/xiaozhi_normal_015" android:duration="60"/>
-    <item android:drawable="@drawable/xiaozhi_normal_016" android:duration="60"/>
-    <item android:drawable="@drawable/xiaozhi_normal_017" android:duration="60"/>
-    <item android:drawable="@drawable/xiaozhi_normal_018" android:duration="60"/>
-    <item android:drawable="@drawable/xiaozhi_normal_019" android:duration="60"/>
-
-    <item android:drawable="@drawable/xiaozhi_normal_020" android:duration="60"/>
-    <item android:drawable="@drawable/xiaozhi_normal_021" android:duration="60"/>
-    <item android:drawable="@drawable/xiaozhi_normal_022" android:duration="60"/>
-    <item android:drawable="@drawable/xiaozhi_normal_023" android:duration="60"/>
-    <item android:drawable="@drawable/xiaozhi_normal_024" android:duration="60"/>
-    <item android:drawable="@drawable/xiaozhi_normal_025" android:duration="60"/>
-    <item android:drawable="@drawable/xiaozhi_normal_026" android:duration="60"/>
-    <item android:drawable="@drawable/xiaozhi_normal_027" android:duration="60"/>
-    <item android:drawable="@drawable/xiaozhi_normal_028" android:duration="60"/>
-    <item android:drawable="@drawable/xiaozhi_normal_029" android:duration="60"/>
-
-    <item android:drawable="@drawable/xiaozhi_normal_030" android:duration="60"/>
-    <item android:drawable="@drawable/xiaozhi_normal_031" android:duration="60"/>
-    <item android:drawable="@drawable/xiaozhi_normal_032" android:duration="60"/>
-    <item android:drawable="@drawable/xiaozhi_normal_033" android:duration="60"/>
-    <item android:drawable="@drawable/xiaozhi_normal_034" android:duration="60"/>
-    <item android:drawable="@drawable/xiaozhi_normal_035" android:duration="60"/>
-    <item android:drawable="@drawable/xiaozhi_normal_036" android:duration="60"/>
-    <item android:drawable="@drawable/xiaozhi_normal_037" android:duration="60"/>
-    <item android:drawable="@drawable/xiaozhi_normal_038" android:duration="60"/>
-    <item android:drawable="@drawable/xiaozhi_normal_039" android:duration="60"/>
-
-    <item android:drawable="@drawable/xiaozhi_normal_040" android:duration="60"/>
-    <item android:drawable="@drawable/xiaozhi_normal_041" android:duration="60"/>
-    <item android:drawable="@drawable/xiaozhi_normal_042" android:duration="60"/>
-    <item android:drawable="@drawable/xiaozhi_normal_043" android:duration="60"/>
-    <item android:drawable="@drawable/xiaozhi_normal_044" android:duration="60"/>
-    <item android:drawable="@drawable/xiaozhi_normal_045" android:duration="60"/>
-    <item android:drawable="@drawable/xiaozhi_normal_046" android:duration="60"/>
-    <item android:drawable="@drawable/xiaozhi_normal_047" android:duration="60"/>
-    <item android:drawable="@drawable/xiaozhi_normal_048" android:duration="60"/>
-    <item android:drawable="@drawable/xiaozhi_normal_049" android:duration="60"/>
-
-    <item android:drawable="@drawable/xiaozhi_normal_050" android:duration="60"/>
-    <item android:drawable="@drawable/xiaozhi_normal_051" android:duration="60"/>
-    <item android:drawable="@drawable/xiaozhi_normal_052" android:duration="60"/>
-    <item android:drawable="@drawable/xiaozhi_normal_053" android:duration="60"/>
-    <item android:drawable="@drawable/xiaozhi_normal_054" android:duration="60"/>
-    <item android:drawable="@drawable/xiaozhi_normal_055" android:duration="60"/>
-    <item android:drawable="@drawable/xiaozhi_normal_056" android:duration="60"/>
-    <item android:drawable="@drawable/xiaozhi_normal_057" android:duration="60"/>
-    <item android:drawable="@drawable/xiaozhi_normal_058" android:duration="60"/>
-    <item android:drawable="@drawable/xiaozhi_normal_059" android:duration="60"/>
-
-    <item android:drawable="@drawable/xiaozhi_normal_060" android:duration="60"/>
-    <item android:drawable="@drawable/xiaozhi_normal_061" android:duration="60"/>
-    <item android:drawable="@drawable/xiaozhi_normal_062" android:duration="60"/>
-    <item android:drawable="@drawable/xiaozhi_normal_063" android:duration="60"/>
-    <item android:drawable="@drawable/xiaozhi_normal_064" android:duration="60"/>
-    <item android:drawable="@drawable/xiaozhi_normal_065" android:duration="60"/>
-
+    <item android:drawable="@drawable/xiaozhi_normal002" android:duration="60"/>
+    <item android:drawable="@drawable/xiaozhi_normal004" android:duration="60"/>
+    <item android:drawable="@drawable/xiaozhi_normal006" android:duration="60"/>
+    <item android:drawable="@drawable/xiaozhi_normal008" android:duration="60"/>
+    <item android:drawable="@drawable/xiaozhi_normal010" android:duration="60"/>
+    <item android:drawable="@drawable/xiaozhi_normal012" android:duration="60"/>
+    <item android:drawable="@drawable/xiaozhi_normal014" android:duration="60"/>
+    <item android:drawable="@drawable/xiaozhi_normal016" android:duration="60"/>
+    <item android:drawable="@drawable/xiaozhi_normal018" android:duration="60"/>
+    <item android:drawable="@drawable/xiaozhi_normal020" android:duration="60"/>
+    <item android:drawable="@drawable/xiaozhi_normal022" android:duration="60"/>
+    <item android:drawable="@drawable/xiaozhi_normal024" android:duration="60"/>
+    <item android:drawable="@drawable/xiaozhi_normal026" android:duration="60"/>
+    <item android:drawable="@drawable/xiaozhi_normal028" android:duration="60"/>
+    <item android:drawable="@drawable/xiaozhi_normal030" android:duration="60"/>
+    <item android:drawable="@drawable/xiaozhi_normal032" android:duration="60"/>
+    <item android:drawable="@drawable/xiaozhi_normal034" android:duration="60"/>
+    <item android:drawable="@drawable/xiaozhi_normal036" android:duration="60"/>
+    <item android:drawable="@drawable/xiaozhi_normal038" android:duration="60"/>
+    <item android:drawable="@drawable/xiaozhi_normal040" android:duration="60"/>
+    <item android:drawable="@drawable/xiaozhi_normal042" android:duration="60"/>
+    <item android:drawable="@drawable/xiaozhi_normal044" android:duration="60"/>
+    <item android:drawable="@drawable/xiaozhi_normal046" android:duration="60"/>
+    <item android:drawable="@drawable/xiaozhi_normal048" android:duration="60"/>
+    <item android:drawable="@drawable/xiaozhi_normal050" android:duration="60"/>
+    <item android:drawable="@drawable/xiaozhi_normal052" android:duration="60"/>
+    <item android:drawable="@drawable/xiaozhi_normal054" android:duration="60"/>
+    <item android:drawable="@drawable/xiaozhi_normal056" android:duration="60"/>
+    <item android:drawable="@drawable/xiaozhi_normal058" android:duration="60"/>
+    <item android:drawable="@drawable/xiaozhi_normal060" android:duration="60"/>
+    <item android:drawable="@drawable/xiaozhi_normal062" android:duration="60"/>
+    <item android:drawable="@drawable/xiaozhi_normal064" android:duration="60"/>
+    <item android:drawable="@drawable/xiaozhi_normal066" android:duration="60"/>
+    <item android:drawable="@drawable/xiaozhi_normal068" android:duration="60"/>
+    <item android:drawable="@drawable/xiaozhi_normal070" android:duration="60"/>
+    <item android:drawable="@drawable/xiaozhi_normal072" android:duration="60"/>
+    <item android:drawable="@drawable/xiaozhi_normal074" android:duration="60"/>
+    <item android:drawable="@drawable/xiaozhi_normal076" android:duration="60"/>
+    <item android:drawable="@drawable/xiaozhi_normal078" android:duration="60"/>
+    <item android:drawable="@drawable/xiaozhi_normal080" android:duration="60"/>
+    <item android:drawable="@drawable/xiaozhi_normal082" android:duration="60"/>
+    <item android:drawable="@drawable/xiaozhi_normal084" android:duration="60"/>
+    <item android:drawable="@drawable/xiaozhi_normal086" android:duration="60"/>
+    <item android:drawable="@drawable/xiaozhi_normal088" android:duration="60"/>
+    <item android:drawable="@drawable/xiaozhi_normal090" android:duration="60"/>
+    <item android:drawable="@drawable/xiaozhi_normal092" android:duration="60"/>
+    <item android:drawable="@drawable/xiaozhi_normal094" android:duration="60"/>
+    <item android:drawable="@drawable/xiaozhi_normal096" android:duration="60"/>
+    <item android:drawable="@drawable/xiaozhi_normal098" android:duration="60"/>
+    <item android:drawable="@drawable/xiaozhi_normal100" android:duration="60"/>
+    <item android:drawable="@drawable/xiaozhi_normal102" android:duration="60"/>
+    <item android:drawable="@drawable/xiaozhi_normal104" android:duration="60"/>
+    <item android:drawable="@drawable/xiaozhi_normal106" android:duration="60"/>
+    <item android:drawable="@drawable/xiaozhi_normal108" android:duration="60"/>
+    <item android:drawable="@drawable/xiaozhi_normal110" android:duration="60"/>
+    <item android:drawable="@drawable/xiaozhi_normal112" android:duration="60"/>
+    <item android:drawable="@drawable/xiaozhi_normal114" android:duration="60"/>
+    <item android:drawable="@drawable/xiaozhi_normal116" android:duration="60"/>
+    <item android:drawable="@drawable/xiaozhi_normal118" android:duration="60"/>
 
 </animation-list>