From 57be87ff6297603b033c1223ab3990fdf1863fc6 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Fri, 14 Jul 2023 21:06:07 +0800
Subject: [PATCH] =?UTF-8?q?[3.3.2]=20[=E8=BF=9B=E5=BA=A6=E7=99=BE=E5=88=86?=
 =?UTF-8?q?=E6=AF=94]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TrajectoryAndDistanceManager.kt           |  2 +-
 .../passenger/model/TaxiPassengerModel.kt     | 25 +++++++++++++++++--
 .../presenter/BaseTaxiPassengerPresenter.java |  5 ++++
 .../passenger/ui/orderinfo/ItineraryView.kt   |  3 ++-
 4 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/distancemamager/TrajectoryAndDistanceManager.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/distancemamager/TrajectoryAndDistanceManager.kt
index 7b2ef43495..5620d2859b 100644
--- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/distancemamager/TrajectoryAndDistanceManager.kt
+++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/distancemamager/TrajectoryAndDistanceManager.kt
@@ -390,7 +390,7 @@ object  TrajectoryAndDistanceManager: IMoGoPlanningRottingListener{
                 lastPoints!!.longitude, lastPoints.latitude
             )
         }
-        d(M_OCHCOMMON+ TAG,"距离终点：$lastSumLength")
+        d(M_OCHCOMMON+ TAG,"两站点距离：$lastSumLength")
         stationDistance[key] = lastSumLength
 
         if(distanceListeners.size>0) {
diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.kt
index b42f1d84f8..766d01c9b1 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.kt
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.kt
@@ -6,6 +6,7 @@ import android.net.ConnectivityManager
 import com.mogo.aicloud.services.socket.MogoAiCloudSocketManager
 import com.mogo.commons.module.intent.IMogoIntentListener
 import com.mogo.commons.module.intent.IntentManager
+import com.mogo.eagle.core.data.map.MogoLocation
 import com.mogo.eagle.core.function.api.datacenter.msgbox.IMsgBoxEventListener
 import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxEventListenerManager
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
@@ -149,13 +150,17 @@ object TaxiPassengerModel {
                         // 1.1. 当存在进行中单时：对本地currentOrder进行更新
                         val currentOrder = data.data.servicing[0]
                         if(currentOCHOrder==null||currentOCHOrder?.orderStatus!=currentOrder.orderStatus){
+                            currentOCHOrder = currentOrder
                             orderStatusChange(currentOrder)
+                        }else {
+                            currentOCHOrder = currentOrder
                         }
-                        currentOCHOrder = currentOrder
                     }
                 }
 
-                override fun onError() {}
+                override fun onError() {
+                    e(M_TAXI_P + TAG, "queryInAndWaitOrders onError")
+                }
                 override fun onFail(code: Int, msg: String) {
                     e(M_TAXI_P + TAG, "queryInAndWaitOrders$code$msg")
                 }
@@ -319,4 +324,20 @@ object TaxiPassengerModel {
         }
     }
 
+    fun setStation() {
+        if (currentOCHOrder != null) {
+            val startStation = MogoLocation()
+            startStation.longitude = currentOCHOrder!!.startSiteGcjPoint[0]
+            startStation.latitude = currentOCHOrder!!.startSiteGcjPoint[1]
+            val endStation = MogoLocation()
+            endStation.longitude = currentOCHOrder!!.endSiteGcjPoint[0]
+            endStation.latitude = currentOCHOrder!!.endSiteGcjPoint[1]
+            TrajectoryAndDistanceManager.setStationPoint(startStation, endStation, currentOCHOrder!!.lineId)
+        }
+    }
+
+    fun cleanStation() {
+        TrajectoryAndDistanceManager.setStationPoint(null, null, -1L)
+    }
+
 }
\ No newline at end of file
diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.java
index 3c91698d4b..a936507560 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.java
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.java
@@ -115,6 +115,7 @@ public class BaseTaxiPassengerPresenter extends Presenter<TaxiPassengerBaseFragm
             AutopilotManager.INSTANCE.clearAutopilotControlParameters();
             TaxiPassengerModel.INSTANCE.startOrStopQueryOrderRemaining(false);
             TaxiPassengerModel.INSTANCE.startOrStopReadyToAutopilotLoop(false);
+            TaxiPassengerModel.INSTANCE.cleanStation();
             return;
         }
         // 20 司机到达上车点
@@ -136,6 +137,7 @@ public class BaseTaxiPassengerPresenter extends Presenter<TaxiPassengerBaseFragm
             });
             //开启轮询司机是否已准备好开启自动驾驶的环境
             TaxiPassengerModel.INSTANCE.startDriverReadyToAutopilotLoop();
+            TaxiPassengerModel.INSTANCE.setStation();
         }
         if (TaxiPassengerOrderStatusEnum.OnTheWayToEnd.getCode() == order.orderStatus){
             runOnUIThread(() ->{
@@ -146,6 +148,7 @@ public class BaseTaxiPassengerPresenter extends Presenter<TaxiPassengerBaseFragm
             TaxiPassengerModel.INSTANCE.startOrStopQueryOrderRemaining(true);
             AutopilotManager.INSTANCE.updateAutopilotControlParameters();
             TaxiPassengerModel.INSTANCE.startOrStopReadyToAutopilotLoop(false);
+            TaxiPassengerModel.INSTANCE.setStation();
         }
         // 30 用户到达上车点 并通过了手机号后四位验证
         // 40 服务中
@@ -173,6 +176,7 @@ public class BaseTaxiPassengerPresenter extends Presenter<TaxiPassengerBaseFragm
                 mView.showOrHideArrivedEndLayout(true, order.endSiteAddr,order.orderNo);
                 CallerOrderListenerManager.INSTANCE.invokeOrderStatus(false);
             });
+            TaxiPassengerModel.INSTANCE.cleanStation();
             return;
         }
         // 60 服务完成  页面
@@ -180,6 +184,7 @@ public class BaseTaxiPassengerPresenter extends Presenter<TaxiPassengerBaseFragm
             AutopilotManager.INSTANCE.clearAutopilotControlParameters();
             TaxiPassengerModel.INSTANCE.startOrStopQueryOrderRemaining(false);
             mCurrentPassengerOrder = null;
+            TaxiPassengerModel.INSTANCE.cleanStation();
         }
     }
 
diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/orderinfo/ItineraryView.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/orderinfo/ItineraryView.kt
index b8094089a8..f6ee66440a 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/orderinfo/ItineraryView.kt
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/orderinfo/ItineraryView.kt
@@ -99,7 +99,7 @@ class ItineraryView : ConstraintLayout, OrderInfoViewModel.ItineraryViewCallback
         actv_endstation.text = endStation
     }
 
-    var prePercentage = 0
+    var prePercentage = 0f
     val needChangeStyleNumber = 0.98622
 
     override fun setDistanceInfo(surplusdistance:String,distanceUnit:String,
@@ -121,6 +121,7 @@ class ItineraryView : ConstraintLayout, OrderInfoViewModel.ItineraryViewCallback
                     setDrawable(true)
                 }
             }
+            prePercentage = currentPercentage
 
             if (progress_distance.max != stationDistance) {
                 progress_distance.max = stationDistance