From 3c36b6e3bb3da2dd138038f8ca153dc4d873f1a9 Mon Sep 17 00:00:00 2001 From: renwj Date: Tue, 23 Jul 2024 15:39:18 +0800 Subject: [PATCH] =?UTF-8?q?[6.5.0][=E8=A7=86=E8=A7=92=E5=88=87=E6=8D=A2]?= =?UTF-8?q?=20=E4=BC=98=E5=8C=96=E9=AB=98=E7=B2=BE=E5=9C=B0=E5=9B=BE?= =?UTF-8?q?=E6=8E=A7=E4=BB=B6=E6=89=8B=E5=8A=BF=E7=A6=81=E7=94=A8=E5=92=8C?= =?UTF-8?q?=E5=BC=80=E5=90=AF=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../map/switchvisual/VisualViewModel.kt | 2 +- .../main/java/com/autonavi/nge/map/MapView.kt | 16 ++++++++++ .../map/sdk/inner/abs/IMapController.kt | 2 ++ .../zhidaoauto/map/sdk/inner/abs/IMapView.kt | 32 ++----------------- .../map/sdk/inner/map/MapController.kt | 4 +++ .../map/sdk/open/view/MapAutoViewHelper.kt | 1 + 6 files changed, 27 insertions(+), 30 deletions(-) diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/switchvisual/VisualViewModel.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/switchvisual/VisualViewModel.kt index bdd9dc4a6c..8ab46c8ee7 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/switchvisual/VisualViewModel.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/switchvisual/VisualViewModel.kt @@ -76,7 +76,7 @@ class VisualViewModel : ViewModel(), when (angle) { Visualangle.Middle -> { - CallerVisualAngleManager.changeScene(Default()) + CallerVisualAngleManager.changeScene(Default(forceClosePrev = true)) } Visualangle.Long -> { diff --git a/libraries/mapmodule/src/main/java/com/autonavi/nge/map/MapView.kt b/libraries/mapmodule/src/main/java/com/autonavi/nge/map/MapView.kt index 0937ddb890..c3d1bf567f 100644 --- a/libraries/mapmodule/src/main/java/com/autonavi/nge/map/MapView.kt +++ b/libraries/mapmodule/src/main/java/com/autonavi/nge/map/MapView.kt @@ -139,6 +139,8 @@ class MapView(context: Context, private val mMapStyleParams: IMapStyleParams, pr private var waitTime = 5000L private var isAutoLockCar = true + private var isAllGestureEnabled = true + // 协程 private val mScope: CoroutineScope = CoroutineScope(SupervisorJob() + Dispatchers.Default) // 耗时专用协程 @@ -336,6 +338,9 @@ class MapView(context: Context, private val mMapStyleParams: IMapStyleParams, pr var lonlat: LonLat? = null override fun onTouchEvent(ev: MotionEvent): Boolean { + if (!isAllGestureEnabled) { + return mGestureDetector.onTouchEvent(ev) + } if (ev.action == MotionEvent.ACTION_MOVE && mDragMarker != null) { mDragMarker?.let { if(DEBUG){ @@ -993,6 +998,9 @@ class MapView(context: Context, private val mMapStyleParams: IMapStyleParams, pr if (DEBUG && mShowTouchInfo) { Log.i(TAG, "touchop--mGestureDetector--onFling:e1:${e1.x},${e1.y},e2:${e2.x},${e2.y},${velocityX},${velocityY}") } + if (!isAllGestureEnabled) { + return false + } if (e1.pointerCount >= 2 || e2.pointerCount >= 2) { return false } @@ -1040,6 +1048,10 @@ class MapView(context: Context, private val mMapStyleParams: IMapStyleParams, pr if (DEBUG && mShowTouchInfo) { Log.i(TAG, "touchop--mGestureDetector--onScroll:e1:${e1.pointerCount},${e1.x},${e1.y},,e2:${e2.pointerCount},${e2.x},${e2.y},$distanceX,$distanceY,time:${e2.eventTime}") } + + if (!isAllGestureEnabled) { + return false + } if (e1.pointerCount >= 2 || e2.pointerCount >= 2) { return false } @@ -1256,6 +1268,10 @@ class MapView(context: Context, private val mMapStyleParams: IMapStyleParams, pr this.renderTimePer = renderTimePer } + override fun setAllGestureEnabled(flag: Boolean) { + this.isAllGestureEnabled = flag + } + private fun renderDataCallback(data: String) { // if(DEBUG){ // Log.d("renderDataCallback", "renderDataCallback:$data") diff --git a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/abs/IMapController.kt b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/abs/IMapController.kt index 82ae0a2449..4a237dca46 100644 --- a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/abs/IMapController.kt +++ b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/abs/IMapController.kt @@ -478,4 +478,6 @@ interface IMapController { fun setStreetLightEffectIsEnable(isEnable: Boolean) fun setHDTypeVisible(type: IntArray?) + + fun setAllGestureEnabled(flag: Boolean) } \ No newline at end of file diff --git a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/abs/IMapView.kt b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/abs/IMapView.kt index 9081b00ecf..1796f69a6a 100644 --- a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/abs/IMapView.kt +++ b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/abs/IMapView.kt @@ -80,37 +80,11 @@ interface IMapView { //耗时协程 fun getDemaningScope():CoroutineScope? + // 设置手势标记位-- 临时 + fun setAllGestureEnabled(flag: Boolean) - - - - - - - - - - - - - - - - - - - - - - - - - - - - -// fun setIsFarViewAngel(isFar: Boolean) + // fun setIsFarViewAngel(isFar: Boolean) // // fun setUpdateCount(updateCount: Int) } \ No newline at end of file diff --git a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/map/MapController.kt b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/map/MapController.kt index 36b495f9d7..88a732a40d 100644 --- a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/map/MapController.kt +++ b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/map/MapController.kt @@ -2281,4 +2281,8 @@ class MapController(private var context: Context?, private val mMapView: IMapVie override fun setHDTypeVisible(type: IntArray?){ mMapView.getMapEngine().setHDTypeVisible(type) } + + override fun setAllGestureEnabled(flag: Boolean) { + mMapView.setAllGestureEnabled(flag) + } } \ No newline at end of file diff --git a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/view/MapAutoViewHelper.kt b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/view/MapAutoViewHelper.kt index 7b8e117fc6..0ee4e5671e 100644 --- a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/view/MapAutoViewHelper.kt +++ b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/view/MapAutoViewHelper.kt @@ -550,6 +550,7 @@ class MapAutoViewHelper(mapAutoView: MapAutoView) { mMapAutoView.getMapController()?.setScroll(flag) mMapAutoView.getMapController()?.setFling(flag) mMapAutoView.getMapController()?.setRotate(flag) + mMapAutoView.getMapController()?.setAllGestureEnabled(flag) } /**