expo-gaode-map 2.2.26-next.0 → 2.2.26-next.2

package/README.md

@@ -30,7 +30,7 @@
 - ✅ 高测试覆盖率（75.7%，207 个单元测试）
 - ✅ 支持自定义Marker覆盖物
 - ✅ 默认实现了优化地图加载，减少内存占用
-- ✅ 几何运算（距离计算、面积计算等，由 C++ 实现）
+- ✅ 几何运算（距离/面积、点在圆/多边形、质心/边界、路径长度/抽稀、GeoHash、瓦片/像素坐标转换、最近点、热力网格等，由 C++ 实现）
 - ✅ 丰富的使用案例
 - ✅ 提供AI编程助手，帮助开发者快速集成和使用（https://TomWq.github.io/expo-gaode-map/guide/ai-skills.html）
 - ✅ 更多内容和功能请查看 [完整文档](https://TomWq.github.io/expo-gaode-map/)
@@ -44,6 +44,14 @@
 
 ## 📦 安装
 
+> ⚠️ **版本兼容性说明**：
+> - 如果你的项目使用 **Expo SDK 54 及以上**，请安装 默认的 版本。
+> - 如果你的项目使用 **Expo SDK 53 及以下**（如 50, 51, 52, 53），请使用 **V1** 版本（Tag: `v1`）。
+>   ```bash
+>   npm install expo-gaode-map@v1
+>   ```
+>   **说明**：V1 版本除了不支持**世界地图**功能外，其余 API 与 V2 (Latest) 版本完全一致。
+
 ### 方案一：仅使用地图和定位（核心包）
 
 ```bash
@@ -162,9 +170,46 @@ try {
   }
 }
 ```
+### 5. 地图在模拟器上显示异常(可能会出现黑屏或闪退)
+
+建议：
+- 确保在真机上测试，模拟器可能不支持地图功能
+- 检查是否正确配置了 API Key
 
 **完整错误处理指南**：[ERROR_HANDLING_GUIDE.md](./ERROR_HANDLING_GUIDE.md)
 
+### 6. Google Play 版本支持
+
+如果你的应用需要上架 Google Play，需要使用高德地图 Google Play 版本的 SDK（通过了 Google Play 的合规审核）。
+
+#### 步骤 1：下载 SDK
+前往 [高德开放平台](https://lbs.amap.com/api/android-sdk/download) 下载包含 Google Play 版本的 SDK（通常是合包，包含地图、搜索、定位功能）。
+
+#### 步骤 2：放入项目
+将下载的 `.aar` 或 `.jar` 文件放入你的 Expo 项目根目录下的 `libs` 文件夹中（如果没有则创建），例如 `libs/AMap_3DMap_GooglePlay.aar`。
+
+#### 步骤 3：配置插件
+在 `app.json` 中配置 `customMapSdkPath`：
+
+```json
+{
+  "expo": {
+    "plugins": [
+      [
+        "expo-gaode-map",
+        {
+          "androidKey": "your-android-key",
+          "iosKey": "your-ios-key",
+          "customMapSdkPath": "./libs/AMap_3DMap_GooglePlay.aar" 
+        }
+      ]
+    ]
+  }
+}
+```
+
+> **注意**：Google Play 版本的 SDK 通常是合包（包含地图+搜索+定位）。如果你的项目中引入了其他高德相关依赖（如 `expo-gaode-map-search`），可能会导致类冲突。插件会自动处理大部分冲突，但如果依然遇到 `Duplicate class` 错误，请检查是否引入了多余的依赖。
+
 支持的错误类型：
 - `SDK_NOT_INITIALIZED` - SDK 未初始化
 - `INVALID_API_KEY` - API Key 配置错误
@@ -185,6 +230,7 @@ MIT
 
 - [在线文档](https://TomWq.github.io/expo-gaode-map/)
 - [错误处理指南](./ERROR_HANDLING_GUIDE.md) 🆕
+- [性能优化指南](./PERFORMANCE_GUIDE.md) 🆕
 - [GitHub 仓库](https://github.com/TomWq/expo-gaode-map)
 - [示例项目(地图)](https://github.com/TomWq/expo-gaode-map-example)
 - [示例项目(导航)](https://github.com/TomWq/expo-gaode-map-navigation-example)

package/android/build.gradle

@@ -31,6 +31,9 @@ if (useManagedAndroidSdkVersions) {
   }
 }
 
+logger.warn("[expo-gaode-map] Thank you for using expo-gaode-map ❤️")
+logger.warn("[expo-gaode-map] If you enjoy using expo-gaode-map, please consider sponsoring this project: https://github.com/TomWq")
+
 android {
   namespace "expo.modules.gaodemap"
   defaultConfig {
@@ -54,5 +57,29 @@ android {
 
 dependencies {
     // 高德地图 3D SDK
-    implementation ('com.amap.api:3dmap:latest.integration')
+    def customSdkPath = null
+    println "ExpoGaodeMap: Checking for custom SDK property in rootProject: ${rootProject.name}"
+    if (rootProject.hasProperty("EXPO_GAODE_MAP_CUSTOM_SDK_PATH")) {
+        customSdkPath = rootProject.property("EXPO_GAODE_MAP_CUSTOM_SDK_PATH")
+        println "ExpoGaodeMap: Found custom SDK path property: ${customSdkPath}"
+    } else {
+        println "ExpoGaodeMap: No custom SDK path property found."
+    }
+
+    if (customSdkPath) {
+        def sdkFile = rootProject.file(customSdkPath)
+        if (!sdkFile.exists()) {
+            // Try to find the file relative to the project root (parent of android folder)
+            sdkFile = new File(rootProject.projectDir.parentFile, customSdkPath)
+        }
+
+        if (sdkFile.exists()) {
+            println "ExpoGaodeMap: Using custom Map SDK from ${sdkFile.absolutePath}"
+            implementation files(sdkFile)
+        } else {
+            throw new FileNotFoundException("ExpoGaodeMap: Could not find custom SDK at ${customSdkPath}. Please check your customMapSdkPath configuration.")
+        }
+    } else {
+        implementation ('com.amap.api:3dmap:latest.integration')
+    }
 }

package/android/src/main/cpp/CMakeLists.txt

@@ -22,3 +22,5 @@ find_library(log-lib log)
 target_link_libraries(gaodecluster
     ${log-lib}
 )
+
+target_link_options(gaodecluster PRIVATE "-Wl,-z,max-page-size=16384")

package/android/src/main/java/expo/modules/gaodemap/ExpoGaodeMapModule.kt

@@ -30,42 +30,6 @@ class ExpoGaodeMapModule : Module() {
   override fun definition() = ModuleDefinition {
     Name("ExpoGaodeMap")
 
-    // 在模块加载时尝试从本地缓存恢复隐私同意状态，避免每次启动都必须 JS 调用
-    try {
-      val context = appContext.reactContext!!
-      SDKInitializer.restorePrivacyState(context)
-
-      // 初始化预加载管理器（注册内存监听）
-      MapPreloadManager.initialize(context)
-
-      // 尝试从 AndroidManifest.xml 读取并设置 API Key
-      val apiKey = context.packageManager
-          .getApplicationInfo(context.packageName, android.content.pm.PackageManager.GET_META_DATA)
-          .metaData?.getString("com.amap.api.v2.apikey")
-
-      if (!apiKey.isNullOrEmpty()) {
-          try {
-            MapsInitializer.setApiKey(apiKey)
-            com.amap.api.location.AMapLocationClient.setApiKey(apiKey)
-
-
-            // 只有在 API Key 已设置的情况下才启动预加载
-            android.os.Handler(android.os.Looper.getMainLooper()).postDelayed({
-              android.util.Log.i("ExpoGaodeMap", "🚀 自动启动地图预加载")
-              MapPreloadManager.startPreload(context, poolSize = 1)
-            }, 2000)
-          } catch (e: Exception) {
-            android.util.Log.w("ExpoGaodeMap", "设置 API Key 失败: ${e.message}")
-          }
-        } else {
-          android.util.Log.w("ExpoGaodeMap", "⚠️ AndroidManifest.xml 未找到 API Key，跳过自动预加载")
-        }
-
-    } catch (e: Exception) {
-      android.util.Log.w("ExpoGaodeMap", "恢复隐私状态时出现问题: ${e.message}")
-    }
- 
-  
     // ==================== SDK 初始化 ====================
     
     /**
@@ -74,23 +38,43 @@ class ExpoGaodeMapModule : Module() {
      */
     Function("initSDK") { config: Map<String, String> ->
       val androidKey = config["androidKey"]
-      if (androidKey != null) {
-        try {
-          SDKInitializer.initSDK(appContext.reactContext!!, androidKey)
-          getLocationManager() // 初始化定位管理器
-          
-          // 初始化成功后自动触发一次预加载
-          MapPreloadManager.startPreload(appContext.reactContext!!, poolSize = 1)
-        } catch (e: SecurityException) {
-          android.util.Log.e("ExpoGaodeMap", "隐私协议未同意: ${e.message}")
-          throw expo.modules.kotlin.exception.CodedException("PRIVACY_NOT_AGREED", e.message ?: "用户未同意隐私协议", e)
-        } catch (e: Exception) {
-          android.util.Log.e("ExpoGaodeMap", "SDK 初始化失败: ${e.message}")
-          throw expo.modules.kotlin.exception.CodedException("INIT_FAILED", e.message ?: "SDK 初始化失败", e)
+      try {
+        val context = appContext.reactContext!!
+        if (androidKey != null) {
+          SDKInitializer.initSDK(context, androidKey)
+        } else if (!SDKInitializer.isPrivacyReady()) {
+          throw expo.modules.kotlin.exception.CodedException(
+            "PRIVACY_NOT_AGREED",
+            "隐私协议未完成确认，请先调用 setPrivacyShow/setPrivacyAgree",
+            null
+          )
+        } else {
+          SDKInitializer.applyPrivacyState(context)
         }
+
+        getLocationManager()
+        android.util.Log.i("ExpoGaodeMap", "✅ SDK 初始化完成 - Version: ${MapsInitializer.getVersion()}")
+      } catch (e: SecurityException) {
+        android.util.Log.e("ExpoGaodeMap", "隐私协议未同意: ${e.message}")
+        throw expo.modules.kotlin.exception.CodedException("PRIVACY_NOT_AGREED", e.message ?: "用户未同意隐私协议", e)
+      } catch (e: Exception) {
+        android.util.Log.e("ExpoGaodeMap", "SDK 初始化失败: ${e.message}")
+        throw expo.modules.kotlin.exception.CodedException("INIT_FAILED", e.message ?: "SDK 初始化失败", e)
       }
     }
 
+    Function("setPrivacyShow") { hasShow: Boolean, hasContainsPrivacy: Boolean ->
+      SDKInitializer.setPrivacyShow(appContext.reactContext!!, hasShow, hasContainsPrivacy)
+    }
+
+    Function("setPrivacyAgree") { hasAgree: Boolean ->
+      SDKInitializer.setPrivacyAgree(appContext.reactContext!!, hasAgree)
+    }
+
+    Function("getPrivacyStatus") {
+      SDKInitializer.getPrivacyStatus()
+    }
+
     /**
      * 设置是否加载世界向量地图
      * @param enable 是否开启
@@ -890,7 +874,6 @@ class ExpoGaodeMapModule : Module() {
     OnDestroy {
       locationManager?.destroy()
       locationManager = null
-      MapPreloadManager.cleanup()
     }
   }
 

package/android/src/main/java/expo/modules/gaodemap/ExpoGaodeMapOfflineModule.kt

@@ -7,6 +7,8 @@ import com.amap.api.maps.offlinemap.OfflineMapCity
 import com.amap.api.maps.offlinemap.OfflineMapManager
 import com.amap.api.maps.offlinemap.OfflineMapProvince
 import com.amap.api.maps.offlinemap.OfflineMapStatus
+import expo.modules.gaodemap.modules.SDKInitializer
+import expo.modules.kotlin.exception.CodedException
 import expo.modules.kotlin.modules.Module
 import expo.modules.kotlin.modules.ModuleDefinition
 
@@ -21,6 +23,42 @@ class ExpoGaodeMapOfflineModule : Module() {
   
   // 线程安全锁
   private val lock = Any()
+
+  private fun createDownloadListener(): OfflineMapManager.OfflineMapDownloadListener {
+    return object : OfflineMapManager.OfflineMapDownloadListener {
+      override fun onDownload(status: Int, completeCode: Int, downName: String?) {
+        handleDownloadStatus(status, completeCode, downName)
+      }
+
+      override fun onCheckUpdate(hasNew: Boolean, name: String?) {
+      }
+
+      override fun onRemove(success: Boolean, name: String?, describe: String?) {
+      }
+    }
+  }
+
+  private fun getOfflineMapManager(): OfflineMapManager {
+    if (!SDKInitializer.isPrivacyReady()) {
+      throw CodedException(
+        "PRIVACY_NOT_AGREED",
+        "隐私协议未完成确认，请先调用 setPrivacyShow/setPrivacyAgree",
+        null
+      )
+    }
+
+    val reactContext = appContext.reactContext
+      ?: throw CodedException("NO_CONTEXT", "React context not available", null)
+
+    if (offlineMapManager == null) {
+      offlineMapManager = OfflineMapManager(
+        reactContext.applicationContext,
+        createDownloadListener()
+      )
+    }
+
+    return offlineMapManager!!
+  }
   
   override fun definition() = ModuleDefinition {
     Name("ExpoGaodeMapOffline")
@@ -36,25 +74,6 @@ class ExpoGaodeMapOfflineModule : Module() {
       "onDownloadCancelled"
     )
     
-    // ==================== 模块生命周期 ====================
-    
-    OnCreate {
-      // 初始化离线地图管理器
-      offlineMapManager = OfflineMapManager(appContext.reactContext, object : OfflineMapManager.OfflineMapDownloadListener {
-        override fun onDownload(status: Int, completeCode: Int, downName: String?) {
-          handleDownloadStatus(status, completeCode, downName)
-        }
-        
-        override fun onCheckUpdate(hasNew: Boolean, name: String?) {
-          // 更新检查回调
-        }
-        
-        override fun onRemove(success: Boolean, name: String?, describe: String?) {
-          // 删除回调
-        }
-      })
-    }
-    
     OnDestroy {
       offlineMapManager?.destroy()
       offlineMapManager = null
@@ -64,24 +83,24 @@ class ExpoGaodeMapOfflineModule : Module() {
     // ==================== 地图列表管理 ====================
     
     AsyncFunction("getAvailableCities") {
-      val cities = offlineMapManager?.offlineMapCityList ?: emptyList()
+      val cities = getOfflineMapManager().offlineMapCityList ?: emptyList()
       cities.map { city -> convertCityToMap(city) }
     }
     
     AsyncFunction("getAvailableProvinces") {
-      val provinces = offlineMapManager?.offlineMapProvinceList ?: emptyList()
+      val provinces = getOfflineMapManager().offlineMapProvinceList ?: emptyList()
       provinces.map { province -> convertProvinceToMap(province) }
     }
     
     AsyncFunction("getCitiesByProvince") { provinceCode: String ->
-      val province = offlineMapManager?.offlineMapProvinceList?.find { 
+      val province = getOfflineMapManager().offlineMapProvinceList?.find { 
         it.provinceCode == provinceCode 
       }
       province?.cityList?.map { city -> convertCityToMap(city) } ?: emptyList()
     }
     
     AsyncFunction("getDownloadedMaps") {
-      val cities = offlineMapManager?.downloadOfflineMapCityList ?: emptyList()
+      val cities = getOfflineMapManager().downloadOfflineMapCityList ?: emptyList()
       cities.map { city -> convertCityToMap(city) }
     }
     
@@ -95,11 +114,11 @@ class ExpoGaodeMapOfflineModule : Module() {
         downloadingCities.add(cityCode)
         pausedCities.remove(cityCode)
       }
-      offlineMapManager?.downloadByCityCode(cityCode)
+      getOfflineMapManager().downloadByCityCode(cityCode)
     }
     
     AsyncFunction("pauseDownload") { cityCode: String ->
-      val city = offlineMapManager?.getItemByCityCode(cityCode)
+      val city = getOfflineMapManager().getItemByCityCode(cityCode)
       
       synchronized(lock) {
         pausedCities.add(cityCode)
@@ -108,7 +127,7 @@ class ExpoGaodeMapOfflineModule : Module() {
       
       // 使用 pauseByName 暂停指定城市
       city?.city?.let { cityName ->
-        offlineMapManager?.pauseByName(cityName)
+        getOfflineMapManager().pauseByName(cityName)
       }
       
       if (city != null) {
@@ -126,11 +145,11 @@ class ExpoGaodeMapOfflineModule : Module() {
       }
       // Android SDK 没有针对单个城市的恢复方法
       // 需要重新调用 downloadByCityCode 来继续下载
-      offlineMapManager?.downloadByCityCode(cityCode)
+      getOfflineMapManager().downloadByCityCode(cityCode)
     }
     
     AsyncFunction("cancelDownload") { cityCode: String ->
-      val city = offlineMapManager?.getItemByCityCode(cityCode)
+      val city = getOfflineMapManager().getItemByCityCode(cityCode)
       
       synchronized(lock) {
         downloadingCities.remove(cityCode)
@@ -138,7 +157,7 @@ class ExpoGaodeMapOfflineModule : Module() {
       }
       
       // 使用 stop() 停止所有下载(包括队列)
-      offlineMapManager?.stop()
+      getOfflineMapManager().stop()
       
       if (city != null) {
         sendEvent("onDownloadCancelled", Bundle().apply {
@@ -149,11 +168,11 @@ class ExpoGaodeMapOfflineModule : Module() {
     }
     
     AsyncFunction("deleteMap") { cityCode: String ->
-      val city = offlineMapManager?.getItemByCityCode(cityCode)
+      val city = getOfflineMapManager().getItemByCityCode(cityCode)
         ?: throw IllegalArgumentException("City not found: $cityCode")
       
       // 官方文档:remove() 需要传入城市名称,不是城市代码
-      offlineMapManager?.remove(city.city)
+      getOfflineMapManager().remove(city.city)
       
       synchronized(lock) {
         downloadingCities.remove(cityCode)
@@ -165,29 +184,29 @@ class ExpoGaodeMapOfflineModule : Module() {
       synchronized(lock) {
         downloadingCities.add(cityCode)
       }
-      offlineMapManager?.updateOfflineCityByCode(cityCode)
+      getOfflineMapManager().updateOfflineCityByCode(cityCode)
     }
     
     AsyncFunction("checkUpdate") { cityCode: String ->
-      val city = offlineMapManager?.getItemByCityCode(cityCode)
+      val city = getOfflineMapManager().getItemByCityCode(cityCode)
       city?.state == OfflineMapStatus.NEW_VERSION
     }
     
     // ==================== 状态查询 ====================
     
     AsyncFunction("isMapDownloaded") { cityCode: String ->
-      val city = offlineMapManager?.getItemByCityCode(cityCode)
+      val city = getOfflineMapManager().getItemByCityCode(cityCode)
       city?.state == OfflineMapStatus.SUCCESS || 
       city?.state == OfflineMapStatus.CHECKUPDATES
     }
     
     AsyncFunction("getMapStatus") { cityCode: String ->
-      val city = offlineMapManager?.getItemByCityCode(cityCode)
+      val city = getOfflineMapManager().getItemByCityCode(cityCode)
       city?.let { convertCityToMap(it) } ?: Bundle()
     }
     
     AsyncFunction("getTotalProgress") {
-      val downloadedCities = offlineMapManager?.downloadOfflineMapCityList ?: emptyList()
+      val downloadedCities = getOfflineMapManager().downloadOfflineMapCityList ?: emptyList()
       if (downloadedCities.isEmpty()) {
         0.0
       } else {
@@ -204,12 +223,12 @@ class ExpoGaodeMapOfflineModule : Module() {
     
     AsyncFunction("getStorageSize") {
       // 计算所有已下载地图的大小
-      val cities = offlineMapManager?.downloadOfflineMapCityList ?: emptyList()
+      val cities = getOfflineMapManager().downloadOfflineMapCityList ?: emptyList()
       cities.sumOf { it.size }
     }
     
     AsyncFunction("getStorageInfo") {
-      val cities = offlineMapManager?.downloadOfflineMapCityList ?: emptyList()
+      val cities = getOfflineMapManager().downloadOfflineMapCityList ?: emptyList()
       val offlineMapSize = cities.sumOf { it.size }
       
       // 获取存储路径的统计信息
@@ -231,9 +250,9 @@ class ExpoGaodeMapOfflineModule : Module() {
     }
     
     AsyncFunction("clearAllMaps") {
-      offlineMapManager?.downloadOfflineMapCityList?.forEach { city ->
+      getOfflineMapManager().downloadOfflineMapCityList?.forEach { city ->
         // 使用城市名称删除
-        offlineMapManager?.remove(city.city)
+        getOfflineMapManager().remove(city.city)
       }
       synchronized(lock) {
         downloadingCities.clear()
@@ -260,16 +279,16 @@ class ExpoGaodeMapOfflineModule : Module() {
         }
       }
       cityCodes.forEach { cityCode ->
-        offlineMapManager?.downloadByCityCode(cityCode)
+        getOfflineMapManager().downloadByCityCode(cityCode)
       }
     }
     
     AsyncFunction("batchDelete") { cityCodes: List<String> ->
       cityCodes.forEach { cityCode ->
-        val city = offlineMapManager?.getItemByCityCode(cityCode)
+        val city = getOfflineMapManager().getItemByCityCode(cityCode)
         // 使用城市名称删除,不是城市代码
         city?.city?.let { cityName ->
-          offlineMapManager?.remove(cityName)
+          getOfflineMapManager().remove(cityName)
         }
       }
       synchronized(lock) {
@@ -287,18 +306,18 @@ class ExpoGaodeMapOfflineModule : Module() {
         }
       }
       cityCodes.forEach { cityCode ->
-        offlineMapManager?.updateOfflineCityByCode(cityCode)
+        getOfflineMapManager().updateOfflineCityByCode(cityCode)
       }
     }
     
     AsyncFunction("pauseAllDownloads") {
       // pause() 只暂停正在下载的,不包括队列
-      offlineMapManager?.pause()
+      getOfflineMapManager().pause()
       
       synchronized(lock) {
         pausedCities.addAll(downloadingCities)
         downloadingCities.forEach { cityCode ->
-          val city = offlineMapManager?.getItemByCityCode(cityCode)
+          val city = getOfflineMapManager().getItemByCityCode(cityCode)
           if (city != null) {
             sendEvent("onDownloadPaused", Bundle().apply {
               putString("cityCode", cityCode)
@@ -321,7 +340,7 @@ class ExpoGaodeMapOfflineModule : Module() {
           downloadingCities.add(cityCode)
           pausedCities.remove(cityCode)
         }
-        offlineMapManager?.downloadByCityCode(cityCode)
+        getOfflineMapManager().downloadByCityCode(cityCode)
       }
     }
   }
@@ -335,9 +354,10 @@ class ExpoGaodeMapOfflineModule : Module() {
     if (downName == null) return
     
     // downName 可能是城市代码或城市名称,尝试两种方式查找
-    var city = offlineMapManager?.getItemByCityCode(downName)
+    val manager = offlineMapManager ?: return
+    var city = manager.getItemByCityCode(downName)
     if (city == null) {
-      city = offlineMapManager?.offlineMapCityList?.find { it.city == downName }
+      city = manager.offlineMapCityList?.find { it.city == downName }
     }
     
     if (city == null) return
@@ -446,9 +466,9 @@ class ExpoGaodeMapOfflineModule : Module() {
       putString("cityName", city.city)
       putLong("size", city.size)
       putString("status", status)
-      putInt("progress", city.getcompleteCode())
+      putInt("progress", getDownloadProgress(city))
       putString("version", city.version)
-      putLong("downloadedSize", (city.size * city.getcompleteCode() / 100))
+      putLong("downloadedSize", (city.size * getDownloadProgress(city) / 100))
     }
   }
   
@@ -461,12 +481,54 @@ class ExpoGaodeMapOfflineModule : Module() {
       putString("cityName", province.provinceName)
       putLong("size", province.size)
       putString("status", getStatusString(province.state))
-      putInt("progress", province.getcompleteCode())
+      putInt("progress", getDownloadProgress(province))
       putString("version", province.version)
       putString("provinceName", province.provinceName)
       putString("provinceCode", province.provinceCode)
     }
   }
+
+  /**
+   * 兼容获取 START_DOWNLOAD_FAILED 状态码
+   * 国内版拼写为 START_DOWNLOAD_FAILD，Google Play 版修正为 START_DOWNLOAD_FAILED
+   */
+  private val startDownloadFailedCode: Int by lazy {
+    try {
+      OfflineMapStatus::class.java.getField("START_DOWNLOAD_FAILED").getInt(null)
+    } catch (e: Exception) {
+      try {
+        OfflineMapStatus::class.java.getField("START_DOWNLOAD_FAILD").getInt(null)
+      } catch (e2: Exception) {
+        -1
+      }
+    }
+  }
+
+  /**
+   * 兼容获取下载进度
+   * Google Play 版本 SDK 可能修复了 getcompleteCode 的命名或使用了不同的 API
+   */
+  private fun getDownloadProgress(obj: Any): Int {
+    try {
+      // 尝试标准版的命名 (getcompleteCode)
+      val method = obj.javaClass.getMethod("getcompleteCode")
+      return method.invoke(obj) as Int
+    } catch (e: Exception) {
+      try {
+        // 尝试修正后的命名 (getCompleteCode) - Google Play 版本可能使用此命名
+        val method = obj.javaClass.getMethod("getCompleteCode")
+        return method.invoke(obj) as Int
+      } catch (e2: Exception) {
+        // 如果都失败了，尝试直接访问 completeCode 字段
+         try {
+             val field = obj.javaClass.getField("completeCode")
+             return field.getInt(obj)
+         } catch (e3: Exception) {
+             return 0
+         }
+      }
+    }
+  }
   
   /**
    * 获取状态字符串
@@ -484,10 +546,10 @@ class ExpoGaodeMapOfflineModule : Module() {
       OfflineMapStatus.EXCEPTION_NETWORK_LOADING -> "downloading"  // 网络问题,可继续
       OfflineMapStatus.EXCEPTION_AMAP -> "failed"  // 认证异常
       OfflineMapStatus.EXCEPTION_SDCARD -> "failed"  // SD卡异常
-      OfflineMapStatus.START_DOWNLOAD_FAILD -> "failed"  // 开始下载失败
+      startDownloadFailedCode -> "failed"  // 兼容两种拼写的开始下载失败
       OfflineMapStatus.CHECKUPDATES -> "not_downloaded"
       OfflineMapStatus.NEW_VERSION -> "not_downloaded"
       else -> "not_downloaded"
     }
   }
-}
+}