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

package/ios/map/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）
@@ -496,9 +498,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)
@@ -969,6 +972,8 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate, UIGestureRecognizerDelegate
 
         mapView = resolvedMapView
         super.addSubview(resolvedMapView)
+        isMapLoaded = false
+        hasAppliedInitialCameraPosition = false
 
         cameraManager = CameraManager(mapView: resolvedMapView)
         uiManager = UIManager(mapView: resolvedMapView)
@@ -1026,6 +1031,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 {
@@ -1443,17 +1454,24 @@ extension ExpoGaodeMapView {
         isHandlingAnnotationSelect = true
         
         // 🔑 统一从 overlayViews 查找 MarkerView（新旧架构统一）
-        for view in overlayViews {
-            if let markerView = view as? MarkerView {
+        for overlayView in overlayViews {
+            if let markerView = overlayView as? MarkerView {
                 if markerView.annotation === annotation {
                     let eventData: [String: Any] = [
                         "latitude": annotation.coordinate.latitude,
                         "longitude": annotation.coordinate.longitude
                     ]
                     markerView.onMarkerPress(eventData)
+                    // iOS 对“已选中 annotation”再次点击通常不会重复触发 didSelect。
+                    // 对自定义 children marker（无系统 callout）这里主动取消选中，
+                    // 以保证同一 marker 可以连续触发点击（例如关闭 sheet 后再次点击）。
+                    if !markerView.subviews.isEmpty {
+                        mapView.deselectAnnotation(annotation, animated: false)
+                        isHandlingAnnotationSelect = false
+                    }
                     return
                 }
-            } else if let clusterView = view as? ClusterView {
+            } else if let clusterView = overlayView as? ClusterView {
                 if clusterView.containsAnnotation(annotation) {
                     clusterView.handleAnnotationTap(annotation)
                     return

package/ios/map/GaodeMapPrivacyManager.swift

@@ -46,24 +46,6 @@ enum GaodeMapPrivacyManager {
         applyPrivacyState()
     }
 
-    static func setPrivacyShow(_ show: Bool, hasContainsPrivacy: Bool) {
-        let previousStatus = status()
-        hasShow = show
-        self.hasContainsPrivacy = hasContainsPrivacy
-        persistState()
-        applyPrivacyState()
-        notifyIfNeeded(previousStatus: previousStatus)
-    }
-
-    static func setPrivacyAgree(_ agree: Bool) {
-        let previousStatus = status()
-        hasAgree = agree
-        agreedPrivacyVersion = agree ? privacyVersion : nil
-        persistState()
-        applyPrivacyState()
-        notifyIfNeeded(previousStatus: previousStatus)
-    }
-
     static func setPrivacyVersion(_ version: String) {
         let previousStatus = status()
         privacyVersion = version.trimmingCharacters(in: .whitespacesAndNewlines)
@@ -83,6 +65,32 @@ enum GaodeMapPrivacyManager {
         notifyIfNeeded(previousStatus: previousStatus)
     }
 
+    static func setPrivacyConfig(
+        hasShow: Bool,
+        hasContainsPrivacy: Bool,
+        hasAgree: Bool,
+        privacyVersion newPrivacyVersion: String?,
+        updatesPrivacyVersion: Bool
+    ) {
+        let previousStatus = status()
+
+        if updatesPrivacyVersion {
+            privacyVersion = newPrivacyVersion?.trimmingCharacters(in: .whitespacesAndNewlines)
+            if privacyVersion?.isEmpty == true {
+                privacyVersion = nil
+            }
+        }
+
+        self.hasShow = hasShow
+        self.hasContainsPrivacy = hasContainsPrivacy
+        self.hasAgree = hasAgree
+        agreedPrivacyVersion = hasAgree ? privacyVersion : nil
+
+        persistState()
+        applyPrivacyState()
+        notifyIfNeeded(previousStatus: previousStatus)
+    }
+
     static func resetPrivacyConsent() {
         let previousStatus = status()
         clearConsentPersistedState(keepCurrentVersion: false)

package/ios/map/cpp/GeometryEngine.cpp

@@ -3,6 +3,7 @@
 #include <cmath>
 #include <map>
 #include <algorithm>
+#include <limits>
 
 namespace gaodemap {
 
@@ -19,6 +20,54 @@ static inline double geo_toDegrees(double radians) {
     return radians * kRadiansToDegrees;
 }
 
+static inline double clampMercatorLatitude(double lat) {
+    static constexpr double kMaxMercatorLatitude = 85.05112878;
+    if (lat > kMaxMercatorLatitude) return kMaxMercatorLatitude;
+    if (lat < -kMaxMercatorLatitude) return -kMaxMercatorLatitude;
+    return lat;
+}
+
+static inline double mercatorX01(double lon) {
+    double wrapped = std::fmod(lon + 180.0, 360.0);
+    if (wrapped < 0.0) {
+        wrapped += 360.0;
+    }
+    return wrapped / 360.0;
+}
+
+static inline double mercatorY01(double lat) {
+    const double clampedLat = clampMercatorLatitude(lat);
+    const double latRad = geo_toRadians(clampedLat);
+    const double y = (1.0 - std::asinh(std::tan(latRad)) / kPi) * 0.5;
+    if (y < 0.0) return 0.0;
+    if (y > 1.0) return 1.0;
+    return y;
+}
+
+static double wrappedSpan01(std::vector<double> xs) {
+    if (xs.size() <= 1) {
+        return 0.0;
+    }
+
+    std::sort(xs.begin(), xs.end());
+    double maxGap = 0.0;
+
+    for (size_t i = 0; i + 1 < xs.size(); ++i) {
+        const double gap = xs[i + 1] - xs[i];
+        if (gap > maxGap) {
+            maxGap = gap;
+        }
+    }
+
+    const double endGap = xs.front() + 1.0 - xs.back();
+    if (endGap > maxGap) {
+        maxGap = endGap;
+    }
+
+    const double span = 1.0 - maxGap;
+    return span < 0.0 ? 0.0 : span;
+}
+
 double calculateDistance(double lat1, double lon1, double lat2, double lon2) {
     const double radLat1 = geo_toRadians(lat1);
     const double radLat2 = geo_toRadians(lat2);
@@ -512,6 +561,69 @@ GeoPoint pixelToLatLng(double x, double y, int zoom) {
     return {lat, lon};
 }
 
+double calculateFitZoomForPoints(
+    const std::vector<GeoPoint>& points,
+    double viewportWidthPx,
+    double viewportHeightPx,
+    double paddingPx,
+    int minZoom,
+    int maxZoom
+) {
+    if (minZoom > maxZoom) {
+        std::swap(minZoom, maxZoom);
+    }
+    if (points.empty()) {
+        return static_cast<double>(minZoom);
+    }
+    if (points.size() == 1) {
+        return static_cast<double>(maxZoom);
+    }
+
+    const double safeViewportWidth = viewportWidthPx > 1.0 ? viewportWidthPx : 390.0;
+    const double safeViewportHeight = viewportHeightPx > 1.0 ? viewportHeightPx : 844.0;
+    const double safePadding = std::max(0.0, paddingPx);
+    const double availableWidth = std::max(1.0, safeViewportWidth - safePadding * 2.0);
+    const double availableHeight = std::max(1.0, safeViewportHeight - safePadding * 2.0);
+
+    std::vector<double> projectedXs;
+    projectedXs.reserve(points.size());
+
+    double minY = std::numeric_limits<double>::max();
+    double maxY = -std::numeric_limits<double>::max();
+
+    for (const auto& p : points) {
+        projectedXs.push_back(mercatorX01(p.lon));
+        const double y = mercatorY01(p.lat);
+        if (y < minY) minY = y;
+        if (y > maxY) maxY = y;
+    }
+
+    const double spanX = wrappedSpan01(projectedXs);
+    const double spanY = std::max(0.0, maxY - minY);
+    static constexpr double kTileSize = 256.0;
+    static constexpr double kSpanEpsilon = 1e-12;
+
+    const double zoomX = spanX <= kSpanEpsilon
+        ? static_cast<double>(maxZoom)
+        : std::log2(availableWidth / (kTileSize * spanX));
+    const double zoomY = spanY <= kSpanEpsilon
+        ? static_cast<double>(maxZoom)
+        : std::log2(availableHeight / (kTileSize * spanY));
+
+    double fitZoom = std::min(zoomX, zoomY);
+    if (!std::isfinite(fitZoom)) {
+        fitZoom = static_cast<double>(minZoom);
+    }
+
+    if (fitZoom < static_cast<double>(minZoom)) {
+        fitZoom = static_cast<double>(minZoom);
+    } else if (fitZoom > static_cast<double>(maxZoom)) {
+        fitZoom = static_cast<double>(maxZoom);
+    }
+
+    return fitZoom;
+}
+
 // --- 批量地理围栏与热力图 ---
 
 int findPointInPolygons(double pointLat, double pointLon, const std::vector<std::vector<GeoPoint>>& polygons) {

package/ios/map/cpp/GeometryEngine.hpp

@@ -125,6 +125,27 @@ PixelResult latLngToPixel(double lat, double lon, int zoom);
  */
 GeoPoint pixelToLatLng(double x, double y, int zoom);
 
+/**
+ * 根据一组坐标点和视口尺寸计算“可同时看到所有点”的推荐缩放级别。
+ * 使用 Web Mercator 投影，在跨经线场景下会自动取更小经度跨度。
+ *
+ * @param points 坐标点集合，至少 1 个
+ * @param viewportWidthPx 视口宽度（像素）
+ * @param viewportHeightPx 视口高度（像素）
+ * @param paddingPx 四周预留的内边距（像素）
+ * @param minZoom 最小缩放级别
+ * @param maxZoom 最大缩放级别
+ * @return 推荐 zoom（已在 [minZoom, maxZoom] 范围内）
+ */
+double calculateFitZoomForPoints(
+    const std::vector<GeoPoint>& points,
+    double viewportWidthPx,
+    double viewportHeightPx,
+    double paddingPx,
+    int minZoom,
+    int maxZoom
+);
+
 // --- 批量地理围栏与热力图 ---
 
 /**

package/ios/map/modules/LocationManager.swift

@@ -90,14 +90,29 @@ class LocationManager: NSObject, AMapLocationManagerDelegate {
                 return
             }
         }
-        ensureLocationManager()?.allowsBackgroundLocationUpdates = allows
+        guard let manager = ensureLocationManager() else {
+            return
+        }
+        manager.allowsBackgroundLocationUpdates = allows
+        if #available(iOS 11.0, *) {
+            let indicatorSelector = NSSelectorFromString("setShowsBackgroundLocationIndicator:")
+            if manager.responds(to: indicatorSelector) {
+                manager.setValue(allows, forKey: "showsBackgroundLocationIndicator")
+            }
+        }
+    }
+
+    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
         }
     }
@@ -112,6 +127,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
@@ -199,7 +231,7 @@ class LocationManager: NSObject, AMapLocationManagerDelegate {
      */
     func coordinateConvert(_ coordinate: [String: Double], type: Int, promise: Promise) {
         guard GaodeMapPrivacyManager.isReady else {
-            promise.reject("PRIVACY_NOT_AGREED", "隐私协议未完成确认，请先调用 setPrivacyShow/setPrivacyAgree")
+            promise.reject("PRIVACY_NOT_AGREED", "隐私协议未完成确认，请先调用 setPrivacyConfig")
             return
         }
 

package/ios/map/overlays/MarkerView.swift

@@ -37,9 +37,9 @@ class MarkerView: ExpoView {
     /// 图标高度（用于自定义图标 icon 属性）
     var iconHeight: Double = 40
     /// 自定义视图宽度（用于 children 属性）
-    var customViewWidth: Double = 0
+    var contentWidth: Double = 0
     /// 自定义视图高度（用于 children 属性）
-    var customViewHeight: Double = 0
+    var contentHeight: Double = 0
     /// 中心偏移
     var centerOffset: [String: Double]?
     /// 是否显示动画
@@ -585,9 +585,9 @@ class MarkerView: ExpoView {
             return defaultSize
         }
 
-        if customViewWidth > 0 || customViewHeight > 0 {
-            let width = customViewWidth > 0 ? CGFloat(customViewWidth) : defaultSize.width
-            let height = customViewHeight > 0 ? CGFloat(customViewHeight) : defaultSize.height
+        if contentWidth > 0 || contentHeight > 0 {
+            let width = contentWidth > 0 ? CGFloat(contentWidth) : defaultSize.width
+            let height = contentHeight > 0 ? CGFloat(contentHeight) : defaultSize.height
             return CGSize(width: width, height: height)
         }
 
@@ -1000,17 +1000,17 @@ class MarkerView: ExpoView {
         }
     }
 
-    func setCustomViewWidth(_ width: Double) {
-        guard customViewWidth != width else { return }
-        customViewWidth = width
+    func setContentWidth(_ width: Double) {
+        guard contentWidth != width else { return }
+        contentWidth = width
         if !subviews.isEmpty {
             refreshAnnotationAppearance(invalidateChildrenCache: true)
         }
     }
 
-    func setCustomViewHeight(_ height: Double) {
-        guard customViewHeight != height else { return }
-        customViewHeight = height
+    func setContentHeight(_ height: Double) {
+        guard contentHeight != height else { return }
+        contentHeight = height
         if !subviews.isEmpty {
             refreshAnnotationAppearance(invalidateChildrenCache: true)
         }

package/ios/map/overlays/MarkerViewModule.swift

@@ -41,12 +41,12 @@ public class MarkerViewModule: Module {
                 view.iconHeight = height
             }
             
-            Prop("customViewWidth") { (view: MarkerView, width: Double) in
-                view.customViewWidth = width
+            Prop("contentWidth") { (view: MarkerView, width: Double) in
+                view.setContentWidth(width)
             }
             
-            Prop("customViewHeight") { (view: MarkerView, height: Double) in
-                view.customViewHeight = height
+            Prop("contentHeight") { (view: MarkerView, height: Double) in
+                view.setContentHeight(height)
             }
             
             Prop("centerOffset") { (view: MarkerView, offset: [String: Double]) in

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/ios/map/utils/ClusterNative.h

@@ -55,6 +55,14 @@ NS_ASSUME_NONNULL_BEGIN
 + (NSDictionary * _Nullable)calculatePathBoundsWithLatitudes:(NSArray<NSNumber *> *)latitudes
                                                 longitudes:(NSArray<NSNumber *> *)longitudes NS_SWIFT_NAME(calculatePathBounds(latitudes:longitudes:));
 
++ (double)calculateFitZoomWithLatitudes:(NSArray<NSNumber *> *)latitudes
+                             longitudes:(NSArray<NSNumber *> *)longitudes
+                        viewportWidthPx:(double)viewportWidthPx
+                       viewportHeightPx:(double)viewportHeightPx
+                               paddingPx:(double)paddingPx
+                                 minZoom:(int)minZoom
+                                 maxZoom:(int)maxZoom NS_SWIFT_NAME(calculateFitZoom(latitudes:longitudes:viewportWidthPx:viewportHeightPx:paddingPx:minZoom:maxZoom:));
+
 + (NSString *)encodeGeoHashWithLat:(double)lat
                                lon:(double)lon
                          precision:(int)precision NS_SWIFT_NAME(encodeGeoHash(lat:lon:precision:));

package/ios/map/utils/ClusterNative.mm

@@ -242,6 +242,33 @@
     };
 }
 
++ (double)calculateFitZoomWithLatitudes:(NSArray<NSNumber *> *)latitudes
+                              longitudes:(NSArray<NSNumber *> *)longitudes
+                         viewportWidthPx:(double)viewportWidthPx
+                        viewportHeightPx:(double)viewportHeightPx
+                                paddingPx:(double)paddingPx
+                                  minZoom:(int)minZoom
+                                  maxZoom:(int)maxZoom {
+    if (latitudes.count == 0 || latitudes.count != longitudes.count) {
+        return (double)minZoom;
+    }
+
+    std::vector<gaodemap::GeoPoint> points;
+    points.reserve(latitudes.count);
+    for (NSUInteger i = 0; i < latitudes.count; i++) {
+        points.push_back({[latitudes[i] doubleValue], [longitudes[i] doubleValue]});
+    }
+
+    return gaodemap::calculateFitZoomForPoints(
+        points,
+        viewportWidthPx,
+        viewportHeightPx,
+        paddingPx,
+        minZoom,
+        maxZoom
+    );
+}
+
 + (NSString *)encodeGeoHashWithLat:(double)lat
                                lon:(double)lon
                          precision:(int)precision {

package/ios/map/utils/PermissionManager.swift

@@ -39,6 +39,39 @@ class PermissionManager: NSObject, CLLocationManagerDelegate {
     private var locationManager: CLLocationManager?
     /// 权限请求回调
     private var permissionCallback: ((Bool, String) -> Void)?
+    /// 后台（始终）权限请求回调
+    private var backgroundPermissionCallback: ((Bool, String) -> Void)?
+    /// 在 notDetermined 状态下，先申请前台权限，再升级为始终权限
+    private var pendingAlwaysAuthorizationUpgrade = false
+
+    private func resolveBackgroundPermissionIfNeeded(_ status: CLAuthorizationStatus) {
+        guard let backgroundPermissionCallback else {
+            return
+        }
+        let backgroundGranted = status == .authorizedAlways
+        backgroundPermissionCallback(backgroundGranted, getAuthorizationStatusString(status))
+        self.backgroundPermissionCallback = nil
+    }
+
+    private func scheduleAlwaysAuthorizationFallback(_ manager: CLLocationManager) {
+        DispatchQueue.main.asyncAfter(deadline: .now() + 1.2) { [weak self] in
+            guard let self else {
+                return
+            }
+            guard self.backgroundPermissionCallback != nil else {
+                return
+            }
+
+            let latestStatus: CLAuthorizationStatus
+            if #available(iOS 14.0, *) {
+                latestStatus = manager.authorizationStatus
+            } else {
+                latestStatus = CLLocationManager.authorizationStatus()
+            }
+            self.pendingAlwaysAuthorizationUpgrade = false
+            self.resolveBackgroundPermissionIfNeeded(latestStatus)
+        }
+    }
     
     /**
      * 请求位置权限
@@ -48,17 +81,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 +122,62 @@ class PermissionManager: NSObject, CLLocationManagerDelegate {
                 return
             }
             
-            self.locationManager?.requestWhenInUseAuthorization()
+            locationManager.requestWhenInUseAuthorization()
+        }
+    }
+
+    /**
+     * 请求后台（始终）位置权限
+     * @param callback 权限结果回调 (granted, status)
+     */
+    func requestAlwaysPermission(callback: @escaping (Bool, String) -> Void) {
+        self.backgroundPermissionCallback = callback
+
+        DispatchQueue.main.async {
+            if self.locationManager == nil {
+                self.locationManager = CLLocationManager()
+            }
+
+            guard let locationManager = self.locationManager else {
+                self.backgroundPermissionCallback?(false, "unknown")
+                self.backgroundPermissionCallback = nil
+                self.pendingAlwaysAuthorizationUpgrade = false
+                return
+            }
+
+            locationManager.delegate = self
+
+            let currentStatus: CLAuthorizationStatus
+            if #available(iOS 14.0, *) {
+                currentStatus = locationManager.authorizationStatus
+            } else {
+                currentStatus = CLLocationManager.authorizationStatus()
+            }
+
+            if currentStatus == .authorizedAlways {
+                self.backgroundPermissionCallback?(true, self.getAuthorizationStatusString(currentStatus))
+                self.backgroundPermissionCallback = nil
+                self.pendingAlwaysAuthorizationUpgrade = false
+                return
+            }
+
+            if currentStatus == .denied || currentStatus == .restricted {
+                self.backgroundPermissionCallback?(false, self.getAuthorizationStatusString(currentStatus))
+                self.backgroundPermissionCallback = nil
+                self.pendingAlwaysAuthorizationUpgrade = false
+                return
+            }
+
+            if currentStatus == .authorizedWhenInUse {
+                self.pendingAlwaysAuthorizationUpgrade = false
+                locationManager.requestAlwaysAuthorization()
+                self.scheduleAlwaysAuthorizationFallback(locationManager)
+                return
+            }
+
+            // notDetermined: 先请求前台定位，再在回调中升级到始终权限
+            self.pendingAlwaysAuthorizationUpgrade = true
+            locationManager.requestWhenInUseAuthorization()
         }
     }
     
@@ -110,6 +203,18 @@ class PermissionManager: NSObject, CLLocationManagerDelegate {
         if status == .notDetermined {
             return
         }
+
+        if pendingAlwaysAuthorizationUpgrade && status == .authorizedWhenInUse {
+            pendingAlwaysAuthorizationUpgrade = false
+            if let locationManager {
+                locationManager.requestAlwaysAuthorization()
+                scheduleAlwaysAuthorizationFallback(locationManager)
+            } else {
+                resolveBackgroundPermissionIfNeeded(status)
+            }
+            return
+        }
+        pendingAlwaysAuthorizationUpgrade = false
         
         // 状态已确定(授予或拒绝),返回结果
         var granted = false
@@ -120,6 +225,8 @@ class PermissionManager: NSObject, CLLocationManagerDelegate {
         }
         let statusString = getAuthorizationStatusString(status)
         
+        resolveBackgroundPermissionIfNeeded(status)
+
         permissionCallback?(granted, statusString)
         permissionCallback = nil
     }
@@ -231,6 +338,8 @@ class PermissionManager: NSObject, CLLocationManagerDelegate {
         locationManager?.delegate = nil
         locationManager = nil
         permissionCallback = nil
+        backgroundPermissionCallback = nil
+        pendingAlwaysAuthorizationUpgrade = false
     }
 }
 #endif