From 6aede14f0b5d9ce94e11d61c2db4b2b4b21d1089 Mon Sep 17 00:00:00 2001 From: gaoqiang_strong Date: Thu, 12 May 2022 14:13:55 +0800 Subject: [PATCH 1/6] screen add dumper Signed-off-by: gaoqiang_strong --- .../include/dscreen_sink_service.h | 1 + .../src/dscreen_sink_service.cpp | 15 +++++++++ .../screenregionmgr/include/screenregion.h | 2 ++ .../screenregionmgr/include/screenregionmgr.h | 1 + .../screenregionmgr/src/screenregion.cpp | 10 ++++++ .../screenregionmgr/src/screenregionmgr.cpp | 32 +++++++++++++++++++ .../dscreenmgr/include/dscreen_manager.h | 1 + .../dscreenmgr/src/dscreen_manager.cpp | 32 +++++++++++++++++++ .../include/dscreen_source_service.h | 1 + .../src/dscreen_source_service.cpp | 14 ++++++++ 10 files changed, 109 insertions(+) diff --git a/services/screenservice/sinkservice/dscreenservice/include/dscreen_sink_service.h b/services/screenservice/sinkservice/dscreenservice/include/dscreen_sink_service.h index a314bacb..6fe7cd17 100644 --- a/services/screenservice/sinkservice/dscreenservice/include/dscreen_sink_service.h +++ b/services/screenservice/sinkservice/dscreenservice/include/dscreen_sink_service.h @@ -35,6 +35,7 @@ public: int32_t SubscribeLocalHardware(const std::string &dhId, const std::string ¶m) override; int32_t UnsubscribeLocalHardware(const std::string &dhId) override; void DScreenNotify(const std::string &devId, int32_t eventCode, const std::string &eventContent) override; + int Dump(int32_t fd, const std::vector& args) override; protected: void OnStart() override; diff --git a/services/screenservice/sinkservice/dscreenservice/src/dscreen_sink_service.cpp b/services/screenservice/sinkservice/dscreenservice/src/dscreen_sink_service.cpp index 020ce954..c0978392 100644 --- a/services/screenservice/sinkservice/dscreenservice/src/dscreen_sink_service.cpp +++ b/services/screenservice/sinkservice/dscreenservice/src/dscreen_sink_service.cpp @@ -100,5 +100,20 @@ void DScreenSinkService::DScreenNotify(const std::string &devId, int32_t eventCo eventCode, eventContent.c_str()); ScreenRegionManager::GetInstance().HandleDScreenNotify(devId, eventCode, eventContent); } + +int DScreenSinkService::Dump(int32_t fd, const std::vector& args) +{ + DHLOGI("DScreenSourceService Dump."); + std::string result; + ScreenRegionManager::GetInstance().GetScreenDumpInfo(result); + int ret = dprintf(fd, "%s\n", result.c_str()); + if (ret < 0) { + DHLOGE("dprintf error"); + return ERR_DH_SCREEN_HIDUMP_ERROR; + } + + return ERR_OK; +} + } // namespace DistributedHardware } // namespace OHOS \ No newline at end of file diff --git a/services/screenservice/sinkservice/screenregionmgr/include/screenregion.h b/services/screenservice/sinkservice/screenregionmgr/include/screenregion.h index 8c400b67..6709424f 100644 --- a/services/screenservice/sinkservice/screenregionmgr/include/screenregion.h +++ b/services/screenservice/sinkservice/screenregionmgr/include/screenregion.h @@ -45,6 +45,8 @@ public: std::string GetRemoteDevId(); uint64_t GetScreenId(); uint64_t GetDisplayId(); + std::shared_ptr GetVideoParam(); + int32_t GetWindowId(); int32_t SetUp(); int32_t Start(); int32_t Stop(); diff --git a/services/screenservice/sinkservice/screenregionmgr/include/screenregionmgr.h b/services/screenservice/sinkservice/screenregionmgr/include/screenregionmgr.h index 65fcd09a..a4fe0f5a 100644 --- a/services/screenservice/sinkservice/screenregionmgr/include/screenregionmgr.h +++ b/services/screenservice/sinkservice/screenregionmgr/include/screenregionmgr.h @@ -31,6 +31,7 @@ DECLARE_SINGLE_INSTANCE_BASE(ScreenRegionManager); public: int32_t ReleaseAllRegions(); void HandleDScreenNotify(const std::string &devId, int32_t eventCode, const std::string &eventContent); + void GetScreenDumpInfo(std::string &result); private: ScreenRegionManager(); diff --git a/services/screenservice/sinkservice/screenregionmgr/src/screenregion.cpp b/services/screenservice/sinkservice/screenregionmgr/src/screenregion.cpp index 93520843..cc3b4e28 100644 --- a/services/screenservice/sinkservice/screenregionmgr/src/screenregion.cpp +++ b/services/screenservice/sinkservice/screenregionmgr/src/screenregion.cpp @@ -73,6 +73,16 @@ std::string ScreenRegion::GetRemoteDevId() return remoteDevId_; } +std::shared_ptr ScreenRegion::GetVideoParam() +{ + return videoParam_; +} + +int32_t ScreenRegion::GetWindowId() +{ + return windowId_; +} + int32_t ScreenRegion::SetUp() { DHLOGI("ScreenRegion::SetUp, remoteDevId: %s", GetAnonyString(remoteDevId_).c_str()); diff --git a/services/screenservice/sinkservice/screenregionmgr/src/screenregionmgr.cpp b/services/screenservice/sinkservice/screenregionmgr/src/screenregionmgr.cpp index 48457eeb..2ef53b42 100644 --- a/services/screenservice/sinkservice/screenregionmgr/src/screenregionmgr.cpp +++ b/services/screenservice/sinkservice/screenregionmgr/src/screenregionmgr.cpp @@ -74,6 +74,38 @@ void ScreenRegionManager::HandleDScreenNotify(const std::string &remoteDevId, in DHLOGE("invalid event."); } +void ScreenRegionManager::GetScreenDumpInfo(std::string &result) +{ + DHLOGI("GetScreenDumpInfo."); + result.clear(); + result.append("screenRegion OnLine:\n[\n"); + if (screenRegions_.size() == 0) { + result.append(" exsit 0 screenRegion\n]"); + DHLOGD("no screenRegion"); + return; + } + + for (const auto &iter : screenRegions_) { + std::shared_ptr screenRegion = iter.second; + if (!screenRegion) { + continue; + } + uint64_t screenId = screenRegion->GetScreenId(); + std::string remoteDevId = screenRegion->GetRemoteDevId(); + std::shared_ptr videoParam = screenRegion->GetVideoParam(); + if (videoParam == nullptr) { + continue; + } + int32_t screenHeight = videoParam->GetScreenHeight(); + int32_t screenWidth = videoParam->GetScreenWidth(); + int32_t windowId = screenRegion->GetWindowId(); + std::string screenInfo = "{ windowId:" + windowId + ", devId:"+ GetAnonyString(devId) + + ", screenWidth:" + screenWidth + ", screenHeight:" + screenHeight + " }\n"; + result.append(screenInfo); + } + result.append("]"); +} + void ScreenRegionManager::HandleNotifySetUp(const std::string &remoteDevId, const std::string &eventContent) { DHLOGI("HandleNotifySetUp, remoteDevId: %s", GetAnonyString(remoteDevId).c_str()); diff --git a/services/screenservice/sourceservice/dscreenmgr/include/dscreen_manager.h b/services/screenservice/sourceservice/dscreenmgr/include/dscreen_manager.h index 9af60db0..67c3cdd2 100644 --- a/services/screenservice/sourceservice/dscreenmgr/include/dscreen_manager.h +++ b/services/screenservice/sourceservice/dscreenmgr/include/dscreen_manager.h @@ -58,6 +58,7 @@ public: void RegisterDScreenCallback(const sptr &callback); void HandleScreenChange(const std::shared_ptr &changedScreen, Rosen::ScreenGroupChangeEvent event); std::shared_ptr FindDScreenByScreenId(uint64_t screenId); + void GetScreenDumpInfo(std::string &result); private: ~DScreenManager(); diff --git a/services/screenservice/sourceservice/dscreenmgr/src/dscreen_manager.cpp b/services/screenservice/sourceservice/dscreenmgr/src/dscreen_manager.cpp index 49812b88..ddc1bc1a 100644 --- a/services/screenservice/sourceservice/dscreenmgr/src/dscreen_manager.cpp +++ b/services/screenservice/sourceservice/dscreenmgr/src/dscreen_manager.cpp @@ -293,6 +293,38 @@ std::shared_ptr DScreenManager::FindDScreenByScreenId(uint64_t screenId return nullptr; } +void DScreenManager::GetScreenDumpInfo(std::string &result) +{ + DHLOGI("GetScreenDumpInfo."); + result.clear(); + result.append("RemoteScreens OnLine:\n[\n"); + if (dScreens_.size() == 0) { + result.append(" exsit 0 virtualScreen\n]"); + DHLOGD("no virtualscreen"); + return; + } + + for (const auto &iter : dScreens_) { + std::shared_ptr dScreen = iter.second; + if (!dScreen) { + continue; + } + uint64_t screenId = dScreen->GetScreenId(); + std::string devId = dScreen->GetDevId(); + std::shared_ptr videoParam = dScreen->GetVideoParam(); + if (videoParam == nullptr) { + continue; + } + int32_t screenHeight = videoParam->GetScreenHeight(); + int32_t screenWidth = videoParam->GetScreenWidth(); + DScreenState state = dScreen->GetState(); + std::string screenInfo = "{ virtualScreenId:" + screenId + ", devId:"+ GetAnonyString(devId) + + ", screenWidth:" + screenWidth + ", screenHeight:" + screenHeight + ", state:" + state + " }\n"; + result.append(screenInfo); + } + result.append("]"); +} + void DScreenManager::HandleDScreenNotify(const std::string &devId, int32_t eventCode, const std::string &eventContent) { diff --git a/services/screenservice/sourceservice/dscreenservice/include/dscreen_source_service.h b/services/screenservice/sourceservice/dscreenservice/include/dscreen_source_service.h index d66e1859..415673d0 100644 --- a/services/screenservice/sourceservice/dscreenservice/include/dscreen_source_service.h +++ b/services/screenservice/sourceservice/dscreenservice/include/dscreen_source_service.h @@ -40,6 +40,7 @@ public: int32_t ConfigDistributedHardware(const std::string &devId, const std::string &dhId, const std::string &key, const std::string &value) override; void DScreenNotify(const std::string &devId, const int32_t eventCode, const std::string &eventContent) override; + int Dump(int32_t fd, const std::vector& args) override; protected: void OnStart() override; diff --git a/services/screenservice/sourceservice/dscreenservice/src/dscreen_source_service.cpp b/services/screenservice/sourceservice/dscreenservice/src/dscreen_source_service.cpp index 3a7c561d..fa4eda68 100644 --- a/services/screenservice/sourceservice/dscreenservice/src/dscreen_source_service.cpp +++ b/services/screenservice/sourceservice/dscreenservice/src/dscreen_source_service.cpp @@ -141,5 +141,19 @@ void DScreenSourceService::DScreenNotify(const std::string &devId, const int32_t DHLOGI("DScreenNotify, devId: %s, eventCode: %d", GetAnonyString(devId).c_str(), eventCode); DScreenManager::GetInstance().HandleDScreenNotify(devId, eventCode, eventContent); } + +int DScreenSourceService::Dump(int32_t fd, const std::vector& args) +{ + DHLOGI("DScreenSourceService Dump."); + std::string result; + DScreenManager::GetInstance().GetScreenDumpInfo(result); + int ret = dprintf(fd, "%s\n", result.c_str()); + if (ret < 0) { + DHLOGE("dprintf error"); + return ERR_DH_SCREEN_HIDUMP_ERROR; + } + + return ERR_OK; +} } // namespace DistributedHardware } // namespace OHOS \ No newline at end of file -- Gitee From f0ec50a98b4d8dcb104f12b87408a892220e2355 Mon Sep 17 00:00:00 2001 From: gaoqiang_strong Date: Thu, 12 May 2022 19:01:21 +0800 Subject: [PATCH 2/6] screen add dumper Signed-off-by: gaoqiang_strong --- common/include/dscreen_errcode.h | 1 + .../sinkservice/dscreenservice/src/dscreen_sink_service.cpp | 2 +- .../sinkservice/screenregionmgr/src/screenregionmgr.cpp | 5 +++-- .../sourceservice/dscreenmgr/src/dscreen_manager.cpp | 5 +++-- .../dscreenservice/src/dscreen_source_service.cpp | 2 +- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/common/include/dscreen_errcode.h b/common/include/dscreen_errcode.h index 987e9195..95fd5c3f 100644 --- a/common/include/dscreen_errcode.h +++ b/common/include/dscreen_errcode.h @@ -54,6 +54,7 @@ enum DScreenErrorCode { ERR_DH_SCREEN_SA_UNREGISTER_SCREENLISTENER_FAIL = -500030, ERR_DH_SCREEN_SA_DSCREEN_NEGOTIATE_CODEC_FAIL = -500031, ERR_DH_SCREEN_SA_LOAD_TIMEOUT = -500032, + ERR_DH_SCREEN_SA_HIDUMPER_ERROR = -500033, // Transport component error code ERR_DH_SCREEN_TRANS_ERROR = -51000, ERR_DH_SCREEN_TRANS_TIMEOUT = -51001, diff --git a/services/screenservice/sinkservice/dscreenservice/src/dscreen_sink_service.cpp b/services/screenservice/sinkservice/dscreenservice/src/dscreen_sink_service.cpp index c0978392..5df0f0e0 100644 --- a/services/screenservice/sinkservice/dscreenservice/src/dscreen_sink_service.cpp +++ b/services/screenservice/sinkservice/dscreenservice/src/dscreen_sink_service.cpp @@ -109,7 +109,7 @@ int DScreenSinkService::Dump(int32_t fd, const std::vector& args int ret = dprintf(fd, "%s\n", result.c_str()); if (ret < 0) { DHLOGE("dprintf error"); - return ERR_DH_SCREEN_HIDUMP_ERROR; + return ERR_DH_SCREEN_SA_HIDUMPER_ERROR; } return ERR_OK; diff --git a/services/screenservice/sinkservice/screenregionmgr/src/screenregionmgr.cpp b/services/screenservice/sinkservice/screenregionmgr/src/screenregionmgr.cpp index 2ef53b42..a001a901 100644 --- a/services/screenservice/sinkservice/screenregionmgr/src/screenregionmgr.cpp +++ b/services/screenservice/sinkservice/screenregionmgr/src/screenregionmgr.cpp @@ -99,8 +99,9 @@ void ScreenRegionManager::GetScreenDumpInfo(std::string &result) int32_t screenHeight = videoParam->GetScreenHeight(); int32_t screenWidth = videoParam->GetScreenWidth(); int32_t windowId = screenRegion->GetWindowId(); - std::string screenInfo = "{ windowId:" + windowId + ", devId:"+ GetAnonyString(devId) + - ", screenWidth:" + screenWidth + ", screenHeight:" + screenHeight + " }\n"; + std::string screenInfo = " { windowId:" + std::to_string(windowId) + "screenId:" + std::to_string(screenId) + + " | devId:"+ GetAnonyString(remoteDevId) + " | screenWidth:" + std::to_string(screenWidth) + + " | screenHeight:" + std::to_string(screenHeight) + " }\n"; result.append(screenInfo); } result.append("]"); diff --git a/services/screenservice/sourceservice/dscreenmgr/src/dscreen_manager.cpp b/services/screenservice/sourceservice/dscreenmgr/src/dscreen_manager.cpp index ddc1bc1a..68cbf219 100644 --- a/services/screenservice/sourceservice/dscreenmgr/src/dscreen_manager.cpp +++ b/services/screenservice/sourceservice/dscreenmgr/src/dscreen_manager.cpp @@ -318,8 +318,9 @@ void DScreenManager::GetScreenDumpInfo(std::string &result) int32_t screenHeight = videoParam->GetScreenHeight(); int32_t screenWidth = videoParam->GetScreenWidth(); DScreenState state = dScreen->GetState(); - std::string screenInfo = "{ virtualScreenId:" + screenId + ", devId:"+ GetAnonyString(devId) + - ", screenWidth:" + screenWidth + ", screenHeight:" + screenHeight + ", state:" + state + " }\n"; + std::string screenInfo = " { virtualScreenId:" + std::to_string(screenId) + + " | devId:"+ GetAnonyString(devId) + " | screenWidth:" + std::to_string(screenWidth) + + " | screenHeight:" + std::to_string(screenHeight) + " | state:" + std::to_string(state) + " }\n"; result.append(screenInfo); } result.append("]"); diff --git a/services/screenservice/sourceservice/dscreenservice/src/dscreen_source_service.cpp b/services/screenservice/sourceservice/dscreenservice/src/dscreen_source_service.cpp index fa4eda68..5d718237 100644 --- a/services/screenservice/sourceservice/dscreenservice/src/dscreen_source_service.cpp +++ b/services/screenservice/sourceservice/dscreenservice/src/dscreen_source_service.cpp @@ -150,7 +150,7 @@ int DScreenSourceService::Dump(int32_t fd, const std::vector& ar int ret = dprintf(fd, "%s\n", result.c_str()); if (ret < 0) { DHLOGE("dprintf error"); - return ERR_DH_SCREEN_HIDUMP_ERROR; + return ERR_DH_SCREEN_SA_HIDUMPER_ERROR; } return ERR_OK; -- Gitee From 0b57745616c6b737418e3ba7a0257cf5abcc9288 Mon Sep 17 00:00:00 2001 From: gaoqiang_strong Date: Fri, 13 May 2022 11:44:43 +0800 Subject: [PATCH 3/6] screen add dumper Signed-off-by: gaoqiang_strong --- .../screenregionmgr/include/screenregionmgr.h | 1 + .../screenregionmgr/src/screenregionmgr.cpp | 11 ++++++-- .../dscreenmgr/include/dscreen_manager.h | 1 + .../dscreenmgr/src/dscreen_manager.cpp | 28 ++++++++++++++++--- 4 files changed, 34 insertions(+), 7 deletions(-) diff --git a/services/screenservice/sinkservice/screenregionmgr/include/screenregionmgr.h b/services/screenservice/sinkservice/screenregionmgr/include/screenregionmgr.h index a4fe0f5a..89912f0a 100644 --- a/services/screenservice/sinkservice/screenregionmgr/include/screenregionmgr.h +++ b/services/screenservice/sinkservice/screenregionmgr/include/screenregionmgr.h @@ -38,6 +38,7 @@ private: ~ScreenRegionManager(); std::map> screenRegions_; std::mutex screenRegionsMtx_; + std::string localDevId_; sptr GetDScreenSourceSA(const std::string &devId); int32_t NotifyRemoteScreenService(const std::string &remoteDevId, const std::string &dhId, diff --git a/services/screenservice/sinkservice/screenregionmgr/src/screenregionmgr.cpp b/services/screenservice/sinkservice/screenregionmgr/src/screenregionmgr.cpp index a001a901..1fa3dc24 100644 --- a/services/screenservice/sinkservice/screenregionmgr/src/screenregionmgr.cpp +++ b/services/screenservice/sinkservice/screenregionmgr/src/screenregionmgr.cpp @@ -86,6 +86,7 @@ void ScreenRegionManager::GetScreenDumpInfo(std::string &result) } for (const auto &iter : screenRegions_) { + result.append(" {\n"); std::shared_ptr screenRegion = iter.second; if (!screenRegion) { continue; @@ -99,9 +100,12 @@ void ScreenRegionManager::GetScreenDumpInfo(std::string &result) int32_t screenHeight = videoParam->GetScreenHeight(); int32_t screenWidth = videoParam->GetScreenWidth(); int32_t windowId = screenRegion->GetWindowId(); - std::string screenInfo = " { windowId:" + std::to_string(windowId) + "screenId:" + std::to_string(screenId) + - " | devId:"+ GetAnonyString(remoteDevId) + " | screenWidth:" + std::to_string(screenWidth) + - " | screenHeight:" + std::to_string(screenHeight) + " }\n"; + std::string screenInfo = " \"clientWindowId\" : \"" + std::to_string(windowId) + "\",\n" + + " \"remoteScreenId\" : \"" + std::to_string(screenId) + "\",\n" + + " \"localDevId\" : \"" + GetAnonyString(localDevId_) + "\",\n" + + " \"remoteDevId\" : \"" + GetAnonyString(remoteDevId) + "\",\n" + + " \"screenWidth\" : \"" + std::to_string(screenWidth) + "\",\n" + + " \"screenHeight\" : \"" + std::to_string(screenHeight) + "\"\n}\n"; result.append(screenInfo); } result.append("]"); @@ -202,6 +206,7 @@ int32_t ScreenRegionManager::NotifyRemoteScreenService(const std::string &remote DHLOGE("notify remote screen service failed, cannot get local device id"); return ret; } + localDevId_ = localDevId; remoteSourceSA->DScreenNotify(localDevId, eventCode, eventContent); return DH_SUCCESS; } diff --git a/services/screenservice/sourceservice/dscreenmgr/include/dscreen_manager.h b/services/screenservice/sourceservice/dscreenmgr/include/dscreen_manager.h index 67c3cdd2..3d951763 100644 --- a/services/screenservice/sourceservice/dscreenmgr/include/dscreen_manager.h +++ b/services/screenservice/sourceservice/dscreenmgr/include/dscreen_manager.h @@ -70,6 +70,7 @@ private: sptr dScreenSourceCallbackProxy_ = nullptr; sptr dScreenGroupListener_ = nullptr; std::shared_ptr dScreenCallback_ = nullptr; + std::string localDevId_; sptr GetDScreenSinkSA(const std::string &devId); int32_t NotifyRemoteScreenService(const std::string &devId, int32_t eventCode, const std::string &eventContent); diff --git a/services/screenservice/sourceservice/dscreenmgr/src/dscreen_manager.cpp b/services/screenservice/sourceservice/dscreenmgr/src/dscreen_manager.cpp index 68cbf219..68452b49 100644 --- a/services/screenservice/sourceservice/dscreenmgr/src/dscreen_manager.cpp +++ b/services/screenservice/sourceservice/dscreenmgr/src/dscreen_manager.cpp @@ -15,6 +15,8 @@ #include "dscreen_manager.h" +#include + #include "if_system_ability_manager.h" #include "iservice_registry.h" #include "nlohmann/json.hpp" @@ -31,6 +33,17 @@ using json = nlohmann::json; namespace OHOS { namespace DistributedHardware { IMPLEMENT_SINGLE_INSTANCE(DScreenManager); + +const std::map stateMap = { + { DISABLED, "disabled" }, + { ENABLED, "enabled" }, + { DISABLING, "disabling" }, + { ENABLING, "enabling" }, + { CONNECTING, "connecting" }, + { CONNECTED, "connected" }, + { DISCONNECTING, "disconnecting" } +}; + DScreenManager::DScreenManager() { DHLOGI("DScreenMgr construct."); @@ -299,12 +312,13 @@ void DScreenManager::GetScreenDumpInfo(std::string &result) result.clear(); result.append("RemoteScreens OnLine:\n[\n"); if (dScreens_.size() == 0) { - result.append(" exsit 0 virtualScreen\n]"); + result.append("]"); DHLOGD("no virtualscreen"); return; } for (const auto &iter : dScreens_) { + result.append(" {\n"); std::shared_ptr dScreen = iter.second; if (!dScreen) { continue; @@ -318,9 +332,14 @@ void DScreenManager::GetScreenDumpInfo(std::string &result) int32_t screenHeight = videoParam->GetScreenHeight(); int32_t screenWidth = videoParam->GetScreenWidth(); DScreenState state = dScreen->GetState(); - std::string screenInfo = " { virtualScreenId:" + std::to_string(screenId) + - " | devId:"+ GetAnonyString(devId) + " | screenWidth:" + std::to_string(screenWidth) + - " | screenHeight:" + std::to_string(screenHeight) + " | state:" + std::to_string(state) + " }\n"; + std::string screenState = + stateMap.find(state) == stateMap.end() ? "unknown state" : stateMap.find(state)->second; + std::string screenInfo = " \"virtualScreenId\" : \"" + std::to_string(screenId) + "\",\n" + + " \"localDevId\" : \"" + GetAnonyString(localDevId_) + "\",\n" + + " \"remoteDevId\" : \"" + GetAnonyString(devId) + "\",\n" + + " \"screenWidth\" : \"" + std::to_string(screenWidth) + "\",\n" + + " \"screenHeight\" : \"" + std::to_string(screenHeight) + "\",\n" + + " \"state\" : \"" + screenState + "\"\n}\n"; result.append(screenInfo); } result.append("]"); @@ -354,6 +373,7 @@ int32_t DScreenManager::NotifyRemoteScreenService(const std::string &devId, int3 DHLOGE("notify remote screen service failed, cannot get local device id"); return ret; } + localDevId_ = localDevId; remoteSinkSA->DScreenNotify(localDevId, eventCode, eventContent); return DH_SUCCESS; } -- Gitee From 2b6112b52842d690557bc92e1e3708d39c65a930 Mon Sep 17 00:00:00 2001 From: gaoqiang_strong Date: Fri, 13 May 2022 11:49:29 +0800 Subject: [PATCH 4/6] modify data format Signed-off-by: gaoqiang_strong --- .../sinkservice/screenregionmgr/src/screenregionmgr.cpp | 4 ++-- .../sourceservice/dscreenmgr/src/dscreen_manager.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/services/screenservice/sinkservice/screenregionmgr/src/screenregionmgr.cpp b/services/screenservice/sinkservice/screenregionmgr/src/screenregionmgr.cpp index 1fa3dc24..e55e34ae 100644 --- a/services/screenservice/sinkservice/screenregionmgr/src/screenregionmgr.cpp +++ b/services/screenservice/sinkservice/screenregionmgr/src/screenregionmgr.cpp @@ -105,10 +105,10 @@ void ScreenRegionManager::GetScreenDumpInfo(std::string &result) " \"localDevId\" : \"" + GetAnonyString(localDevId_) + "\",\n" + " \"remoteDevId\" : \"" + GetAnonyString(remoteDevId) + "\",\n" + " \"screenWidth\" : \"" + std::to_string(screenWidth) + "\",\n" + - " \"screenHeight\" : \"" + std::to_string(screenHeight) + "\"\n}\n"; + " \"screenHeight\" : \"" + std::to_string(screenHeight) + "\"\n"; result.append(screenInfo); } - result.append("]"); + result.append(" }\n]"); } void ScreenRegionManager::HandleNotifySetUp(const std::string &remoteDevId, const std::string &eventContent) diff --git a/services/screenservice/sourceservice/dscreenmgr/src/dscreen_manager.cpp b/services/screenservice/sourceservice/dscreenmgr/src/dscreen_manager.cpp index 68452b49..b7c93753 100644 --- a/services/screenservice/sourceservice/dscreenmgr/src/dscreen_manager.cpp +++ b/services/screenservice/sourceservice/dscreenmgr/src/dscreen_manager.cpp @@ -339,10 +339,10 @@ void DScreenManager::GetScreenDumpInfo(std::string &result) " \"remoteDevId\" : \"" + GetAnonyString(devId) + "\",\n" + " \"screenWidth\" : \"" + std::to_string(screenWidth) + "\",\n" + " \"screenHeight\" : \"" + std::to_string(screenHeight) + "\",\n" + - " \"state\" : \"" + screenState + "\"\n}\n"; + " \"state\" : \"" + screenState + "\"\n"; result.append(screenInfo); } - result.append("]"); + result.append(" }\n]"); } void DScreenManager::HandleDScreenNotify(const std::string &devId, int32_t eventCode, -- Gitee From b8e81aa95fdd334a5a9a3ddfa3485e7d40f0b363 Mon Sep 17 00:00:00 2001 From: gaoqiang_strong Date: Fri, 13 May 2022 16:21:08 +0800 Subject: [PATCH 5/6] modify format Signed-off-by: gaoqiang_strong --- .../sinkservice/dscreenservice/src/dscreen_sink_service.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/services/screenservice/sinkservice/dscreenservice/src/dscreen_sink_service.cpp b/services/screenservice/sinkservice/dscreenservice/src/dscreen_sink_service.cpp index 5df0f0e0..94aabb65 100644 --- a/services/screenservice/sinkservice/dscreenservice/src/dscreen_sink_service.cpp +++ b/services/screenservice/sinkservice/dscreenservice/src/dscreen_sink_service.cpp @@ -114,6 +114,5 @@ int DScreenSinkService::Dump(int32_t fd, const std::vector& args return ERR_OK; } - } // namespace DistributedHardware } // namespace OHOS \ No newline at end of file -- Gitee From 63428cae2f02fb5f252e07532cc1376a209a19e2 Mon Sep 17 00:00:00 2001 From: gaoqiang Date: Fri, 13 May 2022 10:30:18 +0000 Subject: [PATCH 6/6] update services/screenservice/sinkservice/screenregionmgr/src/screenregionmgr.cpp. modify data format --- .../sinkservice/screenregionmgr/src/screenregionmgr.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/screenservice/sinkservice/screenregionmgr/src/screenregionmgr.cpp b/services/screenservice/sinkservice/screenregionmgr/src/screenregionmgr.cpp index e55e34ae..7969d524 100644 --- a/services/screenservice/sinkservice/screenregionmgr/src/screenregionmgr.cpp +++ b/services/screenservice/sinkservice/screenregionmgr/src/screenregionmgr.cpp @@ -80,7 +80,7 @@ void ScreenRegionManager::GetScreenDumpInfo(std::string &result) result.clear(); result.append("screenRegion OnLine:\n[\n"); if (screenRegions_.size() == 0) { - result.append(" exsit 0 screenRegion\n]"); + result.append("]"); DHLOGD("no screenRegion"); return; } -- Gitee