From 7edee90e1a313e2a4561a514efe5c95493235195 Mon Sep 17 00:00:00 2001 From: x00405909 Date: Sat, 21 Aug 2021 16:22:57 +0800 Subject: [PATCH 1/3] add udid js interface Signed-off-by: x00405909 Change-Id: I8e036a6cd43a562be19d1f0d868f3703bd4d823e --- interfaces/kits/js/src/native_deviceinfo_js.cpp | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/interfaces/kits/js/src/native_deviceinfo_js.cpp b/interfaces/kits/js/src/native_deviceinfo_js.cpp index b9c09ad..0f0c844 100644 --- a/interfaces/kits/js/src/native_deviceinfo_js.cpp +++ b/interfaces/kits/js/src/native_deviceinfo_js.cpp @@ -21,6 +21,8 @@ #include "parameter.h" #include "sysversion.h" +const int UDID_LEN = 20; + static napi_value GetDeviceType(napi_env env, napi_callback_info info) { napi_value deviceType = nullptr; @@ -282,6 +284,16 @@ static napi_value GetBuildRootHash(napi_env env, napi_callback_info info) return napiValue; } +static napi_value GetDevUdid(napi_env env, napi_callback_info info) +{ + napi_value napiValue = nullptr; + char localDeviceId[UDID_LEN] = {0}; + GetDevUdid(localDeviceId, UDID_LEN); + + NAPI_CALL(env, napi_create_string_utf8(env, localDeviceId, strlen(localDeviceId), &napiValue)); + return napiValue; +} + EXTERN_C_START /* * Module init @@ -321,6 +333,7 @@ static napi_value Init(napi_env env, napi_value exports) {"buildHost", nullptr, nullptr, GetBuildHost, nullptr, nullptr, napi_default, nullptr}, {"buildTime", nullptr, nullptr, GetBuildTime, nullptr, nullptr, napi_default, nullptr}, {"buildRootHash", nullptr, nullptr, GetBuildRootHash, nullptr, nullptr, napi_default, nullptr}, + {"udid", nullptr, nullptr, GetDevUdid, nullptr, nullptr, napi_default, nullptr}, }; NAPI_CALL(env, napi_define_properties(env, exports, sizeof(desc) / sizeof(napi_property_descriptor), desc)); -- Gitee From c0e5545bed84c29bb65e5db17aa93ccaa1816d9c Mon Sep 17 00:00:00 2001 From: x00405909 Date: Sat, 21 Aug 2021 16:49:18 +0800 Subject: [PATCH 2/3] add udid js interface Signed-off-by: x00405909 Change-Id: Ib92604ea3582e96db9284e55793c3d2f58f988b1 --- interfaces/kits/js/src/native_deviceinfo_js.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interfaces/kits/js/src/native_deviceinfo_js.cpp b/interfaces/kits/js/src/native_deviceinfo_js.cpp index 0f0c844..ecc492b 100644 --- a/interfaces/kits/js/src/native_deviceinfo_js.cpp +++ b/interfaces/kits/js/src/native_deviceinfo_js.cpp @@ -21,7 +21,7 @@ #include "parameter.h" #include "sysversion.h" -const int UDID_LEN = 20; +static const int UDID_LEN = 20; static napi_value GetDeviceType(napi_env env, napi_callback_info info) { -- Gitee From 540bb432dc4fa7c22e9945b15784fc3d8b0e9daa Mon Sep 17 00:00:00 2001 From: x00405909 Date: Sat, 21 Aug 2021 17:18:31 +0800 Subject: [PATCH 3/3] add udid js interface Signed-off-by: x00405909 Change-Id: Ia886f6f25c9826ac938283278df88d0ce21fd080 --- interfaces/kits/js/src/native_deviceinfo_js.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interfaces/kits/js/src/native_deviceinfo_js.cpp b/interfaces/kits/js/src/native_deviceinfo_js.cpp index ecc492b..a3053dc 100644 --- a/interfaces/kits/js/src/native_deviceinfo_js.cpp +++ b/interfaces/kits/js/src/native_deviceinfo_js.cpp @@ -21,7 +21,7 @@ #include "parameter.h" #include "sysversion.h" -static const int UDID_LEN = 20; +static const int UDID_LEN = 65; static napi_value GetDeviceType(napi_env env, napi_callback_info info) { -- Gitee