expo-gaode-map 1.2.2 → 1.2.3

package/ios/ExpoGaodeMapView.swift

@@ -2,6 +2,7 @@ import ExpoModulesCore
 import MAMapKit
 import MapKit
 import CoreLocation
+import QuartzCore
 
 /**
  * 高德地图视图组件
@@ -15,8 +16,8 @@ import CoreLocation
 class ExpoGaodeMapView: ExpoView, MAMapViewDelegate, UIGestureRecognizerDelegate {
     // 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()
@@ -81,6 +96,8 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate, UIGestureRecognizerDelegate
     private var uiManager: UIManager!
     /// 地图是否已加载完成
     private var isMapLoaded = false
+    /// 初始相机是否已应用（仅应用一次，避免与运行时相机控制冲突）
+    private var hasAppliedInitialCameraPosition = false
     /// 是否正在处理 annotation 选择事件
     private var isHandlingAnnotationSelect = false
     /// MarkerView 的隐藏容器（用于渲染 children）
@@ -92,14 +109,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!
@@ -109,27 +122,14 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate, UIGestureRecognizerDelegate
     private var zoomVelocity: Double = 0
     private let friction: Double = 0.92 // 摩擦系数，越接近 1 滑得越远
     private let velocityThreshold: Double = 0.001 // 停止阈值
+    private var privacyObserver: NSObjectProtocol?
     
     // MARK: - 初始化
     
     required init(appContext: AppContext? = nil) {
         super.init(appContext: appContext)
         
-        // 确保隐私合规已设置
-        MAMapView.updatePrivacyAgree(.didAgree)
-        MAMapView.updatePrivacyShow(.didShow, privacyInfo: .didContain)
-        
-        // 创建 MAMapView
-        // 尝试从预加载池获取 MapView
-        if let preloaded = MapPreloadManager.shared.getPreloadedMapView() {
-            mapView = preloaded
-            mapView.frame = bounds
-        } else {
-            mapView = MAMapView(frame: bounds)
-        }
-        
-        mapView.delegate = self
-        mapView.autoresizingMask = [.flexibleWidth, .flexibleHeight]
+        GaodeMapPrivacyManager.applyPrivacyState()
 
         // 创建 MKMapView
         appleMapView = MKMapView(frame: bounds)
@@ -155,36 +155,25 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate, UIGestureRecognizerDelegate
         // 2.   - markerContainer (隐藏)
         // 3.   - overlayContainer (隐藏)
         // 4.   - appleMapView (隐藏)
-        // 5.   - mapView (可见，在最上层)
+        // 5.   - mapView (隐私合规完成后再创建，在最上层)
         addSubview(markerContainer)
         addSubview(overlayContainer)
         addSubview(appleMapView)
-        addSubview(mapView)
-        
-        cameraManager = CameraManager(mapView: mapView)
-        uiManager = UIManager(mapView: mapView)
-        
-        // 设置定位变化回调
-        uiManager.onLocationChanged = { [weak self] latitude, longitude, accuracy in
-            self?.onLocation([
-                "latitude": latitude,
-                "longitude": longitude,
-                "accuracy": accuracy,
-                "timestamp": Date().timeIntervalSince1970 * 1000
-            ])
+
+        privacyObserver = NotificationCenter.default.addObserver(
+            forName: .gaodeMapPrivacyStatusDidChange,
+            object: nil,
+            queue: .main
+        ) { [weak self] _ in
+            self?.handlePrivacyStatusChanged()
         }
-        
-        setupDefaultConfig()
-        
-        // 添加 Pinch 手势以支持惯性缩放
-        pinchGesture = UIPinchGestureRecognizer(target: self, action: #selector(handlePinch(_:)))
-        pinchGesture.delegate = self
-        mapView.addGestureRecognizer(pinchGesture)
+
+        ensureMapViewIfReady()
     }
     
     override func layoutSubviews() {
         super.layoutSubviews()
-        mapView.frame = bounds
+        mapView?.frame = bounds
         appleMapView.frame = bounds
         // 🔑 移除自动调用 setupAllOverlayViews()，避免频繁触发
         // layoutSubviews 会在任何视图变化时调用，导致不必要的批量刷新
@@ -197,6 +186,7 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate, UIGestureRecognizerDelegate
     override func didMoveToWindow() {
         super.didMoveToWindow()
         if window != nil {
+            ensureMapViewIfReady()
           
             // 🔑 只在首次添加到窗口时批量设置，后续添加通过 didAddSubview 单独处理
             setupAllOverlayViews()
@@ -208,90 +198,92 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate, UIGestureRecognizerDelegate
      * 这个函数是幂等的，重复调用是安全的
      */
     private func setupAllOverlayViews() {
+        guard let mapView else {
+            return
+        }
+
         // 统一从 overlayViews 数组设置所有覆盖物（包括 MarkerView）
         for view in overlayViews {
-            if let markerView = view as? MarkerView {
-                markerView.setMap(mapView)
-            } else if let circleView = view as? CircleView {
-                circleView.setMap(mapView)
-            } else if let polylineView = view as? PolylineView {
-                polylineView.setMap(mapView)
-            } else if let polygonView = view as? PolygonView {
-                polygonView.setMap(mapView)
-            } else if let heatMapView = view as? HeatMapView {
-                heatMapView.setMap(mapView)
-            } else if let multiPointView = view as? MultiPointView {
-                multiPointView.setMap(mapView)
-            } else if let clusterView = view as? ClusterView {
-                clusterView.setMap(mapView)
-            }
+            connectOverlayViewToMap(view, mapView: mapView)
         }
     }
