Merge remote-tracking branch 'origin/main'

@@ -21,7 +21,7 @@ export enum HostEnum {
  * 环境host管理工具类
  * 环境host管理工具类
  */
  */
 export class HostManager {
 export class HostManager {
-  private static _hostUrl: HostEnum = HostEnum.HOST_PRODUCT;
+  private static _hostUrl: HostEnum = HostEnum.HOST_UAT;
 
 
   static changeHost(host: HostEnum) {
   static changeHost(host: HostEnum) {
     HostManager._hostUrl = host;
     HostManager._hostUrl = host;

@@ -12,7 +12,8 @@ import { SearchShowRed, titleInitRes, textItem } from '../../utils/searchShowRed
 const TAG = 'Card16Component';
 const TAG = 'Card16Component';
 
 
 interface fullColumnImgUrlItem {
 interface fullColumnImgUrlItem {
-  url: string
+  url: string,
+  fullUrl: string
 }
 }
 
 
 
 
@@ -81,15 +82,45 @@ export struct Card16Component {
           .lineHeight(25)
           .lineHeight(25)
       }
       }
       if (this.contentDTO.fullColumnImgUrls?.length > 0) {
       if (this.contentDTO.fullColumnImgUrls?.length > 0) {
-        Flex() {
-          ForEach(this.contentDTO.fullColumnImgUrls.slice(0, 3), (item: fullColumnImgUrlItem, index: number) => {
-            Image(this.loadImg ? item.url : '')
-              .backgroundColor(0xf5f5f5)
-              .flexBasis(113)
-              .height(75)
-              .margin({ right: index > 1 ? 0 : 2 })
+        //三图
+        Stack(){
+          Row() {
+            GridRow({ gutter: 2 }) {
+              ForEach(this.contentDTO.fullColumnImgUrls.slice(0, 3), (item: fullColumnImgUrlItem, index: number) => {
+                if (index < 3) {
+                  GridCol({ span: { xs: 4 } }) {
+                    Image(this.loadImg ? item.url || item.fullUrl : '')
+                      .backgroundColor(0xf5f5f5)
+                      .width('100%')
+                      .aspectRatio(113 / 75)
+                      .borderRadius({
+                        topLeft: index === 0 ? $r('app.float.image_border_radius') : 0,
+                        topRight: index === 2 ? $r('app.float.image_border_radius') : 0,
+                        bottomLeft: index === 0 ? $r('app.float.image_border_radius') : 0,
+                        bottomRight: index === 2 ? $r('app.float.image_border_radius') : 0,
+                      })
+                  }
+                }
+              })
+            }
+          }
+          .width(CommonConstants.FULL_PARENT)
+          .margin({ top: 8 })
+          CardMediaInfo({
+            contentDTO: this.contentDTO
           })
           })
         }
         }
+        .width(CommonConstants.FULL_PARENT)
+        .alignContent(Alignment.BottomEnd)
+        // Flex() {
+        //   ForEach(this.contentDTO.fullColumnImgUrls.slice(0, 3), (item: fullColumnImgUrlItem, index: number) => {
+        //     Image(this.loadImg ? item.url : '')
+        //       .backgroundColor(0xf5f5f5)
+        //       .flexBasis(113)
+        //       .height(75)
+        //       .margin({ right: index > 1 ? 0 : 2 })
+        //   })
+        // }
       }
       }
       CarderInteraction({contentDTO: this.contentDTO})
       CarderInteraction({contentDTO: this.contentDTO})
       //TODO  底部的：分享、评论、点赞 功能；需要引用一个公共组件
       //TODO  底部的：分享、评论、点赞 功能；需要引用一个公共组件

@@ -2,6 +2,7 @@ import { CommonConstants } from 'wdConstant'
 import { ContentDTO, CompDTO, Action, Params } from 'wdBean'
 import { ContentDTO, CompDTO, Action, Params } from 'wdBean'
 import { ProcessUtils, WDRouterRule, WDRouterPage } from 'wdRouter';
 import { ProcessUtils, WDRouterRule, WDRouterPage } from 'wdRouter';
 import { InfomationCardClick } from '../../utils/infomationCardClick';
 import { InfomationCardClick } from '../../utils/infomationCardClick';
+import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
 
 
 @Component
 @Component
 export struct HorizontalStrokeCardThreeTwoRadioForMoreComponent {
 export struct HorizontalStrokeCardThreeTwoRadioForMoreComponent {
@@ -128,11 +129,18 @@ export struct HorizontalStrokeCardThreeTwoRadioForMoreComponent {
           Row() {
           Row() {
             ForEach(this.compDTO.operDataList, (item: ContentDTO, index: number) => {
             ForEach(this.compDTO.operDataList, (item: ContentDTO, index: number) => {
               Column() {
               Column() {
-                Image(item.coverUrl)
-                  .aspectRatio(1.5)
-                  .width(this.compDTO.operDataList.length == 2 ? 210 : 150)
-                  .borderRadius(4)
-                  .objectFit(ImageFit.Cover)
+                Stack() {
+                  Image(item.coverUrl)
+                    .aspectRatio(1.5)
+                    .width(this.compDTO.operDataList.length == 2 ? 210 : 150)
+                    .borderRadius(4)
+                    .objectFit(ImageFit.Cover)
+                  CardMediaInfo({
+                    livePeopleNum:false,
+                    contentDTO: item
+                  })
+                }
+                .align(Alignment.BottomEnd)
 
 
                 Text(item.newsTitle)
                 Text(item.newsTitle)
                   .fontSize($r("app.float.font_size_14"))
                   .fontSize($r("app.float.font_size_14"))
@@ -143,10 +151,9 @@ export struct HorizontalStrokeCardThreeTwoRadioForMoreComponent {
                   .textAlign(TextAlign.Start)
                   .textAlign(TextAlign.Start)
                   .margin({ top: 8 })
                   .margin({ top: 8 })
                   .width(this.compDTO.operDataList.length == 2 ? 210 : 150)
                   .width(this.compDTO.operDataList.length == 2 ? 210 : 150)
-                  .lineHeight(19)
                   .lineHeight(21)
                   .lineHeight(21)
               }
               }
-              .height(134)
+              .height(this.compDTO.operDataList.length == 2 ? 190 : 150)
               .padding({ right: 16 })
               .padding({ right: 16 })
               // .offset({x:16})
               // .offset({x:16})
               .onClick(() => {
               .onClick(() => {
@@ -218,7 +225,7 @@ export struct HorizontalStrokeCardThreeTwoRadioForMoreComponent {
       left: $r('app.float.card_comp_pagePadding_lf'),
       left: $r('app.float.card_comp_pagePadding_lf'),
       right: $r('app.float.card_comp_pagePadding_lf'),
       right: $r('app.float.card_comp_pagePadding_lf'),
       top: $r('app.float.card_comp_pagePadding_tb'),
       top: $r('app.float.card_comp_pagePadding_tb'),
-      bottom: $r('app.float.card_comp_pagePadding_tb')
+      bottom: 6
     })
     })
     .backgroundColor($r("app.color.white"))
     .backgroundColor($r("app.color.white"))
     // .backgroundColor($r("app.color.color_FE4B05"))
     // .backgroundColor($r("app.color.color_FE4B05"))

@@ -170,7 +170,7 @@ export struct LiveHorizontalCardComponent {
                     .width(this.compDTO.operDataList.length == 2 ? 210 : 150)
                     .width(this.compDTO.operDataList.length == 2 ? 210 : 150)
                     .lineHeight(21)
                     .lineHeight(21)
                 }
                 }
-                .height(134)
+                .height(this.compDTO.operDataList.length == 2 ? 190 : 150)
                 .padding({ right: 16 })
                 .padding({ right: 16 })
                 .onClick(() => {
                 .onClick(() => {
                   InfomationCardClick.track(this.compDTO, item, this.pageId, this.pageName)
                   InfomationCardClick.track(this.compDTO, item, this.pageId, this.pageName)
@@ -243,7 +243,7 @@ export struct LiveHorizontalCardComponent {
       left: $r('app.float.card_comp_pagePadding_lf'),
       left: $r('app.float.card_comp_pagePadding_lf'),
       right: $r('app.float.card_comp_pagePadding_lf'),
       right: $r('app.float.card_comp_pagePadding_lf'),
       top: $r('app.float.card_comp_pagePadding_tb'),
       top: $r('app.float.card_comp_pagePadding_tb'),
-      bottom: $r('app.float.card_comp_pagePadding_tb')
+      bottom: 6
     })
     })
     .backgroundColor($r("app.color.white"))
     .backgroundColor($r("app.color.white"))
   }
   }