From 54f493d1137028bc601502564738aca613b55ad8 Mon Sep 17 00:00:00 2001 From: zhoulianhai Date: Thu, 14 Aug 2025 19:08:48 +0800 Subject: [PATCH] =?UTF-8?q?RS=E5=A4=9A=E5=AE=9E=E4=BE=8BAnimation=E6=95=B4?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhoulianhai --- .../data_panel/data_panel_modifier.cpp | 8 ++- .../pattern/data_panel/data_panel_modifier.h | 4 +- .../pattern/data_panel/data_panel_pattern.cpp | 2 +- .../pattern/gauge/gauge_modifier.cpp | 4 +- .../loading_progress_modifier.cpp | 25 +++++++-- .../loading_progress_modifier.h | 5 +- .../loading_progress_pattern.h | 2 +- .../patternlock/patternlock_modifier.cpp | 45 ++++++++++++--- .../patternlock/patternlock_modifier.h | 4 +- .../pattern/patternlock/patternlock_pattern.h | 2 +- .../picker/date_time_animation_controller.cpp | 18 ++++-- .../pattern/picker/datepicker_dialog_view.cpp | 3 +- .../picker_utils/picker_column_pattern.cpp | 12 +++- .../toss_animation_controller.cpp | 7 ++- .../pattern/progress/progress_modifier.cpp | 56 +++++++++++++++---- .../pattern/progress/progress_modifier.h | 5 +- .../pattern/progress/progress_pattern.h | 3 +- .../text_picker/textpicker_column_pattern.cpp | 8 ++- .../text_picker/toss_animation_controller.cpp | 7 ++- .../pattern/data_panel/data_panel_test_ng.cpp | 46 +++++++-------- .../patternlock_modifier_test_ng.cpp | 34 +++++------ .../patternlock_pattern_test_ng.cpp | 14 ++--- .../patternlock/patternlock_test_ng.cpp | 26 ++++----- 23 files changed, 227 insertions(+), 113 deletions(-) diff --git a/frameworks/core/components_ng/pattern/data_panel/data_panel_modifier.cpp b/frameworks/core/components_ng/pattern/data_panel/data_panel_modifier.cpp index 1b7627cf4b0..99855ce2091 100755 --- a/frameworks/core/components_ng/pattern/data_panel/data_panel_modifier.cpp +++ b/frameworks/core/components_ng/pattern/data_panel/data_panel_modifier.cpp @@ -18,6 +18,7 @@ #include "core/components_ng/pattern/data_panel/data_panel_paint_property.h" #include "core/components_ng/render/drawing_prop_convertor.h" #include "core/pipeline/base/constants.h" +#include "core/pipeline_ng/pipeline_context.h" namespace OHOS::Ace::NG { namespace { @@ -32,7 +33,7 @@ constexpr uint32_t SHADOW_ALPHA = 0.4 * 255; constexpr float ZERO_CORNER_RADIUS = 0.0f; } // namespace -DataPanelModifier::DataPanelModifier() +DataPanelModifier::DataPanelModifier(const WeakPtr& pattern) : pattern_(pattern) { auto pipelineContext = PipelineBase::GetCurrentContext(); CHECK_NULL_VOID(pipelineContext); @@ -108,7 +109,10 @@ void DataPanelModifier::UpdateDate() option.SetDelay(ANIMATION_DELAY); option.SetCurve(curve); option.SetIteration(ANIMATION_TIMES); - AnimationUtils::Animate(option, [&]() { date_->Set(ANIMATION_END); }); + auto pattern = pattern_.Upgrade(); + auto host = pattern? pattern->GetHost(): nullptr; + auto context = host? host->GetContextRefPtr(): nullptr; + AnimationUtils::Animate(option, [&]() { date_->Set(ANIMATION_END); }, nullptr, nullptr, context); } else { date_->Set(ANIMATION_END); } diff --git a/frameworks/core/components_ng/pattern/data_panel/data_panel_modifier.h b/frameworks/core/components_ng/pattern/data_panel/data_panel_modifier.h index 751f7b5713d..2b8c122d4e4 100644 --- a/frameworks/core/components_ng/pattern/data_panel/data_panel_modifier.h +++ b/frameworks/core/components_ng/pattern/data_panel/data_panel_modifier.h @@ -22,6 +22,7 @@ #include "core/animation/spring_curve.h" #include "core/common/container.h" #include "core/components_ng/base/modifier.h" +#include "core/components_ng/pattern/pattern.h" #include "core/components_ng/property/property.h" #include "core/components_ng/render/animation_utils.h" #include "core/components_ng/render/canvas_image.h" @@ -75,7 +76,7 @@ class DataPanelModifier : public ContentModifier { DECLARE_ACE_TYPE(DataPanelModifier, ContentModifier); public: - DataPanelModifier(); + DataPanelModifier(const WeakPtr& pattern); ~DataPanelModifier() override = default; void onDraw(DrawingContext& context) override; void UpdateDate(); @@ -210,6 +211,7 @@ private: std::vector> valueColors_; RefPtr trackBackgroundColor_; RefPtr strokeWidth_; + WeakPtr pattern_; // shadow param bool isShadowVisible_ = false; diff --git a/frameworks/core/components_ng/pattern/data_panel/data_panel_pattern.cpp b/frameworks/core/components_ng/pattern/data_panel/data_panel_pattern.cpp index ddc3b62ae3f..f4f331ff4df 100644 --- a/frameworks/core/components_ng/pattern/data_panel/data_panel_pattern.cpp +++ b/frameworks/core/components_ng/pattern/data_panel/data_panel_pattern.cpp @@ -32,7 +32,7 @@ bool DataPanelPattern::OnDirtyLayoutWrapperSwap( RefPtr DataPanelPattern::CreateNodePaintMethod() { if (!dataPanelModifier_) { - dataPanelModifier_ = AceType::MakeRefPtr(); + dataPanelModifier_ = AceType::MakeRefPtr(WeakClaim(this)); } auto paintMethod = MakeRefPtr(dataPanelModifier_); auto host = GetHost(); diff --git a/frameworks/core/components_ng/pattern/gauge/gauge_modifier.cpp b/frameworks/core/components_ng/pattern/gauge/gauge_modifier.cpp index 9ad3f331cd1..d7bb4797cdb 100644 --- a/frameworks/core/components_ng/pattern/gauge/gauge_modifier.cpp +++ b/frameworks/core/components_ng/pattern/gauge/gauge_modifier.cpp @@ -75,7 +75,9 @@ void GaugeModifier::UpdateValue() option.SetDelay(ANIMATION_DELAY); option.SetCurve(curve); option.SetIteration(ANIMATION_TIMES); - AnimationUtils::Animate(option, [&]() { value_->Set(end_); }); + auto host = pattern->GetHost(); + auto context = host? host->GetContextRefPtr(): nullptr; + AnimationUtils::Animate(option, [&]() { value_->Set(end_); }, nullptr, nullptr, context); } void GaugeModifier::InitProperty() diff --git a/frameworks/core/components_ng/pattern/loading_progress/loading_progress_modifier.cpp b/frameworks/core/components_ng/pattern/loading_progress/loading_progress_modifier.cpp index ee2f3487362..7d44cacf245 100644 --- a/frameworks/core/components_ng/pattern/loading_progress/loading_progress_modifier.cpp +++ b/frameworks/core/components_ng/pattern/loading_progress/loading_progress_modifier.cpp @@ -19,6 +19,7 @@ #include "core/common/container.h" #include "core/components_ng/pattern/loading_progress/loading_progress_utill.h" #include "core/components_ng/render/drawing_prop_convertor.h" +#include "core/pipeline_ng/pipeline_context.h" namespace OHOS::Ace::NG { namespace { @@ -68,7 +69,8 @@ constexpr int32_t ANIMATION_MIN_FFR = 15; constexpr int32_t ANIMATION_MAX_FFR = 60; constexpr int32_t ANIMATION_EXPECT_FFR = 30; } // namespace -LoadingProgressModifier::LoadingProgressModifier(LoadingProgressOwner loadingProgressOwner) +LoadingProgressModifier::LoadingProgressModifier( + LoadingProgressOwner loadingProgressOwner, const WeakPtr& pattern) : enableLoading_(AceType::MakeRefPtr(true)), offset_(AceType::MakeRefPtr(OffsetF())), contentSize_(AceType::MakeRefPtr(SizeF())), @@ -80,6 +82,7 @@ LoadingProgressModifier::LoadingProgressModifier(LoadingProgressOwner loadingPro cometTailLen_(AceType::MakeRefPtr(TOTAL_TAIL_LENGTH)), sizeScale_(AceType::MakeRefPtr(1.0f)), useContentModifier_(AceType::MakeRefPtr(false)), + pattern_(pattern), loadingProgressOwner_(loadingProgressOwner) { AttachProperty(enableLoading_); @@ -399,11 +402,14 @@ void LoadingProgressModifier::StartCometTailAnimation() option.SetDuration(TAIL_ANIAMTION_DURATION); option.SetIteration(1); option.SetCurve(curve); + auto pattern = pattern_.Upgrade(); + auto host = pattern? pattern->GetHost(): nullptr; + auto context = host? host->GetContextRefPtr(): nullptr; AnimationUtils::Animate(option, [weakCometTailLen = AceType::WeakClaim(AceType::RawPtr(cometTailLen_))]() { auto cometTailLen = weakCometTailLen.Upgrade(); CHECK_NULL_VOID(cometTailLen); cometTailLen->Set(TOTAL_TAIL_LENGTH); - }); + }, nullptr, nullptr, context); } float LoadingProgressModifier::GetCurentCometOpacity(float baseOpacity, uint32_t index, uint32_t totalNumber) @@ -446,11 +452,14 @@ void LoadingProgressModifier::StartRecycle() } else { option.SetIteration(-1); } + auto pattern = pattern_.Upgrade(); + auto host = pattern? pattern->GetHost(): nullptr; + auto context = host? host->GetContextRefPtr(): nullptr; AnimationUtils::Animate(option, [weakDate = AceType::WeakClaim(AceType::RawPtr(date_))]() { auto date = weakDate.Upgrade(); CHECK_NULL_VOID(date); date->Set(FULL_COUNT); - }); + }, nullptr, nullptr, context); } cometOpacity_->Set(INITIAL_OPACITY_SCALE); cometSizeScale_->Set(INITIAL_SIZE_SCALE); @@ -471,6 +480,9 @@ void LoadingProgressModifier::StartTransToRecycleAnimation() option.SetDuration(TRANS_DURATION); option.SetIteration(1); option.SetCurve(curve); + auto pattern = pattern_.Upgrade(); + auto host = pattern? pattern->GetHost(): nullptr; + auto context = host? host->GetContextRefPtr(): nullptr; AnimationUtils::Animate( option, [weakDate = AceType::WeakClaim(AceType::RawPtr(date_)), @@ -493,7 +505,7 @@ void LoadingProgressModifier::StartTransToRecycleAnimation() auto modify = weak.Upgrade(); CHECK_NULL_VOID(modify); modify->StartRecycle(); - }); + }, nullptr, context); StartCometTailAnimation(); } @@ -533,6 +545,9 @@ void LoadingProgressModifier::CloseAnimation(float date, float cometLen, float c cometOpacity_->Set(cometOpacity + FAKE_DELTA); cometSizeScale_->Set(cometScale + FAKE_DELTA); centerDeviation_->Set(0.0f + FAKE_DELTA); + auto pattern = pattern_.Upgrade(); + auto host = pattern? pattern->GetHost(): nullptr; + auto context = host? host->GetContextRefPtr(): nullptr; AnimationUtils::Animate(option, [weak = AceType::WeakClaim(this), date, cometLen, cometOpacity, cometScale]() { auto curObj = weak.Upgrade(); CHECK_NULL_VOID(curObj); @@ -541,7 +556,7 @@ void LoadingProgressModifier::CloseAnimation(float date, float cometLen, float c curObj->cometOpacity_->Set(cometOpacity); curObj->cometSizeScale_->Set(cometScale); curObj->centerDeviation_->Set(0.0f); - }); + }, nullptr, nullptr, context); } float LoadingProgressModifier::CorrectNormalize(float originData) { diff --git a/frameworks/core/components_ng/pattern/loading_progress/loading_progress_modifier.h b/frameworks/core/components_ng/pattern/loading_progress/loading_progress_modifier.h index 32d4905cba3..87671bc89ae 100644 --- a/frameworks/core/components_ng/pattern/loading_progress/loading_progress_modifier.h +++ b/frameworks/core/components_ng/pattern/loading_progress/loading_progress_modifier.h @@ -22,6 +22,7 @@ #include "core/components_ng/base/modifier.h" #include "core/components_ng/pattern/loading_progress/loading_progress_base.h" #include "core/components_ng/pattern/loading_progress/loading_progress_owner.h" +#include "core/components_ng/pattern/pattern.h" #include "core/components_ng/pattern/refresh/refresh_animation_state.h" #include "core/components_ng/property/property.h" #include "core/components_ng/render/animation_utils.h" @@ -32,7 +33,8 @@ class LoadingProgressModifier : public ContentModifier { DECLARE_ACE_TYPE(LoadingProgressModifier, ContentModifier); public: - explicit LoadingProgressModifier(LoadingProgressOwner loadingProgressOwner = LoadingProgressOwner::SELF); + explicit LoadingProgressModifier(LoadingProgressOwner loadingProgressOwner = LoadingProgressOwner::SELF, + const WeakPtr& pattern = nullptr); ~LoadingProgressModifier() override = default; void onDraw(DrawingContext& context) override; void DrawOrbit(DrawingContext& canvas, const CometParam& cometParam, float orbitRadius, float date); @@ -131,6 +133,7 @@ private: RefPtr cometTailLen_; RefPtr sizeScale_; RefPtr useContentModifier_; + WeakPtr pattern_; LoadingProgressOwner loadingProgressOwner_; bool isLoading_ = false; diff --git a/frameworks/core/components_ng/pattern/loading_progress/loading_progress_pattern.h b/frameworks/core/components_ng/pattern/loading_progress/loading_progress_pattern.h index 72ff32e9b07..da3c121882a 100644 --- a/frameworks/core/components_ng/pattern/loading_progress/loading_progress_pattern.h +++ b/frameworks/core/components_ng/pattern/loading_progress/loading_progress_pattern.h @@ -44,7 +44,7 @@ public: CHECK_NULL_RETURN(paintProperty, nullptr); auto loadingOwner = paintProperty->GetLoadingProgressOwner().value_or(LoadingProgressOwner::SELF); - loadingProgressModifier_ = AceType::MakeRefPtr(loadingOwner); + loadingProgressModifier_ = AceType::MakeRefPtr(loadingOwner, WeakClaim(this)); loadingProgressModifier_->SetUseContentModifier(UseContentModifier()); InitThemeValues(); } diff --git a/frameworks/core/components_ng/pattern/patternlock/patternlock_modifier.cpp b/frameworks/core/components_ng/pattern/patternlock/patternlock_modifier.cpp index 942da53cd15..b6a153864bf 100644 --- a/frameworks/core/components_ng/pattern/patternlock/patternlock_modifier.cpp +++ b/frameworks/core/components_ng/pattern/patternlock/patternlock_modifier.cpp @@ -17,6 +17,7 @@ #include "core/components_ng/pattern/patternlock/patternlock_paint_property.h" #include "core/components_ng/render/drawing_prop_convertor.h" +#include "core/pipeline_ng/pipeline_context.h" namespace OHOS::Ace::NG { namespace { @@ -112,7 +113,7 @@ void PatternLockModifier::AttachProperties() AttachProperty(enableForeground_); } -PatternLockModifier::PatternLockModifier() +PatternLockModifier::PatternLockModifier(const WeakPtr& pattern) : pattern_(pattern) { CreateProperties(); AttachProperties(); @@ -640,7 +641,11 @@ void PatternLockModifier::StartChallengeResultAnimate() AnimationOption option = AnimationOption(); option.SetDuration(CONNECT_ANIMATION_DURATION_FIRST); option.SetCurve(Curves::SHARP); - AnimationUtils::Animate(option, [&]() { pointAnimateColor_->Set(LinearColor(correctColor_->Get())); }); + auto pattern = pattern_.Upgrade(); + auto host = pattern? pattern->GetHost(): nullptr; + auto context = host? host->GetContextRefPtr(): nullptr; + AnimationUtils::Animate( + option, [&]() { pointAnimateColor_->Set(LinearColor(correctColor_->Get())); }, nullptr, nullptr, context); } else if (challengeResult_.value() == NG::PatternLockChallengeResult::WRONG) { pointAnimateColor_->Set(LinearColor(wrongColor_->Get())); auto pathColor = pathColor_->Get(); @@ -731,8 +736,11 @@ void PatternLockModifier::SetBackgroundCircleRadius(int32_t index) auto curve = AceType::MakeRefPtr( BACKGROUND_RADIUS_SPRING_RESPONSE, BACKGROUND_RADIUS_SPRING_DAMPING); option.SetCurve(curve); + auto pattern = pattern_.Upgrade(); + auto host = pattern? pattern->GetHost(): nullptr; + auto context = host? host->GetContextRefPtr(): nullptr; AnimationUtils::Animate(option, - [&]() { backgroundCircleRadius_.at(index)->Set(backgroundCircleRadius); }); + [&]() { backgroundCircleRadius_.at(index)->Set(backgroundCircleRadius); }, nullptr, nullptr, context); } else { backgroundCircleRadius_.at(index)->Set(backgroundCircleRadius); } @@ -763,8 +771,12 @@ void PatternLockModifier::SetActiveCircleRadius(int32_t index) AnimationOption option = AnimationOption(); option.SetDuration(ACTIVE_RADIUS_ANIMATION_DURATION); option.SetCurve(Curves::FRICTION); + auto pattern = pattern_.Upgrade(); + auto host = pattern? pattern->GetHost(): nullptr; + auto context = host? host->GetContextRefPtr(): nullptr; AnimationUtils::Animate( - option, [&]() { activeCircleRadius_.at(index)->Set(circleRadius_->Get() * scaleActiveCircleRadius_); }); + option, [&]() { activeCircleRadius_.at(index)->Set(circleRadius_->Get() * scaleActiveCircleRadius_); }, + nullptr, nullptr, context); } } @@ -784,8 +796,12 @@ void PatternLockModifier::SetLightRingCircleRadius(int32_t index) AnimationOption option = AnimationOption(); option.SetDuration(LIGHT_RING_RADIUS_ANIMATION_DURATION); option.SetCurve(Curves::LINEAR); + auto pattern = pattern_.Upgrade(); + auto host = pattern? pattern->GetHost(): nullptr; + auto context = host? host->GetContextRefPtr(): nullptr; AnimationUtils::Animate( - option, [&]() { lightRingRadius_.at(index)->Set(circleRadius * scaleLightRingRadiusEnd_); }); + option, [&]() { lightRingRadius_.at(index)->Set(circleRadius * scaleLightRingRadiusEnd_); }, + nullptr, nullptr, context); } } @@ -805,14 +821,19 @@ void PatternLockModifier::SetLightRingAlphaF(int32_t index) AnimationOption optionFirst = AnimationOption(); optionFirst.SetDuration(LIGHT_RING_ALPHAF_ANIMATION_DURATION_FIRST); optionFirst.SetCurve(Curves::SHARP); + auto pattern = pattern_.Upgrade(); + auto host = pattern? pattern->GetHost(): nullptr; + auto context = host? host->GetContextRefPtr(): nullptr; optionFirst.SetOnFinishEvent([=] { AnimationOption optionSecond = AnimationOption(); optionSecond.SetDuration(LIGHT_RING_ALPHAF_ANIMATION_DURATION_SECOND); optionSecond.SetCurve(Curves::SHARP); - AnimationUtils::Animate(optionSecond, [=]() { singleLightRingAlphaF->Set(LIGHT_RING_ALPHAF_START); }); + AnimationUtils::Animate(optionSecond, [=]() { singleLightRingAlphaF->Set(LIGHT_RING_ALPHAF_START); }, + nullptr, nullptr, context); }); AnimationUtils::Animate( - optionFirst, [&]() { singleLightRingAlphaF->Set(LIGHT_RING_ALPHAF_END); }, optionFirst.GetOnFinishEvent()); + optionFirst, [&]() { singleLightRingAlphaF->Set(LIGHT_RING_ALPHAF_END); }, optionFirst.GetOnFinishEvent(), + nullptr, context); } } @@ -837,7 +858,10 @@ void PatternLockModifier::SetConnectedLineTailPoint(int32_t x, int32_t y) auto curve = AceType::MakeRefPtr(CONNECTED_LINE_SPRING_RESPONSE, CONNECTED_LINE_SPRING_DAMPING); option.SetCurve(curve); - AnimationUtils::Animate(option, [&]() { connectedLineTailPoint_->Set(lastPoint); }); + auto pattern = pattern_.Upgrade(); + auto host = pattern? pattern->GetHost(): nullptr; + auto context = host? host->GetContextRefPtr(): nullptr; + AnimationUtils::Animate(option, [&]() { connectedLineTailPoint_->Set(lastPoint); }, nullptr, nullptr, context); } else { connectedLineTailPoint_->Set(lastPoint); } @@ -862,7 +886,10 @@ void PatternLockModifier::SetCanceledLineTailPoint() auto curve = AceType::MakeRefPtr(CANCELED_LINE_SPRING_RESPONSE, CANCELED_LINE_SPRING_DAMPING); option.SetCurve(curve); - AnimationUtils::Animate(option, [&]() { canceledLineTailPoint_->Set(pointEnd); }); + auto pattern = pattern_.Upgrade(); + auto host = pattern? pattern->GetHost(): nullptr; + auto context = host? host->GetContextRefPtr(): nullptr; + AnimationUtils::Animate(option, [&]() { canceledLineTailPoint_->Set(pointEnd); }, nullptr, nullptr, context); } OffsetF PatternLockModifier::GetCanceledLineTailPoint() const diff --git a/frameworks/core/components_ng/pattern/patternlock/patternlock_modifier.h b/frameworks/core/components_ng/pattern/patternlock/patternlock_modifier.h index cf2f0103ba7..8a27d6d1523 100644 --- a/frameworks/core/components_ng/pattern/patternlock/patternlock_modifier.h +++ b/frameworks/core/components_ng/pattern/patternlock/patternlock_modifier.h @@ -24,6 +24,7 @@ #include "base/memory/referenced.h" #include "core/components/common/properties/color.h" #include "core/components_ng/base/modifier.h" +#include "core/components_ng/pattern/pattern.h" #include "core/components_ng/pattern/patternlock/patternlock_challenge.h" #include "core/components_ng/pattern/progress/progress_date.h" #include "core/components_ng/property/property.h" @@ -59,7 +60,7 @@ class PatternLockModifier : public ContentModifier { DECLARE_ACE_TYPE(PatternLockModifier, ContentModifier); public: - PatternLockModifier(); + PatternLockModifier(const WeakPtr& pattern); ~PatternLockModifier() override = default; void onDraw(DrawingContext& context) override; @@ -164,6 +165,7 @@ private: std::vector> lightRingRadius_; std::vector> lightRingAlphaF_; std::vector choosePoint_; + WeakPtr pattern_; float scaleActiveCircleRadius_ = 1.0f; float scaleBackgroundCircleRadius_ = 1.0f; diff --git a/frameworks/core/components_ng/pattern/patternlock/patternlock_pattern.h b/frameworks/core/components_ng/pattern/patternlock/patternlock_pattern.h index 6feeb0d59cc..d89147a9aa7 100644 --- a/frameworks/core/components_ng/pattern/patternlock/patternlock_pattern.h +++ b/frameworks/core/components_ng/pattern/patternlock/patternlock_pattern.h @@ -64,7 +64,7 @@ public: RefPtr CreateNodePaintMethod() override { if (!patternLockModifier_) { - patternLockModifier_ = AceType::MakeRefPtr(); + patternLockModifier_ = AceType::MakeRefPtr(WeakClaim(this)); } if (!isInitVirtualNode_ && AceApplicationInfo::GetInstance().IsAccessibilityEnabled()) { isInitVirtualNode_ = InitVirtualNode(); diff --git a/frameworks/core/components_ng/pattern/picker/date_time_animation_controller.cpp b/frameworks/core/components_ng/pattern/picker/date_time_animation_controller.cpp index 75a8a4b6965..a2b585ed22d 100644 --- a/frameworks/core/components_ng/pattern/picker/date_time_animation_controller.cpp +++ b/frameworks/core/components_ng/pattern/picker/date_time_animation_controller.cpp @@ -31,6 +31,7 @@ void DateTimeAnimationController::PlayTitleInAnimation() auto buttonIcon = buttonIcon_.Upgrade(); CHECK_NULL_VOID(buttonIcon); auto renderContext = buttonIcon->GetRenderContext(); + auto context = buttonIcon->GetContextRefPtr(); AnimationOption animationOption; animationOption.SetDuration(TRIANGLE_DURATION); animationOption.SetCurve(Curves::SHARP); @@ -40,7 +41,7 @@ void DateTimeAnimationController::PlayTitleInAnimation() [renderContext]() { CHECK_NULL_VOID(renderContext); renderContext->UpdateTransformRotate(Vector5F(0, 0, 1, 0 - SEMI_CIRCLE_ANGEL, 0)); - }); + }, nullptr, nullptr, context); } void DateTimeAnimationController::PlayTitleOutAnimation() @@ -48,6 +49,7 @@ void DateTimeAnimationController::PlayTitleOutAnimation() auto buttonIcon = buttonIcon_.Upgrade(); CHECK_NULL_VOID(buttonIcon); auto renderContext = buttonIcon->GetRenderContext(); + auto context = buttonIcon->GetContextRefPtr(); AnimationOption animationOption; animationOption.SetDuration(TRIANGLE_DURATION); animationOption.SetCurve(Curves::SHARP); @@ -57,7 +59,7 @@ void DateTimeAnimationController::PlayTitleOutAnimation() [renderContext]() { CHECK_NULL_VOID(renderContext); renderContext->UpdateTransformRotate(Vector5F(0, 0, 1, 0, 0)); - }); + }, nullptr, nullptr, context); } void DateTimeAnimationController::PlayMovingInAnimation() @@ -71,6 +73,7 @@ void DateTimeAnimationController::PlayMovingInAnimation() auto yearRenderContext = year->GetRenderContext(); auto monthRenderContext = month->GetRenderContext(); auto dayRenderContext = day->GetRenderContext(); + auto context = year->GetContextRefPtr(); AnimationOption animationOption; animationOption.SetDuration(MOVE_DURATION); animationOption.SetCurve(Curves::FRICTION); @@ -88,7 +91,7 @@ void DateTimeAnimationController::PlayMovingInAnimation() yearRenderContext->UpdateTransformTranslate({ ref->yearEnd_, 0.0f, 0.0f }); monthRenderContext->UpdateTransformTranslate({ ref->monthEnd_, 0.0f, 0.0f }); dayRenderContext->UpdateTransformTranslate({ ref->dayEnd_, 0.0f, 0.0f }); - }); + }, nullptr, nullptr, context); } void DateTimeAnimationController::PlayMovingOutAnimation() @@ -102,6 +105,7 @@ void DateTimeAnimationController::PlayMovingOutAnimation() auto yearRenderContext = year->GetRenderContext(); auto monthRenderContext = month->GetRenderContext(); auto dayRenderContext = day->GetRenderContext(); + auto context = year->GetContextRefPtr(); AnimationOption animationOption; animationOption.SetDuration(MOVE_DURATION); animationOption.SetCurve(Curves::FRICTION); @@ -119,7 +123,7 @@ void DateTimeAnimationController::PlayMovingOutAnimation() yearRenderContext->UpdateTransformTranslate({ ref->yearStart_, 0.0f, 0.0f }); monthRenderContext->UpdateTransformTranslate({ ref->monthStart_, 0.0f, 0.0f }); dayRenderContext->UpdateTransformTranslate({ ref->dayStart_, 0.0f, 0.0f }); - }); + }, nullptr, nullptr, context); } void DateTimeAnimationController::PlayOldColumnOpacityInAnimation() @@ -181,6 +185,7 @@ void DateTimeAnimationController::PlayNewColumnOpacityInAnimation() CHECK_NULL_VOID(day); auto monthRender = month->GetRenderContext(); auto dayRender = day->GetRenderContext(); + auto context = month->GetContextRefPtr(); CHECK_NULL_VOID(monthRender); CHECK_NULL_VOID(dayRender); @@ -196,7 +201,7 @@ void DateTimeAnimationController::PlayNewColumnOpacityInAnimation() CHECK_NULL_VOID(dayRender); monthRender->UpdateOpacity(1); dayRender->UpdateOpacity(1); - }); + }, nullptr, nullptr, context); } void DateTimeAnimationController::PlayYearColumnOpacityInAnimation() @@ -298,6 +303,7 @@ void DateTimeAnimationController::PlayNewColumnOpacityOutAnimation() CHECK_NULL_VOID(day); auto monthRender = month->GetRenderContext(); auto dayRender = day->GetRenderContext(); + auto context = month->GetContextRefPtr(); CHECK_NULL_VOID(monthRender); CHECK_NULL_VOID(dayRender); @@ -314,7 +320,7 @@ void DateTimeAnimationController::PlayNewColumnOpacityOutAnimation() CHECK_NULL_VOID(dayRender); monthRender->UpdateOpacity(0); dayRender->UpdateOpacity(0); - }); + }, nullptr, nullptr, context); } void DateTimeAnimationController::PlayYearColumnOpacityOutAnimation() diff --git a/frameworks/core/components_ng/pattern/picker/datepicker_dialog_view.cpp b/frameworks/core/components_ng/pattern/picker/datepicker_dialog_view.cpp index 5b552edb3da..c7d4a39eef4 100644 --- a/frameworks/core/components_ng/pattern/picker/datepicker_dialog_view.cpp +++ b/frameworks/core/components_ng/pattern/picker/datepicker_dialog_view.cpp @@ -1567,6 +1567,7 @@ void DatePickerDialogView::PlayHoverAnimation(const RefPtr& titleButt option.SetDuration(HOVER_ANIMATION_DURATION); option.SetCurve(Curves::FRICTION); option.SetFillMode(FillMode::FORWARDS); + auto context = titleButton->GetContextRefPtr(); AnimationUtils::Animate(option, [weak = WeakPtr(titleButton), color]() { auto titleButton = weak.Upgrade(); auto buttonTitleNode = AceType::DynamicCast(titleButton); @@ -1574,7 +1575,7 @@ void DatePickerDialogView::PlayHoverAnimation(const RefPtr& titleButt auto buttonTitleRenderContext = buttonTitleNode->GetRenderContext(); buttonTitleRenderContext->UpdateBackgroundColor(color); buttonTitleNode->MarkDirtyNode(); - }); + }, nullptr, nullptr, context); } RefPtr DatePickerDialogView::CreateAndMountDateNode( diff --git a/frameworks/core/components_ng/pattern/picker_utils/picker_column_pattern.cpp b/frameworks/core/components_ng/pattern/picker_utils/picker_column_pattern.cpp index ccf548d9531..c920d40cdcd 100644 --- a/frameworks/core/components_ng/pattern/picker_utils/picker_column_pattern.cpp +++ b/frameworks/core/components_ng/pattern/picker_utils/picker_column_pattern.cpp @@ -301,11 +301,13 @@ void PickerColumnPattern::PlayPressAnimation(const Color& pressColor) option.SetDuration(PRESS_ANIMATION_DURATION); option.SetCurve(Curves::SHARP); option.SetFillMode(FillMode::FORWARDS); + auto host = GetHost(); + auto context = host? host->GetContextRefPtr(): nullptr; AnimationUtils::Animate(option, [weak = AceType::WeakClaim(this), pressColor]() { auto picker = weak.Upgrade(); CHECK_NULL_VOID(picker); picker->SetButtonBackgroundColor(pressColor); - }); + }, nullptr, nullptr, context); } void PickerColumnPattern::PlayHoverAnimation(const Color& color) @@ -314,11 +316,13 @@ void PickerColumnPattern::PlayHoverAnimation(const Color& color) option.SetDuration(HOVER_ANIMATION_DURATION); option.SetCurve(Curves::FRICTION); option.SetFillMode(FillMode::FORWARDS); + auto host = GetHost(); + auto context = host? host->GetContextRefPtr(): nullptr; AnimationUtils::Animate(option, [weak = AceType::WeakClaim(this), color]() { auto picker = weak.Upgrade(); CHECK_NULL_VOID(picker); picker->SetButtonBackgroundColor(color); - }); + }, nullptr, nullptr, context); } bool PickerColumnPattern::OnDirtyLayoutWrapperSwap(const RefPtr& dirty, const DirtySwapConfig& config) @@ -571,11 +575,13 @@ void PickerColumnPattern::CreateAnimation(double from, double to) option.SetCurve(Curves::FAST_OUT_SLOW_IN); option.SetDuration(CLICK_ANIMATION_DURATION); scrollProperty_->Set(from); + auto host = GetHost(); + auto context = host? host->GetContextRefPtr(): nullptr; AnimationUtils::Animate(option, [weak = AceType::WeakClaim(this), to]() { auto column = weak.Upgrade(); CHECK_NULL_VOID(column); column->scrollProperty_->Set(to); - }); + }, nullptr, nullptr, context); } void PickerColumnPattern::ScrollOption(double delta, bool isJump) diff --git a/frameworks/core/components_ng/pattern/picker_utils/toss_animation_controller.cpp b/frameworks/core/components_ng/pattern/picker_utils/toss_animation_controller.cpp index 41595eb9c04..a6cfc1501fc 100644 --- a/frameworks/core/components_ng/pattern/picker_utils/toss_animation_controller.cpp +++ b/frameworks/core/components_ng/pattern/picker_utils/toss_animation_controller.cpp @@ -121,6 +121,7 @@ void TossAnimationController::StartSpringMotion() } } }; + auto context = columnNode->GetContextRefPtr(); AnimationUtils::Animate( option, [weak]() { @@ -128,7 +129,7 @@ void TossAnimationController::StartSpringMotion() CHECK_NULL_VOID(ref); ref->property_->Set(ref->end_); }, - finishCallback); + finishCallback, nullptr, context); } void TossAnimationController::StopTossAnimation() @@ -144,11 +145,13 @@ void TossAnimationController::StopTossAnimation() option.SetCurve(Curves::LINEAR); option.SetDuration(0); option.SetDelay(0); + auto columnNode = column->GetHost(); + auto context = columnNode? columnNode->GetContextRefPtr(): nullptr; AnimationUtils::Animate(option, [weak]() { auto ref = weak.Upgrade(); CHECK_NULL_VOID(ref); ref->property_->Set(0.0); - }); + }, nullptr, nullptr, context); } RefPtr TossAnimationController::UpdatePlayAnimationValue() { diff --git a/frameworks/core/components_ng/pattern/progress/progress_modifier.cpp b/frameworks/core/components_ng/pattern/progress/progress_modifier.cpp index c1130bd3380..5b46e3cda83 100644 --- a/frameworks/core/components_ng/pattern/progress/progress_modifier.cpp +++ b/frameworks/core/components_ng/pattern/progress/progress_modifier.cpp @@ -18,6 +18,7 @@ #include "core/components/progress/progress_theme.h" #include "core/components_ng/render/drawing_prop_convertor.h" #include "core/pipeline/base/constants.h" +#include "core/pipeline_ng/pipeline_context.h" namespace OHOS::Ace::NG { namespace { @@ -51,7 +52,7 @@ constexpr int32_t ANIMATION_MAX_FFR = 60; constexpr int32_t ANIMATION_EXPECT_FFR = 30; } // namespace ProgressModifier::ProgressModifier(const WeakPtr& host, - const ProgressAnimatableProperty& progressAnimatableProperty_) + const ProgressAnimatableProperty& progressAnimatableProperty_, const WeakPtr& pattern) : strokeWidth_(AceType::MakeRefPtr(progressAnimatableProperty_.strokeWidth)), color_(AceType::MakeRefPtr(LinearColor(progressAnimatableProperty_.color))), bgColor_(AceType::MakeRefPtr(LinearColor(progressAnimatableProperty_.bgColor))), @@ -81,7 +82,8 @@ ProgressModifier::ProgressModifier(const WeakPtr& host, isRightToLeft_(AceType::MakeRefPtr(false)), progressUpdate_(AceType::MakeRefPtr(false)), capsuleBorderRadius_(AceType::MakeRefPtr(0.0f)), - host_(host) + host_(host), + pattern_(pattern) { AttachProperty(strokeWidth_); AttachProperty(color_); @@ -224,6 +226,9 @@ void ProgressModifier::StartCapsuleSweepingAnimationImpl(float value, float spee option.SetIteration(-1); option.SetDuration(time); + auto pattern = pattern_.Upgrade(); + auto host = pattern? pattern->GetHost(): nullptr; + auto context = host? host->GetContextRefPtr(): nullptr; AnimationUtils::Animate( option, [value, id = Container::CurrentId(), weak = WeakClaim(this)]() { @@ -245,7 +250,7 @@ void ProgressModifier::StartCapsuleSweepingAnimationImpl(float value, float spee auto context = PipelineBase::GetCurrentContext(); context->RequestFrame(); } - }); + }, context); } void ProgressModifier::SetRingProgressColor(const Gradient& color) @@ -317,6 +322,9 @@ void ProgressModifier::StartRingLoadingHeadAnimation() optionHead.SetDuration(LOADING_ANIMATION_DURATION); optionHead.SetCurve(curveHead); optionHead.SetIteration(isFormRender ? 1 : -1); + auto pattern = pattern_.Upgrade(); + auto host = pattern? pattern->GetHost(): nullptr; + auto contextPtr = host? host->GetContextRefPtr(): nullptr; AnimationUtils::Animate( optionHead, [&]() { trailingHeadDate_->Set(ANGLE_360); }, nullptr, [weak = AceType::WeakClaim(this), id = Container::CurrentId()]() { @@ -326,7 +334,7 @@ void ProgressModifier::StartRingLoadingHeadAnimation() if (static_cast(modifier->progressStatus_->Get()) == ProgressStatus::PROGRESSING) { modifier->StopRingLoadingHeadAnimation(); } - }); + }, contextPtr); } void ProgressModifier::StartRingLoadingTailAnimation() @@ -339,6 +347,9 @@ void ProgressModifier::StartRingLoadingTailAnimation() optionTail.SetDuration(LOADING_ANIMATION_DURATION); optionTail.SetCurve(curveTail); optionTail.SetIteration(isFormRender ? 1 : -1); + auto pattern = pattern_.Upgrade(); + auto host = pattern? pattern->GetHost(): nullptr; + auto contextPtr = host? host->GetContextRefPtr(): nullptr; AnimationUtils::Animate( optionTail, [&]() { trailingTailDate_->Set(ANGLE_360); }, @@ -353,21 +364,27 @@ void ProgressModifier::StartRingLoadingTailAnimation() modifier->SetValue(modifier->valueBackup_); } } - }); + }, contextPtr); } void ProgressModifier::StopRingLoadingHeadAnimation() { AnimationOption option = AnimationOption(); option.SetDuration(0); - AnimationUtils::Animate(option, [&]() { trailingHeadDate_->Set(0.0f); }); + auto pattern = pattern_.Upgrade(); + auto host = pattern? pattern->GetHost(): nullptr; + auto contextPtr = host? host->GetContextRefPtr(): nullptr; + AnimationUtils::Animate(option, [&]() { trailingHeadDate_->Set(0.0f); }, nullptr, nullptr, contextPtr); } void ProgressModifier::StopRingLoadingTailAnimation() { AnimationOption option = AnimationOption(); option.SetDuration(0); - AnimationUtils::Animate(option, [&]() { trailingTailDate_->Set(0.0f); }); + auto pattern = pattern_.Upgrade(); + auto host = pattern? pattern->GetHost(): nullptr; + auto contextPtr = host? host->GetContextRefPtr(): nullptr; + AnimationUtils::Animate(option, [&]() { trailingTailDate_->Set(0.0f); }, nullptr, nullptr, contextPtr); isLoading_ = false; } @@ -429,6 +446,9 @@ void ProgressModifier::StartRingSweepingAnimationImpl(float date, float speed) option.SetCurve(motion); option.SetIteration(isFormRender ? 1 : -1); option.SetDuration(time); + auto pattern = pattern_.Upgrade(); + auto host = pattern? pattern->GetHost(): nullptr; + auto contextPtr = host? host->GetContextRefPtr(): nullptr; AnimationUtils::Animate( option, [&]() { sweepingDate_->Set(date); }, @@ -445,7 +465,7 @@ void ProgressModifier::StartRingSweepingAnimationImpl(float date, float speed) auto context = PipelineBase::GetCurrentContext(); context->RequestFrame(); } - }); + }, contextPtr); } void ProgressModifier::StartContinuousSweepingAnimation(float currentDate, float newDate, float speed) @@ -467,6 +487,9 @@ void ProgressModifier::StartContinuousSweepingAnimation(float currentDate, float auto motion = AceType::MakeRefPtr(); option.SetCurve(motion); option.SetDuration(time); + auto pattern = pattern_.Upgrade(); + auto host = pattern? pattern->GetHost(): nullptr; + auto contextPtr = host? host->GetContextRefPtr(): nullptr; AnimationUtils::Animate( option, [&]() { sweepingDate_->Set(newDate); }, @@ -498,7 +521,7 @@ void ProgressModifier::StartContinuousSweepingAnimation(float currentDate, float auto context = PipelineBase::GetCurrentContext(); context->RequestFrame(); } - }); + }, nullptr, contextPtr); } bool ProgressModifier::IsSweepEffectOn() @@ -522,7 +545,10 @@ void ProgressModifier::StopSweepingAnimation(float date) dateUpdated_ = false; AnimationOption option = AnimationOption(); option.SetDuration(0); - AnimationUtils::Animate(option, [&]() { sweepingDate_->Set(date); }); + auto pattern = pattern_.Upgrade(); + auto host = pattern? pattern->GetHost(): nullptr; + auto contextPtr = host? host->GetContextRefPtr(): nullptr; + AnimationUtils::Animate(option, [&]() { sweepingDate_->Set(date); }, nullptr, nullptr, contextPtr); } } @@ -598,6 +624,9 @@ void ProgressModifier::StartLinearSweepingAnimationImpl(float date, float speed) option.SetCurve(motion); option.SetIteration(isFormRender ? 1 : -1); option.SetDuration(time); + auto pattern = pattern_.Upgrade(); + auto host = pattern? pattern->GetHost(): nullptr; + auto contextPtr = host? host->GetContextRefPtr(): nullptr; AnimationUtils::Animate( option, [&]() { sweepingDate_->Set(date); }, @@ -614,7 +643,7 @@ void ProgressModifier::StartLinearSweepingAnimationImpl(float date, float speed) auto context = PipelineBase::GetCurrentContext(); context->RequestFrame(); } - }); + }, contextPtr); } void ProgressModifier::SetMaxValue(float value) @@ -644,7 +673,10 @@ void ProgressModifier::SetValue(float value) RefPtr frameRateRange = AceType::MakeRefPtr(ANIMATION_MIN_FFR, ANIMATION_MAX_FFR, ANIMATION_EXPECT_FFR); option.SetFrameRateRange(frameRateRange); - AnimationUtils::Animate(option, [&]() { value_->Set(value); }); + auto pattern = pattern_.Upgrade(); + auto host = pattern? pattern->GetHost(): nullptr; + auto contextPtr = host? host->GetContextRefPtr(): nullptr; + AnimationUtils::Animate(option, [&]() { value_->Set(value); }, nullptr, nullptr, contextPtr); } else { value_->Set(value); } diff --git a/frameworks/core/components_ng/pattern/progress/progress_modifier.h b/frameworks/core/components_ng/pattern/progress/progress_modifier.h index 722035f4aa1..6eeee580bef 100644 --- a/frameworks/core/components_ng/pattern/progress/progress_modifier.h +++ b/frameworks/core/components_ng/pattern/progress/progress_modifier.h @@ -22,6 +22,7 @@ #include "core/common/container.h" #include "core/components/common/properties/color.h" #include "core/components_ng/base/modifier.h" +#include "core/components_ng/pattern/pattern.h" #include "core/components_ng/pattern/progress/progress_date.h" #include "core/components_ng/render/drawing.h" @@ -40,7 +41,8 @@ class ProgressModifier : public ContentModifier { public: explicit ProgressModifier( const WeakPtr& host, - const ProgressAnimatableProperty& progressAnimatableProperty = ProgressAnimatableProperty {}); + const ProgressAnimatableProperty& progressAnimatableProperty = ProgressAnimatableProperty {}, + const WeakPtr& pattern = nullptr); ~ProgressModifier() override = default; void onDraw(DrawingContext& context) override; @@ -191,6 +193,7 @@ private: bool dateUpdated_ = false; Dimension ringProgressLeftPadding_ = 0.0_vp; WeakPtr host_; + WeakPtr pattern_; ACE_DISALLOW_COPY_AND_MOVE(ProgressModifier); }; diff --git a/frameworks/core/components_ng/pattern/progress/progress_pattern.h b/frameworks/core/components_ng/pattern/progress/progress_pattern.h index 79a4c536fed..043a6c2ef47 100644 --- a/frameworks/core/components_ng/pattern/progress/progress_pattern.h +++ b/frameworks/core/components_ng/pattern/progress/progress_pattern.h @@ -51,7 +51,8 @@ public: if (!progressModifier_) { ProgressAnimatableProperty progressAnimatableProperty {}; InitAnimatableProperty(progressAnimatableProperty); - progressModifier_ = AceType::MakeRefPtr(GetHost(), progressAnimatableProperty); + progressModifier_ = AceType::MakeRefPtr( + GetHost(), progressAnimatableProperty, WeakClaim(this)); } bool isRtl = progressLayoutProperty->GetNonAutoLayoutDirection() == TextDirection::RTL; if (isRightToLeft_ != isRtl) { diff --git a/frameworks/core/components_ng/pattern/text_picker/textpicker_column_pattern.cpp b/frameworks/core/components_ng/pattern/text_picker/textpicker_column_pattern.cpp index 99d4e12c24b..4c9f271213a 100644 --- a/frameworks/core/components_ng/pattern/text_picker/textpicker_column_pattern.cpp +++ b/frameworks/core/components_ng/pattern/text_picker/textpicker_column_pattern.cpp @@ -555,12 +555,14 @@ void TextPickerColumnPattern::PlayPressAnimation(const Color& pressColor) AnimationOption option = AnimationOption(); option.SetDuration(HOVER_ANIMATION_DURATION); option.SetFillMode(FillMode::FORWARDS); + auto host = GetHost(); + auto context = host? host->GetContextRefPtr(): nullptr; AnimationUtils::Animate(option, [weak = AceType::WeakClaim(this), pressColor]() { auto picker = weak.Upgrade(); if (picker) { picker->SetButtonBackgroundColor(pressColor); } - }); + }, nullptr, nullptr, context); } uint32_t TextPickerColumnPattern::GetShowOptionCount() const @@ -1538,11 +1540,13 @@ void TextPickerColumnPattern::CreateAnimation(double from, double to) option.SetCurve(Curves::FAST_OUT_SLOW_IN); option.SetDuration(CLICK_ANIMATION_DURATION); scrollProperty_->Set(from); + auto host = GetHost(); + auto context = host? host->GetContextRefPtr(): nullptr; AnimationUtils::Animate(option, [weak = AceType::WeakClaim(this), to]() { auto column = weak.Upgrade(); CHECK_NULL_VOID(column); column->scrollProperty_->Set(to); - }); + }, nullptr, nullptr, context); } void TextPickerColumnPattern::CreateReboundAnimation(double from, double to) diff --git a/frameworks/core/components_ng/pattern/text_picker/toss_animation_controller.cpp b/frameworks/core/components_ng/pattern/text_picker/toss_animation_controller.cpp index a137f3e8ba9..0dc0c04bbd7 100644 --- a/frameworks/core/components_ng/pattern/text_picker/toss_animation_controller.cpp +++ b/frameworks/core/components_ng/pattern/text_picker/toss_animation_controller.cpp @@ -91,6 +91,7 @@ void TextPickerTossAnimationController::StartSpringMotion() auto offset = column->GetOffset(); auto speed = column->GetMainVelocity() / VELOCTY_TRANS; auto renderContext = columnNode->GetRenderContext(); + auto context = columnNode->GetContextRefPtr(); CHECK_NULL_VOID(renderContext); auto springCurve = UpdatePlayAnimationValue(); CHECK_NULL_VOID(springCurve); @@ -128,7 +129,7 @@ void TextPickerTossAnimationController::StartSpringMotion() CHECK_NULL_VOID(ref); ref->property_->Set(ref->end_); }, - finishCallback); + finishCallback, nullptr, context); } void TextPickerTossAnimationController::StopTossAnimation() @@ -143,11 +144,13 @@ void TextPickerTossAnimationController::StopTossAnimation() option.SetCurve(Curves::LINEAR); option.SetDuration(0); option.SetDelay(0); + auto columnNode = column->GetHost(); + auto context = columnNode? columnNode->GetContextRefPtr(): nullptr; AnimationUtils::Animate(option, [weak]() { auto ref = weak.Upgrade(); ref->isManualStopToss_ = true; ref->property_->Set(0.0); - }); + }, nullptr, nullptr, context); } RefPtr TextPickerTossAnimationController::UpdatePlayAnimationValue() diff --git a/test/unittest/core/pattern/data_panel/data_panel_test_ng.cpp b/test/unittest/core/pattern/data_panel/data_panel_test_ng.cpp index 7e264b655d3..24d7d567110 100644 --- a/test/unittest/core/pattern/data_panel/data_panel_test_ng.cpp +++ b/test/unittest/core/pattern/data_panel/data_panel_test_ng.cpp @@ -813,7 +813,7 @@ HWTEST_F(DataPanelTestNg, DataPanelPaintProgressTest001, TestSize.Level0) auto dataTheme = AceType::MakeRefPtr(); EXPECT_CALL(*themeManager, GetTheme(_)).WillOnce(Return(dataTheme)); - DataPanelModifier dataPanelModifier; + DataPanelModifier dataPanelModifier(nullptr); Testing::MockCanvas rsCanvas; ArcData arcData; EXPECT_CALL(rsCanvas, AttachBrush(_)).WillRepeatedly(ReturnRef(rsCanvas)); @@ -854,7 +854,7 @@ HWTEST_F(DataPanelTestNg, DataPanelPaintBackgroundTest001, TestSize.Level0) auto dataTheme = AceType::MakeRefPtr(); EXPECT_CALL(*themeManager, GetTheme(_)).WillOnce(Return(dataTheme)); - DataPanelModifier dataPanelModifier; + DataPanelModifier dataPanelModifier(nullptr); Testing::MockCanvas rsCanvas; EXPECT_CALL(rsCanvas, AttachBrush(_)).WillRepeatedly(ReturnRef(rsCanvas)); EXPECT_CALL(rsCanvas, DetachBrush()).WillRepeatedly(ReturnRef(rsCanvas)); @@ -875,7 +875,7 @@ HWTEST_F(DataPanelTestNg, DataPanelPaintSpaceTest001, TestSize.Level0) auto dataTheme = AceType::MakeRefPtr(); EXPECT_CALL(*themeManager, GetTheme(_)).WillRepeatedly(Return(dataTheme)); - DataPanelModifier dataPanelModifier; + DataPanelModifier dataPanelModifier(nullptr); Testing::MockCanvas rsCanvas; EXPECT_CALL(rsCanvas, AttachBrush(_)).WillRepeatedly(ReturnRef(rsCanvas)); EXPECT_CALL(rsCanvas, DetachBrush()).WillRepeatedly(ReturnRef(rsCanvas)); @@ -891,7 +891,7 @@ HWTEST_F(DataPanelTestNg, DataPanelPaintSpaceTest001, TestSize.Level0) /** * @tc.case: layout direction rtl */ - DataPanelModifier dataPanelModifierRtl; + DataPanelModifier dataPanelModifierRtl(nullptr); dataPanelModifierRtl.SetIsRtl(true); dataPanelModifierRtl.PaintSpace(rsCanvas, linearData, SPACEWIDTH); } @@ -908,7 +908,7 @@ HWTEST_F(DataPanelTestNg, DataPanelPaintColorSegmentTest001, TestSize.Level0) auto dataTheme = AceType::MakeRefPtr(); EXPECT_CALL(*themeManager, GetTheme(_)).WillRepeatedly(Return(dataTheme)); - DataPanelModifier dataPanelModifier; + DataPanelModifier dataPanelModifier(nullptr); Testing::MockCanvas rsCanvas; EXPECT_CALL(rsCanvas, AttachBrush(_)).WillRepeatedly(ReturnRef(rsCanvas)); EXPECT_CALL(rsCanvas, DetachBrush()).WillRepeatedly(ReturnRef(rsCanvas)); @@ -936,7 +936,7 @@ HWTEST_F(DataPanelTestNg, DataPanelPaintColorSegmentTest001, TestSize.Level0) /** * @tc.case: layout direction rtl */ - DataPanelModifier dataPanelModifierRtl; + DataPanelModifier dataPanelModifierRtl(nullptr); dataPanelModifierRtl.SetIsRtl(true); dataPanelModifierRtl.PaintColorSegment(rsCanvas, linerData); } @@ -953,7 +953,7 @@ HWTEST_F(DataPanelTestNg, DataPanelPaintTrackBackgroundTest001, TestSize.Level0) auto dataTheme = AceType::MakeRefPtr(); EXPECT_CALL(*themeManager, GetTheme(_)).WillOnce(Return(dataTheme)); - DataPanelModifier dataPanelModifier; + DataPanelModifier dataPanelModifier(nullptr); Testing::MockCanvas rsCanvas; ArcData arcData; EXPECT_CALL(rsCanvas, AttachPen(_)).WillOnce(ReturnRef(rsCanvas)); @@ -977,7 +977,7 @@ HWTEST_F(DataPanelTestNg, DataPanelPaintCircleTest001, TestSize.Level0) MockPipelineContext::GetCurrent()->SetThemeManager(themeManager); EXPECT_CALL(*themeManager, GetTheme(_)).WillOnce(Return(AceType::MakeRefPtr())); - DataPanelModifier dataPanelModifier; + DataPanelModifier dataPanelModifier(nullptr); Testing::MockCanvas rsCanvas; DrawingContext context { rsCanvas, -10.0f, -10.0f }; EXPECT_CALL(rsCanvas, AttachBrush(_)).WillRepeatedly(ReturnRef(rsCanvas)); @@ -1007,7 +1007,7 @@ HWTEST_F(DataPanelTestNg, DataPanelPaintCircleTest002, TestSize.Level0) dataPanelTheme->color = { { Color::WHITE, Color::BLACK }, { Color::WHITE, Color::BLACK }, { Color::WHITE, Color::BLACK } }; EXPECT_CALL(*themeManager, GetTheme(_)).WillOnce(Return(dataPanelTheme)); - DataPanelModifier dataPanelModifier; + DataPanelModifier dataPanelModifier(nullptr); Testing::MockCanvas rsCanvas; DrawingContext context { rsCanvas, 10.0f, 10.0f }; EXPECT_CALL(rsCanvas, AttachBrush(_)).WillRepeatedly(ReturnRef(rsCanvas)); @@ -1043,7 +1043,7 @@ HWTEST_F(DataPanelTestNg, DataPanelPaintCircleTest003, TestSize.Level1) dataPanelTheme->color = { { Color::WHITE, Color::BLACK }, { Color::WHITE, Color::BLACK }, { Color::WHITE, Color::BLACK } }; EXPECT_CALL(*themeManager, GetTheme(_)).WillOnce(Return(dataPanelTheme)); - DataPanelModifier dataPanelModifier; + DataPanelModifier dataPanelModifier(nullptr); Testing::MockCanvas rsCanvas; DrawingContext context { rsCanvas, 10.0f, 10.0f }; EXPECT_CALL(rsCanvas, AttachBrush(_)).WillRepeatedly(ReturnRef(rsCanvas)); @@ -1112,7 +1112,7 @@ HWTEST_F(DataPanelTestNg, DataPanelPaintCircleTest004, TestSize.Level0) dataPanelTheme->color = { { Color::WHITE, Color::BLACK }, { Color::WHITE, Color::BLACK }, { Color::WHITE, Color::BLACK } }; EXPECT_CALL(*themeManager, GetTheme(_)).WillOnce(Return(dataPanelTheme)); - DataPanelModifier dataPanelModifier; + DataPanelModifier dataPanelModifier(nullptr); Testing::MockCanvas rsCanvas; DrawingContext context { rsCanvas, 10.0f, 10.0f }; @@ -1167,7 +1167,7 @@ HWTEST_F(DataPanelTestNg, DataPanelPaintCircleTest005, TestSize.Level0) dataPanelTheme->color = { { Color::WHITE, Color::BLACK }, { Color::WHITE, Color::BLACK }, { Color::WHITE, Color::BLACK } }; EXPECT_CALL(*themeManager, GetTheme(_)).WillOnce(Return(dataPanelTheme)); - DataPanelModifier dataPanelModifier; + DataPanelModifier dataPanelModifier(nullptr); Testing::MockCanvas rsCanvas; DrawingContext context { rsCanvas, 10.0f, 10.0f }; @@ -1222,7 +1222,7 @@ HWTEST_F(DataPanelTestNg, DataPanelPaintLinearProgressTest001, TestSize.Level0) dataPanelTheme->color = { { Color::WHITE, Color::BLACK }, { Color::WHITE, Color::BLACK }, { Color::WHITE, Color::BLACK } }; EXPECT_CALL(*themeManager, GetTheme(_)).WillOnce(Return(dataPanelTheme)); - DataPanelModifier dataPanelModifier; + DataPanelModifier dataPanelModifier(nullptr); Testing::MockCanvas rsCanvas; DrawingContext context { rsCanvas, 10.0f, 10.0f }; EXPECT_CALL(rsCanvas, AttachBrush(_)).WillRepeatedly(ReturnRef(rsCanvas)); @@ -1279,7 +1279,7 @@ HWTEST_F(DataPanelTestNg, DataPanelPaintLinearProgressTest002, TestSize.Level0) dataPanelTheme->color = { { Color::WHITE, Color::BLACK }, { Color::WHITE, Color::BLACK }, { Color::WHITE, Color::BLACK } }; EXPECT_CALL(*themeManager, GetTheme(_)).WillOnce(Return(dataPanelTheme)); - DataPanelModifier dataPanelModifier; + DataPanelModifier dataPanelModifier(nullptr); Testing::MockCanvas rsCanvas; DrawingContext context { rsCanvas, 10.0f, 10.0f }; EXPECT_CALL(rsCanvas, AttachBrush(_)).WillRepeatedly(ReturnRef(rsCanvas)); @@ -1310,7 +1310,7 @@ HWTEST_F(DataPanelTestNg, DataPanelPaintLinearProgressTest003, TestSize.Level0) dataPanelTheme->color = { { Color::WHITE, Color::BLACK }, { Color::WHITE, Color::BLACK }, { Color::WHITE, Color::BLACK } }; EXPECT_CALL(*themeManager, GetTheme(_)).WillOnce(Return(dataPanelTheme)); - DataPanelModifier dataPanelModifier; + DataPanelModifier dataPanelModifier(nullptr); Testing::MockCanvas rsCanvas; DrawingContext context { rsCanvas, 10.0f, 10.0f }; EXPECT_CALL(rsCanvas, AttachBrush(_)).WillRepeatedly(ReturnRef(rsCanvas)); @@ -1340,7 +1340,7 @@ HWTEST_F(DataPanelTestNg, DataPanelPaintColorSegmentFilterMaskTest001, TestSize. dataPanelTheme->color = { { Color::WHITE, Color::BLACK }, { Color::WHITE, Color::BLACK }, { Color::WHITE, Color::BLACK } }; EXPECT_CALL(*themeManager, GetTheme(_)).WillRepeatedly(Return(dataPanelTheme)); - DataPanelModifier dataPanelModifier; + DataPanelModifier dataPanelModifier(nullptr); Testing::MockCanvas rsCanvas; DrawingContext context { rsCanvas, 10.0f, 10.0f }; EXPECT_CALL(rsCanvas, AttachBrush(_)).WillRepeatedly(ReturnRef(rsCanvas)); @@ -1387,7 +1387,7 @@ HWTEST_F(DataPanelTestNg, DataPanelPaintColorSegmentFilterMaskTest001, TestSize. /** * @tc.case: case. layout direction rtl */ - DataPanelModifier dataPanelModifierRtl; + DataPanelModifier dataPanelModifierRtl(nullptr); dataPanelModifierRtl.SetIsRtl(true); dataPanelModifierRtl.PaintColorSegmentFilterMask(rsCanvas, segmentLinearData); } @@ -1407,7 +1407,7 @@ HWTEST_F(DataPanelTestNg, DataPanelUpdateDateTest001, TestSize.Level0) /** * @tc.cases: case. cover branch isEffect_. */ - DataPanelModifier dataPanelModifier; + DataPanelModifier dataPanelModifier(nullptr); dataPanelModifier.isEffect_->Set(true); dataPanelModifier.date_->Set(0.0f); dataPanelModifier.UpdateDate(); @@ -1433,7 +1433,7 @@ HWTEST_F(DataPanelTestNg, DataPanelOnDrawTest001, TestSize.Level0) MockPipelineContext::GetCurrent()->SetThemeManager(themeManager); auto dataTheme = AceType::MakeRefPtr(); EXPECT_CALL(*themeManager, GetTheme(_)).WillRepeatedly(Return(dataTheme)); - DataPanelModifier dataPanelModifier; + DataPanelModifier dataPanelModifier(nullptr); /** * @tc.steps: step2. construct context and call onDraw(). @@ -1472,7 +1472,7 @@ HWTEST_F(DataPanelTestNg, DataPanelSortGradientColorsOffsetTest001, TestSize.Lev MockPipelineContext::GetCurrent()->SetThemeManager(themeManager); auto dataTheme = AceType::MakeRefPtr(); EXPECT_CALL(*themeManager, GetTheme(_)).WillRepeatedly(Return(dataTheme)); - DataPanelModifier dataPanelModifier; + DataPanelModifier dataPanelModifier(nullptr); /** * @tc.steps: step2. Test positive sequence gradientColor. @@ -1513,7 +1513,7 @@ HWTEST_F(DataPanelTestNg, DataPanelSortGradientColorsOffsetTest002, TestSize.Lev MockPipelineContext::GetCurrent()->SetThemeManager(themeManager); auto dataTheme = AceType::MakeRefPtr(); EXPECT_CALL(*themeManager, GetTheme(_)).WillRepeatedly(Return(dataTheme)); - DataPanelModifier dataPanelModifier; + DataPanelModifier dataPanelModifier(nullptr); /** * @tc.steps: step2. Test Reverse GradientColor. @@ -1554,7 +1554,7 @@ HWTEST_F(DataPanelTestNg, DataPanelShadowTest001, TestSize.Level0) MockPipelineContext::GetCurrent()->SetThemeManager(themeManager); auto dataTheme = AceType::MakeRefPtr(); EXPECT_CALL(*themeManager, GetTheme(_)).WillRepeatedly(Return(dataTheme)); - DataPanelModifier dataPanelModifier; + DataPanelModifier dataPanelModifier(nullptr); /** * @tc.steps: step2. Test the setting of Shadow attribute. @@ -2328,7 +2328,7 @@ HWTEST_F(DataPanelTestNg, DataPanelMeasureTest006, TestSize.Level1) */ HWTEST_F(DataPanelTestNg, DataPanelGetPaintPathTest001, TestSize.Level0) { - DataPanelModifier dataPanelModifier; + DataPanelModifier dataPanelModifier(nullptr); Testing::MockCanvas rsCanvas; DrawingContext context { rsCanvas, 50.0f, 50.0f }; // test Solid color when the valueColors >0 and valueColors <=9 diff --git a/test/unittest/core/pattern/patternlock/patternlock_modifier_test_ng.cpp b/test/unittest/core/pattern/patternlock/patternlock_modifier_test_ng.cpp index 9bfb53991a9..5a780b29922 100644 --- a/test/unittest/core/pattern/patternlock/patternlock_modifier_test_ng.cpp +++ b/test/unittest/core/pattern/patternlock/patternlock_modifier_test_ng.cpp @@ -30,7 +30,7 @@ public: */ HWTEST_F(PatternLockTestNg, PatternLockModifierTest001, TestSize.Level1) { - PatternLockModifier patternlockModifier; + PatternLockModifier patternlockModifier(nullptr); Testing::MockCanvas rsCanvas; DrawingContext context { rsCanvas, 100.0f, 100.0f }; EXPECT_CALL(rsCanvas, AttachBrush(_)).WillRepeatedly(ReturnRef(rsCanvas)); @@ -48,7 +48,7 @@ HWTEST_F(PatternLockTestNg, PatternLockModifierTest001, TestSize.Level1) */ HWTEST_F(PatternLockTestNg, PatternLockModifierTest002, TestSize.Level1) { - auto modifier = AceType::MakeRefPtr(); + auto modifier = AceType::MakeRefPtr(nullptr); modifier->SetSideLength(36.0); int32_t x = 1; int32_t y = 1; @@ -70,7 +70,7 @@ HWTEST_F(PatternLockTestNg, PatternLockModifierTest003, TestSize.Level1) * @tc.case: case1. PatternLock's choosePoint count = 0. */ std::vector vecCell; - auto patternlockModifier1 = AceType::MakeRefPtr(); + auto patternlockModifier1 = AceType::MakeRefPtr(nullptr); patternlockModifier1->SetChoosePoint(vecCell); EXPECT_CALL(canvas, Save()).Times(0); EXPECT_CALL(canvas, Restore()).Times(0); @@ -79,7 +79,7 @@ HWTEST_F(PatternLockTestNg, PatternLockModifierTest003, TestSize.Level1) * @tc.case: case2. pathStrokeWidth_ <= 0. */ std::vector vecCell2 = { PatternLockCell(0, 1), PatternLockCell(0, 2) }; - auto patternlockModifier2 = AceType::MakeRefPtr(); + auto patternlockModifier2 = AceType::MakeRefPtr(nullptr); patternlockModifier2->SetChoosePoint(vecCell2); patternlockModifier2->SetPathStrokeWidth(0.0); EXPECT_CALL(canvas, Save()).Times(0); @@ -89,7 +89,7 @@ HWTEST_F(PatternLockTestNg, PatternLockModifierTest003, TestSize.Level1) * @tc.case: case3. isMoveEventValid_ is flase. */ std::vector vecCell3 = { PatternLockCell(0, 1), PatternLockCell(0, 2), PatternLockCell(1, 2) }; - auto patternlockModifier3 = AceType::MakeRefPtr(); + auto patternlockModifier3 = AceType::MakeRefPtr(nullptr); patternlockModifier3->SetChoosePoint(vecCell3); patternlockModifier3->SetPathStrokeWidth(Dimension(10.0).ConvertToPx()); EXPECT_CALL(canvas, AttachPen(_)).WillOnce(ReturnRef(canvas)); @@ -104,7 +104,7 @@ HWTEST_F(PatternLockTestNg, PatternLockModifierTest003, TestSize.Level1) */ std::vector vecCell4 = { PatternLockCell(0, 1), PatternLockCell(0, 2), PatternLockCell(1, 2), PatternLockCell(2, 2) }; - auto patternlockModifier4 = AceType::MakeRefPtr(); + auto patternlockModifier4 = AceType::MakeRefPtr(nullptr); patternlockModifier4->SetChoosePoint(vecCell4); patternlockModifier4->SetPathStrokeWidth(Dimension(10.0).ConvertToPx()); patternlockModifier4->SetIsMoveEventValid(true); @@ -128,7 +128,7 @@ HWTEST_F(PatternLockTestNg, PatternLockModifierTest004, TestSize.Level1) Testing::MockCanvas canvas; OffsetF offset; std::vector vecCell = { PatternLockCell(0, 0), PatternLockCell(0, 2), PatternLockCell(1, 2) }; - auto patternlockModifier = AceType::MakeRefPtr(); + auto patternlockModifier = AceType::MakeRefPtr(nullptr); patternlockModifier->SetChoosePoint(vecCell); patternlockModifier->SetSideLength(SIDE_LENGH); /** @@ -184,7 +184,7 @@ HWTEST_F(PatternLockTestNg, PatternLockModifierTest005, TestSize.Level1) Testing::MockCanvas canvas; OffsetF offset; std::vector vecCell = { PatternLockCell(0, 0), PatternLockCell(0, 2), PatternLockCell(1, 2) }; - auto patternlockModifier = AceType::MakeRefPtr(); + auto patternlockModifier = AceType::MakeRefPtr(nullptr); patternlockModifier->SetChoosePoint(vecCell); patternlockModifier->SetSideLength(SIDE_LENGH); /** @@ -234,7 +234,7 @@ HWTEST_F(PatternLockTestNg, PatternLockModifierTest006, TestSize.Level1) /** * @tc.steps: step1. Create patternlockModifier and Set ChoosePoint */ - auto patternlockModifier = AceType::MakeRefPtr(); + auto patternlockModifier = AceType::MakeRefPtr(nullptr); std::vector vecCell = { PatternLockCell(0, 0) }; patternlockModifier->SetChoosePoint(vecCell); /** @@ -282,7 +282,7 @@ HWTEST_F(PatternLockTestNg, PatternLockModifierTest007, TestSize.Level1) /** * @tc.steps: step1. Create patternlockModifier and Set ChoosePoint */ - auto patternlockModifier = AceType::MakeRefPtr(); + auto patternlockModifier = AceType::MakeRefPtr(nullptr); std::vector vecCell = { PatternLockCell(0, 0) }; patternlockModifier->SetChoosePoint(vecCell); /** @@ -304,7 +304,7 @@ HWTEST_F(PatternLockTestNg, PatternLockModifierTest008, TestSize.Level1) /** * @tc.steps: step1. Create patternlockModifier */ - auto patternlockModifier = AceType::MakeRefPtr(); + auto patternlockModifier = AceType::MakeRefPtr(nullptr); /** * @tc.steps: step2. call PaintLightRing func * @tc.expected:Related function is called. @@ -326,7 +326,7 @@ HWTEST_F(PatternLockTestNg, PatternLockModifierTest009, TestSize.Level1) /** * @tc.steps: step1. Create patternlockModifier */ - auto patternlockModifier = AceType::MakeRefPtr(); + auto patternlockModifier = AceType::MakeRefPtr(nullptr); std::vector vecCell = { PatternLockCell(0, 0) }; patternlockModifier->SetChoosePoint(vecCell); patternlockModifier->sideLength_->Set(SIDE_LENGTH.Value()); @@ -370,7 +370,7 @@ HWTEST_F(PatternLockTestNg, PatternLockModifierTest010, TestSize.Level1) /** * @tc.steps: step1. Create patternlockModifier */ - auto patternlockModifier = AceType::MakeRefPtr(); + auto patternlockModifier = AceType::MakeRefPtr(nullptr); /** * @tc.steps: step2. call SetHoverColor func */ @@ -408,7 +408,7 @@ HWTEST_F(PatternLockTestNg, PatternLockModifierTest011, TestSize.Level1) /** * @tc.steps: step1. Create patternlockModifier */ - auto patternlockModifier = AceType::MakeRefPtr(); + auto patternlockModifier = AceType::MakeRefPtr(nullptr); /** * @tc.steps: step2. call SetContentOffset func * @tc.expected:the value of offset_ is updated @@ -444,7 +444,7 @@ HWTEST_F(PatternLockTestNg, PatternLockModifierTest012, TestSize.Level1) /** * @tc.steps: step1. Create patternlockModifier and Set ChoosePoint */ - auto patternlockModifier = AceType::MakeRefPtr(); + auto patternlockModifier = AceType::MakeRefPtr(nullptr); std::vector vecCell = { PatternLockCell(0, 0) }; patternlockModifier->SetChoosePoint(vecCell); /** @@ -473,7 +473,7 @@ HWTEST_F(PatternLockTestNg, PatternLockModifierTest013, TestSize.Level1) /** * @tc.steps: step1. Create patternlockModifier and Set SideLength. */ - auto patternlockModifier = AceType::MakeRefPtr(); + auto patternlockModifier = AceType::MakeRefPtr(nullptr); patternlockModifier->SetBackgroundCircleRadiusScale( DEFAULT_BACKGROUND_CIRCLE_RADIUS.Value() / DEFAULT_CIRCLE_RADIUS.Value()); patternlockModifier->SetSideLength(275); @@ -504,7 +504,7 @@ HWTEST_F(PatternLockTestNg, PatternLockModifierTest014, TestSize.Level1) /** * @tc.steps: step1. Create patternlockModifier and Set SideLength. */ - auto patternlockModifier = AceType::MakeRefPtr(); + auto patternlockModifier = AceType::MakeRefPtr(nullptr); std::vector vecCell = { PatternLockCell(1, 1) }; patternlockModifier->SetChoosePoint(vecCell); patternlockModifier->SetBackgroundCircleRadiusScale( diff --git a/test/unittest/core/pattern/patternlock/patternlock_pattern_test_ng.cpp b/test/unittest/core/pattern/patternlock/patternlock_pattern_test_ng.cpp index 70416d569bb..c55801e5696 100644 --- a/test/unittest/core/pattern/patternlock/patternlock_pattern_test_ng.cpp +++ b/test/unittest/core/pattern/patternlock/patternlock_pattern_test_ng.cpp @@ -117,7 +117,7 @@ void PatternLockPatternTestNg::Create(const std::functionpatternLockModifier_ = AceType::MakeRefPtr(); + pattern_->patternLockModifier_ = AceType::MakeRefPtr(nullptr); /** * @tc.steps: step3. Set PatternLock pattern variable and call OnTouchDown @@ -145,7 +145,7 @@ HWTEST_F(PatternLockPatternTestNg, PatternLockPatternTest001, TestSize.Level1) HWTEST_F(PatternLockPatternTestNg, PatternLockPatternTest002, TestSize.Level1) { Create([](PatternLockModelNG model) {}); - pattern_->patternLockModifier_ = AceType::MakeRefPtr(); + pattern_->patternLockModifier_ = AceType::MakeRefPtr(nullptr); /** * @tc.steps: step3. Set PatternLock pattern variable and call OnTouchUp @@ -168,7 +168,7 @@ HWTEST_F(PatternLockPatternTestNg, PatternLockPatternTest002, TestSize.Level1) HWTEST_F(PatternLockPatternTestNg, PatternLockPatternTest003, TestSize.Level1) { Create([](PatternLockModelNG model) {}); - pattern_->patternLockModifier_ = AceType::MakeRefPtr(); + pattern_->patternLockModifier_ = AceType::MakeRefPtr(nullptr); /** * @tc.steps: step3. Set PatternLock pattern variable and call HandleTouchEvent @@ -480,7 +480,7 @@ HWTEST_F(PatternLockPatternTestNg, PatternLockPatternTest010, TestSize.Level1) HWTEST_F(PatternLockPatternTestNg, PatternLockPatternTest011, TestSize.Level1) { Create([](PatternLockModelNG model) {}); - pattern_->patternLockModifier_ = AceType::MakeRefPtr(); + pattern_->patternLockModifier_ = AceType::MakeRefPtr(nullptr); /** * @tc.steps: step1. call HandleReset @@ -565,7 +565,7 @@ HWTEST_F(PatternLockPatternTestNg, PatternLockPatternTest014, TestSize.Level1) CHECK_NULL_VOID(eventHub); auto inputEventHub = eventHub->GetOrCreateInputEventHub(); CHECK_NULL_VOID(inputEventHub); - pattern_->patternLockModifier_ = AceType::MakeRefPtr(); + pattern_->patternLockModifier_ = AceType::MakeRefPtr(nullptr); auto paintProperty_ = frameNode_->GetPaintProperty(); paintProperty_->UpdateCircleRadius(Dimension(CIRCLE_RADIUS_FLOAT)); auto themeManager = AceType::MakeRefPtr(); @@ -614,7 +614,7 @@ HWTEST_F(PatternLockPatternTestNg, PatternLockPatternTest014, TestSize.Level1) HWTEST_F(PatternLockPatternTestNg, PatternLockPatternTest015, TestSize.Level1) { Create([](PatternLockModelNG model) {}); - pattern_->patternLockModifier_ = AceType::MakeRefPtr(); + pattern_->patternLockModifier_ = AceType::MakeRefPtr(nullptr); /** * @tc.steps: step1: choosePoint_ is empty. @@ -795,7 +795,7 @@ HWTEST_F(PatternLockPatternTestNg, PatternLockPatternTest019, TestSize.Level1) Create([](PatternLockModelNG model) {}); frameNode_->GetGeometryNode()->SetContentSize(SizeF(300.0f, 300.0f)); - pattern_->patternLockModifier_ = AceType::MakeRefPtr(); + pattern_->patternLockModifier_ = AceType::MakeRefPtr(nullptr); auto themeManager = AceType::MakeRefPtr(); MockPipelineContext::GetCurrent()->SetThemeManager(themeManager); auto patternlockTheme = AceType::MakeRefPtr(); diff --git a/test/unittest/core/pattern/patternlock/patternlock_test_ng.cpp b/test/unittest/core/pattern/patternlock/patternlock_test_ng.cpp index 0e3c6afe6a7..6f369a2f51f 100644 --- a/test/unittest/core/pattern/patternlock/patternlock_test_ng.cpp +++ b/test/unittest/core/pattern/patternlock/patternlock_test_ng.cpp @@ -172,7 +172,7 @@ HWTEST_F(PatternLockTestNg, PatternLockEventTest002, TestSize.Level0) HWTEST_F(PatternLockTestNg, PatternLockPatternTest001, TestSize.Level0) { Create([](PatternLockModelNG model) {}); - pattern_->patternLockModifier_ = AceType::MakeRefPtr(); + pattern_->patternLockModifier_ = AceType::MakeRefPtr(nullptr); /** * @tc.steps: step3. Set PatternLock pattern variable and call HandleReset @@ -234,7 +234,7 @@ HWTEST_F(PatternLockTestNg, PatternLockPatternTest002, TestSize.Level0) HWTEST_F(PatternLockTestNg, PatternLockPatternTest003, TestSize.Level0) { Create([](PatternLockModelNG model) {}); - pattern_->patternLockModifier_ = AceType::MakeRefPtr(); + pattern_->patternLockModifier_ = AceType::MakeRefPtr(nullptr); /** * @tc.case: case1: choosePoint_ vec is empty. @@ -307,7 +307,7 @@ HWTEST_F(PatternLockTestNg, PatternLockPatternTest005, TestSize.Level0) Create([](PatternLockModelNG model) {}); frameNode_->GetGeometryNode()->SetContentSize(SizeF(300.0f, 300.0f)); - pattern_->patternLockModifier_ = AceType::MakeRefPtr(); + pattern_->patternLockModifier_ = AceType::MakeRefPtr(nullptr); auto themeManager = AceType::MakeRefPtr(); MockPipelineContext::GetCurrent()->SetThemeManager(themeManager); auto patternlockTheme = AceType::MakeRefPtr(); @@ -361,7 +361,7 @@ HWTEST_F(PatternLockTestNg, PatternLockPatternTest005, TestSize.Level0) HWTEST_F(PatternLockTestNg, PatternLockPatternTest006, TestSize.Level0) { Create([](PatternLockModelNG model) {}); - pattern_->patternLockModifier_ = AceType::MakeRefPtr(); + pattern_->patternLockModifier_ = AceType::MakeRefPtr(nullptr); /** * @tc.steps: step3. Set PatternLock pattern variable and call OnTouchUp @@ -415,7 +415,7 @@ HWTEST_F(PatternLockTestNg, PatternLockPatternTest007, TestSize.Level0) HWTEST_F(PatternLockTestNg, PatternLockPatternTest008, TestSize.Level0) { Create([](PatternLockModelNG model) {}); - pattern_->patternLockModifier_ = AceType::MakeRefPtr(); + pattern_->patternLockModifier_ = AceType::MakeRefPtr(nullptr); /** * @tc.steps: step3. Set PatternLock pattern variable and call OnTouchDown @@ -443,7 +443,7 @@ HWTEST_F(PatternLockTestNg, PatternLockPatternTest008, TestSize.Level0) HWTEST_F(PatternLockTestNg, PatternLockPatternTest009, TestSize.Level0) { Create([](PatternLockModelNG model) {}); - pattern_->patternLockModifier_ = AceType::MakeRefPtr(); + pattern_->patternLockModifier_ = AceType::MakeRefPtr(nullptr); /** * @tc.steps: step3. Set PatternLock pattern variable and call HandleTouchEvent @@ -715,7 +715,7 @@ HWTEST_F(PatternLockTestNg, PatternLockPatternTest014, TestSize.Level0) CHECK_NULL_VOID(eventHub); auto inputEventHub = eventHub->GetOrCreateInputEventHub(); CHECK_NULL_VOID(inputEventHub); - pattern_->patternLockModifier_ = AceType::MakeRefPtr(); + pattern_->patternLockModifier_ = AceType::MakeRefPtr(nullptr); auto paintProperty_ = frameNode_->GetPaintProperty(); paintProperty_->UpdateCircleRadius(Dimension(CIRCLE_RADIUS_FLOAT)); auto themeManager = AceType::MakeRefPtr(); @@ -763,7 +763,7 @@ HWTEST_F(PatternLockTestNg, PatternLockPatternTest014, TestSize.Level0) HWTEST_F(PatternLockTestNg, PatternLockPatternTest015, TestSize.Level0) { Create([](PatternLockModelNG model) {}); - pattern_->patternLockModifier_ = AceType::MakeRefPtr(); + pattern_->patternLockModifier_ = AceType::MakeRefPtr(nullptr); ASSERT_NE(pattern_->patternLockController_->setChallengeResultImpl_, nullptr); /** @@ -983,7 +983,7 @@ HWTEST_F(PatternLockTestNg, PatternLockPaintMethodTest001, TestSize.Level1) * @tc.step: step1. create patternLock PaintMethod and PatternLockTheme. */ std::vector vecCell; - auto modifier = AceType::MakeRefPtr(); + auto modifier = AceType::MakeRefPtr(nullptr); PatternLockPaintMethod paintMethod(OffsetF(), false, vecCell, modifier); auto paintProperty_ = AceType::MakeRefPtr(); RefPtr geometryNode = AceType::MakeRefPtr(); @@ -1053,7 +1053,7 @@ HWTEST_F(PatternLockTestNg, PatternLockPaintMethodTest002, TestSize.Level0) * @tc.step: step1. create patternLock PaintMethod and PatternLockTheme. */ std::vector vecCell; - auto modifier = AceType::MakeRefPtr(); + auto modifier = AceType::MakeRefPtr(nullptr); PatternLockPaintMethod paintMethod(OffsetF(), false, vecCell, modifier); auto paintProperty_ = AceType::MakeRefPtr(); RefPtr geometryNode = AceType::MakeRefPtr(); @@ -1252,7 +1252,7 @@ HWTEST_F(PatternLockTestNg, StartModifierCanceledAnimate, TestSize.Level0) auto patternLockNode = GetChildFrameNode(colNode, 0); auto scrollPattern = scrollNode->GetPattern(); auto patternLockPattern = patternLockNode->GetPattern(); - patternLockPattern->patternLockModifier_ = AceType::MakeRefPtr(); + patternLockPattern->patternLockModifier_ = AceType::MakeRefPtr(nullptr); patternLockPattern->isMoveEventValid_ = true; patternLockPattern->StartModifierCanceledAnimate(); EXPECT_TRUE(patternLockPattern->isMoveEventValid_); @@ -1389,7 +1389,7 @@ HWTEST_F(PatternLockTestNg, PatternLockSkipUnselectedPointTest002, TestSize.Leve Create([](PatternLockModelNG model) { model.SetSkipUnselectedPoint(false); }); - pattern_->patternLockModifier_ = AceType::MakeRefPtr(); + pattern_->patternLockModifier_ = AceType::MakeRefPtr(nullptr); pattern_->InitSkipUnselectedPoint(); /** @@ -1428,7 +1428,7 @@ HWTEST_F(PatternLockTestNg, PatternLockSkipUnselectedPointTest003, TestSize.Leve Create([](PatternLockModelNG model) { model.SetSkipUnselectedPoint(true); }); - pattern_->patternLockModifier_ = AceType::MakeRefPtr(); + pattern_->patternLockModifier_ = AceType::MakeRefPtr(nullptr); pattern_->InitSkipUnselectedPoint(); /** -- Gitee