From ca61d0bc70b085eec91cfb35069bf331a179c066 Mon Sep 17 00:00:00 2001 From: mashitao2 Date: Sat, 4 Feb 2023 18:02:17 +0800 Subject: [PATCH 1/2] =?UTF-8?q?IssueNo:=20#I6CWEK:=E5=BA=94=E7=94=A8?= =?UTF-8?q?=E6=9C=80=E5=B0=8F=E5=8C=96=E6=9B=B4=E6=96=B0=20Description:=20?= =?UTF-8?q?Apply=20Minimize=20Updates=20Sig:=20SIG=5Fapplications=5Fapp=5F?= =?UTF-8?q?samples=20Feature=20or=20Bugfix:=20Feature=20Binary=20Source:?= =?UTF-8?q?=20No=20Signed-off-by:=20mashitao2=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entry/src/main/ets/model/DataModels.ets | 4 +++- .../entry/src/main/ets/model/DataUtil.ets | 2 +- .../entry/src/main/ets/pages/FoodDetail.ets | 2 ++ .../entry/src/main/ets/pages/Home.ets | 9 ++++----- .../src/main/ets/pages/components/DietRecord.ets | 8 +++++++- ETSUI/HealthyDiet/entry/src/main/module.json5 | 6 ++++++ .../entry/src/main/ets/pages/Index.ets | 16 ++++++++-------- ETSUI/PatternLock/entry/src/main/module.json5 | 6 ++++++ .../src/main/resources/zh_CN/element/string.json | 2 +- .../src/main/ets/pages/ComponentTransition.ets | 1 + .../entry/src/main/module.json5 | 6 ++++++ .../entry/src/main/ets/common/PlayList.ets | 2 ++ .../entry/src/main/ets/common/PlayListCover.ets | 9 ++++----- .../entry/src/main/ets/common/Player.ets | 2 -- .../entry/src/main/ets/pages/Index.ets | 9 ++++++--- .../MusicAlbum/entry/src/main/module.json5 | 6 ++++++ .../entry/src/main/ets/common/ThemeDesktop.ets | 5 ++--- data/Preferences/entry/src/main/module.json5 | 6 ++++++ data/Search/entry/src/main/module.json5 | 6 ++++++ .../entry/src/main/ets/common/ChatsPage.ets | 7 ++++--- .../WebSocket/entry/src/main/ets/pages/Chats.ets | 6 +++--- network/WebSocket/entry/src/main/module.json5 | 6 ++++++ 22 files changed, 90 insertions(+), 36 deletions(-) diff --git a/ETSUI/HealthyDiet/entry/src/main/ets/model/DataModels.ets b/ETSUI/HealthyDiet/entry/src/main/ets/model/DataModels.ets index 8675d720..68233d50 100644 --- a/ETSUI/HealthyDiet/entry/src/main/ets/model/DataModels.ets +++ b/ETSUI/HealthyDiet/entry/src/main/ets/model/DataModels.ets @@ -106,8 +106,9 @@ export class MealFoodInfo { fat: number carbohydrates: number weight: number + foodId?: number - constructor(recordId: number, name: string | Resource, image: Resource, calories: number, protein: number, fat: number, carbohydrates: number, weight: number) { + constructor(recordId: number, name: string | Resource, image: Resource, calories: number, protein: number, fat: number, carbohydrates: number, weight: number, foodId?: number) { this.recordId = recordId this.name = name this.image = image @@ -116,5 +117,6 @@ export class MealFoodInfo { this.fat = fat this.carbohydrates = carbohydrates this.weight = weight + this.foodId = foodId } } \ No newline at end of file diff --git a/ETSUI/HealthyDiet/entry/src/main/ets/model/DataUtil.ets b/ETSUI/HealthyDiet/entry/src/main/ets/model/DataUtil.ets index e12b1419..fcfe175b 100644 --- a/ETSUI/HealthyDiet/entry/src/main/ets/model/DataUtil.ets +++ b/ETSUI/HealthyDiet/entry/src/main/ets/model/DataUtil.ets @@ -152,7 +152,7 @@ export function statistics(): Array { var protein = foodInfo.protein * item.weight var fat = foodInfo.fat * item.weight var carbohydrates = foodInfo.carbohydrates * item.weight - oneMealStatisticsInfo.mealFoods.push(new MealFoodInfo(item.id, foodInfo.name, foodInfo.image, calories, protein, fat, carbohydrates, item.weight)) + oneMealStatisticsInfo.mealFoods.push(new MealFoodInfo(item.id, foodInfo.name, foodInfo.image, calories, protein, fat, carbohydrates, item.weight, item.foodId)) oneMealStatisticsInfo.totalFat += fat oneMealStatisticsInfo.totalCalories += calories oneMealStatisticsInfo.totalCarbohydrates += carbohydrates diff --git a/ETSUI/HealthyDiet/entry/src/main/ets/pages/FoodDetail.ets b/ETSUI/HealthyDiet/entry/src/main/ets/pages/FoodDetail.ets index f818f65a..308a1805 100644 --- a/ETSUI/HealthyDiet/entry/src/main/ets/pages/FoodDetail.ets +++ b/ETSUI/HealthyDiet/entry/src/main/ets/pages/FoodDetail.ets @@ -310,6 +310,7 @@ struct Record { .justifyContent(FlexAlign.Center) TextPicker({ range: this.mileTime, selected: this.select }) + .height('100%') .layoutWeight(1) .linearGradient({ angle: 0, @@ -321,6 +322,7 @@ struct Record { }) TextPicker({ range: this.foodWeight, selected: this.select }) + .height('100%') .layoutWeight(1) .linearGradient({ angle: 0, diff --git a/ETSUI/HealthyDiet/entry/src/main/ets/pages/Home.ets b/ETSUI/HealthyDiet/entry/src/main/ets/pages/Home.ets index 611b70d3..373128ac 100644 --- a/ETSUI/HealthyDiet/entry/src/main/ets/pages/Home.ets +++ b/ETSUI/HealthyDiet/entry/src/main/ets/pages/Home.ets @@ -96,6 +96,7 @@ struct FoodGridItem { Image(this.foodItem.image) .objectFit(ImageFit.Contain) .backgroundColor('#f1f3f5') + .width('100%') .height(152) .sharedTransition(this.foodItem.letter, { duration: 400, @@ -125,7 +126,7 @@ struct FoodGridItem { @Component struct FoodGrid { - @StorageProp('currentBreakpoint') currentBreakpoint: string = 'md' + @StorageProp('currentBreakpoint') currentBreakpoint: string = 'sm' private foodItems: FoodInfo[] build() { @@ -174,7 +175,7 @@ struct CategoryModeFoods { }) } .animationDuration(0) - .barMode(BarMode.Scrollable) + .barWidth('80%') .onChange((index) => { this.currentTabIndex = index }) @@ -211,7 +212,7 @@ struct FoodsDisplay { @Component struct Home { @State currentTabIndex: number = 0 - @StorageProp('currentBreakpoint') currentBreakpoint: string = 'md' + @StorageProp('currentBreakpoint') currentBreakpoint: string = 'sm' private breakpointSystem: BreakpointSystem = new BreakpointSystem() @Builder bottomBarItemBuilder(name: Resource, icon: Resource, index: number) { @@ -237,8 +238,6 @@ struct Home { .fontSize(11) .fontColor(this.getTabBarColor(index)) } - .width('100%') - .height('100%') } aboutToAppear() { diff --git a/ETSUI/HealthyDiet/entry/src/main/ets/pages/components/DietRecord.ets b/ETSUI/HealthyDiet/entry/src/main/ets/pages/components/DietRecord.ets index d36ace83..6c55ed89 100644 --- a/ETSUI/HealthyDiet/entry/src/main/ets/pages/components/DietRecord.ets +++ b/ETSUI/HealthyDiet/entry/src/main/ets/pages/components/DietRecord.ets @@ -56,7 +56,7 @@ struct Histogram { Stack({ alignContent: Alignment.Bottom }) { Column() { - ForEach(new Array(6), (item) => { + ForEach([...new Array(6)], (item) => { Divider() .strokeWidth(1) .color('#D8D8D8') @@ -241,6 +241,12 @@ struct MealFoodDetail { .onClick(() => { animateTo({ duration: 400 }, () => { this.shown = false + let dietRecords = AppStorage.Get>('dietRecords') + let index = dietRecords.findIndex((item) => { + return item.foodId == this.mealFoodInfo.foodId + }) + dietRecords[index].weight = 0 + AppStorage.SetOrCreate>('dietRecords', dietRecords) }) }) } diff --git a/ETSUI/HealthyDiet/entry/src/main/module.json5 b/ETSUI/HealthyDiet/entry/src/main/module.json5 index 2afdf38b..e7d9eee3 100644 --- a/ETSUI/HealthyDiet/entry/src/main/module.json5 +++ b/ETSUI/HealthyDiet/entry/src/main/module.json5 @@ -25,6 +25,12 @@ "deliveryWithInstall": true, "installationFree": false, "pages": "$profile:main_pages", + "metadata": [ + { + "name": "ArkTSPartialUpdate", + "value": "true" + } + ], "abilities": [ { "name": "EntryAbility", diff --git a/ETSUI/PatternLock/entry/src/main/ets/pages/Index.ets b/ETSUI/PatternLock/entry/src/main/ets/pages/Index.ets index bbbf5454..dc3b1849 100644 --- a/ETSUI/PatternLock/entry/src/main/ets/pages/Index.ets +++ b/ETSUI/PatternLock/entry/src/main/ets/pages/Index.ets @@ -48,6 +48,14 @@ struct Index { this.patternLockController.reset() }) } + if (this.isShowSetting) { + Button($r('app.string.message_set_password')) + .margin(30) + .width('60%') + .onClick(() => { + this.setPassword() + }) + } Text(this.message) .textAlign(TextAlign.Center) .fontSize(30) @@ -98,14 +106,6 @@ struct Index { this.patternLockController.reset() } }) - if (this.isShowSetting) { - Button($r('app.string.message_set_password')) - .margin(30) - .width('60%') - .onClick(() => { - this.setPassword() - }) - } } .layoutWeight(1) .justifyContent(FlexAlign.End) diff --git a/ETSUI/PatternLock/entry/src/main/module.json5 b/ETSUI/PatternLock/entry/src/main/module.json5 index 2afdf38b..e7d9eee3 100644 --- a/ETSUI/PatternLock/entry/src/main/module.json5 +++ b/ETSUI/PatternLock/entry/src/main/module.json5 @@ -25,6 +25,12 @@ "deliveryWithInstall": true, "installationFree": false, "pages": "$profile:main_pages", + "metadata": [ + { + "name": "ArkTSPartialUpdate", + "value": "true" + } + ], "abilities": [ { "name": "EntryAbility", diff --git a/ETSUI/PatternLock/entry/src/main/resources/zh_CN/element/string.json b/ETSUI/PatternLock/entry/src/main/resources/zh_CN/element/string.json index 7d2a57a4..7db774ec 100644 --- a/ETSUI/PatternLock/entry/src/main/resources/zh_CN/element/string.json +++ b/ETSUI/PatternLock/entry/src/main/resources/zh_CN/element/string.json @@ -22,7 +22,7 @@ }, { "name": "message_input_new", - "value": "密码正确,请出入新的密码" + "value": "密码正确,请输入新的密码" }, { "name": "message_password_length_insufficient", diff --git a/ETSUI/TransitionAnimation/entry/src/main/ets/pages/ComponentTransition.ets b/ETSUI/TransitionAnimation/entry/src/main/ets/pages/ComponentTransition.ets index 191ef94f..c7add8b2 100644 --- a/ETSUI/TransitionAnimation/entry/src/main/ets/pages/ComponentTransition.ets +++ b/ETSUI/TransitionAnimation/entry/src/main/ets/pages/ComponentTransition.ets @@ -58,6 +58,7 @@ struct ComponentTransition { ComponentItem() } } + .width('100%') .layoutWeight(1) .padding(20) } diff --git a/ETSUI/TransitionAnimation/entry/src/main/module.json5 b/ETSUI/TransitionAnimation/entry/src/main/module.json5 index 2afdf38b..e7d9eee3 100644 --- a/ETSUI/TransitionAnimation/entry/src/main/module.json5 +++ b/ETSUI/TransitionAnimation/entry/src/main/module.json5 @@ -25,6 +25,12 @@ "deliveryWithInstall": true, "installationFree": false, "pages": "$profile:main_pages", + "metadata": [ + { + "name": "ArkTSPartialUpdate", + "value": "true" + } + ], "abilities": [ { "name": "EntryAbility", diff --git a/MultiDeviceAppDev/MusicAlbum/entry/src/main/ets/common/PlayList.ets b/MultiDeviceAppDev/MusicAlbum/entry/src/main/ets/common/PlayList.ets index 83ba5937..5e738fcf 100644 --- a/MultiDeviceAppDev/MusicAlbum/entry/src/main/ets/common/PlayList.ets +++ b/MultiDeviceAppDev/MusicAlbum/entry/src/main/ets/common/PlayList.ets @@ -98,6 +98,8 @@ export default struct PlayList { .backgroundColor('#fff') .margin({ top: 50 }) } + .width('100%') + .height('100%') .padding({ top: this.currentBreakpoint === 'sm' ? 0 : 50, bottom: this.currentBreakpoint === 'sm' ? this.coverHeight + 48 : 48 diff --git a/MultiDeviceAppDev/MusicAlbum/entry/src/main/ets/common/PlayListCover.ets b/MultiDeviceAppDev/MusicAlbum/entry/src/main/ets/common/PlayListCover.ets index 1566d1c1..832d13e0 100644 --- a/MultiDeviceAppDev/MusicAlbum/entry/src/main/ets/common/PlayListCover.ets +++ b/MultiDeviceAppDev/MusicAlbum/entry/src/main/ets/common/PlayListCover.ets @@ -66,14 +66,14 @@ export default struct PlayListCover { .justifyContent(FlexAlign.Center) .padding({ left: this.currentBreakpoint === 'sm' ? 20 : 0 }) .margin({ - top: this.currentBreakpoint === 'sm' ? 0 : 30, + top: this.currentBreakpoint === 'sm' ? 0 : 50, bottom: this.currentBreakpoint === 'sm' ? 0 : 20 }) } @Builder CoverOptions() { - Row() { + Flex({ justifyContent: FlexAlign.SpaceBetween }) { ForEach(optionList, item => { Column({ space: 4 }) { Image(item.image).height(30).width(30) @@ -88,7 +88,6 @@ export default struct PlayListCover { left: this.currentBreakpoint === 'sm' ? 20 : 0, right: this.currentBreakpoint === 'sm' ? 20 : 0 }) - .justifyContent(FlexAlign.SpaceBetween) } build() { @@ -105,7 +104,7 @@ export default struct PlayListCover { GridCol({ span: { sm: 12, md: 10 }, offset: { sm: 0, md: 2, lg: 2 } }) { this.CoverOptions() - }.margin({ + }.padding({ top: this.currentBreakpoint === 'sm' ? 15 : 0, bottom: this.currentBreakpoint === 'sm' ? 15 : 0 }) @@ -127,7 +126,7 @@ export default struct PlayListCover { GridCol({ span: { sm: 12, md: 10 }, offset: { sm: 0, md: 2, lg: 2 } }) { this.CoverOptions() }.margin({ - top: this.currentBreakpoint === 'sm' ? 15 : 0, + top: this.currentBreakpoint === 'sm' ? 15 : 60, bottom: this.currentBreakpoint === 'sm' ? 15 : 0 }) } diff --git a/MultiDeviceAppDev/MusicAlbum/entry/src/main/ets/common/Player.ets b/MultiDeviceAppDev/MusicAlbum/entry/src/main/ets/common/Player.ets index 48f1924d..5877f208 100644 --- a/MultiDeviceAppDev/MusicAlbum/entry/src/main/ets/common/Player.ets +++ b/MultiDeviceAppDev/MusicAlbum/entry/src/main/ets/common/Player.ets @@ -58,7 +58,5 @@ export default struct Player { .height(48) .backgroundColor('#F6F9FC') .padding({ left: 16, right: 16 }) - .position({x: 0,y: '100%'}) - .translate({x: 0,y: '-100%'}) } } \ No newline at end of file diff --git a/MultiDeviceAppDev/MusicAlbum/entry/src/main/ets/pages/Index.ets b/MultiDeviceAppDev/MusicAlbum/entry/src/main/ets/pages/Index.ets index 3382cacc..dcab3c8c 100644 --- a/MultiDeviceAppDev/MusicAlbum/entry/src/main/ets/pages/Index.ets +++ b/MultiDeviceAppDev/MusicAlbum/entry/src/main/ets/pages/Index.ets @@ -34,9 +34,12 @@ struct Index { } build() { - Stack({ alignContent: Alignment.Top }) { - Header() - Content() + Stack() { + Stack({ alignContent: Alignment.Top }) { + Header() + Content() + } + Player() } .width('100%') diff --git a/MultiDeviceAppDev/MusicAlbum/entry/src/main/module.json5 b/MultiDeviceAppDev/MusicAlbum/entry/src/main/module.json5 index 2afdf38b..e7d9eee3 100644 --- a/MultiDeviceAppDev/MusicAlbum/entry/src/main/module.json5 +++ b/MultiDeviceAppDev/MusicAlbum/entry/src/main/module.json5 @@ -25,6 +25,12 @@ "deliveryWithInstall": true, "installationFree": false, "pages": "$profile:main_pages", + "metadata": [ + { + "name": "ArkTSPartialUpdate", + "value": "true" + } + ], "abilities": [ { "name": "EntryAbility", diff --git a/data/Preferences/entry/src/main/ets/common/ThemeDesktop.ets b/data/Preferences/entry/src/main/ets/common/ThemeDesktop.ets index b6ce28fd..355ee44b 100644 --- a/data/Preferences/entry/src/main/ets/common/ThemeDesktop.ets +++ b/data/Preferences/entry/src/main/ets/common/ThemeDesktop.ets @@ -34,20 +34,19 @@ export default struct ThemeDesktop { build() { Grid() { - LazyForEach(new MyDataSource(this.themeDatas), (item) => { + ForEach(this.themeDatas, (item) => { GridItem() { Column() { Image(item.image) .width(70) .height(70) - .padding(10) .objectFit(ImageFit.Fill) Text(item.name).fontSize(15) } .width(90) .height(90) } - }, item => item.name) + }) } .rowsGap(10) .width('100%') diff --git a/data/Preferences/entry/src/main/module.json5 b/data/Preferences/entry/src/main/module.json5 index 2afdf38b..e7d9eee3 100644 --- a/data/Preferences/entry/src/main/module.json5 +++ b/data/Preferences/entry/src/main/module.json5 @@ -25,6 +25,12 @@ "deliveryWithInstall": true, "installationFree": false, "pages": "$profile:main_pages", + "metadata": [ + { + "name": "ArkTSPartialUpdate", + "value": "true" + } + ], "abilities": [ { "name": "EntryAbility", diff --git a/data/Search/entry/src/main/module.json5 b/data/Search/entry/src/main/module.json5 index 2afdf38b..e7d9eee3 100644 --- a/data/Search/entry/src/main/module.json5 +++ b/data/Search/entry/src/main/module.json5 @@ -25,6 +25,12 @@ "deliveryWithInstall": true, "installationFree": false, "pages": "$profile:main_pages", + "metadata": [ + { + "name": "ArkTSPartialUpdate", + "value": "true" + } + ], "abilities": [ { "name": "EntryAbility", diff --git a/network/WebSocket/entry/src/main/ets/common/ChatsPage.ets b/network/WebSocket/entry/src/main/ets/common/ChatsPage.ets index 2252f468..8d1e9a68 100644 --- a/network/WebSocket/entry/src/main/ets/common/ChatsPage.ets +++ b/network/WebSocket/entry/src/main/ets/common/ChatsPage.ets @@ -14,7 +14,7 @@ */ import ChatData from '../model/ChatData' -import {WebSocketSource} from "../model/DataSource" +import { WebSocketSource } from "../model/DataSource" @Component export default struct ChatsPage { @@ -27,12 +27,13 @@ export default struct ChatsPage { .width(40) .height(40) .padding(5) - .fontSize(25) + .fontSize(30) .borderRadius(10) .margin({ right: 10 }) .backgroundColor('#e5e5e5') .textAlign(TextAlign.Center) Text(message) + .textOverflow({ overflow: TextOverflow.Clip }) .padding(10) .maxLines(5) .fontSize(20) @@ -59,7 +60,7 @@ export default struct ChatsPage { } .padding(10) .width('100%') - }, item => item.message) + }, (item, index) => item.message + index) }.width('100%').height('100%') } .width('100%') diff --git a/network/WebSocket/entry/src/main/ets/pages/Chats.ets b/network/WebSocket/entry/src/main/ets/pages/Chats.ets index 1cc2d691..7b285607 100644 --- a/network/WebSocket/entry/src/main/ets/pages/Chats.ets +++ b/network/WebSocket/entry/src/main/ets/pages/Chats.ets @@ -13,7 +13,7 @@ * limitations under the License. */ -import prompt from '@ohos.prompt' +import promptAction from '@ohos.promptAction' import webSocket from '@ohos.net.webSocket' import Logger from '../model/Logger' import TopBar from '../common/TopBar' @@ -75,7 +75,7 @@ struct Chats { }) socket.on('open', (err, value) => { // 当收到on('open')事件时，可以通过send()方法与服务器进行通信 - prompt.showToast({ button: '连接成功,可以聊天了！', duration: 1500 }) + promptAction.showToast({ button: '连接成功,可以聊天了！', duration: 1500 }) }) socket.on('message', (err, value) => { Logger.info(TAG, `on message, value = ${value}`) @@ -89,7 +89,7 @@ struct Chats { Logger.info(TAG, `on open, status:${value['status']}, message:${value['message']}`) }) socket.off('message') - prompt.showToast({ button: '连接已断开！', duration: 1500 }) + promptAction.showToast({ button: '连接已断开！', duration: 1500 }) socket.close() } diff --git a/network/WebSocket/entry/src/main/module.json5 b/network/WebSocket/entry/src/main/module.json5 index e0c42b58..3f71f88d 100644 --- a/network/WebSocket/entry/src/main/module.json5 +++ b/network/WebSocket/entry/src/main/module.json5 @@ -24,6 +24,12 @@ "deliveryWithInstall": true, "installationFree": false, "pages": "$profile:main_pages", + "metadata": [ + { + "name": "ArkTSPartialUpdate", + "value": "true" + } + ], "abilities": [ { "name": "EntryAbility", -- Gitee From 28c535fc7ff4e1cff38f69e31464f94c4c568f54 Mon Sep 17 00:00:00 2001 From: mashitao2 Date: Mon, 6 Feb 2023 18:45:39 +0800 Subject: [PATCH 2/2] =?UTF-8?q?IssueNo:=20#I6D9TV:=E6=95=B4=E6=94=B9?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=20Description:=20Upadate=20style=20Sig:=20SI?= =?UTF-8?q?G=5Fapplications=5Fapp=5Fsamples=20Feature=20or=20Bugfix:=20Fea?= =?UTF-8?q?ture=20Binary=20Source:=20No=20Signed-off-by:=20mashitao2=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ETSUI/PatternLock/entry/src/main/ets/pages/Index.ets | 1 + .../entry/src/main/ets/common/PlayListCover.ets | 9 +++------ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/ETSUI/PatternLock/entry/src/main/ets/pages/Index.ets b/ETSUI/PatternLock/entry/src/main/ets/pages/Index.ets index dc3b1849..e5c140d0 100644 --- a/ETSUI/PatternLock/entry/src/main/ets/pages/Index.ets +++ b/ETSUI/PatternLock/entry/src/main/ets/pages/Index.ets @@ -52,6 +52,7 @@ struct Index { Button($r('app.string.message_set_password')) .margin(30) .width('60%') + .height(30) .onClick(() => { this.setPassword() }) diff --git a/MultiDeviceAppDev/MusicAlbum/entry/src/main/ets/common/PlayListCover.ets b/MultiDeviceAppDev/MusicAlbum/entry/src/main/ets/common/PlayListCover.ets index 832d13e0..c99ee0e6 100644 --- a/MultiDeviceAppDev/MusicAlbum/entry/src/main/ets/common/PlayListCover.ets +++ b/MultiDeviceAppDev/MusicAlbum/entry/src/main/ets/common/PlayListCover.ets @@ -26,8 +26,8 @@ export default struct PlayListCover { CoverImage() { Stack({ alignContent: Alignment.BottomStart }) { Image($r('app.media.pic_album')) - .width('100%') - .aspectRatio(1) + .width(this.currentBreakpoint == 'sm'? '120vp' : '170vp') + .height(this.currentBreakpoint == 'sm'? '120vp' : '170vp') .borderRadius(8) .onAreaChange((oldArea: Area, newArea: Area) => { this.imgHeight = newArea.height as number @@ -38,9 +38,6 @@ export default struct PlayListCover { .fontSize(this.fontSize - 4) .translate({ x: 10, y: '-100%' }) } - .width('100%') - .height('100%') - .aspectRatio(1) } @Builder @@ -55,7 +52,7 @@ export default struct PlayListCover { Text($r('app.string.playlist_Introduction')) .opacity(0.6) - .width('100%') + .width('170vp') .fontWeight(400) .fontColor('#556B89') .fontSize(this.fontSize - 2) -- Gitee