expo-gaode-map 2.2.26-next.1 → 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
@@ -222,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 {

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,26 +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() // 初始化定位管理器
-          
-          // 打印当前 SDK 版本信息，便于验证依赖来源
-          android.util.Log.i("ExpoGaodeMap", "✅ SDK 初始化完成 - Version: ${MapsInitializer.getVersion()}")
-
-          // 初始化成功后自动触发一次预加载
-          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 是否开启
@@ -893,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
@@ -532,4 +552,4 @@ class ExpoGaodeMapOfflineModule : Module() {
       else -> "not_downloaded"
     }
   }
-}
+}

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

@@ -5,7 +5,7 @@ import android.content.Context
 import android.view.View
 import android.view.ViewGroup
 import com.amap.api.maps.AMap
-import com.amap.api.maps.MapView
+import com.amap.api.maps.TextureMapView
 import com.amap.api.maps.MapsInitializer
 import com.amap.api.maps.model.LatLng
 import expo.modules.kotlin.AppContext
@@ -13,6 +13,7 @@ import expo.modules.kotlin.viewevent.EventDispatcher
 import expo.modules.kotlin.views.ExpoView
 import expo.modules.gaodemap.managers.CameraManager
 import expo.modules.gaodemap.managers.UIManager
+import expo.modules.gaodemap.modules.SDKInitializer
 import expo.modules.gaodemap.overlays.*
 import androidx.core.graphics.createBitmap
 import androidx.core.view.isVisible
