expo-gaode-map 2.2.38 → 2.2.39

package/ios/ExpoGaodeMapView.swift

@@ -28,6 +28,12 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate, UIGestureRecognizerDelegate
     var showsScale: Bool = true
     /// 是否启用缩放手势
     var isZoomEnabled: Bool = true
+    /// 缩放手势锚点：gesture 跟随手势中心点；center 固定地图中心点
+    var zoomGestureAnchor: String = "gesture" {
+        didSet {
+            applyZoomGestureSettings()
+        }
+    }
     /// 是否启用滚动手势
     var isScrollEnabled: Bool = true
     /// 是否启用旋转手势
@@ -96,6 +102,8 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate, UIGestureRecognizerDelegate
     private var uiManager: UIManager!
     /// 地图是否已加载完成
     private var isMapLoaded = false
+    /// 定位 annotation 首次出现后是否已补应用定位样式
+    private var hasAppliedUserLocationStyleAfterLocationUpdate = false
     /// 初始相机是否已应用（仅应用一次，避免与运行时相机控制冲突）
     private var hasAppliedInitialCameraPosition = false
     /// 是否正在处理 annotation 选择事件
@@ -106,6 +114,8 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate, UIGestureRecognizerDelegate
     private var overlayContainer: UIView!
     /// 显式跟踪所有覆盖物视图（新架构下 subviews 可能不可靠）
     private var overlayViews: [UIView] = []
+    /// MarkerView 短暂 detach 时延迟注销，避免 annotation 暂时找不到自定义 view 而回退默认样式
+    private var pendingMarkerOverlayUnregisterTasks: [ObjectIdentifier: DispatchWorkItem] = [:]
     
     // MARK: - 事件节流控制
     
@@ -113,9 +123,15 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate, UIGestureRecognizerDelegate
     private var pendingCameraMoveData: [String: Any]?
     private var cameraMoveDispatchWorkItem: DispatchWorkItem?
     private var lastCameraMoveDispatchTime: CFTimeInterval = 0
+    /// iOS 缩放惯性/连续 setZoom 可能多次触发 regionDidChange，合并后再派发 idle。
+    private var pendingCameraIdleData: [String: Any]?
+    private var cameraIdleDispatchWorkItem: DispatchWorkItem?
+    private let cameraIdleDebounceMs = 160
     
     /// 缩放手势识别器（用于模拟惯性）
     private var pinchGesture: UIPinchGestureRecognizer!
+    private var centerAnchoredPinchStartZoom: CGFloat?
+    private var centerAnchoredZoomCoordinate: CLLocationCoordinate2D?
     
     // 惯性动画相关属性
     private var displayLink: CADisplayLink?
@@ -237,6 +253,8 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate, UIGestureRecognizerDelegate
     }
 
     private func registerOverlayView(_ view: UIView) {
+        cancelPendingMarkerOverlayUnregister(for: view)
+
         guard !overlayViews.contains(where: { $0 === view }) else {
             return
         }
@@ -244,9 +262,31 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate, UIGestureRecognizerDelegate
     }
 
     private func unregisterOverlayView(_ view: UIView) {
+        cancelPendingMarkerOverlayUnregister(for: view)
         overlayViews.removeAll { $0 === view }
     }
 
