@hxa-rn/react-native-gcanvas 6.0.25 → 6.0.26

package/harmony/gcanvas/src/main/cpp/GCanvasXComponent.cpp

@@ -1,16 +1,16 @@
-/**
- * GCanvasXComponent — XComponent(SURFACE) 与 C++ 引擎的桥接入口。
- *
- * 机制（已通过 SDK 文档核实）：
- *  - ArkTS 侧 XComponent({ id, type: XComponentType.SURFACE, libraryname: 'gcanvas' })；
- *  - 框架加载 libraryname 指向的 .so，调用其 nm_register_func(Init)；
- *  - Init 中从 exports 的 OH_NATIVE_XCOMPONENT_OBJ（"__NATIVE_XCOMPONENT_OBJ__"）属性
- *    经 napi_unwrap 取得 OH_NativeXComponent*；
- *  - 注册 OH_NativeXComponent_Callback，OnSurfaceCreated 的 void* window 即
- *    OHNativeWindow*（= EGLNativeWindowType），可直接 eglCreateWindowSurface。
- *
- * nm_modname 必须与 ArkTS libraryname（'gcanvas'）完全一致。
- */
+/**
+ * GCanvasXComponent — XComponent(SURFACE) 与 C++ 引擎的桥接入口。
+ *
+ * 机制（已通过 SDK 文档核实）：
+ *  - ArkTS 侧 XComponent({ id, type: XComponentType.SURFACE, libraryname: 'gcanvas' })；
+ *  - 框架加载 libraryname 指向的 .so，调用其 nm_register_func(Init)；
+ *  - Init 中从 exports 的 OH_NATIVE_XCOMPONENT_OBJ（"__NATIVE_XCOMPONENT_OBJ__"）属性
+ *    经 napi_unwrap 取得 OH_NativeXComponent*；
+ *  - 注册 OH_NativeXComponent_Callback，OnSurfaceCreated 的 void* window 即
+ *    OHNativeWindow*（= EGLNativeWindowType），可直接 eglCreateWindowSurface。
+ *
+ * nm_modname 必须与 ArkTS libraryname（'gcanvas'）完全一致。
+ */
 #include "GCanvasEngine.h"
 
 #include <ace/xcomponent/native_interface_xcomponent.h>
@@ -18,31 +18,31 @@
 #include <napi/native_api.h>
 #include <native_buffer/native_buffer.h>
 #include <native_window/external_window.h>
-
-#include <cstring>
-#include <mutex>
-#include <string>
-#include <unordered_map>
-
+
+#include <cstring>
+#include <mutex>
+#include <string>
+#include <unordered_map>
+
 #define GC_LOGI(...) OH_LOG_INFO(LOG_APP, __VA_ARGS__)
 #define GC_LOGE(...) OH_LOG_ERROR(LOG_APP, __VA_ARGS__)
 
 extern "C" napi_value GCanvasNapi_Init(napi_env env, napi_value exports);
