Merge remote-tracking branch 'origin/main'

@@ -63,7 +63,7 @@ export struct LiveFollowComponent {
           bottom: 0,
           bottom: 0,
         })
         })
         //号主名称
         //号主名称
-        Text(this.rmhInfo.rmhName)
+        Text(this.getRmhName())
           .fontColor(Color.White)
           .fontColor(Color.White)
           .textOverflow({ overflow: TextOverflow.Ellipsis })
           .textOverflow({ overflow: TextOverflow.Ellipsis })
           .maxLines(1)
           .maxLines(1)
@@ -151,4 +151,11 @@ export struct LiveFollowComponent {
       }
       }
     })
     })
   }
   }
+
+  getRmhName() {
+    if (this.rmhInfo.rmhName.length > 7) {
+      return this.rmhInfo.rmhName.substring(0, 7) + "..."
+    }
+    return this.rmhInfo.rmhName
+  }
 }
 }

@@ -832,7 +832,7 @@ struct commentFooterView {
       if (this.item.id) { // 审核通过的才显示点赞
       if (this.item.id) { // 审核通过的才显示点赞
         Row({ space: 6 }) {
         Row({ space: 6 }) {
           Text(this.item.likeNum)
           Text(this.item.likeNum)
-            .fontColor($r('app.color.color_666666'))
+            .fontColor(this.item.api_status?$r('app.color.color_ED2800') : $r('app.color.color_666666'))
             .fontSize(14)
             .fontSize(14)
 
 
           Image(this.item.api_status ? $r('app.media.comment_like_select') : $r('app.media.comment_like_normal'))
           Image(this.item.api_status ? $r('app.media.comment_like_select') : $r('app.media.comment_like_normal'))

@@ -159,7 +159,7 @@ export struct ChildCommentComponent {
               .width('100%')
               .width('100%')
               .height(0.5)
               .height(0.5)
               .strokeWidth(0.5)
               .strokeWidth(0.5)
-              .backgroundColor($r('app.color.color_EDEDED'))
+              .color($r('app.color.color_EDEDED'))
               .margin({ top: 10, bottom: 10 })
               .margin({ top: 10, bottom: 10 })
           }
           }
 
 

 import font from '@ohos.font'
 import font from '@ohos.font'
 import { ContentDetailDTO } from 'wdBean/Index'
 import { ContentDetailDTO } from 'wdBean/Index'
-import { DateTimeUtils, StringUtils, ToastUtils } from 'wdKit/Index'
+import { CustomToast, DateTimeUtils, StringUtils, ToastUtils } from 'wdKit/Index'
 import { LiveViewModel } from '../../viewModel/LiveViewModel'
 import { LiveViewModel } from '../../viewModel/LiveViewModel'
 import { HttpUtils } from 'wdNetwork/Index'
 import { HttpUtils } from 'wdNetwork/Index'
 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index'
 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index'
@@ -22,6 +22,24 @@ export struct LiveCountdownComponent {
   liveViewModel: LiveViewModel = new LiveViewModel()
   liveViewModel: LiveViewModel = new LiveViewModel()
   pageParam: ParamType = {}
   pageParam: ParamType = {}
 
 
+  @State toastText: ResourceStr = ""
+  dialogToast: CustomDialogController = new CustomDialogController({
+    builder: CustomToast({
+        bgColor: 0xB3000000,
+        opacityValue: 1,
+        msg: this.toastText,
+    }),
+    autoCancel: false,
+    alignment: DialogAlignment.Center,
+    customStyle: true,
+    maskColor: "#00000000"
+  })
+
+  showToastTip(msg: ResourceStr) {
+    this.toastText = msg
+    this.dialogToast.open()
+  }
+
   aboutToAppear(): void {
   aboutToAppear(): void {
     //注册字体
     //注册字体
     font.registerFont({
     font.registerFont({
@@ -187,11 +205,13 @@ export struct LiveCountdownComponent {
         if (data.success) {
         if (data.success) {
           this.isAppointmentLive = !this.isAppointmentLive
           this.isAppointmentLive = !this.isAppointmentLive
           if (this.isAppointmentLive) {
           if (this.isAppointmentLive) {
-            ToastUtils.showToast('预约成功', 1000)
+            // ToastUtils.showToast('预约成功', 1000)
+            this.showToastTip('预约成功')
             TrackingContent.subscribeClick(true, TrackConstants.PageName.Live_Detail,
             TrackingContent.subscribeClick(true, TrackConstants.PageName.Live_Detail,
               TrackConstants.PageName.Live_Detail, this.pageParam)
               TrackConstants.PageName.Live_Detail, this.pageParam)
           } else {
           } else {
-            ToastUtils.showToast('取消预约成功', 1000)
+            // ToastUtils.showToast('取消预约成功', 1000)
+            this.showToastTip('取消预约成功')
             TrackingContent.subscribeClick(false, TrackConstants.PageName.Live_Detail,
             TrackingContent.subscribeClick(false, TrackConstants.PageName.Live_Detail,
               TrackConstants.PageName.Live_Detail, this.pageParam)
               TrackConstants.PageName.Live_Detail, this.pageParam)
           }
           }