From 02fa85b830f1234c2769edd03bf40c63f8aa9ad6 Mon Sep 17 00:00:00 2001 From: pwx1285814 Date: Tue, 20 Feb 2024 10:45:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=8F=E6=84=9F=E4=BF=A1=E6=81=AF=E5=8C=BF?= =?UTF-8?q?=E5=90=8D=E5=8C=96=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: pwx1285814 --- .../dscreenmgr/1.0/src/dscreen_manager.cpp | 12 ++++++++---- .../dscreenmgr/2.0/src/dscreen_manager.cpp | 12 ++++++++---- .../dscreenservice/src/dscreen_source_service.cpp | 7 ++++--- 3 files changed, 20 insertions(+), 11 deletions(-) diff --git a/services/screenservice/sourceservice/dscreenmgr/1.0/src/dscreen_manager.cpp b/services/screenservice/sourceservice/dscreenmgr/1.0/src/dscreen_manager.cpp index 574650e4..0e5772e3 100644 --- a/services/screenservice/sourceservice/dscreenmgr/1.0/src/dscreen_manager.cpp +++ b/services/screenservice/sourceservice/dscreenmgr/1.0/src/dscreen_manager.cpp @@ -186,7 +186,8 @@ void DScreenCallback::OnRegResult(const std::shared_ptr &dScreen, return; } DHLOGI("DScreenCallback::OnRegResult, devId: %s, dhId: %s, reqId: %s", - GetAnonyString(dScreen->GetDevId()).c_str(), GetAnonyString(dScreen->GetDHId()).c_str(), reqId.c_str()); + GetAnonyString(dScreen->GetDevId()).c_str(), GetAnonyString(dScreen->GetDHId()).c_str(), + GetAnonyString(reqId).c_str()); DScreenManager::GetInstance().OnRegResult(dScreen, reqId, status, data); } @@ -198,7 +199,8 @@ void DScreenCallback::OnUnregResult(const std::shared_ptr &dScreen, return; } DHLOGI("DScreenCallback::OnUnregResult, devId: %s, dhId: %s, reqId: %s", - GetAnonyString(dScreen->GetDevId()).c_str(), GetAnonyString(dScreen->GetDHId()).c_str(), reqId.c_str()); + GetAnonyString(dScreen->GetDevId()).c_str(), GetAnonyString(dScreen->GetDHId()).c_str(), + GetAnonyString(reqId).c_str()); DScreenManager::GetInstance().OnUnregResult(dScreen, reqId, status, data); } @@ -206,7 +208,8 @@ void DScreenManager::OnRegResult(const std::shared_ptr &dScreen, const std::string &reqId, const int32_t status, const std::string &data) { DHLOGI("DScreenManager::OnRegResult, devId: %s, dhId: %s, reqId: %s", - GetAnonyString(dScreen->GetDevId()).c_str(), GetAnonyString(dScreen->GetDHId()).c_str(), reqId.c_str()); + GetAnonyString(dScreen->GetDevId()).c_str(), GetAnonyString(dScreen->GetDHId()).c_str(), + GetAnonyString(reqId).c_str()); if (dScreenSourceCallbackProxy_ == nullptr) { DHLOGE("dScreenSourceCallbackProxy is null"); return; @@ -218,7 +221,8 @@ void DScreenManager::OnUnregResult(const std::shared_ptr &dScreen, const std::string &reqId, const int32_t status, const std::string &data) { DHLOGI("DScreenManager::OnUnregResult, devId: %s, dhId: %s, reqId: %s", - GetAnonyString(dScreen->GetDevId()).c_str(), GetAnonyString(dScreen->GetDHId()).c_str(), reqId.c_str()); + GetAnonyString(dScreen->GetDevId()).c_str(), GetAnonyString(dScreen->GetDHId()).c_str(), + GetAnonyString(reqId).c_str()); if (dScreenSourceCallbackProxy_ == nullptr) { DHLOGE("dScreenSourceCallbackProxy is null"); return; diff --git a/services/screenservice/sourceservice/dscreenmgr/2.0/src/dscreen_manager.cpp b/services/screenservice/sourceservice/dscreenmgr/2.0/src/dscreen_manager.cpp index a606d2d6..47e0e206 100644 --- a/services/screenservice/sourceservice/dscreenmgr/2.0/src/dscreen_manager.cpp +++ b/services/screenservice/sourceservice/dscreenmgr/2.0/src/dscreen_manager.cpp @@ -181,7 +181,8 @@ void DScreenCallback::OnRegResult(const std::shared_ptr &dScreen, return; } DHLOGI("DScreenCallback::OnRegResult, devId: %s, dhId: %s, reqId: %s", - GetAnonyString(dScreen->GetDevId()).c_str(), GetAnonyString(dScreen->GetDHId()).c_str(), reqId.c_str()); + GetAnonyString(dScreen->GetDevId()).c_str(), GetAnonyString(dScreen->GetDHId()).c_str(), + GetAnonyString(reqId).c_str()); DScreenManager::GetInstance().OnRegResult(dScreen, reqId, status, data); } @@ -193,7 +194,8 @@ void DScreenCallback::OnUnregResult(const std::shared_ptr &dScreen, return; } DHLOGI("DScreenCallback::OnUnregResult, devId: %s, dhId: %s, reqId: %s", - GetAnonyString(dScreen->GetDevId()).c_str(), GetAnonyString(dScreen->GetDHId()).c_str(), reqId.c_str()); + GetAnonyString(dScreen->GetDevId()).c_str(), GetAnonyString(dScreen->GetDHId()).c_str(), + GetAnonyString(reqId).c_str()); DScreenManager::GetInstance().OnUnregResult(dScreen, reqId, status, data); } @@ -201,7 +203,8 @@ void DScreenManager::OnRegResult(const std::shared_ptr &dScreen, const std::string &reqId, int32_t status, const std::string &data) { DHLOGI("DScreenManager::OnRegResult, devId: %s, dhId: %s, reqId: %s", - GetAnonyString(dScreen->GetDevId()).c_str(), GetAnonyString(dScreen->GetDHId()).c_str(), reqId.c_str()); + GetAnonyString(dScreen->GetDevId()).c_str(), GetAnonyString(dScreen->GetDHId()).c_str(), + GetAnonyString(reqId).c_str()); if (dScreenSourceCallbackProxy_ == nullptr) { DHLOGE("dScreenSourceCallbackProxy is null"); return; @@ -213,7 +216,8 @@ void DScreenManager::OnUnregResult(const std::shared_ptr &dScreen, const std::string &reqId, int32_t status, const std::string &data) { DHLOGI("DScreenManager::OnUnregResult, devId: %s, dhId: %s, reqId: %s", - GetAnonyString(dScreen->GetDevId()).c_str(), GetAnonyString(dScreen->GetDHId()).c_str(), reqId.c_str()); + GetAnonyString(dScreen->GetDevId()).c_str(), GetAnonyString(dScreen->GetDHId()).c_str(), + GetAnonyString(reqId).c_str()); if (dScreenSourceCallbackProxy_ == nullptr) { DHLOGE("dScreenSourceCallbackProxy is null"); return; diff --git a/services/screenservice/sourceservice/dscreenservice/src/dscreen_source_service.cpp b/services/screenservice/sourceservice/dscreenservice/src/dscreen_source_service.cpp index 3cab837e..5092f96b 100644 --- a/services/screenservice/sourceservice/dscreenservice/src/dscreen_source_service.cpp +++ b/services/screenservice/sourceservice/dscreenservice/src/dscreen_source_service.cpp @@ -157,7 +157,8 @@ int32_t DScreenSourceService::RegisterDistributedHardware(const std::string &dev } if (ret != DH_SUCCESS) { DHLOGE("enable distributedScreen failed. devId: %s, dhId: %s, reqId: %s, param attrs: %s", - GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str(), reqId.c_str(), param.sinkAttrs.c_str()); + GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str(), GetAnonyString(reqId).c_str(), + param.sinkAttrs.c_str()); ReportRegisterFail(DSCREEN_REGISTER_FAIL, ret, GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str(), "enable distributedScreen failed."); return ERR_DH_SCREEN_SA_ENABLE_FAILED; @@ -171,7 +172,7 @@ int32_t DScreenSourceService::UnregisterDistributedHardware(const std::string &d int ret = V1_0::DScreenManager::GetInstance().DisableDistributedScreen(devId, dhId, reqId); if (ret != DH_SUCCESS) { DHLOGE("V1_0::DScreenManager disable distributedScreen failed. devId: %s, dhId: %s, reqId: %s", - GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str(), reqId.c_str()); + GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str(), GetAnonyString(reqId).c_str()); ReportUnRegisterFail(DSCREEN_REGISTER_FAIL, ret, GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str(), "disable distributedScreen failed."); return ERR_DH_SCREEN_SA_DISABLE_FAILED; @@ -180,7 +181,7 @@ int32_t DScreenSourceService::UnregisterDistributedHardware(const std::string &d ret = V2_0::DScreenManager::GetInstance().DisableDistributedScreen(devId, dhId, reqId); if (ret != DH_SUCCESS) { DHLOGE("V2_0::DScreenManager disable distributedScreen failed. devId: %s, dhId: %s, reqId: %s", - GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str(), reqId.c_str()); + GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str(), GetAnonyString(reqId).c_str()); ReportUnRegisterFail(DSCREEN_REGISTER_FAIL, ret, GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str(), "disable distributedScreen failed."); return ERR_DH_SCREEN_SA_DISABLE_FAILED; -- Gitee