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

package/harmony/gcanvas/OAT.xml

@@ -1,38 +1,38 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-	<oatconfig>
-	<licensefile>LICENSE</licensefile>
-		<filefilterlist>
-			<filefilter name="copyrightPolicyFilter" desc="Filters for compatibility，license header policies">
-				<filteritem type="filename" name="hvigorfile.ts" desc="hvigor构建脚本，DevEco Studio自动生成，不需要添加版权头"/>
-				<filteritem type="filename" name="*.json5" desc="hvigor工程配置文件，DevEco Studio自动生成，不需要添加版权头"/>
-				<filteritem type="filename" name="*.proto" desc="资源文件，不需要添加版权头"/>
-				<filteritem type="filename" name="*.json" desc="资源文件，不需要添加版权头"/>
-				<filteritem type="filepath" name="hvigorw" desc="工程模板，不修改版权头，以防有修改版权风险"/>
-				<filteritem type="filepath" name="hvigorw.bat" desc="工程模板，不修改版权头，以防有修改版权风险"/>
-				<filteritem type="filepath" name="hvigor/hvigor-wrapper.js" desc="工程模板，不修改版权头，以防有修改版权风险"/>
-                <filteritem type="filename" name="LICENSE" desc="工程文件，不修改版权头"/>
-			</filefilter>
-			<filefilter name="defaultPolicyFilter" desc="Filters for compatibility，license header policies">
-				<filteritem type="filename" name="hvigorfile.ts" desc="hvigor构建脚本，DevEco Studio自动生成，不需要添加许可证头"/>
-				<filteritem type="filename" name="*.json5" desc="hvigor工程配置文件，DevEco Studio自动生成，不需要添加许可证头"/>
-				<filteritem type="filename" name="LICENSE" desc="原三方库证书文件无需更改，因此添加过滤"/>
-				<filteritem type="filename" name="*.proto" desc="资源文件，不需要添加许可证头"/>
-				<filteritem type="filename" name="*.json" desc="资源文件，不需要添加许可证头"/>
-				<filteritem type="filepath" name="hvigorw" desc="工程模板，不修改版权头，以防有修改版权风险"/>
-				<filteritem type="filepath" name="hvigorw.bat" desc="工程模板，不修改版权头，以防有修改版权风险"/>
-				<filteritem type="filepath" name="hvigor/hvigor-wrapper.js" desc="工程模板，不修改版权头，以防有修改版权风险"/>
-			</filefilter>
-			<filefilter name="binaryFileTypePolicyFilter" desc="Filters for resources files policies">
-				<filteritem type="filename" name="icon.png" desc="应用图标"/>
-				<filteritem type="filename" name="app_icon.png" desc="应用图标"/>
-				<filteritem type="filename" name="warn.png" desc="页面展示图标"/>
-			</filefilter>
-		</filefilterlist>
-        <policylist>
-            <policy name="projectPolicy" desc="">
-                <policyitem type="license" name="MIT" path="*.*" desc="license under the MIT"/>
-            </policy>
-        </policylist>
-	</oatconfig>
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+	<oatconfig>
+	<licensefile>LICENSE</licensefile>
+		<filefilterlist>
+			<filefilter name="copyrightPolicyFilter" desc="Filters for compatibility，license header policies">
+				<filteritem type="filename" name="hvigorfile.ts" desc="hvigor构建脚本，DevEco Studio自动生成，不需要添加版权头"/>
+				<filteritem type="filename" name="*.json5" desc="hvigor工程配置文件，DevEco Studio自动生成，不需要添加版权头"/>
+				<filteritem type="filename" name="*.proto" desc="资源文件，不需要添加版权头"/>
+				<filteritem type="filename" name="*.json" desc="资源文件，不需要添加版权头"/>
+				<filteritem type="filepath" name="hvigorw" desc="工程模板，不修改版权头，以防有修改版权风险"/>
+				<filteritem type="filepath" name="hvigorw.bat" desc="工程模板，不修改版权头，以防有修改版权风险"/>
+				<filteritem type="filepath" name="hvigor/hvigor-wrapper.js" desc="工程模板，不修改版权头，以防有修改版权风险"/>
+                <filteritem type="filename" name="LICENSE" desc="工程文件，不修改版权头"/>
+			</filefilter>
+			<filefilter name="defaultPolicyFilter" desc="Filters for compatibility，license header policies">
+				<filteritem type="filename" name="hvigorfile.ts" desc="hvigor构建脚本，DevEco Studio自动生成，不需要添加许可证头"/>
+				<filteritem type="filename" name="*.json5" desc="hvigor工程配置文件，DevEco Studio自动生成，不需要添加许可证头"/>
+				<filteritem type="filename" name="LICENSE" desc="原三方库证书文件无需更改，因此添加过滤"/>
+				<filteritem type="filename" name="*.proto" desc="资源文件，不需要添加许可证头"/>
+				<filteritem type="filename" name="*.json" desc="资源文件，不需要添加许可证头"/>
+				<filteritem type="filepath" name="hvigorw" desc="工程模板，不修改版权头，以防有修改版权风险"/>
+				<filteritem type="filepath" name="hvigorw.bat" desc="工程模板，不修改版权头，以防有修改版权风险"/>
+				<filteritem type="filepath" name="hvigor/hvigor-wrapper.js" desc="工程模板，不修改版权头，以防有修改版权风险"/>
+			</filefilter>
+			<filefilter name="binaryFileTypePolicyFilter" desc="Filters for resources files policies">
+				<filteritem type="filename" name="icon.png" desc="应用图标"/>
+				<filteritem type="filename" name="app_icon.png" desc="应用图标"/>
+				<filteritem type="filename" name="warn.png" desc="页面展示图标"/>
+			</filefilter>
+		</filefilterlist>
+        <policylist>
+            <policy name="projectPolicy" desc="">
+                <policyitem type="license" name="MIT" path="*.*" desc="license under the MIT"/>
+            </policy>
+        </policylist>
+	</oatconfig>
 </configuration>

