From 2d32e355f4585ff9daab8c7bb9584a99fc16587d Mon Sep 17 00:00:00 2001 From: oh_ci Date: Sat, 16 Aug 2025 06:07:03 +0000 Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E9=80=80=20'Pull=20Request=20!70130?= =?UTF-8?q?=20:=20=E4=BF=AE=E5=A4=8DImage=20capi=E4=B8=8B=E4=BC=9A?= =?UTF-8?q?=E9=87=8D=E7=BD=AE=E6=8B=96=E6=8B=BD'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pattern/image/image_model_ng.cpp | 2 ++ .../core/pattern/image/image_test_ng.cpp | 24 ++----------------- 2 files changed, 4 insertions(+), 22 deletions(-) diff --git a/frameworks/core/components_ng/pattern/image/image_model_ng.cpp b/frameworks/core/components_ng/pattern/image/image_model_ng.cpp index ef624436405..b1b9946a53b 100644 --- a/frameworks/core/components_ng/pattern/image/image_model_ng.cpp +++ b/frameworks/core/components_ng/pattern/image/image_model_ng.cpp @@ -161,6 +161,8 @@ void ImageModelNG::ResetImage(FrameNode* frameNode) sourceInfo.SetIsFromReset(true); ACE_UPDATE_NODE_LAYOUT_PROPERTY(ImageLayoutProperty, ImageSourceInfo, sourceInfo, frameNode); frameNode->MarkDirtyNode(PROPERTY_UPDATE_RENDER); + RefPtr refNode = AceType::Claim(frameNode); + SetFrameNodeDraggable(refNode, false); auto pattern = frameNode->GetPattern(); CHECK_NULL_VOID(pattern); pattern->SetNeedLoadAlt(false); diff --git a/test/unittest/core/pattern/image/image_test_ng.cpp b/test/unittest/core/pattern/image/image_test_ng.cpp index 25469ca07a7..031b0f3c670 100755 --- a/test/unittest/core/pattern/image/image_test_ng.cpp +++ b/test/unittest/core/pattern/image/image_test_ng.cpp @@ -898,30 +898,10 @@ HWTEST_F(ImageTestNg, ImageCreator005, TestSize.Level0) auto imagePattern = frameNode->GetPattern(); ASSERT_NE(frameNode, nullptr); - ImageModelNG::ResetImage(frameNode.GetRawPtr()); - - auto draggable = frameNode->IsDraggable(); - EXPECT_FALSE(draggable); -} - -/** - * @tc.name: ImageCreator006 - * @tc.desc: Verify that CreateFrameNode reset. - * @tc.type: FUNC - */ -HWTEST_F(ImageTestNg, ImageCreator006, TestSize.Level0) -{ - auto nodeId = int32_t(1); - RefPtr pixMap = nullptr; - auto frameNode = ImageModelNG::CreateFrameNode(nodeId, IMAGE_SRC_URL, pixMap, BUNDLE_NAME, MODULE_NAME, false); - - auto imagePattern = frameNode->GetPattern(); - ASSERT_NE(frameNode, nullptr); - frameNode->SetDraggable(true); - ImageModelNG::ResetImage(frameNode.GetRawPtr()); + ImageModelNG::ResetImage(&(*frameNode)); auto draggable = frameNode->IsDraggable(); - EXPECT_TRUE(draggable); + EXPECT_EQ(draggable, true); } /** -- Gitee