From c92f0044f140cfbfe0d17a9725eae4448119d6c1 Mon Sep 17 00:00:00 2001 From: tangrui Date: Tue, 4 Mar 2025 15:12:22 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E4=BB=8E=E5=A4=A7=E6=A1=8C=E9=9D=A2?= =?UTF-8?q?=E6=8B=BF=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: tangrui --- .../include/scene_session_manager.h | 1 + .../src/scene_session_manager.cpp | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/window_scene/session_manager/include/scene_session_manager.h b/window_scene/session_manager/include/scene_session_manager.h index c60919481f..cc9b9e640f 100644 --- a/window_scene/session_manager/include/scene_session_manager.h +++ b/window_scene/session_manager/include/scene_session_manager.h @@ -1309,6 +1309,7 @@ private: NotifyAppUseControlListFunc notifyAppUseControlListFunc_; std::unordered_map visibleWindowCountMap_ GUARDED_BY(SCENE_GUARD); std::unordered_set sessionLockedStateCacheSet_; + bool GetIconFromDesk(const SessionInfo& sessionInfo, std::string& startupPagePath); /* * Window Pattern diff --git a/window_scene/session_manager/src/scene_session_manager.cpp b/window_scene/session_manager/src/scene_session_manager.cpp index c0226724cc..9425b242fd 100644 --- a/window_scene/session_manager/src/scene_session_manager.cpp +++ b/window_scene/session_manager/src/scene_session_manager.cpp @@ -4270,8 +4270,27 @@ bool SceneSessionManager::GetStartupPageFromResource(const AppExecFwk::AbilityIn return true; } +bool SceneSessionManager::GetIconFromDesk(const SessionInfo& sessionInfo, std::string& startupPagePath) +{ + auto& want = sessionInfo.want; + if (want == nullptr) { + TLOGI(WmsLogTag::DEFAULT, "want is nullPtr"); + return false; + } + startupPagePath = want->GetStringParam("realAppIcon"); + if (std::string() == startupPagePath) { + return false; + } + return true; +} + void SceneSessionManager::GetStartupPage(const SessionInfo& sessionInfo, std::string& path, uint32_t& bgColor) { + if (GetIconFromDesk(sessionInfo, path)) { + TLOGI(WmsLogTag::DEFAULT, "get GetStartupPage from desk suc"); + return; + } + if (!bundleMgr_) { TLOGE(WmsLogTag::WMS_PATTERN, "bundleMgr_ is nullptr."); return; -- Gitee From 49c55862d46b36eb6e7dd06ae16537f2577624dc Mon Sep 17 00:00:00 2001 From: tangrui Date: Thu, 6 Mar 2025 19:55:23 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E6=A0=B9=E6=8D=AEreview=E6=84=8F=E8=A7=81?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: tangrui --- .../session_manager/include/scene_session_manager.h | 2 +- window_scene/session_manager/src/scene_session_manager.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/window_scene/session_manager/include/scene_session_manager.h b/window_scene/session_manager/include/scene_session_manager.h index cc9b9e640f..6b86c9cbd8 100644 --- a/window_scene/session_manager/include/scene_session_manager.h +++ b/window_scene/session_manager/include/scene_session_manager.h @@ -1309,13 +1309,13 @@ private: NotifyAppUseControlListFunc notifyAppUseControlListFunc_; std::unordered_map visibleWindowCountMap_ GUARDED_BY(SCENE_GUARD); std::unordered_set sessionLockedStateCacheSet_; - bool GetIconFromDesk(const SessionInfo& sessionInfo, std::string& startupPagePath); /* * Window Pattern */ std::unique_ptr snapshotLruCache_; std::size_t snapshotCapacity_ = 0; + bool GetIconFromDesk(const SessionInfo& sessionInfo, std::string& startupPagePath); }; } // namespace OHOS::Rosen diff --git a/window_scene/session_manager/src/scene_session_manager.cpp b/window_scene/session_manager/src/scene_session_manager.cpp index 9425b242fd..6f33f965d6 100644 --- a/window_scene/session_manager/src/scene_session_manager.cpp +++ b/window_scene/session_manager/src/scene_session_manager.cpp @@ -4274,11 +4274,11 @@ bool SceneSessionManager::GetIconFromDesk(const SessionInfo& sessionInfo, std::s { auto& want = sessionInfo.want; if (want == nullptr) { - TLOGI(WmsLogTag::DEFAULT, "want is nullPtr"); + TLOGI(WmsLogTag::WMS_PATTERN, "want is nullPtr"); return false; } startupPagePath = want->GetStringParam("realAppIcon"); - if (std::string() == startupPagePath) { + if (startupPagePath.empty()) { return false; } return true; @@ -4287,7 +4287,7 @@ bool SceneSessionManager::GetIconFromDesk(const SessionInfo& sessionInfo, std::s void SceneSessionManager::GetStartupPage(const SessionInfo& sessionInfo, std::string& path, uint32_t& bgColor) { if (GetIconFromDesk(sessionInfo, path)) { - TLOGI(WmsLogTag::DEFAULT, "get GetStartupPage from desk suc"); + TLOGI(WmsLogTag::WMS_PATTERN, "get from desk suc"); return; } -- Gitee From d60aeaf8b6c37c60c47c9c7ebf6da8300020b678 Mon Sep 17 00:00:00 2001 From: tangrui Date: Mon, 10 Mar 2025 16:32:29 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A3=80=E8=A7=86?= =?UTF-8?q?=E6=84=8F=E8=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: tangrui --- window_scene/session_manager/include/scene_session_manager.h | 2 +- window_scene/session_manager/src/scene_session_manager.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/window_scene/session_manager/include/scene_session_manager.h b/window_scene/session_manager/include/scene_session_manager.h index 6b86c9cbd8..eba62a4c8d 100644 --- a/window_scene/session_manager/include/scene_session_manager.h +++ b/window_scene/session_manager/include/scene_session_manager.h @@ -1315,7 +1315,7 @@ private: */ std::unique_ptr snapshotLruCache_; std::size_t snapshotCapacity_ = 0; - bool GetIconFromDesk(const SessionInfo& sessionInfo, std::string& startupPagePath); + const bool GetIconFromDesk(const SessionInfo& sessionInfo, std::string& startupPagePath); }; } // namespace OHOS::Rosen diff --git a/window_scene/session_manager/src/scene_session_manager.cpp b/window_scene/session_manager/src/scene_session_manager.cpp index 6f33f965d6..0b91c96f1e 100644 --- a/window_scene/session_manager/src/scene_session_manager.cpp +++ b/window_scene/session_manager/src/scene_session_manager.cpp @@ -4270,7 +4270,7 @@ bool SceneSessionManager::GetStartupPageFromResource(const AppExecFwk::AbilityIn return true; } -bool SceneSessionManager::GetIconFromDesk(const SessionInfo& sessionInfo, std::string& startupPagePath) +const bool SceneSessionManager::GetIconFromDesk(const SessionInfo& sessionInfo, std::string& startupPagePath) { auto& want = sessionInfo.want; if (want == nullptr) { -- Gitee From aac609fbd68069826a2f60c9f4d974c267583bbf Mon Sep 17 00:00:00 2001 From: tangrui Date: Mon, 10 Mar 2025 17:51:13 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A3=80=E8=A7=86?= =?UTF-8?q?=E6=84=8F=E8=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: tangrui --- window_scene/session_manager/src/scene_session_manager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/window_scene/session_manager/src/scene_session_manager.cpp b/window_scene/session_manager/src/scene_session_manager.cpp index 0b91c96f1e..6f33f965d6 100644 --- a/window_scene/session_manager/src/scene_session_manager.cpp +++ b/window_scene/session_manager/src/scene_session_manager.cpp @@ -4270,7 +4270,7 @@ bool SceneSessionManager::GetStartupPageFromResource(const AppExecFwk::AbilityIn return true; } -const bool SceneSessionManager::GetIconFromDesk(const SessionInfo& sessionInfo, std::string& startupPagePath) +bool SceneSessionManager::GetIconFromDesk(const SessionInfo& sessionInfo, std::string& startupPagePath) { auto& want = sessionInfo.want; if (want == nullptr) { -- Gitee From 729b3143e462cf0fcfa16195331060370890f95a Mon Sep 17 00:00:00 2001 From: tangrui Date: Mon, 10 Mar 2025 19:20:19 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A3=80=E8=A7=86?= =?UTF-8?q?=E6=84=8F=E8=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: tangrui --- window_scene/session_manager/include/scene_session_manager.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/window_scene/session_manager/include/scene_session_manager.h b/window_scene/session_manager/include/scene_session_manager.h index eba62a4c8d..6b86c9cbd8 100644 --- a/window_scene/session_manager/include/scene_session_manager.h +++ b/window_scene/session_manager/include/scene_session_manager.h @@ -1315,7 +1315,7 @@ private: */ std::unique_ptr snapshotLruCache_; std::size_t snapshotCapacity_ = 0; - const bool GetIconFromDesk(const SessionInfo& sessionInfo, std::string& startupPagePath); + bool GetIconFromDesk(const SessionInfo& sessionInfo, std::string& startupPagePath); }; } // namespace OHOS::Rosen -- Gitee From 25973800efd2e65212656a65cd0d41864eb6ad57 Mon Sep 17 00:00:00 2001 From: tangrui Date: Mon, 10 Mar 2025 20:34:56 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A3=80=E8=A7=86?= =?UTF-8?q?=E6=84=8F=E8=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: tangrui --- window_scene/session_manager/include/scene_session_manager.h | 2 +- window_scene/session_manager/src/scene_session_manager.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/window_scene/session_manager/include/scene_session_manager.h b/window_scene/session_manager/include/scene_session_manager.h index 6b86c9cbd8..cd2bd5c099 100644 --- a/window_scene/session_manager/include/scene_session_manager.h +++ b/window_scene/session_manager/include/scene_session_manager.h @@ -1315,7 +1315,7 @@ private: */ std::unique_ptr snapshotLruCache_; std::size_t snapshotCapacity_ = 0; - bool GetIconFromDesk(const SessionInfo& sessionInfo, std::string& startupPagePath); + bool GetIconFromDesk(const SessionInfo& sessionInfo, std::string& startupPagePath) const; }; } // namespace OHOS::Rosen diff --git a/window_scene/session_manager/src/scene_session_manager.cpp b/window_scene/session_manager/src/scene_session_manager.cpp index 6f33f965d6..a92c5c007c 100644 --- a/window_scene/session_manager/src/scene_session_manager.cpp +++ b/window_scene/session_manager/src/scene_session_manager.cpp @@ -4270,7 +4270,7 @@ bool SceneSessionManager::GetStartupPageFromResource(const AppExecFwk::AbilityIn return true; } -bool SceneSessionManager::GetIconFromDesk(const SessionInfo& sessionInfo, std::string& startupPagePath) +bool SceneSessionManager::GetIconFromDesk(const SessionInfo& sessionInfo, std::string& startupPagePath) const { auto& want = sessionInfo.want; if (want == nullptr) { -- Gitee From d32e90249fa408df916a6a3d671c5453d7ce63b2 Mon Sep 17 00:00:00 2001 From: tangrui Date: Tue, 11 Mar 2025 10:21:12 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A3=80=E8=A7=86?= =?UTF-8?q?=E6=84=8F=E8=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: tangrui --- window_scene/session_manager/src/scene_session_manager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/window_scene/session_manager/src/scene_session_manager.cpp b/window_scene/session_manager/src/scene_session_manager.cpp index a92c5c007c..a6b920d592 100644 --- a/window_scene/session_manager/src/scene_session_manager.cpp +++ b/window_scene/session_manager/src/scene_session_manager.cpp @@ -4287,7 +4287,7 @@ bool SceneSessionManager::GetIconFromDesk(const SessionInfo& sessionInfo, std::s void SceneSessionManager::GetStartupPage(const SessionInfo& sessionInfo, std::string& path, uint32_t& bgColor) { if (GetIconFromDesk(sessionInfo, path)) { - TLOGI(WmsLogTag::WMS_PATTERN, "get from desk suc"); + TLOGI(WmsLogTag::WMS_PATTERN, "get icon from desk success"); return; } -- Gitee