@react-native-ohos/react-native-amap3d 3.2.6-rc.1 → 3.2.6-rc.3

package/harmony/rn_amap3d/BuildProfile.ets

@@ -0,0 +1,17 @@
+/**
+ * Use these variables when you tailor your ArkTS code. They must be of the const type.
+ */
+export const HAR_VERSION = '3.2.6-rc.3';
+export const BUILD_MODE_NAME = 'debug';
+export const DEBUG = true;
+export const TARGET_NAME = 'default';
+
+/**
+ * BuildProfile Class is used only for compatibility purposes.
+ */
+export default class BuildProfile { 
+	static readonly HAR_VERSION = HAR_VERSION;
+	static readonly BUILD_MODE_NAME = BUILD_MODE_NAME;
+	static readonly DEBUG = DEBUG;
+	static readonly TARGET_NAME = TARGET_NAME;
+}

package/harmony/rn_amap3d/oh-package.json5

@@ -3,15 +3,15 @@
   "devDependencies": {
   },
   "name": "@react-native-ohos/react-native-amap3d",
-  "version": "3.2.6-rc.1",
+  "version": "3.2.6-rc.3",
   "description": "Please describe the basic information.",
   "main": "index.ets",
   "author": "",
   "license": "Apache-2.0",
   "dependencies": {
     "@rnoh/react-native-openharmony": "0.72.82",
-    "@amap/amap_lbs_map3d": "2.2.1",
-    "@amap/amap_lbs_common": ">=1.2.0",
-    "@amap/amap_lbs_location": "^1.2.2"
+    "@amap/amap_lbs_map3d": "2.2.5",
+    "@amap/amap_lbs_common": ">=1.2.3",
+    "@amap/amap_lbs_location": "^1.2.3"
   }
 }

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

@@ -25,9 +25,39 @@ import type {
   UITurboModule,
   UITurboModuleContext
 } from '@rnoh/react-native-openharmony/ts';
-import { RNOHPackage, TurboModulesFactory } from '@rnoh/react-native-openharmony'
+import { RNOHPackage, TurboModulesFactory, ComponentBuilderContext } from '@rnoh/react-native-openharmony'
 import { AMap3DModule } from './AMap3DModule';
 import type { TurboModule } from '@rnoh/react-native-openharmony/ts';