package/harmony/gcanvas/build-profile.json5

@@ -1,16 +1,16 @@
-{
-  "apiType": "stageMode",
-  "buildOption": {
-    "externalNativeOptions": {
-      "path": "./src/main/cpp/CMakeLists.txt",
-      "arguments": "",
-      "cppFlags": ""
-    }
-  },
-  "targets": [
-    {
-      "name": "default",
-      "runtimeOS": "HarmonyOS"
-    }
-  ]
-}
+{
+  "apiType": "stageMode",
+  "buildOption": {
+    "externalNativeOptions": {
+      "path": "./src/main/cpp/CMakeLists.txt",
+      "arguments": "",
+      "cppFlags": ""
+    }
+  },
+  "targets": [
+    {
+      "name": "default",
+      "runtimeOS": "HarmonyOS"
+    }
+  ]
+}

package/harmony/gcanvas/hvigorfile.ts

@@ -1,2 +1,2 @@
-// Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently.
+// Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently.
 export { harTasks } from '@ohos/hvigor-ohos-plugin';

package/harmony/gcanvas/index.ets

@@ -1 +1 @@
-export { GcanvasPackage as default } from './src/main/ets/GcanvasTurboModulesFactory';
+export { GcanvasPackage as default } from './src/main/ets/GcanvasTurboModulesFactory';

package/harmony/gcanvas/oh-package.json5

@@ -1,14 +1,14 @@
-{
-  "license": "Apache-2.0",
-  "devDependencies": {
-
-  },
-  "author": "",
-  "name": "@hxa-rn/react-native-gcanvas",
-  "description": "Please describe the basic information.",
-  "main": "index.ets",
-  "version": "1.0.0",
-  "dependencies": {
-    "@rnoh/react-native-openharmony": "file:../react_native_openharmony_release.har"
-  }
-}
+{
+  "license": "Apache-2.0",
+  "devDependencies": {
+
+  },
+  "author": "",
+  "name": "@hxa-rn/react-native-gcanvas",
+  "description": "Please describe the basic information.",
+  "main": "index.ets",
+  "version": "1.0.0",
+  "dependencies": {
+    "@rnoh/react-native-openharmony": "file:../react_native_openharmony_release.har"
+  }
+}

