Merge remote-tracking branch 'origin/main'

@@ -84,6 +84,7 @@ export struct CommentCustomDialog {
           controller: this.textInputController,
           controller: this.textInputController,
           text: this.publishCommentModel.commentContent
           text: this.publishCommentModel.commentContent
         })
         })
+          .placeholderColor("#999999")
           .id("textAreaId")
           .id("textAreaId")
           .defaultFocus(true) // 获取默认焦点
           .defaultFocus(true) // 获取默认焦点
           .enableKeyboardOnFocus(true)
           .enableKeyboardOnFocus(true)

@@ -13,7 +13,7 @@ export struct AudioRowComponent {
 
 
   aboutToAppear(): void {
   aboutToAppear(): void {
     this.playerController.onCanplay = () => {
     this.playerController.onCanplay = () => {
-      this.playerController.play()
+      // this.playerController.play()
     }
     }
     this.playerController.onStatusChange = (status: number) => {
     this.playerController.onStatusChange = (status: number) => {
       if (status == PlayerConstants.STATUS_START) {
       if (status == PlayerConstants.STATUS_START) {

@@ -148,7 +148,7 @@ export struct LiveHorizontalCardComponent {
         }
         }
       }.justifyContent(FlexAlign.SpaceBetween)
       }.justifyContent(FlexAlign.SpaceBetween)
       // .padding({ left: 16, right: 16 })
       // .padding({ left: 16, right: 16 })
-      .margin({ top: 8, bottom: 8 })
+      .margin({ top: 8, bottom: 10 })
       .width(CommonConstants.FULL_WIDTH)
       .width(CommonConstants.FULL_WIDTH)
 
 
       // 多个
       // 多个
@@ -264,7 +264,7 @@ export struct LiveHorizontalCardComponent {
       left: 10,
       left: 10,
       right: 10,
       right: 10,
       top: $r('app.float.card_comp_pagePadding_tb'),
       top: $r('app.float.card_comp_pagePadding_tb'),
-      bottom: 6
+      bottom: $r('app.float.card_comp_pagePadding_tb')
     })
     })
     .backgroundColor($r("app.color.white"))
     .backgroundColor($r("app.color.white"))
   }
   }

@@ -20,7 +20,7 @@ export struct LiveHorizontalCardForOneComponent {
       }
       }
 
 
       Text(this.contentDTO.newsTitle)
       Text(this.contentDTO.newsTitle)
-        .fontSize($r("app.float.font_size_14"))
+        .fontSize(15)
         .fontColor($r("app.color.color_212228"))
         .fontColor($r("app.color.color_212228"))
         .fontWeight(400)
         .fontWeight(400)
         .maxLines(1)
         .maxLines(1)

@@ -298,7 +298,7 @@
     },
     },
     {
     {
       "name": "card_comp_pagePadding_tb",
       "name": "card_comp_pagePadding_tb",
-      "value": "14fp"
+      "value": "14vp"
     },
     },
     {
     {
       "name": "margin_116",
       "name": "margin_116",