From 154c6de22bc1ecc5dc3e81cd09ba48b2b452fb30 Mon Sep 17 00:00:00 2001 From: wangchaole Date: Mon, 19 Sep 2022 14:42:24 +0800 Subject: [PATCH 1/4] fix: modify tdd test Signed-off-by: wangchaole --- common/include/utils/dcamera_hisysevent_adapter.h | 14 +++++++------- common/src/utils/dcamera_hisysevent_adapter.cpp | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/common/include/utils/dcamera_hisysevent_adapter.h b/common/include/utils/dcamera_hisysevent_adapter.h index fec74743..a0bf1704 100644 --- a/common/include/utils/dcamera_hisysevent_adapter.h +++ b/common/include/utils/dcamera_hisysevent_adapter.h @@ -51,17 +51,17 @@ using EventCaptureInfo = struct _EventCaptureInfo { int32_t type_; }; -void ReportDcamerInitFail(const std::string eventName, int32_t errCode, const std::string& errMsg); -void ReportRegisterCameraFail(const std::string eventName, const std::string& devId, const std::string& dhId, +void ReportDcamerInitFail(const std::string& eventName, int32_t errCode, const std::string& errMsg); +void ReportRegisterCameraFail(const std::string& eventName, const std::string& devId, const std::string& dhId, std::string version, const std::string& errMsg); -void ReportDcamerOptFail(const std::string eventName, int32_t errCode, const std::string& errMsg); +void ReportDcamerOptFail(const std::string& eventName, int32_t errCode, const std::string& errMsg); -void ReportSaEvent(const std::string eventName, int32_t saId, const std::string& errMsg); -void ReportRegisterCameraEvent(const std::string eventName, const std::string& devId, const std::string& dhId, +void ReportSaEvent(const std::string& eventName, int32_t saId, const std::string& errMsg); +void ReportRegisterCameraEvent(const std::string& eventName, const std::string& devId, const std::string& dhId, std::string version, const std::string& errMsg); -void ReportCameraOperaterEvent(const std::string eventName, const std::string& devId, const std::string& dhId, +void ReportCameraOperaterEvent(const std::string& eventName, const std::string& devId, const std::string& dhId, const std::string& errMsg); -void ReportStartCaptureEvent(const std::string eventName, EventCaptureInfo& capture, const std::string& errMsg); +void ReportStartCaptureEvent(const std::string& eventName, EventCaptureInfo& capture, const std::string& errMsg); std::string CreateMsg(const char *format, ...); } // namespace DistributedHardware diff --git a/common/src/utils/dcamera_hisysevent_adapter.cpp b/common/src/utils/dcamera_hisysevent_adapter.cpp index 411e1d4c..2b9a6d63 100644 --- a/common/src/utils/dcamera_hisysevent_adapter.cpp +++ b/common/src/utils/dcamera_hisysevent_adapter.cpp @@ -35,7 +35,7 @@ const std::string ENUM_ENCODETYPE_STRINGS[] = { }; } -void ReportDcamerInitFail(const std::string eventName, int32_t errCode, const std::string& errMsg) +void ReportDcamerInitFail(const std::string& eventName, int32_t errCode, const std::string& errMsg) { int32_t ret = HiSysEventNameSpace::Write(DOMAIN_STR, eventName, @@ -47,7 +47,7 @@ void ReportDcamerInitFail(const std::string eventName, int32_t errCode, const st } } -void ReportRegisterCameraFail(const std::string eventName, const std::string& devId, const std::string& dhId, +void ReportRegisterCameraFail(const std::string& eventName, const std::string& devId, const std::string& dhId, std::string version, const std::string& errMsg) { int32_t ret = HiSysEventNameSpace::Write(DOMAIN_STR, @@ -63,7 +63,7 @@ void ReportRegisterCameraFail(const std::string eventName, const std::string& de } } -void ReportDcamerOptFail(const std::string eventName, int32_t errCode, const std::string& errMsg) +void ReportDcamerOptFail(const std::string& eventName, int32_t errCode, const std::string& errMsg) { int32_t ret = HiSysEventNameSpace::Write(DOMAIN_STR, eventName, @@ -75,7 +75,7 @@ void ReportDcamerOptFail(const std::string eventName, int32_t errCode, const std } } -void ReportSaEvent(const std::string eventName, int32_t saId, const std::string& errMsg) +void ReportSaEvent(const std::string& eventName, int32_t saId, const std::string& errMsg) { int32_t ret = HiSysEventNameSpace::Write(DOMAIN_STR, eventName, @@ -87,7 +87,7 @@ void ReportSaEvent(const std::string eventName, int32_t saId, const std::string& } } -void ReportRegisterCameraEvent(const std::string eventName, const std::string& devId, const std::string& dhId, +void ReportRegisterCameraEvent(const std::string& eventName, const std::string& devId, const std::string& dhId, std::string version, const std::string& errMsg) { int32_t ret = HiSysEventNameSpace::Write(DOMAIN_STR, @@ -102,7 +102,7 @@ void ReportRegisterCameraEvent(const std::string eventName, const std::string& d } } -void ReportCameraOperaterEvent(const std::string eventName, const std::string& devId, const std::string& dhId, +void ReportCameraOperaterEvent(const std::string& eventName, const std::string& devId, const std::string& dhId, const std::string& errMsg) { int32_t ret = HiSysEventNameSpace::Write(DOMAIN_STR, @@ -116,7 +116,7 @@ void ReportCameraOperaterEvent(const std::string eventName, const std::string& d } } -void ReportStartCaptureEvent(const std::string eventName, EventCaptureInfo& capture, const std::string& errMsg) +void ReportStartCaptureEvent(const std::string& eventName, EventCaptureInfo& capture, const std::string& errMsg) { int32_t ret = HiSysEventNameSpace::Write(DOMAIN_STR, eventName, -- Gitee From 54443bddde37db419543f6917ca53bf4c787a69c Mon Sep 17 00:00:00 2001 From: wangchaole Date: Wed, 21 Sep 2022 09:58:28 +0800 Subject: [PATCH 2/4] fix: modify tdd test Signed-off-by: wangchaole --- .../src/distributedcamera/dcamera_source_hidumper.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/cameraservice/sourceservice/src/distributedcamera/dcamera_source_hidumper.cpp b/services/cameraservice/sourceservice/src/distributedcamera/dcamera_source_hidumper.cpp index 3db25a3a..680e2356 100644 --- a/services/cameraservice/sourceservice/src/distributedcamera/dcamera_source_hidumper.cpp +++ b/services/cameraservice/sourceservice/src/distributedcamera/dcamera_source_hidumper.cpp @@ -128,10 +128,10 @@ int32_t DcameraSourceHidumper::GetCurrentStateInfo(std::string& result) { DHLOGI("GetCurrentStateInfo Dump."); std::map devState = camDumpInfo_.curState; - std::string deviceId(""); - int32_t camState = 0; result.append("CameraId\tState\n"); for (auto it = devState.begin(); it != devState.end(); it++) { + std::string deviceId(""); + int32_t camState = 0; deviceId = it->first; camState = it->second; DHLOGI("GetCurrentStateInfo camState is %d.", camState); -- Gitee From 9e87ccd3f7c2e7a5f945715afa1af866e9c7176a Mon Sep 17 00:00:00 2001 From: wangchaole Date: Thu, 22 Sep 2022 08:46:58 +0800 Subject: [PATCH 3/4] fix: modify tdd test Signed-off-by: wangchaole --- services/channel/src/dcamera_softbus_adapter.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/channel/src/dcamera_softbus_adapter.cpp b/services/channel/src/dcamera_softbus_adapter.cpp index 24a33a93..ae7e0913 100644 --- a/services/channel/src/dcamera_softbus_adapter.cpp +++ b/services/channel/src/dcamera_softbus_adapter.cpp @@ -180,9 +180,9 @@ int32_t DCameraSoftbusAdapter::OpenSoftbusSession(std::string mySessName, std::s attr.dataType = static_cast(dataType); attr.linkTypeNum = DCAMERA_LINK_TYPE_MAX; LinkType linkTypeList[DCAMERA_LINK_TYPE_MAX] = { - LINK_TYPE_WIFI_P2P, - LINK_TYPE_WIFI_WLAN_5G, LINK_TYPE_WIFI_WLAN_2G, + LINK_TYPE_WIFI_WLAN_5G, + LINK_TYPE_WIFI_P2P, LINK_TYPE_BR, }; -- Gitee From ef3ff404553233b070f0f04f84baaee337c19343 Mon Sep 17 00:00:00 2001 From: wangchaole Date: Thu, 22 Sep 2022 10:02:34 +0800 Subject: [PATCH 4/4] fix: modify tdd test Signed-off-by: wangchaole --- services/channel/src/dcamera_softbus_adapter.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/channel/src/dcamera_softbus_adapter.cpp b/services/channel/src/dcamera_softbus_adapter.cpp index ae7e0913..24a33a93 100644 --- a/services/channel/src/dcamera_softbus_adapter.cpp +++ b/services/channel/src/dcamera_softbus_adapter.cpp @@ -180,9 +180,9 @@ int32_t DCameraSoftbusAdapter::OpenSoftbusSession(std::string mySessName, std::s attr.dataType = static_cast(dataType); attr.linkTypeNum = DCAMERA_LINK_TYPE_MAX; LinkType linkTypeList[DCAMERA_LINK_TYPE_MAX] = { - LINK_TYPE_WIFI_WLAN_2G, - LINK_TYPE_WIFI_WLAN_5G, LINK_TYPE_WIFI_P2P, + LINK_TYPE_WIFI_WLAN_5G, + LINK_TYPE_WIFI_WLAN_2G, LINK_TYPE_BR, }; -- Gitee