diff --git a/interfaces/kits/js/src/native_devicemanager_js.cpp b/interfaces/kits/js/src/native_devicemanager_js.cpp index 5a265ae1c955c20fc253ce750c447d6ab816925a..bb96c37a7044c5a55a282bc3077f4f9ed3ee30f6 100644 --- a/interfaces/kits/js/src/native_devicemanager_js.cpp +++ b/interfaces/kits/js/src/native_devicemanager_js.cpp @@ -46,7 +46,6 @@ 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; std::map g_deviceManagerMap; std::map> g_initCallbackMap; @@ -530,51 +529,7 @@ void DeviceManagerNapi::DeviceInfoToJsArray(const napi_env &env, const std::vect void DeviceManagerNapi::DmAuthParamToJsAuthParam(const napi_env &env, const DmAuthParam &authParam, napi_value ¶mResult) { - napi_value extraInfo = nullptr; - napi_create_object(env, &extraInfo); - SetValueInt32(env, "direction", authParam.direction, extraInfo); - SetValueInt32(env, "authType", authParam.authType, paramResult); - SetValueInt32(env, "pinToken", stoi(authParam.authToken), extraInfo); - - if (authParam.direction == DM_AUTH_DIRECTION_CLIENT) { - napi_set_named_property(env, paramResult, "extraInfo", extraInfo); - return; - } - - SetValueUtf8String(env, "packageName", authParam.packageName, extraInfo); - SetValueUtf8String(env, "appName", authParam.appName, extraInfo); - SetValueUtf8String(env, "appDescription", authParam.appDescription, extraInfo); - SetValueInt32(env, "business", authParam.business, extraInfo); - SetValueInt32(env, "pinCode", authParam.pincode, extraInfo); - napi_set_named_property(env, paramResult, "extraInfo", extraInfo); - - size_t appIconLen = (size_t)authParam.imageinfo.GetAppIconLen(); - if (appIconLen > 0) { - void *appIcon = nullptr; - napi_value appIconBuffer = nullptr; - napi_create_arraybuffer(env, appIconLen, &appIcon, &appIconBuffer); - if (appIcon != nullptr && - memcpy_s(appIcon, appIconLen, reinterpret_cast(authParam.imageinfo.GetAppIcon()), - appIconLen) == 0) { - napi_value appIconArray = nullptr; - napi_create_typedarray(env, napi_uint8_array, appIconLen, appIconBuffer, 0, &appIconArray); - napi_set_named_property(env, paramResult, "appIcon", appIconArray); - } - } - - size_t appThumbnailLen = (size_t)authParam.imageinfo.GetAppThumbnailLen(); - if (appThumbnailLen > 0) { - void *appThumbnail = nullptr; - napi_value appThumbnailBuffer = nullptr; - napi_create_arraybuffer(env, appThumbnailLen, &appThumbnail, &appThumbnailBuffer); - if (appThumbnail != nullptr && - memcpy_s(appThumbnail, appThumbnailLen, - reinterpret_cast(authParam.imageinfo.GetAppThumbnail()), appThumbnailLen) == 0) { - napi_value appThumbnailArray = nullptr; - napi_create_typedarray(env, napi_uint8_array, appThumbnailLen, appThumbnailBuffer, 0, &appThumbnailArray); - napi_set_named_property(env, paramResult, "appThumbnail", appThumbnailArray); - } - } + return; } void DeviceManagerNapi::JsObjectToString(const napi_env &env, const napi_value &object, const std::string &fieldStr, diff --git a/services/devicemanagerservice/src/dependency/timer/dm_timer.cpp b/services/devicemanagerservice/src/dependency/timer/dm_timer.cpp index 08fede1e42c33757f3f394cb8c5530236ae45643..a33034f48a1ba692dd046fe310998c54a148f65d 100644 --- a/services/devicemanagerservice/src/dependency/timer/dm_timer.cpp +++ b/services/devicemanagerservice/src/dependency/timer/dm_timer.cpp @@ -26,6 +26,10 @@ const int32_t MILL_SECONDS_PER_SECOND = 1000; } DmTimer::DmTimer(const std::string &name) { + if (name.empty()) { + LOGI("DmTimer name is null"); + return; + } mStatus_ = DmTimerStatus::DM_STATUS_INIT; mTimeOutSec_ = 0; mHandle_ = nullptr; @@ -39,12 +43,20 @@ DmTimer::DmTimer(const std::string &name) DmTimer::~DmTimer() { + if (mTimerName_.empty()) { + LOGI("DmTimer is not init"); + return; + } LOGI("DmTimer %s Destroy in", mTimerName_.c_str()); Release(); } DmTimerStatus DmTimer::Start(uint32_t timeOut, TimeoutHandle handle, void *data) { + if (mTimerName_.empty() || handle == nullptr || data == nullptr) { + LOGI("DmTimer is not init or param empty"); + return DmTimerStatus::DM_STATUS_FINISH; + } LOGI("DmTimer %s start timeout(%d)", mTimerName_.c_str(), timeOut); if (mStatus_ != DmTimerStatus::DM_STATUS_INIT) { return DmTimerStatus::DM_STATUS_BUSY; @@ -67,6 +79,10 @@ DmTimerStatus DmTimer::Start(uint32_t timeOut, TimeoutHandle handle, void *data) void DmTimer::Stop(int32_t code) { + if (mTimerName_.empty()) { + LOGI("DmTimer is not init"); + return; + } LOGI("DmTimer %s Stop code (%d)", mTimerName_.c_str(), code); if (mTimeFd_[1]) { char event = 'S'; @@ -82,6 +98,10 @@ void DmTimer::Stop(int32_t code) void DmTimer::WaitForTimeout() { + if (mTimerName_.empty()) { + LOGI("DmTimer is not init"); + return; + } LOGI("DmTimer %s start timer at (%d)s", mTimerName_.c_str(), mTimeOutSec_); int32_t nfds = epoll_wait(mEpFd_, mEvents_, MAX_EVENTS, mTimeOutSec_ * MILL_SECONDS_PER_SECOND); @@ -112,6 +132,10 @@ void DmTimer::WaitForTimeout() int32_t DmTimer::CreateTimeFd() { + if (mTimerName_.empty()) { + LOGI("DmTimer is not init"); + return DM_STATUS_FINISH; + } LOGI("DmTimer %s creatTimeFd", mTimerName_.c_str()); int ret = 0; @@ -134,6 +158,10 @@ int32_t DmTimer::CreateTimeFd() void DmTimer::Release() { + if (mTimerName_.empty()) { + LOGI("DmTimer is not init"); + return; + } LOGI("DmTimer %s Release in", mTimerName_.c_str()); if (mStatus_ == DmTimerStatus::DM_STATUS_INIT) { LOGI("DmTimer %s already Release", mTimerName_.c_str());