expo-gaode-map-navigation 2.0.5 → 2.0.6

package/ios/map/overlays/MarkerView.swift

@@ -73,6 +73,10 @@ class MarkerView: ExpoView {
     private var pendingAddTask: DispatchWorkItem?
     /// 延迟更新任务（批量处理 props 更新）
     private var pendingUpdateTask: DispatchWorkItem?
+    /// 子视图变化后的延迟刷新任务
+    private var pendingSubviewRefreshTask: DispatchWorkItem?
+    /// 最近一次应用到 annotationView 的 children 结构签名
+    private var lastRenderedChildrenSignature: String?
     /// 上次设置的地图引用（防止重复调用）
     private weak var lastSetMapView: MAMapView?
     
@@ -226,10 +230,13 @@ class MarkerView: ExpoView {
         
         // 1. 如果有 children，使用自定义视图
         if self.subviews.count > 0 {
-            let key = cacheKey ?? "children_\(ObjectIdentifier(self).hashValue)"
+            let size = resolvedCustomSubviewSize(defaultSize: CGSize(width: 200, height: 60))
+            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
             }
             
@@ -237,9 +244,10 @@ class MarkerView: ExpoView {
             DispatchQueue.main.async { [weak self, weak annotationView] in
                 guard let self = self, let annotationView = annotationView else { return }
                 if let generated = self.createImageFromSubviews() {
-                    IconBitmapCache.shared.setImage(generated, forKey: key)
                     annotationView.image = generated
-                    annotationView.centerOffset = CGPoint(x: 0, y: 0)
+                    self.applyCenterOffset(to: annotationView, defaultOffset: .zero)
+                } else if self.hasPendingImageContent() {
+                    self.scheduleSubviewRefresh(allowFallbackToDefault: false)
                 }
             }
             return annotationView
@@ -318,19 +326,19 @@ class MarkerView: ExpoView {
             self.annotationView = annotationView
 
             // 生成 cacheKey 或 fallback 到 identifier
-            let key = cacheKey ?? "children_\(ObjectIdentifier(self).hashValue)"
+            let size = resolvedCustomSubviewSize(defaultSize: CGSize(width: 200, height: 40))
+            let key = childrenCacheKey(for: size)
 
             // 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
             }
 
             // 2) 缓存未命中：返回占位（透明），并异步在主线程生成图像然后回填
-            let size = CGSize(width: CGFloat(customViewWidth > 0 ? customViewWidth : 200),
-                              height: CGFloat(customViewHeight > 0 ? customViewHeight : 40))
             UIGraphicsBeginImageContextWithOptions(size, false, 0.0)
             let transparentImage = UIGraphicsGetImageFromCurrentImageContext()
             UIGraphicsEndImageContext()
@@ -342,17 +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() {
-                    // 写入缓存（仅当用户传了 cacheKey 才缓存；否则建议仍缓存由 fingerprint 决定）
-                    IconBitmapCache.shared.setImage(generated, forKey: key)
                     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)
                 }
             }
 
@@ -482,37 +489,21 @@ class MarkerView: ExpoView {
      * 将子视图转换为图片
      */
     private func createImageFromSubviews() -> UIImage? {
-        // 🔑 如果有 cacheKey 且命中缓存，直接返回缓存图片
-        if let key = cacheKey, let cachedImage = IconBitmapCache.shared.image(forKey: key) {
+        let size = resolvedCustomSubviewSize(defaultSize: CGSize(width: 200, height: 60))
+        let key = childrenCacheKey(for: size)
+
+        if let cachedImage = IconBitmapCache.shared.image(forKey: key) {
             return cachedImage
         }
         
         guard let firstSubview = subviews.first else {
             return nil
         }
-        
-        // 优先使用 customViewWidth/customViewHeight（用于 children），其次使用子视图尺寸，最后使用默认值
-        let width: CGFloat
-        let height: CGFloat
-        
-        if customViewWidth > 0 {
-            width = CGFloat(customViewWidth)
-        } else if firstSubview.bounds.size.width > 0 {
-            width = firstSubview.bounds.size.width
-        } else {
-            width = 200 // 默认宽度
-        }
-        
-        if customViewHeight > 0 {
-            height = CGFloat(customViewHeight)
-        } else if firstSubview.bounds.size.height > 0 {
-            height = firstSubview.bounds.size.height
-        } else {
-            height = 60 // 默认高度
+
+        guard size.width > 0, size.height > 0 else {
+            return nil
         }
         
-        let size = CGSize(width: width, height: height)
-        
         // 强制子视图使用指定尺寸布局
         firstSubview.frame = CGRect(origin: .zero, size: size)
         
@@ -521,6 +512,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() }
@@ -538,14 +533,120 @@ class MarkerView: ExpoView {
         
    
         
-        // 🔑 写入缓存
-        if let key = cacheKey {
-            IconBitmapCache.shared.setImage(image, forKey: key)
-        }
+        IconBitmapCache.shared.setImage(image, forKey: key)
         
         return image
     }
 
+    private func resolvedCustomSubviewSize(defaultSize: CGSize) -> CGSize {
+        guard let firstSubview = subviews.first else {
+            return defaultSize
+        }
+
+        if customViewWidth > 0 || customViewHeight > 0 {
+            let width = customViewWidth > 0 ? CGFloat(customViewWidth) : defaultSize.width
+            let height = customViewHeight > 0 ? CGFloat(customViewHeight) : defaultSize.height
+            return CGSize(width: width, height: height)
+        }
+
+        forceLayoutRecursively(view: firstSubview)
+
+        let compressedSize = firstSubview.systemLayoutSizeFitting(UIView.layoutFittingCompressedSize)
+        let fittingSize = firstSubview.sizeThatFits(
+            CGSize(width: CGFloat.greatestFiniteMagnitude, height: CGFloat.greatestFiniteMagnitude)
+        )
+        let intrinsicSize = firstSubview.intrinsicContentSize
+
+        let width = resolvedDimension(
+            candidates: [compressedSize.width, fittingSize.width, intrinsicSize.width, firstSubview.bounds.size.width],
+            fallback: defaultSize.width
+        )
+        let height = resolvedDimension(
+            candidates: [compressedSize.height, fittingSize.height, intrinsicSize.height, firstSubview.bounds.size.height],
+            fallback: defaultSize.height
+        )
+
+        return CGSize(width: width, height: height)
+    }
+
+    private func resolvedDimension(candidates: [CGFloat], fallback: CGFloat) -> CGFloat {
+        for value in candidates {
+            if value.isFinite && value > 0 {
+                return ceil(value)
+            }
+        }
+
+        return fallback
+    }
+
+    private func childrenCacheKey(for size: CGSize) -> String {
+        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)"
+    }
+
+    private func childrenRenderSignature() -> String {
+        guard let firstSubview = subviews.first else {
+            return "empty"
+        }
+
+        var parts: [String] = []
+
+        func appendSignature(for view: UIView) {
+            parts.append(String(describing: type(of: view)))
+            let bounds = view.bounds
+            parts.append("b:\(Int(bounds.width.rounded()))x\(Int(bounds.height.rounded()))")
+
+            if let label = view as? UILabel {
+                parts.append("t:\(label.text ?? "")")
+            }
+
+            if let imageView = view as? UIImageView,
+               let image = imageView.image {
+                parts.append("i:\(Int(image.size.width.rounded()))x\(Int(image.size.height.rounded()))")
+            }
+
+            parts.append("c:\(view.subviews.count)")
+            for child in view.subviews {
+                appendSignature(for: child)
+            }
+        }
+
+        appendSignature(for: firstSubview)
+        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
+    }
+
     
     /**
      * 递归强制布局视图及其所有子视图
@@ -580,6 +681,7 @@ class MarkerView: ExpoView {
         isRemoving = true
         pendingAddTask?.cancel(); pendingAddTask = nil
         pendingUpdateTask?.cancel(); pendingUpdateTask = nil
+        pendingSubviewRefreshTask?.cancel(); pendingSubviewRefreshTask = nil
 
         guard let mapView = mapView else { 
             isRemoving = false
@@ -621,19 +723,7 @@ class MarkerView: ExpoView {
             return
         }
         
-        // 子视图移除后，需要刷新 annotation 视图
-        if self.subviews.count <= 1 {
-            // 所有子视图已移除，刷新以恢复默认图标
-            if let mapView = mapView, let annotation = annotation {
-                DispatchQueue.main.async { [weak self] in
-                    guard let self = self, !self.isRemoving else {
-                        return
-                    }
-                    mapView.removeAnnotation(annotation)
-                    mapView.addAnnotation(annotation)
-                }
-            }
-        }
+        scheduleSubviewRefresh(allowFallbackToDefault: true)
     }
     
     override func didAddSubview(_ subview: UIView) {
@@ -644,14 +734,78 @@ class MarkerView: ExpoView {
             return
         }
         
-        // 🔑 关键修复：刷新 annotation
-        if let mapView = mapView, let annotation = annotation {
-            // annotation 已存在，立即刷新
+        scheduleSubviewRefresh(allowFallbackToDefault: false)
+    }
+
+    private func scheduleSubviewRefresh(allowFallbackToDefault: Bool) {
+        pendingSubviewRefreshTask?.cancel()
+
+        let task = DispatchWorkItem { [weak self] in
+            guard let self = self, !self.isRemoving else { return }
+            self.refreshAnnotationForSubviewChanges(allowFallbackToDefault: allowFallbackToDefault)
+        }
+
+        pendingSubviewRefreshTask = task
+        DispatchQueue.main.asyncAfter(deadline: .now() + 0.02, execute: task)
+    }
+
+    private func refreshAnnotationForSubviewChanges(allowFallbackToDefault: Bool) {
+        guard let mapView = mapView else { return }
+
+        if annotation == nil {
+            updateAnnotation()
+            return
+        }
+
+        guard let annotation = annotation else { return }
+
+        if subviews.isEmpty {
+            if allowFallbackToDefault {
+                lastRenderedChildrenSignature = nil
+                annotationView = nil
+                mapView.removeAnnotation(annotation)
+                mapView.addAnnotation(annotation)
+            }
+            return
+        }
+
+        let signature = childrenRenderSignature()
+        if signature == lastRenderedChildrenSignature, annotationView?.image != nil {
+            return
+        }
+
+        invalidateCurrentChildrenCache()
+
+        if annotationView is MAPinAnnotationView {
+            annotationView = nil
             mapView.removeAnnotation(annotation)
             mapView.addAnnotation(annotation)
-        } else if mapView != nil && annotation == nil {
-            // annotation 还未创建，children 先添加了，触发创建
-            updateAnnotation()
+            return
+        }
+
+        guard let annotationView = annotationView else {
+            mapView.removeAnnotation(annotation)
+            mapView.addAnnotation(annotation)
+            return
+        }
+
+        if let image = createImageFromSubviews() {
+            annotationView.image = image
+            applyCenterOffset(to: annotationView, defaultOffset: .zero)
+            annotationView.canShowCallout = false
+            annotationView.isDraggable = draggable
+            lastRenderedChildrenSignature = signature
+        }
+    }
+
+    private func invalidateCurrentChildrenCache() {
+        let sizes = [
+            resolvedCustomSubviewSize(defaultSize: CGSize(width: 200, height: 40)),
+            resolvedCustomSubviewSize(defaultSize: CGSize(width: 200, height: 60))
+        ]
+
+        for size in sizes {
+            IconBitmapCache.shared.removeImage(forKey: childrenCacheKey(for: size))
         }
     }
     

package/ios/map/overlays/MarkerViewModule.swift

@@ -68,7 +68,7 @@ public class MarkerViewModule: Module {
             Prop("growAnimation") { (view: MarkerView, enabled: Bool) in
                 view.growAnimation = 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-navigation",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "description": "高德地图导航功能模块 - 路径规划、导航引导，独立版本包含完整地图功能",
   "author": "TomWq <582752848@qq.com> (https://github.com/TomWq)",
   "repository": {