expo-gaode-map-navigation 1.1.5-next.1 → 1.1.5-next.3

package/ios/map/utils/LatLngParser.swift

@@ -0,0 +1,87 @@
+import CoreLocation
+
+/**
+ * 坐标解析工具类
+ * 支持解析多种格式的坐标：
+ * 1. Dictionary: ["latitude": 39.9, "longitude": 116.4]
+ * 2. Array: [116.4, 39.9] (longitude, latitude)
+ */
+public enum LatLngParser {
+    
+    /**
+     * 解析单个坐标点
+     */
+    public static func parseLatLng(_ data: Any?) -> CLLocationCoordinate2D? {
+        guard let data = data else { return nil }
+        
+        var coordinate: CLLocationCoordinate2D?
+        
+        if let dict = data as? [String: Any] {
+            let lat = (dict["latitude"] as? NSNumber)?.doubleValue
+            let lng = (dict["longitude"] as? NSNumber)?.doubleValue
+            if let lat = lat, let lng = lng {
+                coordinate = CLLocationCoordinate2D(latitude: lat, longitude: lng)
+            }
+        } else if let array = data as? [Any] {
+            if array.count >= 2 {
+                let lng = (array[0] as? NSNumber)?.doubleValue
+                let lat = (array[1] as? NSNumber)?.doubleValue
+                if let lat = lat, let lng = lng {
+                    coordinate = CLLocationCoordinate2D(latitude: lat, longitude: lng)
+                }
+            }
+        }
+        
+        // 验证坐标范围
+        if let coord = coordinate,
+           coord.latitude >= -90.0 && coord.latitude <= 90.0 &&
+           coord.longitude >= -180.0 && coord.longitude <= 180.0 {
+            return coord
+        }
+        
+        return nil
+    }
+
+    /**
+     * 解析坐标列表
+     * 支持扁平列表 [p1, p2, ...]
+     * 也支持嵌套列表 [[p1, p2], [p3, p4]] 并自动展平
+     */
+    public static func parseLatLngList(_ data: Any?) -> [CLLocationCoordinate2D] {
+        guard let array = data as? [Any] else { return [] }
+        
+        var result: [CLLocationCoordinate2D] = []
+        for item in array {
+            if let point = parseLatLng(item) {
+                result.append(point)
+            } else if let subArray = item as? [Any] {
+                // 如果不是点且是列表，递归解析并展平
+                result.append(contentsOf: parseLatLngList(subArray))
+            }
+        }
+        return result
+    }
+
+    /**
+     * 解析嵌套坐标列表 (例如用于多边形孔洞)
+     * 返回 [[CLLocationCoordinate2D]]
+     */
+    public static func parseLatLngListList(_ data: Any?) -> [[CLLocationCoordinate2D]] {
+        guard let array = data as? [Any], !array.isEmpty else { return [] }
+        
+        // 检查第一项。如果第一项能直接解析为点，说明这是一个平铺的列表 [p1, p2, ...]
+        if parseLatLng(array[0]) != nil {
+            return [parseLatLngList(array)]
+        }
+        
+        // 否则，它可能是一个嵌套列表 [[p1, p2], [p3, p4]]
+        var result: [[CLLocationCoordinate2D]] = []
+        for item in array {
+            let ring = parseLatLngList(item)
+            if !ring.isEmpty {
+                result.append(ring)
+            }
+        }
+        return result
+    }
+}

package/ios/map/utils/PermissionManager.swift

@@ -1,15 +1,40 @@
+#if os(iOS)
 import Foundation
 import CoreLocation
+import UIKit
 
 /**
  * 位置权限管理器
- * 
+ *
  * 负责:
- * - 请求位置权限
+ * - 请求位置权限（支持 iOS 17+ 新特性）
  * - 监听权限状态变化
  * - 返回权限结果
+ * - 提供权限诊断信息
  */
 class PermissionManager: NSObject, CLLocationManagerDelegate {
+    
+    // MARK: - iOS 版本检测
+    
+    /**
+     * 检查是否为 iOS 17+
+     */
+    static func isIOS17Plus() -> Bool {
+        if #available(iOS 17.0, *) {
+            return true
+        }
+        return false
+    }
+    
+    /**
+     * 检查是否为 iOS 14+（引入精确位置权限）
+     */
+    static func isIOS14Plus() -> Bool {
+        if #available(iOS 14.0, *) {
+            return true
+        }
+        return false
+    }
     /// 位置管理器实例
     private var locationManager: CLLocationManager?
     /// 权限请求回调
