expo-gaode-map 2.2.26-next.1 → 2.2.26

package/README.md

@@ -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/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/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
@@ -64,23 +64,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
 
     // 管理器
@@ -97,18 +85,9 @@ class ExpoGaodeMapView(context: Context, appContext: AppContext) : ExpoView(cont
             MapsInitializer.updatePrivacyShow(context, true, true)
             MapsInitializer.updatePrivacyAgree(context, true)
 
-            // 尝试从预加载池获取 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 +163,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 +186,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 +464,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 +579,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 +628,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 +676,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 ->

package/build/index.d.ts

@@ -10,6 +10,7 @@ export { PlatformDetector, DeviceType, FoldState, isAndroid14Plus, isiOS17Plus,
 export type { DeviceInfo, SystemVersion } from './utils/PlatformDetector';
 export { PermissionUtils, PermissionManager, // 向后兼容的别名
 LocationPermissionType, } from './utils/PermissionUtils';
+export { throttle } from './utils/throttle';
 export { FoldableMapView, useFoldableMap, } from './components/FoldableMapView';
 export type { FoldableMapViewProps, FoldableConfig, } from './components/FoldableMapView';
 export { default as ExpoGaodeMapOfflineModule } from './utils/OfflineMapManager';

package/build/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAKA,cAAc,SAAS,CAAC;AAExB,OAAO,EAAE,OAAO,IAAI,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAGrE,OAAO,EAAE,OAAO,IAAI,OAAO,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;AACjD,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAG3C,OAAO,EACL,MAAM,EACN,QAAQ,EACR,OAAO,EACP,MAAM,EACN,OAAO,EACP,UAAU,EACV,OAAO,GACR,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EACL,YAAY,EACZ,WAAW,EACX,aAAa,EACb,SAAS,GACV,MAAM,sBAAsB,CAAC;AAC9B,YAAY,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAGzD,OAAO,EACL,gBAAgB,EAChB,UAAU,EACV,SAAS,EACT,eAAe,EACf,WAAW,EACX,QAAQ,EACR,UAAU,EACV,MAAM,GACP,MAAM,0BAA0B,CAAC;AAClC,YAAY,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAG1E,OAAO,EACL,eAAe,EACf,iBAAiB,EAAE,UAAU;AAC7B,sBAAsB,GACvB,MAAM,yBAAyB,CAAC;AAGjC,OAAO,EACL,eAAe,EACf,cAAc,GACf,MAAM,8BAA8B,CAAC;AACtC,YAAY,EACV,oBAAoB,EACpB,cAAc,GACf,MAAM,8BAA8B,CAAC;AAGtC,OAAO,EAAE,OAAO,IAAI,yBAAyB,EAAE,MAAM,2BAA2B,CAAC;AAEjF,YAAY,EACV,cAAc,EACd,gBAAgB,EAChB,wBAAwB,EACxB,uBAAuB,EACvB,uBAAuB,EACvB,oBAAoB,EACpB,qBAAqB,EACrB,wBAAwB,EACxB,qBAAqB,EACrB,gBAAgB,GACjB,MAAM,uBAAuB,CAAC;AAM/B;;;;;;;;GAQG;AACH,eAAO,MAAM,sBAAsB,wOAGjC,CAAA;AAGF,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAG/D,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAKA,cAAc,SAAS,CAAC;AAExB,OAAO,EAAE,OAAO,IAAI,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAGrE,OAAO,EAAE,OAAO,IAAI,OAAO,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;AACjD,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAG3C,OAAO,EACL,MAAM,EACN,QAAQ,EACR,OAAO,EACP,MAAM,EACN,OAAO,EACP,UAAU,EACV,OAAO,GACR,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EACL,YAAY,EACZ,WAAW,EACX,aAAa,EACb,SAAS,GACV,MAAM,sBAAsB,CAAC;AAC9B,YAAY,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAGzD,OAAO,EACL,gBAAgB,EAChB,UAAU,EACV,SAAS,EACT,eAAe,EACf,WAAW,EACX,QAAQ,EACR,UAAU,EACV,MAAM,GACP,MAAM,0BAA0B,CAAC;AAClC,YAAY,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAG1E,OAAO,EACL,eAAe,EACf,iBAAiB,EAAE,UAAU;AAC7B,sBAAsB,GACvB,MAAM,yBAAyB,CAAC;AAGjC,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAG5C,OAAO,EACL,eAAe,EACf,cAAc,GACf,MAAM,8BAA8B,CAAC;AACtC,YAAY,EACV,oBAAoB,EACpB,cAAc,GACf,MAAM,8BAA8B,CAAC;AAGtC,OAAO,EAAE,OAAO,IAAI,yBAAyB,EAAE,MAAM,2BAA2B,CAAC;AAEjF,YAAY,EACV,cAAc,EACd,gBAAgB,EAChB,wBAAwB,EACxB,uBAAuB,EACvB,uBAAuB,EACvB,oBAAoB,EACpB,qBAAqB,EACrB,wBAAwB,EACxB,qBAAqB,EACrB,gBAAgB,GACjB,MAAM,uBAAuB,CAAC;AAM/B;;;;;;;;GAQG;AACH,eAAO,MAAM,sBAAsB,wOAGjC,CAAA;AAGF,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAG/D,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC"}

package/build/index.js

@@ -17,6 +17,8 @@ export { PlatformDetector, DeviceType, FoldState, isAndroid14Plus, isiOS17Plus,
 // 导出权限工具类（仅提供文案和诊断，实际权限请求使用 ExpoGaodeMapModule）
 export { PermissionUtils, PermissionManager, // 向后兼容的别名
 LocationPermissionType, } from './utils/PermissionUtils';
+// 导出节流工具函数
+export { throttle } from './utils/throttle';
 // 导出折叠屏适配组件
 export { FoldableMapView, useFoldableMap, } from './components/FoldableMapView';
 // 导出离线地图 API

package/build/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,6BAA6B,MAAM,sBAAsB,CAAC;AAEjE,mBAAmB;AACnB,cAAc,SAAS,CAAC;AACxB,SAAS;AACT,OAAO,EAAE,OAAO,IAAI,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAErE,WAAW;AACX,OAAO,EAAE,OAAO,IAAI,OAAO,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;AACjD,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAE3C,UAAU;AACV,OAAO,EACL,MAAM,EACN,QAAQ,EACR,OAAO,EACP,MAAM,EACN,OAAO,EACP,UAAU,EACV,OAAO,GACR,MAAM,uBAAuB,CAAC;AAE/B,WAAW;AACX,OAAO,EACL,YAAY,EACZ,WAAW,EACX,aAAa,EACb,SAAS,GACV,MAAM,sBAAsB,CAAC;AAG9B,WAAW;AACX,OAAO,EACL,gBAAgB,EAChB,UAAU,EACV,SAAS,EACT,eAAe,EACf,WAAW,EACX,QAAQ,EACR,UAAU,EACV,MAAM,GACP,MAAM,0BAA0B,CAAC;AAGlC,gDAAgD;AAChD,OAAO,EACL,eAAe,EACf,iBAAiB,EAAE,UAAU;AAC7B,sBAAsB,GACvB,MAAM,yBAAyB,CAAC;AAEjC,YAAY;AACZ,OAAO,EACL,eAAe,EACf,cAAc,GACf,MAAM,8BAA8B,CAAC;AAMtC,aAAa;AACb,OAAO,EAAE,OAAO,IAAI,yBAAyB,EAAE,MAAM,2BAA2B,CAAC;AAejF,MAAM,uBAAuB,GAAG,6BAA6B,CAAC,yBAAyB,CAAA;AACvF,MAAM,mBAAmB,GAAG,6BAA6B,CAAC,uBAAuB,CAAA;AAGjF;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG,oBAAoB,CAAC;IACzD,SAAS,EAAE,mBAAmB;IAC9B,aAAa,EAAE,uBAAuB;CACvC,CAAC,CAAA;AAEF,yBAAyB;AACzB,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAE/D,WAAW;AACX,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC","sourcesContent":["\nimport { createPermissionHook } from 'expo-modules-core';\nimport ExpoGaodeMapModuleWithHelpers from './ExpoGaodeMapModule';\n\n// 导出类型定义（包含所有通用类型）\nexport * from './types';\n// 导出原生模块\nexport { default as ExpoGaodeMapModule } from './ExpoGaodeMapModule';\n\n// 导出地图视图组件\nexport { default as MapView } from './ExpoGaodeMapView';\nexport { useMap } from './components/MapContext';\nexport { MapUI } from './components/MapUI';\n\n// 导出覆盖物组件\nexport {\n  Marker,\n  Polyline,\n  Polygon,\n  Circle,\n  HeatMap,\n  MultiPoint,\n  Cluster,\n} from './components/overlays';\n\n// 导出错误处理工具\nexport {\n  ErrorHandler,\n  ErrorLogger,\n  GaodeMapError,\n  ErrorType,\n} from './utils/ErrorHandler';\nexport type { ErrorDetails } from './utils/ErrorHandler';\n\n// 导出平台检测工具\nexport {\n  PlatformDetector,\n  DeviceType,\n  FoldState,\n  isAndroid14Plus,\n  isiOS17Plus,\n  isTablet,\n  isFoldable,\n  isIPad,\n} from './utils/PlatformDetector';\nexport type { DeviceInfo, SystemVersion } from './utils/PlatformDetector';\n\n// 导出权限工具类（仅提供文案和诊断，实际权限请求使用 ExpoGaodeMapModule）\nexport {\n  PermissionUtils,\n  PermissionManager, // 向后兼容的别名\n  LocationPermissionType,\n} from './utils/PermissionUtils';\n\n// 导出折叠屏适配组件\nexport {\n  FoldableMapView,\n  useFoldableMap,\n} from './components/FoldableMapView';\nexport type {\n  FoldableMapViewProps,\n  FoldableConfig,\n} from './components/FoldableMapView';\n\n// 导出离线地图 API\nexport { default as ExpoGaodeMapOfflineModule } from './utils/OfflineMapManager';\n\nexport type {\n  OfflineMapInfo,\n  OfflineMapStatus,\n  OfflineMapDownloadConfig,\n  OfflineMapDownloadEvent,\n  OfflineMapCompleteEvent,\n  OfflineMapErrorEvent,\n  OfflineMapPausedEvent,\n  OfflineMapCancelledEvent,\n  OfflineMapStorageInfo,\n  OfflineMapEvents,\n} from './types/offline.types';\n\nconst requestPermissionsAsync = ExpoGaodeMapModuleWithHelpers.requestLocationPermission\nconst getPermissionsAsync = ExpoGaodeMapModuleWithHelpers.checkLocationPermission\n\n\n/**\n * Check or request permissions to access the location.\n * This uses both `requestPermissionsAsync` and `getPermissionsAsync` to interact with the permissions.\n *\n * @example\n * ```ts\n * const [status, requestPermission] = useLocationPermissions();\n * ```\n */\nexport const useLocationPermissions = createPermissionHook({\n  getMethod: getPermissionsAsync,\n  requestMethod: requestPermissionsAsync,\n})\n\n// 导出便捷读取的 SDK 配置与 webKey\nexport { getSDKConfig, getWebKey } from './ExpoGaodeMapModule';\n\n// 默认导出原生模块\nexport { default } from './ExpoGaodeMapModule';\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,6BAA6B,MAAM,sBAAsB,CAAC;AAEjE,mBAAmB;AACnB,cAAc,SAAS,CAAC;AACxB,SAAS;AACT,OAAO,EAAE,OAAO,IAAI,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAErE,WAAW;AACX,OAAO,EAAE,OAAO,IAAI,OAAO,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;AACjD,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAE3C,UAAU;AACV,OAAO,EACL,MAAM,EACN,QAAQ,EACR,OAAO,EACP,MAAM,EACN,OAAO,EACP,UAAU,EACV,OAAO,GACR,MAAM,uBAAuB,CAAC;AAE/B,WAAW;AACX,OAAO,EACL,YAAY,EACZ,WAAW,EACX,aAAa,EACb,SAAS,GACV,MAAM,sBAAsB,CAAC;AAG9B,WAAW;AACX,OAAO,EACL,gBAAgB,EAChB,UAAU,EACV,SAAS,EACT,eAAe,EACf,WAAW,EACX,QAAQ,EACR,UAAU,EACV,MAAM,GACP,MAAM,0BAA0B,CAAC;AAGlC,gDAAgD;AAChD,OAAO,EACL,eAAe,EACf,iBAAiB,EAAE,UAAU;AAC7B,sBAAsB,GACvB,MAAM,yBAAyB,CAAC;AAEjC,WAAW;AACX,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAE5C,YAAY;AACZ,OAAO,EACL,eAAe,EACf,cAAc,GACf,MAAM,8BAA8B,CAAC;AAMtC,aAAa;AACb,OAAO,EAAE,OAAO,IAAI,yBAAyB,EAAE,MAAM,2BAA2B,CAAC;AAejF,MAAM,uBAAuB,GAAG,6BAA6B,CAAC,yBAAyB,CAAA;AACvF,MAAM,mBAAmB,GAAG,6BAA6B,CAAC,uBAAuB,CAAA;AAGjF;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG,oBAAoB,CAAC;IACzD,SAAS,EAAE,mBAAmB;IAC9B,aAAa,EAAE,uBAAuB;CACvC,CAAC,CAAA;AAEF,yBAAyB;AACzB,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAE/D,WAAW;AACX,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC","sourcesContent":["\nimport { createPermissionHook } from 'expo-modules-core';\nimport ExpoGaodeMapModuleWithHelpers from './ExpoGaodeMapModule';\n\n// 导出类型定义（包含所有通用类型）\nexport * from './types';\n// 导出原生模块\nexport { default as ExpoGaodeMapModule } from './ExpoGaodeMapModule';\n\n// 导出地图视图组件\nexport { default as MapView } from './ExpoGaodeMapView';\nexport { useMap } from './components/MapContext';\nexport { MapUI } from './components/MapUI';\n\n// 导出覆盖物组件\nexport {\n  Marker,\n  Polyline,\n  Polygon,\n  Circle,\n  HeatMap,\n  MultiPoint,\n  Cluster,\n} from './components/overlays';\n\n// 导出错误处理工具\nexport {\n  ErrorHandler,\n  ErrorLogger,\n  GaodeMapError,\n  ErrorType,\n} from './utils/ErrorHandler';\nexport type { ErrorDetails } from './utils/ErrorHandler';\n\n// 导出平台检测工具\nexport {\n  PlatformDetector,\n  DeviceType,\n  FoldState,\n  isAndroid14Plus,\n  isiOS17Plus,\n  isTablet,\n  isFoldable,\n  isIPad,\n} from './utils/PlatformDetector';\nexport type { DeviceInfo, SystemVersion } from './utils/PlatformDetector';\n\n// 导出权限工具类（仅提供文案和诊断，实际权限请求使用 ExpoGaodeMapModule）\nexport {\n  PermissionUtils,\n  PermissionManager, // 向后兼容的别名\n  LocationPermissionType,\n} from './utils/PermissionUtils';\n\n// 导出节流工具函数\nexport { throttle } from './utils/throttle';\n\n// 导出折叠屏适配组件\nexport {\n  FoldableMapView,\n  useFoldableMap,\n} from './components/FoldableMapView';\nexport type {\n  FoldableMapViewProps,\n  FoldableConfig,\n} from './components/FoldableMapView';\n\n// 导出离线地图 API\nexport { default as ExpoGaodeMapOfflineModule } from './utils/OfflineMapManager';\n\nexport type {\n  OfflineMapInfo,\n  OfflineMapStatus,\n  OfflineMapDownloadConfig,\n  OfflineMapDownloadEvent,\n  OfflineMapCompleteEvent,\n  OfflineMapErrorEvent,\n  OfflineMapPausedEvent,\n  OfflineMapCancelledEvent,\n  OfflineMapStorageInfo,\n  OfflineMapEvents,\n} from './types/offline.types';\n\nconst requestPermissionsAsync = ExpoGaodeMapModuleWithHelpers.requestLocationPermission\nconst getPermissionsAsync = ExpoGaodeMapModuleWithHelpers.checkLocationPermission\n\n\n/**\n * Check or request permissions to access the location.\n * This uses both `requestPermissionsAsync` and `getPermissionsAsync` to interact with the permissions.\n *\n * @example\n * ```ts\n * const [status, requestPermission] = useLocationPermissions();\n * ```\n */\nexport const useLocationPermissions = createPermissionHook({\n  getMethod: getPermissionsAsync,\n  requestMethod: requestPermissionsAsync,\n})\n\n// 导出便捷读取的 SDK 配置与 webKey\nexport { getSDKConfig, getWebKey } from './ExpoGaodeMapModule';\n\n// 默认导出原生模块\nexport { default } from './ExpoGaodeMapModule';\n"]}

package/build/utils/throttle.d.ts

@@ -0,0 +1,10 @@
+/**
+ * 一个轻量级的节流函数，用于限制函数调用的频率。
+ * 特别适用于处理高频事件，如地图移动、滚动等。
+ *
+ * @param func 需要节流的函数
+ * @param limit 时间间隔（毫秒）
+ * @returns 节流后的函数
+ */
+export declare function throttle<T extends (...args: any[]) => void>(func: T, limit: number): T;
+//# sourceMappingURL=throttle.d.ts.map

package/build/utils/throttle.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"throttle.d.ts","sourceRoot":"","sources":["../../src/utils/throttle.ts"],"names":[],"mappings":"AACA;;;;;;;GAOG;AACH,wBAAgB,QAAQ,CAAC,CAAC,SAAS,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,EAAE,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,GAAG,CAAC,CAStF"}

package/build/utils/throttle.js

@@ -0,0 +1,19 @@
+/**
+ * 一个轻量级的节流函数，用于限制函数调用的频率。
+ * 特别适用于处理高频事件，如地图移动、滚动等。
+ *
+ * @param func 需要节流的函数
+ * @param limit 时间间隔（毫秒）
+ * @returns 节流后的函数
+ */
+export function throttle(func, limit) {
+    let inThrottle;
+    return function (...args) {
+        if (!inThrottle) {
+            func.apply(this, args);
+            inThrottle = true;
+            setTimeout(() => (inThrottle = false), limit);
+        }
+    };
+}
+//# sourceMappingURL=throttle.js.map

package/build/utils/throttle.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"throttle.js","sourceRoot":"","sources":["../../src/utils/throttle.ts"],"names":[],"mappings":"AACA;;;;;;;GAOG;AACH,MAAM,UAAU,QAAQ,CAAqC,IAAO,EAAE,KAAa;IACjF,IAAI,UAAmB,CAAC;IACxB,OAAO,UAAoB,GAAG,IAAW;QACvC,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YACvB,UAAU,GAAG,IAAI,CAAC;YAClB,UAAU,CAAC,GAAG,EAAE,CAAC,CAAC,UAAU,GAAG,KAAK,CAAC,EAAE,KAAK,CAAC,CAAC;QAChD,CAAC;IACH,CAAM,CAAC;AACT,CAAC","sourcesContent":["\n/**\n * 一个轻量级的节流函数，用于限制函数调用的频率。\n * 特别适用于处理高频事件，如地图移动、滚动等。\n *\n * @param func 需要节流的函数\n * @param limit 时间间隔（毫秒）\n * @returns 节流后的函数\n */\nexport function throttle<T extends (...args: any[]) => void>(func: T, limit: number): T {\n  let inThrottle: boolean;\n  return function(this: any, ...args: any[]) {\n    if (!inThrottle) {\n      func.apply(this, args);\n      inThrottle = true;\n      setTimeout(() => (inThrottle = false), limit);\n    }\n  } as T;\n}\n"]}

package/ios/ExpoGaodeMap.podspec

@@ -19,11 +19,9 @@ Pod::Spec.new do |s|
   s.static_framework = true
 
   s.dependency 'ExpoModulesCore'
-  s.dependency 'AMapFoundation'
-  s.dependency 'AMapLocation'
   s.dependency 'AMap3DMap'
-
-  s.library = 'c++'
+  s.dependency "AMapLocation"
+  s.dependency "AMapLocation"
 
   # Swift/Objective-C compatibility
   s.pod_target_xcconfig = {

package/ios/ExpoGaodeMapModule.swift

@@ -124,7 +124,7 @@ public class ExpoGaodeMapModule: Module {
          * @param enable 是否开启
          */
         Function("setLoadWorldVectorMap") { (enable: Bool) in
-            MAMapView.loadWorldVectorMap = enable
+           MAMapView.loadWorldVectorMap = enable
         }
         
         /**

package/ios/ExpoGaodeMapView.swift

@@ -92,14 +92,8 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate, UIGestureRecognizerDelegate
     
     // MARK: - 事件节流控制
     
-    /// 相机移动事件节流间隔(秒)
-    private let cameraMoveThrottleInterval: TimeInterval = 0.1
-    /// 上次触发相机移动事件的时间戳
-    private var lastCameraMoveTime: TimeInterval = 0
     /// 缓存的相机移动事件数据
     private var pendingCameraMoveData: [String: Any]?
-    /// 节流定时器
-    private var throttleTimer: Timer?
     
     /// 缩放手势识别器（用于模拟惯性）
     private var pinchGesture: UIPinchGestureRecognizer!
@@ -856,9 +850,7 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate, UIGestureRecognizerDelegate
      * 当视图从层级中移除并释放时自动调用
      */
     deinit {
-        // 清理节流定时器
-        throttleTimer?.invalidate()
-        throttleTimer = nil
+        // 清理资源
         pendingCameraMoveData = nil
         
         // 清理代理,停止接收回调
@@ -935,11 +927,10 @@ extension ExpoGaodeMapView {
     }
     
     /**
-     * 地图区域即将改变时触发 - 应用节流优化
+     * 地图区域即将改变时触发
      */
     public func mapView(_ mapView: MAMapView, regionWillChangeAnimated animated: Bool) {
-        // 相机开始移动 - 应用节流优化
-        let currentTime = Date().timeIntervalSince1970
+        // 相机开始移动
         let cameraPosition = cameraManager.getCameraPosition()
         let visibleRegion = mapView.region
         
@@ -957,29 +948,9 @@ extension ExpoGaodeMapView {
             ]
         ]
         
-        // 节流逻辑：0.1秒 内只触发一次
-        if currentTime - lastCameraMoveTime >= cameraMoveThrottleInterval {
-            // 超过节流时间，立即触发事件
-            lastCameraMoveTime = currentTime
-            onCameraMove(eventData)
-            // 清除待处理的事件和定时器
-            throttleTimer?.invalidate()
-            throttleTimer = nil
-            pendingCameraMoveData = nil
-        } else {
-            // 在节流时间内，缓存事件数据，使用定时器延迟触发
-            pendingCameraMoveData = eventData
-            throttleTimer?.invalidate()
-            
-            let delay = cameraMoveThrottleInterval - (currentTime - lastCameraMoveTime)
-            throttleTimer = Timer.scheduledTimer(withTimeInterval: delay, repeats: false) { [weak self] _ in
-                guard let self = self, let data = self.pendingCameraMoveData else { return }
-                self.lastCameraMoveTime = Date().timeIntervalSince1970
-                self.onCameraMove(data)
-                self.pendingCameraMoveData = nil
-                self.throttleTimer = nil
-            }
-        }
+        // 直接触发事件，移除手动节流
+        // 建议在 JS 端进行 debounce/throttle 处理
+        onCameraMove(eventData)
     }
     
     /**

package/ios/ExpoGaodeMapViewModule.swift

@@ -1,6 +1,14 @@
 import ExpoModulesCore
 import MAMapKit
 
+enum MapType: Int, Enumerable {
+    case standard = 0
+    case satellite = 1
+    case night = 2
+    case navi = 3
+    case bus = 4
+}
+
 /**
  * 高德地图视图 Module
  */
@@ -11,8 +19,8 @@ public class ExpoGaodeMapViewModule: Module {
         View(ExpoGaodeMapView.self) {
             Events("onMapPress", "onMapLongPress", "onLoad", "onLocation", "onCameraMove", "onCameraIdle")
             
-            Prop("mapType") { (view: ExpoGaodeMapView, type: Int) in
-                view.mapType = type
+            Prop("mapType") { (view: ExpoGaodeMapView, type: MapType) in
+                view.mapType = type.rawValue
             }
             
             Prop("initialCameraPosition") { (view: ExpoGaodeMapView, position: [String: Any]?) in

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-gaode-map",
-  "version": "2.2.26-next.1",
+  "version": "2.2.26",
   "description": "A full-featured AMap (Gaode Map) React Native component library built with Expo Modules, providing map display, location services, overlays, and more.",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -14,18 +14,18 @@
     "plugin/build"
   ],
   "scripts": {
-    "build": "expo-module build && bun run build:plugin",
+    "build": "expo-module build && yarn build:plugin",
     "build:plugin": "tsc --project plugin/tsconfig.json",
     "clean": "expo-module clean && rm -rf plugin/build",
     "lint": "expo-module lint",
     "test": "expo-module test",
-    "prepare": "expo-module prepare && bun run build:plugin",
+    "prepare": "expo-module prepare && yarn build:plugin",
     "prepublishOnly": "echo 'Skipping proofread check' && exit 0",
     "expo-module": "expo-module",
     "open:ios": "xed example/ios",
     "open:android": "open -a \"Android Studio\" example/android",
-    "publish:next": "bun publish --tag next",
-    "publish:latest": "bun publish --tag latest"
+    "publish:next": "npm publish --tag next",
+    "publish:latest": "npm publish --tag latest"
   },
   "keywords": [
     "react-native",
@@ -50,19 +50,15 @@
     "registry": "https://registry.npmjs.org/"
   },
   "devDependencies": {
-    "@expo/config-plugins": "~54.0.4",
-    "@testing-library/react-native": "^13.3.3",
     "@babel/runtime": "^7.25.7",
+    "@testing-library/react-native": "^13.3.3",
     "@types/jest": "^29.5.14",
     "@types/react": "~19.1.0",
-    "eslint": "^9.15.0",
-    "babel-preset-expo": "^54.0.8",
-    "expo": "^54.0.31",
+    "expo": "^54.0.27",
     "expo-module-scripts": "^5.0.8",
     "jest": "~29.7.0",
     "jest-expo": "^54.0.16",
     "react-native": "0.81.5",
-    "react-test-renderer": "19.1.0",
     "typescript": "^5.9.3"
   },
   "peerDependencies": {

package/plugin/build/withGaodeMap.d.ts

@@ -1,4 +1,4 @@
-import { ConfigPlugin } from '@expo/config-plugins';
+import { ConfigPlugin } from 'expo/config-plugins';
 /**
  * 高德地图插件配置类型
  */

package/plugin/build/withGaodeMap.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const config_plugins_1 = require("@expo/config-plugins");
+const config_plugins_1 = require("expo/config-plugins");
 const pkg = require('../../package.json');
 /** 默认定位权限描述 */
 const DEFAULT_LOCATION_USAGE = '需要访问您的位置信息以提供地图服务';
@@ -11,22 +11,24 @@ const withGaodeMapIOSPermissions = (config, props) => {
     if (props.enableLocation === false) {
         return config;
     }
-    const description = props.locationDescription || DEFAULT_LOCATION_USAGE;
+    // 使用 IOSConfig.Permissions 简化权限配置
+    // 注意：locationDescription 的检查已移至 withGaodeMapInfoPlist 中以避免重复打印
+    const description = props.locationDescription;
+    const finalDescription = description || DEFAULT_LOCATION_USAGE;
     // 构建权限配置对象
     const permissionDefaults = {
         NSLocationWhenInUseUsageDescription: DEFAULT_LOCATION_USAGE,
     };
     const permissionValues = {
-        NSLocationWhenInUseUsageDescription: description,
+        NSLocationWhenInUseUsageDescription: finalDescription,
     };
     // 如果启用后台定位，添加额外权限
     if (props.enableBackgroundLocation) {
         permissionDefaults.NSLocationAlwaysUsageDescription = DEFAULT_LOCATION_USAGE;
         permissionDefaults.NSLocationAlwaysAndWhenInUseUsageDescription = DEFAULT_LOCATION_USAGE;
-        permissionValues.NSLocationAlwaysUsageDescription = description;
-        permissionValues.NSLocationAlwaysAndWhenInUseUsageDescription = description;
+        permissionValues.NSLocationAlwaysUsageDescription = finalDescription;
+        permissionValues.NSLocationAlwaysAndWhenInUseUsageDescription = finalDescription;
     }
-    // 使用 IOSConfig.Permissions 简化权限配置
     return config_plugins_1.IOSConfig.Permissions.createPermissionsPlugin(permissionDefaults)(config, permissionValues);
 };
 /**
@@ -34,6 +36,16 @@ const withGaodeMapIOSPermissions = (config, props) => {
  */
 const withGaodeMapInfoPlist = (config, props) => {
     return (0, config_plugins_1.withInfoPlist)(config, (config) => {
+        // 检查 iOS API Key
+        if (!props.iosKey && !props.androidKey) {
+            // 仅当两个平台都未配置时提示 Notice，避免打扰单平台开发者
+            // 这里使用 console.log 而不是 WarningAggregator，因为这只是一个提示
+            console.log('\u001b[33m[expo-gaode-map] Notice: 未在 app.json 中配置 API Key。请确保在应用启动时通过代码配置 Key，否则地图将无法加载。建议在 app.json 中配置 API Key 以避免运行时错误。\u001b[0m');
+        }
+        // 检查 locationDescription
+        if (props.enableLocation !== false && !props.locationDescription) {
+            config_plugins_1.WarningAggregator.addWarningIOS('expo-gaode-map', `未配置 iOS 定位权限描述 (locationDescription)。将使用默认描述: "${DEFAULT_LOCATION_USAGE}"。建议在 app.json 中配置以满足 App Store 审核要求。`);
+        }
         // 添加高德地图 API Key
         if (props.iosKey) {
             config.modResults.AMapApiKey = props.iosKey;
@@ -195,10 +207,6 @@ const withGaodeMapAndroidSdk = (config, props) => {
  * 主插件函数 - 组合所有修改器
  */
 const withGaodeMap = (config, props = {}) => {
-    // 验证配置
-    if (!props.iosKey && !props.androidKey) {
-        config_plugins_1.WarningAggregator.addWarningIOS('expo-gaode-map', '未配置 API Key。请在 app.json 的 plugins 中配置 iosKey 和 androidKey');
-    }
     // 应用 iOS 配置
     config = withGaodeMapIOSPermissions(config, props); // 使用 IOSConfig 添加权限
     config = withGaodeMapInfoPlist(config, props); // 添加 API Key 和后台模式