From 9094b2d5fee8b13f1b78d140d5b2baac835e8ba5 Mon Sep 17 00:00:00 2001 From: renguang1116 Date: Fri, 8 Apr 2022 11:25:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=87=AA=E9=AA=8C=E8=AF=81?= =?UTF-8?q?=E5=8F=91=E7=8E=B0=E9=97=AE=E9=A2=98=20Signed-off-by:=20renguan?= =?UTF-8?q?g1116=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- interfaces/kits/js/src/native_devicemanager_js.cpp | 3 ++- .../src/dependency/hichain/hichain_connector.cpp | 1 + utils/src/dm_random.cpp | 4 ++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/interfaces/kits/js/src/native_devicemanager_js.cpp b/interfaces/kits/js/src/native_devicemanager_js.cpp index 01503e91d..17278a458 100644 --- a/interfaces/kits/js/src/native_devicemanager_js.cpp +++ b/interfaces/kits/js/src/native_devicemanager_js.cpp @@ -46,6 +46,7 @@ const int32_t DM_NAPI_ARGS_TWO = 2; const int32_t DM_NAPI_ARGS_THREE = 3; const int32_t DM_NAPI_SUB_ID_MAX = 65535; const int32_t DM_AUTH_DIRECTION_CLIENT = 1; +const int32_t DM_AUTH_REQUEST_SUCCESS_STATUS = 8; napi_ref deviceTypeEnumConstructor_ = nullptr; napi_ref deviceStateChangeActionEnumConstructor_ = nullptr; @@ -499,7 +500,7 @@ void DeviceManagerNapi::OnAuthResult(const std::string &deviceId, const std::str napi_get_reference_value(env_, thisVarRef_, &thisVar); napi_value result[DM_NAPI_ARGS_TWO] = {0}; - if (status == 0) { + if (status == DM_AUTH_REQUEST_SUCCESS_STATUS && reason == 0) { LOGI("OnAuthResult success"); napi_get_undefined(env_, &result[0]); napi_create_object(env_, &result[1]); diff --git a/services/devicemanagerservice/src/dependency/hichain/hichain_connector.cpp b/services/devicemanagerservice/src/dependency/hichain/hichain_connector.cpp index c25458c4c..f1bb3a441 100644 --- a/services/devicemanagerservice/src/dependency/hichain/hichain_connector.cpp +++ b/services/devicemanagerservice/src/dependency/hichain/hichain_connector.cpp @@ -61,6 +61,7 @@ HiChainConnector::HiChainConnector() { LOGI("HiChainConnector::constructor"); deviceAuthCallback_ = {.onTransmit = nullptr, + .onSessionKeyReturned = nullptr, .onFinish = HiChainConnector::onFinish, .onError = HiChainConnector::onError, .onRequest = HiChainConnector::onRequest}; diff --git a/utils/src/dm_random.cpp b/utils/src/dm_random.cpp index 5a4b83cad..01daea9df 100644 --- a/utils/src/dm_random.cpp +++ b/utils/src/dm_random.cpp @@ -24,6 +24,10 @@ #include "mbedtls/gcm.h" #include "mbedtls/md.h" +#if defined(__LITEOS_M__) +#include +#endif + namespace OHOS { namespace DistributedHardware { int32_t GenRandInt(int32_t randMin, int32_t randMax) -- Gitee