expo-gaode-map-navigation 2.0.12-next.0 → 2.0.13

package/ios/routes/drive/DriveTruckRouteCalculator.swift

@@ -36,11 +36,144 @@ class DriveTruckRouteCalculator: NSObject {
     isInitialized = true
     NSLog("DriveTruckRouteCalculator: AMapNaviDriveManager 初始化成功")
   }
+
+  private func bindDriveManagerDelegate() {
+    driveManager = AMapNaviDriveManager.sharedInstance()
+    driveManager?.delegate = self
+  }
+
+  private func resolveScene(options: [String: Any]) -> String {
+    let carType = intValue(options["carType"]) ?? intValue(options["type"])
+    switch carType {
+    case 11:
+      return "motorcycle"
+    case 1, 3, 5:
+      return "truck"
+    default:
+      return "drive"
+    }
+  }
+
+  private func resolveDrivingStrategy(options: [String: Any]) -> AMapNaviDrivingStrategy {
+    let strategyValue: Int
+    if let rawStrategy = intValue(options["strategy"]) {
+      strategyValue = rawStrategy
+    } else {
+      strategyValue = Converters.convertDrivingPreferenceToStrategy(
+        multipleRoute: true,
+        avoidCongestion: boolValue(options["avoidCongestion"]) ?? false,
+        avoidHighway: boolValue(options["avoidHighway"]) ?? false,
+        avoidCost: boolValue(options["avoidCost"]) ?? false,
+        prioritiseHighway: boolValue(options["prioritiseHighway"]) ?? false
+      )
+    }
+    return AMapNaviDrivingStrategy(rawValue: strategyValue)
+      ?? AMapNaviDrivingStrategy.drivingStrategyMultipleDefault
+  }
+
+  private func applyVehicleInfoIfNeeded(options: [String: Any]) {
+    let vehicleInfo = buildVehicleInfo(options: options)
+    _ = driveManager?.setVehicleInfo(vehicleInfo)
+  }
+
+  private func buildVehicleInfo(options: [String: Any]) -> AMapNaviVehicleInfo? {
+    let vehicleInfo = AMapNaviVehicleInfo()
+    var hasAnyValue = false
+
+    if let vehicleId = nonEmptyString(options["carNumber"]) {
+      vehicleInfo.vehicleId = vehicleId
+      hasAnyValue = true
+    }
+    if let restriction = boolValue(options["restriction"]) {
+      vehicleInfo.isETARestriction = restriction
+      hasAnyValue = true
+    }
+    if let type = intValue(options["carType"]) ?? intValue(options["type"]) {
+      vehicleInfo.type = type
+      hasAnyValue = true
+    }
+    if let motorcycleCC = intValue(options["motorcycleCC"]) {
+      vehicleInfo.motorcycleCC = motorcycleCC
+      hasAnyValue = true
+    }
+    if let size = intValue(options["size"]) ?? intValue(options["vehicleSize"]) {
+      vehicleInfo.size = size
+      hasAnyValue = true
+    }
+    if let width = doubleValue(options["width"]) ?? doubleValue(options["vehicleWidth"]) {
+      vehicleInfo.width = width
+      hasAnyValue = true
+    }
+    if let height = doubleValue(options["height"]) ?? doubleValue(options["vehicleHeight"]) {
+      vehicleInfo.height = height
+      hasAnyValue = true
+    }
+    if let length = doubleValue(options["length"]) ?? doubleValue(options["vehicleLength"]) {
+      vehicleInfo.length = length
+      hasAnyValue = true
+    }
+    if let load = doubleValue(options["load"]) ?? doubleValue(options["vehicleLoad"]) {
+      vehicleInfo.load = load
+      hasAnyValue = true
+    }
+    if let weight = doubleValue(options["weight"]) ?? doubleValue(options["vehicleWeight"]) {
+      vehicleInfo.weight = weight
+      hasAnyValue = true
+    }
+    if let axisNums = intValue(options["axis"]) ?? intValue(options["axisNums"]) ?? intValue(options["vehicleAxis"]) {
+      vehicleInfo.axisNums = axisNums
+      hasAnyValue = true
+    }
+    if let isLoadIgnore = boolValue(options["isLoadIgnore"]) {
+      vehicleInfo.isLoadIgnore = isLoadIgnore
+      hasAnyValue = true
+    }
+
+    return hasAnyValue ? vehicleInfo : nil
+  }
+
+  private func boolValue(_ raw: Any?) -> Bool? {
+    if let value = raw as? Bool { return value }
+    if let value = raw as? NSNumber { return value.boolValue }
+    if let value = raw as? String {
+      switch value.trimmingCharacters(in: .whitespacesAndNewlines).lowercased() {
+      case "true", "1", "yes":
+        return true
+      case "false", "0", "no":
+        return false
+      default:
+        return nil
+      }
+    }
+    return nil
+  }
+
+  private func intValue(_ raw: Any?) -> Int? {
+    if let value = raw as? Int { return value }
+    if let value = raw as? NSNumber { return value.intValue }
+    if let value = raw as? String { return Int(value) }
+    return nil
+  }
+
+  private func doubleValue(_ raw: Any?) -> Double? {
+    if let value = raw as? Double { return value }
+    if let value = raw as? Float { return Double(value) }
+    if let value = raw as? NSNumber { return value.doubleValue }
+    if let value = raw as? String { return Double(value) }
+    return nil
+  }
+
+  private func nonEmptyString(_ raw: Any?) -> String? {
+    guard let value = raw as? String else { return nil }
+    let trimmed = value.trimmingCharacters(in: .whitespacesAndNewlines)
+    return trimmed.isEmpty ? nil : trimmed
+  }
   
   // MARK: - 驾车路径规划
   
   func calculateDriveRoute(options: [String: Any], promise: Promise) {
     NSLog("DriveTruckRouteCalculator: 开始计算驾车路线")
+    bindDriveManagerDelegate()
     
     // 防重复调用检查
     if currentPromise != nil {
@@ -56,20 +189,19 @@ class DriveTruckRouteCalculator: NSObject {
     }
     
     // 解析途经点
-    var wayPoints: [AMapNaviPoint]? = nil
-    if let waypointsArray = options["waypoints"] as? [[String: Any]] {
-      wayPoints = waypointsArray.compactMap { Converters.parseNaviPoint($0) }
+    let wayPoints = Converters.parseWaypoints(options["waypoints"] as? [[String: Any]])
+    let wayPOIInfos = Converters.parseNaviPOIInfos(options["waypoints"] as? [[String: Any]])
+    let wayPointPOIIds = (options["waypoints"] as? [[String: Any]])?.compactMap { point in
+      nonEmptyString(point["poiId"]) ?? nonEmptyString(point["mid"])
     }
-    
-    // 解析策略 (0-20 对应 AMapNaviDrivingStrategy)
-    // 10-20 是多路径策略,0-9 是单路径策略
-    let strategyValue = (options["strategy"] as? Int) ?? 10 // 默认使用多路径策略
-    let strategy: AMapNaviDrivingStrategy = AMapNaviDrivingStrategy(rawValue: strategyValue) ?? AMapNaviDrivingStrategy.drivingStrategyMultipleDefault
-    
-    NSLog("DriveTruckRouteCalculator: 使用策略值: \(strategyValue), strategy: \(strategy.rawValue)")
-    
-    scene = "drive"
+
+    let strategy = resolveDrivingStrategy(options: options)
+
+    NSLog("DriveTruckRouteCalculator: 使用策略值: \(strategy.rawValue), strategy: \(strategy.rawValue)")
+
+    scene = resolveScene(options: options)
     currentPromise = promise
+    applyVehicleInfoIfNeeded(options: options)
     
     var success = false
     
@@ -81,20 +213,14 @@ class DriveTruckRouteCalculator: NSObject {
       success = driveManager?.calculateDriveRoute(
         withStartPointPOIId: fromMid,
         endPointPOIId: toMid,
-        wayPointsPOIId: nil,
+        wayPointsPOIId: wayPointPOIIds,
         drivingStrategy: strategy
       ) ?? false
     } else if let fromInfo = Converters.parseNaviPOIInfo(from),
               let toInfo = Converters.parseNaviPOIInfo(to) {
       // 使用 POIInfo 算路（支持起点角度）
       NSLog("DriveTruckRouteCalculator: 使用 POIInfo 算路")
-      
-      // 解析途经点 POIInfo
-      var wayPOIInfos: [AMapNaviPOIInfo]? = nil
-      if let waypointsArray = options["waypoints"] as? [[String: Any]] {
-        wayPOIInfos = waypointsArray.compactMap { Converters.parseNaviPOIInfo($0) }
-      }
-      
+
       // 官方方法：calculateDriveRouteWithStart:end:wayPOIInfos:drivingStrategy:
       success = driveManager?.calculateDriveRoute(
         withStart: fromInfo,
@@ -138,62 +264,11 @@ class DriveTruckRouteCalculator: NSObject {
   
   func calculateTruckRoute(options: [String: Any], promise: Promise) {
     NSLog("DriveTruckRouteCalculator: 开始计算货车路线")
-    
-    // 设置货车车辆信息
-    let vehicleInfo = AMapNaviVehicleInfo()
-    
-    // 车牌号
-    if let vehicleId = options["carNumber"] as? String {
-      vehicleInfo.vehicleId = vehicleId
-    }
-    
-    // 车辆类型：1/3/5 为货车
-    vehicleInfo.type = 1
-    
-    // 货车尺寸类型
-    if let size = options["size"] as? Int {
-      vehicleInfo.size = size
-    } else {
-      vehicleInfo.size = 4 // 默认
-    }
-    
-    // 货车宽度（米）
-    if let width = options["width"] as? Double {
-      vehicleInfo.width = width
-    }
-    
-    // 货车高度（米）
-    if let height = options["height"] as? Double {
-      vehicleInfo.height = height
-    }
-    
-    // 货车长度（米）
-    if let length = options["length"] as? Double {
-      vehicleInfo.length = length
-    }
-    
-    // 货车总重（吨）
-    if let load = options["load"] as? Double {
-      vehicleInfo.load = load
-    }
-    
-    // 货车核定载重（吨）
-    if let weight = options["weight"] as? Double {
-      vehicleInfo.weight = weight
-    }
-    
-    // 货车轴数
-    if let axisNums = options["axisNums"] as? Int {
-      vehicleInfo.axisNums = axisNums
+    var truckOptions = options
+    if truckOptions["carType"] == nil && truckOptions["type"] == nil {
+      truckOptions["carType"] = 1
     }
-    
-    // 设置车辆信息
-    driveManager?.setVehicleInfo(vehicleInfo)
-    
-    scene = "truck"
-    
-    // 复用驾车算路逻辑
-    calculateDriveRoute(options: options, promise: promise)
+    calculateDriveRoute(options: truckOptions, promise: promise)
   }
   
   func destroy() {
@@ -223,22 +298,24 @@ extension DriveTruckRouteCalculator: AMapNaviDriveManagerDelegate {
     if let naviRoutes = driveManager.naviRoutes {
       for (routeId, route) in naviRoutes {
         routes.append([
+          "id": routeId,
           "routeId": routeId,
           "distance": route.routeLength,
           "duration": route.routeTime,
           "tollCost": route.routeTollCost,
-          "strategy": scene == "truck" ? "货车路线" : getStrategyName(routeId: routeId as? Int ?? 0),
+          "strategy": routeTitle(routeId: routeId as? Int ?? 0),
           "polyline": extractCoordinates(from: route)
         ])
       }
     } else if let naviRoute = driveManager.naviRoute {
       // 单路线
       routes.append([
+        "id": 12,
         "routeId": 12,
         "distance": naviRoute.routeLength,
         "duration": naviRoute.routeTime,
         "tollCost": naviRoute.routeTollCost,
-        "strategy": scene == "truck" ? "货车路线" : "推荐路线",
+        "strategy": routeTitle(routeId: 12),
         "polyline": extractCoordinates(from: naviRoute)
       ])
     }
@@ -269,6 +346,17 @@ extension DriveTruckRouteCalculator: AMapNaviDriveManagerDelegate {
     default: return "路线\(routeId - 11)"
     }
   }
+
+  private func routeTitle(routeId: Int) -> String {
+    switch scene {
+    case "truck":
+      return "货车路线"
+    case "motorcycle":
+      return "摩托车路线"
+    default:
+      return getStrategyName(routeId: routeId)
+    }
+  }
   
   /// 提取路线坐标点
   private func extractCoordinates(from route: AMapNaviRoute) -> [[String: Double]] {

package/ios/routes/walkride/WalkRideRouteCalculator.swift

@@ -38,10 +38,84 @@ class WalkRideRouteCalculator: NSObject {
     eleBikeDelegateHandler?.calculator = self
     eleBikeManager?.delegate = eleBikeDelegateHandler
   }
+
+  private func bindWalkManagerDelegate() {
+    walkManager = AMapNaviWalkManager.sharedInstance()
+    walkManager?.delegate = self
+  }
+
+  private func bindRideManagerDelegate() {
+    rideManager = AMapNaviRideManager.sharedInstance()
+    rideManager?.delegate = self
+  }
+
+  private func bindEleBikeManagerDelegate() {
+    eleBikeManager = AMapNaviEleBikeManager.sharedInstance()
+    if eleBikeDelegateHandler == nil {
+      eleBikeDelegateHandler = EleBikeDelegateHandler()
+      eleBikeDelegateHandler?.calculator = self
+    }
+    eleBikeManager?.delegate = eleBikeDelegateHandler
+  }
+
+  private func boolValue(_ raw: Any?) -> Bool? {
+    if let value = raw as? Bool { return value }
+    if let value = raw as? NSNumber { return value.boolValue }
+    if let value = raw as? String {
+      switch value.trimmingCharacters(in: .whitespacesAndNewlines).lowercased() {
+      case "true", "1", "yes":
+        return true
+      case "false", "0", "no":
+        return false
+      default:
+        return nil
+      }
+    }
+    return nil
+  }
+
+  private func intValue(_ raw: Any?) -> Int? {
+    if let value = raw as? Int { return value }
+    if let value = raw as? NSNumber { return value.intValue }
+    if let value = raw as? String { return Int(value) }
+    return nil
+  }
+
+  private func shouldUsePOICalculation(options: [String: Any]) -> Bool {
+    if boolValue(options["usePoi"]) == true {
+      return true
+    }
+
+    let pointDictionaries = [
+      options["from"] as? [String: Any],
+      options["to"] as? [String: Any]
+    ]
+
+    return pointDictionaries.contains { point in
+      guard let point else {
+        return false
+      }
+      let name = (point["name"] as? String)?.trimmingCharacters(in: .whitespacesAndNewlines)
+      let poiId = (point["poiId"] as? String)?.trimmingCharacters(in: .whitespacesAndNewlines)
+      let mid = (point["mid"] as? String)?.trimmingCharacters(in: .whitespacesAndNewlines)
+      return !(name?.isEmpty ?? true) || !(poiId?.isEmpty ?? true) || !(mid?.isEmpty ?? true)
+    }
+  }
+
+  private func resolveTravelStrategy(options: [String: Any]) -> AMapNaviTravelStrategy {
+    if let raw = intValue(options["travelStrategy"]) {
+      return raw == 1001 ? .multipleDefault : .singleDefault
+    }
+    if boolValue(options["multiple"]) == true {
+      return .multipleDefault
+    }
+    return .singleDefault
+  }
   
   // MARK: - 步行路径规划
   
   func calculateWalkRoute(options: [String: Any], promise: Promise) {
+    bindWalkManagerDelegate()
     guard let from = options["from"] as? [String: Any],
           let to = options["to"] as? [String: Any] else {
       promise.reject("INVALID_PARAMS", "from and to are required")
@@ -76,6 +150,7 @@ class WalkRideRouteCalculator: NSObject {
   /// 骑行路线规划（坐标方式）
   /// 对应官方方法：calculateRideRouteWithStartPoint:endPoint:
   func calculateRideRoute(options: [String: Any], promise: Promise) {
+    bindRideManagerDelegate()
     guard let from = options["from"] as? [String: Any],
           let to = options["to"] as? [String: Any] else {
       promise.reject("INVALID_PARAMS", "from and to are required")
@@ -104,6 +179,7 @@ class WalkRideRouteCalculator: NSObject {
   /// 骑行路线规划（POIInfo方式，推荐）
   /// 对应官方方法：calculateRideRouteWithStartPOIInfo:endPOIInfo:strategy:
   func calculateRideRouteWithPOI(options: [String: Any], promise: Promise) {
+    bindRideManagerDelegate()
     guard let to = options["to"] as? [String: Any] else {
       promise.reject("INVALID_PARAMS", "to is required")
       return
@@ -138,6 +214,7 @@ class WalkRideRouteCalculator: NSObject {
   /// 电动车路线规划（坐标方式）
   /// 对应官方方法：calculateEleBikeRouteWithStartPoint:endPoint:
   func calculateEleBikeRoute(options: [String: Any], promise: Promise) {
+    bindEleBikeManagerDelegate()
     guard let from = options["from"] as? [String: Any],
           let to = options["to"] as? [String: Any] else {
       promise.reject("INVALID_PARAMS", "from and to are required")
@@ -166,6 +243,7 @@ class WalkRideRouteCalculator: NSObject {
   /// 电动车路线规划（POIInfo方式，推荐）
   /// 对应官方方法：calculateEleBikeRouteWithStartPOIInfo:endPOIInfo:strategy:
   func calculateEleBikeRouteWithPOI(options: [String: Any], promise: Promise) {
+    bindEleBikeManagerDelegate()
     guard let to = options["to"] as? [String: Any] else {
       promise.reject("INVALID_PARAMS", "to is required")
       return
@@ -184,7 +262,7 @@ class WalkRideRouteCalculator: NSObject {
       promise.reject("INVALID_PARAMS", "Invalid end POI info")
       return
     }
-    let strategy = AMapNaviTravelStrategy(rawValue: options["strategy"] as? Int ?? 0) ?? .multipleDefault
+    let strategy = resolveTravelStrategy(options: options)
     
     let success = eleBikeManager?.calculateEleBikeRoute(withStart: startPOIInfo, end: endPOIInfo, strategy: strategy) ?? false
     
@@ -193,6 +271,48 @@ class WalkRideRouteCalculator: NSObject {
       promise.reject("CALCULATE_FAILED", "电动车路线规划启动失败")
     }
   }
+
+  func calculateResolvedEleBikeRoute(options: [String: Any], promise: Promise) {
+    if shouldUsePOICalculation(options: options) {
+      calculateEleBikeRouteWithPOI(options: options, promise: promise)
+      return
+    }
+
+    bindEleBikeManagerDelegate()
+    guard let to = options["to"] as? [String: Any] else {
+      promise.reject("INVALID_PARAMS", "to is required")
+      return
+    }
+
+    scene = "eleBike"
+    currentPromise = promise
+
+    if let from = options["from"] as? [String: Any] {
+      guard let start = Converters.parseNaviPoint(from),
+            let end = Converters.parseNaviPoint(to) else {
+        currentPromise = nil
+        promise.reject("INVALID_COORDS", "Invalid coordinates")
+        return
+      }
+      let success = eleBikeManager?.calculateEleBikeRoute(withStart: start, end: end) ?? false
+      if !success {
+        currentPromise = nil
+        promise.reject("CALCULATE_FAILED", "电动车路线规划启动失败")
+      }
+      return
+    }
+
+    guard let end = Converters.parseNaviPoint(to) else {
+      currentPromise = nil
+      promise.reject("INVALID_COORDS", "Invalid coordinates")
+      return
+    }
+    let success = eleBikeManager?.calculateEleBikeRoute(withEnd: end) ?? false
+    if !success {
+      currentPromise = nil
+      promise.reject("CALCULATE_FAILED", "电动车路线规划启动失败")
+    }
+  }
   
   func destroy() {
     walkManager?.delegate = nil
@@ -225,6 +345,7 @@ extension WalkRideRouteCalculator: AMapNaviWalkManagerDelegate {
       NSLog("WalkRideRouteCalculator: 步行规划返回 \(naviRoutes.count) 条路线")
       for (routeId, route) in naviRoutes {
         routes.append([
+          "id": routeId,
           "routeId": routeId,
           "distance": route.routeLength,
           "duration": route.routeTime,
@@ -236,6 +357,7 @@ extension WalkRideRouteCalculator: AMapNaviWalkManagerDelegate {
       // 单路线
       NSLog("WalkRideRouteCalculator: 步行规划返回单条路线")
       routes.append([
+        "id": 12,
         "routeId": 12,
         "distance": naviRoute.routeLength,
         "duration": naviRoute.routeTime,
@@ -274,6 +396,7 @@ extension WalkRideRouteCalculator: AMapNaviRideManagerDelegate {
       NSLog("WalkRideRouteCalculator: 骑行规划返回 \(naviRoutes.count) 条路线")
       for (routeId, route) in naviRoutes {
         routes.append([
+          "id": routeId,
           "routeId": routeId,
           "distance": route.routeLength,
           "duration": route.routeTime,
@@ -285,6 +408,7 @@ extension WalkRideRouteCalculator: AMapNaviRideManagerDelegate {
       // 单路线
       NSLog("WalkRideRouteCalculator: 骑行规划返回单条路线")
       routes.append([
+        "id": 12,
         "routeId": 12,
         "distance": naviRoute.routeLength,
         "duration": naviRoute.routeTime,
@@ -336,6 +460,7 @@ extension WalkRideRouteCalculator {
       NSLog("WalkRideRouteCalculator: 电动车规划返回 \(naviRoutes.count) 条路线")
       for (routeId, route) in naviRoutes {
         routes.append([
+          "id": routeId,
           "routeId": routeId,
           "distance": route.routeLength,
           "duration": route.routeTime,
@@ -347,6 +472,7 @@ extension WalkRideRouteCalculator {
       // 单路线
       NSLog("WalkRideRouteCalculator: 电动车规划返回单条路线")
       routes.append([
+        "id": 12,
         "routeId": 12,
         "distance": naviRoute.routeLength,
         "duration": naviRoute.routeTime,