From 77bb3e7574962bcec5f8eb45c236392c63926c27 Mon Sep 17 00:00:00 2001 From: kuangning <2540487435@qq.com> Date: Mon, 26 May 2025 15:53:39 +0800 Subject: [PATCH] =?UTF-8?q?fix:Ndk=E4=BF=AE=E6=94=B9=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Ndk/Ndk2/CMakeGetModuleVersion/oh-package-lock.json5 | 6 +++--- Ndk/Ndk2/CMakeGetModuleVersion/oh-package.json5 | 2 +- .../CMakeGetModuleVersion/src/main/cpp/napi_init.cpp | 2 +- .../types/libcmakegetmoduleversion/oh-package.json5 | 2 +- .../CMakeGetModuleVersion/src/main/ets/pages/Index.ets | 2 +- .../src/main/cpp/napi_init.cpp | 10 +++++++--- .../src/main/cpp/types/libapplication/oh-package.json5 | 2 +- 7 files changed, 15 insertions(+), 11 deletions(-) diff --git a/Ndk/Ndk2/CMakeGetModuleVersion/oh-package-lock.json5 b/Ndk/Ndk2/CMakeGetModuleVersion/oh-package-lock.json5 index 03f15ea..0fdfd9b 100644 --- a/Ndk/Ndk2/CMakeGetModuleVersion/oh-package-lock.json5 +++ b/Ndk/Ndk2/CMakeGetModuleVersion/oh-package-lock.json5 @@ -5,11 +5,11 @@ "lockfileVersion": 3, "ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.", "specifiers": { - "libcmakegetmoduleversion.so@src/main/cpp/types/libcmakegetmoduleversion": "libcmakegetmoduleversion.so@src/main/cpp/types/libcmakegetmoduleversion" + "libentry.so@src/main/cpp/types/libcmakegetmoduleversion": "libentry.so@src/main/cpp/types/libcmakegetmoduleversion" }, "packages": { - "libcmakegetmoduleversion.so@src/main/cpp/types/libcmakegetmoduleversion": { - "name": "libcmakegetmoduleversion.so", + "libentry.so@src/main/cpp/types/libcmakegetmoduleversion": { + "name": "libentry.so", "version": "1.0.0", "resolved": "src/main/cpp/types/libcmakegetmoduleversion", "registryType": "local" diff --git a/Ndk/Ndk2/CMakeGetModuleVersion/oh-package.json5 b/Ndk/Ndk2/CMakeGetModuleVersion/oh-package.json5 index 6f32a3a..82a9da7 100644 --- a/Ndk/Ndk2/CMakeGetModuleVersion/oh-package.json5 +++ b/Ndk/Ndk2/CMakeGetModuleVersion/oh-package.json5 @@ -6,6 +6,6 @@ "author": "", "license": "", "dependencies": { - "libcmakegetmoduleversion.so": "file:./src/main/cpp/types/libcmakegetmoduleversion" + "libentry.so": "file:./src/main/cpp/types/libcmakegetmoduleversion" } } \ No newline at end of file diff --git a/Ndk/Ndk2/CMakeGetModuleVersion/src/main/cpp/napi_init.cpp b/Ndk/Ndk2/CMakeGetModuleVersion/src/main/cpp/napi_init.cpp index 22ae246..2a14eef 100644 --- a/Ndk/Ndk2/CMakeGetModuleVersion/src/main/cpp/napi_init.cpp +++ b/Ndk/Ndk2/CMakeGetModuleVersion/src/main/cpp/napi_init.cpp @@ -42,7 +42,7 @@ static napi_module demoModule = { .nm_flags = 0, .nm_filename = nullptr, .nm_register_func = Init, - .nm_modname = "cmakegetmoduleversion", + .nm_modname = "entry", .nm_priv = ((void*)0), .reserved = { 0 }, }; diff --git a/Ndk/Ndk2/CMakeGetModuleVersion/src/main/cpp/types/libcmakegetmoduleversion/oh-package.json5 b/Ndk/Ndk2/CMakeGetModuleVersion/src/main/cpp/types/libcmakegetmoduleversion/oh-package.json5 index 798471c..ea41072 100644 --- a/Ndk/Ndk2/CMakeGetModuleVersion/src/main/cpp/types/libcmakegetmoduleversion/oh-package.json5 +++ b/Ndk/Ndk2/CMakeGetModuleVersion/src/main/cpp/types/libcmakegetmoduleversion/oh-package.json5 @@ -1,5 +1,5 @@ { - "name": "libcmakegetmoduleversion.so", + "name": "libentry.so", "types": "./Index.d.ts", "version": "1.0.0", "description": "Please describe the basic information." diff --git a/Ndk/Ndk2/CMakeGetModuleVersion/src/main/ets/pages/Index.ets b/Ndk/Ndk2/CMakeGetModuleVersion/src/main/ets/pages/Index.ets index 8d4aa3f..0738f87 100644 --- a/Ndk/Ndk2/CMakeGetModuleVersion/src/main/ets/pages/Index.ets +++ b/Ndk/Ndk2/CMakeGetModuleVersion/src/main/ets/pages/Index.ets @@ -1,5 +1,5 @@ import { hilog } from '@kit.PerformanceAnalysisKit'; -import testNapi from 'libcmakegetmoduleversion.so'; +import testNapi from 'libentry.so'; const DOMAIN = 0x0000; diff --git a/Ndk/Ndk2/ImportThirdPartyLibraries/src/main/cpp/napi_init.cpp b/Ndk/Ndk2/ImportThirdPartyLibraries/src/main/cpp/napi_init.cpp index 1401f0a..48d1062 100644 --- a/Ndk/Ndk2/ImportThirdPartyLibraries/src/main/cpp/napi_init.cpp +++ b/Ndk/Ndk2/ImportThirdPartyLibraries/src/main/cpp/napi_init.cpp @@ -27,11 +27,15 @@ static napi_value Sub(napi_env env, napi_callback_info info) } +static napi_value Add(napi_env env, napi_callback_info info) { + +} + EXTERN_C_START -static napi_value Init(napi_env env, napi_value exports) -{ +static napi_value Init(napi_env env, napi_value exports) { napi_property_descriptor desc[] = { - { "sub", nullptr, Sub, nullptr, nullptr, nullptr, napi_default, nullptr } + {"sub", nullptr, Sub, nullptr, nullptr, nullptr, napi_default, nullptr}, + {"add", nullptr, Add, nullptr, nullptr, nullptr, napi_default, nullptr } }; napi_define_properties(env, exports, sizeof(desc) / sizeof(desc[0]), desc); return exports; diff --git a/Ndk/Ndk2/ImportThirdPartyLibraries/src/main/cpp/types/libapplication/oh-package.json5 b/Ndk/Ndk2/ImportThirdPartyLibraries/src/main/cpp/types/libapplication/oh-package.json5 index 4fb0377..efff24b 100644 --- a/Ndk/Ndk2/ImportThirdPartyLibraries/src/main/cpp/types/libapplication/oh-package.json5 +++ b/Ndk/Ndk2/ImportThirdPartyLibraries/src/main/cpp/types/libapplication/oh-package.json5 @@ -1,6 +1,6 @@ { "name": "libapplication.so", "types": "./Index.d.ts", - "version": "", + "version": "1.0.0", "description": "Please describe the basic information." } \ No newline at end of file -- Gitee