From 5afa87ba791f5856c1315145fbc89a20fe181eea Mon Sep 17 00:00:00 2001
From: fox <tanhong6@h-partners.com>
Date: Wed, 6 Aug 2025 15:44:47 +0800
Subject: [PATCH 1/2] ii

Signed-off-by: fox <tanhong6@h-partners.com>
---
 .../session/host/src/scene_session.cpp         |  2 +-
 .../test/unittest/scene_session_test.cpp       | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/window_scene/session/host/src/scene_session.cpp b/window_scene/session/host/src/scene_session.cpp
index a03c51b7dd..a45705ac0f 100644
--- a/window_scene/session/host/src/scene_session.cpp
+++ b/window_scene/session/host/src/scene_session.cpp
@@ -2334,7 +2334,7 @@ void SceneSession::PrintAvoidAreaInfo(DisplayId displayId,
         return;
     }
     TLOGI(WmsLogTag::WMS_IMMS, "win %{public}d dispaly %{public}" PRIu64 ""
-        "type %{public}d rect %{public}s bar %{public}s",
+        " type %{public}d rect %{public}s bar %{public}s",
         GetPersistentId(), displayId, type, rect.ToString().c_str(), avoidRect.ToString().c_str());
 }
 
diff --git a/window_scene/test/unittest/scene_session_test.cpp b/window_scene/test/unittest/scene_session_test.cpp
index 5e12b8bc4a..2915ed9cb7 100644
--- a/window_scene/test/unittest/scene_session_test.cpp
+++ b/window_scene/test/unittest/scene_session_test.cpp
@@ -1412,31 +1412,31 @@ HWTEST_F(SceneSessionTest, ProcessWindowMoving, TestSize.Level1)
 }
 
 /**
- * @tc.name: PrintAvoidAreaInfo
- * @tc.desc: PrintAvoidAreaInfo
+ * @tc.name: CalculateAvoidAreaByType
+ * @tc.desc: CalculateAvoidAreaByType
  * @tc.type: FUNC
  */
-HWTEST_F(SceneSessionTest, PrintAvoidAreaInfo, TestSize.Level1)
+HWTEST_F(SceneSessionTest, CalculateAvoidAreaByType, TestSize.Level1)
 {
     SessionInfo info;
-    info.abilityName_ = "PrintAvoidAreaInfo";
-    info.bundleName_ = "PrintAvoidAreaInfo";
+    info.abilityName_ = "CalculateAvoidAreaByType";
+    info.bundleName_ = "CalculateAvoidAreaByType";
     sptr<SceneSession>sceneSession = sptr<SceneSession>::MakeSptr(info, nullptr);
     sceneSession->property_ = sptr<WindowSessionProperty>::MakeSptr();
     sceneSession->property_->displayId_ = 0;
     WSRect winRect;
     WSRect avoidRect;
     auto type = AvoidAreaType::TYPE_SYSTEM;
-    sceneSession->PrintAvoidAreaInfo(sceneSession->property_->displayId_, type, winRect, avoidRect);
+    AvoidArea avoidArea;
+    sceneSession->CalculateAvoidAreaByType(type, winRect, avoidRect, avoidArea);
     std::tuple<DisplayId, WSRect, WSRect> inputParamters(sceneSession->property_->displayId_, winRect, avoidRect);
     EXPECT_EQ(inputParamters, sceneSession->lastAvoidAreaInputParamtersMap_[type]);
     sceneSession->property_->displayId_ = 1;
-    sceneSession->PrintAvoidAreaInfo(sceneSession->property_->displayId_, type, winRect, avoidRect);
+    sceneSession->CalculateAvoidAreaByType(type, winRect, avoidRect, avoidArea);
     std::tuple<DisplayId, WSRect, WSRect> inputParamters1(sceneSession->property_->displayId_, winRect, avoidRect);
     EXPECT_EQ(inputParamters1, sceneSession->lastAvoidAreaInputParamtersMap_[type]);
-    sceneSession->PrintAvoidAreaInfo(sceneSession->property_->displayId_, type, winRect, avoidRect);
+    sceneSession->CalculateAvoidAreaByType(type, winRect, avoidRect, avoidArea);
     EXPECT_EQ(inputParamters1, sceneSession->lastAvoidAreaInputParamtersMap_[type]);
-    AvoidArea avoidArea;
     sceneSession->CalculateAvoidAreaByType(type, winRect, avoidRect, avoidArea);
     EXPECT_EQ(inputParamters1, sceneSession->lastAvoidAreaInputParamtersMap_[type]);
 }
-- 
Gitee


From 191ee1745b78cd2cc6c434501be2ead6275a69e6 Mon Sep 17 00:00:00 2001
From: fox <tanhong6@h-partners.com>
Date: Thu, 7 Aug 2025 07:36:19 +0000
Subject: [PATCH 2/2] update window_scene/session/host/src/scene_session.cpp.

Signed-off-by: fox <tanhong6@h-partners.com>
---
 window_scene/session/host/src/scene_session.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/window_scene/session/host/src/scene_session.cpp b/window_scene/session/host/src/scene_session.cpp
index a45705ac0f..a28e3bbdfb 100644
--- a/window_scene/session/host/src/scene_session.cpp
+++ b/window_scene/session/host/src/scene_session.cpp
@@ -2333,7 +2333,7 @@ void SceneSession::PrintAvoidAreaInfo(DisplayId displayId,
     if (iter != lastAvoidAreaInputParamtersMap_.end() && iter->second == inputParamters) {
         return;
     }
-    TLOGI(WmsLogTag::WMS_IMMS, "win %{public}d dispaly %{public}" PRIu64 ""
+    TLOGI(WmsLogTag::WMS_IMMS, "win %{public}d dispaly %{public}" PRIu64
         " type %{public}d rect %{public}s bar %{public}s",
         GetPersistentId(), displayId, type, rect.ToString().c_str(), avoidRect.ToString().c_str());
 }
-- 
Gitee