expo-gaode-map 2.2.30-next.0 → 2.2.30

package/ios/overlays/MarkerView.swift

@@ -154,9 +154,9 @@ class MarkerView: ExpoView {
     
     // JS 侧可以调用
     func setCacheKey(_ key: String?) {
+        guard cacheKey != key else { return }
         self.cacheKey = key
-        // 发生变化时刷新 annotation
-        updateAnnotation()
+        refreshAnnotationAppearance(invalidateChildrenCache: !subviews.isEmpty)
     }
     
     /**
@@ -234,7 +234,9 @@ class MarkerView: ExpoView {
             let key = childrenCacheKey(for: size)
             if let cached = IconBitmapCache.shared.image(forKey: key) {
                 annotationView?.image = cached
-                annotationView?.centerOffset = CGPoint(x: 0, y: 0)
+                if let annotationView = annotationView {
+                    applyCenterOffset(to: annotationView, defaultOffset: .zero)
+                }
                 return annotationView
             }
             
@@ -243,7 +245,7 @@ class MarkerView: ExpoView {
                 guard let self = self, let annotationView = annotationView else { return }
                 if let generated = self.createImageFromSubviews() {
                     annotationView.image = generated
-                    annotationView.centerOffset = CGPoint(x: 0, y: 0)
+                    self.applyCenterOffset(to: annotationView, defaultOffset: .zero)
                 }
             }
             return annotationView
@@ -251,10 +253,12 @@ class MarkerView: ExpoView {
         
         // 2. 如果有 icon 属性，使用自定义图标
         if let iconUri = iconUri, !iconUri.isEmpty {
-            let key = cacheKey ?? "icon|\(iconUri)|\(Int(iconWidth))x\(Int(iconHeight))"
+            let key = iconCacheKey(for: iconUri)
             if let cached = IconBitmapCache.shared.image(forKey: key) {
                 annotationView?.image = cached
-                annotationView?.centerOffset = CGPoint(x: 0, y: -cached.size.height / 2)
+                if let annotationView = annotationView {
+                    applyCenterOffset(to: annotationView, defaultOffset: CGPoint(x: 0, y: -cached.size.height / 2))
+                }
                 return annotationView
             }
             
@@ -270,7 +274,7 @@ class MarkerView: ExpoView {
                 if let img = resizedImage {
                     IconBitmapCache.shared.setImage(img, forKey: key)
                     annotationView.image = img
-                    annotationView.centerOffset = CGPoint(x: 0, y: -img.size.height / 2)
+                    self.applyCenterOffset(to: annotationView, defaultOffset: CGPoint(x: 0, y: -img.size.height / 2))
                 }
             }
             return annotationView
@@ -328,8 +332,9 @@ class MarkerView: ExpoView {
             // 1) 如果缓存命中，直接同步返回图像（fast path）
             if let cached = IconBitmapCache.shared.image(forKey: key) {
                 annotationView?.image = cached
-                // 🔑 修复:自定义视图使用中心偏移,不需要底部偏移
-                annotationView?.centerOffset = CGPoint(x: 0, y: 0)
+                if let annotationView = annotationView {
+                    applyCenterOffset(to: annotationView, defaultOffset: .zero)
+                }
                 return annotationView
             }
 
@@ -345,15 +350,16 @@ class MarkerView: ExpoView {
                 // 再次检查缓存（避免重复渲染）
                 if let cached = IconBitmapCache.shared.image(forKey: key) {
                     annotationView.image = cached
-                    annotationView.centerOffset = CGPoint(x: 0, y: 0)
+                    self.applyCenterOffset(to: annotationView, defaultOffset: .zero)
                     return
                 }
                 
                 // 调用你的原生渲染逻辑（保留空白检测、多次 layout）
                 if let generated = self.createImageFromSubviews() {
                     annotationView.image = generated
-                    annotationView.centerOffset = CGPoint(x: 0, y: 0)
-                } else {
+                    self.applyCenterOffset(to: annotationView, defaultOffset: .zero)
+                } else if self.hasPendingImageContent() {
+                    self.scheduleSubviewRefresh(allowFallbackToDefault: false)
                 }
             }
 
@@ -385,10 +391,12 @@ class MarkerView: ExpoView {
             self.annotationView = annotationView
             
             // 构建 key
-            let key = cacheKey ?? "icon|\(iconUri)|\(Int(iconWidth))x\(Int(iconHeight))"
+            let key = iconCacheKey(for: iconUri)
             if let cached = IconBitmapCache.shared.image(forKey: key) {
                 annotationView?.image = cached
-                annotationView?.centerOffset = CGPoint(x: 0, y: -cached.size.height / 2)
+                if let annotationView = annotationView {
+                    applyCenterOffset(to: annotationView, defaultOffset: CGPoint(x: 0, y: -cached.size.height / 2))
+                }
                 return annotationView
             }
 
@@ -405,7 +413,9 @@ class MarkerView: ExpoView {
                     if let img = resizedImage {
                         IconBitmapCache.shared.setImage(img, forKey: key)
                         annotationView?.image = img
-                        annotationView?.centerOffset = CGPoint(x: 0, y: -img.size.height / 2)
+                        if let annotationView = annotationView {
+                            self.applyCenterOffset(to: annotationView, defaultOffset: CGPoint(x: 0, y: -img.size.height / 2))
+                        }
                     }
                 }
             }
@@ -445,6 +455,9 @@ class MarkerView: ExpoView {
         pinView?.canShowCallout = canShowCallout
         pinView?.isDraggable = draggable
         pinView?.animatesDrop = animatesDrop
+        if let pinView = pinView {
+            applyCenterOffset(to: pinView, defaultOffset: .zero)
+        }
         
         self.annotationView = pinView
         return pinView
@@ -506,6 +519,10 @@ class MarkerView: ExpoView {
             forceLayoutRecursively(view: firstSubview)
             RunLoop.current.run(until: Date(timeIntervalSinceNow: 0.01))
         }
+
+        if containsPendingImageContent(in: firstSubview) {
+            return nil
+        }
         
         UIGraphicsBeginImageContextWithOptions(size, false, 0.0)
         defer { UIGraphicsEndImageContext() }
@@ -528,6 +545,41 @@ class MarkerView: ExpoView {
         return image
     }
 
+    private func iconCacheKey(for iconUri: String) -> String {
+        let baseKey = cacheKey ?? "icon|\(iconUri)"
+        return "\(baseKey)|\(Int(iconWidth.rounded()))x\(Int(iconHeight.rounded()))"
+    }
+
+    private func applyCenterOffset(to annotationView: MAAnnotationView, defaultOffset: CGPoint) {
+        annotationView.centerOffset = resolvedCenterOffset(defaultOffset: defaultOffset)
+    }
+
+    private func resolvedCenterOffset(defaultOffset: CGPoint) -> CGPoint {
+        guard let centerOffset else {
+            return defaultOffset
+        }
+
+        let x = centerOffset["x"] ?? Double(defaultOffset.x)
+        let y = centerOffset["y"] ?? Double(defaultOffset.y)
+        return CGPoint(x: x, y: y)
+    }
+
+    private func currentDefaultCenterOffset() -> CGPoint {
+        if !subviews.isEmpty {
+            return .zero
+        }
+
+        if let image = annotationView?.image ?? animatedAnnotationView?.image {
+            return CGPoint(x: 0, y: -image.size.height / 2)
+        }
+
+        if let iconUri, !iconUri.isEmpty {
+            return CGPoint(x: 0, y: -iconHeight / 2)
+        }
+
+        return .zero
+    }
+
     private func resolvedCustomSubviewSize(defaultSize: CGSize) -> CGSize {
         guard let firstSubview = subviews.first else {
             return defaultSize
@@ -570,7 +622,9 @@ class MarkerView: ExpoView {
     }
 
     private func childrenCacheKey(for size: CGSize) -> String {
-        let baseKey = cacheKey ?? "children_\(ObjectIdentifier(self).hashValue)"
+        let signature = childrenRenderSignature()
+        let baseKey = cacheKey.map { "\($0)|\(signature)" }
+            ?? "children_\(ObjectIdentifier(self).hashValue)|\(signature)"
         let roundedWidth = Int(ceil(size.width))
         let roundedHeight = Int(ceil(size.height))
         return "\(baseKey)|\(roundedWidth)x\(roundedHeight)"
@@ -607,6 +661,34 @@ class MarkerView: ExpoView {
         return parts.joined(separator: "|")
     }
 
+    private func hasPendingImageContent() -> Bool {
+        guard let firstSubview = subviews.first else {
+            return false
+        }
+
+        return containsPendingImageContent(in: firstSubview)
+    }
+
+    private func containsPendingImageContent(in view: UIView) -> Bool {
+        if view.isHidden || view.alpha <= 0 {
+            return false
+        }
+
+        if let imageView = view as? UIImageView {
+            let bounds = imageView.bounds
+            let hasSize = bounds.width > 0 || bounds.height > 0
+            if hasSize && imageView.image == nil {
+                return true
+            }
+        }
+
+        for subview in view.subviews where containsPendingImageContent(in: subview) {
+            return true
+        }
+
+        return false
+    }
+
     
     /**
      * 递归强制布局视图及其所有子视图
@@ -751,7 +833,7 @@ class MarkerView: ExpoView {
 
         if let image = createImageFromSubviews() {
             annotationView.image = image
-            annotationView.centerOffset = CGPoint(x: 0, y: 0)
+            applyCenterOffset(to: annotationView, defaultOffset: .zero)
             annotationView.canShowCallout = false
             annotationView.isDraggable = draggable
             lastRenderedChildrenSignature = signature
@@ -768,6 +850,45 @@ class MarkerView: ExpoView {
             IconBitmapCache.shared.removeImage(forKey: childrenCacheKey(for: size))
         }
     }
+
+    private func refreshAnnotationAppearance(invalidateChildrenCache: Bool = false) {
+        guard !isRemoving else { return }
+
+        let refresh = { [weak self] in
+            guard let self = self, let mapView = self.mapView else { return }
+
+            self.pendingSubviewRefreshTask?.cancel()
+            self.pendingSubviewRefreshTask = nil
+
+            if invalidateChildrenCache {
+                self.lastRenderedChildrenSignature = nil
+                if !self.subviews.isEmpty {
+                    self.invalidateCurrentChildrenCache()
+                }
+            }
+
+            if let animatedAnnotation = self.animatedAnnotation {
+                self.animatedAnnotationView = nil
+                mapView.removeAnnotation(animatedAnnotation)
+                mapView.addAnnotation(animatedAnnotation)
+                return
+            }
+
+            if let annotation = self.annotation {
+                self.annotationView = nil
+                mapView.removeAnnotation(annotation)
+                mapView.addAnnotation(annotation)
+            } else {
+                self.updateAnnotation()
+            }
+        }
+
+        if Thread.isMainThread {
+            refresh()
+        } else {
+            DispatchQueue.main.async(execute: refresh)
+        }
+    }
     
     /**
      * 设置纬度
@@ -853,28 +974,83 @@ class MarkerView: ExpoView {
      */
     func setDraggable(_ draggable: Bool) {
         self.draggable = draggable
+        annotationView?.isDraggable = draggable
+        animatedAnnotationView?.isDraggable = draggable
         updateAnnotation()
     }
     
     func setIconUri(_ uri: String?) {
         self.iconUri = uri
-        updateAnnotation()
+        refreshAnnotationAppearance()
+    }
+
+    func setIconWidth(_ width: Double) {
+        guard iconWidth != width else { return }
+        iconWidth = width
+        if let iconUri, !iconUri.isEmpty {
+            refreshAnnotationAppearance()
+        }
+    }
+
+    func setIconHeight(_ height: Double) {
+        guard iconHeight != height else { return }
+        iconHeight = height
+        if let iconUri, !iconUri.isEmpty {
+            refreshAnnotationAppearance()
+        }
+    }
+
+    func setCustomViewWidth(_ width: Double) {
+        guard customViewWidth != width else { return }
+        customViewWidth = width
+        if !subviews.isEmpty {
+            refreshAnnotationAppearance(invalidateChildrenCache: true)
+        }
+    }
+
+    func setCustomViewHeight(_ height: Double) {
+        guard customViewHeight != height else { return }
+        customViewHeight = height
+        if !subviews.isEmpty {
+            refreshAnnotationAppearance(invalidateChildrenCache: true)
+        }
     }
     
     func setCenterOffset(_ offset: [String: Double]) {
         self.centerOffset = offset
+        if let annotationView = annotationView {
+            applyCenterOffset(to: annotationView, defaultOffset: currentDefaultCenterOffset())
+        }
+        if let animatedAnnotationView = animatedAnnotationView {
+            applyCenterOffset(to: animatedAnnotationView, defaultOffset: currentDefaultCenterOffset())
+        }
     }
     
     func setAnimatesDrop(_ animate: Bool) {
         self.animatesDrop = animate
+        (annotationView as? MAPinAnnotationView)?.animatesDrop = animate
     }
     
     func setPinColor(_ color: String) {
+        guard pinColor != color else { return }
         self.pinColor = color
+        if subviews.isEmpty && (iconUri?.isEmpty ?? true) {
+            refreshAnnotationAppearance()
+        }
     }
     
     func setCanShowCallout(_ show: Bool) {
         self.canShowCallout = show
+        if subviews.isEmpty {
+            annotationView?.canShowCallout = show
+            animatedAnnotationView?.canShowCallout = show
+        }
+    }
+
+    func setGrowAnimation(_ enabled: Bool) {
+        guard growAnimation != enabled else { return }
+        growAnimation = enabled
+        refreshAnnotationAppearance()
     }
     
     // MARK: - 平滑移动相关方法
@@ -1085,6 +1261,7 @@ class MarkerView: ExpoView {
         // 取消待处理的任务
         pendingAddTask?.cancel()
         pendingUpdateTask?.cancel()
+        pendingSubviewRefreshTask?.cancel()
         
         // 清理引用，防止内存泄漏
         mapView = nil

package/ios/overlays/MarkerViewModule.swift

@@ -34,19 +34,19 @@ public class MarkerViewModule: Module {
             }
             
             Prop("iconWidth") { (view: MarkerView, width: Double) in
-                view.iconWidth = width
+                view.setIconWidth(width)
             }
             
             Prop("iconHeight") { (view: MarkerView, height: Double) in
-                view.iconHeight = height
+                view.setIconHeight(height)
             }
             
             Prop("customViewWidth") { (view: MarkerView, width: Double) in
-                view.customViewWidth = width
+                view.setCustomViewWidth(width)
             }
             
             Prop("customViewHeight") { (view: MarkerView, height: Double) in
-                view.customViewHeight = height
+                view.setCustomViewHeight(height)
             }
             
             Prop("centerOffset") { (view: MarkerView, offset: [String: Double]) in
@@ -62,13 +62,13 @@ public class MarkerViewModule: Module {
             }
             
             Prop("canShowCallout") { (view: MarkerView, canShow: Bool) in
-                view.canShowCallout = canShow
+                view.setCanShowCallout(canShow)
             }
 
             Prop("growAnimation") { (view: MarkerView, enabled: Bool) in
-                view.growAnimation = enabled
+                view.setGrowAnimation(enabled)
             }
-             Prop("cacheKey") { (view: MarkerView, key: String) in
+             Prop("cacheKey") { (view: MarkerView, key: String?) in
                 view.setCacheKey(key)
             }
             

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-gaode-map",
-  "version": "2.2.30-next.0",
+  "version": "2.2.30",
   "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",
@@ -53,12 +53,12 @@
     "@babel/runtime": "^7.25.7",
     "@testing-library/react-native": "^13.3.3",
     "@types/jest": "^29.5.14",
-    "@types/react": "~19.1.0",
-    "expo": "^54.0.27",
-    "expo-module-scripts": "^5.0.8",
+    "@types/react": "~19.2.10",
+    "expo": "^55.0.8",
+    "expo-module-scripts": "^55.0.2",
     "jest": "~29.7.0",
-    "jest-expo": "^54.0.16",
-    "react-native": "0.81.5",
+    "jest-expo": "~55.0.11",
+    "react-native": "0.83.2",
     "typescript": "^5.9.3"
   },
   "peerDependencies": {

package/build/utils/throttle.d.ts

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

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

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

package/build/utils/throttle.js

@@ -1,19 +0,0 @@
-/**
- * 一个轻量级的节流函数，用于限制函数调用的频率。
- * 特别适用于处理高频事件，如地图移动、滚动等。
- *
- * @param func 需要节流的函数
- * @param limit 时间间隔（毫秒）
- * @returns 节流后的函数
- */
-export function throttle(func, limit) {
-    let inThrottle = false;
-    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

@@ -1 +0,0 @@
-{"version":3,"file":"throttle.js","sourceRoot":"","sources":["../../src/utils/throttle.ts"],"names":[],"mappings":"AACA;;;;;;;GAOG;AACH,MAAM,UAAU,QAAQ,CACtB,IAAO,EACP,KAAa;IAEb,IAAI,UAAU,GAAG,KAAK,CAAC;IAEvB,OAAO,UAAsC,GAAG,IAAmB;QACjE,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 (this: ThisParameterType<T>, ...args: Parameters<T>) => void>(\n  func: T,\n  limit: number\n): T {\n  let inThrottle = false;\n\n  return function (this: ThisParameterType<T>, ...args: Parameters<T>) {\n    if (!inThrottle) {\n      func.apply(this, args);\n      inThrottle = true;\n      setTimeout(() => (inThrottle = false), limit);\n    }\n  } as T;\n}\n"]}