package/harmony/gcanvas/src/main/cpp/CMakeLists.txt

@@ -1,126 +1,126 @@
-# GCanvas 鸿蒙 C++ 库构建配置。
-cmake_minimum_required(VERSION 3.13)
-set(CMAKE_VERBOSE_MAKEFILE on)
-project(gcanvas_library)
-
-# The public NAPI/XComponent entry remains libgcanvas.so.  The vendored
-# renderer/core is linked into it as a static implementation library.
-set(GCANVAS_WEEX ON)
-
-# RNOH/RN 头文件（ViewProps.h 等）使用 std::optional，要求 C++17。
-set(CMAKE_CXX_STANDARD 17)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-
-find_package(react-native-openharmony REQUIRED CONFIG)
-
-if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/core/CMakeLists.txt")
-    add_subdirectory(core)
-    set(GCANVAS_CORE_LIB gcanvas_core)
-else()
-    set(GCANVAS_CORE_LIB "")
-endif()
-
-# 从 imported 目标 rnoh_semi 的库位置反推 RNOH 包根目录。Windows 上可由
-# -DRNOH_PKG_ROOT=<short-path> 覆盖，避免 ohpm 哈希目录触发 MAX_PATH。
-if(NOT DEFINED RNOH_PKG_ROOT)
-    get_target_property(_rnoh_semi_loc react-native-openharmony::rnoh_semi IMPORTED_LOCATION)
-    get_filename_component(_rnoh_pkg_libdir "${_rnoh_semi_loc}" DIRECTORY)   # .../libs/arm64-v8a
-    get_filename_component(_rnoh_pkg_libdir "${_rnoh_pkg_libdir}" DIRECTORY) # .../libs
-    get_filename_component(RNOH_PKG_ROOT "${_rnoh_pkg_libdir}" DIRECTORY)    # <pkg_root>
-endif()
-set(RNOH_CPP_DIR "${RNOH_PKG_ROOT}/src/main/include")
-set(REACT_COMMON_PATCH_DIR "${RNOH_CPP_DIR}/patches/react_native_core")
-
-set(library_generated_dir "${CMAKE_CURRENT_SOURCE_DIR}/generated")
-
-# folly F14 链接一致性：FOLLY_MOBILE=1（failure-lessons testing-cmake-004）。
-set(folly_compile_options
-    -DFOLLY_NO_CONFIG=1
-    -DFOLLY_MOBILE=1
-    -DFOLLY_USE_LIBCPP=1
-    -DFOLLY_HAVE_RECVMMSG=1
-    -DFOLLY_HAVE_PTHREAD=1
-    -Wno-comma
-    -Wno-shorten-64-to-32
-    -faligned-new
-)
-
-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${library_generated_dir}
-    ${RNOH_CPP_DIR}
-    ${REACT_COMMON_PATCH_DIR}
-    ${RNOH_CPP_DIR}/third-party/folly
-    ${RNOH_CPP_DIR}/third-party/rn/ReactCommon
-    ${RNOH_CPP_DIR}/third-party/rn/ReactCommon/react/nativemodule/core
-    ${RNOH_CPP_DIR}/third-party/rn/ReactCommon/jsi
-    ${RNOH_CPP_DIR}/third-party/rn/ReactCommon/callinvoker
-    ${RNOH_CPP_DIR}/third-party/boost/libs/utility/include
-    ${RNOH_CPP_DIR}/third-party/boost/libs/stacktrace/include
-    ${RNOH_CPP_DIR}/third-party/boost/libs/predef/include
-    ${RNOH_CPP_DIR}/third-party/boost/libs/array/include
-    ${RNOH_CPP_DIR}/third-party/boost/libs/throw_exception/include
-    ${RNOH_CPP_DIR}/third-party/boost/libs/config/include
-    ${RNOH_CPP_DIR}/third-party/boost/libs/core/include
-    ${RNOH_CPP_DIR}/third-party/boost/libs/preprocessor/include
-    ${RNOH_CPP_DIR}/third-party/double-conversion
-    ${RNOH_CPP_DIR}/third-party/rn/ReactCommon/react/renderer/graphics/platform/cxx
-    ${RNOH_CPP_DIR}/third-party/rn/ReactCommon/runtimeexecutor
-    ${RNOH_CPP_DIR}/third-party/glog/src
-    ${RNOH_CPP_DIR}/third-party/boost/libs/mpl/include
-    ${RNOH_CPP_DIR}/third-party/boost/libs/type_traits/include
-    ${RNOH_CPP_DIR}/third-party/rn/ReactCommon/yoga
-    ${RNOH_CPP_DIR}/third-party/boost/libs/intrusive/include
-    ${RNOH_CPP_DIR}/third-party/boost/libs/assert/include
-    ${RNOH_CPP_DIR}/third-party/boost/libs/move/include
-    ${RNOH_CPP_DIR}/third-party/boost/libs/static_assert/include
-    ${RNOH_CPP_DIR}/third-party/boost/libs/container_hash/include
-    ${RNOH_CPP_DIR}/third-party/boost/libs/describe/include
-    ${RNOH_CPP_DIR}/third-party/boost/libs/mp11/include
-    ${RNOH_CPP_DIR}/third-party/boost/libs/iterator/include
-    ${RNOH_CPP_DIR}/third-party/boost/libs/detail/include
-    ${RNOH_CPP_DIR}/third-party/boost/libs/regex/include
-    ${RNOH_CPP_DIR}/patches/react_native_core/react/renderer/textlayoutmanager/platform/harmony
-)
-
-# 不用 **/*.cpp：OHOS CMake 在 Windows 上常匹配不到 → 空列表 → No SOURCES。
-# Codegen 的 TurboModule 与 Fabric 组件实现必须都进入插件目标；只保留头文件会让
-# Package 虽能注册 descriptor，却在运行/最终链接阶段缺失 Props/EventEmitter vtable。
-file(GLOB_RECURSE library_generated_SRC CONFIGURE_DEPENDS "${library_generated_dir}/*.cpp")
-file(GLOB library_SRC CONFIGURE_DEPENDS *.cpp)
-
-add_library(gcanvas SHARED
-    ${library_SRC}
-    ${library_generated_SRC}
-)
-
-target_compile_options(gcanvas PUBLIC ${folly_compile_options})
-target_compile_options(gcanvas PUBLIC -Wno-unused-command-line-argument)
-# RNOH 预编译 Fabric 库以 NDEBUG ABI 构建（Hvigor 的 debug profile 同样带
-# -DNDEBUG）；显式保持一致，避免独立插件构建误启用 React Native debug-only vtable。
-target_compile_definitions(gcanvas PRIVATE OHOS=1 GCANVAS_WEEX=1 NDEBUG)
-
-# 链接 RNOH 运行时（TurboModule 代理依赖 ArkTSTurboModule/TurboModule 等符号）与 GL/EGL/字体系统库。
-target_link_libraries(gcanvas PUBLIC
-    react-native-openharmony::rnoh_semi
-    react-native-openharmony::react_nativemodule_core
-    react-native-openharmony::runtimeexecutor
-    react-native-openharmony::jsi
-    react-native-openharmony::react_utils
-    react-native-openharmony::react_render_core
-    react-native-openharmony::react_render_graphics
-    react-native-openharmony::rrc_view
-    ${GCANVAS_CORE_LIB}
-    libace_napi.z.so      # NAPI / XComponent（OH_NativeXComponent_*）
-    libace_ndk.z.so       # ArkUI NDK
-    libhilog_ndk.z.so     # OH_LOG_Print 日志
-    libEGL.so             # Khronos EGL（eglCreateWindowSurface 等）
-    libGLESv3.so          # OpenGL ES 3.2
-    libnative_drawing.so  # OH_Drawing_RegisterFont / FontMgr 字体
-    libnative_window.so   # OHNativeWindow
-    libimage_packer.so    # toDataURL 图片编码
-    libimage_source.so    # PixelMap/图片数据
-    libpixelmap.so        # OH_PixelmapNative
-)
-
-target_link_options(gcanvas PRIVATE "-Wl,-z,max-page-size=16384")
+# GCanvas 鸿蒙 C++ 库构建配置。
+cmake_minimum_required(VERSION 3.13)
+set(CMAKE_VERBOSE_MAKEFILE on)
+project(gcanvas_library)
+
+# The public NAPI/XComponent entry remains libgcanvas.so.  The vendored
+# renderer/core is linked into it as a static implementation library.
+set(GCANVAS_WEEX ON)
+
+# RNOH/RN 头文件（ViewProps.h 等）使用 std::optional，要求 C++17。
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+find_package(react-native-openharmony REQUIRED CONFIG)
+
+if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/core/CMakeLists.txt")
+    add_subdirectory(core)
+    set(GCANVAS_CORE_LIB gcanvas_core)
+else()
+    set(GCANVAS_CORE_LIB "")
+endif()
+
+# 从 imported 目标 rnoh_semi 的库位置反推 RNOH 包根目录。Windows 上可由
+# -DRNOH_PKG_ROOT=<short-path> 覆盖，避免 ohpm 哈希目录触发 MAX_PATH。
+if(NOT DEFINED RNOH_PKG_ROOT)
+    get_target_property(_rnoh_semi_loc react-native-openharmony::rnoh_semi IMPORTED_LOCATION)
+    get_filename_component(_rnoh_pkg_libdir "${_rnoh_semi_loc}" DIRECTORY)   # .../libs/arm64-v8a
+    get_filename_component(_rnoh_pkg_libdir "${_rnoh_pkg_libdir}" DIRECTORY) # .../libs
+    get_filename_component(RNOH_PKG_ROOT "${_rnoh_pkg_libdir}" DIRECTORY)    # <pkg_root>
+endif()
+set(RNOH_CPP_DIR "${RNOH_PKG_ROOT}/src/main/include")
+set(REACT_COMMON_PATCH_DIR "${RNOH_CPP_DIR}/patches/react_native_core")
+
+set(library_generated_dir "${CMAKE_CURRENT_SOURCE_DIR}/generated")
+
+# folly F14 链接一致性：FOLLY_MOBILE=1（failure-lessons testing-cmake-004）。
+set(folly_compile_options
+    -DFOLLY_NO_CONFIG=1
+    -DFOLLY_MOBILE=1
+    -DFOLLY_USE_LIBCPP=1
+    -DFOLLY_HAVE_RECVMMSG=1
+    -DFOLLY_HAVE_PTHREAD=1
+    -Wno-comma
+    -Wno-shorten-64-to-32
+    -faligned-new
+)
+
+include_directories(
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${library_generated_dir}
+    ${RNOH_CPP_DIR}
+    ${REACT_COMMON_PATCH_DIR}
+    ${RNOH_CPP_DIR}/third-party/folly
+    ${RNOH_CPP_DIR}/third-party/rn/ReactCommon
+    ${RNOH_CPP_DIR}/third-party/rn/ReactCommon/react/nativemodule/core
+    ${RNOH_CPP_DIR}/third-party/rn/ReactCommon/jsi
+    ${RNOH_CPP_DIR}/third-party/rn/ReactCommon/callinvoker
+    ${RNOH_CPP_DIR}/third-party/boost/libs/utility/include
+    ${RNOH_CPP_DIR}/third-party/boost/libs/stacktrace/include
+    ${RNOH_CPP_DIR}/third-party/boost/libs/predef/include
+    ${RNOH_CPP_DIR}/third-party/boost/libs/array/include
+    ${RNOH_CPP_DIR}/third-party/boost/libs/throw_exception/include
+    ${RNOH_CPP_DIR}/third-party/boost/libs/config/include
+    ${RNOH_CPP_DIR}/third-party/boost/libs/core/include
+    ${RNOH_CPP_DIR}/third-party/boost/libs/preprocessor/include
+    ${RNOH_CPP_DIR}/third-party/double-conversion
+    ${RNOH_CPP_DIR}/third-party/rn/ReactCommon/react/renderer/graphics/platform/cxx
+    ${RNOH_CPP_DIR}/third-party/rn/ReactCommon/runtimeexecutor
+    ${RNOH_CPP_DIR}/third-party/glog/src
+    ${RNOH_CPP_DIR}/third-party/boost/libs/mpl/include
+    ${RNOH_CPP_DIR}/third-party/boost/libs/type_traits/include
+    ${RNOH_CPP_DIR}/third-party/rn/ReactCommon/yoga
+    ${RNOH_CPP_DIR}/third-party/boost/libs/intrusive/include
+    ${RNOH_CPP_DIR}/third-party/boost/libs/assert/include
+    ${RNOH_CPP_DIR}/third-party/boost/libs/move/include
+    ${RNOH_CPP_DIR}/third-party/boost/libs/static_assert/include
+    ${RNOH_CPP_DIR}/third-party/boost/libs/container_hash/include
+    ${RNOH_CPP_DIR}/third-party/boost/libs/describe/include
+    ${RNOH_CPP_DIR}/third-party/boost/libs/mp11/include
+    ${RNOH_CPP_DIR}/third-party/boost/libs/iterator/include
+    ${RNOH_CPP_DIR}/third-party/boost/libs/detail/include
+    ${RNOH_CPP_DIR}/third-party/boost/libs/regex/include
+    ${RNOH_CPP_DIR}/patches/react_native_core/react/renderer/textlayoutmanager/platform/harmony
+)
+
+# 不用 **/*.cpp：OHOS CMake 在 Windows 上常匹配不到 → 空列表 → No SOURCES。
+# Codegen 的 TurboModule 与 Fabric 组件实现必须都进入插件目标；只保留头文件会让
+# Package 虽能注册 descriptor，却在运行/最终链接阶段缺失 Props/EventEmitter vtable。
+file(GLOB_RECURSE library_generated_SRC CONFIGURE_DEPENDS "${library_generated_dir}/*.cpp")
+file(GLOB library_SRC CONFIGURE_DEPENDS *.cpp)
+
+add_library(gcanvas SHARED
+    ${library_SRC}
+    ${library_generated_SRC}
+)
+
+target_compile_options(gcanvas PUBLIC ${folly_compile_options})
+target_compile_options(gcanvas PUBLIC -Wno-unused-command-line-argument)
+# RNOH 预编译 Fabric 库以 NDEBUG ABI 构建（Hvigor 的 debug profile 同样带
+# -DNDEBUG）；显式保持一致，避免独立插件构建误启用 React Native debug-only vtable。
+target_compile_definitions(gcanvas PRIVATE OHOS=1 GCANVAS_WEEX=1 NDEBUG)
+
+# 链接 RNOH 运行时（TurboModule 代理依赖 ArkTSTurboModule/TurboModule 等符号）与 GL/EGL/字体系统库。
+target_link_libraries(gcanvas PUBLIC
+    react-native-openharmony::rnoh_semi
+    react-native-openharmony::react_nativemodule_core
+    react-native-openharmony::runtimeexecutor
+    react-native-openharmony::jsi
+    react-native-openharmony::react_utils
+    react-native-openharmony::react_render_core
+    react-native-openharmony::react_render_graphics
+    react-native-openharmony::rrc_view
+    ${GCANVAS_CORE_LIB}
+    libace_napi.z.so      # NAPI / XComponent（OH_NativeXComponent_*）
+    libace_ndk.z.so       # ArkUI NDK
+    libhilog_ndk.z.so     # OH_LOG_Print 日志
+    libEGL.so             # Khronos EGL（eglCreateWindowSurface 等）
+    libGLESv3.so          # OpenGL ES 3.2
+    libnative_drawing.so  # OH_Drawing_RegisterFont / FontMgr 字体
+    libnative_window.so   # OHNativeWindow
+    libimage_packer.so    # toDataURL 图片编码
+    libimage_source.so    # PixelMap/图片数据
+    libpixelmap.so        # OH_PixelmapNative
+)
+
+target_link_options(gcanvas PRIVATE "-Wl,-z,max-page-size=16384")