expo-gaode-map-navigation 2.0.14 → 2.0.15

package/android/.project

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>expo-gaode-map-navigation</name>
+	<comment>Project example-navigation-android-expo-gaode-map-navigation created by Buildship.</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
+	</natures>
+	<filteredResources>
+		<filter>
+			<id>1778483172220</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
+</projectDescription>

package/android/src/main/java/expo/modules/gaodemap/map/ExpoGaodeMapModule.kt

@@ -27,6 +27,8 @@ class ExpoGaodeMapModule : Module() {
   /** 定位管理器实例 */
   private var locationManager: LocationManager? = null
 
+  private fun jsValue(value: Any?): Any? = value
+
   override fun definition() = ModuleDefinition {
     Name("ExpoGaodeMap")
 
@@ -93,7 +95,7 @@ class ExpoGaodeMapModule : Module() {
     }
 
     Function("getPrivacyStatus") {
-      SDKInitializer.getPrivacyStatus()
+      jsValue(SDKInitializer.getPrivacyStatus())
     }
 
     /**
@@ -109,14 +111,14 @@ class ExpoGaodeMapModule : Module() {
      * @return SDK 版本号
      */
     Function("getVersion") {
-      SDKInitializer.getVersion()
+      jsValue(SDKInitializer.getVersion())
     }
 
     /**
     * 检查原生 SDK 是否已配置 API Key
     */
     Function("isNativeSDKConfigured") {
-      try {
+      jsValue(try {
         val context = appContext.reactContext!!
         val apiKey = context.packageManager
           .getApplicationInfo(context.packageName, android.content.pm.PackageManager.GET_META_DATA)
@@ -124,7 +126,7 @@ class ExpoGaodeMapModule : Module() {
         !apiKey.isNullOrEmpty()
       } catch (_: Exception) {
         false
-      }
+      })
     }
 
 
@@ -187,11 +189,11 @@ class ExpoGaodeMapModule : Module() {
     Function("distanceBetweenCoordinates") { p1: Map<String, Any>?, p2: Map<String, Any>? ->
       val coord1 = LatLngParser.parseLatLng(p1)
       val coord2 = LatLngParser.parseLatLng(p2)
-      if (coord1 != null && coord2 != null) {
+      jsValue(if (coord1 != null && coord2 != null) {
         GeometryUtils.calculateDistance(coord1, coord2)
       } else {
         0.0
-      }
+      })
     }
 
     /**
@@ -213,16 +215,16 @@ class ExpoGaodeMapModule : Module() {
       val normalized = LatLngParser.parseLatLngList(points)
       val safeMinZoom = minZoom ?: 3
       val safeMaxZoom = maxZoom ?: 20
-      if (normalized.isEmpty()) return@Function safeMinZoom.toDouble()
+      if (normalized.isEmpty()) return@Function jsValue(safeMinZoom.toDouble())
 
-      GeometryUtils.calculateFitZoom(
+      jsValue(GeometryUtils.calculateFitZoom(
         normalized,
         viewportWidthPx ?: 390.0,
         viewportHeightPx ?: 844.0,
         paddingPx ?: 48.0,
         safeMinZoom,
         safeMaxZoom
-      )
+      ))
     }
 
     /**
@@ -232,7 +234,7 @@ class ExpoGaodeMapModule : Module() {
      */
     Function("calculatePolygonArea") { points: List<Any>? ->
       val rings = LatLngParser.parseLatLngListList(points)
-      if (rings.isEmpty()) return@Function 0.0
+      if (rings.isEmpty()) return@Function jsValue(0.0)
       
       // 第一项是外轮廓
       var totalArea = GeometryUtils.calculatePolygonArea(rings[0])
@@ -245,7 +247,7 @@ class ExpoGaodeMapModule : Module() {
       }
       
       // 确保面积不为负数
-      max(0.0, totalArea)
+      jsValue(max(0.0, totalArea))
     }
 
     /**
@@ -255,24 +257,24 @@ class ExpoGaodeMapModule : Module() {
      * @return 是否在多边形内
      */
     Function("isPointInPolygon") { point: Map<String, Any>?, polygon: List<Any>? ->
-      val pt = LatLngParser.parseLatLng(point) ?: return@Function false
+      val pt = LatLngParser.parseLatLng(point) ?: return@Function jsValue(false)
       val rings = LatLngParser.parseLatLngListList(polygon)
-      if (rings.isEmpty()) return@Function false
+      if (rings.isEmpty()) return@Function jsValue(false)
       
       // 点必须在外轮廓内
       val inOuter = GeometryUtils.isPointInPolygon(pt, rings[0])
-      if (!inOuter) return@Function false
+      if (!inOuter) return@Function jsValue(false)
       
       // 点不能在任何内孔内
       if (rings.size > 1) {
         for (i in 1 until rings.size) {
           if (GeometryUtils.isPointInPolygon(pt, rings[i])) {
-            return@Function false
+            return@Function jsValue(false)
           }
         }
       }
       
-      true
+      jsValue(true)
     }
 
     /**
@@ -285,11 +287,11 @@ class ExpoGaodeMapModule : Module() {
     Function("isPointInCircle") { point: Map<String, Any>?, center: Map<String, Any>?, radius: Double ->
       val pt = LatLngParser.parseLatLng(point)
       val cn = LatLngParser.parseLatLng(center)
-      if (pt != null && cn != null) {
+      jsValue(if (pt != null && cn != null) {
         GeometryUtils.isPointInCircle(pt, cn, radius)
       } else {
         false
-      }
+      })
     }
 
     /**
@@ -301,11 +303,11 @@ class ExpoGaodeMapModule : Module() {
     Function("calculateRectangleArea") { southWest: Map<String, Any>?, northEast: Map<String, Any>? ->
       val sw = LatLngParser.parseLatLng(southWest)
       val ne = LatLngParser.parseLatLng(northEast)
-      if (sw != null && ne != null) {
+      jsValue(if (sw != null && ne != null) {
         GeometryUtils.calculateRectangleArea(sw, ne)
       } else {
         0.0
-      }
+      })
     }
 
     /**
@@ -318,7 +320,7 @@ class ExpoGaodeMapModule : Module() {
       val pathPoints = LatLngParser.parseLatLngList(path)
       val targetPoint = LatLngParser.parseLatLng(target)
       
-      if (targetPoint != null && pathPoints.isNotEmpty()) {
+      jsValue(if (targetPoint != null && pathPoints.isNotEmpty()) {
         val result = GeometryUtils.getNearestPointOnPath(pathPoints, targetPoint)
         if (result != null) {
           mapOf(
@@ -332,7 +334,7 @@ class ExpoGaodeMapModule : Module() {
         }
       } else {
         null
-      }
+      })
     }
 
     /**
@@ -342,16 +344,16 @@ class ExpoGaodeMapModule : Module() {
      */
     Function("calculateCentroid") { polygon: List<Any>? ->
       val rings = LatLngParser.parseLatLngListList(polygon)
-      if (rings.isEmpty()) return@Function null
+      if (rings.isEmpty()) return@Function jsValue(null)
       
       if (rings.size == 1) {
         val result = GeometryUtils.calculateCentroid(rings[0])
-        return@Function result?.let {
+        return@Function jsValue(result?.let {
           mapOf(
             "latitude" to it.latitude,
             "longitude" to it.longitude
           )
-        }
+        })
       }
       
       // 带孔多边形的质心计算: Σ(Area_i * Centroid_i) / Σ(Area_i)
@@ -376,14 +378,14 @@ class ExpoGaodeMapModule : Module() {
         }
       }
       
-      if (abs(totalArea) > 1e-9) {
+      jsValue(if (abs(totalArea) > 1e-9) {
         mapOf(
           "latitude" to sumLat / totalArea,
           "longitude" to sumLon / totalArea
         )
       } else {
         null
-      }
+      })
     }
 
     /**
@@ -393,10 +395,10 @@ class ExpoGaodeMapModule : Module() {
      */
     Function("calculatePathBounds") { pointsList: List<Any>? ->
       val points = LatLngParser.parseLatLngList(pointsList)
-      if (points.isEmpty()) return@Function null
+      if (points.isEmpty()) return@Function jsValue(null)
 
       val result = GeometryUtils.calculatePathBounds(points)
-      result?.let {
+      jsValue(result?.let {
         mapOf(
           "north" to it.north,
           "south" to it.south,
@@ -407,7 +409,7 @@ class ExpoGaodeMapModule : Module() {
             "longitude" to it.centerLon
           )
         )
-      }
+      })
     }
 
     /**
@@ -418,11 +420,11 @@ class ExpoGaodeMapModule : Module() {
      */
     Function("encodeGeoHash") { coordinate: Map<String, Any>?, precision: Int ->
       val latLng = LatLngParser.parseLatLng(coordinate)
-      if (latLng != null) {
+      jsValue(if (latLng != null) {
         GeometryUtils.encodeGeoHash(latLng, precision)
       } else {
         ""
-      }
+      })
     }
 
     /**
@@ -434,12 +436,12 @@ class ExpoGaodeMapModule : Module() {
     Function("simplifyPolyline") { points: List<Any>?, tolerance: Double ->
       val poly = LatLngParser.parseLatLngList(points)
       val simplified = GeometryUtils.simplifyPolyline(poly, tolerance)
-      simplified.map {
+      jsValue(simplified.map {
         mapOf(
           "latitude" to it.latitude,
           "longitude" to it.longitude
         )
-      }
+      })
     }
 
     /**
@@ -449,7 +451,7 @@ class ExpoGaodeMapModule : Module() {
      */
     Function("calculatePathLength") { points: List<Any>? ->
       val poly = LatLngParser.parseLatLngList(points)
-      GeometryUtils.calculatePathLength(poly)
+      jsValue(GeometryUtils.calculatePathLength(poly))
     }
 
     /**
@@ -459,12 +461,12 @@ class ExpoGaodeMapModule : Module() {
      */
     Function("parsePolyline") { polylineStr: String? ->
       val result = GeometryUtils.parsePolyline(polylineStr)
-      result.map {
+      jsValue(result.map {
         mapOf(
           "latitude" to it.latitude,
           "longitude" to it.longitude
         )
-      }
+      })
     }
 
     /**
@@ -476,7 +478,7 @@ class ExpoGaodeMapModule : Module() {
     Function("getPointAtDistance") { points: List<Any>?, distance: Double ->
       val poly = LatLngParser.parseLatLngList(points)
       val result = GeometryUtils.getPointAtDistance(poly, distance)
-      if (result != null) {
+      jsValue(if (result != null) {
         mapOf(
           "latitude" to result.point.latitude,
           "longitude" to result.point.longitude,
@@ -484,7 +486,7 @@ class ExpoGaodeMapModule : Module() {
         )
       } else {
         null
-      }
+      })
     }
 
     /**
@@ -495,7 +497,7 @@ class ExpoGaodeMapModule : Module() {
      */
     Function("latLngToTile") { coordinate: Map<String, Any>?, zoom: Int ->
       val latLng = LatLngParser.parseLatLng(coordinate)
-      if (latLng != null) {
+      jsValue(if (latLng != null) {
         val result = GeometryUtils.latLngToTile(latLng, zoom)
         if (result != null && result.size >= 2) {
           mapOf("x" to result[0], "y" to result[1])
@@ -504,7 +506,7 @@ class ExpoGaodeMapModule : Module() {
         }
       } else {
         null
-      }
+      })
     }
 
     /**
@@ -517,9 +519,9 @@ class ExpoGaodeMapModule : Module() {
       val y = (tile?.get("y") as? Number)?.toInt() ?: 0
       val zoom = (tile?.get("z") as? Number)?.toInt() ?: (tile?.get("zoom") as? Number)?.toInt() ?: 0
       val result = GeometryUtils.tileToLatLng(x, y, zoom)
-      result?.let {
+      jsValue(result?.let {
         mapOf("latitude" to it.latitude, "longitude" to it.longitude)
-      }
+      })
     }
 
     /**
@@ -530,7 +532,7 @@ class ExpoGaodeMapModule : Module() {
      */
     Function("latLngToPixel") { coordinate: Map<String, Any>?, zoom: Int ->
       val latLng = LatLngParser.parseLatLng(coordinate)
-      if (latLng != null) {
+      jsValue(if (latLng != null) {
         val result = GeometryUtils.latLngToPixel(latLng, zoom)
         if (result != null && result.size >= 2) {
           mapOf("x" to result[0], "y" to result[1])
@@ -539,7 +541,7 @@ class ExpoGaodeMapModule : Module() {
         }
       } else {
         null
-      }
+      })
     }
 
     /**
@@ -552,9 +554,9 @@ class ExpoGaodeMapModule : Module() {
       val x = (pixel?.get("x") as? Number)?.toDouble() ?: 0.0
       val y = (pixel?.get("y") as? Number)?.toDouble() ?: 0.0
       val result = GeometryUtils.pixelToLatLng(x, y, zoom)
-      result?.let {
+      jsValue(result?.let {
         mapOf("latitude" to it.latitude, "longitude" to it.longitude)
-      }
+      })
     }
 
     /**
@@ -566,11 +568,11 @@ class ExpoGaodeMapModule : Module() {
     Function("findPointInPolygons") { point: Map<String, Any>?, polygons: List<List<Any>>? ->
       val pt = LatLngParser.parseLatLng(point)
       val polys = polygons?.map { LatLngParser.parseLatLngList(it) }
-      if (pt != null && polys != null) {
+      jsValue(if (pt != null && polys != null) {
         GeometryUtils.findPointInPolygons(pt, polys)
       } else {
         -1
-      }
+      })
     }
 
     /**
@@ -579,7 +581,7 @@ class ExpoGaodeMapModule : Module() {
      * @param gridSizeMeters 网格大小（米）
      */
     Function("generateHeatmapGrid") { points: List<Map<String, Any>>?, gridSizeMeters: Double ->
-      if (points == null || points.isEmpty()) return@Function emptyList<Map<String, Any>>()
+      if (points == null || points.isEmpty()) return@Function jsValue(emptyList<Map<String, Any>>())
       
       val count = points.size
       val latitudes = DoubleArray(count)
@@ -593,13 +595,13 @@ class ExpoGaodeMapModule : Module() {
       }
       
       val result = GeometryUtils.generateHeatmapGrid(latitudes, longitudes, weights, gridSizeMeters)
-      result.map {
+      jsValue(result.map {
         mapOf(
           "latitude" to it.latitude,
           "longitude" to it.longitude,
           "intensity" to it.intensity
         )
-      }
+      })
     }
 
     // ==================== 定位配置 ====================

package/ios/map/modules/LocationManager.swift

@@ -102,10 +102,8 @@ class LocationManager: NSObject, AMapLocationManagerDelegate {
         }
     }
 
-    private func setReGeocodeLanguage(_ rawValue: AMapRegionLanguageType.RawValue) {
-        if let language = AMapRegionLanguageType(rawValue: rawValue) {
-            ensureLocationManager()?.reGeocodeLanguage = language
-        }
+    private func setReGeocodeLanguage(_ rawValue: Int) {
+        ensureLocationManager()?.setValue(rawValue, forKey: "reGeocodeLanguage")
     }
 
     func setGeoLanguage(_ language: Int) {

package/ios/map/overlays/MarkerView.swift

@@ -243,6 +243,7 @@ class MarkerView: ExpoView {
             // 异步渲染并设置
             DispatchQueue.main.async { [weak self, weak annotationView] in
                 guard let self = self, let annotationView = annotationView else { return }
+                guard self.isAnnotationView(annotationView, boundTo: annotation) else { return }
                 if let generated = self.createImageFromSubviews() {
                     annotationView.image = generated
                     self.applyCenterOffset(to: annotationView, defaultOffset: .zero)
@@ -265,6 +266,7 @@ class MarkerView: ExpoView {
             // 异步加载图标
             loadIcon(iconUri: iconUri) { [weak self, weak annotationView] image in
                 guard let self = self, let image = image, let annotationView = annotationView else { return }
+                guard self.isAnnotationView(annotationView, boundTo: annotation) else { return }
                 let size = CGSize(width: self.iconWidth, height: self.iconHeight)
                 UIGraphicsBeginImageContextWithOptions(size, false, 0.0)
                 image.draw(in: CGRect(origin: .zero, size: size))
@@ -347,6 +349,7 @@ class MarkerView: ExpoView {
             // 🔑 修复:延长延迟时间,给 React Native Image 更多加载时间
             DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) { [weak self, weak annotationView] in
                 guard let self = self, let annotationView = annotationView else { return }
+                guard self.isAnnotationView(annotationView, boundTo: annotation) else { return }
                 // 再次检查缓存（避免重复渲染）
                 if let cached = IconBitmapCache.shared.image(forKey: key) {
                     annotationView.image = cached
@@ -410,12 +413,12 @@ class MarkerView: ExpoView {
                 UIGraphicsEndImageContext()
 
                 DispatchQueue.main.async {
+                    guard let annotationView else { return }
+                    guard self.isAnnotationView(annotationView, boundTo: annotation) else { return }
                     if let img = resizedImage {
                         IconBitmapCache.shared.setImage(img, forKey: key)
-                        annotationView?.image = img
-                        if let annotationView = annotationView {
-                            self.applyCenterOffset(to: annotationView, defaultOffset: CGPoint(x: 0, y: -img.size.height / 2))
-                        }
+                        annotationView.image = img
+                        self.applyCenterOffset(to: annotationView, defaultOffset: CGPoint(x: 0, y: -img.size.height / 2))
                     }
                 }
             }
@@ -580,6 +583,13 @@ class MarkerView: ExpoView {
         return .zero
     }
 
+    private func isAnnotationView(_ annotationView: MAAnnotationView, boundTo annotation: MAAnnotation) -> Bool {
+        guard let current = annotationView.annotation else {
+            return false
+        }
+        return (current as AnyObject) === (annotation as AnyObject)
+    }
+
     private func resolvedCustomSubviewSize(defaultSize: CGSize) -> CGSize {
         guard let firstSubview = subviews.first else {
             return defaultSize
@@ -725,36 +735,42 @@ class MarkerView: ExpoView {
         pendingUpdateTask?.cancel(); pendingUpdateTask = nil
         pendingSubviewRefreshTask?.cancel(); pendingSubviewRefreshTask = nil
 
-        guard let mapView = mapView else { 
-            isRemoving = false
-            return 
-        }
-        
-        // 确保在主线程执行移除操作
-        let cleanup = { [weak self, weak mapView] in
-            guard let self = self, let mapView = mapView else { return }
-            
-            // 1. 停止任何正在进行的平滑移动
-            if self.animatedAnnotation != nil {
-                self.stopSmoothMove()
-            }
-            
-            // 2. 移除普通标记点
-            if let annotation = self.annotation {
-                mapView.removeAnnotation(annotation)
-                self.annotation = nil
+        if Thread.isMainThread {
+            cleanupAnnotationFromMap()
+        } else {
+            DispatchQueue.main.sync {
+                cleanupAnnotationFromMap()
             }
+        }
+    }
 
-            self.annotationView = nil
-            self.animatedAnnotationView = nil
-            self.isRemoving = false
+    private func cleanupAnnotationFromMap() {
+        defer { isRemoving = false }
+
+        guard let mapView = mapView else { return }
+
+        if let animAnnotation = animatedAnnotation {
+            if let animations = animAnnotation.allMoveAnimations() {
+                for animation in animations {
+                    animation.cancel()
+                }
+            }
+            mapView.removeAnnotation(animAnnotation)
+            animatedAnnotation = nil
         }
 
-        if Thread.isMainThread {
-            cleanup()
-        } else {
-            DispatchQueue.main.async(execute: cleanup)
+        if let annotation = annotation {
+            mapView.removeAnnotation(annotation)
+            self.annotation = nil
         }
+
+        annotationView?.annotation = nil
+        animatedAnnotationView?.annotation = nil
+        annotationView = nil
+        animatedAnnotationView = nil
+        isAnimating = false
+        lastSetMapView = nil
+        self.mapView = nil
     }
 
     override func willRemoveSubview(_ subview: UIView) {
@@ -780,10 +796,12 @@ class MarkerView: ExpoView {
     }
 
     private func scheduleSubviewRefresh(allowFallbackToDefault: Bool) {
+        guard superview != nil else { return }
+
         pendingSubviewRefreshTask?.cancel()
 
         let task = DispatchWorkItem { [weak self] in
-            guard let self = self, !self.isRemoving else { return }
+            guard let self = self, !self.isRemoving, self.superview != nil else { return }
             self.refreshAnnotationForSubviewChanges(allowFallbackToDefault: allowFallbackToDefault)
         }
 
@@ -1262,11 +1280,17 @@ class MarkerView: ExpoView {
         pendingAddTask?.cancel()
         pendingUpdateTask?.cancel()
         pendingSubviewRefreshTask?.cancel()
+
+        if Thread.isMainThread {
+            cleanupAnnotationFromMap()
+        }
         
         // 清理引用，防止内存泄漏
         mapView = nil
         annotation = nil
         annotationView = nil
+        animatedAnnotation = nil
+        animatedAnnotationView = nil
         lastSetMapView = nil
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-gaode-map-navigation",
-  "version": "2.0.14",
+  "version": "2.0.15",
   "description": "React Native AMap (Gaode Map) navigation module for Expo: route planning and turn-by-turn navigation, includes full map features.",
   "author": "TomWq <582752848@qq.com> (https://github.com/TomWq)",
   "repository": {