From 6cc16e91f83b909b3b8a2251c825e6d142f36f17 Mon Sep 17 00:00:00 2001 From: zakalyukinalexander_ac40 Date: Tue, 5 Aug 2025 15:57:07 +0300 Subject: [PATCH 1/2] =?UTF-8?q?fb0702=20unit=20tests=20restore=20part=203?= =?UTF-8?q?=20=E6=98=AF=E5=90=A6=E6=B6=89=E5=8F=8A=E9=9D=9E=E5=85=BC?= =?UTF-8?q?=E5=AE=B9=E5=8F=98=E6=9B=B4:=20=E5=90=A6=20TDD=E8=87=AA?= =?UTF-8?q?=E9=AA=8C=E7=BB=93=E6=9E=9C(=E5=A6=82=E6=9C=89=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=E7=94=A8=E4=BE=8B=E9=9C=80=E6=8F=90=E4=BE=9B=E5=9F=BA?= =?UTF-8?q?=E7=BA=BF=E6=89=A7=E8=A1=8C=E6=83=85=E5=86=B5):=20Pass=20XTS?= =?UTF-8?q?=E8=87=AA=E9=AA=8C=E7=BB=93=E6=9E=9C(=E5=A6=82=E6=9C=89?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E7=94=A8=E4=BE=8B=E9=9C=80=E6=8F=90=E4=BE=9B?= =?UTF-8?q?=E5=9F=BA=E7=BA=BF=E6=89=A7=E8=A1=8C=E6=83=85=E5=86=B5):=20?= =?UTF-8?q?=E4=B8=8D=E6=B6=89=E5=8F=8A=20=E6=A3=80=E8=A7=86=E6=84=8F?= =?UTF-8?q?=E8=A7=81=E6=98=AF=E5=90=A6=E9=83=BD=E5=B7=B2=E9=97=AD=E7=8E=AF?= =?UTF-8?q?(=E6=97=A0=E6=A3=80=E8=A7=86=E6=84=8F=E8=A7=81=E5=A1=AB?= =?UTF-8?q?=E6=98=AF):=20=E6=98=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zakalyukinalexander_ac40 --- .../core/components_ng/pattern/button/button_model_static.cpp | 2 +- .../components_ng/pattern/checkbox/checkbox_model_static.cpp | 4 ++-- .../pattern/checkboxgroup/checkboxgroup_model_static.cpp | 2 +- .../components_ng/pattern/counter/counter_model_static.cpp | 2 +- .../pattern/folder_stack/folder_stack_model_ng.cpp | 4 ++-- .../components_ng/pattern/picker/datepicker_model_static.cpp | 4 ++-- .../interfaces/native/implementation/checkbox_modifier.cpp | 2 +- test/unittest/capi/modifiers/button_modifier_test.cpp | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/frameworks/core/components_ng/pattern/button/button_model_static.cpp b/frameworks/core/components_ng/pattern/button/button_model_static.cpp index 01851f66ed8..69fc4964f68 100644 --- a/frameworks/core/components_ng/pattern/button/button_model_static.cpp +++ b/frameworks/core/components_ng/pattern/button/button_model_static.cpp @@ -258,7 +258,7 @@ void ButtonModelStatic::SetType(FrameNode* frameNode, const std::optional v void ButtonModelStatic::SetStateEffect(FrameNode* frameNode, const std::optional stateEffect) { CHECK_NULL_VOID(frameNode); - auto buttonEventHub = frameNode->GetEventHub(); + auto buttonEventHub = frameNode->GetOrCreateEventHub(); CHECK_NULL_VOID(buttonEventHub); if (stateEffect) { buttonEventHub->SetStateEffect(stateEffect.value()); diff --git a/frameworks/core/components_ng/pattern/checkbox/checkbox_model_static.cpp b/frameworks/core/components_ng/pattern/checkbox/checkbox_model_static.cpp index 1b47d2dddcd..fbd96d94635 100644 --- a/frameworks/core/components_ng/pattern/checkbox/checkbox_model_static.cpp +++ b/frameworks/core/components_ng/pattern/checkbox/checkbox_model_static.cpp @@ -25,7 +25,7 @@ namespace OHOS::Ace::NG { void CheckBoxModelStatic::SetSelect(FrameNode* frameNode, const std::optional& isSelected) { CHECK_NULL_VOID(frameNode); - auto eventHub = frameNode->GetEventHub(); + auto eventHub = frameNode->GetOrCreateEventHub(); CHECK_NULL_VOID(eventHub); eventHub->SetCurrentUIState(UI_STATE_SELECTED, isSelected.value_or(false)); auto pattern = frameNode->GetPattern(); @@ -117,7 +117,7 @@ void CheckBoxModelStatic::SetCheckboxStyle(FrameNode* frameNode, const std::opti void CheckBoxModelStatic::SetChangeEvent(FrameNode* frameNode, ChangeEvent&& onChange) { CHECK_NULL_VOID(frameNode); - auto eventHub = frameNode->GetEventHub(); + auto eventHub = frameNode->GetOrCreateEventHub(); CHECK_NULL_VOID(eventHub); eventHub->SetChangeEvent(std::move(onChange)); } diff --git a/frameworks/core/components_ng/pattern/checkboxgroup/checkboxgroup_model_static.cpp b/frameworks/core/components_ng/pattern/checkboxgroup/checkboxgroup_model_static.cpp index 79c21ad6b4e..624e3f425bc 100644 --- a/frameworks/core/components_ng/pattern/checkboxgroup/checkboxgroup_model_static.cpp +++ b/frameworks/core/components_ng/pattern/checkboxgroup/checkboxgroup_model_static.cpp @@ -108,7 +108,7 @@ void CheckBoxGroupModelStatic::SetCheckboxGroupStyle( void CheckBoxGroupModelStatic::SetChangeEvent(FrameNode* frameNode, GroupChangeEvent&& changeEvent) { CHECK_NULL_VOID(frameNode); - auto eventHub = frameNode->GetEventHub(); + auto eventHub = frameNode->GetOrCreateEventHub(); CHECK_NULL_VOID(eventHub); eventHub->SetChangeEvent(std::move(changeEvent)); } diff --git a/frameworks/core/components_ng/pattern/counter/counter_model_static.cpp b/frameworks/core/components_ng/pattern/counter/counter_model_static.cpp index 56a0396c555..82cfad75d37 100644 --- a/frameworks/core/components_ng/pattern/counter/counter_model_static.cpp +++ b/frameworks/core/components_ng/pattern/counter/counter_model_static.cpp @@ -157,7 +157,7 @@ RefPtr CounterModelStatic::CreateButtonChild( { auto buttonNode = FrameNode::GetOrCreateFrameNode(V2::BUTTON_ETS_TAG, id, []() { return AceType::MakeRefPtr(); }); - buttonNode->GetEventHub()->SetStateEffect(true); + buttonNode->GetOrCreateEventHub()->SetStateEffect(true); buttonNode->GetLayoutProperty()->UpdateType(ButtonType::NORMAL); buttonNode->GetLayoutProperty()->UpdateCreateWithLabel(false); buttonNode->GetLayoutProperty()->UpdateUserDefinedIdealSize( diff --git a/frameworks/core/components_ng/pattern/folder_stack/folder_stack_model_ng.cpp b/frameworks/core/components_ng/pattern/folder_stack/folder_stack_model_ng.cpp index 4bb96a65170..2347b7450dc 100644 --- a/frameworks/core/components_ng/pattern/folder_stack/folder_stack_model_ng.cpp +++ b/frameworks/core/components_ng/pattern/folder_stack/folder_stack_model_ng.cpp @@ -125,7 +125,7 @@ void FolderStackModelNG::SetOnFolderStateChange( FrameNode* frameNode, std::function&& onChange) { CHECK_NULL_VOID(frameNode); - auto eventHub = frameNode->GetEventHub(); + auto eventHub = frameNode->GetOrCreateEventHub(); CHECK_NULL_VOID(eventHub); eventHub->SetOnFolderStateChange(std::move(onChange)); } @@ -134,7 +134,7 @@ void FolderStackModelNG::SetOnHoverStatusChange( FrameNode* frameNode, std::function&& onChange) { CHECK_NULL_VOID(frameNode); - auto eventHub = frameNode->GetEventHub(); + auto eventHub = frameNode->GetOrCreateEventHub(); CHECK_NULL_VOID(eventHub); eventHub->SetOnHoverStatusChange(std::move(onChange)); } diff --git a/frameworks/core/components_ng/pattern/picker/datepicker_model_static.cpp b/frameworks/core/components_ng/pattern/picker/datepicker_model_static.cpp index 0bbdfdba5b1..c3fa61dfb2f 100644 --- a/frameworks/core/components_ng/pattern/picker/datepicker_model_static.cpp +++ b/frameworks/core/components_ng/pattern/picker/datepicker_model_static.cpp @@ -21,7 +21,7 @@ namespace OHOS::Ace::NG { void DatePickerModelStatic::SetOnChange(FrameNode* frameNode, DateChangeEvent&& onChange) { CHECK_NULL_VOID(frameNode); - auto eventHub = frameNode->GetEventHub(); + auto eventHub = frameNode->GetOrCreateEventHub(); CHECK_NULL_VOID(eventHub); eventHub->SetOnChange(std::move(onChange)); } @@ -29,7 +29,7 @@ void DatePickerModelStatic::SetOnChange(FrameNode* frameNode, DateChangeEvent&& void DatePickerModelStatic::SetChangeEvent(FrameNode* frameNode, DateChangeEvent&& onChange) { CHECK_NULL_VOID(frameNode); - auto eventHub = frameNode->GetEventHub(); + auto eventHub = frameNode->GetOrCreateEventHub(); CHECK_NULL_VOID(eventHub); eventHub->SetChangeEvent(std::move(onChange)); } diff --git a/frameworks/core/interfaces/native/implementation/checkbox_modifier.cpp b/frameworks/core/interfaces/native/implementation/checkbox_modifier.cpp index 775e419d133..4d0bcdc2cb9 100644 --- a/frameworks/core/interfaces/native/implementation/checkbox_modifier.cpp +++ b/frameworks/core/interfaces/native/implementation/checkbox_modifier.cpp @@ -52,7 +52,7 @@ void SetCheckboxOptionsImpl(Ark_NativePointer node, CHECK_NULL_VOID(frameNode); CHECK_NULL_VOID(options); Converter::WithOptional(*options, [frameNode, node](const Ark_CheckboxOptions& options) { - auto eventHub = frameNode->GetEventHub(); + auto eventHub = frameNode->GetOrCreateEventHub(); CHECK_NULL_VOID(eventHub); auto name = Converter::OptConvert(options.name); diff --git a/test/unittest/capi/modifiers/button_modifier_test.cpp b/test/unittest/capi/modifiers/button_modifier_test.cpp index 98277078949..cf75441500c 100644 --- a/test/unittest/capi/modifiers/button_modifier_test.cpp +++ b/test/unittest/capi/modifiers/button_modifier_test.cpp @@ -62,7 +62,7 @@ namespace { const auto ATTRIBUTE_FONT_SIZE_DEFAULT_VALUE("0.00px"); const auto ATTRIBUTE_FONT_WEIGHT_DEFAULT_VALUE("FontWeight.Medium"); const auto ATTRIBUTE_FONT_STYLE_DEFAULT_VALUE("FontStyle.Normal"); - const auto ATTRIBUTE_MIN_FONT_SCALE_DEFAULT_VALUE(""); + const auto ATTRIBUTE_MIN_FONT_SCALE_DEFAULT_VALUE("0.850000"); const auto ATTRIBUTE_MAX_FONT_SCALE_DEFAULT_VALUE("2147483648.000000"); // typedefs -- Gitee From d34aae314a52fef9d83c1c545114e82c6aa33448 Mon Sep 17 00:00:00 2001 From: zakalyukinalexander_ac40 Date: Wed, 6 Aug 2025 11:57:13 +0300 Subject: [PATCH 2/2] =?UTF-8?q?fb0702=20unit=20tests=20restore=20part=203?= =?UTF-8?q?=20=E6=98=AF=E5=90=A6=E6=B6=89=E5=8F=8A=E9=9D=9E=E5=85=BC?= =?UTF-8?q?=E5=AE=B9=E5=8F=98=E6=9B=B4:=20=E5=90=A6=20TDD=E8=87=AA?= =?UTF-8?q?=E9=AA=8C=E7=BB=93=E6=9E=9C(=E5=A6=82=E6=9C=89=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=E7=94=A8=E4=BE=8B=E9=9C=80=E6=8F=90=E4=BE=9B=E5=9F=BA?= =?UTF-8?q?=E7=BA=BF=E6=89=A7=E8=A1=8C=E6=83=85=E5=86=B5):=20Pass=20XTS?= =?UTF-8?q?=E8=87=AA=E9=AA=8C=E7=BB=93=E6=9E=9C(=E5=A6=82=E6=9C=89?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E7=94=A8=E4=BE=8B=E9=9C=80=E6=8F=90=E4=BE=9B?= =?UTF-8?q?=E5=9F=BA=E7=BA=BF=E6=89=A7=E8=A1=8C=E6=83=85=E5=86=B5):=20?= =?UTF-8?q?=E4=B8=8D=E6=B6=89=E5=8F=8A=20=E6=A3=80=E8=A7=86=E6=84=8F?= =?UTF-8?q?=E8=A7=81=E6=98=AF=E5=90=A6=E9=83=BD=E5=B7=B2=E9=97=AD=E7=8E=AF?= =?UTF-8?q?(=E6=97=A0=E6=A3=80=E8=A7=86=E6=84=8F=E8=A7=81=E5=A1=AB?= =?UTF-8?q?=E6=98=AF):=20=E6=98=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zakalyukinalexander_ac40 --- .../folder_stack/folder_stack_model_ng.cpp | 4 ++-- .../folder_stack_model_ng_static.cpp | 17 +++++++++++++++++ .../folder_stack/folder_stack_model_ng_static.h | 4 ++++ .../implementation/folder_stack_modifier.cpp | 4 ++-- 4 files changed, 25 insertions(+), 4 deletions(-) diff --git a/frameworks/core/components_ng/pattern/folder_stack/folder_stack_model_ng.cpp b/frameworks/core/components_ng/pattern/folder_stack/folder_stack_model_ng.cpp index 2347b7450dc..4bb96a65170 100644 --- a/frameworks/core/components_ng/pattern/folder_stack/folder_stack_model_ng.cpp +++ b/frameworks/core/components_ng/pattern/folder_stack/folder_stack_model_ng.cpp @@ -125,7 +125,7 @@ void FolderStackModelNG::SetOnFolderStateChange( FrameNode* frameNode, std::function&& onChange) { CHECK_NULL_VOID(frameNode); - auto eventHub = frameNode->GetOrCreateEventHub(); + auto eventHub = frameNode->GetEventHub(); CHECK_NULL_VOID(eventHub); eventHub->SetOnFolderStateChange(std::move(onChange)); } @@ -134,7 +134,7 @@ void FolderStackModelNG::SetOnHoverStatusChange( FrameNode* frameNode, std::function&& onChange) { CHECK_NULL_VOID(frameNode); - auto eventHub = frameNode->GetOrCreateEventHub(); + auto eventHub = frameNode->GetEventHub(); CHECK_NULL_VOID(eventHub); eventHub->SetOnHoverStatusChange(std::move(onChange)); } diff --git a/frameworks/core/components_ng/pattern/folder_stack/folder_stack_model_ng_static.cpp b/frameworks/core/components_ng/pattern/folder_stack/folder_stack_model_ng_static.cpp index d186fc9cd84..ba48f103744 100644 --- a/frameworks/core/components_ng/pattern/folder_stack/folder_stack_model_ng_static.cpp +++ b/frameworks/core/components_ng/pattern/folder_stack/folder_stack_model_ng_static.cpp @@ -59,4 +59,21 @@ void FolderStackModelNGStatic::SetAlignment(FrameNode* frameNode, const std::opt ACE_UPDATE_NODE_LAYOUT_PROPERTY(LayoutProperty, Alignment, valueOpt.value_or(Alignment::CENTER), frameNode); } +void FolderStackModelNGStatic::SetOnFolderStateChange( + FrameNode* frameNode, std::function&& onChange) +{ + CHECK_NULL_VOID(frameNode); + auto eventHub = frameNode->GetOrCreateEventHub(); + CHECK_NULL_VOID(eventHub); + eventHub->SetOnFolderStateChange(std::move(onChange)); +} + +void FolderStackModelNGStatic::SetOnHoverStatusChange( + FrameNode* frameNode, std::function&& onChange) +{ + CHECK_NULL_VOID(frameNode); + auto eventHub = frameNode->GetOrCreateEventHub(); + CHECK_NULL_VOID(eventHub); + eventHub->SetOnHoverStatusChange(std::move(onChange)); +} } diff --git a/frameworks/core/components_ng/pattern/folder_stack/folder_stack_model_ng_static.h b/frameworks/core/components_ng/pattern/folder_stack/folder_stack_model_ng_static.h index b8c8712c6c1..b77125eaae6 100644 --- a/frameworks/core/components_ng/pattern/folder_stack/folder_stack_model_ng_static.h +++ b/frameworks/core/components_ng/pattern/folder_stack/folder_stack_model_ng_static.h @@ -26,6 +26,10 @@ public: static RefPtr CreateFrameNode(int32_t nodeId); static void SetUpdateUpperItems(FrameNode* frameNode, const std::vector& itemId); static void SetAlignment(FrameNode* frameNode, const std::optional& valueOpt); + static void SetOnFolderStateChange( + FrameNode* frameNode, std::function&& onChange); + static void SetOnHoverStatusChange( + FrameNode* frameNode, std::function&& onChange); }; } diff --git a/frameworks/core/interfaces/native/implementation/folder_stack_modifier.cpp b/frameworks/core/interfaces/native/implementation/folder_stack_modifier.cpp index af9eaea1afb..5db1fdacc9b 100644 --- a/frameworks/core/interfaces/native/implementation/folder_stack_modifier.cpp +++ b/frameworks/core/interfaces/native/implementation/folder_stack_modifier.cpp @@ -72,7 +72,7 @@ void OnFolderStateChangeImpl(Ark_NativePointer node, eventInfo.foldStatus = Converter::ArkValue(folderEventInfo.GetFolderState()); arkCallback.Invoke(eventInfo); }; - FolderStackModelNG::SetOnFolderStateChange(frameNode, std::move(onChange)); + FolderStackModelNGStatic::SetOnFolderStateChange(frameNode, std::move(onChange)); } void OnHoverStatusChangeImpl(Ark_NativePointer node, const Opt_OnHoverStatusChangeCallback* value) @@ -89,7 +89,7 @@ void OnHoverStatusChangeImpl(Ark_NativePointer node, eventInfo.foldStatus = Converter::ArkValue(folderEventInfo.GetFolderState()); arkCallback.Invoke(eventInfo); }; - FolderStackModelNG::SetOnHoverStatusChange(frameNode, std::move(onChange)); + FolderStackModelNGStatic::SetOnHoverStatusChange(frameNode, std::move(onChange)); } void EnableAnimationImpl(Ark_NativePointer node, const Opt_Boolean* value) -- Gitee