@@ -31,10 +56,22 @@ class PermissionManager: NSObject, CLLocationManagerDelegate {
                 self.locationManager?.delegate = self
             }
             
-            let currentStatus = CLLocationManager.authorizationStatus()
+            var currentStatus: CLAuthorizationStatus
+            if #available(iOS 14.0, *) {
+                currentStatus = self.locationManager?.authorizationStatus ?? .notDetermined
+            } else {
+                currentStatus = CLLocationManager.authorizationStatus()
+            }
             
             // 如果已经有权限,直接返回
-            if currentStatus == .authorizedAlways || currentStatus == .authorizedWhenInUse {
+            var hasPermission = false
+            if #available(iOS 8.0, *) {
+                hasPermission = currentStatus == .authorizedWhenInUse || currentStatus == .authorizedAlways
+            } else {
+                hasPermission = currentStatus == .authorizedAlways
+            }
+            
+            if hasPermission {
                 self.permissionCallback?(true, self.getAuthorizationStatusString(currentStatus))
                 self.permissionCallback = nil
                 return
@@ -75,7 +112,12 @@ class PermissionManager: NSObject, CLLocationManagerDelegate {
         }
         
         // 状态已确定(授予或拒绝),返回结果
-        let granted = status == .authorizedAlways || status == .authorizedWhenInUse
+        var granted = false
+        if #available(iOS 8.0, *) {
+            granted = status == .authorizedWhenInUse || status == .authorizedAlways
+        } else {
+            granted = status == .authorizedAlways
+        }
         let statusString = getAuthorizationStatusString(status)
         
         permissionCallback?(granted, statusString)
@@ -96,6 +138,92 @@ class PermissionManager: NSObject, CLLocationManagerDelegate {
         }
     }
     
+    // MARK: - iOS 17+ 新功能
+    
+    /**
+     * 检查是否有精确位置权限（iOS 14+）
+     */
+    func hasAccuracyAuthorization() -> Bool {
+        guard let manager = locationManager else { return true }
+        
+        if #available(iOS 14.0, *) {
+            return manager.accuracyAuthorization == .fullAccuracy
+        }
+        return true // iOS 14 以下默认为精确位置
+    }
+    
+    /**
+     * 请求临时精确位置权限（iOS 14+）
+     * @param purposeKey Info.plist 中配置的用途键
+     * @param callback 结果回调 (granted)
+     */
+    func requestTemporaryFullAccuracy(purposeKey: String, callback: @escaping (Bool) -> Void) {
+        guard let manager = locationManager else {
+            callback(false)
+            return
+        }
+        
+        if #available(iOS 14.0, *) {
+            manager.requestTemporaryFullAccuracyAuthorization(withPurposeKey: purposeKey) { error in
+                if error != nil {
+                    callback(false)
+                } else {
+                    let hasAccuracy = manager.accuracyAuthorization == .fullAccuracy
+                    callback(hasAccuracy)
+                }
+            }
+        } else {
+            // iOS 14 以下默认为精确位置
+            callback(true)
+        }
+    }
+    
+    // MARK: - 诊断信息
+    
+    /**
+     * 获取权限诊断信息
+     */
+    static func getDiagnosticInfo() -> [String: Any] {
+        var currentStatus: CLAuthorizationStatus
+        if #available(iOS 14.0, *) {
+            currentStatus = CLLocationManager().authorizationStatus
+        } else {
+            currentStatus = CLLocationManager.authorizationStatus()
+        }
+        let statusString = getStaticAuthorizationStatusString(currentStatus)
+        
+        var info: [String: Any] = [
+            "platform": "ios",
+            "systemVersion": UIDevice.current.systemVersion,
+            "isIOS17Plus": isIOS17Plus(),
+            "isIOS14Plus": isIOS14Plus(),
+            "currentStatus": statusString,
+            "granted": currentStatus == .authorizedAlways || currentStatus == .authorizedWhenInUse
+        ]
+        
+        // iOS 14+ 精确位置信息
+        if #available(iOS 14.0, *) {
+            let manager = CLLocationManager()
+            info["hasAccuracyAuthorization"] = manager.accuracyAuthorization == .fullAccuracy
+        }
+        
+        return info
+    }
+    
+    /**
+     * 静态方法：将权限状态转换为字符串
+     */
+    private static func getStaticAuthorizationStatusString(_ status: CLAuthorizationStatus) -> String {
+        switch status {
+        case .notDetermined: return "notDetermined"
+        case .restricted: return "restricted"
+        case .denied: return "denied"
+        case .authorizedAlways: return "authorizedAlways"
+        case .authorizedWhenInUse: return "authorizedWhenInUse"
+        @unknown default: return "unknown"
+        }
+    }
+    
     /**
      * 析构函数 - 清理资源
      */
