diff --git a/screenhandler/src/dscreen_handler.cpp b/screenhandler/src/dscreen_handler.cpp index 58d4b409ffe0d46ebf7c5ada48b00c0c5ef51cb7..018d2909e2554652a9ffb67b2afa6f87b49bd8e3 100644 --- a/screenhandler/src/dscreen_handler.cpp +++ b/screenhandler/src/dscreen_handler.cpp @@ -48,8 +48,8 @@ int32_t DScreenHandler::Initialize() if (screenListener_ == nullptr) { screenListener_ = new (std::nothrow) ScreenListener(); } - bool ret = Rosen::ScreenManager::GetInstance().RegisterScreenListener(screenListener_); - if (!ret) { + Rosen::DMError ret = Rosen::ScreenManager::GetInstance().RegisterScreenListener(screenListener_); + if (ret != Rosen::DMError::DM_OK) { DHLOGE("register screen listener failed."); return DSCREEN_INIT_ERR; } @@ -110,7 +110,8 @@ std::vector DScreenHandler::Query() { DHLOGI("DScreenHandler query hardware info"); std::vector dhItemVec; - std::vector> screens = Rosen::ScreenManager::GetInstance().GetAllScreens(); + std::vector> screens; + Rosen::ScreenManager::GetInstance().GetAllScreens(screens); DHLOGI("screens size is: %" PRId32, screens.size()); for (const auto &screen : screens) { if (screen == nullptr) { @@ -182,7 +183,7 @@ std::string DScreenHandler::QueryCodecInfo() } std::vector> caps = codecList->GetVideoEncoderCaps(); json codecTypeArray = json::array(); - + for (const auto &cap : caps) { if (cap == nullptr) { continue; diff --git a/services/screendemo/test.cpp b/services/screendemo/test.cpp index 527055198904f1d8e51512e360dce6923cae29e3..29102b96f08be456d7dbc879b4e9b25388a5dfb6 100644 --- a/services/screendemo/test.cpp +++ b/services/screendemo/test.cpp @@ -53,7 +53,8 @@ namespace { vector> QueryRemoteScreenInfo() { - vector> allScreens = ScreenManager::GetInstance().GetAllScreens(); + vector> allScreens; + ScreenManager::GetInstance().GetAllScreens(allScreens); sptr defaultDisplay = DisplayManager::GetInstance().GetDefaultDisplay(); vector> remoteScreens; for (const auto &screen : allScreens) { diff --git a/services/screenservice/sourceservice/dscreenmgr/src/screen_manager_adapter.cpp b/services/screenservice/sourceservice/dscreenmgr/src/screen_manager_adapter.cpp index 0522751209bb6013530af18a16ef598bdc7b7c90..cb003f185dc9cd446b0b367498277c4af60ec407 100644 --- a/services/screenservice/sourceservice/dscreenmgr/src/screen_manager_adapter.cpp +++ b/services/screenservice/sourceservice/dscreenmgr/src/screen_manager_adapter.cpp @@ -85,8 +85,8 @@ int32_t ScreenMgrAdapter::RegisterScreenGroupListener(sptr