From 769ecade8ca229f108a59d02af149c3a764d9ae5 Mon Sep 17 00:00:00 2001
From: ac__fancheyu <liuyangyang58@huawei.com>
Date: Fri, 13 Jan 2023 10:36:39 +0800
Subject: [PATCH] errorcode change

Signed-off-by: ac__fancheyu <liuyangyang58@huawei.com>
Change-Id: Iaf7108b79d1864a6eb2672fddc7cd36776ea6dfa
---
 screenhandler/src/dscreen_handler.cpp                    | 9 +++++----
 services/screendemo/test.cpp                             | 9 ++++++---
 .../dscreenmgr/src/screen_manager_adapter.cpp            | 8 ++++----
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/screenhandler/src/dscreen_handler.cpp b/screenhandler/src/dscreen_handler.cpp
index 58d4b409..018d2909 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<DHItem> DScreenHandler::Query()
 {
     DHLOGI("DScreenHandler query hardware info");
     std::vector<DHItem> dhItemVec;
-    std::vector<sptr<Rosen::Screen>> screens = Rosen::ScreenManager::GetInstance().GetAllScreens();
+    std::vector<sptr<Rosen::Screen>> 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<std::shared_ptr<Media::VideoCaps>> 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 560df087..4430e704 100644
--- a/services/screendemo/test.cpp
+++ b/services/screendemo/test.cpp
@@ -55,7 +55,8 @@ namespace {
 
 vector<sptr<Screen>> QueryRemoteScreenInfo()
 {
-    vector<sptr<Screen>> allScreens = ScreenManager::GetInstance().GetAllScreens();
+    vector<sptr<Screen>> allScreens;
+    ScreenManager::GetInstance().GetAllScreens(allScreens);
     sptr<Display> defaultDisplay = DisplayManager::GetInstance().GetDefaultDisplay();
     vector<sptr<Screen>> remoteScreens;
     for (const auto &screen : allScreens) {
@@ -115,7 +116,8 @@ static void StartMirror()
     cout << "mirror screen Id is " << mirrorId << endl;
     vector<uint64_t> mirrorIds;
     mirrorIds.push_back(mirrorId);
-    ScreenManager::GetInstance().MakeMirror(defaultDisplay->GetScreenId(), mirrorIds);
+    ScreenId screenGroupId;
+    ScreenManager::GetInstance().MakeMirror(defaultDisplay->GetScreenId(), mirrorIds, screenGroupId);
 }
 
 static void StopMirror()
@@ -184,7 +186,8 @@ static void StartExpand()
     cout << endl << "------------start expand----------" << endl;
     cout << "expand screen Id is " << expandId << endl;
     vector<ExpandOption> options = {{defaultDisplay->GetScreenId(), 0, 0}, {expandId, defaultDisplay->GetWidth(), 0}};
-    ScreenManager::GetInstance().MakeExpand(options);
+    ScreenId screenGroupId;
+    ScreenManager::GetInstance().MakeExpand(options, screenGroupId);
 }
 
 static void StopExpand()
diff --git a/services/screenservice/sourceservice/dscreenmgr/src/screen_manager_adapter.cpp b/services/screenservice/sourceservice/dscreenmgr/src/screen_manager_adapter.cpp
index 05227512..cb003f18 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<Rosen::ScreenManager:
         DHLOGI("already registered listener.");
         return DH_SUCCESS;
     }
-    bool ret = Rosen::ScreenManager::GetInstance().RegisterScreenGroupListener(listener);
-    if (!ret) {
+    Rosen::DMError ret = Rosen::ScreenManager::GetInstance().RegisterScreenGroupListener(listener);
+    if (ret != Rosen::DMError::DM_OK) {
         DHLOGE("RegisterScreenGroupListener Failed.");
         return ERR_DH_SCREEN_SA_REGISTER_SCREENLISTENER_FAIL;
     }
@@ -105,8 +105,8 @@ int32_t ScreenMgrAdapter::UnregisterScreenGroupListener(sptr<Rosen::ScreenManage
         DHLOGI("listener already unregistered.");
         return DH_SUCCESS;
     }
-    bool ret = Rosen::ScreenManager::GetInstance().UnregisterScreenGroupListener(listener);
-    if (!ret) {
+    Rosen::DMError ret = Rosen::ScreenManager::GetInstance().UnregisterScreenGroupListener(listener);
+    if (ret != Rosen::DMError::DM_OK) {
         DHLOGE("UnregisterScreenGroupListener Failed.");
         return ERR_DH_SCREEN_SA_UNREGISTER_SCREENLISTENER_FAIL;
     }
-- 
Gitee