+    private func scheduleMarkerOverlayUnregister(_ markerView: MarkerView) {
+        cancelPendingMarkerOverlayUnregister(for: markerView)
+
+        let identifier = ObjectIdentifier(markerView)
+        let task = DispatchWorkItem { [weak self, weak markerView] in
+            guard let self = self, let markerView = markerView else { return }
+            self.pendingMarkerOverlayUnregisterTasks[identifier] = nil
+            guard markerView.superview == nil else { return }
+            self.unregisterOverlayView(markerView)
+        }
+
+        pendingMarkerOverlayUnregisterTasks[identifier] = task
+        DispatchQueue.main.asyncAfter(deadline: .now() + 0.35, execute: task)
+    }
+
+    private func cancelPendingMarkerOverlayUnregister(for view: UIView) {
+        let identifier = ObjectIdentifier(view)
+        pendingMarkerOverlayUnregisterTasks[identifier]?.cancel()
+        pendingMarkerOverlayUnregisterTasks[identifier] = nil
+    }
+
     private func prepareOverlayViewForHosting(_ view: UIView) {
         guard !(view is MarkerView) else {
             return
@@ -322,8 +362,8 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate, UIGestureRecognizerDelegate
         // 🔑 处理所有覆盖物 - 从跟踪数组中移除并确保 native 对象也从地图移除
         // 🔑 关键修复：先从数组移除，再调用 super，防止 super 触发的事件回调中引用已卸载的视图
         if let markerView = subview as? MarkerView {
-            unregisterOverlayView(markerView)
-            // MarkerView 内部的 willMove(toSuperview: nil) 会处理 annotation 的移除
+            scheduleMarkerOverlayUnregister(markerView)
+            // MarkerView 内部也会延迟确认 annotation 移除，避免 transient detach 闪烁。
         } else if let circleView = subview as? CircleView {
             unregisterOverlayView(circleView)
             if let mapView, let circle = circleView.circle {
@@ -361,12 +401,12 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate, UIGestureRecognizerDelegate
         uiManager.setMapType(1)
         uiManager.setShowsScale(showsScale)
         uiManager.setShowsCompass(showsCompass)
-        uiManager.setZoomEnabled(isZoomEnabled)
+        applyZoomGestureSettings()
         uiManager.setScrollEnabled(isScrollEnabled)
         uiManager.setRotateEnabled(isRotateEnabled)
         uiManager.setTiltEnabled(isTiltEnabled)
         uiManager.setShowsUserLocation(showsUserLocation, followUser: followUserLocation)
-        updatePinchGestureState()
+        applyUserLocationStyle()
     }
     
     /**
@@ -390,21 +430,21 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate, UIGestureRecognizerDelegate
         
         uiManager.setShowsScale(showsScale)
         uiManager.setShowsCompass(showsCompass)
-        uiManager.setZoomEnabled(isZoomEnabled)
+        applyZoomGestureSettings()
         uiManager.setScrollEnabled(isScrollEnabled)
         uiManager.setRotateEnabled(isRotateEnabled)
         uiManager.setTiltEnabled(isTiltEnabled)
         uiManager.setShowsUserLocation(showsUserLocation, followUser: followUserLocation)
+        applyUserLocationStyle()
         uiManager.setShowsTraffic(showsTraffic)
         uiManager.setShowsBuildings(showsBuildings)
         uiManager.setShowsIndoorMap(showsIndoorMap)
-        updatePinchGestureState()
         mapView.distanceFilter = distanceFilter
         mapView.headingFilter = headingFilter
         if let customMapStyleData {
             uiManager.setCustomMapStyle(customMapStyleData)
         }
-        
+
         // 更新苹果地图样式
         updateAppleMapStyle()
         
@@ -439,6 +479,13 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate, UIGestureRecognizerDelegate
     // MARK: - 手势处理
     
     @objc func handlePinch(_ gesture: UIPinchGestureRecognizer) {
+        guard isZoomEnabled else { return }
+
+        if zoomGestureAnchor == "center" {
+            handleCenterAnchoredPinch(gesture)
+            return
+        }
+
         if gesture.state == .began {
             // 手势开始，立即停止之前的惯性动画，避免冲突
             stopInertiaAnimation()
@@ -455,6 +502,44 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate, UIGestureRecognizerDelegate
             }
         }
     }
+
+    private func handleCenterAnchoredPinch(_ gesture: UIPinchGestureRecognizer) {
+        switch gesture.state {
+        case .began:
+            stopInertiaAnimation()
+            centerAnchoredPinchStartZoom = mapView.zoomLevel
+            centerAnchoredZoomCoordinate = mapView.centerCoordinate
+        case .changed:
+            let startZoom = centerAnchoredPinchStartZoom ?? mapView.zoomLevel
+            let center = centerAnchoredZoomCoordinate ?? mapView.centerCoordinate
+            let zoomDelta = log2(Double(max(gesture.scale, 0.0001)))
+            applyCenterAnchoredZoom(CGFloat(Double(startZoom) + zoomDelta), center: center)
+        case .ended, .cancelled, .failed:
+            centerAnchoredPinchStartZoom = nil
+            let velocity = gesture.velocity
+            if abs(velocity) > 0.1 {
+                zoomVelocity = Double(velocity) * 0.02
+                if centerAnchoredZoomCoordinate == nil {
+                    centerAnchoredZoomCoordinate = mapView.centerCoordinate
+                }
+                startInertiaAnimation()
+            } else {
+                centerAnchoredZoomCoordinate = nil
+            }
+        default:
+            break
+        }
+    }
+
+    private func applyCenterAnchoredZoom(_ zoom: CGFloat, center: CLLocationCoordinate2D) {
+        let validZoom = max(mapView.minZoomLevel, min(mapView.maxZoomLevel, zoom))
+        let status = MAMapStatus()
+        status.centerCoordinate = center
+        status.zoomLevel = validZoom
+        status.rotationDegree = mapView.rotationDegree
+        status.cameraDegree = mapView.cameraDegree
+        mapView.setMapStatus(status, animated: false, duration: 0)
+    }
     
     private func startInertiaAnimation() {
         stopInertiaAnimation()
@@ -476,12 +561,21 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate, UIGestureRecognizerDelegate
             // 碰到边界，停止动画
             newZoom = max(mapView.minZoomLevel, min(mapView.maxZoomLevel, newZoom))
             stopInertiaAnimation()
-            mapView.setZoomLevel(newZoom, animated: false)
+            if zoomGestureAnchor == "center" {
+                applyCenterAnchoredZoom(newZoom, center: centerAnchoredZoomCoordinate ?? mapView.centerCoordinate)
+                centerAnchoredZoomCoordinate = nil
+            } else {
+                mapView.setZoomLevel(newZoom, animated: false)
+            }
             return
         }
         
         // 更新地图缩放级别（animated: false 以保证逐帧控制的流畅性）
-        mapView.setZoomLevel(newZoom, animated: false)
+        if zoomGestureAnchor == "center" {
+            applyCenterAnchoredZoom(newZoom, center: centerAnchoredZoomCoordinate ?? mapView.centerCoordinate)
+        } else {
+            mapView.setZoomLevel(newZoom, animated: false)
+        }
         
         // 减速（应用摩擦力）
         zoomVelocity *= friction
@@ -489,6 +583,7 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate, UIGestureRecognizerDelegate
         // 停止条件
         if abs(zoomVelocity) < velocityThreshold {
             stopInertiaAnimation()
+            centerAnchoredZoomCoordinate = nil
         }
     }
     
@@ -568,6 +663,9 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate, UIGestureRecognizerDelegate
     func setFollowUserLocation(_ follow: Bool) {
         followUserLocation = follow
         uiManager?.setShowsUserLocation(showsUserLocation, followUser: follow)
+        if showsUserLocation {
+            applyUserLocationStyle()
+        }
     }
     
     func setShowsUserLocation(_ show: Bool) {
@@ -580,6 +678,7 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate, UIGestureRecognizerDelegate
     
     func setUserLocationRepresentation(_ config: [String: Any]) {
         userLocationRepresentation = config
+        hasAppliedUserLocationStyleAfterLocationUpdate = false
         if showsUserLocation {
             uiManager?.setUserLocationRepresentation(config)
         }
@@ -589,7 +688,7 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate, UIGestureRecognizerDelegate
      * 应用用户位置样式
      */
     private func applyUserLocationStyle() {
-        guard let config = userLocationRepresentation else { return }
+        guard showsUserLocation, let config = userLocationRepresentation else { return }
         uiManager?.setUserLocationRepresentation(config)
     }
     
@@ -806,6 +905,9 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate, UIGestureRecognizerDelegate
         pendingCameraMoveData = nil
         cameraMoveDispatchWorkItem?.cancel()
         cameraMoveDispatchWorkItem = nil
+        pendingCameraIdleData = nil
+        cameraIdleDispatchWorkItem?.cancel()
+        cameraIdleDispatchWorkItem = nil
         if let privacyObserver {
             NotificationCenter.default.removeObserver(privacyObserver)
         }
@@ -822,6 +924,8 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate, UIGestureRecognizerDelegate
         appleMapView?.removeOverlays(appleMapView?.overlays ?? [])
         
         // 清空覆盖物数组
+        pendingMarkerOverlayUnregisterTasks.values.forEach { $0.cancel() }
+        pendingMarkerOverlayUnregisterTasks.removeAll()
         overlayViews.removeAll()
         
         // 移除所有子视图
@@ -861,6 +965,7 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate, UIGestureRecognizerDelegate
         super.addSubview(resolvedMapView)
         isMapLoaded = false
         hasAppliedInitialCameraPosition = false
+        hasAppliedUserLocationStyleAfterLocationUpdate = false
 
         cameraManager = CameraManager(mapView: resolvedMapView)
         uiManager = UIManager(mapView: resolvedMapView)
@@ -879,13 +984,20 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate, UIGestureRecognizerDelegate
         pinchGesture.delegate = self
         resolvedMapView.addGestureRecognizer(pinchGesture)
         self.pinchGesture = pinchGesture
-        updatePinchGestureState()
+        applyZoomGestureSettings()
     }
 
-    private func updatePinchGestureState() {
+    private func applyZoomGestureSettings() {
+        uiManager?.setZoomEnabled(isZoomEnabled && zoomGestureAnchor != "center")
         pinchGesture?.isEnabled = isZoomEnabled
+        if zoomGestureAnchor != "center" {
+            centerAnchoredPinchStartZoom = nil
+            centerAnchoredZoomCoordinate = nil
+        }
         if !isZoomEnabled {
             stopInertiaAnimation()
+            centerAnchoredPinchStartZoom = nil
+            centerAnchoredZoomCoordinate = nil
         }
     }
 }
@@ -937,9 +1049,37 @@ extension ExpoGaodeMapView {
         if let styleData = customMapStyleData {
             uiManager?.setCustomMapStyle(styleData)
         }
+
+        applyUserLocationStyle()
         
         onLoad(["loaded": true])
     }
+
+    /**
+     * 定位更新回调
+     */
+    public func mapView(_ mapView: MAMapView, didUpdate userLocation: MAUserLocation, updatingLocation: Bool) {
+        guard updatingLocation, let location = userLocation.location else { return }
+
+        if !hasAppliedUserLocationStyleAfterLocationUpdate {
+            applyUserLocationStyle()
+            hasAppliedUserLocationStyleAfterLocationUpdate = true
+        }
+
+        let latitude = location.coordinate.latitude
+        let longitude = location.coordinate.longitude
+        guard latitude >= -90 && latitude <= 90,
+              longitude >= -180 && longitude <= 180 else {
+            return
+        }
+
+        onLocation([
+            "latitude": latitude,
+            "longitude": longitude,
+            "accuracy": location.horizontalAccuracy,
+            "timestamp": Date().timeIntervalSince1970 * 1000
+        ])
+    }
     
     /**
      * 地图区域即将改变时触发
@@ -958,7 +1098,7 @@ extension ExpoGaodeMapView {
      */
     public func mapView(_ mapView: MAMapView, regionDidChangeAnimated animated: Bool) {
         flushPendingCameraMoveEvent()
-        onCameraIdle(buildCameraEventData(for: mapView))
+        scheduleCameraIdleEvent(buildCameraEventData(for: mapView))
 
         // 这里的 overlayViews 是 [UIView] 类型，可能包含 ClusterView
         for view in overlayViews {
@@ -1038,6 +1178,27 @@ extension ExpoGaodeMapView {
         lastCameraMoveDispatchTime = timestamp
         onCameraMove(eventData)
     }
+
+    private func scheduleCameraIdleEvent(_ eventData: [String: Any]) {
+        pendingCameraIdleData = eventData
+        cameraIdleDispatchWorkItem?.cancel()
+
+        let workItem = DispatchWorkItem { [weak self] in
+            guard let self = self, let latestEventData = self.pendingCameraIdleData else {
+                return
+            }
+
+            self.pendingCameraIdleData = nil
+            self.cameraIdleDispatchWorkItem = nil
+            self.onCameraIdle(latestEventData)
+        }
+
+        cameraIdleDispatchWorkItem = workItem
+        DispatchQueue.main.asyncAfter(
+            deadline: .now() + Double(cameraIdleDebounceMs) / 1000.0,
+            execute: workItem
+        )
+    }
     
     /**
      * 地图单击事件
@@ -1262,13 +1423,118 @@ extension ExpoGaodeMapView {
         handleGaodePoiTouch(pois)
     }
     
+    private func getUserLocationAnnotationView(for mapView: MAMapView, annotation: MAAnnotation) -> MAAnnotationView? {
+        guard let config = userLocationRepresentation,
+              let imagePath = config["image"] as? String,
+              !imagePath.isEmpty else {
+            return nil
+        }
+
+        let reuseId = "ExpoGaodeMapUserLocationStyleReuseIdentifier"
+        let annotationView: MAAnnotationView
+        if let reusableView = mapView.dequeueReusableAnnotationView(withIdentifier: reuseId) {
+            annotationView = reusableView
+        } else {
+            annotationView = MAAnnotationView(annotation: annotation, reuseIdentifier: reuseId)
+        }
+        annotationView.annotation = annotation
+        annotationView.canShowCallout = false
+
+        let imageWidth = config["imageWidth"] as? Double
+        let imageHeight = config["imageHeight"] as? Double
+        let cacheKey = userLocationImageCacheKey(imagePath: imagePath, imageWidth: imageWidth, imageHeight: imageHeight)
+        annotationView.accessibilityIdentifier = cacheKey
+
+        if let cached = IconBitmapCache.shared.image(forKey: cacheKey) {
+            annotationView.image = cached
+            return annotationView
+        }
+
+        annotationView.image = nil
+        loadUserLocationImage(imagePath: imagePath, imageWidth: imageWidth, imageHeight: imageHeight, cacheKey: cacheKey) { [weak annotationView] image in
+            guard let annotationView = annotationView,
+                  annotationView.accessibilityIdentifier == cacheKey else {
+                return
+            }
+            annotationView.image = image
+        }
+
+        return annotationView
+    }
+
+    private func userLocationImageCacheKey(imagePath: String, imageWidth: Double?, imageHeight: Double?) -> String {
+        let widthPart = imageWidth.map { String(Int($0.rounded())) } ?? "auto"
+        let heightPart = imageHeight.map { String(Int($0.rounded())) } ?? "auto"
+        return "userLocation|\(imagePath)|\(widthPart)x\(heightPart)"
+    }
+
+    private func loadUserLocationImage(
+        imagePath: String,
+        imageWidth: Double?,
+        imageHeight: Double?,
+        cacheKey: String,
+        completion: @escaping (UIImage?) -> Void
+    ) {
+        let finish: (UIImage?) -> Void = { image in
+            if let image = image {
+                IconBitmapCache.shared.setImage(image, forKey: cacheKey)
+            }
+            DispatchQueue.main.async {
+                completion(image)
+            }
+        }
+
+        if imagePath.hasPrefix("http://") || imagePath.hasPrefix("https://") {
+            DispatchQueue.global(qos: .userInitiated).async { [weak self] in
+                guard let self = self,
+                      let url = URL(string: imagePath),
+                      let data = try? Data(contentsOf: url),
+                      let image = UIImage(data: data) else {
+                    finish(nil)
+                    return
+                }
+                finish(self.resizeUserLocationImage(image, imageWidth: imageWidth, imageHeight: imageHeight))
+            }
+            return
+        }
+
+        let image: UIImage?
+        if imagePath.hasPrefix("file://") {
+            let path = String(imagePath.dropFirst(7))
+            image = UIImage(contentsOfFile: path)
+        } else {
+            image = UIImage(named: imagePath)
+        }
+
+        guard let image = image else {
+            finish(nil)
+            return
+        }
+        finish(resizeUserLocationImage(image, imageWidth: imageWidth, imageHeight: imageHeight))
+    }
+
+    private func resizeUserLocationImage(_ image: UIImage, imageWidth: Double?, imageHeight: Double?) -> UIImage {
+        guard let imageWidth = imageWidth,
+              let imageHeight = imageHeight,
+              imageWidth > 0,
+              imageHeight > 0 else {
+            return image
+        }
+
+        let targetSize = CGSize(width: imageWidth, height: imageHeight)
+        let renderer = UIGraphicsImageRenderer(size: targetSize)
+        return renderer.image { _ in
+            image.draw(in: CGRect(origin: .zero, size: targetSize))
+        }
+    }
+
     /**
      * 创建标注视图
-     * 定位蓝点返回 nil 使用系统默认样式
+     * 定位蓝点默认返回 nil 使用系统样式；传入 image 时按官方建议自定义定位 annotationView。
      */
     public func mapView(_ mapView: MAMapView, viewFor annotation: MAAnnotation) -> MAAnnotationView? {
         if annotation.isKind(of: MAUserLocation.self) {
-            return nil
+            return getUserLocationAnnotationView(for: mapView, annotation: annotation)
         }
         
         // 🔑 支持 MAAnimatedAnnotation（平滑移动）

package/ios/ExpoGaodeMapViewModule.swift

@@ -43,6 +43,11 @@ public class ExpoGaodeMapViewModule: Module {
             Prop("zoomGesturesEnabled") { (view: ExpoGaodeMapView, enabled: Bool) in
                 view.isZoomEnabled = enabled
             }
+
+            // 缩放手势锚点：gesture 使用手势焦点，center 固定地图中心点
+            Prop("zoomGestureAnchor") { (view: ExpoGaodeMapView, anchor: String?) in
+                view.zoomGestureAnchor = anchor == "center" ? "center" : "gesture"
+            }
             
             Prop("scrollGesturesEnabled") { (view: ExpoGaodeMapView, enabled: Bool) in
                 view.isScrollEnabled = enabled

package/ios/managers/UIManager.swift

@@ -172,6 +172,9 @@ class UIManager: NSObject, MAMapViewDelegate {
         // 是否显示方向指示
         if let showsHeadingIndicator = config["showsHeadingIndicator"] as? Bool {
             representation.showsHeadingIndicator = showsHeadingIndicator
+            if showsHeadingIndicator {
+                mapView.userTrackingMode = .followWithHeading
+            }
         }
         
         // 精度圈填充颜色