-
-namespace {
-
-// 记录 OH_NativeXComponent* → componentId（由 OH_NativeXComponent_GetXComponentId 取得）。
-std::unordered_map<OH_NativeXComponent *, std::string> g_componentIds;
-std::mutex g_idMutex;
-
+
+namespace {
+
+// 记录 OH_NativeXComponent* → componentId（由 OH_NativeXComponent_GetXComponentId 取得）。
+std::unordered_map<OH_NativeXComponent *, std::string> g_componentIds;
+std::mutex g_idMutex;
+
 std::string GetId(OH_NativeXComponent *component) {
-    char idStr[OH_XCOMPONENT_ID_LEN_MAX + 1] = {'\0'};
-    uint64_t idSize = OH_XCOMPONENT_ID_LEN_MAX + 1;
-    int32_t ret = OH_NativeXComponent_GetXComponentId(component, idStr, &idSize);
-    if (ret != 0) {
-        return "";
-    }
-    return std::string(idStr);
+    char idStr[OH_XCOMPONENT_ID_LEN_MAX + 1] = {'\0'};
+    uint64_t idSize = OH_XCOMPONENT_ID_LEN_MAX + 1;
+    int32_t ret = OH_NativeXComponent_GetXComponentId(component, idStr, &idSize);
+    if (ret != 0) {
+        return "";
+    }
+    return std::string(idStr);
 }
 
 bool GetSurfaceSize(OH_NativeXComponent *component, void *window, uint64_t &width, uint64_t &height) {
@@ -52,16 +52,16 @@ bool GetSurfaceSize(OH_NativeXComponent *component, void *window, uint64_t &widt
         OH_NativeXComponent_GetXComponentSize(component, window, &width, &height) ==
             OH_NATIVEXCOMPONENT_RESULT_SUCCESS;
 }
-
-void OnSurfaceCreatedCB(OH_NativeXComponent *component, void *window) {
-    std::string id;
-    {
-        std::lock_guard<std::mutex> lock(g_idMutex);
-        auto it = g_componentIds.find(component);
-        id = it != g_componentIds.end() ? it->second : GetId(component);
-        if (it == g_componentIds.end() && !id.empty()) {
-            g_componentIds[component] = id;
-        }
+
+void OnSurfaceCreatedCB(OH_NativeXComponent *component, void *window) {
+    std::string id;
+    {
+        std::lock_guard<std::mutex> lock(g_idMutex);
+        auto it = g_componentIds.find(component);
+        id = it != g_componentIds.end() ? it->second : GetId(component);
+        if (it == g_componentIds.end() && !id.empty()) {
+            g_componentIds[component] = id;
+        }
     }
     GC_LOGI("OnSurfaceCreatedCB id=%{public}s window=%{public}p", id.c_str(), window);
     uint64_t width = 0;
@@ -78,13 +78,13 @@ void OnSurfaceCreatedCB(OH_NativeXComponent *component, void *window) {
     }
     gcanvas::GCanvasEngine::Instance().OnSurfaceCreated(id, window, width, height);
 }
-
-void OnSurfaceChangedCB(OH_NativeXComponent *component, void *window) {
-    std::string id;
-    {
-        std::lock_guard<std::mutex> lock(g_idMutex);
-        auto it = g_componentIds.find(component);
-        id = it != g_componentIds.end() ? it->second : GetId(component);
+
+void OnSurfaceChangedCB(OH_NativeXComponent *component, void *window) {
+    std::string id;
+    {
+        std::lock_guard<std::mutex> lock(g_idMutex);
+        auto it = g_componentIds.find(component);
+        id = it != g_componentIds.end() ? it->second : GetId(component);
     }
     GC_LOGI("OnSurfaceChangedCB id=%{public}s", id.c_str());
     uint64_t width = 0;
@@ -93,13 +93,13 @@ void OnSurfaceChangedCB(OH_NativeXComponent *component, void *window) {
         gcanvas::GCanvasEngine::Instance().OnSurfaceChanged(id, window, width, height);
     }
 }
-
-void OnSurfaceDestroyedCB(OH_NativeXComponent *component, void *window) {
-    std::string id;
-    {
-        std::lock_guard<std::mutex> lock(g_idMutex);
-        auto it = g_componentIds.find(component);
-        id = it != g_componentIds.end() ? it->second : GetId(component);
+
+void OnSurfaceDestroyedCB(OH_NativeXComponent *component, void *window) {
+    std::string id;
+    {
+        std::lock_guard<std::mutex> lock(g_idMutex);
+        auto it = g_componentIds.find(component);
+        id = it != g_componentIds.end() ? it->second : GetId(component);
     }
     GC_LOGI("OnSurfaceDestroyedCB id=%{public}s", id.c_str());
     gcanvas::GCanvasEngine::Instance().OnSurfaceDestroyed(id);
@@ -107,38 +107,38 @@ void OnSurfaceDestroyedCB(OH_NativeXComponent *component, void *window) {
         std::lock_guard<std::mutex> lock(g_idMutex);
         g_componentIds.erase(component);
     }
-    (void)window;
-}
-
-void DispatchTouchEventCB(OH_NativeXComponent *component, void *window) {
-    // 触摸事件：JS 侧 GCanvasComponent.js 的 PanResponder 已处理手势分发，
-    // 底层 XComponent DispatchTouchEvent 在此透传（如需原生手势可扩展）。
-    (void)component;
-    (void)window;
-}
-
-void RegisterCallbackFor(OH_NativeXComponent *nativeXComponent) {
-    std::string id = GetId(nativeXComponent);
-    if (!id.empty()) {
-        std::lock_guard<std::mutex> lock(g_idMutex);
-        g_componentIds[nativeXComponent] = id;
-    }
-    static OH_NativeXComponent_Callback callback = {};
-    callback.OnSurfaceCreated = OnSurfaceCreatedCB;
-    callback.OnSurfaceChanged = OnSurfaceChangedCB;
-    callback.OnSurfaceDestroyed = OnSurfaceDestroyedCB;
-    callback.DispatchTouchEvent = DispatchTouchEventCB;
-    int32_t ret = OH_NativeXComponent_RegisterCallback(nativeXComponent, &callback);
-    GC_LOGI("RegisterCallback ret=%{public}d id=%{public}s", ret, id.c_str());
-}
-
-napi_value Init(napi_env env, napi_value exports) {
-    GC_LOGI("GCanvasXComponent Init");
-    napi_value exportInstance = nullptr;
-    napi_get_named_property(env, exports, OH_NATIVE_XCOMPONENT_OBJ, &exportInstance);
-
-    OH_NativeXComponent *nativeXComponent = nullptr;
-    napi_unwrap(env, exportInstance, reinterpret_cast<void **>(&nativeXComponent));
+    (void)window;
+}
+
+void DispatchTouchEventCB(OH_NativeXComponent *component, void *window) {
+    // 触摸事件：JS 侧 GCanvasComponent.js 的 PanResponder 已处理手势分发，
+    // 底层 XComponent DispatchTouchEvent 在此透传（如需原生手势可扩展）。
+    (void)component;
+    (void)window;
+}
+
+void RegisterCallbackFor(OH_NativeXComponent *nativeXComponent) {
+    std::string id = GetId(nativeXComponent);
+    if (!id.empty()) {
+        std::lock_guard<std::mutex> lock(g_idMutex);
+        g_componentIds[nativeXComponent] = id;
+    }
+    static OH_NativeXComponent_Callback callback = {};
+    callback.OnSurfaceCreated = OnSurfaceCreatedCB;
+    callback.OnSurfaceChanged = OnSurfaceChangedCB;
+    callback.OnSurfaceDestroyed = OnSurfaceDestroyedCB;
+    callback.DispatchTouchEvent = DispatchTouchEventCB;
+    int32_t ret = OH_NativeXComponent_RegisterCallback(nativeXComponent, &callback);
+    GC_LOGI("RegisterCallback ret=%{public}d id=%{public}s", ret, id.c_str());
+}
+
+napi_value Init(napi_env env, napi_value exports) {
+    GC_LOGI("GCanvasXComponent Init");
+    napi_value exportInstance = nullptr;
+    napi_get_named_property(env, exports, OH_NATIVE_XCOMPONENT_OBJ, &exportInstance);
+
+    OH_NativeXComponent *nativeXComponent = nullptr;
+    napi_unwrap(env, exportInstance, reinterpret_cast<void **>(&nativeXComponent));
     if (nativeXComponent != nullptr) {
         RegisterCallbackFor(nativeXComponent);
     }
@@ -147,20 +147,20 @@ napi_value Init(napi_env env, napi_value exports) {
     // callable API for GCanvasNativeEngine.
     return GCanvasNapi_Init(env, exports);
 }
-
-} // namespace
-
-// .so 入口：nm_modname 必须等于 ArkTS libraryname 'gcanvas'。
-static napi_module gcanvasModule = {
-    .nm_version = 1,
-    .nm_flags = 0,
-    .nm_filename = nullptr,
-    .nm_register_func = Init,
-    .nm_modname = "gcanvas",
-    .nm_priv = nullptr,
-    .reserved = {0},
-};
-
-extern "C" __attribute__((constructor)) void RegisterGCanvasModule(void) {
-    napi_module_register(&gcanvasModule);
-}
+
+} // namespace
+
+// .so 入口：nm_modname 必须等于 ArkTS libraryname 'gcanvas'。
+static napi_module gcanvasModule = {
+    .nm_version = 1,
+    .nm_flags = 0,
+    .nm_filename = nullptr,
+    .nm_register_func = Init,
+    .nm_modname = "gcanvas",
+    .nm_priv = nullptr,
+    .reserved = {0},
+};
+
+extern "C" __attribute__((constructor)) void RegisterGCanvasModule(void) {
+    napi_module_register(&gcanvasModule);
+}

package/harmony/gcanvas/src/main/cpp/GcanvasPackage.h

@@ -1,24 +1,24 @@
-#ifndef GCANVASPACKAGE_H
-#define GCANVASPACKAGE_H
-#pragma once
-
-// GCanvas 鸿蒙 C++ Package。
-//
-// 必须继承 BaseGcanvasPackage，才能把 GCanvasView 的 Fabric descriptor / JSIBinder
-// 注册进 UIManager；空 binder 会在 JS 侧变成
-// requireNativeComponent: "GCanvasView" was not found in the UIManager。
-//
-// 本头做成 header-only：构造在宿主 entry 的 rnoh_app（PackageProvider）里实例化，
-// Fabric 模板与 ViewProps/Yoga vtable 也在 rnoh_app 里解析。不要再写
-// GcanvasPackage.cpp 编进独立 libgcanvas.so，否则会因缺 Fabric 符号链接失败。
-#include "RNOH/generated/BaseGcanvasPackage.h"
-
-namespace rnoh {
-
-class GcanvasPackage : public BaseGcanvasPackage {
-public:
-    explicit GcanvasPackage(Package::Context ctx) : BaseGcanvasPackage(ctx) {}
-};
-
-} // namespace rnoh
-#endif // GCANVASPACKAGE_H
+#ifndef GCANVASPACKAGE_H
+#define GCANVASPACKAGE_H
+#pragma once
+
+// GCanvas 鸿蒙 C++ Package。
+//
+// 必须继承 BaseGcanvasPackage，才能把 GCanvasView 的 Fabric descriptor / JSIBinder
+// 注册进 UIManager；空 binder 会在 JS 侧变成
+// requireNativeComponent: "GCanvasView" was not found in the UIManager。
+//
+// 本头做成 header-only：构造在宿主 entry 的 rnoh_app（PackageProvider）里实例化，
+// Fabric 模板与 ViewProps/Yoga vtable 也在 rnoh_app 里解析。不要再写
+// GcanvasPackage.cpp 编进独立 libgcanvas.so，否则会因缺 Fabric 符号链接失败。
+#include "RNOH/generated/BaseGcanvasPackage.h"
+
+namespace rnoh {
+
+class GcanvasPackage : public BaseGcanvasPackage {
+public:
+    explicit GcanvasPackage(Package::Context ctx) : BaseGcanvasPackage(ctx) {}
+};
+
+} // namespace rnoh
+#endif // GCANVASPACKAGE_H