expo-gaode-map 2.2.35-next.0 → 2.2.35-next.1

package/README.md

@@ -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 模块维护说明**
+>
+> 从 `2.2.34` 开始，搜索能力已经集成到 `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
 ```
 
@@ -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？
@@ -249,6 +255,6 @@ MIT
 如果你在使用过程中遇到问题或有任何建议，欢迎：
 
 - 📝 提交 [GitHub Issue](https://github.com/TomWq/expo-gaode-map/issues)
-- 💬 参与 [Discussions](https://github.com/TomWq/expo-gaode-map/discussions)
+- 💬 查看并参与 [GitHub Issues](https://github.com/TomWq/expo-gaode-map/issues)
 - ⭐ 给项目点个 Star 支持一下
 - QQ：582752848 

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

@@ -26,6 +26,8 @@ class ExpoGaodeMapModule : Module() {
   /** 定位管理器实例 */
   private var locationManager: LocationManager? = null
 
+  private fun jsValue(value: Any?): Any? = value
+
   override fun definition() = ModuleDefinition {
     Name("ExpoGaodeMap")
 
@@ -93,7 +95,7 @@ class ExpoGaodeMapModule : Module() {
     }
 
     Function("getPrivacyStatus") {
-      SDKInitializer.getPrivacyStatus()
+      jsValue(SDKInitializer.getPrivacyStatus())
     }
 
     /**
@@ -109,14 +111,14 @@ class ExpoGaodeMapModule : Module() {
      * @return SDK 版本号
      */
     Function("getVersion") {
-      SDKInitializer.getVersion()
+      jsValue(SDKInitializer.getVersion())
     }
 
     /**
     * 检查原生 SDK 是否已配置 API Key
     */
     Function("isNativeSDKConfigured") {
-      try {
+      jsValue(try {
         val context = appContext.reactContext!!
         val apiKey = context.packageManager
           .getApplicationInfo(context.packageName, android.content.pm.PackageManager.GET_META_DATA)
@@ -124,7 +126,7 @@ class ExpoGaodeMapModule : Module() {
         !apiKey.isNullOrEmpty()
       } catch (_: Exception) {
         false
-      }
+      })
     }
 
 
@@ -187,11 +189,11 @@ class ExpoGaodeMapModule : Module() {
     Function("distanceBetweenCoordinates") { p1: Map<String, Any>?, p2: Map<String, Any>? ->
       val cord1 = LatLngParser.parseLatLng(p1)
       val cord2 = LatLngParser.parseLatLng(p2)
-      if (cord1 != null && cord2 != null) {
+      jsValue(if (cord1 != null && cord2 != null) {
         GeometryUtils.calculateDistance(cord1, cord2)
       } else {
         0.0
-      }
+      })
     }
 
     /**
@@ -213,16 +215,16 @@ class ExpoGaodeMapModule : Module() {
       val normalized = LatLngParser.parseLatLngList(points)
       val safeMinZoom = minZoom ?: 3
       val safeMaxZoom = maxZoom ?: 20
-      if (normalized.isEmpty()) return@Function safeMinZoom.toDouble()
+      if (normalized.isEmpty()) return@Function jsValue(safeMinZoom.toDouble())
 
-      GeometryUtils.calculateFitZoom(
+      jsValue(GeometryUtils.calculateFitZoom(
         normalized,
         viewportWidthPx ?: 390.0,
         viewportHeightPx ?: 844.0,
         paddingPx ?: 48.0,
         safeMinZoom,
         safeMaxZoom
-      )
+      ))
     }
 
     /**
@@ -232,7 +234,7 @@ class ExpoGaodeMapModule : Module() {
      */
     Function("calculatePolygonArea") { points: List<Any>? ->
       val rings = LatLngParser.parseLatLngListList(points)
-      if (rings.isEmpty()) return@Function 0.0
+      if (rings.isEmpty()) return@Function jsValue(0.0)
       
       // 第一项是外轮廓
       var totalArea = GeometryUtils.calculatePolygonArea(rings[0])
@@ -245,7 +247,7 @@ class ExpoGaodeMapModule : Module() {
       }
       
       // 确保面积不为负数
-      max(0.0, totalArea)
+      jsValue(max(0.0, totalArea))
     }
 
     /**
@@ -255,24 +257,24 @@ class ExpoGaodeMapModule : Module() {
      * @return 是否在多边形内
      */
     Function("isPointInPolygon") { point: Map<String, Any>?, polygon: List<Any>? ->
-      val pt = LatLngParser.parseLatLng(point) ?: return@Function false
+      val pt = LatLngParser.parseLatLng(point) ?: return@Function jsValue(false)
       val rings = LatLngParser.parseLatLngListList(polygon)
-      if (rings.isEmpty()) return@Function false
+      if (rings.isEmpty()) return@Function jsValue(false)
       
       // 点必须在外轮廓内
       val inOuter = GeometryUtils.isPointInPolygon(pt, rings[0])
-      if (!inOuter) return@Function false
+      if (!inOuter) return@Function jsValue(false)
       
       // 点不能在任何内孔内
       if (rings.size > 1) {
         for (i in 1 until rings.size) {
           if (GeometryUtils.isPointInPolygon(pt, rings[i])) {
-            return@Function false
+            return@Function jsValue(false)
           }
         }
       }
       
-      true
+      jsValue(true)
     }
 
     /**
@@ -285,11 +287,11 @@ class ExpoGaodeMapModule : Module() {
     Function("isPointInCircle") { point: Map<String, Any>?, center: Map<String, Any>?, radius: Double ->
       val pt = LatLngParser.parseLatLng(point)
       val cn = LatLngParser.parseLatLng(center)
-      if (pt != null && cn != null) {
+      jsValue(if (pt != null && cn != null) {
         GeometryUtils.isPointInCircle(pt, cn, radius)
       } else {
         false
-      }
+      })
     }
 
     /**
@@ -301,11 +303,11 @@ class ExpoGaodeMapModule : Module() {
     Function("calculateRectangleArea") { southWest: Map<String, Any>?, northEast: Map<String, Any>? ->
       val sw = LatLngParser.parseLatLng(southWest)
       val ne = LatLngParser.parseLatLng(northEast)
-      if (sw != null && ne != null) {
+      jsValue(if (sw != null && ne != null) {
         GeometryUtils.calculateRectangleArea(sw, ne)
       } else {
         0.0
-      }
+      })
     }
 
     /**
@@ -318,7 +320,7 @@ class ExpoGaodeMapModule : Module() {
       val pathPoints = LatLngParser.parseLatLngList(path)
       val targetPoint = LatLngParser.parseLatLng(target)
       
-      if (targetPoint != null && pathPoints.isNotEmpty()) {
+      jsValue(if (targetPoint != null && pathPoints.isNotEmpty()) {
         val result = GeometryUtils.getNearestPointOnPath(pathPoints, targetPoint)
         if (result != null) {
           mapOf(
@@ -332,7 +334,7 @@ class ExpoGaodeMapModule : Module() {
         }
       } else {
         null
-      }
+      })
     }
 
     /**
@@ -342,16 +344,16 @@ class ExpoGaodeMapModule : Module() {
      */
     Function("calculateCentroid") { polygon: List<Any>? ->
       val rings = LatLngParser.parseLatLngListList(polygon)
-      if (rings.isEmpty()) return@Function null
+      if (rings.isEmpty()) return@Function jsValue(null)
       
       if (rings.size == 1) {
         val result = GeometryUtils.calculateCentroid(rings[0])
-        return@Function result?.let {
+        return@Function jsValue(result?.let {
           mapOf(
             "latitude" to it.latitude,
             "longitude" to it.longitude
           )
-        }
+        })
       }
       
       // 带孔多边形的质心计算: Σ(Area_i * Centroid_i) / Σ(Area_i)
@@ -376,14 +378,14 @@ class ExpoGaodeMapModule : Module() {
         }
       }
       
-      if (abs(totalArea) > 1e-9) {
+      jsValue(if (abs(totalArea) > 1e-9) {
         mapOf(
           "latitude" to sumLat / totalArea,
           "longitude" to sumLon / totalArea
         )
       } else {
         null
-      }
+      })
     }
 
     /**
@@ -393,10 +395,10 @@ class ExpoGaodeMapModule : Module() {
      */
     Function("calculatePathBounds") { pointsList: List<Any>? ->
       val points = LatLngParser.parseLatLngList(pointsList)
-      if (points.isEmpty()) return@Function null
+      if (points.isEmpty()) return@Function jsValue(null)
 
       val result = GeometryUtils.calculatePathBounds(points)
-      result?.let {
+      jsValue(result?.let {
         mapOf(
           "north" to it.north,
           "south" to it.south,
@@ -407,7 +409,7 @@ class ExpoGaodeMapModule : Module() {
             "longitude" to it.centerLon
           )
         )
-      }
+      })
     }
 
     /**
@@ -418,11 +420,11 @@ class ExpoGaodeMapModule : Module() {
      */
     Function("encodeGeoHash") { coordinate: Map<String, Any>?, precision: Int ->
       val latLng = LatLngParser.parseLatLng(coordinate)
-      if (latLng != null) {
+      jsValue(if (latLng != null) {
         GeometryUtils.encodeGeoHash(latLng, precision)
       } else {
         ""
-      }
+      })
     }
 
     /**
@@ -434,12 +436,12 @@ class ExpoGaodeMapModule : Module() {
     Function("simplifyPolyline") { points: List<Any>?, tolerance: Double ->
       val poly = LatLngParser.parseLatLngList(points)
       val simplified = GeometryUtils.simplifyPolyline(poly, tolerance)
-      simplified.map {
+      jsValue(simplified.map {
         mapOf(
           "latitude" to it.latitude,
           "longitude" to it.longitude
         )
-      }
+      })
     }
 
     /**
@@ -449,7 +451,7 @@ class ExpoGaodeMapModule : Module() {
      */
     Function("calculatePathLength") { points: List<Any>? ->
       val poly = LatLngParser.parseLatLngList(points)
-      GeometryUtils.calculatePathLength(poly)
+      jsValue(GeometryUtils.calculatePathLength(poly))
     }
 
     /**
@@ -459,12 +461,12 @@ class ExpoGaodeMapModule : Module() {
      */
     Function("parsePolyline") { polylineStr: String? ->
       val result = GeometryUtils.parsePolyline(polylineStr)
-      result.map {
+      jsValue(result.map {
         mapOf(
           "latitude" to it.latitude,
           "longitude" to it.longitude
         )
-      }
+      })
     }
 
     /**
@@ -476,7 +478,7 @@ class ExpoGaodeMapModule : Module() {
     Function("getPointAtDistance") { points: List<Any>?, distance: Double ->
       val poly = LatLngParser.parseLatLngList(points)
       val result = GeometryUtils.getPointAtDistance(poly, distance)
-      if (result != null) {
+      jsValue(if (result != null) {
         mapOf(
           "latitude" to result.point.latitude,
           "longitude" to result.point.longitude,
@@ -484,7 +486,7 @@ class ExpoGaodeMapModule : Module() {
         )
       } else {
         null
-      }
+      })
     }
 
     /**
@@ -495,7 +497,7 @@ class ExpoGaodeMapModule : Module() {
      */
     Function("latLngToTile") { coordinate: Map<String, Any>?, zoom: Int ->
       val latLng = LatLngParser.parseLatLng(coordinate)
-      if (latLng != null) {
+      jsValue(if (latLng != null) {
         val result = GeometryUtils.latLngToTile(latLng, zoom)
         if (result != null && result.size >= 2) {
           mapOf("x" to result[0], "y" to result[1])
@@ -504,7 +506,7 @@ class ExpoGaodeMapModule : Module() {
         }
       } else {
         null
-      }
+      })
     }
 
     /**
@@ -517,9 +519,9 @@ class ExpoGaodeMapModule : Module() {
       val y = (tile?.get("y") as? Number)?.toInt() ?: 0
       val zoom = (tile?.get("z") as? Number)?.toInt() ?: (tile?.get("zoom") as? Number)?.toInt() ?: 0
       val result = GeometryUtils.tileToLatLng(x, y, zoom)
-      result?.let {
+      jsValue(result?.let {
         mapOf("latitude" to it.latitude, "longitude" to it.longitude)
-      }
+      })
     }
 
     /**
@@ -530,7 +532,7 @@ class ExpoGaodeMapModule : Module() {
      */
     Function("latLngToPixel") { coordinate: Map<String, Any>?, zoom: Int ->
       val latLng = LatLngParser.parseLatLng(coordinate)
-      if (latLng != null) {
+      jsValue(if (latLng != null) {
         val result = GeometryUtils.latLngToPixel(latLng, zoom)
         if (result != null && result.size >= 2) {
           mapOf("x" to result[0], "y" to result[1])
@@ -539,7 +541,7 @@ class ExpoGaodeMapModule : Module() {
         }
       } else {
         null
-      }
+      })
     }
 
     /**
@@ -552,9 +554,9 @@ class ExpoGaodeMapModule : Module() {
       val x = (pixel?.get("x") as? Number)?.toDouble() ?: 0.0
       val y = (pixel?.get("y") as? Number)?.toDouble() ?: 0.0
       val result = GeometryUtils.pixelToLatLng(x, y, zoom)
-      result?.let {
+      jsValue(result?.let {
         mapOf("latitude" to it.latitude, "longitude" to it.longitude)
-      }
+      })
     }
 
     /**
@@ -566,11 +568,11 @@ class ExpoGaodeMapModule : Module() {
     Function("findPointInPolygons") { point: Map<String, Any>?, polygons: List<List<Any>>? ->
       val pt = LatLngParser.parseLatLng(point)
       val polys = polygons?.map { LatLngParser.parseLatLngList(it) }
-      if (pt != null && polys != null) {
+      jsValue(if (pt != null && polys != null) {
         GeometryUtils.findPointInPolygons(pt, polys)
       } else {
         -1
-      }
+      })
     }
 
     /**
@@ -579,7 +581,7 @@ class ExpoGaodeMapModule : Module() {
      * @param gridSizeMeters 网格大小（米）
      */
     Function("generateHeatmapGrid") { points: List<Map<String, Any>>?, gridSizeMeters: Double ->
-      if (points.isNullOrEmpty()) return@Function emptyList<Map<String, Any>>()
+      if (points.isNullOrEmpty()) return@Function jsValue(emptyList<Map<String, Any>>())
       
       val count = points.size
       val latitudes = DoubleArray(count)
@@ -593,13 +595,13 @@ class ExpoGaodeMapModule : Module() {
       }
       
       val result = GeometryUtils.generateHeatmapGrid(latitudes, longitudes, weights, gridSizeMeters)
-      result.map {
+      jsValue(result.map {
         mapOf(
           "latitude" to it.latitude,
           "longitude" to it.longitude,
           "intensity" to it.intensity
         )
-      }
+      })
     }
 
     // ==================== 定位配置 ====================

package/build/components/FoldableMapView.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FoldableMapView.d.ts","sourceRoot":"","sources":["../../src/components/FoldableMapView.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA+C,MAAM,OAAO,CAAC;AAIpE,OAAO,EAAoB,UAAU,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AACpF,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAEpD;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,oBAAoB;IACpB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,iBAAiB;IACjB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,qBAAqB;IACrB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,eAAe;IACf,iBAAiB,CAAC,EAAE,CAAC,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,UAAU,KAAK,IAAI,CAAC;IACvE,eAAe;IACf,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED;;;;GAIG;AACH,MAAM,WAAW,oBAAqB,SAAQ,YAAY;IACxD,cAAc;IACd,cAAc,CAAC,EAAE,cAAc,CAAC;CACjC;AA2ED,eAAO,MAAM,eAAe,EAAE,KAAK,CAAC,EAAE,CAAC,oBAAoB,CA6F1D,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,cAAc,CAC5B,MAAM,EAAE,KAAK,CAAC,SAAS,CAAC,UAAU,CAAC,EACnC,MAAM,CAAC,EAAE,cAAc;;;;EAgExB"}
+{"version":3,"file":"FoldableMapView.d.ts","sourceRoot":"","sources":["../../src/components/FoldableMapView.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA+C,MAAM,OAAO,CAAC;AAIpE,OAAO,EAAoB,UAAU,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AACpF,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAEpD;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,oBAAoB;IACpB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,iBAAiB;IACjB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,qBAAqB;IACrB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,eAAe;IACf,iBAAiB,CAAC,EAAE,CAAC,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,UAAU,KAAK,IAAI,CAAC;IACvE,eAAe;IACf,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED;;;;GAIG;AACH,MAAM,WAAW,oBAAqB,SAAQ,YAAY;IACxD,cAAc;IACd,cAAc,CAAC,EAAE,cAAc,CAAC;CACjC;AA2ED,eAAO,MAAM,eAAe,EAAE,KAAK,CAAC,EAAE,CAAC,oBAAoB,CA0F1D,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,cAAc,CAC5B,MAAM,EAAE,KAAK,CAAC,SAAS,CAAC,UAAU,CAAC,EACnC,MAAM,CAAC,EAAE,cAAc;;;;EA8DxB"}

package/build/components/FoldableMapView.js

@@ -63,11 +63,30 @@ export const FoldableMapView = ({ foldableConfig, ...mapProps }) => {
     const [currentFoldState, setCurrentFoldState] = useState(FoldState.UNKNOWN);
     const [deviceInfo, setDeviceInfo] = useState(PlatformDetector.getDeviceInfo());
     const config = useMemo(() => createFoldableConfig(foldableConfig), [foldableConfig]);
-    const configRef = useRef(config);
     const foldStateRef = useRef(currentFoldState);
-    useEffect(() => {
-        configRef.current = config;
-    }, [config]);
+    const handleFoldStateChange = React.useEffectEvent(async (newInfo, debugPrefix) => {
+        const newFoldState = PlatformDetector.getFoldState();
+        const previousFoldState = foldStateRef.current;
+        if (config.debug) {
+            console.log(`[${debugPrefix}] 屏幕尺寸变化`);
+            console.log('新设备信息:', newInfo);
+            console.log('新折叠状态:', newFoldState);
+        }
+        if (newFoldState !== previousFoldState && previousFoldState !== FoldState.UNKNOWN) {
+            try {
+                await applyFoldStateCameraAdjustment(mapRef, previousFoldState, newFoldState, config, debugPrefix);
+            }
+            catch (error) {
+                if (config.debug) {
+                    console.error(`[${debugPrefix}] 处理折叠状态变化失败:`, error);
+                }
+            }
+        }
+        foldStateRef.current = newFoldState;
+        setCurrentFoldState(newFoldState);
+        setDeviceInfo(newInfo);
+        config.onFoldStateChange(newFoldState, newInfo);
+    });
     useEffect(() => {
         foldStateRef.current = currentFoldState;
     }, [currentFoldState]);
@@ -78,7 +97,7 @@ export const FoldableMapView = ({ foldableConfig, ...mapProps }) => {
     useEffect(() => {
         // 仅在 Android 折叠屏设备上启用
         if (Platform.OS !== 'android' || !deviceInfo.isFoldable) {
-            if (configRef.current.debug) {
+            if (config.debug) {
                 console.log('[FoldableMapView] 非折叠屏设备，跳过适配');
             }
             return;
@@ -86,42 +105,19 @@ export const FoldableMapView = ({ foldableConfig, ...mapProps }) => {
         const initialState = PlatformDetector.getFoldState();
         foldStateRef.current = initialState;
         setCurrentFoldState(initialState);
-        if (configRef.current.debug) {
+        if (config.debug) {
             console.log('[FoldableMapView] 初始化折叠屏适配');
             console.log('设备信息:', deviceInfo);
             console.log('初始折叠状态:', initialState);
         }
         // 监听屏幕尺寸变化
         const removeListener = PlatformDetector.addDimensionChangeListener(async (newInfo) => {
-            const newFoldState = PlatformDetector.getFoldState();
-            const previousFoldState = foldStateRef.current;
-            const latestConfig = configRef.current;
-            if (latestConfig.debug) {
-                console.log('[FoldableMapView] 屏幕尺寸变化');
-                console.log('新设备信息:', newInfo);
-                console.log('新折叠状态:', newFoldState);
-            }
-            // 折叠状态变化时的处理
-            if (newFoldState !== previousFoldState && previousFoldState !== FoldState.UNKNOWN) {
-                try {
-                    await applyFoldStateCameraAdjustment(mapRef, previousFoldState, newFoldState, latestConfig, 'FoldableMapView');
-                }
-                catch (error) {
-                    if (latestConfig.debug) {
-                        console.error('[FoldableMapView] 处理折叠状态变化失败:', error);
-                    }
-                }
-            }
-            foldStateRef.current = newFoldState;
-            setCurrentFoldState(newFoldState);
-            setDeviceInfo(newInfo);
-            // 触发回调
-            latestConfig.onFoldStateChange(newFoldState, newInfo);
+            await handleFoldStateChange(newInfo, 'FoldableMapView');
         });
         return () => {
             removeListener();
         };
-    }, [deviceInfo.isFoldable]);
+    }, [config.debug, deviceInfo.isFoldable]);
     return (<ExpoGaodeMapView ref={mapRef} {...mapProps}/>);
 };
 /**
@@ -134,13 +130,27 @@ export function useFoldableMap(mapRef, config) {
     const [deviceInfo, setDeviceInfo] = useState(PlatformDetector.getDeviceInfo());
     const mergedConfig = useMemo(() => createFoldableConfig(config), [config]);
     const foldStateRef = useRef(foldState);
-    const configRef = useRef(mergedConfig);
     useEffect(() => {
         foldStateRef.current = foldState;
     }, [foldState]);
-    useEffect(() => {
-        configRef.current = mergedConfig;
-    }, [mergedConfig]);
+    const handleFoldStateChange = React.useEffectEvent(async (newInfo) => {
+        const newFoldState = PlatformDetector.getFoldState();
+        const previousFoldState = foldStateRef.current;
+        if (newFoldState !== previousFoldState && previousFoldState !== FoldState.UNKNOWN) {
+            try {
+                await applyFoldStateCameraAdjustment(mapRef, previousFoldState, newFoldState, mergedConfig, 'useFoldableMap');
+            }
+            catch (error) {
+                if (mergedConfig.debug) {
+                    console.error('[useFoldableMap] 调整失败:', error);
+                }
+            }
+        }
+        foldStateRef.current = newFoldState;
+        setFoldState(newFoldState);
+        setDeviceInfo(newInfo);
+        mergedConfig.onFoldStateChange(newFoldState, newInfo);
+    });
     useEffect(() => {
         if (Platform.OS !== 'android' || !deviceInfo.isFoldable) {
             return;
@@ -149,23 +159,7 @@ export function useFoldableMap(mapRef, config) {
         foldStateRef.current = initialState;
         setFoldState(initialState);
         const removeListener = PlatformDetector.addDimensionChangeListener(async (newInfo) => {
-            const newFoldState = PlatformDetector.getFoldState();
-            const previousFoldState = foldStateRef.current;
-            const latestConfig = configRef.current;
-            if (newFoldState !== previousFoldState && previousFoldState !== FoldState.UNKNOWN) {
-                try {
-                    await applyFoldStateCameraAdjustment(mapRef, previousFoldState, newFoldState, latestConfig, 'useFoldableMap');
-                }
-                catch (error) {
-                    if (latestConfig.debug) {
-                        console.error('[useFoldableMap] 调整失败:', error);
-                    }
-                }
-            }
-            foldStateRef.current = newFoldState;
-            setFoldState(newFoldState);
-            setDeviceInfo(newInfo);
-            latestConfig.onFoldStateChange(newFoldState, newInfo);
+            await handleFoldStateChange(newInfo);
         });
         return () => {
             removeListener();