expo-gaode-map 2.2.31 → 2.2.32

package/README.md

@@ -252,4 +252,4 @@ MIT
 - 📝 提交 [GitHub Issue](https://github.com/TomWq/expo-gaode-map/issues)
 - 💬 参与 [Discussions](https://github.com/TomWq/expo-gaode-map/discussions)
 - ⭐ 给项目点个 Star 支持一下
-- 群：952241387 （欢迎加入，交流使用经验、问题反馈等）
+- QQ：582752848 

package/ios/ExpoGaodeMapModule.swift

@@ -179,7 +179,7 @@ public class ExpoGaodeMapModule: Module {
             
             if status == .authorizedAlways || status == .authorizedWhenInUse {
                 let manager = self.getLocationManager()
-                manager.locationManager?.requestLocation(withReGeocode: manager.locationManager?.locatingWithReGeocode ?? true, completionBlock: { location, regeocode, error in
+                manager.requestSingleLocation { location, regeocode, error in
                     if let error = error {
                         promise.reject("LOCATION_ERROR", error.localizedDescription)
                         return
@@ -214,7 +214,7 @@ public class ExpoGaodeMapModule: Module {
                     }
                     
                     promise.resolve(locationData)
-                })
+                }
             } else {
                 promise.reject("LOCATION_ERROR", "location unauthorized")
             }
@@ -699,8 +699,13 @@ public class ExpoGaodeMapModule: Module {
             if self.permissionManager == nil {
                 self.permissionManager = PermissionManager()
             }
-            
-            self.permissionManager?.requestPermission { granted, status in
+
+            guard let permissionManager = self.permissionManager else {
+                promise.reject("PERMISSION_MANAGER_INIT_FAILED", "权限管理器初始化失败")
+                return
+            }
+
+            permissionManager.requestPermission { _, _ in
                 // 无论结果如何,都延迟后再次检查最终状态
                 DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
                     let finalStatus = self.currentAuthorizationStatus()

package/ios/ExpoGaodeMapView.swift

@@ -96,6 +96,8 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate, UIGestureRecognizerDelegate
     private var uiManager: UIManager!
     /// 地图是否已加载完成
     private var isMapLoaded = false
+    /// 初始相机是否已应用（仅应用一次，避免与运行时相机控制冲突）
+    private var hasAppliedInitialCameraPosition = false
     /// 是否正在处理 annotation 选择事件
     private var isHandlingAnnotationSelect = false
     /// MarkerView 的隐藏容器（用于渲染 children）
@@ -380,9 +382,10 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate, UIGestureRecognizerDelegate
 
         uiManager.setMapType(mapType)
         
-        // 如果有初始位置，设置相机位置
-        if let position = initialCameraPosition {
+        // initialCameraPosition 只应用一次，避免每次 props 更新重置相机导致操作延迟感
+        if !hasAppliedInitialCameraPosition, let position = initialCameraPosition {
             cameraManager.setInitialCameraPosition(position)
+            hasAppliedInitialCameraPosition = true
         }
         
         uiManager.setShowsScale(showsScale)
@@ -856,6 +859,8 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate, UIGestureRecognizerDelegate
 
         mapView = resolvedMapView
         super.addSubview(resolvedMapView)
+        isMapLoaded = false
+        hasAppliedInitialCameraPosition = false
 
         cameraManager = CameraManager(mapView: resolvedMapView)
         uiManager = UIManager(mapView: resolvedMapView)
@@ -921,6 +926,12 @@ extension ExpoGaodeMapView {
     public func mapViewDidFinishLoadingMap(_ mapView: MAMapView) {
         guard !isMapLoaded else { return }
         isMapLoaded = true
+
+        // 兜底：若初始化阶段尚未生效，在加载完成后应用一次初始相机
+        if !hasAppliedInitialCameraPosition, let position = initialCameraPosition {
+            cameraManager?.setInitialCameraPosition(position)
+            hasAppliedInitialCameraPosition = true
+        }
         
         // 地图加载完成后，应用自定义样式
         if let styleData = customMapStyleData {

package/ios/modules/LocationManager.swift

@@ -122,6 +122,23 @@ class LocationManager: NSObject, AMapLocationManagerDelegate {
         ensureLocationManager()?.stopUpdatingHeading()
     }
 
+    func requestSingleLocation(completion: @escaping (_ location: CLLocation?, _ reGeocode: AMapLocationReGeocode?, _ error: Error?) -> Void) {
+        guard let manager = ensureLocationManager() else {
+            let error = NSError(
+                domain: "ExpoGaodeMap",
+                code: -1,
+                userInfo: [NSLocalizedDescriptionKey: "定位管理器未初始化，请先完成隐私协议确认"]
+            )
+            completion(nil, nil, error)
+            return
+        }
+
+        manager.requestLocation(
+            withReGeocode: manager.locatingWithReGeocode,
+            completionBlock: completion
+        )
+    }
+
     // MARK: - 初始化
 
     @discardableResult

package/ios/utils/PermissionManager.swift

@@ -48,17 +48,22 @@ class PermissionManager: NSObject, CLLocationManagerDelegate {
         self.permissionCallback = callback
         
         // 确保在主线程操作
-        DispatchQueue.main.async { [weak self] in
-            guard let self = self else { return }
-            
+        DispatchQueue.main.async {
             if self.locationManager == nil {
                 self.locationManager = CLLocationManager()
-                self.locationManager?.delegate = self
             }
+
+            guard let locationManager = self.locationManager else {
+                self.permissionCallback?(false, "unknown")
+                self.permissionCallback = nil
+                return
+            }
+
+            locationManager.delegate = self
             
             var currentStatus: CLAuthorizationStatus
             if #available(iOS 14.0, *) {
-                currentStatus = self.locationManager?.authorizationStatus ?? .notDetermined
+                currentStatus = locationManager.authorizationStatus
             } else {
                 currentStatus = CLLocationManager.authorizationStatus()
             }
@@ -84,7 +89,7 @@ class PermissionManager: NSObject, CLLocationManagerDelegate {
                 return
             }
             
-            self.locationManager?.requestWhenInUseAuthorization()
+            locationManager.requestWhenInUseAuthorization()
         }
     }
     

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-gaode-map",
-  "version": "2.2.31",
+  "version": "2.2.32",
   "description": "A full-featured React Native AMap (Gaode Map) library for Expo, including map display, location, overlays, offline maps, and geometry utilities.",
   "main": "build/index.js",
   "types": "build/index.d.ts",