From ab66efffc85029c660d0f1ea4ed23e4bceb1ef9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A2=A6=E9=BE=99?= Date: Wed, 10 Sep 2025 07:44:05 +0000 Subject: [PATCH 1/9] =?UTF-8?q?update=20ArkTS/entry/src/main/ets/pages/Wor?= =?UTF-8?q?ker2.ets.=20=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99=E7=AD=89?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 杨梦龙 --- ArkTS/entry/src/main/ets/pages/Worker2.ets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ArkTS/entry/src/main/ets/pages/Worker2.ets b/ArkTS/entry/src/main/ets/pages/Worker2.ets index 0e092223..0e35b7e8 100644 --- a/ArkTS/entry/src/main/ets/pages/Worker2.ets +++ b/ArkTS/entry/src/main/ets/pages/Worker2.ets @@ -20,7 +20,7 @@ // [Start MultipleWorkerInstances4] import { ErrorEvent, MessageEvents, ThreadWorkerGlobalScope, worker, process } from '@kit.ArkTS'; -const worker2: string = 'worker2='; +const worker2: string = 'worker2'; const workerPort: ThreadWorkerGlobalScope = worker.workerPort; workerPort.onmessage = (e: MessageEvents) => { -- Gitee From 4c2878cfe269f6b3a36ca7b270e83829a87b1300 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A2=A6=E9=BE=99?= Date: Wed, 10 Sep 2025 07:52:08 +0000 Subject: [PATCH 2/9] =?UTF-8?q?update=20Ndk/Ndk2/CallCustomMethod/src/main?= =?UTF-8?q?/cpp/napi=5Finit.cpp.=20=E4=BF=AE=E6=94=B9=E5=8D=95=E8=AF=8D?= =?UTF-8?q?=E6=8B=BC=E5=86=99=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 杨梦龙 --- Ndk/Ndk2/CallCustomMethod/src/main/cpp/napi_init.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Ndk/Ndk2/CallCustomMethod/src/main/cpp/napi_init.cpp b/Ndk/Ndk2/CallCustomMethod/src/main/cpp/napi_init.cpp index 2177b462..250e47da 100644 --- a/Ndk/Ndk2/CallCustomMethod/src/main/cpp/napi_init.cpp +++ b/Ndk/Ndk2/CallCustomMethod/src/main/cpp/napi_init.cpp @@ -32,7 +32,7 @@ static napi_value LoadModule(napi_env env, napi_callback_info info) { napi_value key; std::string keyStr = "value"; napi_create_string_utf8(env, keyStr.c_str(), keyStr.size(), &key); - // 4. Get variable value using napi_get_propey + // 4. Get variable value using napi_get_property napi_get_property(env, result, key, &value); return value; } -- Gitee From 8d7e8f5cc63fe92961733fa50e463fd7f102a29e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A2=A6=E9=BE=99?= Date: Thu, 11 Sep 2025 01:28:31 +0000 Subject: [PATCH 3/9] update Ndk/Ndk2/ArkTSCallNativeNapiCreateBuffer/src/main/cpp/CreatBuffer.h. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 杨梦龙 --- .../ArkTSCallNativeNapiCreateBuffer/src/main/cpp/CreatBuffer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Ndk/Ndk2/ArkTSCallNativeNapiCreateBuffer/src/main/cpp/CreatBuffer.h b/Ndk/Ndk2/ArkTSCallNativeNapiCreateBuffer/src/main/cpp/CreatBuffer.h index aa59d8ad..53e1202c 100644 --- a/Ndk/Ndk2/ArkTSCallNativeNapiCreateBuffer/src/main/cpp/CreatBuffer.h +++ b/Ndk/Ndk2/ArkTSCallNativeNapiCreateBuffer/src/main/cpp/CreatBuffer.h @@ -8,7 +8,7 @@ #define NDK5_CREATBUFFER_H #include -class CreatBuffer { +class CreateBuffer { public: static napi_value TestBuffer(napi_env env, napi_callback_info info); }; -- Gitee From 11f1e8803c03853e2ba980738988c1677b337141 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A2=A6=E9=BE=99?= Date: Thu, 11 Sep 2025 01:29:32 +0000 Subject: [PATCH 4/9] rename CreateBuffer.h. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 杨梦龙 --- .../src/main/cpp/{CreatBuffer.h => CreateBuffer.h} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Ndk/Ndk2/ArkTSCallNativeNapiCreateBuffer/src/main/cpp/{CreatBuffer.h => CreateBuffer.h} (100%) diff --git a/Ndk/Ndk2/ArkTSCallNativeNapiCreateBuffer/src/main/cpp/CreatBuffer.h b/Ndk/Ndk2/ArkTSCallNativeNapiCreateBuffer/src/main/cpp/CreateBuffer.h similarity index 100% rename from Ndk/Ndk2/ArkTSCallNativeNapiCreateBuffer/src/main/cpp/CreatBuffer.h rename to Ndk/Ndk2/ArkTSCallNativeNapiCreateBuffer/src/main/cpp/CreateBuffer.h -- Gitee From 18b49cd5f5cef05726647809ada493b53a7931ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A2=A6=E9=BE=99?= Date: Thu, 11 Sep 2025 01:30:23 +0000 Subject: [PATCH 5/9] update Ndk/Ndk2/ArkTSCallNativeNapiCreateBuffer/src/main/cpp/napi_init.cpp. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 杨梦龙 --- .../src/main/cpp/napi_init.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Ndk/Ndk2/ArkTSCallNativeNapiCreateBuffer/src/main/cpp/napi_init.cpp b/Ndk/Ndk2/ArkTSCallNativeNapiCreateBuffer/src/main/cpp/napi_init.cpp index 7914494c..cee98785 100644 --- a/Ndk/Ndk2/ArkTSCallNativeNapiCreateBuffer/src/main/cpp/napi_init.cpp +++ b/Ndk/Ndk2/ArkTSCallNativeNapiCreateBuffer/src/main/cpp/napi_init.cpp @@ -19,8 +19,8 @@ #include "napi/native_api.h" // [Start ark_ts_call_native_napi_create_buffer_cpp] -#include "CreatBuffer.h" -napi_value CreatBuffer::TestBuffer(napi_env env, napi_callback_info) { +#include "CreateBuffer.h" +napi_value CreateBuffer::TestBuffer(napi_env env, napi_callback_info) { size_t length = 100; char *data = nullptr; napi_value result = nullptr; -- Gitee From 91e5dcb6837e8cb2994123f9d1972198ec3d877e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A2=A6=E9=BE=99?= Date: Thu, 11 Sep 2025 01:35:54 +0000 Subject: [PATCH 6/9] update Ndk/Ndk2/entry/src/main/ets/pages/HashMap.ets. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 杨梦龙 --- Ndk/Ndk2/entry/src/main/ets/pages/HashMap.ets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Ndk/Ndk2/entry/src/main/ets/pages/HashMap.ets b/Ndk/Ndk2/entry/src/main/ets/pages/HashMap.ets index 1aa8747f..9fd59fa0 100644 --- a/Ndk/Ndk2/entry/src/main/ets/pages/HashMap.ets +++ b/Ndk/Ndk2/entry/src/main/ets/pages/HashMap.ets @@ -49,7 +49,7 @@ struct Index { // [Start hash_map_one_ets] let hashMap: HashMap = new HashMap(); hashMap.set("Abc", 123); - hashMap.set("Bcd", 234) + hashMap.set("Bcd", 234); hashMap.set("Cde", 345); let keysArray: Array = Array.from(hashMap.keys()); -- Gitee From 9314e22788798a90d847c3cebd39c8a9b636d5ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A2=A6=E9=BE=99?= Date: Thu, 11 Sep 2025 01:39:07 +0000 Subject: [PATCH 7/9] update Ndk/ndk1/demoso/src/main/cpp/a.cpp. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 杨梦龙 --- Ndk/ndk1/demoso/src/main/cpp/a.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Ndk/ndk1/demoso/src/main/cpp/a.cpp b/Ndk/ndk1/demoso/src/main/cpp/a.cpp index fb5d3751..eb93ee49 100644 --- a/Ndk/ndk1/demoso/src/main/cpp/a.cpp +++ b/Ndk/ndk1/demoso/src/main/cpp/a.cpp @@ -14,7 +14,7 @@ extern "C" { // Be sure to enclose it with extern 'C' {} #include "stdio.h" typedef int (*FUNC_SUB)(int, int); int add(int a, int b) { return a + b; } -int getb(char *path, int a, int b) { // Path: The sandbox path for passing So files from ArkTS side (note that the path should be passed from ArkTS side, otherwise it may not be found, and the specific code will be listed later) +int getb(char *path, int a, int b) { // Path:The sandbox path for passing So files from ArkTS side (note that the path should be passed from ArkTS side, otherwise it may not be found, and the specific code will be listed later) void *handle = dlopen(path, RTLD_LAZY); // Open the dynamic link library with path as path if (!handle) { return 0; -- Gitee From dfadbd385de131d6e4d26fbcf5b44b98605614a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A2=A6=E9=BE=99?= Date: Thu, 11 Sep 2025 01:57:20 +0000 Subject: [PATCH 8/9] update NetworkKit/entry/src/main/ets/pages/SetTcpSocket.ets. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 杨梦龙 --- NetworkKit/entry/src/main/ets/pages/SetTcpSocket.ets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NetworkKit/entry/src/main/ets/pages/SetTcpSocket.ets b/NetworkKit/entry/src/main/ets/pages/SetTcpSocket.ets index 59994684..4df61dca 100644 --- a/NetworkKit/entry/src/main/ets/pages/SetTcpSocket.ets +++ b/NetworkKit/entry/src/main/ets/pages/SetTcpSocket.ets @@ -31,7 +31,7 @@ interface ObjData2 { @Entry @Component export struct ObjectToArrayBuffer { - @State message: string = 'Object转ArrayBuffe'; + @State message: string = 'Object转ArrayBuffer'; strToArrayBuffer(str: string) { let buf = new ArrayBuffer(str.length * 2); -- Gitee From 5129136057dab4c47de71bd02908ef616f9a4e98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A2=A6=E9=BE=99?= Date: Fri, 12 Sep 2025 07:37:09 +0000 Subject: [PATCH 9/9] update AnalysisKit/entry/src/main/ets/entryability/EntryAbility.ets. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 杨梦龙 --- AnalysisKit/entry/src/main/ets/entryability/EntryAbility.ets | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AnalysisKit/entry/src/main/ets/entryability/EntryAbility.ets b/AnalysisKit/entry/src/main/ets/entryability/EntryAbility.ets index 05607603..e8762bf4 100644 --- a/AnalysisKit/entry/src/main/ets/entryability/EntryAbility.ets +++ b/AnalysisKit/entry/src/main/ets/entryability/EntryAbility.ets @@ -23,10 +23,10 @@ import { window } from '@kit.ArkUI'; let callback: errorManager.ErrorObserver = { onUnhandledException: (errMsg) => { - console.log('Callback when an uncaught exception occurs，onUnhandledException:', errMsg); + console.log('Callback when an uncaught exception occurs,onUnhandledException:', errMsg); }, onException: (errorObj) => { - console.log('The callback when an exception is reported to the JS layer，onException'); + console.log('The callback when an exception is reported to the JS layer,onException'); console.log('onException, name: ', errorObj.name); console.log('onException, message: ', errorObj.message); if (typeof (errorObj.stack) === 'string') { -- Gitee