[Taxi无人化] feat: 乘客屏 调试相关接口；

OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerCheckPhoneUpdateOrderReqBean.java

@@ -8,9 +8,11 @@ public class TaxiPassengerCheckPhoneUpdateOrderReqBean {
 
     public String orderNo;
     public String phone;
+    public String sn;
 
-    public TaxiPassengerCheckPhoneUpdateOrderReqBean(String orderNo,String phone) {
+    public TaxiPassengerCheckPhoneUpdateOrderReqBean(String orderNo,String phone, String sn) {
         this.orderNo = orderNo;
         this.phone = phone;
+        this.sn = sn;
     }
 }

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

@@ -159,7 +159,7 @@ object TaxiPassengerModel {
                         return
                     }
                     //1. 处理进行中订单
-                    if (data.data != null) {
+                    if (data.data != null && data.data.order != null) {
                         // 1.1. 当存在进行中单时：对本地currentOrder进行更新
                         val currentOrder = data.data.order
                         currentLineId = data.data.lineId

OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceApi.kt

@@ -43,7 +43,7 @@ internal interface TaxiPassengerServiceApi {
     fun getTrajectoryInfoByLineIds(
         @Header("appId") appId: String = MoGoAiCloudClientConfig.getInstance().serviceAppId,
         @Header("ticket") ticket: String = MoGoAiCloudClientConfig.getInstance().token,
-        @Query("lineIds") lineIds: List<Long>
+        @Body lineIds: List<Long>
     ):Observable<TaxiPassengerGetTrajectoryByLineIdRespBean>
 
 

OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceManager.kt

@@ -17,6 +17,7 @@ import com.mogo.och.taxi.passenger.bean.TaxiPassengerOrderQueryReqBean
 import com.mogo.och.taxi.passenger.bean.TaxiPassengerOrderQueryRespBean
 import com.mogo.och.taxi.passenger.bean.TaxiPassengerOrdersInServiceQueryRespBean
 import com.mogo.och.taxi.passenger.bean.TaxiPassengerStartReqBean
+import io.reactivex.Observable
 
 /**
  * Created by pangfan on 2021/8/19
@@ -69,6 +70,11 @@ object TaxiPassengerServiceManager {
         }
         mOCHTaxiServiceApi.queryOrdersInAndWaitService(sn = driverSn) //获取到司机端的sn
             .flatMap { ordersInServiceQueryResp: TaxiPassengerOrdersInServiceQueryRespBean ->
+                if (ordersInServiceQueryResp.data == null
+                    || ordersInServiceQueryResp.data.lineId == -1L
+                ) {
+                    return@flatMap Observable.just(ordersInServiceQueryResp)
+                }
                 val lineId = ordersInServiceQueryResp.data.lineId
                 return@flatMap mOCHTaxiServiceApi.getTrajectoryInfoByLineIds(lineIds = listOf(lineId))
                     .map { trajectoryInfoResp: TaxiPassengerGetTrajectoryByLineIdRespBean? ->
@@ -90,7 +96,8 @@ object TaxiPassengerServiceManager {
         mOCHTaxiServiceApi.checkPhoneAndUpdateOrderStatus(
             data = TaxiPassengerCheckPhoneUpdateOrderReqBean(
                 orderNo,
-                phone
+                phone,
+                driverSn
             )
         )
             .transformTry()

OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/check/ChekViewModel.kt

@@ -24,7 +24,6 @@ class ChekViewModel : ViewModel(), IOCHTaxiPassengerOrderStatusCallback {
         TaxiPassengerModel.checkPhoneAndUpdateStatus(phone)
     }
 
-
     private fun setOrderInfo() {
         val currentOCHOrder = TaxiPassengerModel.currentOCHOrder
         currentOCHOrder?.let { order ->