[6.5.0]

[fea]
[location 聚合]

OCH/bus/driver/src/main/java/com/mogo/och/bus/model/OrderModel.java

@@ -80,6 +80,7 @@ import com.mogo.och.data.bean.BusRoutesResult;
 import com.mogo.och.data.bean.BusStationBean;
 import com.mogo.och.data.bean.BusTransferData;
 import com.mogo.och.data.manager.cache.CacheDataManager;
+import com.mogo.och.common.module.manager.autopilot.location.OchLocationManager;
 
 import org.jetbrains.annotations.NotNull;
 
@@ -1231,8 +1232,9 @@ public class OrderModel {
 
     // 车机端上传心跳数据（只在出车状态时上传）
     public void runCarHeartbeat() {
-        double mLatitude = CallerChassisLocationGCJ02ListenerManager.INSTANCE.getChassisLocationGCJ02().getLatitude();
+        MogoLocation gcj02Location = OchLocationManager.getGCJ02Location();
-        double mLongitude =CallerChassisLocationGCJ02ListenerManager.INSTANCE.getChassisLocationGCJ02().getLongitude();
+        double mLatitude = gcj02Location.getLatitude();
+        double mLongitude = gcj02Location.getLongitude();
         OrderServiceManager.runCarHeartbeat(mContext, mLongitude, mLatitude,
                 new OchCommonServiceCallback<BaseData>() {
                     @Override
@@ -1258,9 +1260,7 @@ public class OrderModel {
 
     // 登出
     public void logout() {
-        double mLatitude = CallerChassisLocationGCJ02ListenerManager.INSTANCE.getChassisLocationGCJ02().getLatitude();
+        LoginStatusManager.loginOut();
-        double mLongitude =CallerChassisLocationGCJ02ListenerManager.INSTANCE.getChassisLocationGCJ02().getLongitude();
-        LoginStatusManager.loginOut(mLatitude, mLongitude);
     }
 
     public void triggerStartServiceEvent(boolean isRestart, boolean send) {

OCH/bus/passenger/src/main/java/com/mogo/och/bus/passenger/model/OrderModel.kt

@@ -29,6 +29,7 @@ import com.mogo.och.common.module.biz.login.LoginStatusManager
 import com.mogo.och.common.module.biz.login.OpenOrderStatusEnum
 import com.mogo.och.common.module.manager.autopilot.autopilot.IOchAutopilotStatusListener
 import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotStatusListenerManager
+import com.mogo.och.common.module.manager.autopilot.location.OchLocationManager
 import com.mogo.och.common.module.manager.distance.IDistanceListener
 import com.mogo.och.common.module.manager.distance.TrajectoryAndDistanceManager
 import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager
@@ -80,7 +81,7 @@ object OrderModel {
         //自动驾驶状态监听
         OchAutoPilotStatusListenerManager.addListener(TAG, mGoAutopilotStatusListener)
         // 定位监听
-        CallerChassisLocationGCJ02ListenerManager.addListener(TAG, 3, mMapLocationListener)
+        OchLocationManager.addGCJ02Listener(TAG, 3, mMapLocationListener)
         // 距离终点站距离监听
         TrajectoryAndDistanceManager.addDistanceListener(TAG, trajectoryListener)
         AbnormalFactorsLoopManager.startLoopAbnormalFactors(mContext!!)
@@ -94,7 +95,7 @@ object OrderModel {
         //自动驾驶状态监听
         OchAutoPilotStatusListenerManager.removeListener(mGoAutopilotStatusListener)
         // 注销定位监听
-        CallerChassisLocationGCJ02ListenerManager.removeListener(TAG)
+        OchLocationManager.removeGCJ02Listener(TAG)
         // 距离终点站距离监听
         TrajectoryAndDistanceManager.removeListener(TAG)
 

OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/model/DriverM1Model.kt

@@ -46,6 +46,7 @@ import com.mogo.och.common.module.manager.CharterSendTripInfoManager.END_TRIP
 import com.mogo.och.common.module.manager.CharterSendTripInfoManager.START_TRIP
 import com.mogo.och.common.module.manager.autopilot.OCHAdasAbilityManager
 import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotManager
+import com.mogo.och.common.module.manager.autopilot.location.OchLocationManager
 import com.mogo.och.common.module.manager.device.LightAirconditionDoorManager
 import com.mogo.och.common.module.manager.device.LightAirconditionDoorStatusManager
 import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager
@@ -76,8 +77,6 @@ import com.mogo.och.data.bean.*
  */
 class DriverM1Model {
 
-    var mLongitude = 0.0
-    var mLatitude = 0.0
     private var mContext: Context? = null
 
     private var isArrivedStation: Boolean = false
@@ -118,7 +117,7 @@ class DriverM1Model {
     fun init(context: Context) {
         mContext = context
         // 定位监听
-        CallerChassisLocationGCJ02ListenerManager.addListener(TAG, 5, mMapLocationListener)
+        OchLocationManager.addGCJ02Listener(TAG, 5, mMapLocationListener)
 
         //开启自驾后 异常信息返回
         OCHAdasAbilityManager.getInstance().setAdasStartFailureCallback(mAdasStartFailureListener)
@@ -174,7 +173,7 @@ class DriverM1Model {
 
     fun release() {
         // 注销定位监听
-        CallerChassisLocationGCJ02ListenerManager.removeListener(TAG)
+        OchLocationManager.removeGCJ02Listener(TAG)
 
         OCHAdasAbilityManager.getInstance().setAdasStartFailureCallback(null)
         releaseSocketMessageListener(
@@ -363,8 +362,6 @@ class DriverM1Model {
         object : IMoGoChassisLocationGCJ02Listener {
             override fun onChassisLocationGCJ02(gnssInfo: MogoLocation?) {
                 if (null == gnssInfo) return
-                mLongitude = gnssInfo.longitude
-                mLatitude = gnssInfo.latitude
 
                 //是否到站的围栏判断 自动驾驶还未触发到站
                 if (!isArrivedStation) {
@@ -547,7 +544,7 @@ class DriverM1Model {
 
     // 登出
     fun logout() {
-        LoginStatusManager.loginOut(mLatitude, mLongitude)
+        LoginStatusManager.loginOut()
     }
 
     fun triggerStartServiceEvent(isRestart: Boolean, send: Boolean) {
@@ -610,9 +607,10 @@ class DriverM1Model {
         parameters.routeName = mCurrentOrder?.lineName!!
         parameters.startName = PinYinUtil.getPinYinHeadChar(mCurrentOrder?.startSiteName)
         parameters.endName = PinYinUtil.getPinYinHeadChar(mCurrentOrder?.siteName)
+        val gcJ02Location = OchLocationManager.getGCJ02Location()
         parameters.startLatLon = AutopilotControlParameters.AutoPilotLonLat(
-            mLatitude,
+            gcJ02Location.latitude,
-            mLongitude
+            gcJ02Location.longitude
         )
         parameters.endLatLon =
             AutopilotControlParameters.AutoPilotLonLat(mCurrentOrder?.wgs84Lat!!, mCurrentOrder?.wgs84Lon!!)

OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/view/carstatus/CarStatusViewModel.kt

@@ -5,8 +5,8 @@ import com.magic.mogo.och.charter.model.DriverM1Model
 import com.mogo.eagle.core.data.map.MogoLocation
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
 import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Listener
-import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager
 import com.mogo.eagle.core.utilcode.util.ThreadUtils
+import com.mogo.och.common.module.manager.autopilot.location.OchLocationManager
 import kotlin.math.abs
 
 class CarStatusViewModel: ViewModel(), IMoGoAutopilotStatusListener,
@@ -24,12 +24,12 @@ class CarStatusViewModel: ViewModel(), IMoGoAutopilotStatusListener,
     override fun onCleared() {
         super.onCleared()
         this.viewCallback = null
-        CallerChassisLocationGCJ02ListenerManager.removeListener(DriverM1Model.TAG)
+        OchLocationManager.removeGCJ02Listener(DriverM1Model.TAG)
     }
 
     fun setAutopilotStatusCallback(viewCallback:ICarStatusCallback){
         this.viewCallback = viewCallback
-        CallerChassisLocationGCJ02ListenerManager.addListener(DriverM1Model.TAG, 3, this)
+        OchLocationManager.addGCJ02Listener(DriverM1Model.TAG, 3, this)
     }
 
     interface ICarStatusCallback{

OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/CharterPassengerModel.kt

@@ -49,6 +49,7 @@ import com.mogo.och.common.module.manager.autopilot.autopilot.ArrivedStation
 import com.mogo.och.common.module.manager.autopilot.autopilot.IOchAutopilotStatusListener
 import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotManager
 import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotStatusListenerManager
+import com.mogo.och.common.module.manager.autopilot.location.OchLocationManager
 import com.mogo.och.common.module.manager.beautifymode.BeautifyManager
 import com.mogo.och.common.module.manager.distance.TrajectoryAndDistanceManager
 import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager
@@ -394,7 +395,7 @@ object CharterPassengerModel {
                     this.orderInfo = orderData
                 }
                 //计算终点距离
-                CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02().let { currentInfo ->
+                OchLocationManager.getGCJ02Location().let { currentInfo ->
                     // 两点之间的距离
                     val calculateLineDistance = CoordinateUtils.calculateLineDistance(
                         currentInfo.longitude,
@@ -644,7 +645,7 @@ object CharterPassengerModel {
      */
     private fun calculateDistance() {
         //mLocation gcj坐标
-        CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02().let {
+        OchLocationManager.getGCJ02Location().let {
             orderInfo?.let { order ->
                 d(M_BUS_P + "calculateDistance", "订单信息:$order")
                 if (order.siteId == null || order.siteId == 0L ||
@@ -758,7 +759,7 @@ object CharterPassengerModel {
         val distanceMap: MutableMap<Float, Int> = TreeMap()
         // 计算所有点的距离
         data.forEachIndexed { index, siteInfo ->
-            CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02().let { currentInfo ->
+            OchLocationManager.getGCJ02Location().let { currentInfo ->
                 // 两点之间的距离
                 val calculateLineDistance = CoordinateUtils.calculateLineDistance(
                     currentInfo.longitude,
@@ -806,7 +807,7 @@ object CharterPassengerModel {
             if (middle == 0) {
                 return Pair(1, false)
             }
-            CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02().let {
+            OchLocationManager.getGCJ02Location().let {
                 // 仅计算 距离最近的站点middle  附近5个坐标的夹角
 
                 // middle middle-1
@@ -1184,7 +1185,7 @@ object CharterPassengerModel {
         }
         val parameters = AutopilotControlParameters()
         orderInfo?.let { orderInfo ->
-            CallerChassisLocationWGS84ListenerManager.getChassisLocationWGS84().let { startPoint ->
+            OchLocationManager.getWgs02Location().let { startPoint ->
                 val startWgsLon: Double = startPoint.longitude
                 val startWgsLat: Double = startPoint.latitude
                 val endWgsLon: Double = orderInfo.wgs84Lon!!

OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/itinerary/ItineraryViewModel.kt

@@ -11,6 +11,7 @@ import com.mogo.och.charter.passenger.callback.IDistanceCallback
 import com.mogo.och.charter.passenger.model.CharterPassengerModel
 import com.mogo.och.charter.passenger.model.IOrderStatusChangeListener
 import com.mogo.och.charter.passenger.model.OrderStatusEnum
+import com.mogo.och.common.module.manager.autopilot.location.OchLocationManager
 import com.mogo.och.common.module.utils.DateTimeUtil
 import com.mogo.och.common.module.utils.NumberFormatUtil
 import kotlin.math.abs
@@ -24,7 +25,7 @@ class ItineraryViewModel : ViewModel(), IMoGoChassisLocationGCJ02Listener, IDist
     private var viewCallback: ItineraryViewCallback? = null
 
     init {
-        CallerChassisLocationGCJ02ListenerManager.addListener(TAG, 3, this)
+        OchLocationManager.addGCJ02Listener(TAG, 3, this)
         CharterPassengerModel.setStationDistanceListener(TAG, this)
         CharterPassengerModel.setStatusChangeListener(TAG, this)
     }
@@ -32,7 +33,7 @@ class ItineraryViewModel : ViewModel(), IMoGoChassisLocationGCJ02Listener, IDist
     override fun onCleared() {
         super.onCleared()
         this.viewCallback = null
-        CallerChassisLocationGCJ02ListenerManager.removeListener(TAG)
+        OchLocationManager.removeGCJ02Listener(TAG)
         CharterPassengerModel.setStationDistanceListener(TAG, null)
         CharterPassengerModel.setStatusChangeListener(TAG, null)
     }

OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/selectline/SelectLineViewModel.kt

@@ -26,6 +26,7 @@ import com.mogo.och.common.module.manager.socket.lan.bean.ChangeDestMsg
 import com.mogo.och.common.module.manager.socket.lan.bean.DPMsgType
 import com.mogo.och.common.module.manager.socket.lan.bean.LineSite
 import com.mogo.och.common.module.constant.OchCommonConst
+import com.mogo.och.common.module.manager.autopilot.location.OchLocationManager
 import com.mogo.och.common.module.network.OchCommonServiceCallback
 import com.mogo.och.common.module.manager.stopside.StopSideManager
 import com.mogo.och.common.module.manager.loop.BizLoopManager
@@ -366,8 +367,7 @@ class SelectLineViewModel : ViewModel(), IOrderStatusChangeListener {
     }
 
     fun canSwitchLine(): Boolean {
-        val gnssSpeed =
+        val gnssSpeed = OchLocationManager.getGCJ02Location().gnssSpeed
-            CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02().gnssSpeed
         if (gnssSpeed < 0.5) {
             when (CallerAutoPilotStatusListenerManager.getState()) {
                 IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE -> {// 不可自动驾驶

OCH/common/biz/src/main/java/com/mogo/och/biz/login/LoginProvider.kt

@@ -98,9 +98,9 @@ class LoginProvider : LoginService {
         LoginModel.queryCarStatus()
     }
 
-    override fun loginOut(mLatitude: Double, mLongitude: Double) {
+    override fun loginOut() {
-        CallerLogger.d(tag, "loginOut mLatitude:${mLatitude}--mLongitude:${mLongitude}")
+        CallerLogger.d(tag, "loginOut ")
-        LoginModel.logout(mLatitude, mLongitude)
+        LoginModel.logout()
     }
 
     override fun checkBusiness(businessType: Int): Boolean {

OCH/common/biz/src/main/java/com/mogo/och/biz/login/bean/TaxiLogoutReqBean.java

@@ -1,5 +1,8 @@
 package com.mogo.och.biz.login.bean;
 
+import com.mogo.eagle.core.data.map.MogoLocation;
+import com.mogo.och.common.module.manager.autopilot.location.OchLocationManager;
+
 /**
  * Created by yyk on 2021/8/19
  * 登出请求参数
@@ -17,9 +20,10 @@ public class TaxiLogoutReqBean {
         public double lat;
         public double lon;
 
-        public Location4Login(double lat, double lon) {
+        public Location4Login() {
-            this.lat = lat;
+            MogoLocation gcj02Location = OchLocationManager.getGCJ02Location();
-            this.lon = lon;
+            this.lat = gcj02Location.getLatitude();
+            this.lon = gcj02Location.getLongitude();
         }
     }
 }

OCH/common/biz/src/main/java/com/mogo/och/biz/login/model/LoginModel.kt

@@ -8,8 +8,6 @@ import com.mogo.commons.module.intent.IMogoIntentListener
 import com.mogo.commons.module.intent.IntentManager
 import com.mogo.commons.storage.SharedPrefsMgr
 import com.mogo.eagle.core.data.BaseData
-import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager
-import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
@@ -27,7 +25,7 @@ import com.mogo.och.common.module.biz.login.BusinessEnum
 import com.mogo.och.common.module.biz.login.LoginStatusEnum
 import com.mogo.och.common.module.biz.login.LoginStatusEnum.Companion.valueOf
 import com.mogo.och.common.module.biz.login.LoginStatusManager
-import com.mogo.och.common.module.constant.OchCommonConst
+import com.mogo.och.common.module.manager.autopilot.location.OchLocationManager
 import com.mogo.och.common.module.manager.socket.lan.bean.BusCacheKey
 import com.mogo.och.common.module.manager.socket.lan.bean.LoginCacheStatus
 import com.mogo.och.common.module.network.OchCommonServiceCallback
@@ -125,7 +123,7 @@ object LoginModel {
 
     fun gotoLogin(phone: String, code: String) {
         mContext?.let {
-            val location = CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02()
+            val location = OchLocationManager.getGCJ02Location()
             val location4Login = TaxiLoginReqBean.Location4Login(location.latitude, location.longitude)
             OchCommonServiceManager.gotoLoginBycode(it, phone, code, location4Login,
                 object : OchCommonServiceCallback<TaxiLoginRespBean> {
@@ -179,9 +177,7 @@ object LoginModel {
                             if (valueOf(data.data.driverStatus) == LoginStatusEnum.Login) {
                                 // 业务不支持 去退出登录
                                 if (!LoginStatusManager.checkBusiness(data.data.businessType)) {
-                                    val mLatitude = getChassisLocationGCJ02().latitude
+                                    LoginStatusManager.loginOut()
-                                    val mLongitude = getChassisLocationGCJ02().longitude
-                                    LoginStatusManager.loginOut(mLatitude, mLongitude)
                                     return
                                 }
                             }
@@ -220,8 +216,8 @@ object LoginModel {
     }
 
     // 登出
-    fun logout(mLatitude: Double, mLongitude: Double) {
+    fun logout() {
-        val location4Login = TaxiLogoutReqBean.Location4Login(mLatitude, mLongitude)
+        val location4Login = TaxiLogoutReqBean.Location4Login()
         OchCommonServiceManager.logout(
             mContext!!, location4Login,
             object : OchCommonServiceCallback<BaseData> {

OCH/common/common/src/main/java/com/mogo/och/common/module/biz/login/LoginService.kt

@@ -25,7 +25,7 @@ interface LoginService :CommonService {
     /**
      * 登出
      */
-    fun loginOut(mLatitude:Double,mLongitude:Double)
+    fun loginOut()
     fun checkBusiness(businessType: Int): Boolean
     fun checkAllEnv(
         projectType: ProjectType,

OCH/common/common/src/main/java/com/mogo/och/common/module/biz/login/LoginStatusManager.kt

@@ -36,8 +36,8 @@ object LoginStatusManager : CallerBase<ILoginCallback>() {
     }
 
     @JvmStatic
-    fun loginOut(mLatitude: Double, mLongitude: Double) {
+    fun loginOut() {
-        loginService?.loginOut(mLatitude, mLongitude)
+        loginService?.loginOut()
     }
 
     @JvmStatic

OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/location/LocationManager.kt

@@ -0,0 +1,47 @@
+package com.mogo.och.common.module.manager.autopilot.location
+
+import com.mogo.eagle.core.data.map.MogoLocation
+import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Listener
+import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationWGS84Listener
+import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager
+import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationWGS84ListenerManager
+
+object OchLocationManager {
+
+    @JvmStatic
+    fun getGCJ02Location(): MogoLocation {
+         return CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02()
+    }
+
+    @JvmStatic
+    fun getWgs02Location():MogoLocation {
+        return CallerChassisLocationWGS84ListenerManager.getChassisLocationWGS84()
+    }
+
+    @JvmStatic
+    fun addGCJ02Listener(tag:String,callBackHz:Int,listener: IMoGoChassisLocationGCJ02Listener){
+        CallerChassisLocationGCJ02ListenerManager.addListener(tag, callBackHz, listener)
+    }
+    @JvmStatic
+    fun removeGCJ02Listener(tag:String){
+        CallerChassisLocationGCJ02ListenerManager.removeListener(tag)
+    }
+    @JvmStatic
+    fun removeGCJ02Listener(listener: IMoGoChassisLocationGCJ02Listener){
+        CallerChassisLocationGCJ02ListenerManager.removeListener(listener)
+    }
+    @JvmStatic
+    fun addWgs02Listener(tag:String,callBackHz:Int,listener: IMoGoChassisLocationWGS84Listener){
+        CallerChassisLocationWGS84ListenerManager.addListener(tag, callBackHz, listener)
+    }
+    @JvmStatic
+    fun removeWgs02Listener(tag:String){
+        CallerChassisLocationWGS84ListenerManager.removeListener(tag)
+    }
+    @JvmStatic
+    fun removeWgs02Listener(listener: IMoGoChassisLocationWGS84Listener){
+        CallerChassisLocationWGS84ListenerManager.removeListener(listener)
+    }
+
+
+}

OCH/common/common/src/main/java/com/mogo/och/common/module/manager/device/LightAirconditionDoorManager.kt

@@ -1,7 +1,7 @@
 package com.mogo.och.common.module.manager.device
 
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager
-import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager
+import com.mogo.och.common.module.manager.autopilot.location.OchLocationManager
 import com.mogo.och.common.module.utils.RxUtils
 import com.mogo.och.common.module.wigets.toast.ToastCharterUtils
 import io.reactivex.disposables.Disposable
@@ -35,7 +35,7 @@ object LightAirconditionDoorManager {
     }
 
     private fun canOpenOrCloseDoor(): String? {
-        val location = CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02()
+        val location = OchLocationManager.getGCJ02Location()
         return if(location.gnssSpeed<0.3){
             null
         }else{

OCH/common/common/src/main/java/com/mogo/och/common/module/manager/distance/TrajectoryAndDistanceManager.kt

@@ -4,7 +4,6 @@ import com.mogo.commons.AbsMogoApplication
 import com.mogo.eagle.core.data.map.MogoLocation
 import com.mogo.eagle.core.function.api.autopilot.IMoGoPlanningRottingListener
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager
-import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager
 import com.mogo.eagle.core.function.call.autopilot.CallerPlanningRottingListenerManager
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.e
@@ -13,6 +12,7 @@ import com.mogo.eagle.core.utilcode.util.CoordinateUtils
 import com.mogo.eagle.core.utilcode.util.LocationUtils
 import com.mogo.och.common.module.constant.OchCommonConst
 import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutopilotAnalytics
+import com.mogo.och.common.module.manager.autopilot.location.OchLocationManager
 import com.mogo.och.common.module.manager.autopilot.trajectory.TrajectoryCache
 import com.mogo.och.common.module.manager.loop.BizLoopManager
 import com.mogo.och.common.module.manager.loop.LoopInfo
@@ -270,7 +270,7 @@ object TrajectoryAndDistanceManager : IMoGoPlanningRottingListener {
      */
     private fun calculateDistance() {
         //mLocation gcj坐标
-        CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02().let {
+        OchLocationManager.getGCJ02Location().let {
             if (mRoutePoints.isNullOrEmpty() || endStationInfo.stationPoint == null) {
                 d(M_OCHCOMMON + TAG, "没有轨迹或站点坐标停止计算")
                 //结束距离计算
@@ -677,23 +677,20 @@ object TrajectoryAndDistanceManager : IMoGoPlanningRottingListener {
                 return if (redCatche.isNullOrEmpty()) {
                     distanceWithStartStation()
                 } else {
-                    val currentPoint =
+                    val currentPoint = OchLocationManager.getGCJ02Location()
-                        CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02()
                     distanceWithTrajectory(redCatche,currentPoint)
                 }
 
             } else {
                 return if (this.lineId == 0L || this.lineId == null) {
-                    val currentPoint =
+                    val currentPoint = OchLocationManager.getGCJ02Location()
-                        CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02()
                     distanceWithTrajectory(mRoutePoints!!,currentPoint)
                 } else {
                     if (lineId != this.lineId) {
                         // 判断距离起始站的距离
                         distanceWithStartStation()
                     } else {
-                        val currentPoint =
+                        val currentPoint = OchLocationManager.getGCJ02Location()
-                            CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02()
                         distanceWithTrajectory(mRoutePoints!!,currentPoint)
                     }
                 }
@@ -712,7 +709,7 @@ object TrajectoryAndDistanceManager : IMoGoPlanningRottingListener {
         if (startStationInfo.stationPoint == null) {
             return errorTypeNoneLineId
         }
-        val currentPoint = CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02()
+        val currentPoint = OchLocationManager.getGCJ02Location()
         val distance = CoordinateUtils.calculateLineDistance(
             currentPoint.longitude,
             currentPoint.latitude,

OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/mapdirectionview/MapDirectionView.kt

@@ -29,6 +29,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
 import com.mogo.och.common.module.R
+import com.mogo.och.common.module.manager.autopilot.location.OchLocationManager
 import com.mogo.och.shuttle.passenger.ui.mapdirectionview.MapDirectionViewModel
 import me.jessyan.autosize.utils.AutoSizeUtils
 
@@ -128,13 +129,13 @@ class MapDirectionView @JvmOverloads constructor(
         initAMapView()
 
         // 注册定位监听
-        CallerChassisLocationGCJ02ListenerManager.addListener(TAG, 1, this)
+        OchLocationManager.addGCJ02Listener(TAG, 1, this)
     }
 
     override fun onDetachedFromWindow() {
         super.onDetachedFromWindow()
         // 注册定位监听
-        CallerChassisLocationGCJ02ListenerManager.removeListener(TAG)
+        OchLocationManager.removeGCJ02Listener(TAG)
     }
 
     private fun initAMapView() {

OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/model/OrderModel.java

@@ -24,6 +24,7 @@ import com.mogo.eagle.core.data.map.MogoLocation;
 import com.mogo.eagle.core.utilcode.util.DateTimeUtils;
 import com.mogo.eagle.core.utilcode.util.StringUtils;
 import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotManager;
+import com.mogo.och.common.module.manager.autopilot.location.OchLocationManager;
 import com.mogo.och.common.module.manager.distance.TrajectoryAndDistanceManager;
 import com.mogo.och.common.module.manager.socket.lan.LanSocketManager;
 import com.mogo.och.common.module.manager.socket.lan.bean.BusinessType;
@@ -1185,8 +1186,7 @@ public class OrderModel {
 
     // 登出
     public void logout() {
-        MogoLocation gcj02 = CallerChassisLocationGCJ02ListenerManager.INSTANCE.getChassisLocationGCJ02();
+        LoginStatusManager.loginOut();
-        LoginStatusManager.loginOut(gcj02.getLatitude(), gcj02.getLongitude());
     }
 
     public void triggerStartServiceEvent(boolean isRestart, boolean send) {

OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/model/PM2DrivingModel.kt

@@ -32,6 +32,7 @@ import com.mogo.och.common.module.manager.socket.cloud.OCHSocketMessageManager.p
 import com.mogo.och.common.module.constant.OchCommonConst
 import com.mogo.och.common.module.manager.autopilot.autopilot.IOchAutopilotStatusListener
 import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotStatusListenerManager
+import com.mogo.och.common.module.manager.autopilot.location.OchLocationManager
 import com.mogo.och.common.module.network.OchCommonServiceCallback
 import com.mogo.och.common.module.manager.distance.IDistanceListener
 import com.mogo.och.common.module.manager.distance.TrajectoryAndDistanceManager
@@ -113,7 +114,7 @@ class PM2DrivingModel private constructor() {
         OchAutoPilotStatusListenerManager.addListener(TAG, mAutoPilotStatusListener)
 
         // 定位监听
-        CallerChassisLocationGCJ02ListenerManager.addListener(TAG, 3, mMapLocationListener)
+        OchLocationManager.addGCJ02Listener(TAG, 3, mMapLocationListener)
 
         //司乘屏通信监听
         CallerTelematicListenerManager.addListener(TAG, mReceivedMsgListener)
@@ -131,7 +132,7 @@ class PM2DrivingModel private constructor() {
         CallerAutoPilotStatusListenerManager.removeListener(TAG)
 
         // 定位监听
-        CallerChassisLocationGCJ02ListenerManager.removeListener(TAG)
+        OchLocationManager.removeGCJ02Listener(TAG)
 
         CallerTelematicListenerManager.removeListener(TAG)
 

OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/view/WeltMapOverView.kt

@@ -19,6 +19,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
 import com.mogo.eagle.core.utilcode.util.CoordinateUtils
 import com.mogo.eagle.core.utilcode.util.ThreadUtils
+import com.mogo.och.common.module.manager.autopilot.location.OchLocationManager
 import com.mogo.och.sweeper.R
 import com.mogo.och.sweeper.common.bean.SweeperRoutePlanningUpdateReqBean
 import com.mogo.och.sweeper.common.constant.SweeperConst
@@ -55,8 +56,7 @@ class WeltMapOverView : ConstraintLayout, IMoGoChassisLocationGCJ02Listener {
         LayoutInflater.from(context).inflate(R.layout.sweeper_welt_map_overview, this)
         initAMapView()
         // 注册定位监听
-        CallerChassisLocationGCJ02ListenerManager.addListener(TAG, this)
+        OchLocationManager.addGCJ02Listener(TAG, 5,this)
-        CallerChassisLocationGCJ02ListenerManager.setListenerHz(TAG,5)
     }
 
     private fun initAMapView() {

OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/view/WeltSmallMapView.kt

@@ -19,6 +19,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
 import com.mogo.eagle.core.utilcode.util.CoordinateUtils
 import com.mogo.eagle.core.utilcode.util.ThreadUtils
+import com.mogo.och.common.module.manager.autopilot.location.OchLocationManager
 import com.mogo.och.sweeper.common.database.bean.WeltDataBean
 import com.mogo.och.sweeper.R
 import kotlinx.android.synthetic.main.sweeper_welt_small_map_view.view.*
@@ -51,8 +52,7 @@ class WeltSmallMapView : ConstraintLayout, IMoGoChassisLocationGCJ02Listener {
         LayoutInflater.from(context).inflate(R.layout.sweeper_welt_small_map_view, this)
         initAMapView()
         // 注册定位监听
-        CallerChassisLocationGCJ02ListenerManager.addListener(TAG, this)
+        OchLocationManager.addGCJ02Listener(TAG, 5,this)
-        CallerChassisLocationGCJ02ListenerManager.setListenerHz(TAG,5)
     }
 
     override fun onChassisLocationGCJ02(mogoLocation: MogoLocation?) {

OCH/taxi/driver/src/main/java/com/mogo/och/taxi/model/TaxiModel.java

@@ -34,7 +34,6 @@ import com.mogo.eagle.core.function.call.autopilot.CallerPlanningRottingListener
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.commons.storage.SharedPrefsMgr;
 import com.mogo.eagle.core.utilcode.util.CoordinateUtils;
-import com.mogo.eagle.core.utilcode.util.DateTimeUtils;
 import com.mogo.eagle.core.utilcode.util.DrivingDirectionUtils;
 import com.mogo.eagle.core.utilcode.util.NetworkUtils;
 import com.mogo.eagle.core.utilcode.util.StringUtils;
@@ -44,6 +43,7 @@ import com.mogo.och.common.module.manager.autopilot.autopilot.ArrivedStation;
 import com.mogo.och.common.module.manager.autopilot.autopilot.IOchAutopilotStatusListener;
 import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotManager;
 import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotStatusListenerManager;
+import com.mogo.och.common.module.manager.autopilot.location.OchLocationManager;
 import com.mogo.och.common.module.manager.socket.cloud.OCHSocketMessageManager;
 import com.mogo.och.common.module.manager.socket.cloud.data.OCHOperationalMessage;
 import com.mogo.och.common.module.biz.login.LoginStatusManager;
@@ -134,8 +134,6 @@ public class TaxiModel {
     private final List<MogoLocation> mRoutePoints = new ArrayList<>();
     private final int mPreRouteIndex = 0;
 
-    private double mLongitude, mLatitude;
-    private MogoLocation mLocation = null;
 
     private TaxiModel() {
     }
@@ -696,7 +694,9 @@ public class TaxiModel {
 
     // 车机端上传心跳数据（只在出车状态时上传）
     public void runCarHeartbeat() {
-        TaxiServiceManager.runCarHeartbeat(mContext, mLongitude, mLatitude,
+        MogoLocation gcj02Location = OchLocationManager.getGCJ02Location();
+        TaxiServiceManager.runCarHeartbeat(mContext,
+                gcj02Location.getLongitude(), gcj02Location.getLatitude(),
                 new OchCommonServiceCallback<BaseData>() {
                     @Override
                     public void onSuccess(BaseData data) {
@@ -747,8 +747,6 @@ public class TaxiModel {
     public void confirmAutopilotConditionByDriver() {
         if (mCurrentOCHOrder == null) return;
         TaxiOrPassengerReadyReqBean.Result result = new TaxiOrPassengerReadyReqBean.Result();
-//        result.lat = mLatitude;
-//        result.lon = mLongitude;
         TaxiServiceManager.confirmAutopilotConditionByDriver(mContext,
                 mCurrentOCHOrder.orderNo,
                 result,
@@ -1117,10 +1115,6 @@ public class TaxiModel {
                             judgeEndStation(gnssInfo);
                         }
                     }
-
-                    mLongitude = gnssInfo.getLongitude();
-                    mLatitude = gnssInfo.getLatitude();
-                    mLocation = gnssInfo;
                 }
             });
         }
@@ -1489,31 +1483,6 @@ public class TaxiModel {
         reportOrderRemain((long) lastSumLength, (long) lastTime);
     }
 
-    private void routeAndWipe() {
-        if (mRoutePoints != null && mRoutePoints.size() > 0 && mLocation != null) {
-            int haveArrivedIndex = CoordinateCalculateRouteUtil
-                    .getArrivedPointIndexNew(mPreRouteIndex,
-                            mRoutePoints,
-                            mLocation.getLongitude(),
-                            mLocation.getLatitude());
-            List<LatLng> routePoints = CoordinateCalculateRouteUtil
-                    .coordinateConverterLocationToLatLng(mContext, mRoutePoints);
-            List<LatLng> routeArrivied = new ArrayList<>();
-            List<LatLng> routeArriving = new ArrayList<>();
-            for (int i = 0; i < routePoints.size(); i++){
-                if (i <= haveArrivedIndex){
-                    routeArrivied.add(routePoints.get(i));
-                }else {
-                    routeArriving.add(routePoints.get(i));
-                }
-            }
-            if (mAutopilotPlanningCallback != null) {
-                mAutopilotPlanningCallback.routeResult(routeArrivied,routeArriving, mLocation);
-            }
-            setRouteLineMarker();
-        }
-    }
-
     private final IDistanceListener distanceListener = new IDistanceListener() {
         @Override
         public void distanceCallback(float distance) {
@@ -1621,8 +1590,9 @@ public class TaxiModel {
             return;
         }
         TaxiOrPassengerReadyReqBean.Result result = new TaxiOrPassengerReadyReqBean.Result();
-        result.lat = mLatitude;
+        MogoLocation gcj02Location = OchLocationManager.getGCJ02Location();
-        result.lon = mLongitude;
+        result.lat = gcj02Location.getLatitude();
+        result.lon = gcj02Location.getLongitude();
         TaxiServiceManager.updatePassengerHasBoardedStatus(mContext
                 , mCurrentOCHOrder.orderNo
                 , result
@@ -1643,8 +1613,9 @@ public class TaxiModel {
         if (mCurrentOCHOrder == null) return;
 
         TaxiOrPassengerReadyReqBean.Result result = new TaxiOrPassengerReadyReqBean.Result();
-        result.lat = mLatitude;
+        MogoLocation gcj02Location = OchLocationManager.getGCJ02Location();
-        result.lon = mLongitude;
+        result.lat = gcj02Location.getLatitude();
+        result.lon = gcj02Location.getLongitude();
         TaxiServiceManager.startServicePilotDone(mContext
                 , mCurrentOCHOrder.orderNo
                 , result
@@ -1663,8 +1634,9 @@ public class TaxiModel {
     public void arrivedStartPoint() {
         if (mCurrentOCHOrder == null) return;
         TaxiOrPassengerReadyReqBean.Result result = new TaxiOrPassengerReadyReqBean.Result();
-        result.lat = mLatitude;
+        MogoLocation gcj02Location = OchLocationManager.getGCJ02Location();
-        result.lon = mLongitude;
+        result.lat = gcj02Location.getLatitude();
+        result.lon = gcj02Location.getLongitude();
         TaxiServiceManager.arrivedStartPoint(mContext
                 , mCurrentOCHOrder.orderNo
                 , result
@@ -1684,8 +1656,9 @@ public class TaxiModel {
     public void arriveTerminal() {
         if (mCurrentOCHOrder == null) return;
         TaxiOrPassengerReadyReqBean.Result result = new TaxiOrPassengerReadyReqBean.Result();
-        result.lat = mLatitude;
+        MogoLocation gcj02Location = OchLocationManager.getGCJ02Location();
-        result.lon = mLongitude;
+        result.lat = gcj02Location.getLatitude();
+        result.lon = gcj02Location.getLongitude();
         TaxiServiceManager.arriveTerminal(mContext
                 , mCurrentOCHOrder.orderNo
                 , result
@@ -1705,8 +1678,9 @@ public class TaxiModel {
     public void orderCompleted() {
         if (mCurrentOCHOrder == null) return;
         TaxiOrPassengerReadyReqBean.Result result = new TaxiOrPassengerReadyReqBean.Result();
-        result.lat = mLatitude;
+        MogoLocation gcj02Location = OchLocationManager.getGCJ02Location();
-        result.lon = mLongitude;
+        result.lat = gcj02Location.getLatitude();
+        result.lon = gcj02Location.getLongitude();
         TaxiServiceManager.orderCompleted(mContext
                 , mCurrentOCHOrder.orderNo
                 , result
@@ -1724,7 +1698,7 @@ public class TaxiModel {
 
     // 登出
     public void logout() {
-        LoginStatusManager.loginOut(mLatitude, mLongitude);
+        LoginStatusManager.loginOut();
     }
 
     //导航去订单终点目的地

OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java

@@ -18,9 +18,9 @@ import androidx.annotation.RequiresApi;
 import androidx.constraintlayout.widget.ConstraintLayout;
 
 import com.amap.api.navi.model.NaviLatLng;
+import com.mogo.eagle.core.data.map.MogoLocation;
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener;
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager;
-import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager;
 import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.eagle.core.utilcode.util.DateTimeUtils;
@@ -29,6 +29,7 @@ import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
 import com.mogo.map.overlay.IMoGoOverlayManager;
 import com.mogo.map.overlay.core.Level;
 import com.mogo.map.overlay.point.Point;
+import com.mogo.och.common.module.manager.autopilot.location.OchLocationManager;
 import com.mogo.och.common.module.map.AmapNaviToDestinationModel;
 import com.mogo.och.common.module.map.ICommonNaviChangedCallback;
 import com.mogo.och.common.module.utils.DateTimeUtil;
@@ -340,8 +341,9 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment
 
     private void startNaviToStation(boolean isVoicePlay, double stationLat, double stationLng) {
         AmapNaviToDestinationModel.getInstance(getContext()).destroyAmaNavi();
-        double mCurLatitude = CallerChassisLocationGCJ02ListenerManager.INSTANCE.getChassisLocationGCJ02().getLatitude();
+        MogoLocation gcj02Location = OchLocationManager.getGCJ02Location();
-        double mCurLongitude =CallerChassisLocationGCJ02ListenerManager.INSTANCE.getChassisLocationGCJ02().getLongitude();
+        double mCurLatitude = gcj02Location.getLatitude();
+        double mCurLongitude =gcj02Location.getLongitude();
 
         CallerLogger.d(M_TAXI + TAG, "currentLatLng=" + mCurLatitude + " " +mCurLongitude);
 

OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiMapDirectionView.kt

@@ -21,9 +21,9 @@ import com.amap.api.maps.model.Polyline
 import com.amap.api.maps.model.PolylineOptions
 import com.mogo.eagle.core.data.map.MogoLocation
 import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Listener
-import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
+import com.mogo.och.common.module.manager.autopilot.location.OchLocationManager
 import com.mogo.och.taxi.R
 import com.mogo.och.taxi.utils.TaxiMapAssetStyleUtil
 
@@ -68,13 +68,13 @@ class TaxiMapDirectionView @JvmOverloads constructor(
         initAMapView()
 
         // 注册定位监听
-        CallerChassisLocationGCJ02ListenerManager.addListener(TAG, 3, this)
+        OchLocationManager.addGCJ02Listener(TAG, 3, this)
     }
 
     override fun onDetachedFromWindow() {
         super.onDetachedFromWindow()
         // 注册定位监听
-        CallerChassisLocationGCJ02ListenerManager.removeListener(TAG)
+        OchLocationManager.removeGCJ02Listener(TAG)
     }
 
     private fun initAMapView() {

OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/model/AutopilotManager.kt

@@ -18,6 +18,7 @@ import com.mogo.och.common.module.manager.autopilot.OCHAdasAbilityManager
 import com.mogo.och.common.module.manager.autopilot.autopilot.IOchAutopilotStatusListener
 import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotManager
 import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotStatusListenerManager
+import com.mogo.och.common.module.manager.autopilot.location.OchLocationManager
 import com.mogo.och.common.module.manager.distance.TrajectoryAndDistanceManager
 import com.mogo.och.common.module.utils.PinYinUtil
 import com.mogo.och.common.module.voice.VoiceNotice
@@ -232,7 +233,7 @@ object AutopilotManager : IOchAutopilotStatusListener {
     fun startServicePilotDone() {
         if (TaxiPassengerModel.currentOCHOrder == null) return
         val result = TaxiPassengerStartReqBean.Result()
-        val currentLocation = CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02()
+        val currentLocation = OchLocationManager.getGCJ02Location()
         result.lat = currentLocation.latitude
         result.lon = currentLocation.longitude
         TaxiPassengerServiceManager.startServicePilotDone(

OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/speed/SpeedView.kt

@@ -7,8 +7,8 @@ import android.view.LayoutInflater
 import androidx.constraintlayout.widget.ConstraintLayout
 import com.mogo.eagle.core.data.map.MogoLocation
 import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Listener
-import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
+import com.mogo.och.common.module.manager.autopilot.location.OchLocationManager
 import com.mogo.och.taxi.passenger.R
 import kotlinx.android.synthetic.main.taxt_p_speed.view.actv_speed_value
 import kotlin.math.abs
@@ -32,9 +32,9 @@ class SpeedView : ConstraintLayout, IMoGoChassisLocationGCJ02Listener {
     override fun onVisibilityAggregated(isVisible: Boolean) {
         super.onVisibilityAggregated(isVisible)
         if(isVisible){
-            CallerChassisLocationGCJ02ListenerManager.addListener(TAG, 3, this)
+            OchLocationManager.addGCJ02Listener(TAG, 3, this)
         }else{
-            CallerChassisLocationGCJ02ListenerManager.removeListener(TAG)
+            OchLocationManager.removeGCJ02Listener(TAG)
         }
     }
 

OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/errorpoint/ReportErrorPointViewModel.kt

@@ -3,10 +3,9 @@ package com.mogo.och.unmanned.taxi.ui.errorpoint
 import androidx.lifecycle.ViewModel
 import com.mogo.commons.AbsMogoApplication
 import com.mogo.eagle.core.data.BaseData
-import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager
-import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationWGS84ListenerManager
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.util.ToastUtils
+import com.mogo.och.common.module.manager.autopilot.location.OchLocationManager
 import com.mogo.och.common.module.network.OchCommonServiceCallback
 import com.mogo.och.unmanned.taxi.bean.PointError
 import com.mogo.och.unmanned.taxi.bean.QueryPointErrorReasonsRsp
@@ -65,8 +64,8 @@ class ReportErrorPointViewModel : ViewModel() {
             return
         }
         grayId?.let {
-            val gcj02 = CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02()
+            val gcj02 = OchLocationManager.getGCJ02Location()
-            val wgs84 = CallerChassisLocationWGS84ListenerManager.getChassisLocationWGS84()
+            val wgs84 = OchLocationManager.getWgs02Location()
             val errorReasonCodes = mutableListOf<String>()
             checkDataList.forEach {pointError->
                 errorReasonCodes.add(pointError.code)

OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/navi/auto/TaxiMapDirectionView.kt

@@ -21,9 +21,9 @@ import com.amap.api.maps.model.Polyline
 import com.amap.api.maps.model.PolylineOptions
 import com.mogo.eagle.core.data.map.MogoLocation
 import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Listener
-import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
+import com.mogo.och.common.module.manager.autopilot.location.OchLocationManager
 import com.mogo.och.unmanned.taxi.R
 import com.mogo.och.unmanned.taxi.utils.TaxiMapAssetStyleUtil
 
@@ -68,14 +68,14 @@ class TaxiMapDirectionView @JvmOverloads constructor(
         initAMapView()
 
         // 注册定位监听
-        CallerChassisLocationGCJ02ListenerManager.addListener(TAG, 3, this)
+        OchLocationManager.addGCJ02Listener(TAG, 3, this)
     }
 
     override fun onDetachedFromWindow() {
         super.onDetachedFromWindow()
         // 注册定位监听
         clearPolyline()
-        CallerChassisLocationGCJ02ListenerManager.removeListener(TAG)
+        OchLocationManager.removeGCJ02Listener(TAG)
     }
 
     private fun initAMapView() {

OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/TaxiRoutingFragment.kt

@@ -6,12 +6,12 @@ import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
 import com.amap.api.navi.model.NaviLatLng
 import com.mogo.commons.mvp.BaseFragment
-import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager
 import com.mogo.eagle.core.function.main.MainMoGoApplication
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
 import com.mogo.eagle.core.utilcode.util.ThreadUtils
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
+import com.mogo.och.common.module.manager.autopilot.location.OchLocationManager
 import com.mogo.och.common.module.map.AmapNaviToDestinationModel
 import com.mogo.och.common.module.map.ICommonNaviChangedCallback
 import com.mogo.och.common.module.utils.FlowBus
@@ -311,10 +311,9 @@ class TaxiRoutingFragment : BaseFragment(), ICommonNaviChangedCallback {
         stationLng: Double
     ) {
         AmapNaviToDestinationModel.getInstance(context).destroyAmaNavi()
-        val mCurLatitude =
+        val gcJ02Location = OchLocationManager.getGCJ02Location()
-            CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02().latitude
+        val mCurLatitude = gcJ02Location.latitude
-        val mCurLongitude =
+        val mCurLongitude = gcJ02Location.longitude
-            CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02().longitude
         CallerLogger.d(
             TAG,
             "currentLocation, lat=$mCurLatitude, lon=$mCurLongitude"

OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/TaxiRoutingFragmentViewModel.kt

@@ -4,10 +4,10 @@ import android.content.Context
 import android.content.Intent
 import com.mogo.commons.AbsMogoApplication
 import com.mogo.commons.module.status.MogoStatusManager
-import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
 import com.mogo.eagle.core.utilcode.util.ActivityUtils
 import com.mogo.eagle.core.utilcode.util.ToastUtils
+import com.mogo.och.common.module.manager.autopilot.location.OchLocationManager
 import com.mogo.och.common.module.map.AmapNaviToDestinationModel
 import com.mogo.och.unmanned.taxi.base.BaseViewModel
 import com.mogo.och.unmanned.taxi.base.IUiIntent
@@ -89,8 +89,7 @@ class TaxiRoutingFragmentViewModel : BaseViewModel<TaxiRoutingUiState, TaxiRouti
             is TaxiRoutingUiIntent.SubmitGrayLineIssueLocation -> {
                 DebugView.printInfoMsg("[上报打点] 准备上报打点")
                 val grayId = intent.grayId
-                val currentLocation =
+                val currentLocation = OchLocationManager.getGCJ02Location()
-                    CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02()
                 TaxiRoutingModel.submitGrayLineIssueLocation(
                     grayId,
                     currentLocation.longitude,

OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/TaxiRoutingModel.kt

@@ -25,6 +25,7 @@ import com.mogo.och.common.module.manager.autopilot.autopilot.ArrivedStation
 import com.mogo.och.common.module.manager.autopilot.autopilot.IOchAutopilotStatusListener
 import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotManager
 import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotStatusListenerManager
+import com.mogo.och.common.module.manager.autopilot.location.OchLocationManager
 import com.mogo.och.common.module.utils.OCHThreadPoolManager
 import com.mogo.och.unmanned.taxi.bean.ContrailBean
 import com.mogo.och.unmanned.taxi.bean.EndGrayContrailTaskReq
@@ -192,11 +193,11 @@ object TaxiRoutingModel {
 
     fun addGDMapCurrentLocationListener() {
         //定位监听， 传false是高德坐标系 10 -> 100ms一次
-        CallerChassisLocationGCJ02ListenerManager.addListener(TAG, 5, mMapLocationListener)
+        OchLocationManager.addGCJ02Listener(TAG, 5, mMapLocationListener)
     }
 
     fun removeGDMapCurrentLocationListener() {
-        CallerChassisLocationGCJ02ListenerManager.removeListener(TAG)
+        OchLocationManager.removeGCJ02Listener(TAG)
     }
 
     fun queryRoutingGrayLineList() {

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

@@ -13,7 +13,6 @@ import com.amap.api.navi.model.NaviLatLng
 import com.mogo.commons.mvp.BaseFragment
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager.getState
-import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02
 import com.mogo.eagle.core.function.main.MainMoGoApplication
 import com.mogo.eagle.core.network.utils.GsonUtil
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
@@ -23,6 +22,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_
 import com.mogo.eagle.core.utilcode.util.ClickUtils
 import com.mogo.eagle.core.utilcode.util.ToastUtils
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
+import com.mogo.och.common.module.manager.autopilot.location.OchLocationManager
 import com.mogo.och.common.module.map.AmapNaviToDestinationModel
 import com.mogo.och.common.module.map.ICommonNaviChangedCallback
 import com.mogo.och.common.module.utils.DateTimeUtil
@@ -617,12 +617,10 @@ class TaxiCurrentTaskFragment : BaseFragment(),
 
     private fun startNaviToStation(isVoicePlay: Boolean, stationLat: Double, stationLng: Double) {
         AmapNaviToDestinationModel.getInstance(context).destroyAmaNavi()
-        val mCurLatitude = getChassisLocationGCJ02().latitude
+        val gcJ02Location = OchLocationManager.getGCJ02Location()
-        val mCurLongitude = getChassisLocationGCJ02().longitude
+        val mCurLatitude = gcJ02Location.latitude
-        d(
+        val mCurLongitude = gcJ02Location.longitude
-            TAG,
+        d(TAG, "currentLatLng=$mCurLatitude $mCurLongitude")
-            "currentLatLng=$mCurLatitude $mCurLongitude"
-        )
         val startNaviLatLng = NaviLatLng(mCurLatitude, mCurLongitude)
         val endNaviLatLng = NaviLatLng(stationLat, stationLng)
         AmapNaviToDestinationModel.getInstance(context).initAMapNavi(startNaviLatLng, endNaviLatLng)

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

@@ -7,7 +7,6 @@ import com.mogo.eagle.core.data.config.FunctionBuildConfig
 import com.mogo.eagle.core.data.map.MogoLocation
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager
-import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager
 import com.mogo.eagle.core.function.call.unmanned.CallerUnmannedListenerManager
 import com.mogo.eagle.core.network.utils.GsonUtil
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
@@ -16,6 +15,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
 import com.mogo.eagle.core.utilcode.util.NetworkUtils
 import com.mogo.eagle.core.utilcode.util.ToastUtils
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
+import com.mogo.och.common.module.manager.autopilot.location.OchLocationManager
 import com.mogo.och.common.module.network.OchCommonServiceCallback
 import com.mogo.och.common.module.manager.distance.TrajectoryAndDistanceManager
 import com.mogo.och.common.module.utils.ToastUtilsOch
@@ -439,9 +439,10 @@ class TaxiCurrentTaskViewModel : BaseViewModel<UnmannedState, TaskUiIntent>(),
     }
 
     override fun onCarStartServiceFailed(code: Int, msg: String) {
+        val gcJ02Location = OchLocationManager.getGCJ02Location()
         ToastUtilsOch.showWithCodeMessage(
             code,
-            "$msg curLatitude = ${CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02().latitude}" + " curLongitude = ${CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02().longitude}"
+            "$msg curLatitude = ${gcJ02Location.latitude}" + " curLongitude = ${gcJ02Location.longitude}"
         )
     }
 

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

@@ -21,10 +21,8 @@ import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Liste
 import com.mogo.eagle.core.function.api.autopilot.IMoGoPlanningRottingListener
 import com.mogo.eagle.core.function.api.unmanned.IUnmannedListener
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager
-import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager.updateAutopilotControlParameters
 import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager
-import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02
 import com.mogo.eagle.core.function.call.autopilot.CallerPlanningRottingListenerManager
 import com.mogo.eagle.core.function.call.unmanned.CallerUnmannedListenerManager
 import com.mogo.eagle.core.network.utils.GsonUtil
@@ -51,6 +49,7 @@ import com.mogo.och.common.module.manager.autopilot.autopilot.ArrivedStation
 import com.mogo.och.common.module.manager.autopilot.autopilot.IOchAutopilotStatusListener
 import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotManager
 import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotStatusListenerManager
+import com.mogo.och.common.module.manager.autopilot.location.OchLocationManager
 import com.mogo.och.common.module.manager.distance.IDistanceListener
 import com.mogo.och.common.module.manager.distance.ITrajectoryListener
 import com.mogo.och.common.module.manager.distance.TrajectoryAndDistanceManager
@@ -215,7 +214,7 @@ object TaxiTaskModel {
         // 2021.11.1重构自动驾驶 实现接口 IMoGoAutopilotStatusListener 注册监听 替换IMogoAdasOCHCallback接口
         OchAutoPilotStatusListenerManager.addListener(TAG, mMogoAutopilotStatusListener)
         //定位监听， 传false是高德坐标系 10 -> 100ms一次
-        CallerChassisLocationGCJ02ListenerManager.addListener(TAG, 5, mMapLocationListener)
+        OchLocationManager.addGCJ02Listener(TAG, 5, mMapLocationListener)
         //2021.11.1 自动驾驶路线规划接口
         CallerPlanningRottingListenerManager.addListener(TAG, mMogoAutopilotPlanningListener)
         //开启自驾后 异常信息返回
@@ -246,7 +245,7 @@ object TaxiTaskModel {
         )
 
         // 注销地图监听
-        CallerChassisLocationGCJ02ListenerManager.removeListener(TAG)
+        OchLocationManager.removeGCJ02Listener(TAG)
         OCHSocketMessageManager.releaseSocketMessageListener(OCHSocketMessageManager.msgMonitorType)
         OchAutoPilotStatusListenerManager.removeListener(mMogoAutopilotStatusListener)
         CallerPlanningRottingListenerManager.removeListener(mMogoAutopilotPlanningListener)
@@ -1142,9 +1141,9 @@ object TaxiTaskModel {
         } else {
             //暂停接单状态下,去接单
             DebugView.printInfoMsg("[开始接单] 准备发送请求")
+            val gcJ02Location = OchLocationManager.getGCJ02Location()
             TaxiTaskWithOrderServiceManager.startService(mContext,
-                getChassisLocationGCJ02().latitude,
+                gcJ02Location.latitude, gcJ02Location.longitude,
-                getChassisLocationGCJ02().longitude,
                 object : OchCommonServiceCallback<StartServiceRespBean> {
                     override fun onSuccess(data: StartServiceRespBean?) {
                         if (data == null) return
@@ -1473,10 +1472,7 @@ object TaxiTaskModel {
 
     // 登出
     fun logout() {
-        LoginStatusManager.loginOut(
+        LoginStatusManager.loginOut()
-            getChassisLocationGCJ02().latitude,
-            getChassisLocationGCJ02().longitude
-        )
         mCurrentTaskWithOrder = null
         mDriveToNearestStationTask = null
         DebugView.printInfoMsg("[登出] 退出登陆")

OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/speed/SpeedView.kt

@@ -7,8 +7,8 @@ import android.view.LayoutInflater
 import androidx.constraintlayout.widget.ConstraintLayout
 import com.mogo.eagle.core.data.map.MogoLocation
 import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Listener
-import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
+import com.mogo.och.common.module.manager.autopilot.location.OchLocationManager
 import com.mogo.och.unmanned.taxi.passenger.R
 import kotlinx.android.synthetic.main.taxt_u_p_speed.view.actv_speed_value
 import kotlin.math.abs
@@ -32,9 +32,9 @@ class SpeedView : ConstraintLayout, IMoGoChassisLocationGCJ02Listener {
     override fun onVisibilityAggregated(isVisible: Boolean) {
         super.onVisibilityAggregated(isVisible)
         if(isVisible){
-            CallerChassisLocationGCJ02ListenerManager.addListener(TAG, 3, this)
+            OchLocationManager.addGCJ02Listener(TAG, 3, this)
         }else{
-            CallerChassisLocationGCJ02ListenerManager.removeListener(TAG)
+            OchLocationManager.removeGCJ02Listener(TAG)
         }
     }