expo-gaode-map 2.2.33 → 2.2.34

package/README.md

@@ -6,7 +6,7 @@
 
 ## 📖 完整文档
 
-**👉 [在线文档网站](https://TomWq.github.io/expo-gaode-map/)** · **👉 [示例仓库](https://github.com/TomWq/expo-gaode-map-example)**
+**👉 [在线文档网站](https://TomWq.github.io/expo-gaode-map/)** · **👉 本地示例：[`example/`](../../example) / [`example-navigation/`](../../example-navigation)**
 
 包含完整的 API 文档、使用指南和示例代码：
 - [快速开始](https://TomWq.github.io/expo-gaode-map/guide/getting-started.html)
@@ -15,7 +15,7 @@
 - [导航功能](https://TomWq.github.io/expo-gaode-map/guide/navigation.html)
 - [Web API](https://TomWq.github.io/expo-gaode-map/guide/web-api.html)
 - [API 参考](https://TomWq.github.io/expo-gaode-map/api/)
-- [使用示例](https://github.com/TomWq/expo-gaode-map-example)
+- [本地示例工程](../../example) / [导航示例工程](../../example-navigation)
 
 ## ✨ 主要特性
 
@@ -37,10 +37,16 @@
 
 
 ### 可选模块
-- 🔍 **搜索功能**（expo-gaode-map-search）- POI 搜索、周边搜索、关键字搜索、地理编码等
+- 🔍 **搜索功能** - 已内置在 `expo-gaode-map` 中，提供 POI 搜索、周边搜索、关键字搜索、地理编码等
 - 🧭 **导航功能**（expo-gaode-map-navigation）- 驾车、步行、骑行、货车路径规划，实时导航
 - 🌐 **Web API**（expo-gaode-map-web-api）- 纯 JavaScript 实现的路径规划、地理编码、POI 搜索等
 
+> ⚠️ **Search 模块维护说明**
+>
+> 从下个版本开始，搜索能力已经集成到 `expo-gaode-map`（core）和 `expo-gaode-map-navigation` 的 map 能力中，`expo-gaode-map-search` 将不再作为独立模块继续维护。`2.2.33` 是最后一个支持 `expo-gaode-map-search` 单独集成的版本；新项目请直接从 `expo-gaode-map` 或 `expo-gaode-map-navigation` 导入搜索 API。
+>
+> 高德官方 Android SDK 在 `10.0.700` 之后将远程依赖由“地图 + 定位”调整为“地图 + 定位 + 搜索”，依赖地址从 `com.amap.api:3dmap:latest.integration` 调整为 `com.amap.api:3dmap-location-search:latest.integration`。继续单独维护 search 模块会带来重复合包和依赖冲突成本，因此搜索能力改为随 core / navigation 一起维护。
+
 ## 📦 安装
 
 > ⚠️ **版本兼容性说明**：
@@ -57,7 +63,6 @@
 npm install expo-gaode-map
 
 # 可选模块
-npm install expo-gaode-map-search      # 搜索功能
 npm install expo-gaode-map-web-api     # Web API
 ```
 
@@ -104,7 +109,7 @@ npx expo run:ios
 
 详细的初始化和使用指南请查看：
 - 📖 [快速开始文档](https://TomWq.github.io/expo-gaode-map/guide/getting-started.html)
-- 💻 [完整示例代码](https://github.com/TomWq/expo-gaode-map-example)
+- 💻 [地图示例工程](../../example) / [导航示例工程](../../example-navigation)
 
 ## 📚 功能模块对比
 
@@ -113,8 +118,8 @@ npx expo run:ios
 | 地图显示 | ✅ | ❌ | ✅ | ❌ |
 | 定位 | ✅ | ❌ | ✅ | ❌ |
 | 覆盖物 | ✅ | ❌ | ✅ | ❌ |
-| POI 搜索 | ❌ | ✅ | ❌ | ✅ |
-| 地理编码 | ❌ | ✅ | ❌ | ✅ |
+| POI 搜索 | ✅ | ⚠️ 2.2.33 及以下 | ✅ | ✅ |
+| 地理编码 | ✅ | ⚠️ 2.2.33 及以下 | ✅ | ✅ |
 | 路径规划 | ❌ | ❌ | ✅ | ✅ |
 | 实时导航 | ❌ | ❌ | ✅ | ❌ |
 | 平台 | 原生 | 原生 | 原生 | Web/原生 |
@@ -125,11 +130,11 @@ npx expo run:ios
 expo-gaode-map/
 ├── packages/
 │   ├── core/                    # expo-gaode-map（核心包）
-│   │   └── 地图显示、定位、覆盖物
-│   ├── search/                  # expo-gaode-map-search（搜索包）
-│   │   └── POI 搜索、地理编码
+│   │   └── 地图显示、定位、覆盖物、搜索
+│   ├── search/                  # expo-gaode-map-search（独立搜索包，2.2.33 后不再维护）
+│   │   └── POI 搜索、地理编码（历史兼容）
 │   ├── navigation/              # expo-gaode-map-navigation（导航包）
-│   │   └── 地图+导航（替代 core）
+│   │   └── 地图+搜索+导航（替代 core）
 │   └── web-api/                 # expo-gaode-map-web-api（Web API）
 │       └── 纯 JS 实现的POI 搜索、地理编码、路径规划等
 └── 注意：core 和 navigation 不能同时安装
@@ -145,7 +150,8 @@ expo-gaode-map/
 
 ### 2. 搜索功能和 Web API 有什么区别？
 
-- **搜索包**（`expo-gaode-map-search`）：原生实现，性能更好，无需网络请求，需要配置原生环境
+- **内置原生搜索**（`expo-gaode-map` / `expo-gaode-map-navigation`）：原生实现，性能更好，无需网络请求，需要配置原生环境
+- **独立搜索包**（`expo-gaode-map-search`）：仅建议历史项目固定 `2.2.33` 使用，后续不再单独维护
 - **Web API**（`expo-gaode-map-web-api`）：纯 JavaScript，无需原生配置，跨平台更好，需要网络请求，但功能更加强大和完善
 
 ### 3. 如何配置 API Key？
@@ -231,8 +237,8 @@ MIT
 - [错误处理指南](./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)
+- [地图示例工程](../../example)
+- [导航示例工程](../../example-navigation)
 - [高德地图开放平台](https://lbs.amap.com/)
 - [Expo Modules API](https://docs.expo.dev/modules/overview/)
 

package/android/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 
 group = 'expo.modules.gaodemap'
-version = '2.2.11'
+version = '2.2.34'
 
 def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
 apply from: expoModulesCorePlugin
@@ -38,7 +38,7 @@ android {
   namespace "expo.modules.gaodemap"
   defaultConfig {
     versionCode 1
-    versionName "2.2.11"
+    versionName "2.2.34"
     externalNativeBuild {
       cmake {
         cppFlags "-std=c++17"
@@ -55,8 +55,10 @@ android {
   }
 }
 
+
+
 dependencies {
-    // 高德地图 3D SDK
+    // 高德地图组合 SDK：地图 + 定位 + 搜索。
     def customSdkPath = null
     println "ExpoGaodeMap: Checking for custom SDK property in rootProject: ${rootProject.name}"
     if (rootProject.hasProperty("EXPO_GAODE_MAP_CUSTOM_SDK_PATH")) {
@@ -80,6 +82,8 @@ dependencies {
             throw new FileNotFoundException("ExpoGaodeMap: Could not find custom SDK at ${customSdkPath}. Please check your customMapSdkPath configuration.")
         }
     } else {
-        implementation ('com.amap.api:3dmap:latest.integration')
+        // 10.1.600 is the last Android 3D map SDK line that supports offline
+        // map downloads without the separate 11.x offline-download permission.
+        implementation('com.amap.api:3dmap-location-search:10.1.700_loc6.5.1_sea9.7.4')
     }
 }

package/android/src/main/AndroidManifest.xml

@@ -5,6 +5,14 @@
   <uses-permission android:name="android.permission.INTERNET" />
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
   <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+
+  <!-- 离线地图读写本地地图包 (Android 12 及以下) -->
+  <uses-permission
+    android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+    android:maxSdkVersion="32" />
+  <uses-permission
+    android:name="android.permission.READ_EXTERNAL_STORAGE"
+    android:maxSdkVersion="32" />
   
   <application allowBackup="false" >
   
@@ -13,6 +21,12 @@
       android:name="com.amap.api.location.APSService"
       android:enabled="true"
       android:exported="false" />
+
+    <!-- 高德 3D 地图 SDK 官方离线地图 UI 组件 -->
+    <activity
+      android:name="com.amap.api.maps.offlinemap.OfflineMapActivity"
+      android:screenOrientation="portrait"
+      android:exported="false" />
     
   </application>
   

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

@@ -1,7 +1,6 @@
 package expo.modules.gaodemap
 
 import com.amap.api.maps.MapsInitializer
-import com.amap.api.maps.model.LatLng
 import expo.modules.kotlin.modules.Module
 import expo.modules.kotlin.modules.ModuleDefinition
 import expo.modules.gaodemap.modules.SDKInitializer
@@ -170,8 +169,8 @@ class ExpoGaodeMapModule : Module() {
     AsyncFunction("coordinateConvert") { coordinate: Map<String, Any>?, type: Int, promise: expo.modules.kotlin.Promise ->
       val latLng = LatLngParser.parseLatLng(coordinate)
       if (latLng != null) {
-        val coordMap = mapOf("latitude" to latLng.latitude, "longitude" to latLng.longitude)
-        getLocationManager().coordinateConvert(coordMap, type, promise)
+        val cordMap = mapOf("latitude" to latLng.latitude, "longitude" to latLng.longitude)
+        getLocationManager().coordinateConvert(cordMap, type, promise)
       } else {
         promise.reject("INVALID_COORDINATE", "Invalid coordinate format", null)
       }
@@ -186,10 +185,10 @@ class ExpoGaodeMapModule : Module() {
      * @returns 两点之间的距离（单位：米）
      */
     Function("distanceBetweenCoordinates") { p1: Map<String, Any>?, p2: Map<String, Any>? ->
-      val coord1 = LatLngParser.parseLatLng(p1)
-      val coord2 = LatLngParser.parseLatLng(p2)
-      if (coord1 != null && coord2 != null) {
-        GeometryUtils.calculateDistance(coord1, coord2)
+      val cord1 = LatLngParser.parseLatLng(p1)
+      val cord2 = LatLngParser.parseLatLng(p2)
+      if (cord1 != null && cord2 != null) {
+        GeometryUtils.calculateDistance(cord1, cord2)
       } else {
         0.0
       }
@@ -580,7 +579,7 @@ class ExpoGaodeMapModule : Module() {
      * @param gridSizeMeters 网格大小（米）
      */
     Function("generateHeatmapGrid") { points: List<Map<String, Any>>?, gridSizeMeters: Double ->
-      if (points == null || points.isEmpty()) return@Function emptyList<Map<String, Any>>()
+      if (points.isNullOrEmpty()) return@Function emptyList<Map<String, Any>>()
       
       val count = points.size
       val latitudes = DoubleArray(count)

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

@@ -1,8 +1,13 @@
 package expo.modules.gaodemap
 
+import android.app.Activity
+import android.content.Context
+import android.content.Intent
 import android.os.Bundle
 import android.os.StatFs
 import android.os.Environment
+import android.util.Log
+import com.amap.api.maps.offlinemap.OfflineMapActivity
 import com.amap.api.maps.offlinemap.OfflineMapCity
 import com.amap.api.maps.offlinemap.OfflineMapManager
 import com.amap.api.maps.offlinemap.OfflineMapProvince
@@ -17,6 +22,7 @@ import expo.modules.kotlin.modules.ModuleDefinition
  */
 class ExpoGaodeMapOfflineModule : Module() {
   
+  private val logTag = "ExpoGaodeMapOffline"
   private var offlineMapManager: OfflineMapManager? = null
   private val downloadingCities = mutableSetOf<String>()
   private val pausedCities = mutableSetOf<String>()
@@ -39,6 +45,11 @@ class ExpoGaodeMapOfflineModule : Module() {
   }
 
   private fun getOfflineMapManager(): OfflineMapManager {
+    val reactContext = appContext.reactContext
+      ?: throw CodedException("NO_CONTEXT", "React context not available", null)
+
+    SDKInitializer.restorePersistedState(reactContext.applicationContext)
+
     if (!SDKInitializer.isPrivacyReady()) {
       throw CodedException(
         "PRIVACY_NOT_AGREED",
@@ -47,9 +58,6 @@ class ExpoGaodeMapOfflineModule : Module() {
       )
     }
 
-    val reactContext = appContext.reactContext
-      ?: throw CodedException("NO_CONTEXT", "React context not available", null)
-
     if (offlineMapManager == null) {
       offlineMapManager = OfflineMapManager(
         reactContext.applicationContext,
@@ -59,6 +67,31 @@ class ExpoGaodeMapOfflineModule : Module() {
 
     return offlineMapManager!!
   }
+
+  private fun getActivityLaunchContext(): Context {
+    return appContext.currentActivity
+      ?: appContext.reactContext
+      ?: throw CodedException("NO_CONTEXT", "React context not available", null)
+  }
+
+  private fun openOfflineMapUI() {
+    val context = getActivityLaunchContext()
+    SDKInitializer.restorePersistedState(context.applicationContext)
+
+    if (!SDKInitializer.isPrivacyReady()) {
+      throw CodedException(
+        "PRIVACY_NOT_AGREED",
+        "隐私协议未完成确认，请先调用 setPrivacyConfig",
+        null
+      )
+    }
+
+    val intent = Intent(context, OfflineMapActivity::class.java)
+    if (context !is Activity) {
+      intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+    }
+    context.startActivity(intent)
+  }
   
   override fun definition() = ModuleDefinition {
     Name("ExpoGaodeMapOffline")
@@ -79,12 +112,18 @@ class ExpoGaodeMapOfflineModule : Module() {
       offlineMapManager = null
       downloadingCities.clear()
     }
+
+    AsyncFunction("openOfflineMapUI") {
+      openOfflineMapUI()
+    }
     
     // ==================== 地图列表管理 ====================
     
     AsyncFunction("getAvailableCities") {
-      val cities = getOfflineMapManager().offlineMapCityList ?: emptyList()
-      cities.map { city -> convertCityToMap(city) }
+      val manager = getOfflineMapManager()
+      val cities = manager.offlineMapCityList ?: emptyList()
+      val downloadedCityKeys = getDownloadedCityKeys(manager)
+      cities.map { city -> convertCityToMap(city, downloadedCityKeys) }
     }
     
     AsyncFunction("getAvailableProvinces") {
@@ -93,15 +132,19 @@ class ExpoGaodeMapOfflineModule : Module() {
     }
     
     AsyncFunction("getCitiesByProvince") { provinceCode: String ->
-      val province = getOfflineMapManager().offlineMapProvinceList?.find { 
+      val manager = getOfflineMapManager()
+      val province = manager.offlineMapProvinceList?.find {
         it.provinceCode == provinceCode 
       }
-      province?.cityList?.map { city -> convertCityToMap(city) } ?: emptyList()
+      val downloadedCityKeys = getDownloadedCityKeys(manager)
+      province?.cityList?.map { city -> convertCityToMap(city, downloadedCityKeys) } ?: emptyList()
     }
     
     AsyncFunction("getDownloadedMaps") {
-      val cities = getOfflineMapManager().downloadOfflineMapCityList ?: emptyList()
-      cities.map { city -> convertCityToMap(city) }
+      val manager = getOfflineMapManager()
+      val cities = manager.downloadOfflineMapCityList ?: emptyList()
+      val downloadedCityKeys = getDownloadedCityKeys(manager)
+      cities.map { city -> convertCityToMap(city, downloadedCityKeys) }
     }
     
     // ==================== 下载管理 ====================
@@ -114,7 +157,7 @@ class ExpoGaodeMapOfflineModule : Module() {
         downloadingCities.add(cityCode)
         pausedCities.remove(cityCode)
       }
-      getOfflineMapManager().downloadByCityCode(cityCode)
+      startCityDownload(getOfflineMapManager(), cityCode, "startDownload")
     }
     
     AsyncFunction("pauseDownload") { cityCode: String ->
@@ -145,7 +188,7 @@ class ExpoGaodeMapOfflineModule : Module() {
       }
       // Android SDK 没有针对单个城市的恢复方法
       // 需要重新调用 downloadByCityCode 来继续下载
-      getOfflineMapManager().downloadByCityCode(cityCode)
+      startCityDownload(getOfflineMapManager(), cityCode, "resumeDownload")
     }
     
     AsyncFunction("cancelDownload") { cityCode: String ->
@@ -195,14 +238,17 @@ class ExpoGaodeMapOfflineModule : Module() {
     // ==================== 状态查询 ====================
     
     AsyncFunction("isMapDownloaded") { cityCode: String ->
-      val city = getOfflineMapManager().getItemByCityCode(cityCode)
-      city?.state == OfflineMapStatus.SUCCESS || 
-      city?.state == OfflineMapStatus.CHECKUPDATES
+      val manager = getOfflineMapManager()
+      val city = manager.getItemByCityCode(cityCode)
+      city?.state == OfflineMapStatus.SUCCESS ||
+        city?.let { isDownloadedCity(it, getDownloadedCityKeys(manager)) } == true
     }
     
     AsyncFunction("getMapStatus") { cityCode: String ->
-      val city = getOfflineMapManager().getItemByCityCode(cityCode)
-      city?.let { convertCityToMap(it) } ?: Bundle()
+      val manager = getOfflineMapManager()
+      val city = manager.getItemByCityCode(cityCode)
+      val downloadedCityKeys = getDownloadedCityKeys(manager)
+      city?.let { convertCityToMap(it, downloadedCityKeys) } ?: Bundle()
     }
     
     AsyncFunction("getTotalProgress") {
@@ -279,7 +325,7 @@ class ExpoGaodeMapOfflineModule : Module() {
         }
       }
       cityCodes.forEach { cityCode ->
-        getOfflineMapManager().downloadByCityCode(cityCode)
+        startCityDownload(getOfflineMapManager(), cityCode, "batchDownload")
       }
     }
     
@@ -340,17 +386,53 @@ class ExpoGaodeMapOfflineModule : Module() {
           downloadingCities.add(cityCode)
           pausedCities.remove(cityCode)
         }
-        getOfflineMapManager().downloadByCityCode(cityCode)
+        startCityDownload(getOfflineMapManager(), cityCode, "resumeAllDownloads")
       }
     }
   }
   
   // ==================== 辅助方法 ====================
+
+  private fun findCity(manager: OfflineMapManager, cityCode: String): OfflineMapCity? {
+    return manager.getItemByCityCode(cityCode)
+      ?: manager.offlineMapCityList?.find { it.code == cityCode || it.adcode == cityCode }
+  }
+
+  private fun startCityDownload(manager: OfflineMapManager, cityCode: String, action: String) {
+    val city = findCity(manager, cityCode)
+      ?: throw IllegalArgumentException("City not found: $cityCode")
+
+    logCityBeforeDownload(city, cityCode, action)
+    downloadCity(manager, city)
+  }
+
+  private fun downloadCity(manager: OfflineMapManager, city: OfflineMapCity) {
+    try {
+      manager.downloadByCityCode(city.code)
+      return
+    } catch (codeError: Exception) {
+      Log.w(logTag, "downloadByCityCode failed cityCode=${city.code} cityName=${city.city} error=${codeError.message}")
+      try {
+        manager.downloadByCityName(city.city)
+      } catch (nameError: Exception) {
+        throw IllegalStateException(
+          "离线地图下载失败: cityCode=${city.code}, cityName=${city.city}, codeError=${codeError.message}, nameError=${nameError.message}",
+          nameError
+        )
+      }
+    }
+  }
+
+  private fun logCityBeforeDownload(city: OfflineMapCity?, cityCode: String, action: String) {
+    Log.i(logTag, "$action cityCode=$cityCode cityName=${city?.city} code=${city?.code} adcode=${city?.adcode} state=${city?.state} progress=${city?.let { getDownloadProgress(it) }} size=${city?.size} url=${city?.url}")
+  }
   
   /**
    * 处理下载状态回调
    */
   private fun handleDownloadStatus(status: Int, completeCode: Int, downName: String?) {
+    Log.i(logTag, "onDownload raw status=$status completeCode=$completeCode downName=$downName")
+
     if (downName == null) return
     
     // downName 可能是城市代码或城市名称,尝试两种方式查找
@@ -360,10 +442,14 @@ class ExpoGaodeMapOfflineModule : Module() {
       city = manager.offlineMapCityList?.find { it.city == downName }
     }
     
-    if (city == null) return
+    if (city == null) {
+      Log.w(logTag, "onDownload city not found for downName=$downName status=$status completeCode=$completeCode")
+      return
+    }
     
     val cityCode = city.code
     val cityName = city.city
+    Log.i(logTag, "onDownload city cityCode=$cityCode cityName=$cityName adcode=${city.adcode} state=${city.state} progress=${getDownloadProgress(city)} size=${city.size} url=${city.url} status=$status completeCode=$completeCode")
     
     when (status) {
       OfflineMapStatus.SUCCESS -> {
@@ -404,6 +490,18 @@ class ExpoGaodeMapOfflineModule : Module() {
           putString("error", "解压失败,数据可能有问题")
         })
       }
+
+      startDownloadFailedCode -> {
+        synchronized(lock) {
+          downloadingCities.remove(cityCode)
+        }
+        sendEvent("onDownloadError", Bundle().apply {
+          putString("cityCode", cityCode)
+          putString("cityName", cityName)
+          putString("error", "下载地址为空或离线包不可用")
+          putInt("errorCode", status)
+        })
+      }
       
       OfflineMapStatus.EXCEPTION_NETWORK_LOADING -> {
         sendEvent("onDownloadError", Bundle().apply {
@@ -451,13 +549,37 @@ class ExpoGaodeMapOfflineModule : Module() {
   /**
    * 转换城市对象为 Map
    */
-  private fun convertCityToMap(city: OfflineMapCity): Bundle {
+  private fun getDownloadedCityKeys(manager: OfflineMapManager): Set<String> {
+    return manager.downloadOfflineMapCityList
+      ?.flatMap { getCityIdentityKeys(it) }
+      ?.toSet()
+      ?: emptySet()
+  }
+
+  private fun getCityIdentityKeys(city: OfflineMapCity): List<String> {
+    return listOfNotNull(
+      city.code?.trim()?.takeIf { it.isNotEmpty() }?.let { "code:$it" },
+      city.adcode?.trim()?.takeIf { it.isNotEmpty() }?.let { "adcode:$it" },
+      city.city?.trim()?.takeIf { it.isNotEmpty() }?.let { "name:$it" }
+    )
+  }
+
+  private fun isDownloadedCity(city: OfflineMapCity, downloadedCityKeys: Set<String>): Boolean {
+    return getCityIdentityKeys(city).any { downloadedCityKeys.contains(it) }
+  }
+
+  private fun convertCityToMap(
+    city: OfflineMapCity,
+    downloadedCityKeys: Set<String> = emptySet()
+  ): Bundle {
     val isPaused = synchronized(lock) { pausedCities.contains(city.code) }
     val isDownloading = synchronized(lock) { downloadingCities.contains(city.code) }
+    val isDownloaded = isDownloadedCity(city, downloadedCityKeys)
     
     val status = when {
       isPaused -> "paused"
       isDownloading -> "downloading"
+      isDownloaded -> "downloaded"
       else -> getStatusString(city.state)
     }
     
@@ -495,10 +617,10 @@ class ExpoGaodeMapOfflineModule : Module() {
   private val startDownloadFailedCode: Int by lazy {
     try {
       OfflineMapStatus::class.java.getField("START_DOWNLOAD_FAILED").getInt(null)
-    } catch (e: Exception) {
+    } catch (_: Exception) {
       try {
         OfflineMapStatus::class.java.getField("START_DOWNLOAD_FAILD").getInt(null)
-      } catch (e2: Exception) {
+      } catch (_: Exception) {
         -1
       }
     }
@@ -513,17 +635,17 @@ class ExpoGaodeMapOfflineModule : Module() {
       // 尝试标准版的命名 (getcompleteCode)
       val method = obj.javaClass.getMethod("getcompleteCode")
       return method.invoke(obj) as Int
-    } catch (e: Exception) {
+    } catch (_: Exception) {
       try {
         // 尝试修正后的命名 (getCompleteCode) - Google Play 版本可能使用此命名
         val method = obj.javaClass.getMethod("getCompleteCode")
         return method.invoke(obj) as Int
-      } catch (e2: Exception) {
+      } catch (_: Exception) {
         // 如果都失败了，尝试直接访问 completeCode 字段
          try {
              val field = obj.javaClass.getField("completeCode")
              return field.getInt(obj)
-         } catch (e3: Exception) {
+         } catch (_: Exception) {
              return 0
          }
       }
@@ -531,8 +653,9 @@ class ExpoGaodeMapOfflineModule : Module() {
   }
   
   /**
-   * 获取状态字符串
-   * 注意：只有 SUCCESS 状态才表示真正下载完成
+   * 获取状态字符串。
+   * CHECKUPDATES / NEW_VERSION 在 10.1.600 冷启动时可能出现在普通城市列表,
+   * 不能单独作为已下载依据；已下载状态以 downloadOfflineMapCityList 为准。
    */
   private fun getStatusString(state: Int): String {
     return when (state) {

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

@@ -7,7 +7,6 @@ import android.view.View
 import android.view.ViewGroup
 import com.amap.api.maps.AMap
 import com.amap.api.maps.TextureMapView
-import com.amap.api.maps.MapsInitializer
 import com.amap.api.maps.model.LatLng
 import expo.modules.kotlin.AppContext
 import expo.modules.kotlin.viewevent.EventDispatcher
@@ -19,6 +18,7 @@ import expo.modules.gaodemap.overlays.*
 import androidx.core.graphics.createBitmap
 import androidx.core.view.isVisible
 import androidx.core.graphics.withTranslation
+import androidx.core.view.isGone
 
 /**
  * 高德地图视图组件
@@ -50,20 +50,20 @@ class ExpoGaodeMapView(context: Context, appContext: AppContext) : ExpoView(cont
     }
 
     override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
-        val measuredWidth = View.MeasureSpec.getSize(widthMeasureSpec)
-        val measuredHeight = View.MeasureSpec.getSize(heightMeasureSpec)
+        val measuredWidth = MeasureSpec.getSize(widthMeasureSpec)
+        val measuredHeight = MeasureSpec.getSize(heightMeasureSpec)
 
         setMeasuredDimension(measuredWidth, measuredHeight)
 
         for (i in 0 until childCount) {
             val child = getChildAt(i) ?: continue
-            if (child.visibility == View.GONE) {
+            if (child.isGone) {
                 continue
             }
 
             if (child === mapView) {
-                val childWidthSpec = View.MeasureSpec.makeMeasureSpec(measuredWidth, View.MeasureSpec.EXACTLY)
-                val childHeightSpec = View.MeasureSpec.makeMeasureSpec(measuredHeight, View.MeasureSpec.EXACTLY)
+                val childWidthSpec = MeasureSpec.makeMeasureSpec(measuredWidth, MeasureSpec.EXACTLY)
+                val childHeightSpec = MeasureSpec.makeMeasureSpec(measuredHeight, MeasureSpec.EXACTLY)
                 child.measure(childWidthSpec, childHeightSpec)
                 continue
             }
@@ -71,15 +71,15 @@ class ExpoGaodeMapView(context: Context, appContext: AppContext) : ExpoView(cont
             val lp = child.layoutParams
             val childWidthSpec = when {
                 lp?.width != null && lp.width > 0 ->
-                    View.MeasureSpec.makeMeasureSpec(lp.width, View.MeasureSpec.EXACTLY)
+                    MeasureSpec.makeMeasureSpec(lp.width, MeasureSpec.EXACTLY)
                 else ->
-                    View.MeasureSpec.makeMeasureSpec(measuredWidth, View.MeasureSpec.AT_MOST)
+                    MeasureSpec.makeMeasureSpec(measuredWidth, MeasureSpec.AT_MOST)
             }
             val childHeightSpec = when {
                 lp?.height != null && lp.height > 0 ->
-                    View.MeasureSpec.makeMeasureSpec(lp.height, View.MeasureSpec.EXACTLY)
+                    MeasureSpec.makeMeasureSpec(lp.height, MeasureSpec.EXACTLY)
                 else ->
-                    View.MeasureSpec.makeMeasureSpec(measuredHeight, View.MeasureSpec.AT_MOST)
+                    MeasureSpec.makeMeasureSpec(measuredHeight, MeasureSpec.AT_MOST)
             }
             child.measure(childWidthSpec, childHeightSpec)
         }
@@ -91,7 +91,7 @@ class ExpoGaodeMapView(context: Context, appContext: AppContext) : ExpoView(cont
 
         for (i in 0 until childCount) {
             val child = getChildAt(i) ?: continue
-            if (child.visibility == View.GONE) {
+            if (child.isGone) {
                 continue
             }
 
@@ -150,6 +150,7 @@ class ExpoGaodeMapView(context: Context, appContext: AppContext) : ExpoView(cont
     // 缓存初始相机位置，等待地图加载完成后设置
     private var pendingCameraPosition: Map<String, Any?>? = null
     private var isMapLoaded = false
+    private var hasAppliedInitialCameraPosition = false
 
     init {
         try {
@@ -192,7 +193,7 @@ class ExpoGaodeMapView(context: Context, appContext: AppContext) : ExpoView(cont
 
                 val positionToApply = initialCameraPosition ?: pendingCameraPosition
                 positionToApply?.let { position ->
-                    applyInitialCameraPosition(position)
+                    applyInitialCameraPositionIfNeeded(position)
                     pendingCameraPosition = null
                 }
 
@@ -352,10 +353,14 @@ class ExpoGaodeMapView(context: Context, appContext: AppContext) : ExpoView(cont
     fun setInitialCameraPosition(position: Map<String, Any?>) {
         initialCameraPosition = position
 
+        if (hasAppliedInitialCameraPosition) {
+            return
+        }
+
         // 如果地图已加载,立即应用;否则缓存等待地图加载完成
         if (isMapLoaded) {
             mainHandler.post {
-                applyInitialCameraPosition(position)
+                applyInitialCameraPositionIfNeeded(position)
             }
         } else {
             pendingCameraPosition = position
@@ -366,8 +371,12 @@ class ExpoGaodeMapView(context: Context, appContext: AppContext) : ExpoView(cont
      * 实际应用相机位置
      * @param position 相机位置配置
      */
-    private fun applyInitialCameraPosition(position: Map<String, Any?>) {
+    private fun applyInitialCameraPositionIfNeeded(position: Map<String, Any?>) {
+        if (hasAppliedInitialCameraPosition) {
+            return
+        }
         cameraManager.setInitialCameraPosition(position)
+        hasAppliedInitialCameraPosition = true
     }
 
     // ==================== UI 控件和手势 ====================
@@ -649,6 +658,7 @@ class ExpoGaodeMapView(context: Context, appContext: AppContext) : ExpoView(cont
 
             // 销毁地图实例
             mapView.onDestroy()
+            hasAppliedInitialCameraPosition = false
         } catch (e: Exception) {
             // 静默处理异常,确保销毁流程不会中断
             android.util.Log.e("ExpoGaodeMapView", "Error destroying map", e)