developOne / harmonyPool

Go to a project
Toggle navigation Toggle navigation pinning
王士厅
7b8b7323 2 parents 0d048a98 d4dca382

Merge remote-tracking branch 'origin/main'

Inline Side-by-side
Showing 2 changed files with 10 additions and 1 deletions
... ... @@ -113,7 +113,7 @@ export struct Card16Component {
})
}
.width(CommonConstants.FULL_PARENT)
.alignContent(Alignment.BottomEnd)
.alignContent(Alignment.TopEnd)
// Flex() {
// ForEach(this.contentDTO.fullColumnImgUrls.slice(0, 3), (item: fullColumnImgUrlItem, index: number) => {
// Image(this.loadImg ? item.url : '')
... ...
... ... @@ -148,6 +148,14 @@ struct createImg {
radius.bottomLeft = index === 0 ? $r('app.float.image_border_radius') : 0
radius.topRight = index === 1 ? $r('app.float.image_border_radius') : 0
radius.bottomRight = index === 1 ? $r('app.float.image_border_radius') : 0
} else if (this.fullColumnImgUrls.length === 3) {
radius.bottomLeft = index === 0 ? $r('app.float.image_border_radius') : 0
radius.topRight = index === 2 ? $r('app.float.image_border_radius') : 0
radius.bottomRight = index === 2 ? $r('app.float.image_border_radius') : 0
} else if (this.fullColumnImgUrls.length === 6) {
radius.topRight = index === 2 ? $r('app.float.image_border_radius') : 0
radius.bottomLeft = index === 3 ? $r('app.float.image_border_radius') : 0
radius.bottomRight = index === 5 ? $r('app.float.image_border_radius') : 0
} else if (this.fullColumnImgUrls.length === 5 && !this.fullColumnImgUrls[2].fullUrl) {
radius.topRight = index === 1 ? $r('app.float.image_border_radius') : 0
radius.bottomLeft = index === 3 ? $r('app.float.image_border_radius') : 0
... ... @@ -161,6 +169,7 @@ struct createImg {
}
getPicType(picWidth: number, picHeight: number) {
//console.info(`cj2024 getPicType picWidth = ${picWidth} picHeight = ${picHeight} picWidth / picHeight = ${picWidth / picHeight}`)
if (picWidth && picHeight) {
if (picWidth / picHeight > 2/1) {
return 1; //横长图
... ...