expo-gaode-map 1.2.2 → 1.2.3

package/ios/ExpoGaodeMapModule.swift

@@ -40,49 +40,32 @@ public class ExpoGaodeMapModule: Module {
         return true // 已经设置过了
     }
     
-    /**
-     * 尝试启动预加载（检查 API Key 后）
-     * @param delay 延迟时间（秒）
-     * @param poolSize 预加载池大小
-     */
-    private func tryStartPreload(delay: Double = 1.0, poolSize: Int = 1) {
-        if let apiKey = AMapServices.shared().apiKey, !apiKey.isEmpty {
-            DispatchQueue.main.asyncAfter(deadline: .now() + delay) {
-                let status = MapPreloadManager.shared.getStatus()
-                let isPreloading = (status["isPreloading"] as? Bool) ?? false
-                
-                if !MapPreloadManager.shared.hasPreloadedMapView() && !isPreloading {
-                   
-                    MapPreloadManager.shared.startPreload(poolSize: poolSize)
-                }
-            }
-        } else {
-            print("⚠️ ExpoGaodeMap: API Key 未设置，跳过自动预加载")
-        }
-    }
-    
     public func definition() -> ModuleDefinition {
         Name("ExpoGaodeMap")
-        
-        // 模块初始化：尝试从本地缓存恢复隐私同意状态
-        OnCreate {
 
-             // 1. 告知 SDK：隐私协议已展示且包含隐私内容
-            MAMapView.updatePrivacyShow(
-                AMapPrivacyShowStatus.didShow,
-                privacyInfo: AMapPrivacyInfoStatus.didContain
-            )
+        OnCreate {
+            GaodeMapPrivacyManager.restorePersistedState()
+            _ = self.trySetupApiKeyFromPlist()
+        }
+        
+        Function("setPrivacyShow") { (hasShow: Bool, hasContainsPrivacy: Bool) in
+            GaodeMapPrivacyManager.setPrivacyShow(hasShow, hasContainsPrivacy: hasContainsPrivacy)
+        }
 
-            // 2. 告知 SDK：用户已同意隐私协议（关键）
-            MAMapView.updatePrivacyAgree(AMapPrivacyAgreeStatus.didAgree)
+        Function("setPrivacyAgree") { (hasAgree: Bool) in
+            GaodeMapPrivacyManager.setPrivacyAgree(hasAgree)
+        }
 
-            print("✅ ExpoGaodeMap: 原生侧已默认同意隐私协议")
+        Function("setPrivacyVersion") { (version: String) in
+            GaodeMapPrivacyManager.setPrivacyVersion(version)
+        }
 
-             // 3. 自动设置 API Key（Info.plist）
-            self.trySetupApiKeyFromPlist()
+        Function("resetPrivacyConsent") {
+            GaodeMapPrivacyManager.resetPrivacyConsent()
+        }
 
-            // 4. 自动启动预加载（可选）
-            self.tryStartPreload(delay: 2.0, poolSize: 1)
+        Function("getPrivacyStatus") { () -> [String: Any] in
+            GaodeMapPrivacyManager.status()
         }
         
         // ==================== SDK 初始化 ====================
@@ -92,6 +75,11 @@ public class ExpoGaodeMapModule: Module {
          * @param config 配置字典,包含 iosKey
          */
         Function("initSDK") { (config: [String: String]) in
+            guard GaodeMapPrivacyManager.isReady else {
+                throw Exception(name: "PRIVACY_NOT_AGREED", description: "隐私协议未完成确认，请先调用 setPrivacyShow/setPrivacyAgree")
+            }
+            GaodeMapPrivacyManager.applyPrivacyState()
+
             // 1) 优先使用传入的 iosKey；2) 否则回退读取 Info.plist 的 AMapApiKey
             let providedKey = config["iosKey"]?.trimmingCharacters(in: .whitespacesAndNewlines)
             var finalKey: String? = (providedKey?.isEmpty == false) ? providedKey : nil
@@ -113,10 +101,7 @@ public class ExpoGaodeMapModule: Module {
             }
             AMapServices.shared().enableHTTPS = true
             
-            // 初始化定位管理器（触发原生侧懒加载）
             self.getLocationManager()
-            
-            print("✅ ExpoGaodeMap: 已设置 API Key 并完成初始化（来源：\(providedKey != nil ? "入参 iosKey" : "Info.plist")）")
         }
         
         /**
@@ -124,14 +109,15 @@ public class ExpoGaodeMapModule: Module {
          * @param enable 是否开启
          */
         Function("setLoadWorldVectorMap") { (enable: Bool) in
-//            MAMapView.loadWorldVectorMap = enable
+        // v1 版本不支持
+        //    MAMapView.loadWorldVectorMap = enable
         }
         
         /**
          * 获取 SDK 版本号
          */
         Function("getVersion") {
-            "iOS SDK Version"
+            MAMapKitVersion
         }
         
         /**
@@ -141,6 +127,9 @@ public class ExpoGaodeMapModule: Module {
             if let apiKey = AMapServices.shared().apiKey, !apiKey.isEmpty {
                 return true
             }
+            if let plistKey = Bundle.main.infoDictionary?["AMapApiKey"] as? String, !plistKey.isEmpty {
+                return true
+            }
             return false
         }
         
@@ -191,7 +180,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
@@ -207,6 +196,7 @@ public class ExpoGaodeMapModule: Module {
                         "longitude": location.coordinate.longitude,
                         "accuracy": location.horizontalAccuracy,
                         "altitude": location.altitude,
+                        "heading": location.course,
                         "bearing": location.course,
                         "speed": location.speed,
                         "timestamp": location.timestamp.timeIntervalSince1970 * 1000
@@ -225,7 +215,7 @@ public class ExpoGaodeMapModule: Module {
                     }
                     
                     promise.resolve(locationData)
-                })
+                }
             } else {
                 promise.reject("LOCATION_ERROR", "location unauthorized")
             }
@@ -590,7 +580,7 @@ public class ExpoGaodeMapModule: Module {
         }
         
         Function("setInterval") { (interval: Int) in
-            self.getLocationManager().setDistanceFilter(Double(interval))
+            self.getLocationManager().setInterval(interval)
         }
         
         Function("setDistanceFilter") { (distance: Double) in
@@ -633,7 +623,7 @@ public class ExpoGaodeMapModule: Module {
         /**
          * 设置逆地理语言 (iOS 实现)
          */
-        Function("setGeoLanguage") { (language: Int) in
+        Function("setGeoLanguage") { (language: String) in
             self.getLocationManager().setGeoLanguage(language)
         }
         
@@ -700,12 +690,7 @@ public class ExpoGaodeMapModule: Module {
          */
         AsyncFunction("checkLocationPermission") { (promise: Promise) in
             let status = self.currentAuthorizationStatus()
-            let granted = status == .authorizedAlways || status == .authorizedWhenInUse
-            
-            promise.resolve([
-                "granted": granted,
-                "status": self.getAuthorizationStatusString(status)
-            ])
+            promise.resolve(self.buildPermissionStatus(status))
         }
         
         /**
@@ -715,18 +700,17 @@ 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()
-                    let finalGranted = finalStatus == .authorizedAlways || finalStatus == .authorizedWhenInUse
-                    let finalStatusString = self.getAuthorizationStatusString(finalStatus)
-                    
-                    promise.resolve([
-                        "granted": finalGranted,
-                        "status": finalStatusString
-                    ])
+                    promise.resolve(self.buildPermissionStatus(finalStatus))
                 }
             }
         }
@@ -748,12 +732,14 @@ public class ExpoGaodeMapModule: Module {
             // 这里返回当前状态
             let hasBackground = status == .authorizedAlways
             
-            promise.resolve([
-                "granted": hasBackground,
-                "backgroundLocation": hasBackground,
-                "status": self.getAuthorizationStatusString(status),
-                "message": hasBackground ? "已授予后台权限" : "需要在系统设置中手动授予'始终'权限"
-            ])
+            promise.resolve(
+                self.buildPermissionStatus(
+                    status,
+                    grantedOverride: hasBackground,
+                    backgroundLocationOverride: hasBackground,
+                    message: hasBackground ? "已授予后台权限" : "需要在系统设置中手动授予'始终'权限"
+                )
+            )
         }
         
   
@@ -774,7 +760,6 @@ public class ExpoGaodeMapModule: Module {
         OnDestroy {
             self.locationManager?.destroy()
             self.locationManager = nil
-            MapPreloadManager.shared.cleanup()
         }
     }
     
@@ -822,4 +807,31 @@ public class ExpoGaodeMapModule: Module {
         @unknown default: return "unknown"
         }
     }
+
+    private func buildPermissionStatus(
+        _ status: CLAuthorizationStatus,
+        grantedOverride: Bool? = nil,
+        backgroundLocationOverride: Bool? = nil,
+        message: String? = nil
+    ) -> [String: Any] {
+        let granted = grantedOverride ?? (status == .authorizedAlways || status == .authorizedWhenInUse)
+        let canAskAgain = status == .notDetermined
+        let isPermanentlyDenied = status == .denied || status == .restricted
+        let backgroundLocation = backgroundLocationOverride ?? (status == .authorizedAlways)
+
+        var result: [String: Any] = [
+            "granted": granted,
+            "status": self.getAuthorizationStatusString(status),
+            "canAskAgain": canAskAgain,
+            "backgroundLocation": backgroundLocation,
+            "isPermanentlyDenied": isPermanentlyDenied,
+            "shouldShowRationale": false
+        ]
+
+        if let message {
+            result["message"] = message
+        }
+
+        return result
+    }
 }

package/ios/ExpoGaodeMapOfflineModule.swift

@@ -27,7 +27,10 @@ public class ExpoGaodeMapOfflineModule: Module {
     set { stateQueue.async(flags: .barrier) { self._pausedCities = newValue } }
   }
   
-  private var offlineMapManager: MAOfflineMap {
+  private var offlineMapManager: MAOfflineMap? {
+    guard setupApiKeyIfNeeded() else {
+      return nil
+    }
     return MAOfflineMap.shared()
   }
   
@@ -56,11 +59,11 @@ public class ExpoGaodeMapOfflineModule: Module {
     )
     
     OnCreate {
-      // Module initialization
+      _ = self.setupApiKeyIfNeeded()
     }
     
     OnDestroy {
-      MAOfflineMap.shared().cancelAll()
+      self.offlineMapManager?.cancelAll()
       self.downloadingCities.removeAll()
       self.pausedCities.removeAll()
     }
@@ -70,7 +73,7 @@ public class ExpoGaodeMapOfflineModule: Module {
     AsyncFunction("getAvailableCities") { (promise: Promise) in
       self.ensureSetup { success in
         guard success else { promise.reject("ERR_SETUP", "Setup failed"); return }
-        let cities = self.cachedCities ?? self.offlineMapManager.cities ?? []
+        let cities = self.cachedCities ?? self.offlineMapManager?.cities ?? []
         promise.resolve(cities.map { self.convertCityToDict($0) })
       }
     }
@@ -78,7 +81,7 @@ public class ExpoGaodeMapOfflineModule: Module {
     AsyncFunction("getAvailableProvinces") { (promise: Promise) in
       self.ensureSetup { success in
         guard success else { promise.reject("ERR_SETUP", "Setup failed"); return }
-        let provinces = self.cachedProvinces ?? self.offlineMapManager.provinces ?? []
+        let provinces = self.cachedProvinces ?? self.offlineMapManager?.provinces ?? []
         promise.resolve(provinces.map { self.convertProvinceToDict($0) })
       }
     }
@@ -86,7 +89,7 @@ public class ExpoGaodeMapOfflineModule: Module {
     AsyncFunction("getCitiesByProvince") { (provinceCode: String, promise: Promise) in
       self.ensureSetup { success in
         guard success else { promise.reject("ERR_SETUP", "Setup failed"); return }
-        let provinces = self.cachedProvinces ?? self.offlineMapManager.provinces ?? []
+        let provinces = self.cachedProvinces ?? self.offlineMapManager?.provinces ?? []
         if let province = provinces.first(where: { $0.adcode == provinceCode }) {
           let cities = province.cities.compactMap { ($0 as? MAOfflineCity).map { self.convertCityToDict($0) } }
           promise.resolve(cities)
@@ -99,7 +102,7 @@ public class ExpoGaodeMapOfflineModule: Module {
     AsyncFunction("getDownloadedMaps") { (promise: Promise) in
       self.ensureSetup { success in
         guard success else { promise.reject("ERR_SETUP", "Setup failed"); return }
-        let allCities = self.cachedCities ?? self.offlineMapManager.cities ?? []
+        let allCities = self.cachedCities ?? self.offlineMapManager?.cities ?? []
         let downloaded = allCities.filter { $0.itemStatus == .installed }
         promise.resolve(downloaded.map { self.convertCityToDict($0) })
       }
@@ -120,28 +123,28 @@ public class ExpoGaodeMapOfflineModule: Module {
     }
     
     Function("pauseDownload") { (cityCode: String) in
-      let allCities = self.cachedCities ?? self.offlineMapManager.cities ?? []
+      let allCities = self.cachedCities ?? self.offlineMapManager?.cities ?? []
       if let city = allCities.first(where: { $0.adcode == cityCode }) {
         self.pausedCities.insert(cityCode)
         self.downloadingCities.remove(cityCode)
-        self.offlineMapManager.pause(city)
+        self.offlineMapManager?.pause(city)
       }
     }
     
     AsyncFunction("cancelDownload") { (cityCode: String) in
-      let allCities = self.cachedCities ?? self.offlineMapManager.cities ?? []
+      let allCities = self.cachedCities ?? self.offlineMapManager?.cities ?? []
       if let city = allCities.first(where: { $0.adcode == cityCode }) {
         self.downloadingCities.remove(cityCode)
         self.pausedCities.remove(cityCode)
-        self.offlineMapManager.pause(city) // iOS SDK 中 pause 停止网络
+        self.offlineMapManager?.pause(city) // iOS SDK 中 pause 停止网络
         self.sendEvent("onDownloadCancelled", ["cityCode": cityCode, "cityName": city.name ?? ""])
       }
     }
     
     AsyncFunction("deleteMap") { (cityCode: String) in
-      let allCities = self.cachedCities ?? self.offlineMapManager.cities ?? []
+      let allCities = self.cachedCities ?? self.offlineMapManager?.cities ?? []
       if let city = allCities.first(where: { $0.adcode == cityCode }) {
-        self.offlineMapManager.delete(city)
+        self.offlineMapManager?.delete(city)
         self.downloadingCities.remove(cityCode)
         self.pausedCities.remove(cityCode)
       }
@@ -152,8 +155,12 @@ public class ExpoGaodeMapOfflineModule: Module {
     }
     
     AsyncFunction("checkUpdate") { (cityCode: String, promise: Promise) in
+      guard let offlineMapManager = self.offlineMapManager else {
+        promise.reject("ERR_SETUP", "离线地图管理器初始化失败，请检查 iOS AMapApiKey 是否已正确配置")
+        return
+      }
       // 检查特定城市或全局更新
-      self.offlineMapManager.checkNewestVersion { hasNewestVersion in
+      offlineMapManager.checkNewestVersion { hasNewestVersion in
         if hasNewestVersion {
           // 刷新缓存以获取最新数据
           self.stateQueue.async(flags: .barrier) {
@@ -169,13 +176,13 @@ public class ExpoGaodeMapOfflineModule: Module {
     // ==================== 3. 状态查询 ====================
     
     AsyncFunction("isMapDownloaded") { (cityCode: String) -> Bool in
-      let allCities = self.cachedCities ?? self.offlineMapManager.cities ?? []
+      let allCities = self.cachedCities ?? self.offlineMapManager?.cities ?? []
       return allCities.first(where: { $0.adcode == cityCode })?.itemStatus == .installed
     }
     
     // 恢复原有方法：getMapStatus
     AsyncFunction("getMapStatus") { (cityCode: String) -> [String: Any] in
-      let allCities = self.cachedCities ?? self.offlineMapManager.cities ?? []
+      let allCities = self.cachedCities ?? self.offlineMapManager?.cities ?? []
       if let city = allCities.first(where: { $0.adcode == cityCode }) {
         return self.convertCityToDict(city)
       }
@@ -194,7 +201,7 @@ public class ExpoGaodeMapOfflineModule: Module {
     // ==================== 4. 存储管理 ====================
     
     AsyncFunction("getStorageSize") { () -> Int64 in
-      let allCities = self.cachedCities ?? self.offlineMapManager.cities ?? []
+      let allCities = self.cachedCities ?? self.offlineMapManager?.cities ?? []
       let installed = allCities.filter { $0.itemStatus == .installed }
       // 修复类型转换报错：Int64(0)
       return installed.reduce(Int64(0)) { $0 + ($1.downloadedSize > 0 ? $1.downloadedSize : $1.size) }
@@ -203,7 +210,7 @@ public class ExpoGaodeMapOfflineModule: Module {
     // 恢复原有方法：getStorageInfo
     AsyncFunction("getStorageInfo") { () -> [String: Any] in
       // 1. 计算离线地图占用
-      let allCities = self.cachedCities ?? self.offlineMapManager.cities ?? []
+      let allCities = self.cachedCities ?? self.offlineMapManager?.cities ?? []
       let installed = allCities.filter { $0.itemStatus == .installed }
       let offlineMapSize = installed.reduce(Int64(0)) { $0 + ($1.downloadedSize > 0 ? $1.downloadedSize : $1.size) }
       
@@ -231,7 +238,7 @@ public class ExpoGaodeMapOfflineModule: Module {
     }
     
     AsyncFunction("clearAllMaps") {
-      self.offlineMapManager.clearDisk()
+      self.offlineMapManager?.clearDisk()
       self.downloadingCities.removeAll()
       self.pausedCities.removeAll()
       self.cachedCities = nil
@@ -254,14 +261,14 @@ public class ExpoGaodeMapOfflineModule: Module {
       // 确保初始化
       self.ensureSetup { success in
         guard success else { return }
-        let allCities = self.cachedCities ?? self.offlineMapManager.cities ?? []
+        let allCities = self.cachedCities ?? self.offlineMapManager?.cities ?? []
         
         cityCodes.forEach { cityCode in
           if let city = allCities.first(where: { $0.adcode == cityCode }) {
             self.downloadingCities.insert(cityCode)
             self.pausedCities.remove(cityCode)
             // 批量下载也建议开启后台
-            self.offlineMapManager.downloadItem(city, shouldContinueWhenAppEntersBackground: true) { [weak self] item, status, info in
+            self.offlineMapManager?.downloadItem(city, shouldContinueWhenAppEntersBackground: true) { [weak self] item, status, info in
               guard let self = self, let item = item else { return }
               self.handleDownloadCallback(item: item, status: status, info: info)
             }
@@ -272,10 +279,10 @@ public class ExpoGaodeMapOfflineModule: Module {
     
     // 恢复原有方法：batchDelete
     AsyncFunction("batchDelete") { (cityCodes: [String]) in
-      let allCities = self.cachedCities ?? self.offlineMapManager.cities ?? []
+      let allCities = self.cachedCities ?? self.offlineMapManager?.cities ?? []
       cityCodes.forEach { cityCode in
         if let city = allCities.first(where: { $0.adcode == cityCode }) {
-          self.offlineMapManager.delete(city)
+          self.offlineMapManager?.delete(city)
         }
         self.downloadingCities.remove(cityCode)
         self.pausedCities.remove(cityCode)
@@ -286,7 +293,7 @@ public class ExpoGaodeMapOfflineModule: Module {
     AsyncFunction("batchUpdate") { (cityCodes: [String]) in
       self.ensureSetup { success in
         guard success else { return }
-        let allCities = self.cachedCities ?? self.offlineMapManager.cities ?? []
+        let allCities = self.cachedCities ?? self.offlineMapManager?.cities ?? []
         
         cityCodes.forEach { cityCode in
           if let city = allCities.first(where: { $0.adcode == cityCode }) {
@@ -296,7 +303,7 @@ public class ExpoGaodeMapOfflineModule: Module {
                 self._downloadingCities.insert(cityCode)
                 self._pausedCities.remove(cityCode)
               }
-              self.offlineMapManager.downloadItem(city, shouldContinueWhenAppEntersBackground: true) { [weak self] item, status, info in
+              self.offlineMapManager?.downloadItem(city, shouldContinueWhenAppEntersBackground: true) { [weak self] item, status, info in
                 guard let self = self, let item = item else { return }
                 self.handleDownloadCallback(item: item, status: status, info: info)
               }
@@ -307,7 +314,7 @@ public class ExpoGaodeMapOfflineModule: Module {
     }
     
     AsyncFunction("pauseAllDownloads") {
-      self.offlineMapManager.cancelAll()
+      self.offlineMapManager?.cancelAll()
       for cityCode in self.downloadingCities {
         self.pausedCities.insert(cityCode)
         self.sendEvent("onDownloadPaused", ["cityCode": cityCode, "cityName": ""])
@@ -320,14 +327,14 @@ public class ExpoGaodeMapOfflineModule: Module {
       // iOS SDK 没有 resumeAll，只能尝试恢复 pausedCities 列表中的城市
       self.ensureSetup { success in
         guard success else { return }
-        let allCities = self.cachedCities ?? self.offlineMapManager.cities ?? []
+        let allCities = self.cachedCities ?? self.offlineMapManager?.cities ?? []
         let pausedList = Array(self.pausedCities)
         
         pausedList.forEach { cityCode in
            if let city = allCities.first(where: { $0.adcode == cityCode }) {
              self.pausedCities.remove(cityCode)
              self.downloadingCities.insert(cityCode)
-             self.offlineMapManager.downloadItem(city, shouldContinueWhenAppEntersBackground: true) { [weak self] item, status, info in
+             self.offlineMapManager?.downloadItem(city, shouldContinueWhenAppEntersBackground: true) { [weak self] item, status, info in
                guard let self = self, let item = item else { return }
                self.handleDownloadCallback(item: item, status: status, info: info)
              }
@@ -346,7 +353,7 @@ public class ExpoGaodeMapOfflineModule: Module {
         return
       }
       
-      let allCities = self.cachedCities ?? self.offlineMapManager.cities ?? []
+      let allCities = self.cachedCities ?? self.offlineMapManager?.cities ?? []
       guard let city = allCities.first(where: { $0.adcode == cityCode }) else {
         promise.reject("ERR_CITY", "City not found: \(cityCode)")
         return
@@ -356,7 +363,7 @@ public class ExpoGaodeMapOfflineModule: Module {
       self.pausedCities.remove(cityCode)
       
       // 开启后台下载
-      self.offlineMapManager.downloadItem(city, shouldContinueWhenAppEntersBackground: true) { [weak self] item, status, info in
+      self.offlineMapManager?.downloadItem(city, shouldContinueWhenAppEntersBackground: true) { [weak self] item, status, info in
         guard let self = self, let item = item else { return }
         self.handleDownloadCallback(item: item, status: status, info: info)
       }
@@ -370,7 +377,15 @@ public class ExpoGaodeMapOfflineModule: Module {
     if isSetupInProgress { return }
     
     isSetupInProgress = true
-    MAOfflineMap.shared().setup { [weak self] success in
+    guard let offlineMapManager = self.offlineMapManager else {
+      self.isSetupInProgress = false
+      let waiters = self.setupWaiters
+      self.setupWaiters.removeAll()
+      waiters.forEach { $0(false) }
+      return
+    }
+
+    offlineMapManager.setup { [weak self] success in
       guard let self = self else { return }
       self.isSetupInProgress = false
       self.isSetupComplete = success
@@ -382,7 +397,7 @@ public class ExpoGaodeMapOfflineModule: Module {
   }
   
   private func parseOfflineMapData() {
-    let map = MAOfflineMap.shared()
+    let map = offlineMapManager
     stateQueue.async(flags: .barrier) {
       self.cachedCities = map?.cities
       self.cachedProvinces = map?.provinces
@@ -462,7 +477,7 @@ public class ExpoGaodeMapOfflineModule: Module {
       "size": city.size,
       "status": status,
       "downloadedSize": city.downloadedSize,
-      "version": self.offlineMapManager.version ?? "",
+      "version": self.offlineMapManager?.version ?? "",
       "progress": city.size > 0 ? Int((Double(city.downloadedSize) / Double(city.size)) * 100) : 0
     ]
   }
@@ -476,4 +491,19 @@ public class ExpoGaodeMapOfflineModule: Module {
       "downloadedSize": province.downloadedSize
     ]
   }
+
+  @discardableResult
+  private func setupApiKeyIfNeeded() -> Bool {
+    if let apiKey = AMapServices.shared().apiKey, !apiKey.isEmpty {
+      return true
+    }
+
+    if let plistKey = Bundle.main.infoDictionary?["AMapApiKey"] as? String, !plistKey.isEmpty {
+      AMapServices.shared().apiKey = plistKey
+      AMapServices.shared().enableHTTPS = true
+      return true
+    }
+
+    return false
+  }
 }