样式卡底部来源、评论、发布日期抽离组件

@@ -69,6 +69,7 @@ export interface ContentDTO {
   isSelect: boolean;
   rmhInfo: RmhInfoDTO; // 人民号信息
   photoNum: number;
-
+  corner: string;
+  rmhPlatform: number
 
 }
\ No newline at end of file

+import { ContentDTO } from 'wdBean'
+import { CommonConstants } from 'wdConstant/Index';
+import { DateTimeUtils } from 'wdKit/Index';
+
+@Component
+export struct CardSourceInfo {
+  @State contentDTO: ContentDTO = {} as ContentDTO;
+  build() {
+    Flex() {
+      if(this.contentDTO.corner === '1') {
+        Text("锐评")
+          .fontSize($r("app.float.font_size_12"))
+          .fontColor($r("app.color.color_ED2800"))
+      }
+      if(this.contentDTO.rmhPlatform === 1) {
+        Text(this.contentDTO.rmhInfo.rmhName)
+          .fontSize($r("app.float.font_size_12"))
+          .fontColor($r("app.color.color_B0B0B0"))
+          .maxLines(1)
+          .textOverflow({overflow: TextOverflow.Ellipsis})
+        Image($r("app.media.point"))
+          .width(16)
+          .height(16)
+      } else if(this.contentDTO.source) {
+        Text(`${this.contentDTO.source}`)
+          .fontSize($r("app.float.font_size_12"))
+          .fontColor($r("app.color.color_B0B0B0"))
+          .maxLines(1)
+          .textOverflow({overflow: TextOverflow.Ellipsis})
+        Image($r("app.media.point"))
+          .width(16)
+          .height(16)
+      }
+      Text(DateTimeUtils.getCommentTime(Number.parseFloat(this.contentDTO.publishTime)))
+        .fontSize($r("app.float.font_size_12"))
+        .fontColor($r("app.color.color_B0B0B0"))
+        .margin({ right: 6 })
+        .flexShrink(0)
+      if(this.contentDTO?.interactData?.commentNum) {
+        Text(`${this.contentDTO.interactData.commentNum}评`)
+          .fontSize($r("app.float.font_size_12"))
+          .fontColor($r("app.color.color_B0B0B0"))
+          .flexShrink(0)
+      }
+    }
+    .width(CommonConstants.FULL_WIDTH)
+    .margin({ top: 8 })
+  }
+}
\ No newline at end of file

@@ -3,7 +3,7 @@ import { CommonConstants } from 'wdConstant'
 import { ContentDTO } from 'wdBean'
 import { DateTimeUtils } from 'wdKit'
 import { ProcessUtils } from '../../utils/ProcessUtils';
