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

package/README.md

@@ -1,5 +1,5 @@
 # @react-native-ohos/react-native-amap3d
-This project is based on [react-native-amap3d](https://github.com/qiuxiang/react-native-amap3d)
+This project is based on [react-native-amap3d@3.2.4](https://github.com/qiuxiang/react-native-amap3d/tree/v3.2.4)
 ## Documentation
 [中文](https://gitee.com/react-native-oh-library/usage-docs/tree/master/zh-cn/react-native-amap3d.md)
 

package/harmony/rn_amap3d/index.ets

@@ -22,9 +22,11 @@
  * SOFTWARE.
  */
 
+import { AMap3DPackage as MapViewPackage } from './src/main/ets/AMap3DPackage'
 export * from "./src/main/ets/View/MapView";
 export * from "./src/main/ets/View/AMapCircle";
 export * from "./src/main/ets/View/AMapMarker";
 export * from "./src/main/ets/View/AMapPolygon";
 export * from "./src/main/ets/View/AMapPolyline";
 export * from "./ts";
+export default MapViewPackage

package/harmony/rn_amap3d/obfuscation-rules.txt

@@ -15,4 +15,8 @@
 
 # Keep options:
 # -keep-property-name: specifies property names that you want to keep
-# -keep-global-name: specifies names that you want to keep in the global scope
+# -keep-global-name: specifies names that you want to keep in the global scope
+-enable-property-obfuscation
+-enable-toplevel-obfuscation
+-enable-filename-obfuscation
+-enable-export-obfuscation

package/harmony/rn_amap3d/oh-package.json5

@@ -3,14 +3,15 @@
   "devDependencies": {
   },
   "name": "@react-native-ohos/react-native-amap3d",
-  "version": "3.2.5-rc.1",
+  "version": "3.2.6-rc.2",
   "description": "Please describe the basic information.",
   "main": "index.ets",
   "author": "",
   "license": "Apache-2.0",
   "dependencies": {
-    "@rnoh/react-native-openharmony": "file:../react_native_openharmony",
-    "@amap/amap_lbs_map3d": "2.1.0",
-    "@amap/amap_lbs_common": ">=1.0.0",
+    "@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"
   }
 }

package/harmony/rn_amap3d/src/main/cpp/AMap3dEventEmitRequestHandler.h

@@ -21,6 +21,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+#ifndef AMAP3D_EVENT_EMIT_REQUEST_HANDLER_h
+#define AMAP3D_EVENT_EMIT_REQUEST_HANDLER_h
+
 #pragma once
 #include "RNOH/ArkJS.h"
 #include "RNOH/EventEmitRequestHandler.h"
@@ -43,7 +46,8 @@ enum class AMapViewEventType {
 
 enum class AMapMarkerEventType { RNC_ONPress = 0, RNC_ONDragStart = 2, RNC_ONDrag = 3, RNC_ONDragEnd = 4 };
 
-AMapViewEventType getAMapViewEventType(ArkJS &arkJs, napi_value eventObject) {
+AMapViewEventType getAMapViewEventType(ArkJS &arkJs, napi_value eventObject)
+{
     auto eventType = arkJs.getString(arkJs.getObjectProperty(eventObject, "type"));
     if (eventType == "onPress") {
         return AMapViewEventType::RNC_ONPress;
@@ -62,7 +66,8 @@ AMapViewEventType getAMapViewEventType(ArkJS &arkJs, napi_value eventObject) {
     }
 }
 
-AMapMarkerEventType getAMapMarkerEventType(ArkJS &arkJs, napi_value eventObject) {
+AMapMarkerEventType getAMapMarkerEventType(ArkJS &arkJs, napi_value eventObject)
+{
     auto eventType = arkJs.getString(arkJs.getObjectProperty(eventObject, "type"));
     if (eventType == "onPress") {
         return AMapMarkerEventType::RNC_ONPress;
@@ -79,7 +84,8 @@ AMapMarkerEventType getAMapMarkerEventType(ArkJS &arkJs, napi_value eventObject)
 
 class AMapViewEventEmitRequestHandler : public EventEmitRequestHandler {
 public:
-    void handleEvent(EventEmitRequestHandler::Context const &ctx) override {
+    void handleEvent(EventEmitRequestHandler::Context const &ctx) override
+    {
         LOG(INFO) << "AMapViewEventEmitRequestHandler AMapViewEventType::RNC_ONLoad entry";
         if (ctx.eventName != "AMapView") {
             return;
@@ -91,75 +97,78 @@ public:
         }
         LOG(INFO) << "AMapViewEventEmitRequestHandler AMapViewEventType eventEmitter not nullptr";
         switch (getAMapViewEventType(arkJs, ctx.payload)) {
-        case AMapViewEventType::RNC_ONPress: {
-            RNOHNapiObject target = arkJs.getObject((arkJs.getObjectProperty(ctx.payload, "LatLng")));
-            double latitude = (double)arkJs.getDouble(target.getProperty("latitude"));
-            double longitude = (double)arkJs.getDouble(target.getProperty("longitude"));
-            facebook::react::MapViewEventEmitter::onPressEvent event{latitude, longitude};
-            eventEmitter->onPress(event);
-            break;
-        }
-        case AMapViewEventType::RNC_ONPressPoi: {
-            RNOHNapiObject Poi = arkJs.getObject((arkJs.getObjectProperty(ctx.payload, "Poi")));
-            std::string id = (std::string)arkJs.getString(Poi.getProperty("poiid"));
-            std::string name = (std::string)arkJs.getString(Poi.getProperty("name"));
-            RNOHNapiObject latLngObject = arkJs.getObject(Poi.getProperty("coordinate"));
-            double latitude = (double)arkJs.getDouble(latLngObject.getProperty("latitude"));
-            double longitude = (double)arkJs.getDouble(latLngObject.getProperty("longitude"));
-            facebook::react::MapViewEventEmitter::LatLng latLngC{latitude, longitude};
-            facebook::react::MapViewEventEmitter::onMapPoiEvent event{id, name, latLngC};
-            eventEmitter->onPressPoi(event);
-            break;
-        }
-         case AMapViewEventType::RNC_ONLongPress: {
-            RNOHNapiObject target = arkJs.getObject((arkJs.getObjectProperty(ctx.payload, "LatLng")));
-            double latitude = (double)arkJs.getDouble(target.getProperty("latitude"));
-            double longitude = (double)arkJs.getDouble(target.getProperty("longitude"));
-            facebook::react::MapViewEventEmitter::onLongPressEvent event{latitude, longitude};
-            eventEmitter->onLongPress(event);
-            break;
-        }
-        case AMapViewEventType::RNC_ONCameraMove: {
-            RNOHNapiObject cameraPosition = arkJs.getObject((arkJs.getObjectProperty(ctx.payload, "CameraPosition")));
-            double zoom = (double)arkJs.getDouble(cameraPosition.getProperty("zoom"));
-            double bearing = (double)arkJs.getDouble(cameraPosition.getProperty("bearing"));
-            double tilt = (double)arkJs.getDouble(cameraPosition.getProperty("tilt"));
-            RNOHNapiObject target = arkJs.getObject(cameraPosition.getProperty("target"));
-            double latitude = (double)arkJs.getDouble(target.getProperty("latitude"));
-            double longitude = (double)arkJs.getDouble(target.getProperty("longitude"));
-            facebook::react::MapViewEventEmitter::LatLng targetL{latitude, longitude};
-            facebook::react::MapViewEventEmitter::CameraPosition event{targetL, zoom, bearing, tilt};
-            eventEmitter->onCameraMove(event);
-            break;
-        }
-        case AMapViewEventType::RNC_ONCameraIdle: {
-            RNOHNapiObject cameraPosition = arkJs.getObject((arkJs.getObjectProperty(ctx.payload, "CameraPosition")));
-            double zoom = (double)arkJs.getDouble(cameraPosition.getProperty("zoom"));
-            double bearing = (double)arkJs.getDouble(cameraPosition.getProperty("bearing"));
-            double tilt = (double)arkJs.getDouble(cameraPosition.getProperty("tilt"));
-            RNOHNapiObject target = arkJs.getObject(cameraPosition.getProperty("target"));
-            double latitude = (double)arkJs.getDouble(target.getProperty("latitude"));
-            double longitude = (double)arkJs.getDouble(target.getProperty("longitude"));
-            facebook::react::MapViewEventEmitter::LatLng targetL{latitude, longitude};
-            facebook::react::MapViewEventEmitter::CameraPosition event{targetL, zoom, bearing, tilt};
-            eventEmitter->onCameraIdle(event);
-            break;
-        }
-        case AMapViewEventType::RNC_ONLoad: {
-            LOG(INFO) << "AMapViewEventEmitRequestHandler AMapViewEventType::RNC_ONLoad entry";
-            facebook::react::MapViewEventEmitter::onLoadEvent event{};
-            eventEmitter->onLoad(event);
-            break;
-        }
-        default:
-            break;
-        }
+            case AMapViewEventType::RNC_ONPress: {
+                RNOHNapiObject target = arkJs.getObject((arkJs.getObjectProperty(ctx.payload, "LatLng")));
+                double latitude = (double)arkJs.getDouble(target.getProperty("latitude"));
+                double longitude = (double)arkJs.getDouble(target.getProperty("longitude"));
+                facebook::react::MapViewEventEmitter::onPressEvent event{latitude, longitude};
+                eventEmitter->onPress(event);
+                break;
+            }
+            case AMapViewEventType::RNC_ONPressPoi: {
+                RNOHNapiObject Poi = arkJs.getObject((arkJs.getObjectProperty(ctx.payload, "Poi")));
+                std::string id = (std::string)arkJs.getString(Poi.getProperty("poiid"));
+                std::string name = (std::string)arkJs.getString(Poi.getProperty("name"));
+                RNOHNapiObject latLngObject = arkJs.getObject(Poi.getProperty("coordinate"));
+                double latitude = (double)arkJs.getDouble(latLngObject.getProperty("latitude"));
+                double longitude = (double)arkJs.getDouble(latLngObject.getProperty("longitude"));
+                facebook::react::MapViewEventEmitter::LatLng latLngC{latitude, longitude};
+                facebook::react::MapViewEventEmitter::onMapPoiEvent event{id, name, latLngC};
+                eventEmitter->onPressPoi(event);
+                break;
+            }
+            case AMapViewEventType::RNC_ONLongPress: {
+                RNOHNapiObject target = arkJs.getObject((arkJs.getObjectProperty(ctx.payload, "LatLng")));
+                double latitude = (double)arkJs.getDouble(target.getProperty("latitude"));
+                double longitude = (double)arkJs.getDouble(target.getProperty("longitude"));
+                facebook::react::MapViewEventEmitter::onLongPressEvent event{latitude, longitude};
+                eventEmitter->onLongPress(event);
+                break;
+            }
+            case AMapViewEventType::RNC_ONCameraMove: {
+                RNOHNapiObject cameraPosition = arkJs.getObject((arkJs.getObjectProperty(ctx.payload,
+                                                                                         "CameraPosition")));
+                double zoom = (double)arkJs.getDouble(cameraPosition.getProperty("zoom"));
+                double bearing = (double)arkJs.getDouble(cameraPosition.getProperty("bearing"));
+                double tilt = (double)arkJs.getDouble(cameraPosition.getProperty("tilt"));
+                RNOHNapiObject target = arkJs.getObject(cameraPosition.getProperty("target"));
+                double latitude = (double)arkJs.getDouble(target.getProperty("latitude"));
+                double longitude = (double)arkJs.getDouble(target.getProperty("longitude"));
+                facebook::react::MapViewEventEmitter::LatLng targetL{latitude, longitude};
+                facebook::react::MapViewEventEmitter::CameraPosition event{targetL, zoom, bearing, tilt};
+                eventEmitter->onCameraMove(event);
+                break;
+            }
+            case AMapViewEventType::RNC_ONCameraIdle: {
+                RNOHNapiObject cameraPosition = arkJs.getObject((arkJs.getObjectProperty(ctx.payload,
+                                                                                         "CameraPosition")));
+                double zoom = (double)arkJs.getDouble(cameraPosition.getProperty("zoom"));
+                double bearing = (double)arkJs.getDouble(cameraPosition.getProperty("bearing"));
+                double tilt = (double)arkJs.getDouble(cameraPosition.getProperty("tilt"));
+                RNOHNapiObject target = arkJs.getObject(cameraPosition.getProperty("target"));
+                double latitude = (double)arkJs.getDouble(target.getProperty("latitude"));
+                double longitude = (double)arkJs.getDouble(target.getProperty("longitude"));
+                facebook::react::MapViewEventEmitter::LatLng targetL{latitude, longitude};
+                facebook::react::MapViewEventEmitter::CameraPosition event{targetL, zoom, bearing, tilt};
+                eventEmitter->onCameraIdle(event);
+                break;
+            }
+            case AMapViewEventType::RNC_ONLoad: {
+                LOG(INFO) << "AMapViewEventEmitRequestHandler AMapViewEventType::RNC_ONLoad entry";
+                facebook::react::MapViewEventEmitter::onLoadEvent event{};
+                eventEmitter->onLoad(event);
+                break;
+            }
+            default:
+                break;
+            }
     };
 };
 
 class AMapMarkerEventEmitRequestHandler : public EventEmitRequestHandler {
 public:
-    void handleEvent(EventEmitRequestHandler::Context const &ctx) override {
+    void handleEvent(EventEmitRequestHandler::Context const &ctx) override
+    {
         if (ctx.eventName != "AMapMarker") {
             return;
         }
@@ -170,38 +179,39 @@ public:
         }
 
         switch (getAMapMarkerEventType(arkJs, ctx.payload)) {
-        case AMapMarkerEventType::RNC_ONPress: {
-            facebook::react::MarkerEventEmitter::onPressEvent event{};
-            eventEmitter->onPress(event);
-            break;
-        }
-        case AMapMarkerEventType::RNC_ONDragStart: {
-            facebook::react::MarkerEventEmitter::onDragStartEvent event{};
-            eventEmitter->onDragStart(event);
-            break;
-        }
-        case AMapMarkerEventType::RNC_ONDrag: {
-            facebook::react::MarkerEventEmitter::onDragEvent event{};
-            eventEmitter->onDrag(event);
-            break;
-        }
-        case AMapMarkerEventType::RNC_ONDragEnd: {
-            RNOHNapiObject target = arkJs.getObject((arkJs.getObjectProperty(ctx.payload, "LatLng")));
-            double latitude = (double)arkJs.getDouble(target.getProperty("latitude"));
-            double longitude = (double)arkJs.getDouble(target.getProperty("longitude"));
-            facebook::react::MarkerEventEmitter::onDragEndEvent event{latitude, longitude};
-            eventEmitter->onDragEnd(event);
-            break;
-        }
-        default:
-            break;
+            case AMapMarkerEventType::RNC_ONPress: {
+                facebook::react::MarkerEventEmitter::onPressEvent event{};
+                eventEmitter->onPress(event);
+                break;
+            }
+            case AMapMarkerEventType::RNC_ONDragStart: {
+                facebook::react::MarkerEventEmitter::onDragStartEvent event{};
+                eventEmitter->onDragStart(event);
+                break;
+            }
+            case AMapMarkerEventType::RNC_ONDrag: {
+                facebook::react::MarkerEventEmitter::onDragEvent event{};
+                eventEmitter->onDrag(event);
+                break;
+            }
+            case AMapMarkerEventType::RNC_ONDragEnd: {
+                RNOHNapiObject target = arkJs.getObject((arkJs.getObjectProperty(ctx.payload, "LatLng")));
+                double latitude = (double)arkJs.getDouble(target.getProperty("latitude"));
+                double longitude = (double)arkJs.getDouble(target.getProperty("longitude"));
+                facebook::react::MarkerEventEmitter::onDragEndEvent event{latitude, longitude};
+                eventEmitter->onDragEnd(event);
+                break;
+            }
+            default:
+                break;
         }
     };
 };
 
 class AMapPolylineEventEmitRequestHandler : public EventEmitRequestHandler {
 public:
-    void handleEvent(EventEmitRequestHandler::Context const &ctx) override {
+    void handleEvent(EventEmitRequestHandler::Context const &ctx) override
+    {
         if (ctx.eventName != "AMapPolyline") {
             return;
         }
@@ -215,4 +225,5 @@ public:
     };
 };
 
-} // namespace rnoh
+} // namespace rnoh
+#endif

package/harmony/rn_amap3d/src/main/cpp/AMapEventEmitters.cpp

@@ -25,8 +25,8 @@
 
 namespace facebook {
 namespace react {
-void MapViewEventEmitter::onPress(struct onPressEvent event) const {
-    
+void MapViewEventEmitter::onPress(struct onPressEvent event) const
+{
     dispatchEvent("Press", [event = std::move(event)](jsi::Runtime &runtime) {
         auto payload = jsi::Object(runtime);
         payload.setProperty(runtime, "latitude", event.latitude);
@@ -34,7 +34,8 @@ void MapViewEventEmitter::onPress(struct onPressEvent event) const {
         return payload;
     });
 }
-void MapViewEventEmitter::onPressPoi(struct onMapPoiEvent event) const {
+void MapViewEventEmitter::onPressPoi(struct onMapPoiEvent event) const
+{
     dispatchEvent("PressPoi", [event = std::move(event)](jsi::Runtime &runtime) {
         auto payload = jsi::Object(runtime);
         payload.setProperty(runtime, "id", event.id);
@@ -47,7 +48,8 @@ void MapViewEventEmitter::onPressPoi(struct onMapPoiEvent event) const {
     });
 }
 
-void MapViewEventEmitter::onLongPress(struct onLongPressEvent event) const {
+void MapViewEventEmitter::onLongPress(struct onLongPressEvent event) const
+{
     dispatchEvent("LongPress", [event = std::move(event)](jsi::Runtime &runtime) {
         auto payload = jsi::Object(runtime);
         payload.setProperty(runtime, "latitude", event.latitude);
@@ -56,7 +58,8 @@ void MapViewEventEmitter::onLongPress(struct onLongPressEvent event) const {
     });
 }
 
-void MapViewEventEmitter::onCameraMove(struct CameraPosition event) const {
+void MapViewEventEmitter::onCameraMove(struct CameraPosition event) const
+{
     dispatchEvent("CameraMove", [event = std::move(event)](jsi::Runtime &runtime) {
         auto payload = jsi::Object(runtime);
         payload.setProperty(runtime, "zoom", event.zoom);
@@ -70,7 +73,8 @@ void MapViewEventEmitter::onCameraMove(struct CameraPosition event) const {
     });
 }
 
-void MapViewEventEmitter::onCameraIdle(struct CameraPosition event) const {
+void MapViewEventEmitter::onCameraIdle(struct CameraPosition event) const
+{
     dispatchEvent("CameraIdle", [event = std::move(event)](jsi::Runtime &runtime) {
         auto payload = jsi::Object(runtime);
         payload.setProperty(runtime, "zoom", event.zoom);
@@ -84,7 +88,8 @@ void MapViewEventEmitter::onCameraIdle(struct CameraPosition event) const {
     });
 }
 
-void MapViewEventEmitter::onLoad(struct onLoadEvent event) const {
+void MapViewEventEmitter::onLoad(struct onLoadEvent event) const
+{
     dispatchEvent("Load", [event = std::move(event)](jsi::Runtime &runtime) {
         auto payload = jsi::Object(runtime);
         return payload;
@@ -92,28 +97,32 @@ void MapViewEventEmitter::onLoad(struct onLoadEvent event) const {
 }
 
 
-void MarkerEventEmitter::onPress(struct onPressEvent event) const {
+void MarkerEventEmitter::onPress(struct onPressEvent event) const
+{
     dispatchEvent("Press", [event = std::move(event)](jsi::Runtime &runtime) {
         auto payload = jsi::Object(runtime);
         return payload;
     });
 }
 
-void MarkerEventEmitter::onDragStart(struct onDragStartEvent event) const {
+void MarkerEventEmitter::onDragStart(struct onDragStartEvent event) const
+{
     dispatchEvent("DragStart", [event = std::move(event)](jsi::Runtime &runtime) {
         auto payload = jsi::Object(runtime);
         return payload;
     });
 }
 
-void MarkerEventEmitter::onDrag(struct onDragEvent event) const {
+void MarkerEventEmitter::onDrag(struct onDragEvent event) const
+{
     dispatchEvent("Drag", [event = std::move(event)](jsi::Runtime &runtime) {
         auto payload = jsi::Object(runtime);
         return payload;
     });
 }
 
-void MarkerEventEmitter::onDragEnd(struct onDragEndEvent event) const {
+void MarkerEventEmitter::onDragEnd(struct onDragEndEvent event) const
+{
     dispatchEvent("DragEnd", [event = std::move(event)](jsi::Runtime &runtime) {
         auto payload = jsi::Object(runtime);
         payload.setProperty(runtime, "latitude", event.latitude);
@@ -122,7 +131,8 @@ void MarkerEventEmitter::onDragEnd(struct onDragEndEvent event) const {
     });
 }
 
-void PolylineEventEmitter::onPress(struct onPressEvent event) const {
+void PolylineEventEmitter::onPress(struct onPressEvent event) const
+{
     dispatchEvent("Press", [event = std::move(event)](jsi::Runtime &runtime) {
         auto payload = jsi::Object(runtime);
         return payload;

package/harmony/rn_amap3d/src/main/cpp/AMapEventEmitters.h

@@ -21,6 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+#ifndef AMAPEVENTEMITTERS_H
+#define AMAPEVENTEMITTERS_H
 
 #pragma once
 #include "react/renderer/components/view/ViewEventEmitter.h"
@@ -108,4 +110,5 @@ public:
     using ViewEventEmitter::ViewEventEmitter;
 };
 } // namespace react
-} // namespace facebook
+} // namespace facebook
+#endif

package/harmony/rn_amap3d/src/main/cpp/MapViewJSIBinder.h

@@ -4,7 +4,8 @@
 
 namespace rnoh {
 class MapViewJSIBinder : public ViewComponentJSIBinder {
-    facebook::jsi::Object createNativeProps(facebook::jsi::Runtime &rt) override {
+    facebook::jsi::Object createNativeProps(facebook::jsi::Runtime &rt) override
+    {
         auto object = ViewComponentJSIBinder::createNativeProps(rt);
         object.setProperty(rt, "mapType", "number");
         object.setProperty(rt, "initialCameraPosition", "Object");
@@ -30,7 +31,8 @@ class MapViewJSIBinder : public ViewComponentJSIBinder {
     {
         return facebook::jsi::Object(rt);
     }
-    facebook::jsi::Object createDirectEventTypes(facebook::jsi::Runtime &rt) override {
+    facebook::jsi::Object createDirectEventTypes(facebook::jsi::Runtime &rt) override
+    {
         facebook::jsi::Object events(rt);
         events.setProperty(rt, "topPress", createDirectEvent(rt, "onPress"));
         events.setProperty(rt, "topPressPoi", createDirectEvent(rt, "onPressPoi"));
@@ -43,7 +45,8 @@ class MapViewJSIBinder : public ViewComponentJSIBinder {
 };
 
 class CircleJSIBinder : public ViewComponentJSIBinder {
-    facebook::jsi::Object createNativeProps(facebook::jsi::Runtime &rt) override {
+    facebook::jsi::Object createNativeProps(facebook::jsi::Runtime &rt) override
+    {
         auto object = ViewComponentJSIBinder::createNativeProps(rt);
         object.setProperty(rt, "center", "Object");
         object.setProperty(rt, "strokeColor", "number");
@@ -53,50 +56,59 @@ class CircleJSIBinder : public ViewComponentJSIBinder {
         object.setProperty(rt, "zIndex", "number");
         return object;
     }
-    facebook::jsi::Object createBubblingEventTypes(facebook::jsi::Runtime &rt) override {
+    facebook::jsi::Object createBubblingEventTypes(facebook::jsi::Runtime &rt) override
+    {
         return facebook::jsi::Object(rt);
     }
-    facebook::jsi::Object createDirectEventTypes(facebook::jsi::Runtime &rt) override {
+    facebook::jsi::Object createDirectEventTypes(facebook::jsi::Runtime &rt) override
+    {
         facebook::jsi::Object events(rt);
         return events;
     }
 };
 
 class HeatMapJSIBinder : public ViewComponentJSIBinder {
-    facebook::jsi::Object createNativeProps(facebook::jsi::Runtime &rt) override {
+    facebook::jsi::Object createNativeProps(facebook::jsi::Runtime &rt) override
+    {
         auto object = ViewComponentJSIBinder::createNativeProps(rt);
         object.setProperty(rt, "data", "array");
         object.setProperty(rt, "radius", "number");
         object.setProperty(rt, "opacity", "number");
         return object;
     }
-    facebook::jsi::Object createBubblingEventTypes(facebook::jsi::Runtime &rt) override {
+    facebook::jsi::Object createBubblingEventTypes(facebook::jsi::Runtime &rt) override
+    {
         return facebook::jsi::Object(rt);
     }
-    facebook::jsi::Object createDirectEventTypes(facebook::jsi::Runtime &rt) override {
+    facebook::jsi::Object createDirectEventTypes(facebook::jsi::Runtime &rt) override
+    {
         facebook::jsi::Object events(rt);
         return events;
     }
 };
 
 class MultipointJSIBinder : public ViewComponentJSIBinder {
-    facebook::jsi::Object createNativeProps(facebook::jsi::Runtime &rt) override {
+    facebook::jsi::Object createNativeProps(facebook::jsi::Runtime &rt) override
+    {
         auto object = ViewComponentJSIBinder::createNativeProps(rt);
         object.setProperty(rt, "items", "array");
         object.setProperty(rt, "icon", "Object");
         return object;
     }
-    facebook::jsi::Object createBubblingEventTypes(facebook::jsi::Runtime &rt) override {
+    facebook::jsi::Object createBubblingEventTypes(facebook::jsi::Runtime &rt) override
+    {
         return facebook::jsi::Object(rt);
     }
-    facebook::jsi::Object createDirectEventTypes(facebook::jsi::Runtime &rt) override {
+    facebook::jsi::Object createDirectEventTypes(facebook::jsi::Runtime &rt) override
+    {
         facebook::jsi::Object events(rt);
         return events;
     }
 };
 
 class MarkerJSIBinder : public ViewComponentJSIBinder {
-    facebook::jsi::Object createNativeProps(facebook::jsi::Runtime &rt) override {
+    facebook::jsi::Object createNativeProps(facebook::jsi::Runtime &rt) override
+    {
         auto object = ViewComponentJSIBinder::createNativeProps(rt);
         object.setProperty(rt, "position", "Object");
         object.setProperty(rt, "opacity", "number");
@@ -109,10 +121,12 @@ class MarkerJSIBinder : public ViewComponentJSIBinder {
         return object;
     }
     
-    facebook::jsi::Object createBubblingEventTypes(facebook::jsi::Runtime &rt) override {
+    facebook::jsi::Object createBubblingEventTypes(facebook::jsi::Runtime &rt) override
+    {
         return facebook::jsi::Object(rt);
     }
-    facebook::jsi::Object createDirectEventTypes(facebook::jsi::Runtime &rt) override {
+    facebook::jsi::Object createDirectEventTypes(facebook::jsi::Runtime &rt) override
+    {
         facebook::jsi::Object events(rt);
         events.setProperty(rt, "topPress", createDirectEvent(rt, "onPress"));
         events.setProperty(rt, "topDragStart", createDirectEvent(rt, "onDragStart"));
@@ -123,7 +137,8 @@ class MarkerJSIBinder : public ViewComponentJSIBinder {
 };
 
 class PolygonJSIBinder : public ViewComponentJSIBinder {
-    facebook::jsi::Object createNativeProps(facebook::jsi::Runtime &rt) override {
+    facebook::jsi::Object createNativeProps(facebook::jsi::Runtime &rt) override
+    {
         auto object = ViewComponentJSIBinder::createNativeProps(rt);
         object.setProperty(rt, "points", "array");
         object.setProperty(rt, "strokeWidth", "number");
@@ -132,17 +147,20 @@ class PolygonJSIBinder : public ViewComponentJSIBinder {
         object.setProperty(rt, "zIndex", "number");
         return object;
     }
-    facebook::jsi::Object createBubblingEventTypes(facebook::jsi::Runtime &rt) override {
+    facebook::jsi::Object createBubblingEventTypes(facebook::jsi::Runtime &rt) override
+    {
         return facebook::jsi::Object(rt);
     }
-    facebook::jsi::Object createDirectEventTypes(facebook::jsi::Runtime &rt) override {
+    facebook::jsi::Object createDirectEventTypes(facebook::jsi::Runtime &rt) override
+    {
         facebook::jsi::Object events(rt);
         return events;
     }
 };
 
 class PolylineJSIBinder : public ViewComponentJSIBinder {
-    facebook::jsi::Object createNativeProps(facebook::jsi::Runtime &rt) override {
+    facebook::jsi::Object createNativeProps(facebook::jsi::Runtime &rt) override
+    {
         auto object = ViewComponentJSIBinder::createNativeProps(rt);
         object.setProperty(rt, "points", "array");
         object.setProperty(rt, "dotted", "boolean");
@@ -154,10 +172,12 @@ class PolylineJSIBinder : public ViewComponentJSIBinder {
         object.setProperty(rt, "width", "number");
         return object;
     }
-    facebook::jsi::Object createBubblingEventTypes(facebook::jsi::Runtime &rt) override {
+    facebook::jsi::Object createBubblingEventTypes(facebook::jsi::Runtime &rt) override
+    {
         return facebook::jsi::Object(rt);
     }
-    facebook::jsi::Object createDirectEventTypes(facebook::jsi::Runtime &rt) override {
+    facebook::jsi::Object createDirectEventTypes(facebook::jsi::Runtime &rt) override
+    {
         facebook::jsi::Object events(rt);
         events.setProperty(rt, "topPress", createDirectEvent(rt, "onPress"));
         return events;

package/harmony/rn_amap3d/src/main/cpp/MapViewPackage.h

@@ -12,7 +12,8 @@ namespace rnoh {
 class MapViewPackage : public Package {
 public:
     MapViewPackage(Package::Context ctx) : Package(ctx) {}
-    std::vector<facebook::react::ComponentDescriptorProvider> createComponentDescriptorProviders() override {
+    std::vector<facebook::react::ComponentDescriptorProvider> createComponentDescriptorProviders() override
+    {
         return {facebook::react::concreteComponentDescriptorProvider<facebook::react::MapViewComponentDescriptor>(),
                 facebook::react::concreteComponentDescriptorProvider<facebook::react::HeatMapComponentDescriptor>(),
                 facebook::react::concreteComponentDescriptorProvider<facebook::react::CircleComponentDescriptor>(),
@@ -22,7 +23,8 @@ public:
                 facebook::react::concreteComponentDescriptorProvider<facebook::react::MarkerComponentDescriptor>()};
     }
 
-    ComponentJSIBinderByString createComponentJSIBinderByName() override {
+    ComponentJSIBinderByString createComponentJSIBinderByName() override
+    {
         return {{"AMapView", std::make_shared<MapViewJSIBinder>()},
                 {"AMapHeatMap", std::make_shared<HeatMapJSIBinder>()},
                 {"AMapCircle", std::make_shared<CircleJSIBinder>()},
@@ -31,7 +33,8 @@ public:
                 {"AMapMultiPoint", std::make_shared<MultipointJSIBinder>()},
                 {"AMapMarker", std::make_shared<MarkerJSIBinder>()}};
     }
-    EventEmitRequestHandlers createEventEmitRequestHandlers() override {
+    EventEmitRequestHandlers createEventEmitRequestHandlers() override
+    {
         return {
             {std::make_shared<AMapViewEventEmitRequestHandler>()},
             {std::make_shared<AMapMarkerEventEmitRequestHandler>()},

package/harmony/rn_amap3d/src/main/cpp/Props.cpp

@@ -56,18 +56,18 @@ MarkerProps::MarkerProps(const PropsParserContext &context, const MarkerProps &s
     : ViewProps(context, sourceProps, rawProps),
       draggable(convertRawProp(context, rawProps, "draggable", sourceProps.draggable, false)),
       flat(convertRawProp(context, rawProps, "flat", sourceProps.flat, false)),
-      anchor(convertRawProp(context, rawProps, "anchor", sourceProps.anchor, {0,0})),
-      centerOffset(convertRawProp(context, rawProps, "centerOffset", sourceProps.centerOffset, {0,0})),
-      position(convertRawProp(context, rawProps, "position", sourceProps.position, {0,0})),
+      anchor(convertRawProp(context, rawProps, "anchor", sourceProps.anchor, {0, 0})),
+      centerOffset(convertRawProp(context, rawProps, "centerOffset", sourceProps.centerOffset, {0, 0})),
+      position(convertRawProp(context, rawProps, "position", sourceProps.position, {0, 0})),
       levelIndex(convertRawProp(context, rawProps, "zIndex", sourceProps.levelIndex, 0)),
-      icon(convertRawProp(context, rawProps, "icon", sourceProps.icon,{"/0", 0, 0, 0, "/0", "/0", "/0"})) {}
+      icon(convertRawProp(context, rawProps, "icon", sourceProps.icon, {"/0", 0, 0, 0, "/0", "/0", "/0"})) {}
 
 PolylineProps::PolylineProps(const PropsParserContext &context, const PolylineProps &sourceProps,
                              const RawProps &rawProps)
     : ViewProps(context, sourceProps, rawProps),
       width(convertRawProp(context, rawProps, "width", sourceProps.width, 1.f)),
       color(convertRawProp(context, rawProps, "color", sourceProps.color, 0x000000)),
-      colors(convertRawProp(context, rawProps, "colors", sourceProps.colors, {0xFF5566,0x112233,0x114477})),
+      colors(convertRawProp(context, rawProps, "colors", sourceProps.colors, {0xFF5566, 0x112233, 0x114477})),
       levelIndex(convertRawProp(context, rawProps, "zIndex", sourceProps.levelIndex, 0.f)),
       geodesic(convertRawProp(context, rawProps, "geodesic", sourceProps.geodesic, false)),
       dotted(convertRawProp(context, rawProps, "dotted", sourceProps.dotted, false)),