diff --git a/services/services/screen_capture/server/screen_capture_server.cpp b/services/services/screen_capture/server/screen_capture_server.cpp index 4b0c0c788831e3787afd2b3d684a78c2e3e308ca..34d437dd5c77878ee7925dfa8b2ee31dd144f1c7 100644 --- a/services/services/screen_capture/server/screen_capture_server.cpp +++ b/services/services/screen_capture/server/screen_capture_server.cpp @@ -618,13 +618,13 @@ SCWindowInfoChangedListener::SCWindowInfoChangedListener(std::weak_ptr>& windowInfoList) + const std::vector>& windowInfoList) { MEDIA_LOGI("SCWindowInfoChangedListener::OnWindowInfoChanged start."); auto SCServer = screenCaptureServer_.lock(); CHECK_AND_RETURN_LOG(SCServer != nullptr, "screenCaptureServer is nullptr"); - std::vector> myWindowInfoList = windowInfoList; + std::vector> myWindowInfoList = windowInfoList; if (myWindowInfoList.size() < WINDOW_INFO_LIST_SIZE || SCServer->GetWindowIdList().size() < WINDOW_INFO_LIST_SIZE) { MEDIA_LOGI("myWindowInfoList or windowIdList is invalid."); @@ -634,7 +634,7 @@ void SCWindowInfoChangedListener::OnWindowInfoChanged( MEDIA_LOGI("OnWindowInfoChanged: the displayId of interestWindowId changed!"); auto iter = myWindowInfoList.front().find(WindowInfoKey::DISPLAY_ID); if (iter != myWindowInfoList.front().end()) { - uint64_t displayId = std::any_cast(iter->second); + uint64_t displayId = std::get(iter->second); MEDIA_LOGI("OnWindowInfoChanged: the curDisplayId: %{public}" PRIu64, displayId); SCServer->SetCurDisplayId(displayId); if (displayId == SCServer->GetDefaultDisplayId()) { diff --git a/services/services/screen_capture/server/screen_capture_server_base.h b/services/services/screen_capture/server/screen_capture_server_base.h index fa164ff88d09bfd4351b6a43bf0bd129b3c0b8d6..b24ebe5f7f63691cd1613afd9eba54c2ce2539ba 100644 --- a/services/services/screen_capture/server/screen_capture_server_base.h +++ b/services/services/screen_capture/server/screen_capture_server_base.h @@ -381,7 +381,8 @@ class SCWindowInfoChangedListener : public Rosen::IWindowInfoChangedListener { public: explicit SCWindowInfoChangedListener(std::weak_ptr screenCaptureServer); ~SCWindowInfoChangedListener() override = default; - void OnWindowInfoChanged(const std::vector>& windowInfoList) override; + void OnWindowInfoChanged(const std::vector>& windowInfoList) override; private: std::weak_ptr screenCaptureServer_; diff --git a/test/unittest/screen_capture_test/screen_capture_service_function_unittest/server/src/screen_capture_server_function_unittest_multiInstance.cpp b/test/unittest/screen_capture_test/screen_capture_service_function_unittest/server/src/screen_capture_server_function_unittest_multiInstance.cpp index 79ae092c571de9f2e7653c3d157a4a4d849807f7..8a9541165a450e1447122ffe6cd24bca841f6d5a 100644 --- a/test/unittest/screen_capture_test/screen_capture_service_function_unittest/server/src/screen_capture_server_function_unittest_multiInstance.cpp +++ b/test/unittest/screen_capture_test/screen_capture_service_function_unittest/server/src/screen_capture_server_function_unittest_multiInstance.cpp @@ -1070,7 +1070,7 @@ HWTEST_F(ScreenCaptureServerFunctionTest, OnWindowInfoChanged_001, TestSize.Leve std::weak_ptr screenCaptureServer(screenCaptureServer_); sptr listener(new (std::nothrow) SCWindowInfoChangedListener(screenCaptureServer)); screenCaptureServer_->windowInfoChangedListener_ = listener; - std::vector> myWindowInfoList; + std::vector> myWindowInfoList; screenCaptureServer_->windowIdList_ = {}; screenCaptureServer_->windowInfoChangedListener_->OnWindowInfoChanged(myWindowInfoList); ASSERT_NE(screenCaptureServer_, nullptr); @@ -1085,8 +1085,8 @@ HWTEST_F(ScreenCaptureServerFunctionTest, OnWindowInfoChanged_002, TestSize.Leve screenCaptureServer_->curWindowInDisplayId_ = 0; screenCaptureServer_->displayScreenId_ = 1; screenCaptureServer_->windowInfoChangedListener_->AddInterestInfo(Rosen::WindowInfoKey::DISPLAY_ID); - std::vector> myWindowInfoList; - std::unordered_map myWindowInfo; + std::vector> myWindowInfoList; + std::unordered_map myWindowInfo; myWindowInfo[WindowInfoKey::DISPLAY_ID] = static_cast(1); myWindowInfoList.push_back(myWindowInfo); screenCaptureServer_->windowInfoChangedListener_->OnWindowInfoChanged(myWindowInfoList); @@ -1103,8 +1103,8 @@ HWTEST_F(ScreenCaptureServerFunctionTest, OnWindowInfoChanged_003, TestSize.Leve screenCaptureServer_->curWindowInDisplayId_ = 0; screenCaptureServer_->displayScreenId_ = 999; screenCaptureServer_->windowInfoChangedListener_->AddInterestInfo(Rosen::WindowInfoKey::DISPLAY_ID); - std::vector> myWindowInfoList; - std::unordered_map myWindowInfo; + std::vector> myWindowInfoList; + std::unordered_map myWindowInfo; myWindowInfo[WindowInfoKey::DISPLAY_ID] = static_cast(1); myWindowInfoList.push_back(myWindowInfo); screenCaptureServer_->windowInfoChangedListener_->OnWindowInfoChanged(myWindowInfoList); @@ -1119,8 +1119,8 @@ HWTEST_F(ScreenCaptureServerFunctionTest, OnWindowInfoChanged_004, TestSize.Leve screenCaptureServer_->windowInfoChangedListener_ = listener; screenCaptureServer_->SetWindowIdList(80); screenCaptureServer_->curWindowInDisplayId_ = 0; - std::vector> myWindowInfoList; - std::unordered_map myWindowInfo; + std::vector> myWindowInfoList; + std::unordered_map myWindowInfo; myWindowInfoList.push_back(myWindowInfo); screenCaptureServer_->windowInfoChangedListener_->OnWindowInfoChanged(myWindowInfoList); ASSERT_EQ(screenCaptureServer_->curWindowInDisplayId_, 0);