From 2b4a664046d6544f0b5511dae316e25393bea7dd Mon Sep 17 00:00:00 2001 From: liqi Date: Tue, 6 Aug 2024 11:03:13 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=82=E9=85=8DV2=E8=A3=85=E9=A5=B0=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: liqi --- AppScope/app.json5 | 2 +- CHANGELOG.md | 3 +++ README.md | 4 +--- build-profile.json5 | 4 ++-- entry/oh-package.json5 | 2 +- entry/src/main/ets/pages/Index.ets | 10 ++++----- library/oh-package.json5 | 2 +- .../components/MainPage/CircleImageView.ets | 21 ++++++++++--------- oh-package.json5 | 2 +- 9 files changed, 26 insertions(+), 24 deletions(-) diff --git a/AppScope/app.json5 b/AppScope/app.json5 index 79f2b2f..b4ea1b9 100644 --- a/AppScope/app.json5 +++ b/AppScope/app.json5 @@ -3,7 +3,7 @@ "bundleName": "cn.openharmony.circleimageview", "vendor": "example", "versionCode": 1000000, - "versionName": "1.0.0", + "versionName": "2.1.0-rc.0", "icon": "$media:app_icon", "label": "$string:app_name", "distributedNotificationEnabled": true diff --git a/CHANGELOG.md b/CHANGELOG.md index 31d287c..af8eb2f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## 2.1.0-rc.0 +- 适配V2装饰器 + ## 2.0.0 1.DevEco Studio 版本： 4.1 Canary(4.1.3.317),OpenHarmony SDK:API11 (4.1.0.36) diff --git a/README.md b/README.md index dfc60c4..70d7e6b 100644 --- a/README.md +++ b/README.md @@ -73,9 +73,7 @@ import { CircleImageView } from '@ohos/circleimageview'; 在下述版本验证通过： -- DevEco Studio 版本： 4.1 Canary(4.1.3.317) - -- OpenHarmony SDK:API11 (4.1.0.36) +- DevEco Studio NEXT Developer Beta3: 5.0(5.0.3.530), SDK: API12 (5.0.0.35(SP3)) ## 目录结构 ```` diff --git a/build-profile.json5 b/build-profile.json5 index 35e4572..af3dcf7 100644 --- a/build-profile.json5 +++ b/build-profile.json5 @@ -6,8 +6,8 @@ { "name": "default", "signingConfig": "default", - "compileSdkVersion": 10, - "compatibleSdkVersion": 10, + "compileSdkVersion": 12, + "compatibleSdkVersion": 12, "runtimeOS": "OpenHarmony" } ] diff --git a/entry/oh-package.json5 b/entry/oh-package.json5 index 487136e..23c4761 100644 --- a/entry/oh-package.json5 +++ b/entry/oh-package.json5 @@ -11,7 +11,7 @@ "description": "一个图片处理的库,可以方便的将图片裁剪成圆形,也可以给图片设置边框的库", "main": "", "repository": {}, - "version": "2.0.0", + "version": "2.1.0-rc.0", "dependencies": { "@ohos/circleimageview": "file:../library" } diff --git a/entry/src/main/ets/pages/Index.ets b/entry/src/main/ets/pages/Index.ets index 03e3535..e291271 100644 --- a/entry/src/main/ets/pages/Index.ets +++ b/entry/src/main/ets/pages/Index.ets @@ -20,22 +20,22 @@ import { CircleImageView } from '@ohos/circleimageview'; @Entry -@Component +@ComponentV2 struct Index { - @State data: CircleImageView.Model = new CircleImageView.Model(); + @Provider('CircleImageViewModel') data: CircleImageView.Model = new CircleImageView.Model(); build() { Column() { List({ space: 0, initialIndex: 0 }) { ListItem() { Column({ space: 5 }) { - CircleImageView({ model: $data }) + CircleImageView() }.align(Alignment.Center).width(200).height(200) }.height('50%').width('100%') ListItem() { Column({ space: 5 }) { - CircleImageView({ model: $data }) + CircleImageView() }.align(Alignment.Center) }.height('50%').backgroundColor(0x000000).width('100%') } @@ -44,7 +44,7 @@ struct Index { } aboutToAppear() { - this.data.setImageURI('hugh.jpg').setDiameter(200).setBorderWidth(5) + this.data.setImageURI('hugh.jpg').setDiameter(200).setBorderWidth(15) .setBorderColor(Color.White).setDisableCircularTransformation(true) } } \ No newline at end of file diff --git a/library/oh-package.json5 b/library/oh-package.json5 index eb4e11f..385cb81 100644 --- a/library/oh-package.json5 +++ b/library/oh-package.json5 @@ -13,7 +13,7 @@ "main": "index.ets", "repository": "https://gitee.com/openharmony-sig/CircleImageView", "type": "module", - "version": "2.0.0", + "version": "2.1.0-rc.0", "tags": [ "OpenHarmony", "circleimage", diff --git a/library/src/main/ets/components/MainPage/CircleImageView.ets b/library/src/main/ets/components/MainPage/CircleImageView.ets index fe1269b..ddc73d4 100644 --- a/library/src/main/ets/components/MainPage/CircleImageView.ets +++ b/library/src/main/ets/components/MainPage/CircleImageView.ets @@ -17,9 +17,9 @@ * limitations under the License. */ -@Component +@ComponentV2 struct CircleImageView { - @Link model: CircleImageView.Model; + @Consumer('CircleImageViewModel') model: CircleImageView.Model = new CircleImageView.Model(); build() { Stack(){ @@ -42,15 +42,16 @@ struct CircleImageView { namespace CircleImageView { + @ObservedV2 export class Model { - src: string = ''; - diameter: number = 0; - scaleType: ImageFit = ImageFit.Contain; - disableCircularTransformation: boolean = true; - circle: ESObject; - color: number = 0; - borderWidth: number = 0; - borderColor: ResourceColor = Color.Gray; + @Trace src: string = ''; + @Trace diameter: number = 0; + @Trace scaleType: ImageFit = ImageFit.Contain; + @Trace disableCircularTransformation: boolean = true; + @Trace circle: ESObject; + @Trace color: number = 0; + @Trace borderWidth: number = 0; + @Trace borderColor: ResourceColor = Color.Gray; setDiameter(diameter: number): Model { this.diameter = diameter; diff --git a/oh-package.json5 b/oh-package.json5 index 07d40e8..af5c6e3 100644 --- a/oh-package.json5 +++ b/oh-package.json5 @@ -13,6 +13,6 @@ "description": "一个图片处理的库,可以方便的将图片裁剪成圆形,也可以给图片设置边框的库", "main": "", "repository": {}, - "version": "2.0.0", + "version": "2.1.0-rc.0", "dependencies": {} } -- Gitee