diff --git a/adapter/ohos/entrance/ace_container.cpp b/adapter/ohos/entrance/ace_container.cpp index 50be4a14e75a43cb12343cc4cb254c7bab9ef338..d637c89681774807915b621657ba20a75140e8f8 100644 --- a/adapter/ohos/entrance/ace_container.cpp +++ b/adapter/ohos/entrance/ace_container.cpp @@ -1532,6 +1532,8 @@ void AceContainer::SetUIWindow(int32_t instanceId, sptr uiW container->SetUIWindowInner(uiWindow); if (!container->IsSceneBoardWindow()) { ResourceManager::GetInstance().SetResourceCacheSize(RESOURCE_CACHE_DEFAULT_SIZE); + } else { + OHOS::Rosen::RSUIDirector::SetTypicalResidentProcess(true); } } @@ -2503,6 +2505,12 @@ void AceContainer::AddLibPath(int32_t instanceId, const std::vector assetManagerImpl->SetLibPath("default", libPath); } +void AceContainer::SetIsFormRender(bool isFormRender) +{ + OHOS::Rosen::RSUIDirector::SetTypicalResidentProcess(isFormRender); + isFormRender_ = isFormRender; +} + void AceContainer::AttachView(std::shared_ptr window, const RefPtr& view, double density, float width, float height, uint32_t windowId, UIEnvCallback callback) { diff --git a/adapter/ohos/entrance/ace_container.h b/adapter/ohos/entrance/ace_container.h index 5e5136ee38fd4ea84c413585dd3769cef8e507c5..e3de3f55e154be99bfaf741e8976f02c2d04abcc 100644 --- a/adapter/ohos/entrance/ace_container.h +++ b/adapter/ohos/entrance/ace_container.h @@ -598,11 +598,6 @@ public: isSubContainer_ = isSubContainer; } - void SetIsFormRender(bool isFormRender) override - { - isFormRender_ = isFormRender; - } - void InitializeSubContainer(int32_t parentContainerId); static void SetDialogCallback(int32_t instanceId, FrontendDialogCallback callback); @@ -901,6 +896,7 @@ public: const std::function&& loadPageCallback); UIContentErrorCode RunIntentPage(); + void SetIsFormRender(bool isFormRender) override; private: virtual bool MaybeRelease() override; diff --git a/test/mock/adapter/mock_ace_container.cpp b/test/mock/adapter/mock_ace_container.cpp index 13720c7ff705ab46db4b1f4dd33ef386def87019..70eff3a3038140e4c54beab9ab9f4d6fd353e3ff 100644 --- a/test/mock/adapter/mock_ace_container.cpp +++ b/test/mock/adapter/mock_ace_container.cpp @@ -91,4 +91,6 @@ void AceContainer::DispatchExtensionDataToHostWindow( void AceContainer::UpdateColorMode(uint32_t colorMode) {} void AceContainer::TriggerModuleSerializer() {} + +void AceContainer::SetIsFormRender(bool isFormRender) {} } // namespace OHOS::Ace::Platform diff --git a/test/unittest/core/accessibility/mock_ace_container.cpp b/test/unittest/core/accessibility/mock_ace_container.cpp index ddbaf211d4c961e21a187cba4a3f1abbe41d2fbe..c3561d4960eaa195db03fe6fe220c00982a6e02e 100644 --- a/test/unittest/core/accessibility/mock_ace_container.cpp +++ b/test/unittest/core/accessibility/mock_ace_container.cpp @@ -305,4 +305,6 @@ bool AceContainer::IsCrossAxisWindow() void AceContainer::UpdateColorMode(uint32_t colorMode) {} void AceContainer::TriggerModuleSerializer() {} + +void AceContainer::SetIsFormRender(bool isFormRender) {} } // namespace OHOS::Ace::Platform diff --git a/test/unittest/core/pattern/ui_extension/mock/mock_ace_container.cpp b/test/unittest/core/pattern/ui_extension/mock/mock_ace_container.cpp index 1591e157dad5461b145bf0b4f4d6b30dd9b922cc..595fdca01202ccc0daae4685f012772851634f3a 100644 --- a/test/unittest/core/pattern/ui_extension/mock/mock_ace_container.cpp +++ b/test/unittest/core/pattern/ui_extension/mock/mock_ace_container.cpp @@ -300,4 +300,6 @@ void AceContainer::DispatchExtensionDataToHostWindow( void AceContainer::UpdateColorMode(uint32_t colorMode) {} void AceContainer::TriggerModuleSerializer() {} + +void AceContainer::SetIsFormRender(bool isFormRender) {} } // namespace OHOS::Ace::NG diff --git a/test/unittest/core/pattern/ui_extension/mock/mock_ace_container_two.cpp b/test/unittest/core/pattern/ui_extension/mock/mock_ace_container_two.cpp index a40c4debd86e32f2a37dea625910081bccadf79e..cb50ee2650514e01bf1a8686409af4a0a0c5ab2d 100644 --- a/test/unittest/core/pattern/ui_extension/mock/mock_ace_container_two.cpp +++ b/test/unittest/core/pattern/ui_extension/mock/mock_ace_container_two.cpp @@ -302,4 +302,6 @@ void AceContainer::DispatchExtensionDataToHostWindow( void AceContainer::UpdateColorMode(uint32_t colorMode) {} void AceContainer::TriggerModuleSerializer() {} + +void AceContainer::SetIsFormRender(bool isFormRender) {} } // namespace OHOS::Ace::NG