+import { A_MAP_CIRCLE_VIEW_TYPE, AMapCircle } from './View/AMapCircle';
+import { A_MAP_MARKER_TYPE, AMapMarker } from './View/AMapMarker';
+import { A_MAP_POLYGON_TYPE, AMapPolygon } from './View/AMapPolygon';
+import { A_MAP_POLYLINE_TYPE, AMapPolyline } from './View/AMapPolyline';
+import { GOADE_MAP_VIEW_TYPE, AMapView } from './View/MapView';
+
+@Builder
+function aMapCircle(ctx: ComponentBuilderContext) {
+  AMapCircle({ ctx: ctx.rnComponentContext, tag: ctx.tag })
+}
+
+@Builder
+function aMapMarker(ctx: ComponentBuilderContext) {
+  AMapMarker({ ctx: ctx.rnComponentContext, tag: ctx.tag })
+}
+
+@Builder
+function aMapPolygon(ctx: ComponentBuilderContext) {
+  AMapPolygon({ ctx: ctx.rnComponentContext, tag: ctx.tag })
+}
+
+@Builder
+function aMapPolyline(ctx: ComponentBuilderContext) {
+  AMapPolyline({ ctx: ctx.rnComponentContext, tag: ctx.tag })
+}
+
+@Builder
+function aMapView(ctx: ComponentBuilderContext) {
+  AMapView({ ctx: ctx.rnComponentContext, tag: ctx.tag })
+}
 
 class RNAMap3DTurboModuleFactory extends TurboModulesFactory {
   createTurboModule(name: string): TurboModule | null {
@@ -67,6 +97,18 @@ export class AMap3DPackage extends RNOHPackage {
   getDebugName(): string {
     return 'AMap3DPackage';
   }
+
+  createWrappedCustomRNComponentBuilderByComponentNameMap(): Map<string, WrappedBuilder<[ComponentBuilderContext]>> {
+    const aMapBuilderMap = new Map<string, WrappedBuilder<[ComponentBuilderContext]>>();
+
+    aMapBuilderMap.set(GOADE_MAP_VIEW_TYPE, wrapBuilder(aMapView))
+    aMapBuilderMap.set(A_MAP_CIRCLE_VIEW_TYPE, wrapBuilder(aMapCircle))
+    aMapBuilderMap.set(A_MAP_MARKER_TYPE, wrapBuilder(aMapMarker))
+    aMapBuilderMap.set(A_MAP_POLYGON_TYPE, wrapBuilder(aMapPolygon))
+    aMapBuilderMap.set(A_MAP_POLYLINE_TYPE, wrapBuilder(aMapPolyline))
+
+    return aMapBuilderMap;
+  }
 }
 
 export const createAMap3DPackage = () => {

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集合

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

@@ -28,11 +28,26 @@ export struct AMapMarker {
   markerTagAndDescriptorTagArray: Array<HashMap<number, string>> = []
   @State amapDescriptor: AMapMarkerDescriptor = {} as AMapMarkerDescriptor
   private unregisterDescriptorChangesListener?: () => void = undefined
+  private isDestroyed: boolean = false;
   static NAME: string = "AMapMarker";
-
+/**
+   * 检查组件是否仍然有效（未被销毁）
+   */
+  private isValid(): boolean {
+    let currentMapTag = GlobalCache.currentPageMarker.get(this.tag);
+    return !this.isDestroyed &&
+           !GlobalCache.destroyedMarkerTags.has(this.tag) &&
+           (currentMapTag === undefined || !GlobalCache.destroyedMapTags.has(currentMapTag));
+  }
   aboutToAppear(): void {
+     // 从销毁列表中移除（处理组件复用场景）
+    GlobalCache.destroyedMarkerTags.delete(this.tag);
     this.unregisterDescriptorChangesListener = this.ctx.descriptorRegistry.subscribeToDescriptorChanges(this.tag,
       async (newDescriptor) => {
+        // 检查组件是否已销毁
+        if (!this.isValid()) {
+          return;
+        }
         /*------ 当RN侧属性props有更改 -------*/
         let currentMapTag = GlobalCache.currentPageMarker.get(this.tag)
         this.markers = GlobalCache.mapMarker.get(currentMapTag) ?? [];
@@ -43,9 +58,15 @@ export struct AMapMarker {
 
           for (let j = 0; j < this.markerTagAndDescriptorTagArray.length; ++j) {
             this.markerTagAndDescriptorTagArray[j].forEach(async (markerID: string, markerTag: number, map: HashMap<number, string>) => {
+              // 异步操作前检查组件是否已销毁
+              if (!this.isValid()) {
+                return;
+              }
               if (markerTag == this.tag) {
                 for (let i = 0; i < this.markers.length; ++i) {
                   if (this.markers[i].getId() == markerID) {
+                    // 每次操作前都检查有效性
+                    if (!this.isValid()) return;  
                     this.markers[i].setPosition(new LatLng(mapMarkerProps.position.latitude, mapMarkerProps.position.longitude));
                     this.markers[i].setAnchor(mapMarkerProps.anchor ? mapMarkerProps.anchor.x : 1,
                       mapMarkerProps.anchor ? mapMarkerProps.anchor.y : 0.5);
@@ -59,9 +80,12 @@ export struct AMapMarker {
                         let bitmapDes: BitmapDescriptor | undefined =
                           await BitmapDescriptorFactory.fromRawfilePath(globalContext, resoure);
                         this.markers[i].setIcon(bitmapDes);
+                        if (!this.isValid()) return;
                       } catch (error) {
+                        if (!this.isValid()) return;
                         let bitmapDesNull: BitmapDescriptor | undefined =
                           await BitmapDescriptorFactory.fromRawfilePath(globalContext, "common/marker_default.png");
+                          if (!this.isValid()) return;
                         if (bitmapDesNull) {
                           this.markers[i].setIcon(bitmapDesNull);
                         }
@@ -77,6 +101,14 @@ export struct AMapMarker {
     )
   }
 
+aboutToDisappear(): void {
+    // 标记组件为已销毁
+    this.isDestroyed = true;
+    GlobalCache.destroyedMarkerTags.add(this.tag);
+    // 取消订阅
+    this.unregisterDescriptorChangesListener?.();
+  }
+
   build() {
     ContentSlot(this.ctx.getContentForTag(this.tag))
   }

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

@@ -33,10 +33,25 @@ export struct AMapPolyline {
   @State amapDescriptor: AMapPolylineDescriptor = {} as AMapPolylineDescriptor
   static NAME: string = "AMapPolyline";
   private unregisterDescriptorChangesListener?: () => void = undefined
+  // 组件是否已销毁标志
+  private isDestroyed: boolean = false;
+
+  /**
+   * 检查组件是否仍然有效（未被销毁）
+   */
+  private isValid(): boolean {
+    let currentMapTag = GlobalCache.currentPagePolyline.get(this.tag);
+    return !this.isDestroyed &&
+           (currentMapTag === undefined || !GlobalCache.destroyedMapTags.has(currentMapTag));
+  }
 
   aboutToAppear(): void {
     this.unregisterDescriptorChangesListener = this.ctx.descriptorRegistry.subscribeToDescriptorChanges(this.tag,
       async (newDescriptor) => {
+        // 检查组件是否已销毁
+        if (!this.isValid()) {
+          return;
+        }
         /*------ 当RN侧属性props有更改 -------*/
         let currentMapTag = GlobalCache.currentPagePolyline.get(this.tag)
         this.polyLines = GlobalCache.mapPolyLine.get(currentMapTag) ?? [];
@@ -47,9 +62,15 @@ export struct AMapPolyline {
           for (let j = 0; j < this.polyLineTagAndDescriptorTagArray.length; ++j) {
             this.polyLineTagAndDescriptorTagArray[j].forEach(async (polyLineID: string, polyLineTag: number,
               map: HashMap<number, string>) => {
+                // 异步操作前检查组件是否已销毁
+              if (!this.isValid()) {
+                return;
+              }
               if (polyLineTag == this.tag) {
                 for (let i = 0; i < this.polyLines.length; ++i) {
                   if (this.polyLines[i].getId() == polyLineID) {
+                    // 每次操作前都检查有效性
+                    if (!this.isValid()) return;
                     this.polyLines[i].setZIndex(mapPolylineProp.zIndex ? mapPolylineProp.zIndex : 1);
                     this.polyLines[i].setDottedLine(mapPolylineProp.dotted ? mapPolylineProp.dotted : false);
                     this.polyLines[i].setGeodesic(mapPolylineProp.geodesic ? mapPolylineProp.geodesic : false);
@@ -84,6 +105,13 @@ export struct AMapPolyline {
     )
   }
 
+aboutToDisappear(): void {
+    // 标记组件为已销毁
+    this.isDestroyed = true;
+    // 取消订阅
+    this.unregisterDescriptorChangesListener?.();
+  }
+
   build() {
   }
 }

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

@@ -86,8 +86,19 @@ export struct AMapView {
   private polylines : Array<Polyline> = new Array();
   private markerTagAndDescriptorTagArray : Array<HashMap<number, string>> = new Array();
   private polylineTagAndDescriptorTagArray : Array<HashMap<number, string>> = new Array();
-  private mapListener?: OnLocationChangedListener;
+   private mapListener?: OnLocationChangedListener;
+// 组件是否已销毁标志，用于防止异步操作访问已释放资源
+  private isDestroyed: boolean = false;
+
+  /**
+   * 检查组件是否仍然有效（未被销毁）
+   */
+  private isValid(): boolean {
+    return !this.isDestroyed && !GlobalCache.destroyedMapTags.has(this.tag);
+  }
   aboutToAppear(): void {
+    // 从销毁列表中移除（处理组件复用场景）
+    GlobalCache.destroyedMapTags.delete(this.tag);
     this.cleanupCallback = this.ctx.componentCommandReceiver.registerCommandCallback(
       this.tag,
       (command, args: ESObject[]) => {
@@ -102,6 +113,10 @@ export struct AMapView {
     this.show();
     this.unregisterDescriptorChangesListener = this.ctx.descriptorRegistry.subscribeToDescriptorChanges(this.tag,
       (newDescriptor) => {
+        // 检查组件是否已销毁，避免访问已释放资源
+        if (!this.isValid()) {
+          return;
+        }
         if (this.aMap) {
           GlobalCache.mapPolyLine.clear();
           /*------ 当RN侧属性props有更改 -------*/
@@ -125,19 +140,29 @@ export struct AMapView {
   }
 
   aboutToDisappear(): void {
+     // 首先标记组件为已销毁，阻止后续异步操作
+    this.isDestroyed = true;
+    GlobalCache.destroyedMapTags.add(this.tag);
     if (this.mapViewCreateCallback) {
       MapViewManager.getInstance().unregisterMapViewCreatedCallback(this.mapViewCreateCallback);
     }
     this.unregisterDescriptorChangesListener?.()
     this.cleanupCallback?.()
-    GlobalCache.maps.get(this.tag)?.clear()
-    GlobalCache.mapViews.get(this.tag)?.onDestroy();
+     // 延迟清理资源，确保正在进行的异步操作有机会检查销毁标志
+    setTimeout(() => {
+      try {
+        GlobalCache.maps.get(this.tag)?.clear()
+        GlobalCache.mapViews.get(this.tag)?.onDestroy();
+    } catch (error) {
+        // 忽略清理过程中的错误
+      }
     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();
+    }, 500);
   }
 
   locationManager?:AMapLocationManagerImpl
@@ -247,6 +272,10 @@ export struct AMapView {
   }
 
   private mapViewCreateCallback = (mapview?: MapView, mapViewName?: string) => {
+    // 检查组件是否已销毁
+    if (!this.isValid()) {
+      return;
+    }
     if (!mapview) {
       return;
     }
@@ -256,7 +285,11 @@ export struct AMapView {
     mapview.onCreate();
     GlobalCache.mapViews.set(this.tag, mapview);
     this.mapView = GlobalCache.mapViews.get(this.tag);
-    this.mapView.getMapAsync(async (map: AMap) => {
+    this.mapView.getMapAsync(async (map:AMap) => {
+      // 异步回调中再次检查
+      if (!this.isValid()) {
+        return;
+      }
       GlobalCache.maps.set(this.tag, map);
       this.aMap = GlobalCache.maps.get(this.tag);
       this.aMap.setLocationSource(this);
@@ -472,6 +505,10 @@ export struct AMapView {
   }
 
   private async getOverlay(descriptor: GDMapViewDescriptor) {
+    // 检查组件是否已销毁
+    if (!this.isValid()) {
+      return;
+    }
     let tagName = "";
     let flag = false;
     let flagLine = false;
@@ -609,10 +646,16 @@ export struct AMapView {
 
           for (let index = 0; index < markerTagAndDescriptorTagArray.length; index++) {
             markerTagAndDescriptorTagArray[index].forEach(async (value: string, key: number, map: HashMap<number, string>) => {
+              // 异步操作前检查组件是否已销毁
+              if (!this.isValid()) {
+                return;
+              }
               if (markerDescriptor.tag == key) {
                 for (let markerIndex = 0; markerIndex < this.markers.length; markerIndex++) {
                   if (this.markers[markerIndex].getId() == value) {
                     flag = true;
+                    // 每次操作前都检查有效性
+                    if (!this.isValid()) return;
                     this.markers[markerIndex].setPosition(new LatLng(mapMarkerProps.position.latitude, mapMarkerProps.position.longitude));
                     this.markers[markerIndex].setAnchor(mapMarkerProps.anchor ? mapMarkerProps.anchor.x : 1,
                       mapMarkerProps.anchor ? mapMarkerProps.anchor.y : 0.5);
@@ -626,14 +669,20 @@ export struct AMapView {
                       let bitmapView : BitmapDescriptor | undefined = await BitmapDescriptorFactory.fromView(() => {
                         this.customMarkerBuilder(markerDescriptor.tag);
                       })
+                      // 异步操作后再次检查
+                      if (!this.isValid()) return;
                       this.markers[markerIndex].setIcon(bitmapView);
                     } else {
                       if (mapMarkerProps.icon) {
                         try {
                           await DownloadIcon.updataMakerIcon(this.getUIContext(), this.markers[markerIndex], mapMarkerProps.icon);
+                          // 异步操作后再次检查
+                          if (!this.isValid()) return;
                         } catch (error) {
+                          if (!this.isValid()) return;
                           let bitmapDesNull: BitmapDescriptor | undefined =
                             await BitmapDescriptorFactory.fromRawfilePath(globalContext, "common/marker_default.png");
+                            if (!this.isValid()) return;
                           if (bitmapDesNull) {
                             this.markers[markerIndex].setIcon(bitmapDesNull);
                           }
@@ -648,6 +697,10 @@ export struct AMapView {
           }
 
           if (!flag) {
+            // 检查组件是否已销毁
+            if (!this.isValid()) {
+              break;
+            }
             let markerOptions = new MarkerOptions();
             GlobalCache.currentPageMarker.set(markerDescriptor.tag, this.tag)
             this.markerTag.push(this.ctx.descriptorRegistry.getDescriptor(descriptor.childrenTags[i]).tag);
@@ -662,19 +715,37 @@ export struct AMapView {
                     let bitmapView: BitmapDescriptor | undefined = await BitmapDescriptorFactory.fromView(() => {
                       this.customMarkerBuilder(markerDescriptor.tag);
                     })
+                    // 异步操作后检查组件是否已销毁
+                    if (!this.isValid()) {
+                      break;
+                    }
                     markerOptions.setIcon(bitmapView);
                   } else {
                     if (mapMarkerProps.icon) {
                       try {
                         await DownloadIcon.updataMakerIcon(this.getUIContext(), markerOptions, mapMarkerProps.icon);
+                        // 异步操作后检查组件是否已销毁
+                        if (!this.isValid()) {
+                          break;
+                        } 
                       } catch (error) {
+                        if (!this.isValid()) {
+                          break;
+                        }
                         let bitmapDesNull: BitmapDescriptor | undefined =
                           await BitmapDescriptorFactory.fromRawfilePath(globalContext, "common/marker_default.png");
+                          if (!this.isValid()) {
+                          break;
+                        }
                         if (bitmapDesNull) {
                           markerOptions.setIcon(bitmapDesNull);
                         }
                       }
                     }
+                    }
+                  // 最后添加 marker 前再次检查
+                  if (!this.isValid()) {
+                    break;
                   }
                   markerOptions.setDraggable(mapMarkerProps.draggable ? mapMarkerProps.draggable : false);
                   markerOptions.setZIndex(mapMarkerProps.zIndex ? mapMarkerProps.zIndex : 1);

package/package.json

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