[3.4.0-map-sdk] fix merge problem

2023-09-11 15:11:58 +08:00
parent 5c95235015
commit b054caa402
13 changed files with 28 additions and 19 deletions
--- a/OCH/bus/driver/src/main/java/com/mogo/och/bus/BusProvider.java
+++ b/OCH/bus/driver/src/main/java/com/mogo/och/bus/BusProvider.java
@@ -10,7 +10,6 @@ import androidx.fragment.app.FragmentActivity;
 import androidx.fragment.app.FragmentManager;

 import com.alibaba.android.arouter.facade.annotation.Route;
-import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager;
 import com.mogo.eagle.core.function.call.setting.CallerMoGoUiSettingManager;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.och.bus.constant.BusConst;
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/MogoOCHBusPassenger.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/MogoOCHBusPassenger.kt
@@ -6,8 +6,6 @@ import androidx.fragment.app.FragmentActivity
 import androidx.fragment.app.FragmentManager
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.mogo.eagle.core.function.api.base.IMoGoFunctionProvider
-import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager.getMapUIController
-import com.mogo.eagle.core.function.call.setting.CallerMoGoUiSettingManager.stepInDayMode
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
 import com.mogo.och.charter.passenger.constant.CharterPassengerConst
--- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/BusProvider.java
+++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/BusProvider.java
@@ -10,7 +10,6 @@ import androidx.fragment.app.FragmentActivity;
 import androidx.fragment.app.FragmentManager;

 import com.alibaba.android.arouter.facade.annotation.Route;
-import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager;
 import com.mogo.eagle.core.function.call.setting.CallerMoGoUiSettingManager;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.och.bus.constant.BusConst;
--- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java
+++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java
@@ -28,8 +28,6 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListener
 import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotRecordListenerManager;
 import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager;
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager;
-import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager;
-import com.mogo.eagle.core.function.call.map.CallerVisualAngleManager;
 import com.mogo.eagle.core.function.hmi.ui.msgbox.DriverMsgBoxBubbleView;
 import com.mogo.eagle.core.function.hmi.ui.msgbox.DriverMsgBoxButtonView;
 import com.mogo.eagle.core.function.hmi.ui.msgbox.DriverMsgBoxListView;
--- a/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt
+++ b/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt
@@ -132,7 +132,7 @@ object ConfigStartUp {
        }

        val mapParams = MapParams.init()
-        mapParams.setDebugMode(false)
+        mapParams.setDebugMode(true)
            // 1-使用本地地图数据，0-使用在线地图数据
 //            .setDataFileSource(1)
            .setIsRecordLogs(false)
