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

* 'main' of http://192.168.1.42/developOne/harmonyPool:
  ref |> 调整横屏直播详情，直播状态标签，距离顶部间距
  fix: 18271 全域-规则_数字显示规则-展示交互问题

@@ -275,6 +275,7 @@ export struct CommentComponent {
 
 
         // 这里需要先赋值，否则下次UI刷新可能重复进入第1页两次
         // 这里需要先赋值，否则下次UI刷新可能重复进入第1页两次
         this.currentPage = pageIndex + 1
         this.currentPage = pageIndex + 1
+
         if (Number.parseInt(commentListModel.totalCommentNum) >
         if (Number.parseInt(commentListModel.totalCommentNum) >
         Number.parseInt(this.publishCommentModel.totalCommentNumer)) {
         Number.parseInt(this.publishCommentModel.totalCommentNumer)) {
           this.publishCommentModel.totalCommentNumer = commentListModel.totalCommentNum + ''
           this.publishCommentModel.totalCommentNumer = commentListModel.totalCommentNum + ''

-import { DisplayUtils, EmitterEventId, EmitterUtils, ToastUtils } from 'wdKit/Index'
+import { DisplayUtils, EmitterEventId, EmitterUtils, ToastUtils, NumberFormatterUtils } from 'wdKit/Index'
 import { publishCommentModel } from '../model/PublishCommentModel'
 import { publishCommentModel } from '../model/PublishCommentModel'
 import { CommentCustomDialog } from './CommentCustomDialog'
 import { CommentCustomDialog } from './CommentCustomDialog'
 import measure from '@ohos.measure'
 import measure from '@ohos.measure'
@@ -206,7 +206,7 @@ export struct CommentIconComponent {
                 //   x:-6
                 //   x:-6
                 // })
                 // })
               .id("Image")
               .id("Image")
-            Text(this.showMainText?'正文':this.publishCommentModel.totalCommentNumer)// Text("44444444")
+            Text(this.showMainText?'正文':NumberFormatterUtils.formatNumberWithWan(this.publishCommentModel.totalCommentNumer))// Text("44444444")
               .fontSize(8)
               .fontSize(8)
               .fontColor(this.showMainText?'#222222':'#ffffff')// .backgroundColor('#ED2800')
               .fontColor(this.showMainText?'#222222':'#ffffff')// .backgroundColor('#ED2800')
               .height(12)
               .height(12)
@@ -217,7 +217,7 @@ export struct CommentIconComponent {
               })// .margin({left: 4,right:4
               })// .margin({left: 4,right:4
                 // })
                 // })
                 /*动态计算文字宽度*/
                 /*动态计算文字宽度*/
-              .width(this.getMeasureText(this.publishCommentModel.totalCommentNumer) +
+              .width(this.getMeasureText(NumberFormatterUtils.formatNumberWithWan(this.publishCommentModel.totalCommentNumer)) +
                 12)// .backgroundColor(Color.Green)
                 12)// .backgroundColor(Color.Green)
               .id("Text")
               .id("Text")
               .visibility(this.publishCommentModel.totalCommentNumer ? Visibility.Visible : Visibility.Hidden)
               .visibility(this.publishCommentModel.totalCommentNumer ? Visibility.Visible : Visibility.Hidden)

@@ -542,16 +542,15 @@ export struct OperRowListView {
       if (res.data) {
       if (res.data) {
         this.interactData.likeNum = NumberFormatterUtils.formatNumberWithWan(res.data[0]?.likeNum)
         this.interactData.likeNum = NumberFormatterUtils.formatNumberWithWan(res.data[0]?.likeNum)
         this.interactData.collectNum = NumberFormatterUtils.formatNumberWithWan(res.data[0]?.collectNum)
         this.interactData.collectNum = NumberFormatterUtils.formatNumberWithWan(res.data[0]?.collectNum)
-        this.interactData.commentNum = NumberFormatterUtils.formatNumberWithWan(res.data[0]?.commentNum)
+        // this.interactData.commentNum = NumberFormatterUtils.formatNumberWithWan(res.data[0]?.commentNum)
+        this.interactData.commentNum = res.data[0]?.commentNum
         // 评论组件需要数据
         // 评论组件需要数据
-        if (Number.parseInt(this.interactData.commentNum) >
+        if (Number.parseInt(this.interactData.commentNum + '') >
         Number.parseInt(this.publishCommentModel.totalCommentNumer)) {
         Number.parseInt(this.publishCommentModel.totalCommentNumer)) {
           this.publishCommentModel.totalCommentNumer = this.interactData.commentNum + ''
           this.publishCommentModel.totalCommentNumer = this.interactData.commentNum + ''
         }
         }
       }
       }
       // console.log(TAG, '获取互动点赞等数据===', JSON.stringify(res))
       // console.log(TAG, '获取互动点赞等数据===', JSON.stringify(res))
-      console.log(TAG, 'this.interactData44', JSON.stringify(this.interactData))
-      console.log(TAG, 'this.publishCommentModel', JSON.stringify(this.publishCommentModel))
     })
     })
   }
   }
 }
 }

@@ -173,7 +173,7 @@ export struct PlayUIComponent {
     .width('100%')
     .width('100%')
     // .width(this.displayDirection == DisplayDirection.VIDEO_HORIZONTAL ? 'calc(100% - 80vp)' : 'calc(100% - 32vp)')
     // .width(this.displayDirection == DisplayDirection.VIDEO_HORIZONTAL ? 'calc(100% - 80vp)' : 'calc(100% - 32vp)')
     .padding({
     .padding({
-      top: 15,
+      top: 11,
       bottom: 6,
       bottom: 6,
       left: this.displayDirection == DisplayDirection.VIDEO_HORIZONTAL ? '40vp' : '16vp',
       left: this.displayDirection == DisplayDirection.VIDEO_HORIZONTAL ? '40vp' : '16vp',
       right: this.displayDirection == DisplayDirection.VIDEO_HORIZONTAL ? '40vp' : '16vp'
       right: this.displayDirection == DisplayDirection.VIDEO_HORIZONTAL ? '40vp' : '16vp'