-
+import { CardSourceInfo } from '../cardCommon/CardSourceInfo'
 const TAG = 'Card11Component';
 
 /**
@@ -21,29 +21,8 @@ export struct Card11Component {
         .maxLines(3)
         .textOverflow({ overflow: TextOverflow.Ellipsis })
         .width(CommonConstants.FULL_WIDTH)
-      Row() {
-        if (this.contentDTO.source) {
-          Text(this.contentDTO.source)
-            .fontSize($r("app.float.font_size_12"))
-            .fontColor($r("app.color.color_B0B0B0"))
-            .margin({ left: 6 })
-          Image($r("app.media.point"))
-            .width(16)
-            .height(16)
-        }
-
-        Text(DateTimeUtils.getCommentTime(Number.parseFloat(this.contentDTO.publishTime)))
-          .fontSize($r("app.float.font_size_12"))
-          .fontColor($r("app.color.color_B0B0B0"))
-          .margin({ right: 6 })
-        // TODO '评论取哪个字段'
-        // Text(`1806评`)
-        //   .fontSize($r("app.float.font_size_12"))
-        //   .fontColor($r("app.color.color_B0B0B0"))
-      }.width(CommonConstants.FULL_WIDTH)
-      .justifyContent(FlexAlign.Start)
-      .margin({ top: 8 })
-
+      // 评论等信息
+      CardSourceInfo({ contentDTO: this.contentDTO })
     }.width(CommonConstants.FULL_WIDTH)
     .padding({
       left: $r('app.float.card_comp_pagePadding_lf'),

 //全标题 "appStyle":"2",
 import { ContentDTO } from 'wdBean';
 import { CommonConstants } from 'wdConstant/Index';
-import { DateTimeUtils } from 'wdKit/Index';
 import { ProcessUtils } from '../../utils/ProcessUtils';
 import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
-
+import { CardSourceInfo } from '../cardCommon/CardSourceInfo'
 const TAG: string = 'Card2Component';
 
 /**
@@ -60,21 +59,8 @@ export struct Card2Component {
       .alignItems(HorizontalAlign.Start)
 
       //bottom
-      Row() {
-        Text(this.contentDTO.source)
-          .bottomTextStyle()
-        //间隔点
-        Image($r('app.media.point'))
-          .width(12)
-          .height(12)
-
-        Text(DateTimeUtils.getCommentTime(Number.parseFloat(this.contentDTO.publishTime)))
-          .bottomTextStyle()
-      }
-      .width(CommonConstants.FULL_WIDTH)
-      .height(18)
-      .justifyContent(FlexAlign.Start)
-      .margin({ top: 8 })
+      // 评论等信息
+      CardSourceInfo({ contentDTO: this.contentDTO })
     }
     .width(CommonConstants.FULL_WIDTH)
     .padding({

 import { ContentDTO } from 'wdBean';
 import { CommonConstants } from 'wdConstant'
-import { DateTimeUtils } from 'wdKit/src/main/ets/utils/DateTimeUtils'
 import { ProcessUtils } from '../../utils/ProcessUtils';
+import { CardSourceInfo } from '../cardCommon/CardSourceInfo'
 
 /**
  * 卡片样式："appStyle":"3"
@@ -27,30 +27,8 @@ export struct Card3Component {
         .fontSize($r("app.float.font_size_16"))
         .fontColor($r("app.color.color_222222"))
         .width(CommonConstants.FULL_WIDTH)
-      Row() {
-        // TODO "锐评"取得哪个字段，什么时候显示。
-        // Text("锐评")
-        //   .fontSize($r("app.float.font_size_12"))
-        //   .fontColor($r("app.color.color_ED2800"))
-        if(this.contentDTO.source) {
-          Text(this.contentDTO.source)
-            .fontSize($r("app.float.font_size_12"))
-            .fontColor($r("app.color.color_B0B0B0"))
-          Image($r("app.media.point"))
-            .width(16)
-            .height(16)
-        }
-        Text(DateTimeUtils.getCommentTime(Number.parseFloat(this.contentDTO.publishTime)))
-          .fontSize($r("app.float.font_size_12"))
-          .fontColor($r("app.color.color_B0B0B0"))
-          .margin({ right: 6 })
-        // TODO '评论取哪个字段'
-        Text(`${this.contentDTO?.interactData?.commentNum}评`)
-          .fontSize($r("app.float.font_size_12"))
-          .fontColor($r("app.color.color_B0B0B0"))
-      }.width(CommonConstants.FULL_WIDTH)
-      .justifyContent(FlexAlign.Start)
-      .margin({ top: 8 })
+      // 评论等信息
+      CardSourceInfo({ contentDTO: this.contentDTO })
     }
     .width(CommonConstants.FULL_WIDTH)
     .padding({

 import { ContentDTO, FullColumnImgUrlDTO } from 'wdBean';
 import { CommonConstants } from 'wdConstant/Index';
 import { ProcessUtils } from '../../utils/ProcessUtils';
-import { DateTimeUtils } from 'wdKit/Index';
-
+import { CardSourceInfo } from '../cardCommon/CardSourceInfo'
 const TAG: string = 'Card4Component';
 
 /**
@@ -110,25 +109,8 @@ export struct Card4Component {
       .onClick((event: ClickEvent) => {
         ProcessUtils.processPage(this.contentDTO)
       })
-
-
-      //bottom
-      Row() {
-        Text(this.contentDTO.source)
-          .bottomTextStyle()
-        //间隔点
-        Image($r('app.media.point'))
-          .width(12)
-          .height(12)
-        Text(DateTimeUtils.getCommentTime(Number.parseFloat(this.contentDTO.publishTime)))
-          .bottomTextStyle()
-        // TODO 评论字段取值
-        // Text('518条评论')
-        //   .bottomTextStyle()
-      }
-      .width('100%')
-      .justifyContent(FlexAlign.Start)
-      .margin({ top: 8 })
+      //bottom 评论等信息
+      CardSourceInfo({ contentDTO: this.contentDTO })
     }
     .width(CommonConstants.FULL_WIDTH)
     .padding({

@@ -2,12 +2,13 @@ import { ContentDTO } from 'wdBean';
 import { CommonConstants, CompStyle } from 'wdConstant';
 import { DateTimeUtils } from 'wdKit';
 import { ProcessUtils } from '../../utils/ProcessUtils';
-
+import { CardSourceInfo } from '../cardCommon/CardSourceInfo'
+import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
 const TAG: string = 'Card6Component-Card13Component';
 const FULL_PARENT: string = '100%';
 
 /**
- * 卡片样式："appStyle":"6"以及13
+ * 卡片样式："appStyle":"6"以及13--- 小视频卡
  */
 @Component
 export struct Card6Component {
@@ -26,93 +27,35 @@ export struct Card6Component {
         }.height("80%")
         .justifyContent(FlexAlign.Start)
 
-        Row() {
-          if (this.contentDTO.source) {
-            Text(this.contentDTO.source)
-              .fontSize($r('app.float.font_size_12'))
-              .fontColor(Color.Gray)
-              .maxLines(1)
-              .textOverflow({ overflow: TextOverflow.Ellipsis })// 超出的部分显示省略号。
-              .width(this.contentDTO.source.length > 8 ? '50%' : '')
-            Image($r('app.media.point'))
-              .width(16)
-              .height(16)
-          }
-          if (this.contentDTO.publishTime && this.contentDTO.publishTime.length === 13) {
-            Text(DateTimeUtils.getCommentTime(Number.parseFloat(this.contentDTO.publishTime)))
-              .fontSize($r('app.float.font_size_12'))
-              .fontColor(Color.Gray)
-          }
-          Text(this.contentDTO.visitorComment + '评')
-            .fontSize($r('app.float.font_size_12'))
-            .fontColor(Color.Gray)
-            .padding({
-              left: 5
-            })
-        }.alignSelf(ItemAlign.Start)
-        .height("20%")
-        .justifyContent(FlexAlign.Start)
+
+        //bottom 评论等信息
+        CardSourceInfo({ contentDTO: this.contentDTO })
       }
       .alignItems(HorizontalAlign.Start)
       .justifyContent(FlexAlign.Start)
       .width('58%')