@@ -64,23 +65,11 @@ class ExpoGaodeMapView(context: Context, appContext: AppContext) : ExpoView(cont
     private val onCameraMove by EventDispatcher()
     private val onCameraIdle by EventDispatcher()
 
-    // 事件节流控制
-    /** 相机移动事件节流间隔(毫秒) */
-    private val CAMERA_MOVE_THROTTLE_MS = 100L
-    /** 上次触发相机移动事件的时间戳 */
-    private var lastCameraMoveTime = 0L
-    /** 缓存的相机移动事件数据 */
+    // 缓存的相机移动事件数据
     private var pendingCameraMoveData: Map<String, Any>? = null
-    /** 节流定时器 Runnable */
-    private val throttleRunnable = Runnable {
-        pendingCameraMoveData?.let { data ->
-            onCameraMove(data)
-            pendingCameraMoveData = null
-        }
-    }
 
     // 高德地图视图
-    private lateinit var mapView: MapView
+    private lateinit var mapView: TextureMapView
     private lateinit var aMap: AMap
 
     // 管理器
@@ -93,22 +82,11 @@ class ExpoGaodeMapView(context: Context, appContext: AppContext) : ExpoView(cont
 
     init {
         try {
-            // 确保隐私合规已设置
-            MapsInitializer.updatePrivacyShow(context, true, true)
-            MapsInitializer.updatePrivacyAgree(context, true)
+            SDKInitializer.applyPrivacyState(context)
 
-            // 尝试从预加载池获取 MapView
-            val preloadedMapView = MapPreloadManager.getPreloadedMapView()
-            
-            if (preloadedMapView != null) {
-                mapView = preloadedMapView
-                android.util.Log.i("ExpoGaodeMapView", "🚀 使用预加载的 MapView 实例")
-            } else {
-                // 创建地图视图
-                mapView = MapView(context)
-                mapView.onCreate(null)
-                android.util.Log.i("ExpoGaodeMapView", "⚠️ 创建新的 MapView 实例 (未命中预加载池)")
-            }
+            // 创建地图视图 - 使用 TextureMapView 以支持截图
+            mapView = TextureMapView(context)
+            mapView.onCreate(null)
             
             aMap = mapView.map
 
@@ -184,7 +162,6 @@ class ExpoGaodeMapView(context: Context, appContext: AppContext) : ExpoView(cont
 
                 // 相机移动中 - 应用节流优化
                 cameraPosition?.let {
-                    val currentTime = System.currentTimeMillis()
                     val visibleRegion = aMap.projection.visibleRegion
                     val eventData = mapOf(
                         "cameraPosition" to mapOf(
@@ -208,23 +185,16 @@ class ExpoGaodeMapView(context: Context, appContext: AppContext) : ExpoView(cont
                         )
                     )
                     
-                    // 节流逻辑：100ms 内只触发一次
-                    if (currentTime - lastCameraMoveTime >= CAMERA_MOVE_THROTTLE_MS) {
-                        // 超过节流时间，立即触发事件
-                        lastCameraMoveTime = currentTime
-                        onCameraMove(eventData)
-                        // 清除待处理的事件和定时器
-                        mainHandler.removeCallbacks(throttleRunnable)
-                        pendingCameraMoveData = null
-                    } else {
-                        // 在节流时间内，缓存事件数据，使用定时器延迟触发
-                        pendingCameraMoveData = eventData
-                        mainHandler.removeCallbacks(throttleRunnable)
-                        mainHandler.postDelayed(
-                            throttleRunnable,
-                            CAMERA_MOVE_THROTTLE_MS - (currentTime - lastCameraMoveTime)
-                        )
-                    }
+                    // 使用 onCameraMove 自身的节流机制（如果在 Module 定义中配置了 Coalescing）
+                    // 或者在这里简单发送，让 JS 端处理节流，或者依赖 Expo 的事件批处理
+                    // 这里我们移除自定义的 Handler 实现，直接发送事件，简化代码逻辑
+                    // 注意：高德地图的 onCameraChange 调用频率非常高，
+                    // 建议在 Module 定义中使用 Events("onCameraMove") 时考虑是否需要原生侧节流
+                    // 目前 Expo Modules 默认没有自动节流，但为了代码简洁和避免 Handler 泄漏风险，
+                    // 我们可以依赖 JS 端的 debounce/throttle，或者如果性能是瓶颈，再加回轻量级的节流。
+                    // 鉴于之前的 Handler 实现比较复杂且容易出错，我们先简化。
+                    
+                     onCameraMove(eventData)
                 }
             }
 
@@ -493,27 +463,34 @@ class ExpoGaodeMapView(context: Context, appContext: AppContext) : ExpoView(cont
         
         aMap.getMapScreenShot(object : AMap.OnMapScreenShotListener {
             override fun onMapScreenShot(bitmap: android.graphics.Bitmap?) {
-                // 如果已经处理过，直接返回
+                // 这个回调通常在旧版 SDK 或部分机型触发
+                // 如果已经处理过（通过带 status 的回调），则忽略
                 if (isSettled.getAndSet(true)) return
                 
-                // 旧版本回调，为了兼容性也处理
-                bitmap?.let { handleSnapshot(it, promise) } ?: run {
-                     promise.reject("SNAPSHOT_FAILED", "Bitmap is null", null)
+                if (bitmap == null) {
+                    promise.reject("SNAPSHOT_FAILED", "Bitmap is null", null)
+                    return
                 }
+                handleSnapshot(bitmap, promise)
             }
 
             override fun onMapScreenShot(bitmap: android.graphics.Bitmap?, status: Int) {
                 // 如果已经处理过，直接返回
                 if (isSettled.getAndSet(true)) return
 
-                // status != 0 表示失败
-                if (status != 0) {
-                    promise.reject("SNAPSHOT_FAILED", "Failed to take snapshot, status code: $status", null)
+                if (bitmap == null) {
+                    promise.reject("SNAPSHOT_FAILED", "Bitmap is null", null)
                     return
                 }
-                bitmap?.let { handleSnapshot(it, promise) } ?: run {
-                    promise.reject("SNAPSHOT_FAILED", "Bitmap is null", null)
+
+                // 根据高德文档：
+                // status != 0 地图渲染完成，截屏无网格
+                // status == 0 地图未渲染完成，截屏有网格
+                if (status == 0) {
+                    android.util.Log.w("ExpoGaodeMapView", "Warning: Map snapshot taken before rendering completed (grid may be visible)")
                 }
+
+                handleSnapshot(bitmap, promise)
             }
         })
     }
@@ -601,10 +578,6 @@ class ExpoGaodeMapView(context: Context, appContext: AppContext) : ExpoView(cont
     @Suppress("unused")
     fun onDestroy() {
                try {
-                   // 清理节流定时器
-                   mainHandler.removeCallbacks(throttleRunnable)
-                   pendingCameraMoveData = null
-                   
                    // 清理 Handler 回调,防止内存泄露
                    mainHandler.removeCallbacksAndMessages(null)
 
@@ -654,7 +627,7 @@ class ExpoGaodeMapView(context: Context, appContext: AppContext) : ExpoView(cont
             return
         }
 
-        if (child is MapView) {
+        if (child is TextureMapView) {
             super.addView(child, index)
             return
         }
@@ -702,7 +675,7 @@ class ExpoGaodeMapView(context: Context, appContext: AppContext) : ExpoView(cont
         try {
             val child = super.getChildAt(index)
 
-            if (child is MapView) {
+            if (child is TextureMapView) {
                 return
             }
 

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

@@ -3,6 +3,16 @@ package expo.modules.gaodemap
 import expo.modules.kotlin.modules.Module
 import expo.modules.kotlin.modules.ModuleDefinition
 
+import expo.modules.kotlin.types.Enumerable
+
+enum class MapType(val value: Int) : Enumerable {
+  STANDARD(1),
+  SATELLITE(2),
+  NIGHT(3),
+  NAVI(4),
+  BUS(5)
+}
+
 /**
  * 高德地图视图 Module
  */
@@ -24,9 +34,9 @@ class ExpoGaodeMapViewModule : Module() {
       }
 
 
-      Prop<Int>("mapType") { view, type ->
-        view.mapType = type
-        view.setMapType(type)
+      Prop<MapType>("mapType") { view, type ->
+        view.mapType = type.value
+        view.setMapType(type.value)
       }
 
       Prop<Map<String, Any?>?>("initialCameraPosition") { view, position ->