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

* 'main' of http://192.168.1.42/developOne/harmonyPool:
  fix: 19525 【UI走查-卡片】折叠屏展开-单图卡
  去除title中的所有换行符
  去除title中的换行符,第四行适配使得箭头在第四行
  ref |> 修复直播详情大家聊角色标签UI走查问题
  17700 【UI】【UAT】【缺省图】视频稿件进入详情后，没有获取到播放数据时，没有展示缺省图
  20217 号主-猛犸新闻，动态tab页，单图动态稿件，图片未展示。

@@ -191,7 +191,7 @@ struct createImg {
     }) {
     }) {
       ForEach(this.fullColumnImgUrls, (item: FullColumnImgUrlDTO, index: number) => {
       ForEach(this.fullColumnImgUrls, (item: FullColumnImgUrlDTO, index: number) => {
         if (this.fullColumnImgUrls.length === 1) {
         if (this.fullColumnImgUrls.length === 1) {
-          if (this.getPicType(item.weight, item.height) !== 3) {
+          if (this.getPicType(item.weight, item.height) < 3) {
             GridCol({
             GridCol({
               span: this.getPicType(item.weight, item.height) === 1 ? 12 : 8
               span: this.getPicType(item.weight, item.height) === 1 ? 12 : 8
             }){
             }){

@@ -115,7 +115,7 @@ export struct Card6Component {
       .height(this.contentDTO.appStyle === CompStyle.Card_13 ? '' : 156)
       .height(this.contentDTO.appStyle === CompStyle.Card_13 ? '' : 156)
       .constraintSize({minHeight: 78})
       .constraintSize({minHeight: 78})
       .justifyContent(FlexAlign.SpaceBetween)
       .justifyContent(FlexAlign.SpaceBetween)
-      .width('64%')
+      .width('calc(100% - 117vp - 12vp)')
 
 
 
 
       Stack({alignContent: Alignment.BottomEnd}) {
       Stack({alignContent: Alignment.BottomEnd}) {

 import { CommonConstants } from 'wdConstant';
 import { CommonConstants } from 'wdConstant';
 import { Logger } from 'wdKit';
 import { Logger } from 'wdKit';
+import { router } from '@kit.ArkUI';
 
 
 const TAG = 'EmptyComponent';
 const TAG = 'EmptyComponent';
 
 
@@ -108,7 +109,19 @@ export struct EmptyComponent {
   }
   }
 
 
   build() {
   build() {
-    this.noProgrammeData();
+    Stack({alignContent:Alignment.Bottom}) {
+      this.noProgrammeData();
+      Image($r("app.media.icon_arrow_left_white"))
+        .width(24)
+        .height(24)
+        .onClick(() => {
+          router.back();
+        })
+        .position({
+          bottom: 15,
+          left: 16
+        })
+    }
   }
   }
 
 
   /**
   /**

@@ -4,6 +4,7 @@ import { Logger, StringUtils } from 'wdKit/Index'
 import { WDRouterRule } from 'wdRouter'
 import { WDRouterRule } from 'wdRouter'
 import { ExtraDTO } from 'wdBean/src/main/ets/bean/component/extra/ExtraDTO'
 import { ExtraDTO } from 'wdBean/src/main/ets/bean/component/extra/ExtraDTO'
 import { LiveMessageOptType, LiveMessageRole } from 'wdBean/src/main/ets/bean/live/LiveRoomBean'
 import { LiveMessageOptType, LiveMessageRole } from 'wdBean/src/main/ets/bean/live/LiveRoomBean'
+import { LengthMetrics, LengthUnit } from '@kit.ArkUI'
 
 
 const TAG = "TabChatItemComponent"
 const TAG = "TabChatItemComponent"
 
 
@@ -68,14 +69,20 @@ export struct TabChatItemComponent {
             Span(' 主持人 ')
             Span(' 主持人 ')
               .fontSize(11)
               .fontSize(11)
               .lineHeight(20)
               .lineHeight(20)
-              .textBackgroundStyle({ color: "#70FFC63F", radius: 2 })
+              .textBackgroundStyle({ color: "#F1EFEB"})
+              .baselineOffset(new LengthMetrics(5,LengthUnit.PX))
+              .fontColor('#968562')
+              .borderRadius(2)
             Span(' ')
             Span(' ')
           }
           }
           if (this.item.role == LiveMessageRole.guest) {
           if (this.item.role == LiveMessageRole.guest) {
             Span(' 嘉宾 ')
             Span(' 嘉宾 ')
               .fontSize(11)
               .fontSize(11)
               .lineHeight(20)
               .lineHeight(20)
-              .textBackgroundStyle({ color: "#70FFC63F", radius: 2 })
+              .textBackgroundStyle({ color: "#F1EFEB"})
+              .baselineOffset(new LengthMetrics(5,LengthUnit.PX))
+              .fontColor('#968562')
+              .borderRadius(2)
             Span(' ')
             Span(' ')
           }
           }
           Span("回复了 ").fontColor('#222222')
           Span("回复了 ").fontColor('#222222')

@@ -71,7 +71,7 @@ export struct PlayerTitleView {
    * @returns {string} clipStr  截断后的文本 '啊啊'
    * @returns {string} clipStr  截断后的文本 '啊啊'
    */
    */
   clipText(str: string, fontSize: number, maxLines: number, textWidth: number): string {
   clipText(str: string, fontSize: number, maxLines: number, textWidth: number): string {
-    let strArr: string[] = str.split("")
+    let strArr: string[] = str.replace(/\n/g, '').split("")
     let truncateContent: string = '啊啊啊啊啊啊' // ...比正常文字宽度更小，这里使用啊啊啊(任意三个文字)代替计算
     let truncateContent: string = '啊啊啊啊啊啊' // ...比正常文字宽度更小，这里使用啊啊啊(任意三个文字)代替计算
     let measureTruncateWidth: number = measure.measureText({
     let measureTruncateWidth: number = measure.measureText({
       textContent: truncateContent,
       textContent: truncateContent,
@@ -219,7 +219,7 @@ export struct PlayerTitleView {
       // } else {
       // } else {
       if (this.summary && this.titleLines < 4) {
       if (this.summary && this.titleLines < 4) {
         Text() {
         Text() {
-          Span(this.clipText(this.summary, 14, this.summaryLines, this.windowWidth - 150 - vp2px(50)))
+          Span(this.clipText(this.summary, 14, this.summaryLines, this.windowWidth - 160 - vp2px(50)))
             .fontSize(14)
             .fontSize(14)
             .fontColor(Color.White)
             .fontColor(Color.White)
             .lineHeight(21)
             .lineHeight(21)