@@ -104,4 +232,5 @@ class PermissionManager: NSObject, CLLocationManagerDelegate {
         locationManager = nil
         permissionCallback = nil
     }
-}
+}
+#endif

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-gaode-map-navigation",
-  "version": "1.1.5-next.1",
+  "version": "1.1.5-next.3",
   "description": "高德地图导航功能模块 - 路径规划、导航引导，独立版本包含完整地图功能",
   "author": "<TomWq> (https://github.com/TomWq)",
   "repository": "https://github.com/TomWq/expo-gaode-map",

package/build/map/ExpoGaodeMap.types.d.ts

@@ -1,41 +0,0 @@
-/**
- * 高德地图 Expo 模块类型定义
- *
- * 此文件定义了 Expo 模块专用的类型，包括事件类型等
- * 其他通用类型请从 './types' 导入
- */
-import type { Coordinates, ReGeocode } from './types';
-export * from './types';
-/**
- * Expo 模块事件类型
- * 定义了原生模块可以触发的事件
- */
-export type ExpoGaodeMapModuleEvents = {
-    /**
-     * 定位更新事件
-     * 当位置发生变化时触发
-     * @param location 位置信息，包含坐标和可选的逆地理编码信息
-     */
-    onLocationUpdate: (location: Coordinates | ReGeocode) => void;
-    /**
-     * 方向更新事件（iOS）
-     * 当设备方向发生变化时触发
-     * @param heading 方向信息
-     */
-    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;
-};

package/build/map/ExpoGaodeMap.types.js

@@ -1,24 +0,0 @@
-"use strict";
-/**
- * 高德地图 Expo 模块类型定义
- *
- * 此文件定义了 Expo 模块专用的类型，包括事件类型等
- * 其他通用类型请从 './types' 导入
- */
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-// 重新导出所有通用类型，方便使用
-__exportStar(require("./types"), exports);

package/build/map/utils/EventManager.d.ts

@@ -1,10 +0,0 @@
-/**
- * 通用事件管理器
- * 用于管理地图覆盖物的事件回调
- */
-export declare class EventManager<T extends Record<string, any>> {
-    private callbacks;
-    register(id: string, callbacks: T): void;
-    unregister(id: string): void;
-    trigger<K extends keyof T>(id: string, eventType: K, data?: any): void;
-}

package/build/map/utils/EventManager.js

@@ -1,26 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.EventManager = void 0;
-/**
- * 通用事件管理器
- * 用于管理地图覆盖物的事件回调
- */
-class EventManager {
-    constructor() {
-        this.callbacks = new Map();
-    }
-    register(id, callbacks) {
-        this.callbacks.set(id, callbacks);
-    }
-    unregister(id) {
-        this.callbacks.delete(id);
-    }
-    trigger(id, eventType, data) {
-        const callbacks = this.callbacks.get(id);
-        const callback = callbacks?.[eventType];
-        if (typeof callback === 'function') {
-            callback(data);
-        }
-    }
-}
-exports.EventManager = EventManager;

package/build/map/utils/ModuleLoader.d.ts

@@ -1,73 +0,0 @@
-/**
- * 模块检测器 - 用于检测可选模块是否已安装
- */
-/**
- * 可选模块名称常量
- */
-export declare const OptionalModules: {
-    readonly SEARCH: "expo-gaode-map-search";
-    readonly NAVIGATION: "expo-gaode-map-navigation";
-    readonly ROUTE: "expo-gaode-map-route";
-    readonly GEOCODER: "expo-gaode-map-geocoder";
-};
-/**
- * 延迟加载可选模块
- * 使用示例:
- *
- * @example
- * ```typescript
- * import { OptionalModules, lazyLoad } from 'expo-gaode-map';
- *
- * let SearchModule = null;
- *
- * function loadSearch() {
- *   if (SearchModule == null) {
- *     try {
- *       SearchModule = require('expo-gaode-map-search');
- *     } catch (error) {
- *       console.warn('搜索模块未安装');
- *       return null;
- *     }
- *   }
- *   return SearchModule;
- * }
- *
- * // 使用
- * const search = loadSearch();
- * if (search) {
- *   const results = await search.searchPOI({ keyword: '餐厅' });
- * }
- * ```
- */
-/**
- * 检查必需模块,如果未安装则抛出错误
- * @param moduleName 模块名称
- * @param featureName 功能名称(用于错误提示)
- */
-export declare function requireModule(moduleName: string, featureName: string): void;
-/**
- * 获取已安装的可选模块列表
- * 注意: 此函数无法在运行时准确检测,仅作为文档说明
- */
-export declare function getInstalledModules(): string[];
-/**
- * 打印已安装模块信息(用于调试)
- */
-export declare function printModuleInfo(): void;
-/**
- * 创建延迟加载器
- *
- * @example
- * ```typescript
- * import { createLazyLoader } from 'expo-gaode-map';
- *
- * const loadSearch = createLazyLoader(() => require('expo-gaode-map-search'));
- *
- * // 使用时
- * const SearchModule = loadSearch();
- * if (SearchModule) {
- *   const results = await SearchModule.searchPOI({ keyword: '餐厅' });
- * }
- * ```
- */
-export declare function createLazyLoader<T>(loader: () => T): () => T | null;