-
-      Blank(16)
       if (this.contentDTO.coverUrl) {
         Stack() {
           Image(this.contentDTO.coverUrl)
             .borderRadius(5)
             .aspectRatio(this.contentDTO.appStyle === CompStyle.Card_13 ? 3 / 2 : 3 / 4)
             .height(this.contentDTO.appStyle === CompStyle.Card_13 ? 90 : 180)
-          if (this.contentDTO.videoInfo) {
-            Row() {
-              Image($r('app.media.iv_card_play_yellow_flag'))
-                .width(22)
-                .height(18)
-              Text(DateTimeUtils.getFormattedDuration(this.contentDTO.videoInfo.videoDuration * 1000))
-                .fontSize($r('app.float.font_size_13'))
-                .fontWeight(400)
-                .fontColor($r('app.color.color_fff'))
+          CardMediaInfo({ contentDTO: this.contentDTO })
         }
-            .alignItems(VerticalAlign.Bottom)
-            .height(18)
-            .padding({ right: 4 })
-            .margin({
-              right: 4,
-              bottom: 4
-            })
-            .backgroundColor($r('app.color.color_4d000000'))
-          } else if (this.contentDTO.voiceInfo) {
-            Row() {
-              Image($r('app.media.icon_listen'))
-                .width(22)
-                .height(18)
-              Text(DateTimeUtils.getFormattedDuration(this.contentDTO.voiceInfo
-                .voiceDuration * 1000))
-                .fontSize($r('app.float.font_size_13'))
-                .fontWeight(400)
-                .fontColor($r('app.color.color_fff'))
-            }
-            .alignItems(VerticalAlign.Bottom)
-            .height(18)
-            .padding({ right: 4 })
-            .margin({
-              right: 4,
-              bottom: 4
-            })
-            .backgroundColor($r('app.color.color_4d000000'))
-          }
-        }.alignContent(Alignment.BottomEnd)
+        .alignContent(Alignment.BottomEnd)
       }
     }
     .onClick((event: ClickEvent) => {
       ProcessUtils.processPage(this.contentDTO)
     })
-    .padding(
-      { top: 16, bottom: 16, left: 14, right: 14 })
-    .width(FULL_PARENT)
+    .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')
+    })
+    .width(CommonConstants.FULL_WIDTH)
     .height(this.contentDTO.appStyle === CompStyle.Card_13 ? 127 : 217)
     .justifyContent(FlexAlign.SpaceBetween)
-
   }
 }
\ No newline at end of file