[3.4.0-map-sdk] fix merge problem
This commit is contained in:
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user