--- a/config.gradle
+++ b/config.gradle
@@ -9,7 +9,7 @@ ext {
            androidxconstraintlayout     : "androidx.constraintlayout:constraintlayout:2.1.0",
            boostmultidex                : "com.bytedance.boost_multidex:boost_multidex:1.0.1",
            androidxviewpager2           : "androidx.viewpager2:viewpager2:1.0.0",
-            androidxrecyclerview         : "androidx.recyclerview:recyclerview:1.1.0",
+            androidxrecyclerview         : "androidx.recyclerview:recyclerview:1.2.0",
            androidxcardview             : "androidx.cardview:cardview:1.0.0",
            localbroadcastmanager        : "androidx.localbroadcastmanager:localbroadcastmanager:1.0.0",
            // flexbox
--- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/trafficlight/core/MogoTrafficLightManager.kt
+++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/trafficlight/core/MogoTrafficLightManager.kt
@@ -11,7 +11,6 @@ import com.mogo.eagle.core.data.biz.trafficlight.isInRange
 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.function.call.map.CallerMapUIServiceManager
 import com.mogo.eagle.core.function.call.v2x.CallerTrafficLightListenerManager
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_V2X
--- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/trafficlight/network/TrafficLightNetWorkModel.kt
+++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/trafficlight/network/TrafficLightNetWorkModel.kt
@@ -4,12 +4,12 @@ import com.mogo.cloud.passport.MoGoAiCloudClientConfig
 import com.mogo.commons.constants.HostConst
 import com.mogo.eagle.core.data.BaseResponse
 import com.mogo.eagle.core.data.biz.trafficlight.*
-import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager
 import com.mogo.eagle.core.network.MoGoRetrofitFactory
 import com.mogo.eagle.core.network.apiCall
 import com.mogo.eagle.core.network.cancel
 import com.mogo.eagle.core.network.request
 import com.mogo.eagle.core.utilcode.util.GsonUtils
+import com.mogo.map.MogoData.Companion.mogoMapData

 class TrafficLightNetWorkModel {

@@ -28,8 +28,7 @@ class TrafficLightNetWorkModel {
        request<BaseResponse<RoadIDResult>>("requestRoadID") {
            loader {
                apiCall {
-                    val tileId = CallerMapUIServiceManager.getMapUIController()
-                        ?.getTileId(lon, lat) ?: 0
+                    val tileId = mogoMapData.get().getTileId(lon, lat)
                    val map = hashMapOf<String, String>()
                    val roadIDRequestData = RoadIDRequestData(tileId, lat, lon, bearing)
                    map["sn"] = MoGoAiCloudClientConfig.getInstance().sn
--- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcatch/MogoLogCatchManager.kt
+++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcatch/MogoLogCatchManager.kt
@@ -18,7 +18,6 @@ import com.mogo.eagle.core.function.api.map.deva.IMoGoMapDevaProvider
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager
 import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsListenerManager
 import com.mogo.eagle.core.function.call.map.CallerMapDevaListenerManager
-import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.LogLevel
 import com.mogo.eagle.core.utilcode.mogo.logger.Logger
@@ -26,6 +25,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_
 import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr
 import com.mogo.eagle.core.utilcode.mogo.toast.TipToast
 import com.mogo.eagle.core.utilcode.util.ThreadUtils
+import com.mogo.map.MogoData
 import com.zhidao.loglib.bean.RemoteLogPushContent
 import com.zhidao.loglib.call.LogInfoManagerFactory
 import com.zhidao.loglib.core.ILogListener
@@ -224,7 +224,7 @@ object MogoLogCatchManager : IMogoOnMessageListener<RemoteLogPushContent>, Handl
            config.isShowDebugLog = true
            config.isShowNetDebugLog = true
        }
-        CallerMapUIServiceManager.getMapUIController()?.setDebugMode(true)
+        MogoData.mogoMapData.get().setDebugMode(true)
        CallerAutoPilotControlManager.setEnableLog(true)
    }

@@ -238,7 +238,7 @@ object MogoLogCatchManager : IMogoOnMessageListener<RemoteLogPushContent>, Handl
            config.isShowDebugLog = false
            config.isShowNetDebugLog = false
        }
-        CallerMapUIServiceManager.getMapUIController()?.setDebugMode(false)
+        MogoData.mogoMapData.get().setDebugMode(false)
        CallerAutoPilotControlManager.setEnableLog(false)
    }

--- a/libraries/mapmodule/build.gradle
+++ b/libraries/mapmodule/build.gradle
@@ -48,7 +48,7 @@ android {
 dependencies {
    implementation rootProject.ext.dependencies.coroutinescore
    implementation rootProject.ext.dependencies.coroutinesandroid
-    implementation rootProject.ext.dependencies.kotlinstdlibjdk7
+    implementation rootProject.ext.dependencies.kotlinstdlib
    implementation rootProject.ext.dependencies.androidxrecyclerview
    implementation rootProject.ext.dependencies.androidxannotation
    implementation rootProject.ext.dependencies.androidxappcompat
--- a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/road/RoadHelper.kt
+++ b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/road/RoadHelper.kt
@@ -1228,7 +1228,7 @@ class RoadHelper {

        cancelCacheHDData()
        cacheList.add(id)
-        RoadHelper.getInstance()?.cacheHDDataByCity(id,object : IResult<Boolean> {
+        getInstance()?.cacheHDDataByCity(id,object : IResult<Boolean> {
            override fun result(code: Int, result: Boolean?) {
                mIsExecute.set(result?:false)
                if (CompileConfig.DEBUG) {
@@ -1248,7 +1248,7 @@ class RoadHelper {
        cacheHdDataProgressJob = CommonController.instance.scope?.launch(Dispatchers.IO) {
            var progress = 0.0
            while (progress < 1.0) {
-                RoadHelper.getInstance()?.getCacheProgressByCity(id,object : IResult<Double> {
+                getCacheProgressByCity(id,object : IResult<Double> {
                    override fun result(code: Int, result: Double?) {
                        progress = result?:0.0
                        if (CompileConfig.DEBUG) {
@@ -1278,7 +1278,7 @@ class RoadHelper {
        if (TransformUtils.outOfChina(lat, lon)) {
            return
        }
-        RoadHelper.getInstance()?.getCityCode(lon, lat, object : IResult<Int> {
+        getInstance()?.getCityCode(lon, lat, object : IResult<Int> {
            override fun result(code: Int, id: Int?) {
                if (id == 0) {
                    return
--- a/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.kt
+++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.kt
@@ -33,6 +33,11 @@ interface IMogoMapUIController {
     */
    fun stepInDayMode(isDayMode: Boolean)

+    /**
+     * 锁定视角变换
+     */
+    fun visualAngleLock(lock: Boolean)
+
    /**
     * 切换3D模式下远距，中距，近距视角
     *
--- a/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.kt
+++ b/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.kt
@@ -17,6 +17,7 @@ import com.mogo.eagle.core.function.call.map.CallerMapDevaListenerManager.invoke
 import com.mogo.eagle.core.function.call.map.CallerMapRoadListenerManager.invokeListenersOnRoadIdGet
 import com.mogo.eagle.core.function.call.map.CallerMapRoadListenerManager.invokeListenersOnStopLineGet
 import com.mogo.eagle.core.function.call.map.CallerMapRomaListener.invokeMapRomaStatus
+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.CallerLogger.e
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.i
@@ -69,6 +70,9 @@ class AMapViewWrapper(mMapView: MapAutoView) : IMogoMapView, IMogoMapUIControlle
        .build()
    private var mCarCursorOption = DEFAULT_OPTION

+    @Volatile
+    private var visualLock = false
+
    @Volatile
    private var mCurrentUI: EnumMapUI = EnumMapUI.MAP_STYLE_NIGHT_VR
    override var currentMapVisualAngle: VisualAngleMode = VisualAngleMode.MODE_MEDIUM_SIGHT
@@ -265,6 +269,10 @@ class AMapViewWrapper(mMapView: MapAutoView) : IMogoMapView, IMogoMapUIControlle
    }

    override fun changeMapVisualAngle(angelMode: VisualAngleMode, mogoLatLng: MogoLatLng?) {
+        if(visualLock){
+            e(SceneConstant.M_MAP + TAG, "视角切换已锁定")
+            return
+        }
        val mapAutoViewHelper = mMapView.getMapAutoViewHelper()
        if (mapAutoViewHelper != null) {
            currentMapVisualAngle = angelMode
@@ -655,6 +663,10 @@ class AMapViewWrapper(mMapView: MapAutoView) : IMogoMapView, IMogoMapUIControlle
 //        }
    }

+    override fun visualAngleLock(lock: Boolean) {
+        visualLock = lock
+    }
+
    override fun setMapDAngle(angle: Float) {
        if (checkAMapView()) {
            mMapView.getMapAutoViewHelper()!!.setMapDAngle(angle)