From 8861a8c325e6d925b2ed7ccbab9bd28bebedcbe8 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@gmail.com>
Date: Sun, 28 May 2023 17:52:01 +0800
Subject: [PATCH] =?UTF-8?q?[charter]=20[3.2.0]=20[=E8=BD=A8=E8=BF=B9?=
 =?UTF-8?q?=E4=B8=8D=E4=BD=BF=E7=94=A8clear=20=E7=9B=B4=E6=8E=A5=E8=B5=8B?=
 =?UTF-8?q?=E5=80=BCnull]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../passenger/model/CharterPassengerModel.kt  | 28 +++++++++----------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt
index 4740aa6bad..1b5d940695 100644
--- a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt
+++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt
@@ -94,7 +94,7 @@ object CharterPassengerModel {
 
     // 轨迹点、底盘透传的
     @Volatile
-    private var mRoutePoints: MutableList<MogoLocation> = ArrayList()
+    private var mRoutePoints: MutableList<MogoLocation>? = ArrayList()
 
     private var orderStatus: OrderStatusEnum = OrderStatusEnum.NoOrderUnuse
 
@@ -275,13 +275,13 @@ object CharterPassengerModel {
         }
 
     fun updateRoutePoints(routePoints: List<MessagePad.Location?>?) {
-        mRoutePoints.clear()
+        mRoutePoints = null
         val latLngModels = CoordinateCalculateRouteUtil
             .coordinateConverterWgsToGcjLocations(mContext, routePoints)
-        mRoutePoints.addAll(latLngModels)
+        mRoutePoints = latLngModels
     }
     fun cleanRoutePoints(){
-        mRoutePoints.clear()
+        mRoutePoints = null
     }
 
     fun setStatusChangeListener(tag:String,orderStatusChangeListener: IOrderStatusChangeListener?) {
@@ -676,14 +676,17 @@ object CharterPassengerModel {
         //mLocation gcj坐标
         mLocationGCJ02?.let {
             orderInfo?.let { order ->
+                CallerLogger.d(M_BUS_P + "calculateDistance", "订单信息:$order")
                 if(order.siteId==null||order.siteId==0L||
                     order.wgs84Lat==null||order.wgs84Lat==0.0||
                     order.wgs84Lon==null||order.wgs84Lon==0.0
                 ){
+                    CallerLogger.d(M_BUS_P + "calculateDistance", "站点信息未获得")
                     return
                 }
                 newCheckedSite?.let {
                     if(it.siteId!=order.siteId){
+                        CallerLogger.d(M_BUS_P + "calculateDistance", "站点和已选不吻合")
                         return
                     }
                 }
@@ -705,27 +708,23 @@ object CharterPassengerModel {
                     mogoLocation.longitude,
                     mogoLocation.latitude
                 )
-                CallerLogger.d(M_BUS_P + "calculateDistance两点距离",
-                    "---lastSumLength: $lastSumLength---站点坐标$mogoLocation ----当前坐标：$it"
-                )
-                CallerLogger.d(M_BUS_P + "站点信息",
-                    "--${order.siteId}-$order"
-                )
+                CallerLogger.d(M_BUS_P + "calculateDistance", "两点距离和站点的直线距离：${lastSumLength}")
                 if(lastSumLength>100) {
-                    if (mRoutePoints.size == 0){
-                        ToastCharterUtils.showLong("缺少轨迹数据")
+                    if (mRoutePoints==null||mRoutePoints?.size == 0){
+                        ToastCharterUtils.showLong("缺少轨迹数据暂停计算")
                         CallerLogger.d(M_BUS_P + "calculateDistance两点距离",
                             "缺少轨迹数据"
                         )
                         return
                     }
                     // 计算距离
-                   var templastSumLength =
+                   val templastSumLength =
                         CoordinateCalculateRouteUtil.calculateRouteSumLength(
                             mRoutePoints,
                             it,
                             mogoLocation
                         )
+                    CallerLogger.d(M_BUS_P + "calculateDistance", "轨迹计算的距离$templastSumLength")
                     if(templastSumLength>100){
                         lastSumLength = templastSumLength
                     }
@@ -734,8 +733,7 @@ object CharterPassengerModel {
                 val lastTime: Double = lastSumLength / CharterPassengerConst.Charter_AVERAGE_SPEED * 3.6 //秒
 
                 CallerLogger.d(M_BUS_P + "calculateDistance",
-                    "---lastSumLength: " + lastSumLength + "----lastTime : " + lastTime
-                            + " thread = " + Thread.currentThread().name
+                    "最终信息:lastSumLength: ${lastSumLength}lastTime : $lastTime thread = ${Thread.currentThread().name}"
                 )
                 if (lastSumLength < CharterPassengerConst.ARRIVE_SOON_AT_START_STATION_DISTANCE&&lastSumLength>0) {
                     CallerLogger.d(M_BUS_P + TAG,"小于100米到站2")