package/build/map/utils/ModuleLoader.js

@@ -1,112 +0,0 @@
-"use strict";
-/**
- * 模块检测器 - 用于检测可选模块是否已安装
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.OptionalModules = void 0;
-exports.requireModule = requireModule;
-exports.getInstalledModules = getInstalledModules;
-exports.printModuleInfo = printModuleInfo;
-exports.createLazyLoader = createLazyLoader;
-/**
- * 可选模块名称常量
- */
-exports.OptionalModules = {
-    SEARCH: 'expo-gaode-map-search',
-    NAVIGATION: 'expo-gaode-map-navigation',
-    ROUTE: 'expo-gaode-map-route',
-    GEOCODER: 'expo-gaode-map-geocoder',
-};
-/**
- * 延迟加载可选模块
- * 使用示例:
- *
- * @example
- * ```typescript
- * import { OptionalModules, lazyLoad } from 'expo-gaode-map';
- *
- * let SearchModule = null;
- *
- * function loadSearch() {
- *   if (SearchModule == null) {
- *     try {
- *       SearchModule = require('expo-gaode-map-search');
- *     } catch (error) {
- *       console.warn('搜索模块未安装');
- *       return null;
- *     }
- *   }
- *   return SearchModule;
- * }
- *
- * // 使用
- * const search = loadSearch();
- * if (search) {
- *   const results = await search.searchPOI({ keyword: '餐厅' });
- * }
- * ```
- */
-/**
- * 检查必需模块,如果未安装则抛出错误
- * @param moduleName 模块名称
- * @param featureName 功能名称(用于错误提示)
- */
-function requireModule(moduleName, featureName) {
-    console.warn(`[expo-gaode-map] 使用 ${featureName} 需要安装 ${moduleName}。\n` +
-        `请运行: npm install ${moduleName}\n` +
-        `然后使用 try-catch 包裹 require('${moduleName}') 来加载`);
-}
-/**
- * 获取已安装的可选模块列表
- * 注意: 此函数无法在运行时准确检测,仅作为文档说明
- */
-function getInstalledModules() {
-    console.warn('[expo-gaode-map] getInstalledModules() 无法在运行时检测。\n' +
-        '请在编译时检查 package.json 中安装的模块');
-    return [];
-}
-/**
- * 打印已安装模块信息(用于调试)
- */
-function printModuleInfo() {
-    console.log('[expo-gaode-map] 核心模块: 已加载');
-    console.log('[expo-gaode-map] 可选模块检测:');
-    console.log('  - 使用 try-catch 包裹 require() 来检测可选模块');
-    console.log('  - 可用的可选模块:');
-    Object.entries(exports.OptionalModules).forEach(([key, value]) => {
-        console.log(`    - ${key}: ${value}`);
-    });
-}
-/**
- * 创建延迟加载器
- *
- * @example
- * ```typescript
- * import { createLazyLoader } from 'expo-gaode-map';
- *
- * const loadSearch = createLazyLoader(() => require('expo-gaode-map-search'));
- *
- * // 使用时
- * const SearchModule = loadSearch();
- * if (SearchModule) {
- *   const results = await SearchModule.searchPOI({ keyword: '餐厅' });
- * }
- * ```
- */
-function createLazyLoader(loader) {
-    let cached = null;
-    let attempted = false;
-    return () => {
-        if (!attempted) {
-            attempted = true;
-            try {
-                cached = loader();
-            }
-            catch (error) {
-                console.warn('[expo-gaode-map] 模块加载失败:', error);
-                cached = null;
-            }
-        }
-        return cached;
-    };
-}