-    
-    /**
-     * 重写 addSubview
-     * 根据视图类型，将其分配到正确的隐藏容器中
-     */
-    override func addSubview(_ view: UIView) {
-        // 🔑 关键修复：旧架构下统一不移动任何覆盖物视图，避免破坏 React Native 布局
-        // 所有覆盖物都隐藏并添加到 overlayViews 数组追踪
+
+    private func connectOverlayViewToMap(_ view: UIView, mapView: MAMapView) {
         if let markerView = view as? MarkerView {
-            overlayContainer.addSubview(markerView)
-            // 🔑 关键：MarkerView 不能隐藏，否则 children 无法渲染成图片
-            // 通过 hitTest 返回 nil 已经确保不阻挡地图交互
-            overlayViews.append(markerView)
             markerView.setMap(mapView)
-          
-            return
-        }
-        
-        if let circleView = view as? CircleView {
-            overlayContainer.addSubview(circleView)
-            circleView.alpha = 0
-            circleView.isHidden = true
-            overlayViews.append(circleView)
+        } else if let circleView = view as? CircleView {
             circleView.setMap(mapView)
-         
-            return
         } else if let polylineView = view as? PolylineView {
-            overlayContainer.addSubview(polylineView)
-            polylineView.alpha = 0
-            polylineView.isHidden = true
-            overlayViews.append(polylineView)
             polylineView.setMap(mapView)
-           
-            return
         } else if let polygonView = view as? PolygonView {
-            overlayContainer.addSubview(polygonView)
-            polygonView.alpha = 0
-            polygonView.isHidden = true
-            overlayViews.append(polygonView)
             polygonView.setMap(mapView)
-          
-            return
         } else if let heatMapView = view as? HeatMapView {
-            overlayContainer.addSubview(heatMapView)
-            heatMapView.alpha = 0
-            heatMapView.isHidden = true
-            overlayViews.append(heatMapView)
             heatMapView.setMap(mapView)
-           
-            return
         } else if let multiPointView = view as? MultiPointView {
-            overlayContainer.addSubview(multiPointView)
-            multiPointView.alpha = 0
-            multiPointView.isHidden = true
-            overlayViews.append(multiPointView)
             multiPointView.setMap(mapView)
-           
-            return
         } else if let clusterView = view as? ClusterView {
-            overlayContainer.addSubview(clusterView)
-            clusterView.alpha = 0
-            clusterView.isHidden = true
-            overlayViews.append(clusterView)
             clusterView.setMap(mapView)
-            
+        }
+    }
+
+    private func isOverlayView(_ view: UIView) -> Bool {
+        view is MarkerView ||
+        view is CircleView ||
+        view is PolylineView ||
+        view is PolygonView ||
+        view is HeatMapView ||
+        view is MultiPointView ||
+        view is ClusterView
+    }
+
+    private func registerOverlayView(_ view: UIView) {
+        guard !overlayViews.contains(where: { $0 === view }) else {
+            return
+        }
+        overlayViews.append(view)
+    }
+
+    private func unregisterOverlayView(_ view: UIView) {
+        overlayViews.removeAll { $0 === view }
+    }
+
+    private func prepareOverlayViewForHosting(_ view: UIView) {
+        guard !(view is MarkerView) else {
+            return
+        }
+
+        view.alpha = 0
+        view.isHidden = true
+    }
+
+    @discardableResult
+    private func hostOverlayView(_ view: UIView, moveToOverlayContainer: Bool) -> Bool {
+        guard isOverlayView(view) else {
+            return false
+        }
+
+        if moveToOverlayContainer {
+            overlayContainer.addSubview(view)
+        }
+
+        prepareOverlayViewForHosting(view)
+        registerOverlayView(view)
+
+        if let mapView {
+            connectOverlayViewToMap(view, mapView: mapView)
+        }
+
+        return true
+    }
+    
+    /**
+     * 重写 addSubview
+     * 根据视图类型，将其分配到正确的隐藏容器中
+     */
+    override func addSubview(_ view: UIView) {
+        // 🔑 关键修复：旧架构下统一不移动任何覆盖物视图，避免破坏 React Native 布局
+        // 所有覆盖物都隐藏并添加到 overlayViews 数组追踪
+        if hostOverlayView(view, moveToOverlayContainer: true) {
             return
         }
         
@@ -315,92 +307,7 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate, UIGestureRecognizerDelegate
         }
         
         // 🔑 处理 MarkerView - 新架构下直接连接，旧架构下已在 addSubview 处理
-        if let markerView = subview as? MarkerView {
-            // 检查是否已经在容器中（旧架构下 addSubview 已经处理过）
-            if markerView.superview === overlayContainer {
-             
-                return
-            }
-          
-            // 🔑 新架构下也不能隐藏 MarkerView，否则 children 无法渲染
-            overlayViews.append(markerView)
-            markerView.setMap(mapView)
-            // 🔑 关键修复：不再调用 setupAllOverlayViews()，避免所有覆盖物重新设置
-            return
-        }
-        
-        // 🔑 其他覆盖物不移动视图，只设置连接和隐藏
-        if let circleView = subview as? CircleView {
-            if circleView.superview === overlayContainer {
-               
-                return
-            }
-           
-            circleView.alpha = 0
-            circleView.isHidden = true
-            overlayViews.append(circleView)
-            circleView.setMap(mapView)
-            // 🔑 关键修复：不再调用 setupAllOverlayViews()
-            return
-        } else if let polylineView = subview as? PolylineView {
-            if polylineView.superview === overlayContainer {
-               
-                return
-            }
-            
-            polylineView.alpha = 0
-            polylineView.isHidden = true
-            overlayViews.append(polylineView)
-            polylineView.setMap(mapView)
-            // 🔑 关键修复：不再调用 setupAllOverlayViews()
-            return
-        } else if let polygonView = subview as? PolygonView {
-            if polygonView.superview === overlayContainer {
-               
-                return
-            }
-          
-            polygonView.alpha = 0
-            polygonView.isHidden = true
-            overlayViews.append(polygonView)
-            polygonView.setMap(mapView)
-            // 🔑 关键修复：不再调用 setupAllOverlayViews()
-            return
-        } else if let heatMapView = subview as? HeatMapView {
-            if heatMapView.superview === overlayContainer {
-               
-                return
-            }
-          
-            heatMapView.alpha = 0
-            heatMapView.isHidden = true
-            overlayViews.append(heatMapView)
-            heatMapView.setMap(mapView)
-            // 🔑 关键修复：不再调用 setupAllOverlayViews()
-            return
-        } else if let multiPointView = subview as? MultiPointView {
-            if multiPointView.superview === overlayContainer {
-               
-                return
-            }
-          
-            multiPointView.alpha = 0
-            multiPointView.isHidden = true
-            overlayViews.append(multiPointView)
-            multiPointView.setMap(mapView)
-            // 🔑 关键修复：不再调用 setupAllOverlayViews()
-            return
-        } else if let clusterView = subview as? ClusterView {
-            if clusterView.superview === overlayContainer {
-               
-                return
-            }
-          
-            clusterView.alpha = 0
-            clusterView.isHidden = true
-            overlayViews.append(clusterView)
-            clusterView.setMap(mapView)
-            // 🔑 关键修复：不再调用 setupAllOverlayViews()
+        if subview.superview !== overlayContainer && hostOverlayView(subview, moveToOverlayContainer: false) {
             return
         }
         
@@ -415,29 +322,29 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate, UIGestureRecognizerDelegate
         // 🔑 处理所有覆盖物 - 从跟踪数组中移除并确保 native 对象也从地图移除
         // 🔑 关键修复：先从数组移除，再调用 super，防止 super 触发的事件回调中引用已卸载的视图
         if let markerView = subview as? MarkerView {
-            overlayViews.removeAll { $0 === markerView }
+            unregisterOverlayView(markerView)
             // MarkerView 内部的 willMove(toSuperview: nil) 会处理 annotation 的移除
         } else if let circleView = subview as? CircleView {
-            overlayViews.removeAll { $0 === circleView }
-            if let circle = circleView.circle {
+            unregisterOverlayView(circleView)
+            if let mapView, let circle = circleView.circle {
                 mapView.remove(circle)
             }
         } else if let polylineView = subview as? PolylineView {
-            overlayViews.removeAll { $0 === polylineView }
-            if let polyline = polylineView.polyline {
+            unregisterOverlayView(polylineView)
+            if let mapView, let polyline = polylineView.polyline {
                 mapView.remove(polyline)
             }
         } else if let polygonView = subview as? PolygonView {
-            overlayViews.removeAll { $0 === polygonView }
-            if let polygon = polygonView.polygon {
+            unregisterOverlayView(polygonView)
+            if let mapView, let polygon = polygonView.polygon {
                 mapView.remove(polygon)
             }
         } else if let heatMapView = subview as? HeatMapView {
-            overlayViews.removeAll { $0 === heatMapView }
+            unregisterOverlayView(heatMapView)
         } else if let multiPointView = subview as? MultiPointView {
-            overlayViews.removeAll { $0 === multiPointView }
+            unregisterOverlayView(multiPointView)
         } else if let clusterView = subview as? ClusterView {
-            overlayViews.removeAll { $0 === clusterView }
+            unregisterOverlayView(clusterView)
         }
 
         super.willRemoveSubview(subview)
@@ -447,7 +354,11 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate, UIGestureRecognizerDelegate
      * 设置默认配置
      */
     private func setupDefaultConfig() {
-        uiManager.setMapType(0)
+        guard let uiManager else {
+            return
+        }
+
+        uiManager.setMapType(1)
         uiManager.setShowsScale(showsScale)
         uiManager.setShowsCompass(showsCompass)
         uiManager.setZoomEnabled(isZoomEnabled)
@@ -455,6 +366,7 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate, UIGestureRecognizerDelegate
         uiManager.setRotateEnabled(isRotateEnabled)
         uiManager.setTiltEnabled(isTiltEnabled)
         uiManager.setShowsUserLocation(showsUserLocation, followUser: followUserLocation)
+        updatePinchGestureState()
     }
     
     /**
@@ -462,11 +374,18 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate, UIGestureRecognizerDelegate
      * 在 Props 更新时调用
      */
     func applyProps() {
+        ensureMapViewIfReady()
+        guard let uiManager else {
+            updateAppleMapStyle()
+            return
+        }
+
         uiManager.setMapType(mapType)
         
-        // 如果有初始位置，设置相机位置
-        if let position = initialCameraPosition {
+        // initialCameraPosition 只应用一次，避免每次 props 更新重置相机导致操作延迟感
+        if !hasAppliedInitialCameraPosition, let position = initialCameraPosition {
             cameraManager.setInitialCameraPosition(position)
+            hasAppliedInitialCameraPosition = true
         }
         
         uiManager.setShowsScale(showsScale)
@@ -479,6 +398,12 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate, UIGestureRecognizerDelegate
         uiManager.setShowsTraffic(showsTraffic)
         uiManager.setShowsBuildings(showsBuildings)
         uiManager.setShowsIndoorMap(showsIndoorMap)
+        updatePinchGestureState()
+        mapView.distanceFilter = distanceFilter
+        mapView.headingFilter = headingFilter
+        if let customMapStyleData {
+            uiManager.setCustomMapStyle(customMapStyleData)
+        }
         
         // 更新苹果地图样式
         updateAppleMapStyle()
@@ -491,17 +416,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
@@ -573,33 +501,38 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate, UIGestureRecognizerDelegate
     // MARK: - 缩放控制
     
     func setMaxZoom(_ maxZoom: Double) {
-        cameraManager.setMaxZoomLevel(CGFloat(maxZoom))
+        cameraManager?.setMaxZoomLevel(CGFloat(maxZoom))
     }
     
     func setMinZoom(_ minZoom: Double) {
-        cameraManager.setMinZoomLevel(CGFloat(minZoom))
+        cameraManager?.setMinZoomLevel(CGFloat(minZoom))
     }
     
     // MARK: - 相机控制
     
     func moveCamera(position: [String: Any], duration: Int) {
-        cameraManager.moveCamera(position: position, duration: duration)
+        ensureMapViewIfReady()
+        cameraManager?.moveCamera(position: position, duration: duration)
     }
     
     func getLatLng(point: [String: Double]) -> [String: Double] {
-        return cameraManager.getLatLng(point: point)
+        ensureMapViewIfReady()
+        return cameraManager?.getLatLng(point: point) ?? [:]
     }
     
     func setCenter(center: [String: Double], animated: Bool) {
-        cameraManager.setCenter(center: center, animated: animated)
+        ensureMapViewIfReady()
+        cameraManager?.setCenter(center: center, animated: animated)
     }
     
     func setZoom(zoom: Double, animated: Bool) {
-        cameraManager.setZoomLevel(zoom: CGFloat(zoom), animated: animated)
+        ensureMapViewIfReady()
+        cameraManager?.setZoomLevel(zoom: CGFloat(zoom), animated: animated)
     }
     
     func getCameraPosition() -> [String: Any] {
-        return cameraManager.getCameraPosition()
+        ensureMapViewIfReady()
+        return cameraManager?.getCameraPosition() ?? [:]
     }
     
     
@@ -607,17 +540,17 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate, UIGestureRecognizerDelegate
     
     func setShowsTraffic(_ show: Bool) {
         showsTraffic = show
-        uiManager.setShowsTraffic(show)
+        uiManager?.setShowsTraffic(show)
     }
     
     func setShowsBuildings(_ show: Bool) {
         showsBuildings = show
-        uiManager.setShowsBuildings(show)
+        uiManager?.setShowsBuildings(show)
     }
     
     func setShowsIndoorMap(_ show: Bool) {
         showsIndoorMap = show
-        uiManager.setShowsIndoorMap(show)
+        uiManager?.setShowsIndoorMap(show)
     }
     
     /**
@@ -628,18 +561,18 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate, UIGestureRecognizerDelegate
         customMapStyleData = styleData
         // 如果地图已加载，立即应用样式
         if isMapLoaded {
-            uiManager.setCustomMapStyle(styleData)
+            uiManager?.setCustomMapStyle(styleData)
         }
     }
     
     func setFollowUserLocation(_ follow: Bool) {
         followUserLocation = follow
-        uiManager.setShowsUserLocation(showsUserLocation, followUser: follow)
+        uiManager?.setShowsUserLocation(showsUserLocation, followUser: follow)
     }
     
     func setShowsUserLocation(_ show: Bool) {
         showsUserLocation = show
-        uiManager.setShowsUserLocation(show, followUser: followUserLocation)
+        uiManager?.setShowsUserLocation(show, followUser: followUserLocation)
         if show {
             applyUserLocationStyle()
         }
@@ -648,7 +581,7 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate, UIGestureRecognizerDelegate
     func setUserLocationRepresentation(_ config: [String: Any]) {
         userLocationRepresentation = config
         if showsUserLocation {
-            uiManager.setUserLocationRepresentation(config)
+            uiManager?.setUserLocationRepresentation(config)
         }
     }
     
@@ -657,7 +590,7 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate, UIGestureRecognizerDelegate
      */
     private func applyUserLocationStyle() {
         guard let config = userLocationRepresentation else { return }
-        uiManager.setUserLocationRepresentation(config)
+        uiManager?.setUserLocationRepresentation(config)
     }
     
 
@@ -665,6 +598,10 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate, UIGestureRecognizerDelegate
     // MARK: - 地图切换逻辑
 
     func handleMapviewRegionChange(mapView: UIView) {
+        guard self.mapView != nil else {
+            return
+        }
+
         if !enableWorldMapSwitch {
             return
         }
@@ -707,12 +644,15 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate, UIGestureRecognizerDelegate
     }
 
     func performSwitching() {
+        guard let mapView else {
+            return
+        }
         
         self.isSwitching = true
 
-        let isGaodeCurrentlyVisible = !self.mapView.isHidden
+        let isGaodeCurrentlyVisible = !mapView.isHidden
         
-        self.mapView.isHidden = isGaodeCurrentlyVisible
+        mapView.isHidden = isGaodeCurrentlyVisible
         self.appleMapView.isHidden = !isGaodeCurrentlyVisible
 
         if !isGaodeCurrentlyVisible {
@@ -720,15 +660,15 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate, UIGestureRecognizerDelegate
             let region = self.MARegionForMKRegion(mkRegion: self.appleMapView.region)
             // 简单的合法性检查
             if region.span.latitudeDelta > 0 && region.span.longitudeDelta > 0 {
-                self.mapView.region = region
+                mapView.region = region
             }
-            self.mapView.centerCoordinate = self.appleMapView.centerCoordinate
-            self.mapView.rotationDegree = CGFloat(self.appleMapView.camera.heading)
+            mapView.centerCoordinate = self.appleMapView.centerCoordinate
+            mapView.rotationDegree = CGFloat(self.appleMapView.camera.heading)
         } else {
             // 切换到苹果 (Gaode -> Apple)
-            let gaodeRegion = self.mapView.region
-            let gaodeCenter = self.mapView.centerCoordinate
-            let gaodeHeading = self.mapView.rotationDegree
+            let gaodeRegion = mapView.region
+            let gaodeCenter = mapView.centerCoordinate
+            let gaodeHeading = mapView.rotationDegree
             
 
             // 1. 设置 Region
@@ -789,6 +729,11 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate, UIGestureRecognizerDelegate
             saveSnapshot(image: image, completion: completion)
             return
         }
+
+        guard let mapView else {
+            completion(nil, NSError(domain: "ExpoGaodeMap", code: -2, userInfo: [NSLocalizedDescriptionKey: "Map view is not initialized yet"]))
+            return
+        }
         
         // 高德地图：使用新的异步 API (takeSnapshotInRect:withCompletionBlock:)
         mapView.takeSnapshot(in: bounds) { [weak self] (image, state) in
@@ -856,10 +801,14 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate, UIGestureRecognizerDelegate
      * 当视图从层级中移除并释放时自动调用
      */
     deinit {
-        // 清理节流定时器
-        throttleTimer?.invalidate()
-        throttleTimer = nil
+        // 清理资源
+        stopInertiaAnimation()
         pendingCameraMoveData = nil
+        cameraMoveDispatchWorkItem?.cancel()
+        cameraMoveDispatchWorkItem = nil
+        if let privacyObserver {
+            NotificationCenter.default.removeObserver(privacyObserver)
+        }
         
         // 清理代理,停止接收回调
         mapView?.delegate = nil
@@ -887,6 +836,58 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate, UIGestureRecognizerDelegate
         cameraManager = nil
         uiManager = nil
     }
+
+    @objc
+    private func handlePrivacyStatusChanged() {
+        ensureMapViewIfReady()
+        applyProps()
+        setupAllOverlayViews()
+    }
+
+    private func ensureMapViewIfReady() {
+        guard mapView == nil, GaodeMapPrivacyManager.isReady else {
+            return
+        }
+
+        GaodeMapPrivacyManager.applyPrivacyState()
+
+        let resolvedMapView = MAMapView(frame: bounds)
+        resolvedMapView.frame = bounds
+        resolvedMapView.delegate = self
+        resolvedMapView.autoresizingMask = [.flexibleWidth, .flexibleHeight]
+        resolvedMapView.touchPOIEnabled = true
+
+        mapView = resolvedMapView
+        super.addSubview(resolvedMapView)
+        isMapLoaded = false
+        hasAppliedInitialCameraPosition = false
+
+        cameraManager = CameraManager(mapView: resolvedMapView)
+        uiManager = UIManager(mapView: resolvedMapView)
+        uiManager.onLocationChanged = { [weak self] latitude, longitude, accuracy in
+            self?.onLocation([
+                "latitude": latitude,
+                "longitude": longitude,
+                "accuracy": accuracy,
+                "timestamp": Date().timeIntervalSince1970 * 1000
+            ])
+        }
+
+        setupDefaultConfig()
+
+        let pinchGesture = UIPinchGestureRecognizer(target: self, action: #selector(handlePinch(_:)))
+        pinchGesture.delegate = self
+        resolvedMapView.addGestureRecognizer(pinchGesture)
+        self.pinchGesture = pinchGesture
+        updatePinchGestureState()
+    }
+
+    private func updatePinchGestureState() {
+        pinchGesture?.isEnabled = isZoomEnabled
+        if !isZoomEnabled {
+            stopInertiaAnimation()
+        }
+    }
 }
 
 // MARK: - AppleMapDelegate
@@ -925,72 +926,58 @@ extension ExpoGaodeMapView {
     public func mapViewDidFinishLoadingMap(_ mapView: MAMapView) {
         guard !isMapLoaded else { return }
         isMapLoaded = true
+
+        // 兜底：若初始化阶段尚未生效，在加载完成后应用一次初始相机
+        if !hasAppliedInitialCameraPosition, let position = initialCameraPosition {
+            cameraManager?.setInitialCameraPosition(position)
+            hasAppliedInitialCameraPosition = true
+        }
         
         // 地图加载完成后，应用自定义样式
         if let styleData = customMapStyleData {
-            uiManager.setCustomMapStyle(styleData)
+            uiManager?.setCustomMapStyle(styleData)
         }
         
         onLoad(["loaded": true])
     }
     
     /**
-     * 地图区域即将改变时触发 - 应用节流优化
+     * 地图区域即将改变时触发
      */
     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": [
@@ -1002,25 +989,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
@@ -1034,6 +1056,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)
+    }
     
     /**
      * 检查点击位置是否在圆形内
@@ -1199,9 +1230,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)
+    }
     
     /**
      * 创建标注视图
@@ -1277,7 +1336,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
         }