[6.5.0]

[fea] [location 聚合]
2024-07-04 16:35:43 +08:00
parent a93c0d45c1
commit a3b661cbe4
34 changed files with 179 additions and 162 deletions
--- a/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/login/LoginService.kt
+++ b/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,
--- a/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/login/LoginStatusManager.kt
+++ b/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) {
-        loginService?.loginOut(mLatitude, mLongitude)
+    fun loginOut() {
+        loginService?.loginOut()
    }

    @JvmStatic
--- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/location/LocationManager.kt
+++ b/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)
+    }
+
+
+}
--- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/device/LightAirconditionDoorManager.kt
+++ b/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{
--- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/distance/TrajectoryAndDistanceManager.kt
+++ b/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 =
-                        CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02()
+                    val currentPoint = OchLocationManager.getGCJ02Location()
                    distanceWithTrajectory(redCatche,currentPoint)
                }

            } else {
                return if (this.lineId == 0L || this.lineId == null) {
-                    val currentPoint =
-                        CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02()
+                    val currentPoint = OchLocationManager.getGCJ02Location()
                    distanceWithTrajectory(mRoutePoints!!,currentPoint)
                } else {
                    if (lineId != this.lineId) {
                        // 判断距离起始站的距离
                        distanceWithStartStation()
                    } else {
-                        val currentPoint =
-                            CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02()
+                        val currentPoint = OchLocationManager.getGCJ02Location()
                        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,
--- a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/mapdirectionview/MapDirectionView.kt
+++ b/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() {