From 3463ff5a36e6ff06b98a3dcefe20b36288a845ec Mon Sep 17 00:00:00 2001 From: houdisheng Date: Mon, 9 May 2022 09:48:39 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9codex=E5=91=8A=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: houdisheng --- .../napi/include/bundle_state_data.h | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/interfaces/kits/bundlestats/napi/include/bundle_state_data.h b/interfaces/kits/bundlestats/napi/include/bundle_state_data.h index 0924336..4d89455 100644 --- a/interfaces/kits/bundlestats/napi/include/bundle_state_data.h +++ b/interfaces/kits/bundlestats/napi/include/bundle_state_data.h @@ -56,45 +56,45 @@ struct AsyncWorkData { struct AsyncCallbackInfoIsIdleState : public AsyncWorkData { explicit AsyncCallbackInfoIsIdleState(napi_env env) : AsyncWorkData(env) {} - std::string bundleName; - bool state; + std::string bundleName = ""; + bool state = true; }; struct AsyncCallbackInfoPriorityGroup : public AsyncWorkData { explicit AsyncCallbackInfoPriorityGroup(napi_env env) : AsyncWorkData(env) {} - int32_t priorityGroup; + int32_t priorityGroup = 60; }; struct AsyncCallbackInfoStates : public AsyncWorkData { explicit AsyncCallbackInfoStates(napi_env env) : AsyncWorkData(env) {} - int64_t beginTime; - int64_t endTime; + int64_t beginTime = -1; + int64_t endTime = -1; std::vector BundleActiveState; }; struct AsyncCallbackInfoAppUsageByInterval : public AsyncWorkData { explicit AsyncCallbackInfoAppUsageByInterval(napi_env env) : AsyncWorkData(env) {} - int32_t intervalType; - int64_t beginTime; - int64_t endTime; + int32_t intervalType = -1; + int64_t beginTime = -1; + int64_t endTime = -1; std::vector packageStats; }; struct AsyncCallbackInfoAppUsage : public AsyncWorkData { explicit AsyncCallbackInfoAppUsage(napi_env env) : AsyncWorkData(env) {} - int64_t beginTime; - int64_t endTime; + int64_t beginTime = -1; + int64_t endTime = -1; std::shared_ptr> packageStats; }; struct AsyncCallbackInfoModuleRecord : public AsyncWorkData { explicit AsyncCallbackInfoModuleRecord(napi_env env) : AsyncWorkData(env) {} - int32_t maxNum; + int32_t maxNum = -1; std::vector moduleRecords; }; struct IsIdleStateParamsInfo { - std::string bundleName; + std::string bundleName = ""; napi_ref callback = nullptr; int32_t errorCode = 0; }; @@ -105,29 +105,29 @@ struct PriorityGroupParamsInfo { }; struct StatesParamsInfo { - int64_t beginTime; - int64_t endTime; + int64_t beginTime = -1; + int64_t endTime = -1; napi_ref callback = nullptr; int32_t errorCode = 0; }; struct AppUsageParamsByIntervalInfo { - int32_t intervalType; - int64_t beginTime; - int64_t endTime; + int32_t intervalType = -1; + int64_t beginTime = -1; + int64_t endTime = -1; napi_ref callback = nullptr; int32_t errorCode = 0; }; struct AppUsageParamsInfo { - int64_t beginTime; - int64_t endTime; + int64_t beginTime= -1; + int64_t endTime = -1; napi_ref callback = nullptr; int32_t errorCode = 0; }; struct ModuleRecordParamsInfo { - int32_t maxNum; + int32_t maxNum = -1; napi_ref callback = nullptr; int32_t errorCode = 0; }; -- Gitee From 76633d1eb7299ebb4f6091370c07f558e2efc195 Mon Sep 17 00:00:00 2001 From: houdisheng Date: Mon, 9 May 2022 10:30:44 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9codex=E5=91=8A=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: houdisheng --- frameworks/src/bundle_state_query.cpp | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/frameworks/src/bundle_state_query.cpp b/frameworks/src/bundle_state_query.cpp index 84f5565..7b840ef 100644 --- a/frameworks/src/bundle_state_query.cpp +++ b/frameworks/src/bundle_state_query.cpp @@ -103,8 +103,7 @@ napi_value GetModuleUsageRecord(napi_env env, napi_callback_info info) params.errorCode = ERR_USAGE_STATS_ASYNC_CALLBACK_NULLPTR; return BundleStateCommon::JSParaError(env, params.callback, params.errorCode); } - if (memset_s(asyncCallbackInfo, sizeof(AsyncCallbackInfoModuleRecord), 0, - sizeof(AsyncCallbackInfoModuleRecord)) != EOK) { + if (memset_s(asyncCallbackInfo, sizeof(*asyncCallbackInfo), 0, sizeof(*asyncCallbackInfo)) != EOK) { params.errorCode = ERR_USAGE_STATS_ASYNC_CALLBACK_INIT_FAILED; delete asyncCallbackInfo; asyncCallbackInfo = nullptr; @@ -197,8 +196,7 @@ napi_value IsIdleState(napi_env env, napi_callback_info info) params.errorCode = ERR_USAGE_STATS_ASYNC_CALLBACK_NULLPTR; return BundleStateCommon::JSParaError(env, params.callback, params.errorCode); } - if (memset_s(asyncCallbackInfo, sizeof(AsyncCallbackInfoIsIdleState), 0, sizeof(AsyncCallbackInfoIsIdleState)) - != EOK) { + if (memset_s(asyncCallbackInfo, sizeof(*asyncCallbackInfo), 0, sizeof(*asyncCallbackInfo)) != EOK) { params.errorCode = ERR_USAGE_STATS_ASYNC_CALLBACK_INIT_FAILED; delete asyncCallbackInfo; asyncCallbackInfo = nullptr; @@ -272,8 +270,7 @@ napi_value QueryAppUsagePriorityGroup(napi_env env, napi_callback_info info) params.errorCode = ERR_USAGE_STATS_ASYNC_CALLBACK_NULLPTR; return BundleStateCommon::JSParaError(env, params.callback, params.errorCode); } - if (memset_s(asyncCallbackInfo, sizeof(AsyncCallbackInfoPriorityGroup), 0, sizeof(AsyncCallbackInfoPriorityGroup)) - != EOK) { + if (memset_s(asyncCallbackInfo, sizeof(*asyncCallbackInfo), 0, sizeof(*asyncCallbackInfo)) != EOK) { params.errorCode = ERR_USAGE_STATS_ASYNC_CALLBACK_INIT_FAILED; delete asyncCallbackInfo; asyncCallbackInfo = nullptr; @@ -375,8 +372,7 @@ napi_value QueryCurrentBundleActiveStates(napi_env env, napi_callback_info info) params.errorCode = ERR_USAGE_STATS_ASYNC_CALLBACK_NULLPTR; return BundleStateCommon::JSParaError(env, params.callback, params.errorCode); } - if (memset_s(asyncCallbackInfo, sizeof(AsyncCallbackInfoStates), 0, sizeof(AsyncCallbackInfoStates)) - != EOK) { + if (memset_s(asyncCallbackInfo, sizeof(*asyncCallbackInfo), 0, sizeof(*asyncCallbackInfo)) != EOK) { params.errorCode = ERR_USAGE_STATS_ASYNC_CALLBACK_INIT_FAILED; delete asyncCallbackInfo; asyncCallbackInfo = nullptr; @@ -442,8 +438,7 @@ napi_value QueryBundleActiveStates(napi_env env, napi_callback_info info) params.errorCode = ERR_USAGE_STATS_ASYNC_CALLBACK_NULLPTR; return BundleStateCommon::JSParaError(env, params.callback, params.errorCode); } - if (memset_s(asyncCallbackInfo, sizeof(AsyncCallbackInfoStates), 0, sizeof(AsyncCallbackInfoStates)) - != EOK) { + if (memset_s(asyncCallbackInfo, sizeof(*asyncCallbackInfo), 0, sizeof(*asyncCallbackInfo)) != EOK) { params.errorCode = ERR_USAGE_STATS_ASYNC_CALLBACK_INIT_FAILED; delete asyncCallbackInfo; asyncCallbackInfo = nullptr; @@ -569,8 +564,7 @@ napi_value QueryBundleStateInfoByInterval(napi_env env, napi_callback_info info) params.errorCode = ERR_USAGE_STATS_ASYNC_CALLBACK_NULLPTR; return BundleStateCommon::JSParaError(env, params.callback, params.errorCode); } - if (memset_s(asyncCallbackInfo, sizeof(AsyncCallbackInfoAppUsageByInterval), 0, - sizeof(AsyncCallbackInfoAppUsageByInterval)) != EOK) { + if (memset_s(asyncCallbackInfo, sizeof(*asyncCallbackInfo), 0, sizeof(*asyncCallbackInfo)) != EOK) { params.errorCode = ERR_USAGE_STATS_ASYNC_CALLBACK_INIT_FAILED; delete asyncCallbackInfo; asyncCallbackInfo = nullptr; @@ -682,8 +676,7 @@ napi_value QueryBundleStateInfos(napi_env env, napi_callback_info info) params.errorCode = ERR_USAGE_STATS_ASYNC_CALLBACK_NULLPTR; return BundleStateCommon::JSParaError(env, params.callback, params.errorCode); } - if (memset_s(asyncCallbackInfo, sizeof(AsyncCallbackInfoAppUsage), 0, sizeof(AsyncCallbackInfoAppUsage)) - != EOK) { + if (memset_s(asyncCallbackInfo, sizeof(*asyncCallbackInfo), 0, sizeof(*asyncCallbackInfo)) != EOK) { params.errorCode = ERR_USAGE_STATS_ASYNC_CALLBACK_INIT_FAILED; delete asyncCallbackInfo; asyncCallbackInfo = nullptr; -- Gitee From 512c5b64912b1e7455893a525a5e465467d1e5bb Mon Sep 17 00:00:00 2001 From: houdisheng Date: Mon, 9 May 2022 13:46:28 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9codex=E5=91=8A=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: houdisheng --- interfaces/kits/bundlestats/napi/include/bundle_state_data.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interfaces/kits/bundlestats/napi/include/bundle_state_data.h b/interfaces/kits/bundlestats/napi/include/bundle_state_data.h index 4d89455..b27b51d 100644 --- a/interfaces/kits/bundlestats/napi/include/bundle_state_data.h +++ b/interfaces/kits/bundlestats/napi/include/bundle_state_data.h @@ -120,7 +120,7 @@ struct AppUsageParamsByIntervalInfo { }; struct AppUsageParamsInfo { - int64_t beginTime= -1; + int64_t beginTime = -1; int64_t endTime = -1; napi_ref callback = nullptr; int32_t errorCode = 0; -- Gitee