Merge branch 'main' of http://192.168.1.42/developOne/harmonyPool

@@ -3,46 +3,45 @@ import { RmhTitle } from '../cardCommon/RmhTitle'
 import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
 import { CommonConstants } from 'wdConstant/Index';
 
-const TAG = 'Card12Component';
+const TAG = 'Card14Component';
 
 /**
- * 人民号-动态---12：人民号无图卡；
+ * 人民号-动态---14：人民号单图卡；
  */
-@Entry
 @Component
-export struct Card12Component {
+export struct Card14Component {
   @State contentDTO: ContentDTO = {
-    appStyle: '20',
-    coverType: 1,
-    coverUrl: 'https://rmrbcmsonline.peopleapp.com/upload/user_app/gov_dynamic/video/default_image/202105/rmrb_default_image_4GdWrgSw1622451312.jpg?x-oss-process=image/resize,m_fill,h_480,w_360/quality,q_90',
-    fullColumnImgUrls: [
-      {
-        landscape: 1,
-        size: 1,
-        url: 'https://rmrbcmsonline.peopleapp.com/upload/user_app/gov_dynamic/video/default_image/202105/rmrb_default_image_4GdWrgSw1622451312.jpg?x-oss-process=image/resize,m_fill,h_480,w_360/quality,q_90',
-        weight: 1600
-      }
-    ],
-    newsTitle: '好玩！》10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人',
-    rmhInfo: {
-      authIcon:
-      'https://cdnjdphoto.aikan.pdnews.cn/creator-category/icon/auth/yellow.png',
-      authTitle: '10后音乐人王烁然个人人民号',
-      authTitle2: '10后音乐人王烁然个人人民号',
-      banControl: 0,
-      cnIsAttention: 1,
-      rmhDesc: '10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人',
-      rmhHeadUrl: 'https://cdnjdphoto.aikan.pdnews.cn/image/creator/rmh/20221031/3d3419e86a.jpeg?x-oss-process=image/resize,l_100/auto-orient,1/quality,q_90/format,jpg',
-      rmhName: '王烁然',
-      userId: '522435359667845',
-      userType: '2'
-    },
-    objectType: '1',
-    videoInfo: {
-      firstFrameImageUri: '',
-      videoDuration: 37,
-      videoUrl: 'https://rmrbcmsonline.peopleapp.com/upload/user_app/gov_dynamic/video/mp4/202105/rmrb_GSNARt6P1622451310.mp4'
-    }
+    // appStyle: '20',
+    // coverType: 1,
+    // coverUrl: 'https://rmrbcmsonline.peopleapp.com/upload/user_app/gov_dynamic/video/default_image/202105/rmrb_default_image_4GdWrgSw1622451312.jpg?x-oss-process=image/resize,m_fill,h_480,w_360/quality,q_90',
+    // fullColumnImgUrls: [
+    //   {
+    //     landscape: 1,
+    //     size: 1,
+    //     url: 'https://rmrbcmsonline.peopleapp.com/upload/user_app/gov_dynamic/video/default_image/202105/rmrb_default_image_4GdWrgSw1622451312.jpg?x-oss-process=image/resize,m_fill,h_480,w_360/quality,q_90',
+    //     weight: 1600
+    //   }
+    // ],
+    // newsTitle: '好玩！》10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人',
+    // rmhInfo: {
+    //   authIcon:
+    //   'https://cdnjdphoto.aikan.pdnews.cn/creator-category/icon/auth/yellow.png',
+    //   authTitle: '10后音乐人王烁然个人人民号',
+    //   authTitle2: '10后音乐人王烁然个人人民号',
+    //   banControl: 0,
+    //   cnIsAttention: 1,
+    //   rmhDesc: '10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人',
+    //   rmhHeadUrl: 'https://cdnjdphoto.aikan.pdnews.cn/image/creator/rmh/20221031/3d3419e86a.jpeg?x-oss-process=image/resize,l_100/auto-orient,1/quality,q_90/format,jpg',
+    //   rmhName: '王烁然',
+    //   userId: '522435359667845',
+    //   userType: '2'
+    // },
+    // objectType: '1',
+    // videoInfo: {
+    //   firstFrameImageUri: '',
+    //   videoDuration: 37,
+    //   videoUrl: 'https://rmrbcmsonline.peopleapp.com/upload/user_app/gov_dynamic/video/mp4/202105/rmrb_GSNARt6P1622451310.mp4'
+    // }
   } as ContentDTO;
 
   aboutToAppear(): void {

+import { ContentDTO } from 'wdBean';
+import { RmhTitle } from '../cardCommon/RmhTitle'
+import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
+import { CommonConstants } from 'wdConstant/Index';
+
+const TAG = 'Card16Component';
+
+/**
+ * 人民号-动态---16：人民号三图卡；
+ */
+@Component
+export struct Card16Component {
+  @State contentDTO: ContentDTO = {
+    appStyle: '20',
+    coverType: 1,
+    coverUrl: 'https://rmrbcmsonline.peopleapp.com/upload/user_app/gov_dynamic/video/default_image/202105/rmrb_default_image_4GdWrgSw1622451312.jpg?x-oss-process=image/resize,m_fill,h_480,w_360/quality,q_90;https://rmrbcmsonline.peopleapp.com/upload/user_app/gov_dynamic/video/default_image/202105/rmrb_default_image_4GdWrgSw1622451312.jpg?x-oss-process=image/resize,m_fill,h_480,w_360/quality,q_90;https://rmrbcmsonline.peopleapp.com/upload/user_app/gov_dynamic/video/default_image/202105/rmrb_default_image_4GdWrgSw1622451312.jpg?x-oss-process=image/resize,m_fill,h_480,w_360/quality,q_90',
+    fullColumnImgUrls: [
+      {
+        landscape: 1,
+        size: 1,
+        url: 'https://rmrbcmsonline.peopleapp.com/upload/user_app/gov_dynamic/video/default_image/202105/rmrb_default_image_4GdWrgSw1622451312.jpg?x-oss-process=image/resize,m_fill,h_480,w_360/quality,q_90',
+        weight: 1600
+      }
+    ],
+    newsTitle: '好玩！》10后音乐人王烁然个人人民号10后音乐人王烁然个人人民号10后音乐人王烁然个人人民号10后音乐人王烁然个人人民号10后音乐人王烁然个人人民号10后音乐人王烁然个人人民号',
+    rmhInfo: {
+      authIcon:
+      'https://cdnjdphoto.aikan.pdnews.cn/creator-category/icon/auth/yellow.png',
+      authTitle: '10后音乐人王烁然个人人民号',
+      authTitle2: '10后音乐人王烁然个人人民号',
+      banControl: 0,
+      cnIsAttention: 1,
+      rmhDesc: '10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人',
+      rmhHeadUrl: 'https://cdnjdphoto.aikan.pdnews.cn/image/creator/rmh/20221031/3d3419e86a.jpeg?x-oss-process=image/resize,l_100/auto-orient,1/quality,q_90/format,jpg',
+      rmhName: '王烁然',
+      userId: '522435359667845',
+      userType: '2'
+    },
+    objectType: '1',
+    videoInfo: {
+      firstFrameImageUri: '',
+      videoDuration: 37,
+      videoUrl: 'https://rmrbcmsonline.peopleapp.com/upload/user_app/gov_dynamic/video/mp4/202105/rmrb_GSNARt6P1622451310.mp4'
+    }
+  } as ContentDTO;
+
+  aboutToAppear(): void {
+  }
+
+  build() {
+    Column() {
+      // rmh信息
+      RmhTitle({ rmhInfo: this.contentDTO.rmhInfo })
+      // 标题
+      if (this.contentDTO.newsTitle) {
+        Text(this.contentDTO.newsTitle)
+          .fontSize($r('app.float.font_size_17'))
+          .fontColor($r('app.color.color_222222'))
+          .width(CommonConstants.FULL_WIDTH)
+          .textOverflowStyle(2)
+          .margin({ bottom: 8 })
+          .lineHeight(25)
+      }
+      if (this.contentDTO.coverUrl) {
+        Flex() {
+          ForEach(this.contentDTO.coverUrl?.split(';'), (item: string) => {
+            Image(item).flexBasis(113).height(75).margin({right: 2})
+          })
+        }
+      }
+      //TODO  底部的：分享、评论、点赞 功能；需要引用一个公共组件
+    }
+    .padding({
+      left: $r('app.float.card_comp_pagePadding_lf'),
+      right: $r('app.float.card_comp_pagePadding_lf'),
+      top: $r('app.float.card_comp_pagePadding_tb'),
+      bottom: $r('app.float.card_comp_pagePadding_tb')
+    })
+  }
+}
+
+interface radiusType {
+  topLeft: number | Resource;
+  topRight: number | Resource;
+  bottomLeft: number | Resource;
+  bottomRight: number | Resource;
+}
+
+@Component
+struct createImg {
+  @Prop contentDTO: ContentDTO
+
+  build() {
+    GridRow() {
+      if (this.contentDTO.fullColumnImgUrls[0].landscape === 1) {
+        // 横屏
+        GridCol({
+          span: { xs: 12 }
+        }) {
+          Stack() {
+            Image(this.contentDTO.coverUrl)
+              .width(CommonConstants.FULL_WIDTH)
+              .aspectRatio(16 / 9)
+              .borderRadius($r('app.float.image_border_radius'))
+            CardMediaInfo({ contentDTO: this.contentDTO })
+          }
+          .align(Alignment.BottomEnd)
+        }
+      } else {
+        // 竖图显示，宽度占50%，高度自适应
+        GridCol({
+          span: { xs: 6 }
+        }) {
+          Stack() {
+            Image(this.contentDTO.coverUrl)
+              .width(CommonConstants.FULL_WIDTH)
+              .borderRadius($r('app.float.image_border_radius'))
+            CardMediaInfo({ contentDTO: this.contentDTO })
+          }
+          .align(Alignment.BottomEnd)
+        }
+      }
+    }
+  }
+}
+
+
+@Extend(Text)
+function textOverflowStyle(maxLine: number) {
+  .maxLines(maxLine)
+  .textOverflow({ overflow: TextOverflow.Ellipsis })
+}
\ No newline at end of file

@@ -13,7 +13,7 @@ export struct Card19Component {
       // coverUrl: 'https://rmrbcmsonline.peopleapp.com/upload/ueditor/image/20240323/a_955994160362418176.png?x-oss-process=image/resize,w_550/quality,q_90/format,jpg',
       // fullColumnImgUrls: [
       //   {
-      //     fullUrl: 'https://rmrbcmsonline.peopleapp.com/upload/ueditor/image/20240323/a_955994160362418176.png?x-oss-process=image/quality,q_90/auto-orient,1',
+      //     fullUrl: 'https://rmrbcmsonline.peopleapp.com/upload/ueditor/image/20240323/a_955994155727712256.png?x-oss-process=image/quality,q_90/auto-orient,1',
       //     height: 1500,
       //     landscape: 1,
       //     size: 1,
@@ -107,6 +107,8 @@ interface radiusType {
 @Component
 struct createImg {
   @Prop fullColumnImgUrls: FullColumnImgUrlDTO[]
+  @State picWidth: number = 0;
+  @State picHeight: number = 0;
   aboutToAppear(): void {
     if(this.fullColumnImgUrls.length === 4) { // 为了使用栅格布局以便于占用三分之二的宽度，加一个占位
       this.fullColumnImgUrls.splice(2,0, {
@@ -137,18 +139,77 @@ struct createImg {
     return radius
   }
 
+  getPicType(){
+    if (this.picWidth && this.picWidth) {
+      if (this.picWidth / this.picHeight > 343/172) {
+        return 1; //横长图
+      } else if (this.picHeight / this.picWidth > 305/228) {
+        return 2; //竖长图
+      } else {
+        return 3
+      }
+    } else {
+      return 3; //普通图
+    }
+  }
+
+
   build() {
     GridRow({
       gutter: { x: 2, y: 2 }
     }) {
       ForEach(this.fullColumnImgUrls, (item: FullColumnImgUrlDTO, index: number) => {
         if (this.fullColumnImgUrls.length === 1) {
+          if (this.getPicType() !== 3) {
+            GridCol({
+              span: this.getPicType() === 1 ? 12 : 8
+            }){
+              Stack({
+                alignContent: Alignment.BottomEnd
+              }) {
+                if (this.getPicType() === 1) {
+                  Image(item.fullUrl)
+                    .width('100%')
+                    .height(172)
+                    .autoResize(true)
+                    .borderRadius(this.caclImageRadius(index))
+                } else if (this.getPicType() === 2) {
+                  Image(item.fullUrl)
+                    .width('100%')
+                    .height(305)
+                    .autoResize(true)
+                    .borderRadius(this.caclImageRadius(index))
+                }
+                Flex({ direction: FlexDirection.Row }) {
+                  Image($r('app.media.icon_long_pic'))
+                    .width(14)
+                    .height(14)
+                    .margin({right: 4})
+                  Text('长图')
+                    .fontSize(12)
+                    .fontWeight(400)
+                    .fontColor(0xffffff)
+                    .fontFamily('PingFang SC')
+                }
+                .width(48)
+                .padding({bottom: 9})
+
+              }
+            }
+          } else {
             GridCol({
               span: { xs: 8 }
             }) {
               Image(item.fullUrl)
                 .width('100%')
                 .borderRadius(this.caclImageRadius(index))
+                .autoResize(true)
+                .opacity(!this.picWidth && !this.picHeight ? 0 : 1)
+                .onComplete(callback => {
+                  this.picWidth = callback?.width || 0;
+                  this.picHeight = callback?.height || 0;
+                })
+            }
           }
         } else if (this.fullColumnImgUrls.length === 4) {
           GridCol({