Merge remote-tracking branch 'origin/main'

@@ -229,7 +229,7 @@ export struct LiveOperRowListView {
             }
             }
           }
           }
         }
         }
-        .height(30)
+        .height(this.isLlive ? 30:36)
         .onClick(() => {
         .onClick(() => {
           if (this.onCommentInputFocus) {
           if (this.onCommentInputFocus) {
             this.onCommentInputFocus()
             this.onCommentInputFocus()

@@ -56,7 +56,7 @@ export struct DetailPlayShortVideoPage {
   @State playerHeight: number | string = px2vp(this.windowHeight)
   @State playerHeight: number | string = px2vp(this.windowHeight)
   pageParam: ParamType = {}
   pageParam: ParamType = {}
   PageName: string = ''
   PageName: string = ''
-  @State toastText: ResourceStr = "正在使用非WI-FI网络，播放将产生流量费用"
+  @State toastText: ResourceStr = "正在使用非Wi-Fi网络，播放将产生流量费用"
   @Consume onlyWifiLoadVideo: boolean
   @Consume onlyWifiLoadVideo: boolean
   @Consume toastTextVisible: boolean
   @Consume toastTextVisible: boolean
   @StorageProp('currentBreakpoint') @Watch("currentChanged") currentBreakpoint: string = 'sm';
   @StorageProp('currentBreakpoint') @Watch("currentChanged") currentBreakpoint: string = 'sm';
@@ -396,8 +396,8 @@ export struct DetailPlayShortVideoPage {
             .fontFamily('PingFang SC-Regular')
             .fontFamily('PingFang SC-Regular')
             .fontWeight(FontWeight.Regular)
             .fontWeight(FontWeight.Regular)
             .fontColor('#FFFFFF')
             .fontColor('#FFFFFF')
-            .fontSize(14)
-            .lineHeight(20)
+            .fontSize(16)
+            .lineHeight(24)
             .textAlign(TextAlign.Center)
             .textAlign(TextAlign.Center)
         }
         }
 
 
@@ -406,11 +406,18 @@ export struct DetailPlayShortVideoPage {
             .fontFamily('PingFang SC-Regular')
             .fontFamily('PingFang SC-Regular')
             .fontWeight(FontWeight.Regular)
             .fontWeight(FontWeight.Regular)
             .fontColor(Color.White)
             .fontColor(Color.White)
-            .fontSize(12)
+            .fontSize(14)
+            .lineHeight(20)
+            .textAlign(TextAlign.Center)
+            .margin({
+              top: 5,
+              bottom: 5,
+              left: 8,
+              right: 8
+            })
         }
         }
         .border({ width: 1, color: '#4DFFFFFF', radius: 4 })
         .border({ width: 1, color: '#4DFFFFFF', radius: 4 })
-        .height(28)
-        .width(88)
+        .height(30)
         .alignItems(HorizontalAlign.Center)
         .alignItems(HorizontalAlign.Center)
         .justifyContent(FlexAlign.Center)
         .justifyContent(FlexAlign.Center)
         .margin({
         .margin({