From 2d9b401fcba120fbe406fcdb2035c68f52f9d0af Mon Sep 17 00:00:00 2001 From: saraliusu <1664407727@qq.com> Date: Fri, 4 Jul 2025 15:17:12 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E6=94=AF=E6=8C=81=E7=89=88=E6=9C=AC?= =?UTF-8?q?6.0=E5=8F=8A=E4=BB=A5=E4=B8=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 3 +++ build-profile.json5 | 4 ++-- hvigor/hvigor-config.json5 | 2 +- oh-package.json5 | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 051db66..5e8ae5e 100644 --- a/README.md +++ b/README.md @@ -15,6 +15,9 @@ ## 效果预览 图片名称 +## 依赖系统版本 +- HarmonyOS 6.0.0 Release及以上 + ## 工程目录 ``` ├─entry/src/main/ets diff --git a/build-profile.json5 b/build-profile.json5 index 6f41112..6a6eac8 100644 --- a/build-profile.json5 +++ b/build-profile.json5 @@ -5,8 +5,8 @@ { "name": "default", "signingConfig": "default", - "targetSdkVersion": "5.0.5(17)", - "compatibleSdkVersion": "5.0.5(17)", + "targetSdkVersion": "6.0.0(20)", + "compatibleSdkVersion": "6.0.0(20)", "runtimeOS": "HarmonyOS", "buildOption": { "strictMode": { diff --git a/hvigor/hvigor-config.json5 b/hvigor/hvigor-config.json5 index 5bebc97..8b8ff50 100644 --- a/hvigor/hvigor-config.json5 +++ b/hvigor/hvigor-config.json5 @@ -1,5 +1,5 @@ { - "modelVersion": "5.0.5", + "modelVersion": "6.0.0", "dependencies": { }, "execution": { diff --git a/oh-package.json5 b/oh-package.json5 index 48b5965..9043f56 100644 --- a/oh-package.json5 +++ b/oh-package.json5 @@ -1,5 +1,5 @@ { - "modelVersion": "5.0.5", + "modelVersion": "6.0.0", "description": "Please describe the basic information.", "dependencies": { "@ohos/pulltorefresh": "^2.1.3-rc.0", -- Gitee From 443030048bb53f3fdbd00213ac498712e0a2c93c Mon Sep 17 00:00:00 2001 From: saraliusu <1664407727@qq.com> Date: Mon, 7 Jul 2025 10:53:21 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20AI=E6=A3=80=E6=B5=8B=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/ets/pages/CombineWaterFlowPage.ets | 23 ++++++++++++------- .../src/main/ets/pages/MultiFlowItemPage.ets | 6 ++--- entry/src/main/ets/pages/SharedPoolPage.ets | 8 +++---- .../main/ets/pages/SharedPoolSecondPage.ets | 12 +++++----- .../main/ets/pages/StandardWaterFlowPage.ets | 4 ++-- .../main/ets/pages/StickyWaterFlowPage.ets | 6 ++--- 6 files changed, 33 insertions(+), 26 deletions(-) diff --git a/entry/src/main/ets/pages/CombineWaterFlowPage.ets b/entry/src/main/ets/pages/CombineWaterFlowPage.ets index 88fdd51..feba431 100644 --- a/entry/src/main/ets/pages/CombineWaterFlowPage.ets +++ b/entry/src/main/ets/pages/CombineWaterFlowPage.ets @@ -113,7 +113,10 @@ struct WaterFlowPage { // [Start Prefetch_1] // Registers the callback that prefetcher invokes when a data referenced by a data source item needs to be fetched. this.waterFlowView.registerFetchCallback(this.fetchCallback); - // Registers the callback that prefetcher invokes when a specific fetch should be canceled to avoid wasting system resources, such as network bandwidth. + /** + * Registers the callback that prefetcher invokes when a specific fetch should be + * canceled to avoid wasting system resources, such as network bandwidth. + */ this.waterFlowView.registerCancelCallback(this.cancelCallback); taskpool.execute(generateRandomBlogData).then((data: ESObject) => { this.data = data; @@ -121,7 +124,7 @@ struct WaterFlowPage { }) // [End Prefetch_1] // [EndExclude PreCreate] - // register components + // register components. this.waterFlowView.registerNodeItem('BlogItemContainer', wrapBuilder(BlogItemContainer)); this.waterFlowView.registerNodeItem('AdaptiveTextComponent', wrapBuilder(AdaptiveTextComponentContainer)); this.waterFlowView.registerNodeItem('GridImageViewContainer', wrapBuilder(GridImageViewContainer)); @@ -157,11 +160,15 @@ struct WaterFlowPage { .padding({ top: CommonConstants.PADDING, left: CommonConstants.PADDING, - right: CommonConstants.PADDING, + right: CommonConstants.PADDING })// [EndExclude Prefetch_3] .onScrollIndex((start: number, end: number) => { if (end > 0) { - // Call this method when the visible area boundaries change. The prefetcher will start prefetching after the first call to this method in all cases where the autoStart option is not set to false. + /** + * Call this method when the visible area boundaries change. + * The prefetcher will start prefetching after the first call to this method + * in all cases where the autoStart option is not set to false. + */ this.waterFlowView.visibleAreaChanged(start, end); } // [StartExclude Prefetch_3] @@ -259,7 +266,7 @@ struct WaterFlowPage { build() { Column() { - // Header navigation bar + // Header navigation bar. Row() { Text($r('app.string.scenario_waterFlow2')) .fontSize($r('app.float.title_font_size')) @@ -301,7 +308,7 @@ struct BlogItem { Column({ space: 12 }) { HeaderComponent({ blogItem: this.blogItem }) if (this.blogItem?.content.length > 0) { - // cache component + // cache component. PartReuse({ type: 'AdaptiveTextComponent', builder: wrapBuilder(AdaptiveTextComponentContainer), @@ -366,7 +373,7 @@ export struct AdaptiveTextComponent { build() { Stack() { - // Text container + // Text container. Text(this.blogItem.content) .fontSize(16) .lineHeight(20) @@ -414,7 +421,7 @@ struct GridImageView { build() { // [Start Prefetch_4] - // Preload images using prefetch + // Preload images using prefetch. Image(this.fetchUrl) .sourceSize({ width: 100, height: 100 }) .width(CommonConstants.FULL_WIDTH) diff --git a/entry/src/main/ets/pages/MultiFlowItemPage.ets b/entry/src/main/ets/pages/MultiFlowItemPage.ets index fd9c0c6..68d3149 100644 --- a/entry/src/main/ets/pages/MultiFlowItemPage.ets +++ b/entry/src/main/ets/pages/MultiFlowItemPage.ets @@ -85,7 +85,7 @@ struct MultiFlowItemPage { .padding({ top: CommonConstants.PADDING, left: CommonConstants.PADDING, - right: CommonConstants.PADDING, + right: CommonConstants.PADDING }) // [EndExclude quick_start_4_c] } @@ -103,7 +103,7 @@ struct MultiFlowItemPage { // [End quick_start_4_c] // [Start quick_start_4_c] -// Reusable Image Component Template +// Reusable Image Component Template. @Builder function ImageContainer($$: Params) { ImageContainerView({ blogItem: $$.blogItem }) @@ -138,7 +138,7 @@ struct ImageContainerView { } // [Start quick_start_4_c] -// Reusable Text Component Template +// Reusable Text Component Template. @Builder function TextContainer($$: Params) { TextContainerView({ blogItem: $$.blogItem }) diff --git a/entry/src/main/ets/pages/SharedPoolPage.ets b/entry/src/main/ets/pages/SharedPoolPage.ets index bda5827..4844592 100644 --- a/entry/src/main/ets/pages/SharedPoolPage.ets +++ b/entry/src/main/ets/pages/SharedPoolPage.ets @@ -64,7 +64,7 @@ export struct SharedPoolPage { Utils.getInstance().nodePool = this.waterFlowView.getRecyclePool(); } // [End Share_Pool] - // Reusable Registration Template + // Reusable Registration Template. this.waterFlowView.registerNodeItem('TestBlogItemContainer', wrapBuilder(MyBlogItemContainer)); this.waterFlowView.registerNodeItem('GridImageViewContainer', wrapBuilder(GridImageViewContainer)); // Pre-creation @@ -83,7 +83,7 @@ export struct SharedPoolPage { .padding({ top: CommonConstants.PADDING, left: CommonConstants.PADDING, - right: CommonConstants.PADDING, + right: CommonConstants.PADDING }) } @@ -98,7 +98,7 @@ export struct SharedPoolPage { build() { Column() { - // Header navigation bar + // Header navigation bar. Row() { Text($r('app.string.scenario_waterFlow3')) .fontWeight(FontWeight.Bold) @@ -167,7 +167,7 @@ struct MyBlogItem { build() { Column({ space: 12 }) { HeaderComponent({ blogItem: this.blogItem }) - // Image display + // Image display. if (this.blogItem?.images && this.blogItem.images.length > 0) { Column() { PartReuse({ diff --git a/entry/src/main/ets/pages/SharedPoolSecondPage.ets b/entry/src/main/ets/pages/SharedPoolSecondPage.ets index 0688ced..cb35687 100644 --- a/entry/src/main/ets/pages/SharedPoolSecondPage.ets +++ b/entry/src/main/ets/pages/SharedPoolSecondPage.ets @@ -61,16 +61,16 @@ export struct SharedPoolSecondPage { }); // [EndExclude Share_Pool] if (Utils.getInstance().nodePool) { - // Registration Reuse Pool + // Registration Reuse Pool. this.waterFlowView.registerRecyclePool(Utils.getInstance().nodePool!); } else { Utils.getInstance().nodePool = this.waterFlowView.getRecyclePool(); } // [StartExclude Share_Pool] - // Reusable Registration Template + // Reusable Registration Template. this.waterFlowView.registerNodeItem('TestBlogItemContainer', wrapBuilder(MyBlogItemContainer)); this.waterFlowView.registerNodeItem('GridImageViewContainer', wrapBuilder(GridImageViewContainer)); - // Pre-initialization + // Pre-initialization. this.waterFlowView.preCreate('TestBlogItemContainer', 30); this.waterFlowView.preCreate('GridImageViewContainer', 30); Logger.info('SharedPoolSecondPage==> nodePool : ' + @@ -89,7 +89,7 @@ export struct SharedPoolSecondPage { .padding({ top: CommonConstants.PADDING, left: CommonConstants.PADDING, - right: CommonConstants.PADDING, + right: CommonConstants.PADDING }) .onScrollIndex((_start: number, end: number) => { if (end > this.waterFlowView.nodeAdapter.totalNodeCount - 10) { @@ -111,7 +111,7 @@ export struct SharedPoolSecondPage { build() { Column() { - // Header navigation bar + // Header navigation bar. Row() { Text($r('app.string.scenario_waterFlow3')) .fontWeight(FontWeight.Bold) @@ -158,7 +158,7 @@ struct MyBlogItem { build() { Column({ space: 12 }) { HeaderComponent({ blogItem: this.blogItem }) - // Image display + // Image display. if (this.blogItem?.images && this.blogItem.images.length > 0) { Column() { PartReuse({ diff --git a/entry/src/main/ets/pages/StandardWaterFlowPage.ets b/entry/src/main/ets/pages/StandardWaterFlowPage.ets index 724cc51..73174a9 100644 --- a/entry/src/main/ets/pages/StandardWaterFlowPage.ets +++ b/entry/src/main/ets/pages/StandardWaterFlowPage.ets @@ -140,7 +140,7 @@ struct StandardWaterFlowPage { .padding({ top: CommonConstants.PADDING, left: CommonConstants.PADDING, - right: CommonConstants.PADDING, + right: CommonConstants.PADDING }) .fadingEdge(true, { fadingEdgeLength: LengthMetrics.vp(80) }) // [End quick_start_2] @@ -151,7 +151,7 @@ struct StandardWaterFlowPage { build() { Column() { // [StartExclude quick_start_3] - // Header navigation bar + // Header navigation bar. Row({ space: 8 }) { Text($r('app.string.scenario_waterFlow')) .fontWeight(FontWeight.Bold) diff --git a/entry/src/main/ets/pages/StickyWaterFlowPage.ets b/entry/src/main/ets/pages/StickyWaterFlowPage.ets index c527d15..7ec2a2b 100644 --- a/entry/src/main/ets/pages/StickyWaterFlowPage.ets +++ b/entry/src/main/ets/pages/StickyWaterFlowPage.ets @@ -220,7 +220,7 @@ struct StickyWaterFlowPage { for (let i = 0; i < 100; i++) { dataArray.push(i) } - // update data when the page is scrolling + // update data when the page is scrolling. this.waterFlowView.nodeAdapter.pushData(dataArray) let newSection: SectionOptions = { itemsCount: 100, @@ -233,7 +233,7 @@ struct StickyWaterFlowPage { this.sections.push(newSection); let waterFlow = this.waterFlowView.__VIEW_CONTROLLER__.parentLayout as typeNode.WaterFlow; waterFlow.initialize({ - scroller: this.scroller, // it's very important to do initialize that makes section update + scroller: this.scroller, // it's very important to do initialize that makes section update. sections: this.sections, }) } @@ -393,7 +393,7 @@ struct StickyWaterFlowPage { .padding({ left: CommonConstants.PADDING, right: CommonConstants.PADDING }) .backgroundColor(Color.White) .hitTestBehavior(HitTestMode.Transparent) - // Set the sticky component's offset + // Set the sticky component's offset. .position({ x: 0, y: this.scrollOffset >= 220 ? 0 : 220 - this.scrollOffset }) } } -- Gitee