@react-native-ohos/react-native-amap3d 3.3.0-rc.2 → 3.3.0-rc.3

package/harmony/rn_amap3d/BuildProfile.ets

@@ -1,7 +1,7 @@
 /**
  * Use these variables when you tailor your ArkTS code. They must be of the const type.
  */
-export const HAR_VERSION = '3.3.0-rc.2';
+export const HAR_VERSION = '3.3.0-rc.3';
 export const BUILD_MODE_NAME = 'debug';
 export const DEBUG = true;
 export const TARGET_NAME = 'default';

package/harmony/rn_amap3d/oh-package.json5

@@ -3,7 +3,7 @@
   "devDependencies": {
   },
   "name": "@react-native-ohos/react-native-amap3d",
-  "version": "3.3.0-rc.2",
+  "version": "3.3.0-rc.3",
   "description": "Please describe the basic information.",
   "main": "index.ets",
   "author": "",

package/harmony/rn_amap3d/src/main/ets/GlobalCache.ets

@@ -6,6 +6,10 @@ import HashMap from '@ohos.util.HashMap';
 export default class GlobalCache {
   public static index: number = 1
   public static isGO: boolean = false;
+  // 记录已销毁的地图组件tag，用于防止异步操作访问已释放资源
+  public static destroyedMapTags: Set<number> = new Set();
+  // 记录已销毁的Marker组件tag
+  public static destroyedMarkerTags: Set<number> = new Set();
   public static cacheMap: Map<Object | undefined, number> = new Map()
   public static cacheMapPageDestroy: Map<number, boolean> = new Map()
   public static mapMarker: Map<number, Array<Marker>> = new Map();//map的tag和 marker集合
@@ -21,4 +25,8 @@ export default class GlobalCache {
 
   public static polygonCacheMap: HashMap<number, Polygon> = new HashMap();
   public static circleCacheMap: HashMap<number, Circle> = new HashMap();
+  // 新增: map的tag和circle集合的映射关系
+  public static mapCircle: Map<number, Array<Circle>> = new Map();
+  // 新增: circle的tag和map的tag的映射关系
+  public static currentPageCircle: HashMap<number, number> = new HashMap();
 }

package/harmony/rn_amap3d/src/main/ets/View/MapView.ets

@@ -109,14 +109,24 @@ export struct AMapView {
     }
     this.unregisterDescriptorChangesListener?.()
     this.cleanupCallback?.()
-    GlobalCache.maps.get(this.tag)?.clear()
-    GlobalCache.mapViews.get(this.tag)?.onDestroy();
-    GlobalCache.mapMarker.delete(this.tag);
-    GlobalCache.markerTagAndDescriptorTag.delete(this.tag);
-    GlobalCache.mapPolyLine.delete(this.tag);
-    GlobalCache.polyLinesTagAndDescriptorTag.delete(this.tag);
-    GlobalCache.polygonCacheMap.clear();
-    GlobalCache.circleCacheMap.clear();
+      GlobalCache.maps.get(this.tag)?.clear()
+      GlobalCache.mapViews.get(this.tag)?.onDestroy();
+      GlobalCache.mapMarker.delete(this.tag);
+      GlobalCache.markerTagAndDescriptorTag.delete(this.tag);
+      GlobalCache.mapPolyLine.delete(this.tag);
+      GlobalCache.polyLinesTagAndDescriptorTag.delete(this.tag);
+      GlobalCache.polygonCacheMap.clear();
+      // 清理属于当前 MapView 的 Circle
+      let circleTagsToRemove: number[] = [];
+      GlobalCache.currentPageCircle.forEach((mapTag: number, circleTag: number) => {
+        if (mapTag === this.tag) {
+          circleTagsToRemove.push(circleTag);
+        }
+      });
+      for (let circleTag of circleTagsToRemove) {
+        GlobalCache.circleCacheMap.remove(circleTag);
+        GlobalCache.currentPageCircle.remove(circleTag);
+      }
   }
 
   //地图
@@ -455,13 +465,12 @@ export struct AMapView {
       }
     }
 
-    // 删除不再需要的 Circle
+    // 删除不再需要的 Circle（只删除属于当前 MapView 的）
     let circlesToRemove: number[] = [];
-    GlobalCache.circleCacheMap.forEach((circle, circleTag) => {
-      if (circleTag != undefined) {
-        if (!currentCircleTags.has(circleTag)) {
-          circlesToRemove.push(circleTag);
-        }
+    GlobalCache.currentPageCircle.forEach((mapTag: number, circleTag: number) => {
+      // 只处理属于当前 MapView 的 Circle
+      if (mapTag === this.tag && !currentCircleTags.has(circleTag)) {
+        circlesToRemove.push(circleTag);
       }
     });
     for (let circleTag of circlesToRemove) {
@@ -470,6 +479,7 @@ export struct AMapView {
         circleToRemove.remove(); // 从地图上移除圆
       }
       GlobalCache.circleCacheMap.remove(circleTag); // 从缓存中删除
+      GlobalCache.currentPageCircle.remove(circleTag); // 从映射关系中删除
     }
 
     for (let i = 0; i < descriptor.childrenTags.length; i++) {
@@ -501,6 +511,8 @@ export struct AMapView {
             let circle = this.aMap?.addCircle(circleOptions);
             //Put the overlay ring in the cache and hot-update the properties to modify
             GlobalCache.circleCacheMap.set(childCircleTag, circle);
+            // 记录 Circle 与 MapView 的关联关系
+            GlobalCache.currentPageCircle.set(childCircleTag, this.tag);
             if (circle) {
               circle.setRadius(circleProp.radius ? circleProp.radius : 5000);
               circle.setCenter(new LatLng(circleProp.center.latitude, circleProp.center.longitude));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native-ohos/react-native-amap3d",
-  "version": "3.3.0-rc.2",
+  "version": "3.3.0-rc.3",
   "description": "react-native 高德地图组件，支持 harmonyOS",
   "license": "MIT",
   "keywords": [