expo-gaode-map 2.2.3-next.1 → 2.2.3

package/ios/MapPreloadManager.swift

@@ -20,6 +20,24 @@ class MapPreloadManager {
 
     private init() {
         print("🔧 [MapPreload] 初始化预加载管理器")
+        
+        // 注册内存警告监听
+        NotificationCenter.default.addObserver(
+            self,
+            selector: #selector(handleMemoryWarning),
+            name: UIApplication.didReceiveMemoryWarningNotification,
+            object: nil
+        )
+    }
+    
+    /// 处理内存警告
+    @objc private func handleMemoryWarning() {
+        print("⚠️ [MapPreload] 收到内存警告，自动清理预加载池")
+        clearPool()
+    }
+    
+    deinit {
+        NotificationCenter.default.removeObserver(self)
     }
     
     /// 开始预加载地图实例
@@ -64,33 +82,45 @@ class MapPreloadManager {
     /// - Returns: 预加载的地图视图实例
     private func createPreloadedMapView() -> MAMapView {
         var mapView: MAMapView!
-        // 确保在主线程中创建 MAMapView
-        DispatchQueue.main.sync {
+        
+        // 检查是否已在主线程，避免死锁
+        if Thread.isMainThread {
             mapView = MAMapView()
-            
-            // 基础配置
-            mapView.mapType = .standard
-            mapView.showsUserLocation = false
-            mapView.showsCompass = false
-            mapView.showsScale = false
-            mapView.isZoomEnabled = true
-            mapView.isScrollEnabled = true
-            mapView.isRotateEnabled = true
-            
-            // 预加载中心区域（北京天安门）
-            let centerCoordinate = CLLocationCoordinate2D(latitude: 39.9042, longitude: 116.4074)
-            mapView.setCenter(centerCoordinate, animated: false)
-            mapView.setZoomLevel(12, animated: false)
-            
-            // 设置一个最小的 frame 以触发地图渲染
-            mapView.frame = CGRect(x: 0, y: 0, width: 1, height: 1)
-            
-            // 触发地图初始化
-            mapView.layoutIfNeeded()
+            configureMapView(mapView)
+        } else {
+            // 确保在主线程中创建 MAMapView
+            DispatchQueue.main.sync {
+                mapView = MAMapView()
+                self.configureMapView(mapView)
+            }
         }
         return mapView
     }
     
+    /// 配置地图视图的基础属性
+    /// - Parameter mapView: 需要配置的地图视图
+    private func configureMapView(_ mapView: MAMapView) {
+        // 基础配置
+        mapView.mapType = .standard
+        mapView.showsUserLocation = false
+        mapView.showsCompass = false
+        mapView.showsScale = false
+        mapView.isZoomEnabled = true
+        mapView.isScrollEnabled = true
+        mapView.isRotateEnabled = true
+        
+        // 预加载中心区域（北京天安门）
+        let centerCoordinate = CLLocationCoordinate2D(latitude: 39.9042, longitude: 116.4074)
+        mapView.setCenter(centerCoordinate, animated: false)
+        mapView.setZoomLevel(12, animated: false)
+        
+        // 设置一个最小的 frame 以触发地图渲染
+        mapView.frame = CGRect(x: 0, y: 0, width: 1, height: 1)
+        
+        // 触发地图初始化
+        mapView.layoutIfNeeded()
+    }
+    
     /// 获取一个预加载的地图实例
     /// - Returns: 预加载的地图视图，如果池为空则返回 nil
     func getPreloadedMapView() -> MAMapView? {

package/ios/managers/UIManager.swift

@@ -17,6 +17,9 @@ class UIManager: NSObject, MAMapViewDelegate {
     /// 定位变化回调
     var onLocationChanged: ((_ latitude: Double, _ longitude: Double, _ accuracy: Double) -> Void)?
     
+    /// 缓存的自定义样式配置
+    private var cachedCustomStyleOptions: MAMapCustomStyleOptions?
+    
     init(mapView: MAMapView) {
         self.mapView = mapView
         super.init()
@@ -36,6 +39,13 @@ class UIManager: NSObject, MAMapViewDelegate {
         case 3: mapView.mapType = .navi
         default: mapView.mapType = .standard
         }
+        
+        // 🔑 关键修复：切换地图类型后重新应用自定义样式
+        // 某些地图类型切换可能会重置样式设置
+        if let cachedOptions = cachedCustomStyleOptions {
+            mapView.setCustomMapStyleOptions(cachedOptions)
+            mapView.customMapStyleEnabled = true
+        }
     }
     
     // MARK: - 控件显示
@@ -109,7 +119,8 @@ class UIManager: NSObject, MAMapViewDelegate {
             }
             mapView.showsUserLocation = true
             if followUser {
-                mapView.userTrackingMode = .follow
+                // 🔑 使用 followWithHeading 模式以支持方向指示器
+                mapView.userTrackingMode = .followWithHeading
             } else {
                 mapView.userTrackingMode = .none
             }
@@ -146,6 +157,12 @@ class UIManager: NSObject, MAMapViewDelegate {
         guard let mapView = mapView else { return }
         let representation = MAUserLocationRepresentation()
         
+        // 是否显示定位蓝点 (showMyLocation) - 对应 Android 的 showMyLocation
+        // iOS 通过 mapView.showsUserLocation 控制，这里提供统一的 API
+        if let showMyLocation = config["showMyLocation"] as? Bool {
+            mapView.showsUserLocation = showMyLocation
+        }
+        
         // 精度圈是否显示
         if let showsAccuracyRing = config["showsAccuracyRing"] as? Bool {
             representation.showsAccuracyRing = showsAccuracyRing
@@ -265,4 +282,58 @@ class UIManager: NSObject, MAMapViewDelegate {
     func setShowsIndoorMap(_ show: Bool) {
         mapView?.isShowsIndoorMap = show
     }
+    
+    // MARK: - 自定义地图样式
+    
+    /**
+     * 设置自定义地图样式
+     * @param styleData 样式数据，支持以下格式：
+     *   - styleId: String - 在线样式ID（从高德开放平台获取）
+     *   - styleDataPath: String - 本地样式文件路径
+     *   - extraStyleDataPath: String - 额外样式文件路径（可选）
+     */
+    func setCustomMapStyle(_ styleData: [String: Any]) {
+        guard let mapView = mapView else { return }
+        
+        // 在线样式 ID
+        if let styleId = styleData["styleId"] as? String, !styleId.isEmpty {
+            let customStyle = MAMapCustomStyleOptions()
+            customStyle.styleId = styleId
+            
+            // 🔑 缓存样式配置
+            cachedCustomStyleOptions = customStyle
+            
+            mapView.setCustomMapStyleOptions(customStyle)
+            mapView.customMapStyleEnabled = true
+            return
+        }
+        
+        // 本地样式文件
+        if let styleDataPath = styleData["styleDataPath"] as? String, !styleDataPath.isEmpty {
+            // 读取样式文件数据
+            if let stylePath = Bundle.main.path(forResource: styleDataPath, ofType: nil),
+               let styleFileData = try? Data(contentsOf: URL(fileURLWithPath: stylePath)) {
+                let customStyle = MAMapCustomStyleOptions()
+                customStyle.styleData = styleFileData
+                
+                // 额外样式文件（可选）
+                if let extraPath = styleData["extraStyleDataPath"] as? String, !extraPath.isEmpty,
+                   let extraFilePath = Bundle.main.path(forResource: extraPath, ofType: nil),
+                   let extraFileData = try? Data(contentsOf: URL(fileURLWithPath: extraFilePath)) {
+                    customStyle.styleExtraData = extraFileData
+                }
+                
+                // 🔑 缓存样式配置
+                cachedCustomStyleOptions = customStyle
+                
+                mapView.setCustomMapStyleOptions(customStyle)
+                mapView.customMapStyleEnabled = true
+                return
+            }
+        }
+        
+        // 如果没有提供任何样式，禁用自定义样式并清除缓存
+        cachedCustomStyleOptions = nil
+        mapView.customMapStyleEnabled = false
+    }
 }

package/ios/modules/LocationManager.swift

@@ -11,128 +11,80 @@ import CoreLocation
  * - 方向传感器管理
  * - 定位结果回调
  */
+
 class LocationManager: NSObject, AMapLocationManagerDelegate {
-    /// 高德定位管理器实例
+
+    // 高德定位对象
     var locationManager: AMapLocationManager?
-    /// 定位是否已启动
+
+    // 连续定位是否已开启
     private var isLocationStarted = false
-    /// 定位更新回调
+
+    // 连续定位 event 回调（给 JS map listener 用）
     var onLocationUpdate: (([String: Any]) -> Void)?
-    /// 方向更新回调
     var onHeadingUpdate: (([String: Any]) -> Void)?
-    
+
     override init() {
         super.init()
         initLocationManager()
     }
-    
-    // MARK: - 定位控制
-    
-    /**
-     * 开始连续定位
-     */
+
+    // MARK: - 连续定位控制
+
     func start() {
         locationManager?.startUpdatingLocation()
         isLocationStarted = true
     }
-    
-    /**
-     * 停止定位
-     */
+
     func stop() {
         locationManager?.stopUpdatingLocation()
         isLocationStarted = false
     }
-    
-    /**
-     * 检查定位是否已启动
-     * @return 是否正在定位
-     */
+
     func isStarted() -> Bool {
         return isLocationStarted
     }
-    
-    // MARK: - 定位配置
-    
-    /**
-     * 设置是否返回逆地理信息
-     * @param isReGeocode 是否返回逆地理信息
-     */
+
+    // MARK: - 高德定位配置 API
+
     func setLocatingWithReGeocode(_ isReGeocode: Bool) {
         locationManager?.locatingWithReGeocode = isReGeocode
     }
-    
-    /**
-     * 设置定位距离过滤器(米)
-     * @param distance 最小距离变化才触发定位更新
-     */
+
     func setDistanceFilter(_ distance: Double) {
         locationManager?.distanceFilter = distance
     }
-    
-    /**
-     * 设置定位超时时间(秒)
-     * @param timeout 超时时间
-     */
+
     func setLocationTimeout(_ timeout: Int) {
         locationManager?.locationTimeout = timeout
     }
-    
-    /**
-     * 设置逆地理超时时间(秒)
-     * @param timeout 超时时间
-     */
+
     func setReGeocodeTimeout(_ timeout: Int) {
         locationManager?.reGeocodeTimeout = timeout
     }
-    
-    /**
-     * 设置定位精度
-     * @param accuracy 精度级别
-     *   - 0: 最适合导航
-     *   - 1: 最佳精度
-     *   - 2: 10米精度
-     *   - 3: 100米精度
-     *   - 4: 1公里精度
-     *   - 5: 3公里精度
-     */
+
     func setDesiredAccuracy(_ accuracy: Int) {
-        let accuracyValue: CLLocationAccuracy
+        let value: CLLocationAccuracy
         switch accuracy {
-        case 0: accuracyValue = kCLLocationAccuracyBestForNavigation
-        case 1: accuracyValue = kCLLocationAccuracyBest
-        case 2: accuracyValue = kCLLocationAccuracyNearestTenMeters
-        case 3: accuracyValue = kCLLocationAccuracyHundredMeters
-        case 4: accuracyValue = kCLLocationAccuracyKilometer
-        case 5: accuracyValue = kCLLocationAccuracyThreeKilometers
-        default: accuracyValue = kCLLocationAccuracyBest
+        case 0: value = kCLLocationAccuracyBestForNavigation
+        case 1: value = kCLLocationAccuracyBest
+        case 2: value = kCLLocationAccuracyNearestTenMeters
+        case 3: value = kCLLocationAccuracyHundredMeters
+        case 4: value = kCLLocationAccuracyKilometer
+        case 5: value = kCLLocationAccuracyThreeKilometers
+        default: value = kCLLocationAccuracyBest
         }
-        locationManager?.desiredAccuracy = accuracyValue
+        locationManager?.desiredAccuracy = value
     }
-    
-    /**
-     * 设置是否自动暂停定位更新
-     * @param pauses 是否自动暂停
-     */
+
     func setPausesLocationUpdatesAutomatically(_ pauses: Bool) {
         locationManager?.pausesLocationUpdatesAutomatically = pauses
     }
-    
-    /**
-     * 设置是否允许后台定位
-     * @param allows 是否允许后台定位
-     */
+
     func setAllowsBackgroundLocationUpdates(_ allows: Bool) {
         locationManager?.allowsBackgroundLocationUpdates = allows
     }
-    
-    /**
-     * 设置逆地理语言
-     * @param language 语言类型
-     *   - 0: 默认
-     *   - 1: 中文
-     *   - 2: 英文
-     */
+
     func setGeoLanguage(_ language: Int) {
         switch language {
         case 0: locationManager?.reGeocodeLanguage = .default
@@ -141,71 +93,41 @@ class LocationManager: NSObject, AMapLocationManagerDelegate {
         default: break
         }
     }
-    
-    // MARK: - 方向传感器
-    
-    /**
-     * 开始更新设备方向
-     */
+
+    // MARK: - 方向
+
     func startUpdatingHeading() {
         locationManager?.startUpdatingHeading()
     }
-    
-    /**
-     * 停止更新设备方向
-     */
+
     func stopUpdatingHeading() {
         locationManager?.stopUpdatingHeading()
     }
-    
-    // MARK: - 生命周期
-    
-    /**
-     * 销毁定位管理器
-     */
-    func destroy() {
-        locationManager?.stopUpdatingLocation()
-        locationManager?.stopUpdatingHeading()
-        locationManager?.delegate = nil
-        locationManager = nil
-        onLocationUpdate = nil
-        onHeadingUpdate = nil
-    }
-    
-    /**
-     * 初始化定位管理器
-     */
+
+    // MARK: - 初始化
+
     private func initLocationManager() {
         locationManager = AMapLocationManager()
         locationManager?.delegate = self
-        // 推荐配置：百米精度，快速定位
+
+        // 默认配置
         locationManager?.desiredAccuracy = kCLLocationAccuracyHundredMeters
         locationManager?.distanceFilter = 10
-        // 增加超时时间，避免首次授权时超时(首次定位建议10秒以上)
-        locationManager?.locationTimeout = 10  // 10秒超时
-        locationManager?.reGeocodeTimeout = 5   // 5秒超时
+        locationManager?.locationTimeout = 10
+        locationManager?.reGeocodeTimeout = 5
         locationManager?.locatingWithReGeocode = true
-        
-        // iOS 9 之前:防止后台被系统挂起(默认关闭,用户可通过 setPausesLocationUpdatesAutomatically 配置)
         locationManager?.pausesLocationUpdatesAutomatically = false
     }
-    
-    // MARK: - AMapLocationManagerDelegate
-    
-    /**
-     * 定位更新回调
-     * @param manager 定位管理器
-     * @param location 位置信息
-     * @param reGeocode 逆地理信息
-     */
-    func amapLocationManager(_ manager: AMapLocationManager!, didUpdate location: CLLocation!, reGeocode: AMapLocationReGeocode!) {
-        // 🔑 坐标验证：防止无效坐标
-        guard location.coordinate.latitude >= -90 && location.coordinate.latitude <= 90,
-              location.coordinate.longitude >= -180 && location.coordinate.longitude <= 180 else {
-            return
-        }
-        
-        var locationData: [String: Any] = [
+
+    // MARK: - Delegate（连续定位回调）
+
+    func amapLocationManager(_ manager: AMapLocationManager!,
+                             didUpdate location: CLLocation!,
+                             reGeocode: AMapLocationReGeocode!) {
+
+        guard let location = location else { return }
+
+        var data: [String: Any] = [
             "latitude": location.coordinate.latitude,
             "longitude": location.coordinate.longitude,
             "accuracy": location.horizontalAccuracy,
@@ -214,28 +136,23 @@ class LocationManager: NSObject, AMapLocationManagerDelegate {
             "speed": location.speed,
             "timestamp": location.timestamp.timeIntervalSince1970 * 1000
         ]
-        
-        // 添加逆地理信息
-        if let reGeocode = reGeocode {
-            locationData["address"] = reGeocode.formattedAddress
-            locationData["province"] = reGeocode.province
-            locationData["city"] = reGeocode.city
-            locationData["district"] = reGeocode.district
-            locationData["street"] = reGeocode.street
-            locationData["streetNumber"] = reGeocode.number
-            locationData["country"] = reGeocode.country
-            locationData["cityCode"] = reGeocode.citycode
-            locationData["adCode"] = reGeocode.adcode
+
+        if let geo = reGeocode {
+            data["address"] = geo.formattedAddress
+            data["province"] = geo.province
+            data["city"] = geo.city
+            data["district"] = geo.district
+            data["street"] = geo.street
+            data["streetNumber"] = geo.number
+            data["country"] = geo.country
+            data["cityCode"] = geo.citycode
+            data["adCode"] = geo.adcode
         }
-        
-        onLocationUpdate?(locationData)
+
+        // 触发连续定位回调
+        onLocationUpdate?(data)
     }
-    
-    /**
-     * 方向更新回调
-     * @param manager 定位管理器
-     * @param heading 方向信息
-     */
+
     func amapLocationManager(_ manager: AMapLocationManager!, didUpdate heading: CLHeading!) {
         let headingData: [String: Any] = [
             "heading": heading.trueHeading,
@@ -244,22 +161,18 @@ class LocationManager: NSObject, AMapLocationManagerDelegate {
         ]
         onHeadingUpdate?(headingData)
     }
-    
-    /**
-     * 需要定位权限回调
-     * @param manager 定位管理器
-     * @param locationManager 系统定位管理器
-     */
-    func amapLocationManager(_ manager: AMapLocationManager!, doRequireLocationAuth locationManager: CLLocationManager!) {
-        locationManager.requestAlwaysAuthorization()
-    }
-    
-    /**
-     * 定位失败回调
-     * @param manager 定位管理器
-     * @param error 错误信息
-     */
+
     func amapLocationManager(_ manager: AMapLocationManager!, didFailWithError error: Error!) {
-        // 定位失败 - 静默处理
+        // 定位失败 - 静默处理（连续定位会自动重试）
+    }
+
+    // MARK: - 销毁
+    func destroy() {
+        locationManager?.stopUpdatingLocation()
+        locationManager?.stopUpdatingHeading()
+        locationManager?.delegate = nil
+        locationManager = nil
+        onLocationUpdate = nil
+        onHeadingUpdate = nil
     }
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-gaode-map",
-  "version": "2.2.3-next.1",
+  "version": "2.2.3",
   "description": "一个功能完整的高德地图 React Native 组件库，基于 Expo Modules 开发，提供地图显示、定位、覆盖物等功能。",
   "main": "build/index.js",
   "types": "build/index.d.ts",

package/plugin/build/withGaodeMap.js

@@ -89,24 +89,35 @@ const withGaodeMapAndroidManifest = (config, props) => {
                 }
             });
         }
-        // 添加前台服务（如果启用后台定位）
+        // 添加高德定位服务（APSService）- 必需
         const mainApplication = androidManifest.application?.[0];
-        if (mainApplication && props.enableBackgroundLocation) {
+        if (mainApplication) {
             if (!mainApplication['service']) {
                 mainApplication['service'] = [];
             }
-            // 检查是否已存在 LocationForegroundService
-            const hasService = mainApplication['service'].some((item) => item.$?.['android:name'] === 'expo.modules.gaodemap.services.LocationForegroundService');
-            if (!hasService) {
+            // 1. 添加高德定位服务 APSService（必需）
+            const hasAPSService = mainApplication['service'].some((item) => item.$?.['android:name'] === 'com.amap.api.location.APSService');
+            if (!hasAPSService) {
                 mainApplication['service'].push({
                     $: {
-                        'android:name': 'expo.modules.gaodemap.services.LocationForegroundService',
-                        'android:enabled': 'true',
-                        'android:exported': 'false',
-                        'android:foregroundServiceType': 'location',
+                        'android:name': 'com.amap.api.location.APSService',
                     },
                 });
             }
+            // 2. 添加前台服务（如果启用后台定位）
+            if (props.enableBackgroundLocation) {
+                const hasLocationService = mainApplication['service'].some((item) => item.$?.['android:name'] === 'expo.modules.gaodemap.services.LocationForegroundService');
+                if (!hasLocationService) {
+                    mainApplication['service'].push({
+                        $: {
+                            'android:name': 'expo.modules.gaodemap.services.LocationForegroundService',
+                            'android:enabled': 'true',
+                            'android:exported': 'false',
+                            'android:foregroundServiceType': 'location',
+                        },
+                    });
+                }
+            }
         }
         // 添加 API Key 到 application 标签
         if (mainApplication && props.androidApiKey) {

package/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.values.s

@@ -1 +0,0 @@
-�
ޞ
ޞ
ޞ
ޞ
ޞ
ޞ

package/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.values.s

@@ -1 +0,0 @@
-Ɩ
��
�
ӄ
�
��