[3.4.0]

[同步代码]

OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/model/AutopilotManager.kt

@@ -163,7 +163,7 @@ object AutopilotManager : IMoGoAutopilotStatusListener {
                         TaxiPassengerModel.currentOCHOrder!!.endSiteAddr,
                         TaxiPassengerModel.currentOCHOrder!!.orderNo
                     )
-                    startServicePilotDone()
+                    //startServicePilotDone()
                 }
             }
             else -> {}

OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/debug/DebugView.kt

@@ -11,6 +11,7 @@ import com.mogo.eagle.core.utilcode.util.ActivityUtils
 import com.mogo.och.taxi.passenger.R
 import com.mogo.och.taxi.passenger.ui.TaxiPassengerBaseFragment
 import kotlinx.android.synthetic.main.taxi_p_debug.view.tv_show_arrive
+import kotlinx.android.synthetic.main.taxi_p_debug.view.tv_show_order_info
 import kotlinx.android.synthetic.main.taxi_p_debug.view.tv_show_phone_check
 import kotlinx.android.synthetic.main.taxi_p_debug.view.tv_show_start_autopilot
 import org.greenrobot.eventbus.EventBus
@@ -57,7 +58,9 @@ class DebugView @JvmOverloads constructor(
         tv_show_start_autopilot.onClick {
             fragment?.showOrHideStartAutopilotView(true)
         }
-
+        tv_show_order_info.onClick {
+            fragment?.showOrHideServingOrderFragment(true)
+        }
     }
     @Subscribe(threadMode = ThreadMode.MAIN)
     fun changeOverview(debugEvent: DebugEvent) {

OCH/taxi/taxi-unmanned-passenger/src/main/res/layout/taxi_p_debug.xml

@@ -26,4 +26,11 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>
 
+    <TextView
+        android:id="@+id/tv_show_order_info"
+        android:text="订单信息"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
+
 </androidx.appcompat.widget.LinearLayoutCompat>

OCH/taxi/taxi-unmanned-passenger/src/main/res/layout/taxi_p_itinerary.xml

@@ -72,7 +72,7 @@
     <View
         android:layout_width="0dp"
         android:layout_height="1dp"
-        android:background="@color/taxi_p_B35C71AB"
+        android:background="@color/taxi_p_B37E90BF"
         android:layout_marginTop="-15dp"
         app:layout_constraintEnd_toEndOf="@+id/actv_endstation"
         app:layout_constraintStart_toStartOf="@+id/actv_speed_value"

OCH/taxi/taxi-unmanned-passenger/src/main/res/values/colors.xml

@@ -22,7 +22,6 @@
     <color name="taxi_p_004DC4">#004DC4</color>
     <color name="taxi_p_293449">#293449</color>
     <color name="taxi_p_203555">#203555</color>
-    <color name="taxi_p_B35C71AB">#B35C71AB</color>
     <color name="taxi_p_081831">#081831</color>
     <color name="taxi_p_112B57">#112B57</color>
     <color name="taxi_p_66476FBE">#66476FBE</color>
@@ -50,6 +49,7 @@
     <color name="taxi_p_005D6A8C">#005D6A8C</color>
     <color name="taxi_p_5D6A8C">#5D6A8C</color>
     <color name="taxi_p_995D6A8C">#995D6A8C</color>
+    <color name="taxi_p_B37E90BF">#B37E90BF</color>