From dd14386c7c5282d9b864d059ce29ce724a24b203 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E5=88=9A?= Date: Thu, 21 Aug 2025 18:57:05 +0800 Subject: [PATCH] =?UTF-8?q?TDD=E9=BB=84=E8=93=9D=E5=B7=AE=E5=BC=82?= =?UTF-8?q?=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 吴刚 --- interfaces/innerkits/wm/window.h | 6 ++---- .../napi/window_runtime/window_napi/js_window.cpp | 2 +- previewer/include/window_impl.h | 3 +-- previewer/src/window_impl.cpp | 2 +- .../common/include/window_session_property.h | 8 +++++--- .../test/dms_unittest/screen_session_test.cpp | 2 +- window_scene/test/mock/mock_session.h | 5 +---- wm/include/window_extension_session_impl.h | 2 +- wm/include/window_impl.h | 3 +-- wm/include/window_scene_session_impl.h | 6 ++---- wm/src/window_extension_session_impl.cpp | 3 +-- wm/src/window_impl.cpp | 2 +- wm/src/window_scene.cpp | 7 +++---- wm/src/window_scene_session_impl.cpp | 13 ++++--------- wm/src/window_session_impl.cpp | 2 +- 15 files changed, 26 insertions(+), 40 deletions(-) diff --git a/interfaces/innerkits/wm/window.h b/interfaces/innerkits/wm/window.h index fe67e9d0fd..d53acd4e11 100644 --- a/interfaces/innerkits/wm/window.h +++ b/interfaces/innerkits/wm/window.h @@ -1560,8 +1560,7 @@ public: * @param height * @return WMError */ - virtual WMError Resize(uint32_t width, uint32_t height, - const RectAnimationConfig& rectAnimationConfig = {}) { return WMError::WM_OK; } + virtual WMError Resize(uint32_t width, uint32_t height) { return WMError::WM_OK; } /** * @brief resize the window instance (w,h) @@ -1570,8 +1569,7 @@ public: * @param height * @return WMError */ - virtual WMError ResizeAsync(uint32_t width, uint32_t height, - const RectAnimationConfig& rectAnimationConfig = {}) { return WMError::WM_ERROR_DEVICE_NOT_SUPPORT; } + virtual WMError ResizeAsync(uint32_t width, uint32_t height) { return WMError::WM_ERROR_DEVICE_NOT_SUPPORT; } /** * @brief set the window gravity diff --git a/interfaces/kits/napi/window_runtime/window_napi/js_window.cpp b/interfaces/kits/napi/window_runtime/window_napi/js_window.cpp index 6f236931a8..6d756e431a 100644 --- a/interfaces/kits/napi/window_runtime/window_napi/js_window.cpp +++ b/interfaces/kits/napi/window_runtime/window_napi/js_window.cpp @@ -2252,7 +2252,7 @@ static void SetResizeWindowWithAnimationAsyncTask(NapiAsyncTask::ExecuteCallback *errCodePtr = WmErrorCode::WM_ERROR_STATE_ABNORMALLY; return; } - *errCodePtr = WM_JS_TO_ERROR_CODE_MAP.at(window->ResizeAsync(rect.width_, rect.height_, rectAnimationConfig)); + *errCodePtr = WM_JS_TO_ERROR_CODE_MAP.at(window->ResizeAsync(rect.width_, rect.height_)); TLOGND(WmsLogTag::WMS_LAYOUT, "%{public}s end, window [%{public}u, %{public}s] err=%{public}d", where, window->GetWindowId(), window->GetWindowName().c_str(), *errCodePtr); }; diff --git a/previewer/include/window_impl.h b/previewer/include/window_impl.h index c7133b26e5..1d3fce87ef 100644 --- a/previewer/include/window_impl.h +++ b/previewer/include/window_impl.h @@ -111,8 +111,7 @@ public: virtual WMError Hide(uint32_t reason, bool withAnimation, bool isFromInnerkits, bool waitDetach) override; virtual WMError MoveTo(int32_t x, int32_t y, bool isMoveToGlobal = false, MoveConfiguration moveConfiguration = {}) override; - virtual WMError Resize(uint32_t width, uint32_t height, - const RectAnimationConfig& rectAnimationConfig = {}) override; + virtual WMError Resize(uint32_t width, uint32_t height) override; virtual WMError SetWindowGravity(WindowGravity gravity, uint32_t percent) override; virtual WMError SetKeepScreenOn(bool keepScreenOn) override; virtual bool IsKeepScreenOn() const override; diff --git a/previewer/src/window_impl.cpp b/previewer/src/window_impl.cpp index fd0fc0ba7d..6349e43ae3 100644 --- a/previewer/src/window_impl.cpp +++ b/previewer/src/window_impl.cpp @@ -585,7 +585,7 @@ WMError WindowImpl::MoveTo(int32_t x, int32_t y, bool isMoveToGlobal, MoveConfig return WMError::WM_OK; } -WMError WindowImpl::Resize(uint32_t width, uint32_t height, const RectAnimationConfig& rectAnimationConfig) +WMError WindowImpl::Resize(uint32_t width, uint32_t height) { return WMError::WM_OK; } diff --git a/window_scene/common/include/window_session_property.h b/window_scene/common/include/window_session_property.h index cf8fa9dbbf..909caa4f55 100755 --- a/window_scene/common/include/window_session_property.h +++ b/window_scene/common/include/window_session_property.h @@ -803,9 +803,11 @@ struct SystemSessionConfig : public Parcelable { return false; } - if (!parcel.WriteUint32(miniWidthOfMainWindow_) || !parcel.WriteUint32(miniHeightOfMainWindow_) || - !parcel.WriteUint32(miniWidthOfSubWindow_) || !parcel.WriteUint32(miniHeightOfSubWindow_) || - !parcel.WriteUint32(miniWidthOfDialogWindow_) || !parcel.WriteUint32(miniHeightOfDialogWindow_)) { + bool parcelWriteFail = !parcel.WriteUint32(miniWidthOfMainWindow_) || + !parcel.WriteUint32(miniHeightOfMainWindow_) || !parcel.WriteUint32(miniWidthOfSubWindow_) || + !parcel.WriteUint32(miniHeightOfSubWindow_) || !parcel.WriteUint32(miniWidthOfDialogWindow_) || + !parcel.WriteUint32(miniHeightOfDialogWindow_); + if (parcelWriteFail) { return false; } diff --git a/window_scene/test/dms_unittest/screen_session_test.cpp b/window_scene/test/dms_unittest/screen_session_test.cpp index 2eaaa790fe..acc8a4e761 100644 --- a/window_scene/test/dms_unittest/screen_session_test.cpp +++ b/window_scene/test/dms_unittest/screen_session_test.cpp @@ -1110,7 +1110,7 @@ HWTEST_F(ScreenSessionTest, Resize002, TestSize.Level1) ASSERT_NE(nullptr, screenSession); uint32_t width = 1000; uint32_t height = 1000; - screenSession->Resize(width, height, false); + screenSession->Resize(width, height); GTEST_LOG_(INFO) << "Resize002 end"; } diff --git a/window_scene/test/mock/mock_session.h b/window_scene/test/mock/mock_session.h index 6cb8ae627e..054e746dba 100644 --- a/window_scene/test/mock/mock_session.h +++ b/window_scene/test/mock/mock_session.h @@ -67,10 +67,7 @@ public: WSPropertyChangeAction action)); MOCK_METHOD1(TransferExtensionData, int32_t(const AAFwk::WantParams& wantParams)); MOCK_METHOD(WSError, ProcessPointDownSession, (int32_t x, int32_t y), (override)); - void SetMockLayoutController(const sptr& layoutController) - { - layoutController_ = layoutController; - } + MOCK_CONST_METHOD2(ConvertGlobalRectToRelative, WSRect(const WSRect& globalRect, DisplayId targetDisplayId)); }; } // namespace Rosen } // namespace OHOS diff --git a/wm/include/window_extension_session_impl.h b/wm/include/window_extension_session_impl.h index d2d038c737..6845aaf2b6 100644 --- a/wm/include/window_extension_session_impl.h +++ b/wm/include/window_extension_session_impl.h @@ -42,7 +42,7 @@ public: bool isModuleAbilityHookEnd = false) override; WMError MoveTo(int32_t x, int32_t y, bool isMoveToGlobal = false, MoveConfiguration moveConfiguration = {}) override; - WMError Resize(uint32_t width, uint32_t height, const RectAnimationConfig& rectAnimationConfig = {}) override; + WMError Resize(uint32_t width, uint32_t height) override; WMError TransferAbilityResult(uint32_t resultCode, const AAFwk::Want& want) override; WMError TransferExtensionData(const AAFwk::WantParams& wantParams) override; WSError NotifyTransferComponentData(const AAFwk::WantParams& wantParams) override; diff --git a/wm/include/window_impl.h b/wm/include/window_impl.h index f9a3295f69..0c4f0abdbf 100644 --- a/wm/include/window_impl.h +++ b/wm/include/window_impl.h @@ -194,8 +194,7 @@ public: virtual WMError Hide(uint32_t reason, bool withAnimation, bool isFromInnerkits, bool waitDetach) override; virtual WMError MoveTo(int32_t x, int32_t y, bool isMoveToGlobal = false, MoveConfiguration moveConfiguration = {}) override; - virtual WMError Resize(uint32_t width, uint32_t height, - const RectAnimationConfig& rectAnimationConfig = {}) override; + virtual WMError Resize(uint32_t width, uint32_t height) override; float GetVirtualPixelRatio() override; virtual WMError SetWindowGravity(WindowGravity gravity, uint32_t percent) override; virtual WMError SetKeepScreenOn(bool keepScreenOn) override; diff --git a/wm/include/window_scene_session_impl.h b/wm/include/window_scene_session_impl.h index 9f039e2218..9c232d45c4 100644 --- a/wm/include/window_scene_session_impl.h +++ b/wm/include/window_scene_session_impl.h @@ -57,10 +57,8 @@ public: WMError MoveWindowToGlobal(int32_t x, int32_t y, MoveConfiguration moveConfiguration = {}) override; WMError MoveWindowToGlobalDisplay(int32_t x, int32_t y, MoveConfiguration moveConfiguration = {}) override; WMError GetGlobalScaledRect(Rect& globalScaledRect) override; - WMError Resize(uint32_t width, uint32_t height, - const RectAnimationConfig& rectAnimationConfig = {}) override; - WMError ResizeAsync(uint32_t width, uint32_t height, - const RectAnimationConfig& rectAnimationConfig = {}) override; + WMError Resize(uint32_t width, uint32_t height) override; + WMError ResizeAsync(uint32_t width, uint32_t height) override; WMError SetWindowAnchorInfo(const WindowAnchorInfo& windowAnchorInfo) override; WMError SetFollowParentWindowLayoutEnabled(bool isFollow) override; WSError NotifyLayoutFinishAfterWindowModeChange(WindowMode mode) override; diff --git a/wm/src/window_extension_session_impl.cpp b/wm/src/window_extension_session_impl.cpp index f17292e5b9..5711276058 100644 --- a/wm/src/window_extension_session_impl.cpp +++ b/wm/src/window_extension_session_impl.cpp @@ -335,8 +335,7 @@ WMError WindowExtensionSessionImpl::MoveTo(int32_t x, int32_t y, return static_cast(error); } -WMError WindowExtensionSessionImpl::Resize(uint32_t width, uint32_t height, - const RectAnimationConfig& rectAnimationConfig) +WMError WindowExtensionSessionImpl::Resize(uint32_t width, uint32_t height) { WLOGFD("Id:%{public}d wh %{public}u %{public}u", property_->GetPersistentId(), width, height); if (IsWindowSessionInvalid()) { diff --git a/wm/src/window_impl.cpp b/wm/src/window_impl.cpp index 72ed14ee17..6fbb6eed9a 100644 --- a/wm/src/window_impl.cpp +++ b/wm/src/window_impl.cpp @@ -2020,7 +2020,7 @@ WMError WindowImpl::MoveTo(int32_t x, int32_t y, bool isMoveToGlobal, MoveConfig return UpdateProperty(PropertyChangeAction::ACTION_UPDATE_RECT); } -WMError WindowImpl::Resize(uint32_t width, uint32_t height, const RectAnimationConfig& rectAnimationConfig) +WMError WindowImpl::Resize(uint32_t width, uint32_t height) { WLOGFD("id:%{public}d Resize %{public}u %{public}u", property_->GetWindowId(), width, height); diff --git a/wm/src/window_scene.cpp b/wm/src/window_scene.cpp index 145d3d7cb0..d7529c7056 100644 --- a/wm/src/window_scene.cpp +++ b/wm/src/window_scene.cpp @@ -100,10 +100,9 @@ WMError WindowScene::Init(DisplayId displayId, const std::shared_ptrSetBundleName(context->GetBundleName()); std::string moduleName = context->GetHapModuleInfo() ? context->GetHapModuleInfo()->moduleName : ""; - if (!moduleName.empty()) { - isModuleAbilityHookEnd = - SingletonContainer::Get().IsModuleHookOff(isModuleAbilityHookEnd, moduleName); - } + TLOGI(WmsLogTag::WMS_MAIN, "set isModuleAbiltityHookEnd"); + isModuleAbilityHookEnd = + SingletonContainer::Get().IsModuleHookOff(isModuleAbilityHookEnd, moduleName); } auto mainWindow = SingletonContainer::Get() .CreateWindow(option, context, iSession, identityToken, isModuleAbilityHookEnd); diff --git a/wm/src/window_scene_session_impl.cpp b/wm/src/window_scene_session_impl.cpp index 41f3868a07..0573a7e9ed 100644 --- a/wm/src/window_scene_session_impl.cpp +++ b/wm/src/window_scene_session_impl.cpp @@ -2397,7 +2397,7 @@ WMError WindowSceneSessionImpl::CheckAndModifyWindowRect(uint32_t& width, uint32 } /** @note @window.layout */ -WMError WindowSceneSessionImpl::Resize(uint32_t width, uint32_t height, const RectAnimationConfig& rectAnimationConfig) +WMError WindowSceneSessionImpl::Resize(uint32_t width, uint32_t height) { auto reason = SizeChangeReason::RESIZE; if (isResizedByLimit_) { @@ -2431,21 +2431,16 @@ WMError WindowSceneSessionImpl::Resize(uint32_t width, uint32_t height, const Re windowRect.ToString().c_str(), newRect.ToString().c_str()); property_->SetRequestRect(newRect); - property_->SetRectAnimationConfig(rectAnimationConfig); WSRect wsRect = { newRect.posX_, newRect.posY_, newRect.width_, newRect.height_ }; auto hostSession = GetHostSession(); - if (rectAnimationConfig.duration > 0 && reason == SizeChangeReason::RESIZE) { - reason = SizeChangeReason::RESIZE_WITH_ANIMATION; - } CHECK_HOST_SESSION_RETURN_ERROR_IF_NULL(hostSession, WMError::WM_ERROR_INVALID_WINDOW); - auto ret = hostSession->UpdateSessionRect(wsRect, reason, false, false, {}, rectAnimationConfig); + auto ret = hostSession->UpdateSessionRect(wsRect, reason); return static_cast(ret); } -WMError WindowSceneSessionImpl::ResizeAsync(uint32_t width, uint32_t height, - const RectAnimationConfig& rectAnimationConfig) +WMError WindowSceneSessionImpl::ResizeAsync(uint32_t width, uint32_t height) { if (IsWindowSessionInvalid()) { TLOGE(WmsLogTag::WMS_LAYOUT, "Session is invalid"); @@ -2457,7 +2452,7 @@ WMError WindowSceneSessionImpl::ResizeAsync(uint32_t width, uint32_t height, GetWindowId(), GetWindowMode()); return WMError::WM_ERROR_INVALID_OP_IN_CUR_STATUS; } - auto ret = Resize(width, height, rectAnimationConfig); + auto ret = Resize(width, height); if (state_ == WindowState::STATE_SHOWN) { layoutCallback_->ResetResizeLock(); auto startTime = std::chrono::duration_cast( diff --git a/wm/src/window_session_impl.cpp b/wm/src/window_session_impl.cpp index b299f1c93a..b44849998f 100644 --- a/wm/src/window_session_impl.cpp +++ b/wm/src/window_session_impl.cpp @@ -2163,7 +2163,7 @@ WMError WindowSessionImpl::SetUIContentInner(const std::string& contentInfo, voi return initUIContentRet; } if (auto uiContent = GetUIContentSharedPtr()) { - TLOGI(WmsLogTag::WMS_LAYOUT, "id:%{public}d, posX:%{public}d, posY:%{public}d, " + TLOGI(WmsLogTag::WMS_LAYOUT, "single hand, id:%{public}d, posX:%{public}d, posY:%{public}d, " "scaleX:%{public}f, scaleY:%{public}f", GetPersistentId(), singleHandTransform_.posX, singleHandTransform_.posY, singleHandTransform_.scaleX, singleHandTransform_.scaleY); -- Gitee