From 283d3548770b80bbc84c78c091ffdf5365086d13 Mon Sep 17 00:00:00 2001 From: liangguirong Date: Tue, 24 Sep 2024 11:19:58 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81demo=E5=9B=BD=E9=99=85=E5=8C=96?= =?UTF-8?q?=E5=A4=84=E7=90=86=E4=BC=98=E5=8C=96=202=E3=80=81loadTextPullUp?= =?UTF-8?q?1=E3=80=81loadTextPullUp2=E3=80=81loadTextLoading=E3=80=81loadT?= =?UTF-8?q?ext=E7=AD=89=E6=8E=A5=E5=8F=A3=E7=B1=BB=E5=9E=8B=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=B8=BA"ResourceStr"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: liangguirong --- changelog.md | 2 +- entry/src/main/ets/pages/customConfig.ets | 17 ++++++++++------- entry/src/main/ets/pages/customRefreshAnim.ets | 14 +++++++++----- entry/src/main/ets/pages/fullScreen.ets | 16 ++++++++++------ entry/src/main/ets/pages/lazyForEachGuide.ets | 3 ++- entry/src/main/ets/pages/quickStart.ets | 14 +++++++++----- entry/src/main/ets/pages/tabsTestPage.ets | 17 +++++++++++------ .../components/PullToRefresh/PullToRefresh.ets | 2 +- .../PullToRefresh/PullToRefreshConfigurator.ets | 14 +++++++------- .../src/main/resources/base/element/string.json | 2 +- .../main/resources/zh_CN/element/string.json | 2 +- oh-package.json5 | 1 + 12 files changed, 63 insertions(+), 41 deletions(-) diff --git a/changelog.md b/changelog.md index 2ae592e..5a204c7 100644 --- a/changelog.md +++ b/changelog.md @@ -1,7 +1,7 @@ ## 2.1.1-rc.0 1、添加中英文README.md修改以及demo国际化处理 -2、loadTextPullUp1、loadTextPullUp2、loadTextLoading、loadText等接口类型修改为 "string | Resource" +2、loadTextPullUp1、loadTextPullUp2、loadTextLoading、loadText等接口类型修改为 "ResourceStr" ## 2.1.0 diff --git a/entry/src/main/ets/pages/customConfig.ets b/entry/src/main/ets/pages/customConfig.ets index a4df307..678d895 100644 --- a/entry/src/main/ets/pages/customConfig.ets +++ b/entry/src/main/ets/pages/customConfig.ets @@ -17,13 +17,16 @@ import { PullToRefresh, PullToRefreshConfigurator } from '@ohos/pulltorefresh' @Entry @ComponentV2 struct Index { - private dataNumbers:Array = ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10']; - private dataStrings: Array = - [$r("app.string.MyComments"), $r("app.string.RelatedToMe"), $r("app.string.PersonalCenter1"), $r("app.string.PersonalCenter2"), $r("app.string.PersonalCenter3"), $r("app.string.MyReleases"), $r("app.string.Settings"), $r("app.string.LogOut")]; - @Local data: Array = this.dataStrings; + private dataNumbers: Array = ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10']; + private dataStrings: Array = + [$r("app.string.MyComments"), $r("app.string.RelatedToMe"), $r("app.string.PersonalCenter1"), + $r("app.string.PersonalCenter2"), $r("app.string.PersonalCenter3"), $r("app.string.MyReleases"), + $r("app.string.Settings"), $r("app.string.LogOut")]; + @Local data: Array = this.dataStrings; private scroller: Scroller = new Scroller(); private refreshConfigurator: PullToRefreshConfigurator = new PullToRefreshConfigurator(); - private getResourceString(res:Resource){ + + private getResourceString(res: Resource) { return getContext().resourceManager.getStringSync(res.id) } @@ -48,7 +51,7 @@ struct Index { .setLoadTextSize(25)// 上拉文本的字体大小 .setLoadTextPullUp1(this.getResourceString($r("app.string.Please_continue_pull_up")))// 上拉1阶段文本 .setLoadTextPullUp2(this.getResourceString($r("app.string.Release_refresh")))// 上拉2阶段文本 - .setLoadTextLoading(this.getResourceString($r("app.string.Loading"))) // 上拉加载更多中时的文本 + .setLoadTextLoading(this.getResourceString($r("app.string.Loading")))// 上拉加载更多中时的文本 .setRefreshCompleteTextHoldTime(500) //上拉刷新后停留的时间, 默认一秒, 建议设置500 } @@ -86,7 +89,7 @@ struct Index { // 模拟网络请求操作，请求网络2秒后得到数据，通知组件，变更列表数据 setTimeout(() => { resolve(''); - this.data.push(`${this.getResourceString($r("app.string.AddedEntry"))} ${ this.data.length}`); + this.data.push(`${this.getResourceString($r("app.string.AddedEntry"))} ${this.data.length}`); }, 2000); }); }, diff --git a/entry/src/main/ets/pages/customRefreshAnim.ets b/entry/src/main/ets/pages/customRefreshAnim.ets index d2d20ca..2db9c3a 100644 --- a/entry/src/main/ets/pages/customRefreshAnim.ets +++ b/entry/src/main/ets/pages/customRefreshAnim.ets @@ -20,16 +20,20 @@ const pointJitterAmplitude = 10; @Entry @ComponentV2 struct Index { - private dataNumbers: Array = ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10']; - private dataStrings: Array = [$r("app.string.MyComments"), $r("app.string.RelatedToMe"), $r("app.string.PersonalCenter1"), $r("app.string.PersonalCenter2"), $r("app.string.PersonalCenter3"), $r("app.string.MyReleases"), $r("app.string.Settings"), $r("app.string.LogOut")]; - @Local data: Array = this.dataStrings; + private dataNumbers: Array = ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10']; + private dataStrings: Array = + [$r("app.string.MyComments"), $r("app.string.RelatedToMe"), $r("app.string.PersonalCenter1"), + $r("app.string.PersonalCenter2"), $r("app.string.PersonalCenter3"), $r("app.string.MyReleases"), + $r("app.string.Settings"), $r("app.string.LogOut")]; + @Local data: Array = this.dataStrings; private scroller: Scroller = new Scroller(); private refreshConfigurator: PullToRefreshConfigurator = new PullToRefreshConfigurator(); private canvasSetting: RenderingContextSettings = new RenderingContextSettings(true); private canvasRefresh: CanvasRenderingContext2D = new CanvasRenderingContext2D(this.canvasSetting); private value1: number[] = []; private value2: number[] = []; - private getResourceString(res:Resource){ + + private getResourceString(res: Resource) { return getContext().resourceManager.getStringSync(res.id) } @@ -69,7 +73,7 @@ struct Index { // 模拟网络请求操作，请求网络2秒后得到数据，通知组件，变更列表数据 setTimeout(() => { resolve(''); - this.data.push(`${this.getResourceString($r("app.string.AddedEntry"))} ${ this.data.length}`); + this.data.push(`${this.getResourceString($r("app.string.AddedEntry"))} ${this.data.length}`); }, 2000); }); }, diff --git a/entry/src/main/ets/pages/fullScreen.ets b/entry/src/main/ets/pages/fullScreen.ets index b7c7ed4..bf36f6d 100644 --- a/entry/src/main/ets/pages/fullScreen.ets +++ b/entry/src/main/ets/pages/fullScreen.ets @@ -17,12 +17,16 @@ import { PullToRefresh } from '@ohos/pulltorefresh' @Entry @ComponentV2 struct Index { - private dataNumbers: Array = ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10']; - private dataStrings: Array = [$r("app.string.MyComments"), $r("app.string.RelatedToMe"), $r("app.string.PersonalCenter1"), $r("app.string.PersonalCenter2"), $r("app.string.PersonalCenter3"), $r("app.string.MyReleases"), $r("app.string.Settings"), $r("app.string.LogOut")]; - @Local data: Array = this.dataStrings; + private dataNumbers: Array = ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10']; + private dataStrings: Array = + [$r("app.string.MyComments"), $r("app.string.RelatedToMe"), $r("app.string.PersonalCenter1"), + $r("app.string.PersonalCenter2"), $r("app.string.PersonalCenter3"), $r("app.string.MyReleases"), + $r("app.string.Settings"), $r("app.string.LogOut")]; + @Local data: Array = this.dataStrings; // 需绑定列表或宫格组件 private scroller: Scroller = new Scroller(); - private getResourceString(res:Resource){ + + private getResourceString(res: Resource) { return getContext().resourceManager.getStringSync(res.id) } @@ -43,7 +47,7 @@ struct Index { return new Promise((resolve, reject) => { // 模拟网络请求操作，请求网络2秒后得到数据，通知组件，变更列表数据 setTimeout(() => { - resolve('刷新成功'); + resolve(this.getResourceString($r("app.string.RefreshSuccessful"))); this.data = [...this.dataNumbers]; }, 2000); }); @@ -54,7 +58,7 @@ struct Index { // 模拟网络请求操作，请求网络2秒后得到数据，通知组件，变更列表数据 setTimeout(() => { resolve(''); - this.data.push(`${this.getResourceString($r("app.string.AddedEntry"))} ${ this.data.length}`); + this.data.push(`${this.getResourceString($r("app.string.AddedEntry"))} ${this.data.length}`); }, 2000); }); }, diff --git a/entry/src/main/ets/pages/lazyForEachGuide.ets b/entry/src/main/ets/pages/lazyForEachGuide.ets index 71da16b..e679a4f 100644 --- a/entry/src/main/ets/pages/lazyForEachGuide.ets +++ b/entry/src/main/ets/pages/lazyForEachGuide.ets @@ -110,7 +110,8 @@ struct MyComponent { // 需绑定列表或宫格组件 private scroller: Scroller = new Scroller(); private timer: null | number = null; - private getResourceString(res:Resource){ + + private getResourceString(res: Resource) { return getContext().resourceManager.getStringSync(res.id) } diff --git a/entry/src/main/ets/pages/quickStart.ets b/entry/src/main/ets/pages/quickStart.ets index 4dbc9ef..eb35e53 100644 --- a/entry/src/main/ets/pages/quickStart.ets +++ b/entry/src/main/ets/pages/quickStart.ets @@ -17,12 +17,16 @@ import { PullToRefresh } from '@ohos/pulltorefresh' @Entry @ComponentV2 struct Index { - private dataNumbers: Array = ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10']; - private dataStrings: Array = [$r("app.string.MyComments"), $r("app.string.RelatedToMe"), $r("app.string.PersonalCenter1"), $r("app.string.PersonalCenter2"), $r("app.string.PersonalCenter3"), $r("app.string.MyReleases"), $r("app.string.Settings"), $r("app.string.LogOut")]; - @Local data: Array = this.dataStrings; + private dataNumbers: Array = ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10']; + private dataStrings: Array = + [$r("app.string.MyComments"), $r("app.string.RelatedToMe"), $r("app.string.PersonalCenter1"), + $r("app.string.PersonalCenter2"), $r("app.string.PersonalCenter3"), $r("app.string.MyReleases"), + $r("app.string.Settings"), $r("app.string.LogOut")]; + @Local data: Array = this.dataStrings; // 需绑定列表或宫格组件 private scroller: Scroller = new Scroller(); - private getResourceString(res:Resource){ + + private getResourceString(res: Resource) { return getContext().resourceManager.getStringSync(res.id) } @@ -54,7 +58,7 @@ struct Index { // 模拟网络请求操作，请求网络2秒后得到数据，通知组件，变更列表数据 setTimeout(() => { resolve(''); - this.data.push(`${this.getResourceString($r("app.string.AddedEntry"))} ${ this.data.length}`); + this.data.push(`${this.getResourceString($r("app.string.AddedEntry"))} ${this.data.length}`); }, 2000); }); }, diff --git a/entry/src/main/ets/pages/tabsTestPage.ets b/entry/src/main/ets/pages/tabsTestPage.ets index 1280807..9932907 100644 --- a/entry/src/main/ets/pages/tabsTestPage.ets +++ b/entry/src/main/ets/pages/tabsTestPage.ets @@ -22,7 +22,8 @@ struct TabsExample { @Local currentIndex: number = 0 private controller: TabsController = new TabsController() - @Builder TabBuilder(index: number, name: string) { + @Builder + TabBuilder(index: number, name: string) { Column() { Text(name) .fontColor(this.currentIndex === index ? this.selectedFontColor : this.fontColor) @@ -74,12 +75,16 @@ struct TabsExample { @ComponentV2 struct PullToRefreshDemo { - private dataNumbers: Array = ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10']; - private dataStrings: Array = [$r("app.string.MyComments"), $r("app.string.RelatedToMe"), $r("app.string.PersonalCenter1"), $r("app.string.PersonalCenter2"), $r("app.string.PersonalCenter3"), $r("app.string.MyReleases"), $r("app.string.Settings"), $r("app.string.LogOut")]; - @Local data: Array = this.dataStrings; + private dataNumbers: Array = ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10']; + private dataStrings: Array = + [$r("app.string.MyComments"), $r("app.string.RelatedToMe"), $r("app.string.PersonalCenter1"), + $r("app.string.PersonalCenter2"), $r("app.string.PersonalCenter3"), $r("app.string.MyReleases"), + $r("app.string.Settings"), $r("app.string.LogOut")]; + @Local data: Array = this.dataStrings; // 需绑定列表或宫格组件 private scroller: Scroller = new Scroller(); - private getResourceString(res:Resource){ + + private getResourceString(res: Resource) { return getContext().resourceManager.getStringSync(res.id) } @@ -111,7 +116,7 @@ struct PullToRefreshDemo { // 模拟网络请求操作，请求网络2秒后得到数据，通知组件，变更列表数据 setTimeout(() => { resolve(''); - this.data.push(`${this.getResourceString($r("app.string.AddedEntry"))} ${ this.data.length}`) + this.data.push(`${this.getResourceString($r("app.string.AddedEntry"))} ${this.data.length}`) }, 2000); }); }, diff --git a/library/src/main/ets/components/PullToRefresh/PullToRefresh.ets b/library/src/main/ets/components/PullToRefresh/PullToRefresh.ets index ec93f9f..da6648d 100644 --- a/library/src/main/ets/components/PullToRefresh/PullToRefresh.ets +++ b/library/src/main/ets/components/PullToRefresh/PullToRefresh.ets @@ -60,7 +60,7 @@ export struct PullToRefresh { @Local private trYBottom?: number = 0; @Local private state?: number = IS_FREE; @Local private refreshText?: string = ''; - @Local private loadText?: string | Resource = ''; + @Local private loadText?: ResourceStr = ''; @Local private angle1?: number | string = 0; @Local private angle2?: number | string = 0; private mWidthNumber?: number = 0; diff --git a/library/src/main/ets/components/PullToRefresh/PullToRefreshConfigurator.ets b/library/src/main/ets/components/PullToRefresh/PullToRefreshConfigurator.ets index 57b5af9..7ba4c88 100644 --- a/library/src/main/ets/components/PullToRefresh/PullToRefreshConfigurator.ets +++ b/library/src/main/ets/components/PullToRefresh/PullToRefreshConfigurator.ets @@ -30,9 +30,9 @@ export class PullToRefreshConfigurator { private loadBackgroundColor?: ResourceColor = 'rgba(0,0,0,0)'; // 上拉动画区域背景色 private loadTextColor?: ResourceColor = '#999999'; // 上拉文本的字体颜色 private loadTextSize?: number | string | Resource = 18; // 上拉文本的字体大小 - private loadTextPullUp1?: string | Resource = $r("app.string.Refreshing"); // 上拉1阶段文本 - private loadTextPullUp2?: string | Resource = $r("app.string.ReleaseToRefresh"); // 上拉2阶段文本 - private loadTextLoading?: string | Resource = $r("app.string.Loading"); // 上拉加载更多中时的文本 + private loadTextPullUp1?: ResourceStr = $r("app.string.Refreshing"); // 上拉1阶段文本 + private loadTextPullUp2?: ResourceStr = $r("app.string.ReleaseToRefresh"); // 上拉2阶段文本 + private loadTextLoading?: ResourceStr = $r("app.string.Loading_at_risk"); // 上拉加载更多中时的文本 setHasRefresh(hasRefresh: boolean) { this.hasRefresh = hasRefresh; @@ -203,7 +203,7 @@ export class PullToRefreshConfigurator { return 0; } - setLoadTextPullUp1(loadTextPullUp1: string | Resource) { + setLoadTextPullUp1(loadTextPullUp1: ResourceStr) { this.loadTextPullUp1 = loadTextPullUp1; return this; } @@ -212,7 +212,7 @@ export class PullToRefreshConfigurator { return this.loadTextPullUp1; } - setLoadTextPullUp2(loadTextPullUp2: string | Resource) { + setLoadTextPullUp2(loadTextPullUp2: ResourceStr) { this.loadTextPullUp2 = loadTextPullUp2; return this; } @@ -221,12 +221,12 @@ export class PullToRefreshConfigurator { return this.loadTextPullUp2; } - setLoadTextLoading(loadTextLoading: string | Resource) { + setLoadTextLoading(loadTextLoading: ResourceStr) { this.loadTextLoading = loadTextLoading; return this; } - getLoadTextLoading(): string | Resource { + getLoadTextLoading(): ResourceStr { return this.loadTextLoading !== undefined ? this.loadTextLoading : ""; } } \ No newline at end of file diff --git a/library/src/main/resources/base/element/string.json b/library/src/main/resources/base/element/string.json index 8495bf5..258634a 100644 --- a/library/src/main/resources/base/element/string.json +++ b/library/src/main/resources/base/element/string.json @@ -21,7 +21,7 @@ "value": "Release to refresh" }, { - "name": "Loading", + "name": "Loading_at_risk", "value": "Loading..." } ] diff --git a/library/src/main/resources/zh_CN/element/string.json b/library/src/main/resources/zh_CN/element/string.json index c07cd09..c8e350f 100644 --- a/library/src/main/resources/zh_CN/element/string.json +++ b/library/src/main/resources/zh_CN/element/string.json @@ -17,7 +17,7 @@ "value": "放开刷新" }, { - "name": "Loading", + "name": "Loading_at_risk", "value": "正在玩命加载中..." } ] diff --git a/oh-package.json5 b/oh-package.json5 index 500f7e4..037c84d 100644 --- a/oh-package.json5 +++ b/oh-package.json5 @@ -1,4 +1,5 @@ { + "modelVersion": "5.0.0", "license": "ISC", "devDependencies": { "@ohos/hypium": "1.0.6" -- Gitee