Merge remote-tracking branch 'origin/main'

@@ -113,7 +113,7 @@ export struct Card16Component {
           })
           })
         }
         }
         .width(CommonConstants.FULL_PARENT)
         .width(CommonConstants.FULL_PARENT)
-        .alignContent(Alignment.BottomEnd)
+        .alignContent(Alignment.TopEnd)
         // Flex() {
         // Flex() {
         //   ForEach(this.contentDTO.fullColumnImgUrls.slice(0, 3), (item: fullColumnImgUrlItem, index: number) => {
         //   ForEach(this.contentDTO.fullColumnImgUrls.slice(0, 3), (item: fullColumnImgUrlItem, index: number) => {
         //     Image(this.loadImg ? item.url : '')
         //     Image(this.loadImg ? item.url : '')

@@ -148,6 +148,14 @@ struct createImg {
       radius.bottomLeft = index === 0 ? $r('app.float.image_border_radius') : 0
       radius.bottomLeft = index === 0 ? $r('app.float.image_border_radius') : 0
       radius.topRight = index === 1 ? $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
       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) {
     } else if (this.fullColumnImgUrls.length === 5 && !this.fullColumnImgUrls[2].fullUrl) {
       radius.topRight = index === 1 ? $r('app.float.image_border_radius') : 0
       radius.topRight = index === 1 ? $r('app.float.image_border_radius') : 0
       radius.bottomLeft = index === 3 ? $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) {
   getPicType(picWidth: number, picHeight: number) {
+    //console.info(`cj2024 getPicType picWidth = ${picWidth} picHeight = ${picHeight} picWidth / picHeight = ${picWidth / picHeight}`)
     if (picWidth && picHeight) {
     if (picWidth && picHeight) {
       if (picWidth / picHeight > 2/1) {
       if (picWidth / picHeight > 2/1) {
         return 1; //横长图
         return 1; //横长图