From c04366beb56ff2e9a2164ff240d38b1c7ee046d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=B2=E6=99=93=E6=99=93?= Date: Tue, 4 Mar 2025 14:16:58 +0800 Subject: [PATCH 1/3] =?UTF-8?q?js=E6=8E=A5=E5=8F=A3=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E8=AE=BE=E5=A4=87=E5=90=8D=E7=A7=B0=E5=8C=BF?= =?UTF-8?q?=E5=90=8D=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 史晓晓 --- interfaces/kits/js4.0/src/native_devicemanager_js.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/interfaces/kits/js4.0/src/native_devicemanager_js.cpp b/interfaces/kits/js4.0/src/native_devicemanager_js.cpp index 48fe2775b..e09825abf 100644 --- a/interfaces/kits/js4.0/src/native_devicemanager_js.cpp +++ b/interfaces/kits/js4.0/src/native_devicemanager_js.cpp @@ -1387,8 +1387,9 @@ napi_value DeviceManagerNapi::GetLocalDeviceName(napi_env env, napi_callback_inf CreateBusinessError(env, ret); return result; } - LOGI("DeviceManager::GetLocalDeviceName deviceName:%{public}s", GetAnonyString(std::string(deviceName)).c_str()); - napi_create_string_utf8(env, deviceName.c_str(), deviceName.size(), &result); + std::string anonyDeviceName = GetAnonyString(deviceName); + LOGI("DeviceManager::GetLocalDeviceName deviceName:%{public}s", anonyDeviceName.c_str()); + napi_create_string_utf8(env, anonyDeviceName.c_str(), anonyDeviceName.size(), &result); return result; } -- Gitee From 892527812a6183f7b5a274b873f4d894b5ee44f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=B2=E6=99=93=E6=99=93?= Date: Mon, 10 Mar 2025 17:13:58 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 史晓晓 --- interfaces/kits/js4.0/src/dm_native_util.cpp | 3 ++- interfaces/kits/js4.0/src/native_devicemanager_js.cpp | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/interfaces/kits/js4.0/src/dm_native_util.cpp b/interfaces/kits/js4.0/src/dm_native_util.cpp index 91d06911d..5b44ab078 100644 --- a/interfaces/kits/js4.0/src/dm_native_util.cpp +++ b/interfaces/kits/js4.0/src/dm_native_util.cpp @@ -290,7 +290,8 @@ void DmDeviceBasicToJsObject(napi_env env, const DmDeviceBasicInfo &devInfo, nap { SetValueUtf8String(env, "deviceId", devInfo.deviceId, result); SetValueUtf8String(env, "networkId", devInfo.networkId, result); - SetValueUtf8String(env, "deviceName", devInfo.deviceName, result); + std::string anonyDeviceName = GetAnonyString(std::string(devInfo.deviceName)); + SetValueUtf8String(env, "deviceName", anonyDeviceName.c_str(), result); std::string deviceType = GetDeviceTypeById(static_cast(devInfo.deviceTypeId)); SetValueUtf8String(env, "deviceType", deviceType.c_str(), result); SetValueUtf8String(env, "extraData", devInfo.extraData.c_str(), result); diff --git a/interfaces/kits/js4.0/src/native_devicemanager_js.cpp b/interfaces/kits/js4.0/src/native_devicemanager_js.cpp index e09825abf..68cd5271d 100644 --- a/interfaces/kits/js4.0/src/native_devicemanager_js.cpp +++ b/interfaces/kits/js4.0/src/native_devicemanager_js.cpp @@ -1448,8 +1448,9 @@ napi_value DeviceManagerNapi::GetDeviceName(napi_env env, napi_callback_info inf CreateBusinessError(env, ret); return result; } - LOGI("DeviceManager::GetDeviceName deviceName:%{public}s", GetAnonyString(std::string(deviceName)).c_str()); - napi_create_string_utf8(env, deviceName.c_str(), deviceName.size(), &result); + std::string annoyDeviceName = GetAnonyString(deviceName); + LOGI("DeviceManager::GetDeviceName deviceName:%{public}s", annoyDeviceName.c_str()); + napi_create_string_utf8(env, annoyDeviceName.c_str(), annoyDeviceName.size(), &result); return result; } -- Gitee From 95accd9d5d382841aee268a5ec86469437d718d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=B2=E6=99=93=E6=99=93?= Date: Tue, 11 Mar 2025 15:47:48 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8B=BC=E5=86=99?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 史晓晓 --- interfaces/kits/js4.0/src/native_devicemanager_js.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/interfaces/kits/js4.0/src/native_devicemanager_js.cpp b/interfaces/kits/js4.0/src/native_devicemanager_js.cpp index 68cd5271d..ac3c116fa 100644 --- a/interfaces/kits/js4.0/src/native_devicemanager_js.cpp +++ b/interfaces/kits/js4.0/src/native_devicemanager_js.cpp @@ -1448,9 +1448,9 @@ napi_value DeviceManagerNapi::GetDeviceName(napi_env env, napi_callback_info inf CreateBusinessError(env, ret); return result; } - std::string annoyDeviceName = GetAnonyString(deviceName); - LOGI("DeviceManager::GetDeviceName deviceName:%{public}s", annoyDeviceName.c_str()); - napi_create_string_utf8(env, annoyDeviceName.c_str(), annoyDeviceName.size(), &result); + std::string anonyDeviceName = GetAnonyString(deviceName); + LOGI("DeviceManager::GetDeviceName deviceName:%{public}s", anonyDeviceName.c_str()); + napi_create_string_utf8(env, anonyDeviceName.c_str(), anonyDeviceName.size(), &result); return result; } -- Gitee