[6.5.0]

[fea]
[添加日志]

OCH/common/data/src/main/java/com/mogo/och/data/taxi/BaseOrderBean.java

@@ -7,4 +7,12 @@ public class BaseOrderBean {
     public String getEndSiteAddr() {
         return "";
     }
+
+    @Override
+    public String toString() {
+        return "BaseOrderBean{" +
+                "orderNo='" + orderNo + '\'' +
+                ", orderStatus=" + orderStatus +
+                '}';
+    }
 }

OCH/common/data/src/main/java/com/mogo/och/data/taxi/OrderQueryRouteInfoReqBean.java

@@ -9,6 +9,14 @@ public class OrderQueryRouteInfoReqBean {
     public String sn;
     public String orderNo;
 
+    @Override
+    public String toString() {
+        return "OrderQueryRouteInfoReqBean{" +
+                "sn='" + sn + '\'' +
+                ", orderNo='" + orderNo + '\'' +
+                '}';
+    }
+
     public OrderQueryRouteInfoReqBean(String sn, String orderNo) {
         this.sn = sn;
         this.orderNo = orderNo;

OCH/common/data/src/main/java/com/mogo/och/data/taxi/OrderQueryRouteInfoRespBean.java

@@ -18,5 +18,15 @@ public class OrderQueryRouteInfoRespBean extends BaseData {
         // 起点至终点
         public long durationToEnd; //订单上车点到目的地的时长，单位：秒
         public long distanceToEnd; //订单上车点到目的地的距离，单位：米
+
+        @Override
+        public String toString() {
+            return "Result{" +
+                    "durationToStart=" + durationToStart +
+                    ", distanceToStart=" + distanceToStart +
+                    ", durationToEnd=" + durationToEnd +
+                    ", distanceToEnd=" + distanceToEnd +
+                    '}';
+        }
     }
 }

OCH/taxi/driver/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java

@@ -376,6 +376,10 @@ public class TaxiPresenter extends Presenter<TaxiFragment> implements ITaxiADASS
             @Override
             public void run() {
                 if(mView!=null) {
+                    OchChainLogManager.writeChainLog(
+                            "到达目的地计算距离和时间",
+                            "距离："+routeInfo.distanceToEnd+"  时间："+routeInfo.durationToEnd
+                    );
                     mView.onCurrentOrderRouteInfoGot(routeInfo);
                 }
             }

OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.kt

@@ -17,6 +17,7 @@ import com.mogo.och.taxi.passenger.ui.TaxiPassengerBaseFragment
 import com.mogo.och.data.taxi.BaseOrderBean
 import com.mogo.och.common.module.biz.order.OrderListener
 import com.mogo.och.common.module.biz.order.OrderModel
+import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager
 
 /**
  * @author: wangmingjun
@@ -155,6 +156,10 @@ class BaseTaxiPassengerPresenter(view: TaxiPassengerBaseFragment?) :
     }
 
     override fun onCurrentOrderDistAndduration(distanceToEnd: Long, durationToEnd: Long) {
+        OchChainLogManager.writeChainLog(
+            "到达目的地计算距离和时间",
+            "距离：${distanceToEnd}  时间：${durationToEnd}"
+        )
         mView?.showDuringAndDistance(distanceToEnd,durationToEnd)
     }
 

OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiCurrentTaskViewModel.kt

@@ -20,6 +20,7 @@ import com.mogo.och.common.module.manager.autopilot.location.OchLocationManager
 import com.mogo.och.common.module.manager.autopilot.line.LineManager
 import com.mogo.och.common.module.network.OchCommonServiceCallback
 import com.mogo.och.common.module.manager.distance.TrajectoryAndDistanceManager
+import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager
 import com.mogo.och.common.module.utils.ToastUtilsOch
 import com.mogo.och.common.module.voice.VoiceNotice
 import com.mogo.och.unmanned.taxi.R
@@ -213,6 +214,7 @@ class TaxiCurrentTaskViewModel : BaseViewModel<UnmannedState, TaskUiIntent>(),
 
     private fun updateOrderTripInfoUI(mileage: Float, duration: Int) {
         d(TAG, "updateOrderTripInfoUI")
+        OchChainLogManager.writeChainLog("到达目的地计算距离和时间", "距离：${mileage}  时间：${duration}")
         sendUiState {
             copy(
                 taskWithOrderUIState = TaskWithOrderUIState.UpdateOrderTripInfo(

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

@@ -459,10 +459,8 @@ object TaxiPassengerModel {
             currentOCHOrder!!.orderNo,
             object : OchCommonServiceCallback<QueryCarOrderByNoRespBean> {
                 override fun onSuccess(data: QueryCarOrderByNoRespBean) {
-                    if (data.data != null && currentOCHOrder != null ) {
-                        for (callback in mOrderStatusCallbackMap.values) {
-                            callback.onCurrentOrderDistAndduration(data.data.mileage,data.data.duration)
-                        }
+                    for (callback in mOrderStatusCallbackMap.values) {
+                        callback.onCurrentOrderDistAndduration(data.data.mileage,data.data.duration)
                     }
                 }
 

OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/presenter/BaseTaxiPassengerPresenter.kt

@@ -13,6 +13,7 @@ import com.mogo.och.common.module.biz.order.TaxiOrderStatusEnum
 import com.mogo.och.data.taxi.BaseOrderBean
 import com.mogo.och.common.module.biz.order.OrderListener
 import com.mogo.och.common.module.biz.order.OrderModel
+import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager
 import com.mogo.och.unmanned.passenger.callback.IOCHTaxiPassengerOrderStatusCallback
 import com.mogo.och.unmanned.passenger.model.TaxiPassengerModel
 import com.mogo.och.unmanned.passenger.ui.TaxiPassengerBaseFragment
@@ -146,7 +147,10 @@ class BaseTaxiPassengerPresenter(view: TaxiPassengerBaseFragment?) :
     }
 
     override fun onCurrentOrderDistAndduration(mileage: Float, duration: Float) {
-        mView?.showDuringAndDistance(mileage,duration)
+        UiThreadHandler.post({
+            OchChainLogManager.writeChainLog("到达目的地计算距离和时间","距离：${mileage}  时间：${duration}")
+            mView?.showDuringAndDistance(mileage,duration)
+        },UiThreadHandler.MODE.QUEUE)
     }
 
     companion object {