expo-gaode-map-navigation 2.0.5 → 2.0.6

package/ios/map/ExpoGaodeMapView.swift

@@ -2,6 +2,7 @@ import ExpoModulesCore
 import AMapNaviKit
 import MapKit
 import CoreLocation
+import QuartzCore
 
 /**
  * 高德地图视图组件
@@ -15,8 +16,8 @@ import CoreLocation
 class ExpoGaodeMapView: ExpoView, MAMapViewDelegate, UIGestureRecognizerDelegate, MAMultiPointOverlayRendererDelegate {
     // MARK: - 属性
     
-    /// 地图类型 (0:标准 1:卫星 2:夜间 3:导航)
-    var mapType: Int = 0
+    /// 地图类型 (1:标准 2:卫星 3:夜间 4:导航 5:公交)
+    var mapType: Int = 1
     /// 初始相机位置
     var initialCameraPosition: [String: Any]?
     /// 是否显示缩放控件
@@ -51,6 +52,19 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate, UIGestureRecognizerDelegate
     var showsBuildings: Bool = false
     /// 是否显示室内地图
     var showsIndoorMap: Bool = false
+    /// 定位最小更新距离
+    var distanceFilter: CLLocationDistance = kCLDistanceFilterNone
+    /// 朝向最小更新角度
+    var headingFilter: CLLocationDegrees = kCLHeadingFilterNone
+    /// 相机移动事件节流间隔（毫秒）
+    var cameraEventThrottleMs: Int = 32 {
+        didSet {
+            if cameraEventThrottleMs == 0 {
+                cameraMoveDispatchWorkItem?.cancel()
+                cameraMoveDispatchWorkItem = nil
+            }
+        }
+    }
     /// 自定义地图样式配置
     var customMapStyleData: [String: Any]?
     /// 是否启用国内外地图自动切换
@@ -59,6 +73,7 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate, UIGestureRecognizerDelegate
     // MARK: - 事件派发器
     
     let onMapPress = EventDispatcher()
+    let onPressPoi = EventDispatcher()
     let onMapLongPress = EventDispatcher()
     let onLoad = EventDispatcher()
     let onLocation = EventDispatcher()
@@ -92,14 +107,10 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate, UIGestureRecognizerDelegate
     
     // MARK: - 事件节流控制
     
-    /// 相机移动事件节流间隔(秒)
-    private let cameraMoveThrottleInterval: TimeInterval = 0.1
-    /// 上次触发相机移动事件的时间戳
-    private var lastCameraMoveTime: TimeInterval = 0
     /// 缓存的相机移动事件数据
     private var pendingCameraMoveData: [String: Any]?
-    /// 节流定时器
-    private var throttleTimer: Timer?
+    private var cameraMoveDispatchWorkItem: DispatchWorkItem?
+    private var lastCameraMoveDispatchTime: CFTimeInterval = 0
     
     /// 缩放手势识别器（用于模拟惯性）
     private var pinchGesture: UIPinchGestureRecognizer!
@@ -460,7 +471,7 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate, UIGestureRecognizerDelegate
             return
         }
 
-        uiManager.setMapType(0)
+        uiManager.setMapType(1)
         uiManager.setShowsScale(showsScale)
         uiManager.setShowsCompass(showsCompass)
         uiManager.setZoomEnabled(isZoomEnabled)
@@ -468,6 +479,8 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate, UIGestureRecognizerDelegate
         uiManager.setRotateEnabled(isRotateEnabled)
         uiManager.setTiltEnabled(isTiltEnabled)
         uiManager.setShowsUserLocation(showsUserLocation, followUser: followUserLocation)
+        mapView.distanceFilter = distanceFilter
+        mapView.headingFilter = headingFilter
     }
     
     /**
@@ -498,6 +511,8 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate, UIGestureRecognizerDelegate
         uiManager.setShowsTraffic(showsTraffic)
         uiManager.setShowsBuildings(showsBuildings)
         uiManager.setShowsIndoorMap(showsIndoorMap)
+        mapView.distanceFilter = distanceFilter
+        mapView.headingFilter = headingFilter
         if let customMapStyleData {
             uiManager.setCustomMapStyle(customMapStyleData)
         }
@@ -513,17 +528,20 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate, UIGestureRecognizerDelegate
      */
     private func updateAppleMapStyle() {
         switch mapType {
-        case 1: // 卫星
+        case 2: // 卫星
             appleMapView.mapType = .satellite
             appleMapView.overrideUserInterfaceStyle = .unspecified
-        case 2: // 夜间
+        case 3: // 夜间
             // 苹果地图没有专门的夜间模式枚举，通过强制 Dark Mode 实现
             appleMapView.mapType = .standard
             appleMapView.overrideUserInterfaceStyle = .dark
-        case 3: // 导航
+        case 4: // 导航
             appleMapView.mapType = .standard
             appleMapView.overrideUserInterfaceStyle = .unspecified
-        default: // 标准 (0)
+        case 5: // 公交
+            appleMapView.mapType = .standard
+            appleMapView.overrideUserInterfaceStyle = .unspecified
+        default: // 标准 (1，兼容旧值 0)
             appleMapView.mapType = .standard
             // 标准模式下跟随系统，如果系统是深色则显示深色，否则浅色
             appleMapView.overrideUserInterfaceStyle = .unspecified
@@ -895,10 +913,9 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate, UIGestureRecognizerDelegate
      * 当视图从层级中移除并释放时自动调用
      */
     deinit {
-        // 清理节流定时器
-        throttleTimer?.invalidate()
-        throttleTimer = nil
         pendingCameraMoveData = nil
+        cameraMoveDispatchWorkItem?.cancel()
+        cameraMoveDispatchWorkItem = nil
         if let privacyObserver {
             NotificationCenter.default.removeObserver(privacyObserver)
         }
@@ -948,6 +965,7 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate, UIGestureRecognizerDelegate
         resolvedMapView.frame = bounds
         resolvedMapView.delegate = self
         resolvedMapView.autoresizingMask = [.flexibleWidth, .flexibleHeight]
+        resolvedMapView.touchPOIEnabled = true
 
         mapView = resolvedMapView
         super.addSubview(resolvedMapView)
@@ -1021,59 +1039,39 @@ extension ExpoGaodeMapView {
      * 地图区域即将改变时触发 - 应用节流优化
      */
     public func mapView(_ mapView: MAMapView, regionWillChangeAnimated animated: Bool) {
-        // 相机开始移动 - 应用节流优化
-        let currentTime = Date().timeIntervalSince1970
-        let cameraPosition = cameraManager.getCameraPosition()
-        let visibleRegion = mapView.region
-        
-        let eventData: [String: Any] = [
-            "cameraPosition": cameraPosition,
-            "latLngBounds": [
-                "northeast": [
-                    "latitude": visibleRegion.center.latitude + visibleRegion.span.latitudeDelta / 2,
-                    "longitude": visibleRegion.center.longitude + visibleRegion.span.longitudeDelta / 2
-                ],
-                "southwest": [
-                    "latitude": visibleRegion.center.latitude - visibleRegion.span.latitudeDelta / 2,
-                    "longitude": visibleRegion.center.longitude - visibleRegion.span.longitudeDelta / 2
-                ]
-            ]
-        ]
-        
-        // 节流逻辑：0.1秒 内只触发一次
-        if currentTime - lastCameraMoveTime >= cameraMoveThrottleInterval {
-            // 超过节流时间，立即触发事件
-            lastCameraMoveTime = currentTime
-            onCameraMove(eventData)
-            // 清除待处理的事件和定时器
-            throttleTimer?.invalidate()
-            throttleTimer = nil
-            pendingCameraMoveData = nil
-        } else {
-            // 在节流时间内，缓存事件数据，使用定时器延迟触发
-            pendingCameraMoveData = eventData
-            throttleTimer?.invalidate()
-            
-            let delay = cameraMoveThrottleInterval - (currentTime - lastCameraMoveTime)
-            throttleTimer = Timer.scheduledTimer(withTimeInterval: delay, repeats: false) { [weak self] _ in
-                guard let self = self, let data = self.pendingCameraMoveData else { return }
-                self.lastCameraMoveTime = Date().timeIntervalSince1970
-                self.onCameraMove(data)
-                self.pendingCameraMoveData = nil
-                self.throttleTimer = nil
-            }
-        }
+        // 保留代理实现，但不在这里分发 onCameraMove。
+        // 持续移动过程应使用 mapViewRegionChanged。
+    }
+
+    public func mapViewRegionChanged(_ mapView: MAMapView) {
+        dispatchCameraMoveEvent(buildCameraEventData(for: mapView))
     }
     
     /**
      * 地图区域改变完成后触发
      */
     public func mapView(_ mapView: MAMapView, regionDidChangeAnimated animated: Bool) {
-        // 相机移动完成
-        let cameraPosition = cameraManager.getCameraPosition()
-        let visibleRegion = mapView.region
+        flushPendingCameraMoveEvent()
+        onCameraIdle(buildCameraEventData(for: mapView))
+
+        // 这里的 overlayViews 是 [UIView] 类型，可能包含 ClusterView
+        for view in overlayViews {
+            if let clusterView = view as? ClusterView {
+                // 只有当 clusterView 依然在视图树中时才通知
+                if clusterView.superview != nil && clusterView.window != nil {
+                    clusterView.mapRegionDidChange()
+                }
+            }
+        }
         
-        onCameraIdle([
+        handleMapviewRegionChange(mapView: mapView)
+    }
+
+    private func buildCameraEventData(for mapView: MAMapView) -> [String: Any] {
+        let cameraPosition = cameraManager?.getCameraPosition() ?? [String: Any]()
+        let visibleRegion = mapView.region
+
+        return [
             "cameraPosition": cameraPosition,
             "latLngBounds": [
                 "northeast": [
@@ -1085,25 +1083,60 @@ extension ExpoGaodeMapView {
                     "longitude": visibleRegion.center.longitude - visibleRegion.span.longitudeDelta / 2
                 ]
             ]
-        ])
+        ]
+    }
 
-        // 这里的 overlayViews 是 [UIView] 类型，可能包含 ClusterView
-        for view in overlayViews {
-            if let clusterView = view as? ClusterView {
-                // 只有当 clusterView 依然在视图树中时才通知
-                if clusterView.superview != nil && clusterView.window != nil {
-                    clusterView.mapRegionDidChange()
-                }
-            }
+    private func dispatchCameraMoveEvent(_ eventData: [String: Any]) {
+        let throttleMs = max(cameraEventThrottleMs, 0)
+        if throttleMs == 0 {
+            pendingCameraMoveData = nil
+            cameraMoveDispatchWorkItem?.cancel()
+            cameraMoveDispatchWorkItem = nil
+            lastCameraMoveDispatchTime = CACurrentMediaTime()
+            onCameraMove(eventData)
+            return
         }
-        
-        handleMapviewRegionChange(mapView: mapView)
+
+        pendingCameraMoveData = eventData
+
+        let now = CACurrentMediaTime()
+        let throttleSeconds = Double(throttleMs) / 1000
+        let elapsed = now - lastCameraMoveDispatchTime
+
+        if elapsed >= throttleSeconds {
+            cameraMoveDispatchWorkItem?.cancel()
+            cameraMoveDispatchWorkItem = nil
+            flushPendingCameraMoveEvent(at: now)
+            return
+        }
+
+        guard cameraMoveDispatchWorkItem == nil else {
+            return
+        }
+
+        let delay = max(0, throttleSeconds - elapsed)
+        let workItem = DispatchWorkItem { [weak self] in
+            self?.cameraMoveDispatchWorkItem = nil
+            self?.flushPendingCameraMoveEvent()
+        }
+        cameraMoveDispatchWorkItem = workItem
+        DispatchQueue.main.asyncAfter(deadline: .now() + delay, execute: workItem)
+    }
+
+    private func flushPendingCameraMoveEvent(at timestamp: CFTimeInterval = CACurrentMediaTime()) {
+        guard let eventData = pendingCameraMoveData else {
+            return
+        }
+
+        pendingCameraMoveData = nil
+        lastCameraMoveDispatchTime = timestamp
+        onCameraMove(eventData)
     }
     
     /**
      * 地图单击事件
      */
-    public func mapView(_ mapView: MAMapView, didSingleTappedAt coordinate: CLLocationCoordinate2D) {
+    private func handleGaodeMapTap(at coordinate: CLLocationCoordinate2D) {
         // 如果正在处理 annotation 选择，跳过地图点击事件
         if isHandlingAnnotationSelect {
             isHandlingAnnotationSelect = false
@@ -1117,6 +1150,15 @@ extension ExpoGaodeMapView {
         
         onMapPress(["latitude": coordinate.latitude, "longitude": coordinate.longitude])
     }
+
+    public func mapView(_ mapView: MAMapView, didSingleTappedAtCoordinate coordinate: CLLocationCoordinate2D) {
+        handleGaodeMapTap(at: coordinate)
+    }
+
+    // 兼容部分旧版 SDK/历史实现
+    public func mapView(_ mapView: MAMapView, didSingleTappedAt coordinate: CLLocationCoordinate2D) {
+        handleGaodeMapTap(at: coordinate)
+    }
     
     /**
      * 检查点击位置是否在圆形内
@@ -1282,9 +1324,37 @@ extension ExpoGaodeMapView {
     /**
      * 地图长按事件
      */
-    public func mapView(_ mapView: MAMapView, didLongPressedAt coordinate: CLLocationCoordinate2D) {
+    private func handleGaodeMapLongPress(at coordinate: CLLocationCoordinate2D) {
         onMapLongPress(["latitude": coordinate.latitude, "longitude": coordinate.longitude])
     }
+
+    public func mapView(_ mapView: MAMapView, didLongPressedAtCoordinate coordinate: CLLocationCoordinate2D) {
+        handleGaodeMapLongPress(at: coordinate)
+    }
+
+    // 兼容部分旧版 SDK/历史实现
+    public func mapView(_ mapView: MAMapView, didLongPressedAt coordinate: CLLocationCoordinate2D) {
+        handleGaodeMapLongPress(at: coordinate)
+    }
+
+    private func handleGaodePoiTouch(_ pois: [Any]?) {
+        guard let touchedPoi = pois?.first as? MATouchPoi else {
+            return
+        }
+
+        onPressPoi([
+            "id": touchedPoi.uid ?? "",
+            "name": touchedPoi.name ?? "",
+            "position": [
+                "latitude": touchedPoi.coordinate.latitude,
+                "longitude": touchedPoi.coordinate.longitude
+            ]
+        ])
+    }
+
+    public func mapView(_ mapView: MAMapView!, didTouchPois pois: [Any]!) {
+        handleGaodePoiTouch(pois)
+    }
     
     /**
      * 创建标注视图
@@ -1360,7 +1430,12 @@ extension ExpoGaodeMapView {
      * 标注点击事件
      */
     public func mapView(_ mapView: MAMapView, didSelect view: MAAnnotationView) {
-        guard let annotation = view.annotation, !annotation.isKind(of: MAUserLocation.self) else {
+        guard let annotation = view.annotation else {
+            return
+        }
+
+        if annotation.isKind(of: MAUserLocation.self) {
+            mapView.deselectAnnotation(annotation, animated: false)
             return
         }
         

package/ios/map/ExpoGaodeMapViewModule.swift

@@ -1,5 +1,6 @@
 import ExpoModulesCore
 import AMapNaviKit
+import CoreLocation
 
 /**
  * 高德地图视图 Module
@@ -9,7 +10,7 @@ public class ExpoGaodeMapViewModule: Module {
         Name("ExpoGaodeMapView")
         
         View(ExpoGaodeMapView.self) {
-            Events("onMapPress", "onMapLongPress", "onLoad", "onLocation", "onCameraMove", "onCameraIdle")
+            Events("onMapPress", "onPressPoi", "onMapLongPress", "onLoad", "onLocation", "onCameraMove", "onCameraIdle")
             
             Prop("mapType") { (view: ExpoGaodeMapView, type: Int) in
                 view.mapType = type
@@ -58,6 +59,14 @@ public class ExpoGaodeMapViewModule: Module {
             Prop("myLocationEnabled") { (view: ExpoGaodeMapView, show: Bool) in
                 view.setShowsUserLocation(show)
             }
+
+            Prop("distanceFilter") { (view: ExpoGaodeMapView, distance: Double?) in
+                view.distanceFilter = distance ?? kCLDistanceFilterNone
+            }
+
+            Prop("headingFilter") { (view: ExpoGaodeMapView, heading: Double?) in
+                view.headingFilter = heading ?? kCLHeadingFilterNone
+            }
             
             Prop("followUserLocation") { (view: ExpoGaodeMapView, follow: Bool) in
                 view.setFollowUserLocation(follow)
@@ -88,6 +97,10 @@ public class ExpoGaodeMapViewModule: Module {
             Prop("worldMapSwitchEnabled") { (view: ExpoGaodeMapView, enabled: Bool) in
                 view.enableWorldMapSwitch = enabled
             }
+
+            Prop("cameraEventThrottleMs") { (view: ExpoGaodeMapView, throttleMs: Int?) in
+                view.cameraEventThrottleMs = max(throttleMs ?? 32, 0)
+            }
             
             OnViewDidUpdateProps { (view: ExpoGaodeMapView) in
                 view.applyProps()

package/ios/map/managers/UIManager.swift

@@ -29,14 +29,15 @@ class UIManager: NSObject, MAMapViewDelegate {
     
     /**
      * 设置地图类型
-     * @param type 0:标准 1:卫星 2:夜间 3:导航
+     * @param type 1:标准 2:卫星 3:夜间 4:导航 5:公交
      */
     func setMapType(_ type: Int) {
         guard let mapView = mapView else { return }
         switch type {
-        case 1: mapView.mapType = .satellite
-        case 2: mapView.mapType = .standardNight
-        case 3: mapView.mapType = .navi
+        case 2: mapView.mapType = .satellite
+        case 3: mapView.mapType = .standardNight
+        case 4: mapView.mapType = .navi
+        case 5: mapView.mapType = .bus
         default: mapView.mapType = .standard
         }