expo-gaode-map-navigation 2.0.12 → 2.0.13

package/ios/map/modules/LocationManager.swift

@@ -102,11 +102,17 @@ class LocationManager: NSObject, AMapLocationManagerDelegate {
         }
     }
 
+    private func setReGeocodeLanguage(_ rawValue: AMapRegionLanguageType.RawValue) {
+        if let language = AMapRegionLanguageType(rawValue: rawValue) {
+            ensureLocationManager()?.reGeocodeLanguage = language
+        }
+    }
+
     func setGeoLanguage(_ language: Int) {
         switch language {
-        case 0: ensureLocationManager()?.reGeocodeLanguage = .default
-        case 1: ensureLocationManager()?.reGeocodeLanguage = .chinse
-        case 2: ensureLocationManager()?.reGeocodeLanguage = .english
+        case 0: setReGeocodeLanguage(0)
+        case 1: setReGeocodeLanguage(0)
+        case 2: setReGeocodeLanguage(2)
         default: break
         }
     }

package/ios/map/overlays/PolylineView.swift

@@ -71,6 +71,9 @@ class PolylineView: ExpoView {
     func setMap(_ map: MAMapView) {
         // 🔑 关键优化：如果是同一个地图引用，跳过重复设置
         if lastSetMapView === map {
+            if polyline == nil {
+                updatePolyline()
+            }
             return
         }
         
@@ -105,10 +108,9 @@ class PolylineView: ExpoView {
         // 🔑 至少需要2个点才能绘制折线
         guard coords.count >= 2 else { return }
         
+        renderer = nil
         polyline = MAPolyline(coordinates: &coords, count: UInt(coords.count))
         mapView.add(polyline!)
-        
-        renderer = nil
     }
     
     /**
@@ -221,18 +223,10 @@ class PolylineView: ExpoView {
     
     /**
      * 强制重新渲染折线
-     * 通过移除并重新添加 overlay 来触发地图重新请求 renderer
+     * 通过重建 overlay 来触发地图重新请求 renderer
      */
     private func forceRerender() {
-        guard let mapView = mapView, let polyline = polyline else {
-            return
-        }
-        
-        // 移除旧的 overlay
-        mapView.remove(polyline)
-        
-        // 重新添加（地图会调用 rendererFor overlay）
-        mapView.add(polyline)
+        updatePolyline()
     }
     
     func setDotted(_ dotted: Bool) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-gaode-map-navigation",
-  "version": "2.0.12",
+  "version": "2.0.13",
   "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": {

package/plugin/build/withGaodeMap.js

@@ -236,6 +236,18 @@ configurations.all {
  */
 const withGaodeMapAndroidSdk = (config, props) => {
     return (0, config_plugins_1.withGradleProperties)(config, (config) => {
+        const jetifierKey = 'android.enableJetifier';
+        const jetifier = config.modResults.find((item) => item.type === 'property' && item.key === jetifierKey);
+        if (jetifier && jetifier.type === 'property') {
+            jetifier.value = 'true';
+        }
+        else {
+            config.modResults.push({
+                type: 'property',
+                key: jetifierKey,
+                value: 'true',
+            });
+        }
         if (props.customMapSdkPath) {
             const key = 'EXPO_GAODE_MAP_CUSTOM_SDK_PATH';
             const existing = config.modResults.find((item) => item.type === 'property' && item.key === key);

package/android/src/main/java/expo/modules/gaodemap/navigation/managers/RouteCalculator.kt

@@ -1,173 +0,0 @@
-package expo.modules.gaodemap.navigation.managers
-
-import android.content.Context
-import com.amap.api.navi.AMapNavi
-import com.amap.api.navi.model.AMapCarInfo
-
-import expo.modules.kotlin.Promise
-import expo.modules.gaodemap.navigation.ExpoGaodeMapNavigationModule
-import expo.modules.gaodemap.navigation.utils.Converters
-import expo.modules.gaodemap.navigation.listeners.RouteCalculateListener
-
-/**
- * 路径规划管理器
- * 
- * 负责处理各种类型的路径规划：驾车、步行、骑行、公交、货车
- */
-class RouteCalculator(
-  private val context: Context,
-  private val module: ExpoGaodeMapNavigationModule
-) {
-  
-  private var aMapNavi: AMapNavi? = null
-  private var routeListener: RouteCalculateListener? = null
-
-  init {
-    initNavi()
-  }
-
-  private fun initNavi() {
-    if (aMapNavi == null) {
-      aMapNavi = AMapNavi.getInstance(context)
-      routeListener = RouteCalculateListener(module)
-      aMapNavi?.addAMapNaviListener(routeListener)
-    }
-  }
-
-  /**
-   * 驾车路径规划
-   */
-  fun calculateDriveRoute(options: Map<String, Any?>, promise: Promise) {
-    @Suppress("UNCHECKED_CAST")
-    val from = options["from"] as? Map<String, Any?>
-    @Suppress("UNCHECKED_CAST")
-    val to = options["to"] as? Map<String, Any?>
-      ?: throw Exception("to is required")
-
-    val fromPoi = from?.let { Converters.parseNaviPoi(it) }
-    val toPoi = Converters.parseNaviPoi(to)
-    @Suppress("UNCHECKED_CAST")
-    val waypoints = Converters.parseWaypoints(options["waypoints"] as? List<Map<String, Any?>>)
-
-    // 支持两种策略传参：
-    // 1) 直接传 PathPlanningStrategy 的整型值：strategy
-    // 2) 传策略开关（建议）：avoidCongestion/avoidHighway/avoidCost/prioritiseHighway
-    val strategy: Int = if (options.containsKey("strategy")) {
-      (options["strategy"] as? Number)?.toInt() ?: 0
-    } else {
-      val avoidCongestion = options["avoidCongestion"] as? Boolean ?: false
-      val avoidHighway = options["avoidHighway"] as? Boolean ?: false
-      val avoidCost = options["avoidCost"] as? Boolean ?: false
-      val prioritiseHighway = options["prioritiseHighway"] as? Boolean ?: false
-      try {
-        // 6.3+ multipleRoute 参数已无效，但保留 true 以获取多路线策略
-        aMapNavi?.strategyConvert(avoidCongestion, avoidHighway, avoidCost, prioritiseHighway, true) ?: 0
-      } catch (e: Exception) {
-        0
-      }
-    }
-
-    // 若提供了车牌/限行信息，则在算路前设置车辆信息（小客车）
-    val carNumber = options["carNumber"] as? String
-    val restriction = options["restriction"] as? Boolean
-    if (carNumber != null || restriction != null) {
-      try {
-        val carInfo = AMapCarInfo().apply {
-          if (carNumber != null) setCarNumber(carNumber)
-          // 0=小客车；如为货车请使用 calculateTruckRoute 并设置 carType=1
-          setCarType("0")
-          if (restriction != null) setRestriction(restriction)
-        }
-        aMapNavi?.setCarInfo(carInfo)
-      } catch (_: Exception) {
-        // 忽略设置失败，不影响算路
-      }
-    }
-
-    routeListener?.currentPromise = promise
-    // 官方 API：POI 算路
-    aMapNavi?.calculateDriveRoute(fromPoi, toPoi, waypoints, strategy)
-  }
-
-  /**
-   * 步行路径规划（使用 NaviLatLng）
-   */
-  fun calculateWalkRoute(options: Map<String, Any?>, promise: Promise) {
-    @Suppress("UNCHECKED_CAST")
-    val from = options["from"] as? Map<String, Any?>
-      ?: throw Exception("from is required")
-    @Suppress("UNCHECKED_CAST")
-    val to = options["to"] as? Map<String, Any?>
-      ?: throw Exception("to is required")
-    
-    val fromLatLng = Converters.parseNaviLatLng(from)
-    val toLatLng = Converters.parseNaviLatLng(to)
-    
-    routeListener?.currentPromise = promise
-    aMapNavi?.calculateWalkRoute(fromLatLng, toLatLng)
-  }
-
-  /**
-   * 骑行路径规划（使用 NaviLatLng）
-   */
-  fun calculateRideRoute(options: Map<String, Any?>, promise: Promise) {
-    @Suppress("UNCHECKED_CAST")
-    val from = options["from"] as? Map<String, Any?>
-      ?: throw Exception("from is required")
-    @Suppress("UNCHECKED_CAST")
-    val to = options["to"] as? Map<String, Any?>
-      ?: throw Exception("to is required")
-    
-    val fromLatLng = Converters.parseNaviLatLng(from)
-    val toLatLng = Converters.parseNaviLatLng(to)
-    
-    routeListener?.currentPromise = promise
-    aMapNavi?.calculateRideRoute(fromLatLng, toLatLng)
-  }
-
-  /**
-   * 公交路径规划
-   * 注意：公交路径规划需要使用搜索服务，这里返回未实现错误
-   */
-  fun calculateBusRoute(options: Map<String, Any?>, promise: Promise) {
-    promise.reject("NOT_IMPLEMENTED", "Bus route calculation requires search service", null)
-  }
-
-  /**
-   * 货车路径规划
-   */
-  fun calculateTruckRoute(options: Map<String, Any?>, promise: Promise) {
-    // 货车路径规划：在算路前设置货车信息
-    try {
-      val carNumber = options["carNumber"] as? String
-      val restriction = options["restriction"] as? Boolean
-      val carInfo = AMapCarInfo().apply {
-        if (carNumber != null) setCarNumber(carNumber)
-        // 1=货车（CarType 为 1/3/5 均视为货车），这里取 1 作为通用值
-        setCarType("1")
-        if (restriction != null) setRestriction(restriction)
-        // 如需更精细的车型参数（轴数/长宽高/载重等），可在此扩展：
-        // setVehicleAxis("6"); setVehicleHeight("3.5"); setVehicleLength("7.3"); setVehicleWidth("2.5");
-        // setVehicleSize("4"); setVehicleLoad("25.99"); setVehicleWeight("20"); setVehicleLoadSwitch(true);
-      }
-      aMapNavi?.setCarInfo(carInfo)
-    } catch (_: Exception) {
-      // 忽略设置失败，不影响后续算路
-    }
-
-    // 复用驾车算路逻辑（含 strategyConvert）
-    calculateDriveRoute(options, promise)
-  }
-
-  fun destroy() {
-    aMapNavi?.removeAMapNaviListener(routeListener)
-    try {
-      // 官方建议：销毁单例释放资源
-      AMapNavi.destroy()
-    } catch (_: Exception) {
-    } finally {
-      aMapNavi = null
-      routeListener = null
-    }
-  }
-}