expo-gaode-map 2.2.38 → 2.2.39

package/ios/overlays/MarkerView.swift

@@ -75,8 +75,16 @@ class MarkerView: ExpoView {
     private var pendingUpdateTask: DispatchWorkItem?
     /// 子视图变化后的延迟刷新任务
     private var pendingSubviewRefreshTask: DispatchWorkItem?
+    /// cacheKey 变化后的延迟刷新任务
+    private var pendingCacheKeyRefreshTask: DispatchWorkItem?
+    /// 视图 detach 后延迟确认移除 annotation，避免 React 更新时短暂 detach 导致闪烁
+    private var pendingAnnotationRemovalTask: DispatchWorkItem?
+    /// cacheKey 刷新代次，用于丢弃过期截图任务
+    private var cacheKeyRefreshGeneration: Int = 0
     /// 最近一次应用到 annotationView 的 children 结构签名
     private var lastRenderedChildrenSignature: String?
+    /// 最近一次成功渲染的 children 图片，用于缓存未命中时避免闪烁
+    private var lastRenderedChildrenImage: UIImage?
     /// 上次设置的地图引用（防止重复调用）
     private weak var lastSetMapView: MAMapView?
     
@@ -156,7 +164,11 @@ class MarkerView: ExpoView {
     func setCacheKey(_ key: String?) {
         guard cacheKey != key else { return }
         self.cacheKey = key
-        refreshAnnotationAppearance(invalidateChildrenCache: !subviews.isEmpty)
+        if !subviews.isEmpty {
+            scheduleCacheKeyChildrenImageRefresh()
+        } else {
+            refreshAnnotationAppearance()
+        }
     }
     
     /**
@@ -233,9 +245,8 @@ class MarkerView: ExpoView {
             let size = resolvedContentSubviewSize(defaultSize: CGSize(width: 200, height: 60))
             let key = childrenCacheKey(for: size)
             if let cached = IconBitmapCache.shared.image(forKey: key) {
-                annotationView?.image = cached
                 if let annotationView = annotationView {
-                    applyCenterOffset(to: annotationView, defaultOffset: .zero)
+                    applyChildrenImage(cached, to: annotationView, signature: childrenRenderSignature())
                 }
                 return annotationView
             }
@@ -244,9 +255,8 @@ class MarkerView: ExpoView {
             DispatchQueue.main.async { [weak self, weak annotationView] in
                 guard let self = self, let annotationView = annotationView else { return }
                 guard self.isAnnotationView(annotationView, boundTo: annotation) else { return }
-                if let generated = self.createImageFromSubviews() {
-                    annotationView.image = generated
-                    self.applyCenterOffset(to: annotationView, defaultOffset: .zero)
+                if let generated = self.createImageFromSubviews(size: size) {
+                    self.applyChildrenImage(generated, to: annotationView, signature: self.childrenRenderSignature())
                 }
             }
             return annotationView
@@ -307,9 +317,7 @@ class MarkerView: ExpoView {
         
         // 🔑 如果有 children，使用自定义视图
         if self.subviews.count > 0 {
-            let reuseToken = cacheKey?.replacingOccurrences(of: "|", with: "_")
-                ?? String(ObjectIdentifier(self).hashValue)
-            let reuseId = "custom_marker_children_\(reuseToken)" + (growAnimation ? "_grow" : "")
+            let reuseId = "custom_marker_children_\(ObjectIdentifier(self).hashValue)" + (growAnimation ? "_grow" : "")
             var annotationView = mapView.dequeueReusableAnnotationView(withIdentifier: reuseId)
             if annotationView == nil {
                 if growAnimation {
@@ -331,37 +339,44 @@ class MarkerView: ExpoView {
             // 生成 cacheKey 或 fallback 到 identifier
             let size = resolvedContentSubviewSize(defaultSize: CGSize(width: 200, height: 40))
             let key = childrenCacheKey(for: size)
+            let signature = childrenRenderSignature()
 
             // 1) 如果缓存命中，直接同步返回图像（fast path）
             if let cached = IconBitmapCache.shared.image(forKey: key) {
-                annotationView?.image = cached
                 if let annotationView = annotationView {
-                    applyCenterOffset(to: annotationView, defaultOffset: .zero)
+                    applyChildrenImage(cached, to: annotationView, signature: signature)
                 }
                 return annotationView
             }
 
-            // 2) 缓存未命中：返回占位（透明），并异步在主线程生成图像然后回填
-            UIGraphicsBeginImageContextWithOptions(size, false, 0.0)
-            let transparentImage = UIGraphicsGetImageFromCurrentImageContext()
-            UIGraphicsEndImageContext()
-            annotationView?.image = transparentImage
+            // 2) 缓存未命中：先尝试同步渲染，失败时保留旧图，避免点击切态闪烁。
+            if let generated = createImageFromSubviews(size: size) {
+                if let annotationView = annotationView {
+                    applyChildrenImage(generated, to: annotationView, signature: signature)
+                }
+                return annotationView
+            }
 
-            // 🔑 修复:延长延迟时间,给 React Native Image 更多加载时间
+            if annotationView?.image == nil, let previousImage = lastRenderedChildrenImage {
+                annotationView?.image = previousImage
+                if let annotationView = annotationView {
+                    applyCenterOffset(to: annotationView, defaultOffset: .zero)
+                }
+            }
+
+            // 图片内容可能尚未就绪，保留旧图并延迟重试，避免透明闪烁。
             DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) { [weak self, weak annotationView] in
                 guard let self = self, let annotationView = annotationView else { return }
                 guard self.isAnnotationView(annotationView, boundTo: annotation) else { return }
                 // 再次检查缓存（避免重复渲染）
                 if let cached = IconBitmapCache.shared.image(forKey: key) {
-                    annotationView.image = cached
-                    self.applyCenterOffset(to: annotationView, defaultOffset: .zero)
+                    self.applyChildrenImage(cached, to: annotationView, signature: signature)
                     return
                 }
                 
                 // 调用你的原生渲染逻辑（保留空白检测、多次 layout）
-                if let generated = self.createImageFromSubviews() {
-                    annotationView.image = generated
-                    self.applyCenterOffset(to: annotationView, defaultOffset: .zero)
+                if let generated = self.createImageFromSubviews(size: size) {
+                    self.applyChildrenImage(generated, to: annotationView, signature: signature)
                 } else if self.hasPendingImageContent() {
                     self.scheduleSubviewRefresh(allowFallbackToDefault: false)
                 }
@@ -499,11 +514,11 @@ class MarkerView: ExpoView {
     /**
      * 将子视图转换为图片
      */
-    private func createImageFromSubviews() -> UIImage? {
-        let size = resolvedContentSubviewSize(defaultSize: CGSize(width: 200, height: 60))
+    private func createImageFromSubviews(size explicitSize: CGSize? = nil, cacheImage: Bool = true) -> UIImage? {
+        let size = explicitSize ?? resolvedContentSubviewSize(defaultSize: CGSize(width: 200, height: 60))
         let key = childrenCacheKey(for: size)
 
-        if let cachedImage = IconBitmapCache.shared.image(forKey: key) {
+        if cacheImage, let cachedImage = IconBitmapCache.shared.image(forKey: key) {
             return cachedImage
         }
         
@@ -544,11 +559,133 @@ class MarkerView: ExpoView {
         
    
         
-        IconBitmapCache.shared.setImage(image, forKey: key)
+        if cacheImage {
+            IconBitmapCache.shared.setImage(image, forKey: key)
+        }
         
         return image
     }
 
+    private func applyChildrenImage(_ image: UIImage, to annotationView: MAAnnotationView, signature: String? = nil) {
+        annotationView.image = image
+        applyCenterOffset(to: annotationView, defaultOffset: .zero)
+        annotationView.canShowCallout = false
+        annotationView.isDraggable = draggable
+        lastRenderedChildrenImage = image
+        if let resolvedSignature = signature {
+            lastRenderedChildrenSignature = resolvedSignature
+        }
+    }
+
+    private func currentChildrenAnnotationView() -> MAAnnotationView? {
+        if let annotationView,
+           let annotation,
+           isAnnotationView(annotationView, boundTo: annotation) {
+            return annotationView
+        }
+
+        if annotationView != nil {
+            annotationView = nil
+        }
+
+        if let animatedAnnotationView,
+           let animatedAnnotation,
+           isAnnotationView(animatedAnnotationView, boundTo: animatedAnnotation) {
+            return animatedAnnotationView
+        }
+
+        if animatedAnnotationView != nil {
+            animatedAnnotationView = nil
+        }
+
+        return nil
+    }
+
+    private func refreshChildrenImageInPlace(invalidateChildrenCache: Bool = false, cacheImage: Bool = true) {
+        guard !isRemoving else { return }
+
+        let refresh = { [weak self] in
+            guard let self = self, !self.isRemoving, !self.subviews.isEmpty else { return }
+
+            if invalidateChildrenCache {
+                self.lastRenderedChildrenSignature = nil
+                self.invalidateCurrentChildrenCache()
+            }
+
+            guard let targetView = self.currentChildrenAnnotationView() else {
+                self.refreshAnnotationAppearance(invalidateChildrenCache: invalidateChildrenCache)
+                return
+            }
+
+            let size = self.resolvedContentSubviewSize(defaultSize: CGSize(width: 200, height: 40))
+            let key = self.childrenCacheKey(for: size)
+            let signature = self.childrenRenderSignature()
+
+            if cacheImage, let cached = IconBitmapCache.shared.image(forKey: key) {
+                self.applyChildrenImage(cached, to: targetView, signature: signature)
+                return
+            }
+
+            if let generated = self.createImageFromSubviews(size: size, cacheImage: cacheImage) {
+                self.applyChildrenImage(generated, to: targetView, signature: signature)
+                return
+            }
+
+            if self.hasPendingImageContent() {
+                self.scheduleSubviewRefresh(allowFallbackToDefault: false)
+            }
+        }
+
+        if Thread.isMainThread {
+            refresh()
+        } else {
+            DispatchQueue.main.async(execute: refresh)
+        }
+    }
+
+    private func scheduleChildrenImageRefresh(
+        invalidateChildrenCache: Bool = false,
+        cacheImage: Bool = true,
+        delay: TimeInterval = 0.02
+    ) {
+        pendingSubviewRefreshTask?.cancel()
+
+        let task = DispatchWorkItem { [weak self] in
+            self?.refreshChildrenImageInPlace(invalidateChildrenCache: invalidateChildrenCache, cacheImage: cacheImage)
+        }
+
+        pendingSubviewRefreshTask = task
+        DispatchQueue.main.asyncAfter(deadline: .now() + delay, execute: task)
+    }
+
+    private func scheduleCacheKeyChildrenImageRefresh() {
+        pendingSubviewRefreshTask?.cancel()
+        pendingSubviewRefreshTask = nil
+        pendingCacheKeyRefreshTask?.cancel()
+
+        cacheKeyRefreshGeneration += 1
+        let generation = cacheKeyRefreshGeneration
+
+        lastRenderedChildrenSignature = nil
+        invalidateCurrentChildrenCache()
+
+        let uncachedTask = DispatchWorkItem { [weak self] in
+            guard let self = self, !self.isRemoving, self.cacheKeyRefreshGeneration == generation else { return }
+            self.refreshChildrenImageInPlace(invalidateChildrenCache: true, cacheImage: false)
+
+            let cachedTask = DispatchWorkItem { [weak self] in
+                guard let self = self, !self.isRemoving, self.cacheKeyRefreshGeneration == generation else { return }
+                self.refreshChildrenImageInPlace(invalidateChildrenCache: true, cacheImage: true)
+            }
+
+            self.pendingCacheKeyRefreshTask = cachedTask
+            DispatchQueue.main.asyncAfter(deadline: .now() + 0.08, execute: cachedTask)
+        }
+
+        pendingCacheKeyRefreshTask = uncachedTask
+        DispatchQueue.main.asyncAfter(deadline: .now() + 0.02, execute: uncachedTask)
+    }
+
     private func iconCacheKey(for iconUri: String) -> String {
         let baseKey = cacheKey ?? "icon|\(iconUri)"
         return "\(baseKey)|\(Int(iconWidth.rounded()))x\(Int(iconHeight.rounded()))"
@@ -719,12 +856,39 @@ class MarkerView: ExpoView {
      */
     override func willMove(toSuperview newSuperview: UIView?) {
         super.willMove(toSuperview: newSuperview)
-        
-        // 如果 newSuperview 为 nil，说明视图正在被移除
+
         if newSuperview == nil {
-            removeAnnotationFromMap()
+            scheduleAnnotationRemovalFromMap()
+        } else {
+            cancelPendingAnnotationRemoval()
         }
     }
+
+    override func didMoveToSuperview() {
+        super.didMoveToSuperview()
+
+        if superview != nil {
+            cancelPendingAnnotationRemoval()
+        }
+    }
+
+    private func scheduleAnnotationRemovalFromMap() {
+        cancelPendingAnnotationRemoval()
+
+        let task = DispatchWorkItem { [weak self] in
+            guard let self = self, self.superview == nil else { return }
+            self.pendingAnnotationRemovalTask = nil
+            self.removeAnnotationFromMap()
+        }
+
+        pendingAnnotationRemovalTask = task
+        DispatchQueue.main.asyncAfter(deadline: .now() + 0.3, execute: task)
+    }
+
+    private func cancelPendingAnnotationRemoval() {
+        pendingAnnotationRemovalTask?.cancel()
+        pendingAnnotationRemovalTask = nil
+    }
     
     /**
      * 从地图移除标记点
@@ -732,9 +896,11 @@ class MarkerView: ExpoView {
     private func removeAnnotationFromMap() {
         guard !isRemoving else { return }
         isRemoving = true
+        cancelPendingAnnotationRemoval()
         pendingAddTask?.cancel(); pendingAddTask = nil
         pendingUpdateTask?.cancel(); pendingUpdateTask = nil
         pendingSubviewRefreshTask?.cancel(); pendingSubviewRefreshTask = nil
+        pendingCacheKeyRefreshTask?.cancel(); pendingCacheKeyRefreshTask = nil
 
         if Thread.isMainThread {
             cleanupAnnotationFromMap()
@@ -769,6 +935,8 @@ class MarkerView: ExpoView {
         animatedAnnotationView?.annotation = nil
         annotationView = nil
         animatedAnnotationView = nil
+        lastRenderedChildrenImage = nil
+        lastRenderedChildrenSignature = nil
         isAnimating = false
         lastSetMapView = nil
         self.mapView = nil
@@ -844,18 +1012,15 @@ class MarkerView: ExpoView {
             return
         }
 
-        guard let annotationView = annotationView else {
+        guard let annotationView = currentChildrenAnnotationView() 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
+        let size = resolvedContentSubviewSize(defaultSize: CGSize(width: 200, height: 40))
+        if let image = createImageFromSubviews(size: size) {
+            applyChildrenImage(image, to: annotationView, signature: signature)
         }
     }
 
@@ -1023,7 +1188,7 @@ class MarkerView: ExpoView {
         guard contentWidth != width else { return }
         contentWidth = width
         if !subviews.isEmpty {
-            refreshAnnotationAppearance(invalidateChildrenCache: true)
+            scheduleChildrenImageRefresh(invalidateChildrenCache: true)
         }
     }
 
@@ -1031,7 +1196,7 @@ class MarkerView: ExpoView {
         guard contentHeight != height else { return }
         contentHeight = height
         if !subviews.isEmpty {
-            refreshAnnotationAppearance(invalidateChildrenCache: true)
+            scheduleChildrenImageRefresh(invalidateChildrenCache: true)
         }
     }
     
@@ -1281,6 +1446,8 @@ class MarkerView: ExpoView {
         pendingAddTask?.cancel()
         pendingUpdateTask?.cancel()
         pendingSubviewRefreshTask?.cancel()
+        pendingCacheKeyRefreshTask?.cancel()
+        pendingAnnotationRemovalTask?.cancel()
 
         if Thread.isMainThread {
             cleanupAnnotationFromMap()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-gaode-map",
-  "version": "2.2.38",
+  "version": "2.2.39",
   "description": "Expo Modules AMap (Gaode Map) stack for Expo/React Native: Config Plugin, New Architecture support, maps, location, search, offline maps, and react-native-amap3d migration guidance.",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -18,7 +18,7 @@
     "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",
+    "lint": "eslint \"src/**/*.{ts,tsx}\"",
     "test": "npx jest --no-watchman --config jest.config.js --runInBand",
     "prepare": "expo-module prepare && yarn build:plugin",
     "postinstall": "node scripts/check-expo-modules.js",
@@ -75,13 +75,15 @@
     "@babel/runtime": "^7.25.7",
     "@testing-library/react-native": "^13.3.3",
     "@types/jest": "^29.5.14",
+    "@types/node": "^22.18.0",
     "@types/react": "~19.2.10",
-    "expo": "^55.0.8",
-    "expo-module-scripts": "^55.0.2",
+    "eslint": "^9.25.1",
+    "expo": "^57.0.1",
+    "expo-module-scripts": "^56.0.3",
     "jest": "~29.7.0",
-    "jest-expo": "~55.0.11",
-    "react-native": "0.83.2",
-    "typescript": "^5.9.3"
+    "jest-expo": "~57.0.0",
+    "react-native": "0.86.0",
+    "typescript": "^6.0.3"
   },
   "peerDependencies": {
     "expo": "*",

package/plugin/build/withGaodeMap.js

@@ -146,8 +146,9 @@ const withGaodeMapAndroidManifest = (config, props) => {
             else {
                 // 更新现有的 API Key
                 const apiKeyIndex = mainApplication['meta-data'].findIndex((item) => item.$?.['android:name'] === 'com.amap.api.v2.apikey');
-                if (apiKeyIndex !== -1) {
-                    mainApplication['meta-data'][apiKeyIndex].$ = {
+                const apiKeyMetaData = mainApplication['meta-data'][apiKeyIndex];
+                if (apiKeyMetaData) {
+                    apiKeyMetaData.$ = {
                         'android:name': 'com.amap.api.v2.apikey',
                         'android:value': props.androidKey,
                     };