[6.5.0]

[fea]
[location 聚合]

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,
-            mLongitude
+            gcJ02Location.latitude,
+            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{