From 780f4643f6b9232a32b6d6d0b9de0b46016f0049 Mon Sep 17 00:00:00 2001 From: zhaochaoyan Date: Fri, 18 Aug 2023 14:24:08 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=B6=85=E5=A4=A7=E5=87=BD=E6=95=B0?= =?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: zhaochaoyan --- .../services/src/av_sync_manager.cpp | 5 +---- .../src/componentloader/component_loader.cpp | 8 ++------ 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/av_transport/av_trans_control_center/services/src/av_sync_manager.cpp b/av_transport/av_trans_control_center/services/src/av_sync_manager.cpp index 03950e34..4a61c407 100644 --- a/av_transport/av_trans_control_center/services/src/av_sync_manager.cpp +++ b/av_transport/av_trans_control_center/services/src/av_sync_manager.cpp @@ -188,10 +188,7 @@ bool AVSyncManager::MergeGroupInfo(std::string &syncGroupInfo) } } - nlohmann::json jsonStr = { - { KEY_MY_DEV_ID, "" }, - { KEY_GROUP_INFO_ARRAY, groupInfoSet }, - }; + nlohmann::json jsonStr = { { KEY_MY_DEV_ID, "" }, { KEY_GROUP_INFO_ARRAY, groupInfoSet }, }; syncGroupInfo = jsonStr.dump(); return true; } diff --git a/services/distributedhardwarefwkservice/src/componentloader/component_loader.cpp b/services/distributedhardwarefwkservice/src/componentloader/component_loader.cpp index 04601850..e49598e6 100644 --- a/services/distributedhardwarefwkservice/src/componentloader/component_loader.cpp +++ b/services/distributedhardwarefwkservice/src/componentloader/component_loader.cpp @@ -147,15 +147,11 @@ void from_json(const nlohmann::json &json, CompConfig &cfg) return; } cfg.compSinkLoc = json.at(COMP_SINK_LOC).get(); - if (!IsString(json, COMP_SINK_VERSION)) { - DHLOGE("COMP_SINK_VERSION is invalid"); + if ((!IsString(json, COMP_SINK_VERSION)) || (!IsInt32(json, COMP_SINK_SA_ID))) { + DHLOGE("COMP_SINK_VERSION or COMP_SINK_SA_ID is invalid"); return; } cfg.compSinkVersion = json.at(COMP_SINK_VERSION).get(); - if (!IsInt32(json, COMP_SINK_SA_ID)) { - DHLOGE("COMP_SINK_SA_ID is invalid"); - return; - } cfg.compSinkSaId = json.at(COMP_SINK_SA_ID).get(); } -- Gitee From 7ecbeacdd298c2b0ad2df52fcc620a0ad3c2c640 Mon Sep 17 00:00:00 2001 From: zhaochaoyan <12651641+zhaochaoyan@user.noreply.gitee.com> Date: Mon, 21 Aug 2023 00:51:45 +0000 Subject: [PATCH 2/2] update services/distributedhardwarefwkservice/src/componentloader/component_loader.cpp. Signed-off-by: zhaochaoyan <12651641+zhaochaoyan@user.noreply.gitee.com> --- .../src/componentloader/component_loader.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/services/distributedhardwarefwkservice/src/componentloader/component_loader.cpp b/services/distributedhardwarefwkservice/src/componentloader/component_loader.cpp index e49598e6..04601850 100644 --- a/services/distributedhardwarefwkservice/src/componentloader/component_loader.cpp +++ b/services/distributedhardwarefwkservice/src/componentloader/component_loader.cpp @@ -147,11 +147,15 @@ void from_json(const nlohmann::json &json, CompConfig &cfg) return; } cfg.compSinkLoc = json.at(COMP_SINK_LOC).get(); - if ((!IsString(json, COMP_SINK_VERSION)) || (!IsInt32(json, COMP_SINK_SA_ID))) { - DHLOGE("COMP_SINK_VERSION or COMP_SINK_SA_ID is invalid"); + if (!IsString(json, COMP_SINK_VERSION)) { + DHLOGE("COMP_SINK_VERSION is invalid"); return; } cfg.compSinkVersion = json.at(COMP_SINK_VERSION).get(); + if (!IsInt32(json, COMP_SINK_SA_ID)) { + DHLOGE("COMP_SINK_SA_ID is invalid"); + return; + } cfg.compSinkSaId = json.at(COMP_SINK_SA_ID).get(); } -- Gitee