expo-gaode-map 1.1.8 → 2.0.0-alpha.1

package/ios/overlays/PolygonView.swift

@@ -10,7 +10,7 @@ import MAMapKit
  * - 响应属性变化并更新渲染
  */
 class PolygonView: ExpoView {
-    let onPress = EventDispatcher()
+    let onPolygonPress = EventDispatcher()
     
     /// 多边形点数组
     var points: [[String: Double]] = []
@@ -21,15 +21,41 @@ class PolygonView: ExpoView {
     /// 边框宽度
     var strokeWidth: Float = 0
     
-    /// 地图视图弱引用
+    /// 地图视图引用
     private var mapView: MAMapView?
     /// 多边形覆盖物对象
     var polygon: MAPolygon?
     /// 多边形渲染器
     private var renderer: MAPolygonRenderer?
+    /// 上次设置的地图引用（防止重复调用）
+    private weak var lastSetMapView: MAMapView?
     
     required init(appContext: AppContext? = nil) {
         super.init(appContext: appContext)
+        
+        // 🔑 关键修复：PolygonView 不应该拦截触摸事件
+        self.isUserInteractionEnabled = false
+    }
+    
+    /**
+     * 重写 hitTest，让触摸事件完全穿透此视图
+     */
+    override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? {
+        return nil
+    }
+    
+    /**
+     * 重写 point(inside:with:)，确保此视图不响应任何触摸
+     */
+    override func point(inside point: CGPoint, with event: UIEvent?) -> Bool {
+        return false
+    }
+    
+    /**
+     * 检查地图是否已连接
+     */
+    func isMapConnected() -> Bool {
+        return mapView != nil
     }
     
     /**
@@ -37,7 +63,11 @@ class PolygonView: ExpoView {
      * @param map 地图视图
      */
     func setMap(_ map: MAMapView) {
+        let isNewMap = self.mapView == nil
         self.mapView = map
+        
+        // 无论是否是新地图，都调用 updatePolygon
+        // 这确保了即使在 setMap 之前设置了 props，覆盖物也能被正确创建
         updatePolygon()
     }
     
@@ -48,11 +78,19 @@ class PolygonView: ExpoView {
         guard let mapView = mapView else { return }
         if let old = polygon { mapView.remove(old) }
         
+        // 🔑 坐标验证和过滤
         var coords = points.compactMap { point -> CLLocationCoordinate2D? in
-            guard let lat = point["latitude"], let lng = point["longitude"] else { return nil }
+            guard let lat = point["latitude"],
+                  let lng = point["longitude"],
+                  lat >= -90 && lat <= 90,
+                  lng >= -180 && lng <= 180 else {
+                return nil
+            }
             return CLLocationCoordinate2D(latitude: lat, longitude: lng)
         }
-        guard !coords.isEmpty else { return }
+        
+        // 🔑 至少需要3个点才能绘制多边形
+        guard coords.count >= 3 else { return }
         
         polygon = MAPolygon(coordinates: &coords, count: UInt(coords.count))
         mapView.add(polygon!)
@@ -72,10 +110,6 @@ class PolygonView: ExpoView {
             renderer?.fillColor = parsedFillColor ?? UIColor.clear
             renderer?.strokeColor = parsedStrokeColor ?? UIColor.clear
             renderer?.lineWidth = CGFloat(strokeWidth)
-            print("🔶 PolygonView.getRenderer: 创建新 renderer")
-            print("🔶 PolygonView.getRenderer: fillColor=\(String(describing: parsedFillColor)), strokeColor=\(String(describing: parsedStrokeColor)), lineWidth=\(strokeWidth)")
-        } else {
-            print("🔶 PolygonView.getRenderer: 使用缓存的 renderer")
         }
         return renderer!
     }
@@ -94,7 +128,6 @@ class PolygonView: ExpoView {
      * @param color 颜色值
      */
     func setFillColor(_ color: Any?) {
-        print("🔶 PolygonView.setFillColor: \(String(describing: color))")
         fillColor = color
         renderer = nil
         updatePolygon()
@@ -105,7 +138,6 @@ class PolygonView: ExpoView {
      * @param color 颜色值
      */
     func setStrokeColor(_ color: Any?) {
-        print("🔶 PolygonView.setStrokeColor: \(String(describing: color))")
         strokeColor = color
         renderer = nil
         updatePolygon()
@@ -116,18 +148,37 @@ class PolygonView: ExpoView {
      * @param width 宽度值
      */
     func setStrokeWidth(_ width: Float) {
-        print("🔶 PolygonView.setStrokeWidth: \(width)")
         strokeWidth = width
         renderer = nil
         updatePolygon()
     }
     
     /**
-     * 析构时移除多边形
+     * 视图即将从父视图移除时调用
+     * 🔑 关键修复：旧架构下，React Native 移除视图时不一定立即调用 deinit
+     * 需要在 willMove(toSuperview:) 中立即清理地图覆盖物
+     */
+    override func willMove(toSuperview newSuperview: UIView?) {
+        super.willMove(toSuperview: newSuperview)
+        
+        // 当 newSuperview 为 nil 时，表示视图正在从父视图移除
+        if newSuperview == nil {
+            if let mapView = mapView, let polygon = polygon {
+                mapView.remove(polygon)
+                self.polygon = nil
+            }
+        }
+    }
+    
+    /**
+     * 析构时移除多边形（双重保险）
      */
     deinit {
         if let mapView = mapView, let polygon = polygon {
             mapView.remove(polygon)
         }
+        mapView = nil
+        polygon = nil
+        renderer = nil
     }
 }

package/ios/overlays/PolygonViewModule.swift

@@ -5,6 +5,8 @@ public class PolygonViewModule: Module {
         Name("PolygonView")
         
         View(PolygonView.self) {
+            Events("onPolygonPress")
+            
             Prop("points") { (view: PolygonView, points: [[String: Double]]) in
                 view.setPoints(points)
             }
@@ -20,6 +22,21 @@ public class PolygonViewModule: Module {
             Prop("strokeWidth") { (view: PolygonView, width: Double) in
                 view.setStrokeWidth(Float(width))
             }
+            
+            OnViewDidUpdateProps { (view: PolygonView) in
+                // 属性更新完成后，如果还没连接地图，尝试连接
+                if !view.isMapConnected() {
+                    // 查找父视图 ExpoGaodeMapView
+                    var parent = view.superview
+                    while parent != nil {
+                        if let mapView = parent as? ExpoGaodeMapView {
+                            view.setMap(mapView.mapView)
+                            return
+                        }
+                        parent = parent?.superview
+                    }
+                }
+            }
         }
     }
 }

package/ios/overlays/PolylineView.swift

@@ -6,7 +6,7 @@ import MAMapKit
  * 
  * 负责:
  * - 在地图上绘制折线
- * - 支持纹理贴图
+ * - 支持纹理贴图（仅 3D 地图支持）
  * - 管理折线样式(线宽、颜色)
  */
 class PolylineView: ExpoView {
@@ -22,17 +22,43 @@ class PolylineView: ExpoView {
     var textureUrl: String?
     
     /// 点击事件派发器
-    let onPress = EventDispatcher()
+    let onPolylinePress = EventDispatcher()
     
-    /// 地图视图弱引用
+    /// 地图视图引用
     private var mapView: MAMapView?
     /// 折线覆盖物对象
     var polyline: MAPolyline?
     /// 折线渲染器
     private var renderer: MAPolylineRenderer?
+    /// 上次设置的地图引用（防止重复调用）
+    private weak var lastSetMapView: MAMapView?
     
     required init(appContext: AppContext? = nil) {
         super.init(appContext: appContext)
+        
+        // 🔑 关键修复：PolylineView 不应该拦截触摸事件
+        self.isUserInteractionEnabled = false
+    }
+    
+    /**
+     * 重写 hitTest，让触摸事件完全穿透此视图
+     */
+    override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? {
+        return nil
+    }
+    
+    /**
+     * 重写 point(inside:with:)，确保此视图不响应任何触摸
+     */
+    override func point(inside point: CGPoint, with event: UIEvent?) -> Bool {
+        return false
+    }
+    
+    /**
+     * 检查地图是否已连接
+     */
+    func isMapConnected() -> Bool {
+        return mapView != nil
     }
     
     /**
@@ -40,6 +66,12 @@ class PolylineView: ExpoView {
      * @param map 地图视图
      */
     func setMap(_ map: MAMapView) {
+        // 🔑 关键优化：如果是同一个地图引用，跳过重复设置
+        if lastSetMapView === map {
+            return
+        }
+        
+        lastSetMapView = map
         self.mapView = map
         updatePolyline()
     }
@@ -51,11 +83,19 @@ class PolylineView: ExpoView {
         guard let mapView = mapView else { return }
         if let old = polyline { mapView.remove(old) }
         
+        // 🔑 坐标验证和过滤
         var coords = points.compactMap { point -> CLLocationCoordinate2D? in
-            guard let lat = point["latitude"], let lng = point["longitude"] else { return nil }
+            guard let lat = point["latitude"],
+                  let lng = point["longitude"],
+                  lat >= -90 && lat <= 90,
+                  lng >= -180 && lng <= 180 else {
+                return nil
+            }
             return CLLocationCoordinate2D(latitude: lat, longitude: lng)
         }
-        guard !coords.isEmpty else { return }
+        
+        // 🔑 至少需要2个点才能绘制折线
+        guard coords.count >= 2 else { return }
         
         polyline = MAPolyline(coordinates: &coords, count: UInt(coords.count))
         mapView.add(polyline!)
@@ -72,19 +112,12 @@ class PolylineView: ExpoView {
             renderer = MAPolylineRenderer(polyline: polyline)
             renderer?.lineWidth = CGFloat(strokeWidth)
             
-            // 注意: iOS 高德地图 SDK 不支持简单的虚线设置
-            // 需要使用 MAMultiPolyline 实现虚线,暂不支持
-            
             if let url = textureUrl {
-                print("🔷 PolylineView.getRenderer: 加载纹理 \(url)")
                 loadTexture(url: url, renderer: renderer!)
             } else {
                 let parsedColor = ColorParser.parseColor(strokeColor)
                 renderer?.strokeColor = parsedColor ?? UIColor.clear
-                print("🔷 PolylineView.getRenderer: 创建新 renderer, strokeColor=\(String(describing: parsedColor)), lineWidth=\(strokeWidth)")
             }
-        } else {
-            print("🔷 PolylineView.getRenderer: 使用缓存的 renderer")
         }
         return renderer!
     }
@@ -124,15 +157,19 @@ class PolylineView: ExpoView {
     
     /**
      * 应用纹理到折线渲染器
+     * 
+     * 根据高德地图官方文档：
+     * - 仅 3D 地图支持纹理
+     * - 纹理须是正方形，宽高是2的整数幂（如64x64）
+     * - 若设置了纹理，线颜色、连接类型和端点类型将无效
+     * 
      * @param image 纹理图片
      * @param renderer 折线渲染器
      */
     private func applyTexture(image: UIImage, to renderer: MAPolylineRenderer) {
-        let selector = NSSelectorFromString("loadStrokeTextureImage:")
-        if renderer.responds(to: selector) {
-            renderer.perform(selector, with: image)
-            mapView?.setNeedsDisplay()
-        }
+        // 🔑 关键修复：使用 strokeImage 属性设置纹理（与命令式 API 一致）
+        renderer.strokeImage = image
+        mapView?.setNeedsDisplay()
     }
     
     /**
@@ -149,10 +186,9 @@ class PolylineView: ExpoView {
      * @param width 线宽值
      */
     func setStrokeWidth(_ width: Float) {
-        print("🔷 PolylineView.setStrokeWidth: \(width)")
         strokeWidth = width
         renderer = nil
-        updatePolyline()
+        forceRerender()
     }
     
     /**
@@ -160,10 +196,9 @@ class PolylineView: ExpoView {
      * @param color 颜色值
      */
     func setStrokeColor(_ color: Any?) {
-        print("🔷 PolylineView.setStrokeColor: \(String(describing: color))")
         strokeColor = color
         renderer = nil
-        updatePolyline()
+        forceRerender()
     }
     
     /**
@@ -171,24 +206,59 @@ class PolylineView: ExpoView {
      * @param url 图片 URL
      */
     func setTexture(_ url: String?) {
-        print("🔷 PolylineView.setTexture: \(String(describing: url))")
         textureUrl = url
         renderer = nil
-        updatePolyline()
+        forceRerender()
+    }
+    
+    /**
+     * 强制重新渲染折线
+     * 通过移除并重新添加 overlay 来触发地图重新请求 renderer
+     */
+    private func forceRerender() {
+        guard let mapView = mapView, let polyline = polyline else {
+            return
+        }
+        
+        // 移除旧的 overlay
+        mapView.remove(polyline)
+        
+        // 重新添加（地图会调用 rendererFor overlay）
+        mapView.add(polyline)
     }
     
     func setDotted(_ dotted: Bool) {
         isDotted = dotted
         renderer = nil
-        updatePolyline()
+        forceRerender()
     }
     
     /**
-     * 析构时移除折线
+     * 视图即将从父视图移除时调用
+     * 🔑 关键修复：旧架构下，React Native 移除视图时不一定立即调用 deinit
+     * 需要在 willMove(toSuperview:) 中立即清理地图覆盖物
+     */
+    override func willMove(toSuperview newSuperview: UIView?) {
+        super.willMove(toSuperview: newSuperview)
+        
+        // 当 newSuperview 为 nil 时，表示视图正在从父视图移除
+        if newSuperview == nil {
+            if let mapView = mapView, let polyline = polyline {
+                mapView.remove(polyline)
+                self.polyline = nil
+            }
+        }
+    }
+    
+    /**
+     * 析构时移除折线（双重保险）
      */
     deinit {
         if let mapView = mapView, let polyline = polyline {
             mapView.remove(polyline)
         }
+        mapView = nil
+        polyline = nil
+        renderer = nil
     }
 }

package/ios/overlays/PolylineViewModule.swift

@@ -5,22 +5,16 @@ public class PolylineViewModule: Module {
         Name("PolylineView")
         
         View(PolylineView.self) {
+            Events("onPolylinePress")
+            
             Prop("points") { (view: PolylineView, points: [[String: Double]]) in
                 view.setPoints(points)
             }
             
-            Prop("width") { (view: PolylineView, width: Double) in
-                view.setStrokeWidth(Float(width))
-            }
-            
             Prop("strokeWidth") { (view: PolylineView, width: Double) in
                 view.setStrokeWidth(Float(width))
             }
             
-            Prop("color") { (view: PolylineView, color: String) in
-                view.setStrokeColor(color)
-            }
-            
             Prop("strokeColor") { (view: PolylineView, color: String) in
                 view.setStrokeColor(color)
             }
@@ -32,6 +26,21 @@ public class PolylineViewModule: Module {
             Prop("dotted") { (view: PolylineView, dotted: Bool) in
                 view.setDotted(dotted)
             }
+            
+            OnViewDidUpdateProps { (view: PolylineView) in
+                // 属性更新完成后，如果还没连接地图，尝试连接
+                if !view.isMapConnected() {
+                    // 查找父视图 ExpoGaodeMapView
+                    var parent = view.superview
+                    while parent != nil {
+                        if let mapView = parent as? ExpoGaodeMapView {
+                            view.setMap(mapView.mapView)
+                            return
+                        }
+                        parent = parent?.superview
+                    }
+                }
+            }
         }
     }
 }

package/ios/utils/PermissionManager.swift

@@ -27,18 +27,14 @@ class PermissionManager: NSObject, CLLocationManagerDelegate {
             guard let self = self else { return }
             
             if self.locationManager == nil {
-                print("🔐 [PermissionManager] 创建 CLLocationManager")
                 self.locationManager = CLLocationManager()
                 self.locationManager?.delegate = self
-                print("🔐 [PermissionManager] delegate 已设置: \(self.locationManager?.delegate != nil)")
             }
             
             let currentStatus = CLLocationManager.authorizationStatus()
-            print("🔐 [PermissionManager] 当前权限状态: \(self.getAuthorizationStatusString(currentStatus))")
             
             // 如果已经有权限,直接返回
             if currentStatus == .authorizedAlways || currentStatus == .authorizedWhenInUse {
-                print("🔐 [PermissionManager] 已有权限,直接返回")
                 self.permissionCallback?(true, self.getAuthorizationStatusString(currentStatus))
                 self.permissionCallback = nil
                 return
@@ -46,15 +42,12 @@ class PermissionManager: NSObject, CLLocationManagerDelegate {
             
             // 如果已经被拒绝,直接返回
             if currentStatus == .denied || currentStatus == .restricted {
-                print("🔐 [PermissionManager] 权限已被拒绝")
                 self.permissionCallback?(false, self.getAuthorizationStatusString(currentStatus))
                 self.permissionCallback = nil
                 return
             }
             
-            print("🔐 [PermissionManager] 调用 requestWhenInUseAuthorization()")
             self.locationManager?.requestWhenInUseAuthorization()
-            print("🔐 [PermissionManager] requestWhenInUseAuthorization() 调用完成")
         }
     }
     
@@ -62,7 +55,6 @@ class PermissionManager: NSObject, CLLocationManagerDelegate {
      * 权限状态变化回调 (iOS 14+)
      */
     func locationManagerDidChangeAuthorization(_ manager: CLLocationManager) {
-        print("🔐 [PermissionManager] locationManagerDidChangeAuthorization 被调用")
         handleAuthorizationChange(manager.authorizationStatus)
     }
     
@@ -70,7 +62,6 @@ class PermissionManager: NSObject, CLLocationManagerDelegate {
      * 权限状态变化回调 (iOS 13 及以下,兼容旧版本)
      */
     func locationManager(_ manager: CLLocationManager, didChangeAuthorization status: CLAuthorizationStatus) {
-        print("🔐 [PermissionManager] didChangeAuthorization 被调用")
         handleAuthorizationChange(status)
     }
     
@@ -78,11 +69,8 @@ class PermissionManager: NSObject, CLLocationManagerDelegate {
      * 处理权限状态变化
      */
     private func handleAuthorizationChange(_ status: CLAuthorizationStatus) {
-        print("🔐 [PermissionManager] 当前状态: \(getAuthorizationStatusString(status))")
-        
         // 如果状态仍是 notDetermined,说明用户还没有做出选择,忽略这次回调
         if status == .notDetermined {
-            print("🔐 [PermissionManager] 状态仍为 notDetermined,等待用户选择")
             return
         }
         
@@ -90,8 +78,6 @@ class PermissionManager: NSObject, CLLocationManagerDelegate {
         let granted = status == .authorizedAlways || status == .authorizedWhenInUse
         let statusString = getAuthorizationStatusString(status)
         
-        print("🔐 [PermissionManager] 返回结果: granted=\(granted), status=\(statusString)")
-        
         permissionCallback?(granted, statusString)
         permissionCallback = nil
     }
@@ -109,4 +95,13 @@ class PermissionManager: NSObject, CLLocationManagerDelegate {
         @unknown default: return "unknown"
         }
     }
+    
+    /**
+     * 析构函数 - 清理资源
+     */
+    deinit {
+        locationManager?.delegate = nil
+        locationManager = nil
+        permissionCallback = nil
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-gaode-map",
-  "version": "1.1.8",
+  "version": "2.0.0-alpha.1",
   "description": "一个功能完整的高德地图 React Native 组件库，基于 Expo Modules 开发，提供地图显示、定位、覆盖物等功能。",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -13,8 +13,9 @@
     "prepublishOnly": "expo-module prepublishOnly",
     "expo-module": "expo-module",
     "open:ios": "xed example/ios",
-    "npm:publish": "npm publish",
-    "open:android": "open -a \"Android Studio\" example/android"
+    "open:android": "open -a \"Android Studio\" example/android",
+    "publish:next": "npm publish --tag next",
+    "publish:latest": "npm publish --tag latest"
   },
   "keywords": [
     "react-native",

package/src/ExpoGaodeMap.types.ts

@@ -1,4 +1,8 @@
+/**
+ * 高德地图 Expo 模块类型定义
+ */
 
+import type { Coordinates, ReGeocode } from './types';
 
 // 导出所有类型定义
 export * from './types';
@@ -20,6 +24,7 @@ export type {
   Coordinates,
   ReGeocode,
   LocationOptions,
+  LocationListener,
   
   // 覆盖物
   MarkerProps,
@@ -40,17 +45,37 @@ export {
 
 /**
  * Expo 模块事件类型
+ * 定义了原生模块可以触发的事件
  */
 export type ExpoGaodeMapModuleEvents = {
   /**
    * 定位更新事件
+   * 当位置发生变化时触发
+   * @param location 位置信息，包含坐标和可选的逆地理编码信息
    */
-  onLocationUpdate: (location: any) => void;
+  onLocationUpdate: (location: Coordinates | ReGeocode) => void;
   
   /**
-   * 定位错误事件
+   * 方向更新事件（iOS）
+   * 当设备方向发生变化时触发
+   * @param heading 方向信息
    */
-  onLocationError: (error: { code: number; message: string }) => void;
+  onHeadingUpdate: (heading: {
+    /** 磁北方向角度 (0-359.9) */
+    magneticHeading: number;
+    /** 真北方向角度 (0-359.9) */
+    trueHeading: number;
+    /** 方向精度 */
+    headingAccuracy: number;
+    /** X 轴原始数据 */
+    x: number;
+    /** Y 轴原始数据 */
+    y: number;
+    /** Z 轴原始数据 */
+    z: number;
+    /** 时间戳 */
+    timestamp: number;
+  }) => void;
 };
 
 /**