From b299d376c554c04e198a18d43adb53d094bd0a23 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Thu, 8 Jun 2023 11:59:32 +0800
Subject: [PATCH] =?UTF-8?q?=E9=99=8D=E4=BD=8E=E8=8E=B7=E5=8F=96=E5=AE=9A?=
 =?UTF-8?q?=E4=BD=8D=E7=9A=84=E9=A2=91=E7=8E=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bus/passenger/model/CharterPassengerModel.kt   | 14 ++------------
 1 file changed, 2 insertions(+), 12 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 ab0e27b25d..1c81a9703a 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
@@ -86,7 +86,6 @@ object CharterPassengerModel {
 
     // 当前位置坐标
     private var mLocationGCJ02: MogoLocation? = null
-    private var mLocationWgs: MogoLocation? = null
 
     // 订单信息 有订单有线路结束订单
     @Volatile
@@ -140,7 +139,6 @@ object CharterPassengerModel {
         CallerAutoPilotStatusListenerManager.removeListener(mGoAutopilotStatusListener)
         CallerChassisLocationGCJ02ListenerManager.removeListener(TAG)
         CallerPlanningRottingListenerManager.removeListener(moGoAutopilotPlanningListener)
-        CallerChassisLocationWGS84ListenerManager.removeListener(TAG)
     }
 
     private fun initListeners() {
@@ -150,8 +148,7 @@ object CharterPassengerModel {
         // 自动驾驶状态变化监听
         CallerAutoPilotStatusListenerManager.addListener(TAG, mGoAutopilotStatusListener)
         // 定位监听
-        CallerChassisLocationGCJ02ListenerManager.addListener(TAG, mMapLocationListener)
-        CallerChassisLocationWGS84ListenerManager.addListener(TAG, 2, mMapWGS84LocationListener)
+        CallerChassisLocationGCJ02ListenerManager.addListener(TAG, 4 ,mMapLocationListener)
         // 自动驾驶路线规划接口 返回自动驾驶轨迹
         CallerPlanningRottingListenerManager.addListener(TAG, moGoAutopilotPlanningListener)
         // 登录状态监听
@@ -216,13 +213,6 @@ object CharterPassengerModel {
                 }
             }
         }
-    private val mMapWGS84LocationListener: IMoGoChassisLocationWGS84Listener =
-        object : IMoGoChassisLocationWGS84Listener {
-            override fun onChassisLocationWGS84(gnssInfo: MogoLocation) {
-                if (null == gnssInfo) return
-                mLocationWgs = gnssInfo
-            }
-        }
 
     // 前一个自动驾驶状体
     @Volatile
@@ -1099,7 +1089,7 @@ object CharterPassengerModel {
         }
         val parameters = AutopilotControlParameters()
         orderInfo?.let { orderInfo ->
-            mLocationWgs?.let { startPoint ->
+            CallerChassisLocationWGS84ListenerManager.getChassisLocationWGS84().let { startPoint ->
                 val startWgsLon: Double = startPoint.longitude
                 val startWgsLat: Double = startPoint.latitude
                 val endWgsLon: Double = orderInfo.wgs84Lon!!