Merge remote-tracking branch 'origin/main'

 import MinePageMoreFunctionModel from '../../viewmodel/MinePageMoreFunctionModel'
 import MinePageMoreFunctionModel from '../../viewmodel/MinePageMoreFunctionModel'
 import { WDRouterRule, WDRouterPage } from 'wdRouter'
 import { WDRouterRule, WDRouterPage } from 'wdRouter'
 import { Params } from 'wdBean';
 import { Params } from 'wdBean';
+import { ToastUtils } from 'wdKit/Index';
 
 
 @Component
 @Component
 export default struct MinePageMoreFunctionUI {
 export default struct MinePageMoreFunctionUI {
@@ -75,6 +76,8 @@ export default struct MinePageMoreFunctionUI {
               WDRouterRule.jumpWithPage(WDRouterPage.settingPage, params)
               WDRouterRule.jumpWithPage(WDRouterPage.settingPage, params)
             }else if (item.msg == "关于") { // 关于
             }else if (item.msg == "关于") { // 关于
               WDRouterRule.jumpWithPage(WDRouterPage.aboutPage)
               WDRouterRule.jumpWithPage(WDRouterPage.aboutPage)
+            }else if (item.msg == "意见反馈") { // 关于
+              ToastUtils.shortToast("待开发")
             }
             }
           })
           })
           .height('117lpx')
           .height('117lpx')

@@ -49,6 +49,7 @@ export struct OperRowListView {
   @State newsStatusOfUser: batchLikeAndCollectResult | undefined = undefined // 点赞、收藏状态
   @State newsStatusOfUser: batchLikeAndCollectResult | undefined = undefined // 点赞、收藏状态
   @State likeBean: Record<string, string> = {}
   @State likeBean: Record<string, string> = {}
   @State audioUrl: string= ''
   @State audioUrl: string= ''
+  @State bottomSafeHeight: number = AppStorage.get<number>('bottomSafeHeight') || 0
   needLike: boolean = true
   needLike: boolean = true
 
 
   async aboutToAppear() {
   async aboutToAppear() {
@@ -120,7 +121,7 @@ export struct OperRowListView {
     .backgroundColor(Color.White)
     .backgroundColor(Color.White)
     .padding({
     .padding({
       top: 10,
       top: 10,
-      bottom: 50
+      bottom: `${this.bottomSafeHeight}px`
     })
     })
   }
   }
 
 

@@ -95,7 +95,7 @@ class MinePageDatasModel{
     }
     }
     // this.moreData.push(new MinePageMoreFunctionModel("扫一扫",$r('app.media.mine_scan')))
     // this.moreData.push(new MinePageMoreFunctionModel("扫一扫",$r('app.media.mine_scan')))
     // this.moreData.push(new MinePageMoreFunctionModel("我的奖品",$r('app.media.mine_mygift')))
     // this.moreData.push(new MinePageMoreFunctionModel("我的奖品",$r('app.media.mine_mygift')))
-    // this.moreData.push(new MinePageMoreFunctionModel("意见反馈",$r('app.media.mine_suggest')))
+    this.moreData.push(new MinePageMoreFunctionModel("意见反馈",$r('app.media.mine_suggest')))
     this.moreData.push(new MinePageMoreFunctionModel("设置",$r('app.media.mine_setting')))
     this.moreData.push(new MinePageMoreFunctionModel("设置",$r('app.media.mine_setting')))
     this.moreData.push(new MinePageMoreFunctionModel("关于",$r('app.media.mine_about')))
     this.moreData.push(new MinePageMoreFunctionModel("关于",$r('app.media.mine_about')))
     return this.moreData
     return this.moreData

@@ -101,7 +101,7 @@ export struct VideoChannelDetail {
   openFullScreen() {
   openFullScreen() {
     WindowModel.shared.setWindowSystemBarProperties({
     WindowModel.shared.setWindowSystemBarProperties({
       statusBarContentColor: '#ffffff',
       statusBarContentColor: '#ffffff',
-      statusBarColor: '#000000',
+      // statusBarColor: '#000000',
       // navigationBarColor: '#000000',
       // navigationBarColor: '#000000',
       // navigationBarContentColor: '#ffffff'
       // navigationBarContentColor: '#ffffff'
     })
     })
@@ -116,7 +116,7 @@ export struct VideoChannelDetail {
   closeFullScreen() {
   closeFullScreen() {
     WindowModel.shared.setWindowSystemBarProperties({
     WindowModel.shared.setWindowSystemBarProperties({
       statusBarContentColor: '#000000',
       statusBarContentColor: '#000000',
-      statusBarColor: '#ffffff',
+      // statusBarColor: '#ffffff',
       // navigationBarColor: '#0x66000000',
       // navigationBarColor: '#0x66000000',
       // navigationBarContentColor: '#0xE5FFFFFF'
       // navigationBarContentColor: '#0xE5FFFFFF'
 
 

@@ -170,7 +170,7 @@ export struct PlayerRightView {
     .width(58)
     .width(58)
     .position({ x: '100%', y: '100%' })
     .position({ x: '100%', y: '100%' })
     .markAnchor({ x: '100%', y: '100%' })
     .markAnchor({ x: '100%', y: '100%' })
-    .padding({ bottom: 72, right: 10 })
+    .padding({ bottom: 10, right: 10 })
     .visibility(this.isOpenDetail || this.isDragging ? Visibility.None : Visibility.Visible)
     .visibility(this.isOpenDetail || this.isDragging ? Visibility.None : Visibility.Visible)
 
 
   }
   }
@@ -229,7 +229,8 @@ export struct PlayerRightView {
       }
       }
     } else if (this.likesStyle === 3) {
     } else if (this.likesStyle === 3) {
       return {
       return {
-        url: this.newsStatusOfUser.likeStatus === '1' ? $r(`app.media.ic_candle_check`) : $r(`app.media.ic_candle_uncheck`),
+        url: this.newsStatusOfUser.likeStatus === '1' ? $r(`app.media.ic_candle_check`) :
+        $r(`app.media.ic_candle_uncheck`),
         name: '默哀'
         name: '默哀'
       }
       }
     }
     }
@@ -239,13 +240,17 @@ export struct PlayerRightView {
   }
   }
 
 
   transNum2String(name: 'likeNum' | 'collectNum' | 'commentNum') {
   transNum2String(name: 'likeNum' | 'collectNum' | 'commentNum') {
-    console.log(TAG, 'transNum2String', this.interactData.likeNum, this.interactData.collectNum, this.interactData.commentNum)
+    console.log(TAG, 'transNum2String', this.interactData.likeNum, this.interactData.collectNum,
+      this.interactData.commentNum)
     if (name === 'likeNum') {
     if (name === 'likeNum') {
-      return this.interactData.likeNum != 0 ? NumberFormatterUtils.formatNumberWithWan(this.interactData.likeNum || '') : ''
+      return this.interactData.likeNum != 0 ?
+      NumberFormatterUtils.formatNumberWithWan(this.interactData.likeNum || '') : ''
     } else if (name === 'collectNum') {
     } else if (name === 'collectNum') {
-      return this.interactData.collectNum != 0 ? NumberFormatterUtils.formatNumberWithWan(this.interactData.collectNum || '') : ''
+      return this.interactData.collectNum != 0 ?
+      NumberFormatterUtils.formatNumberWithWan(this.interactData.collectNum || '') : ''
     } else {
     } else {
-      return this.interactData.commentNum != 0 ? NumberFormatterUtils.formatNumberWithWan(this.interactData.commentNum || '') : ''
+      return this.interactData.commentNum != 0 ?
+      NumberFormatterUtils.formatNumberWithWan(this.interactData.commentNum || '') : ''
     }
     }
   }
   }
 
 
@@ -282,7 +287,8 @@ export struct PlayerRightView {
   @Builder
   @Builder
   collectBuilderView() {
   collectBuilderView() {
     Column() {
     Column() {
-      Image(this.newsStatusOfUser.collectStatus == 1 ? $r(`app.media.ic_collect_check`) : $r(`app.media.ic_collect_uncheck`))
+      Image(this.newsStatusOfUser.collectStatus == 1 ? $r(`app.media.ic_collect_check`) :
+      $r(`app.media.ic_collect_uncheck`))
         .width(32)
         .width(32)
         .aspectRatio(1)
         .aspectRatio(1)
         .onClick(() => {
         .onClick(() => {

@@ -25,7 +25,7 @@ export struct PlayerTitleComment {
       name: this.getName(),
       name: this.getName(),
       title: this.getTitle(),
       title: this.getTitle(),
       summary: this.getSummary(),
       summary: this.getSummary(),
-      isOpen: this.isOpen
+      isOpenDetail: this.isOpen
 
 
     }),
     }),
     autoCancel: false,
     autoCancel: false,
@@ -164,9 +164,12 @@ export struct PlayerTitleComment {
             step: 0.01,
             step: 0.01,
             // style: SliderStyle.OutSet
             // style: SliderStyle.OutSet
           })
           })
-            .blockColor(this.status === PlayerConstants.STATUS_START ? Color.Transparent : $r('app.color.play_block_color'))
-            .trackColor(this.status === PlayerConstants.STATUS_START ? $r('app.color.play_track_color') : $r('app.color.pause_track_color'))
-            .selectedColor(this.status === PlayerConstants.STATUS_START ? $r('app.color.play_selected_color') : $r('app.color.pause_selected_color'))
+            .blockColor(this.status === PlayerConstants.STATUS_START ? Color.Transparent :
+            $r('app.color.play_block_color'))
+            .trackColor(this.status === PlayerConstants.STATUS_START ? $r('app.color.play_track_color') :
+            $r('app.color.pause_track_color'))
+            .selectedColor(this.status === PlayerConstants.STATUS_START ? $r('app.color.play_selected_color') :
+            $r('app.color.pause_selected_color'))
             .trackThickness(this.status === PlayerConstants.STATUS_START ? 1 : 4)
             .trackThickness(this.status === PlayerConstants.STATUS_START ? 1 : 4)
             .blockStyle({
             .blockStyle({
               type: this.status === PlayerConstants.STATUS_START ? SliderBlockType.DEFAULT : SliderBlockType.IMAGE,
               type: this.status === PlayerConstants.STATUS_START ? SliderBlockType.DEFAULT : SliderBlockType.IMAGE,
@@ -202,7 +205,12 @@ export struct PlayerTitleComment {
                 .margin({ left: 12 })
                 .margin({ left: 12 })
             }
             }
             .alignItems(VerticalAlign.Center)
             .alignItems(VerticalAlign.Center)
-            .padding({ left: 16, right: 16, top: 11, bottom: 11 })
+            .padding({
+              left: 16,
+              right: 16,
+              top: 11,
+              bottom: 11
+            })
           }
           }
 
 
         }
         }

@@ -47,7 +47,7 @@ export struct PlayerTitleView {
       fontSize: 15,
       fontSize: 15,
       fontWeight: 400,
       fontWeight: 400,
       lineHeight: 20,
       lineHeight: 20,
-      constraintWidth: this.windowWidth - 100 - 16 - 22 + 'px',
+      constraintWidth: this.windowWidth - 150 - 16 - 22 + 'px',
 
 
     })
     })
     this.titleHeight = info?.height as number || 0
     this.titleHeight = info?.height as number || 0
@@ -87,7 +87,12 @@ export struct PlayerTitleView {
        */
        */
       if (this.titleHeight > 200 || this.getSummary()) {
       if (this.titleHeight > 200 || this.getSummary()) {
         Text('查看详情 > ')
         Text('查看详情 > ')
-          .padding({ left: 6, right: 6, top: 4, bottom: 4 })
+          .padding({
+            left: 6,
+            right: 6,
+            top: 4,
+            bottom: 4
+          })
           .borderRadius(2)
           .borderRadius(2)
           .backgroundColor('#99636363')
           .backgroundColor('#99636363')
           .fontColor(Color.White)
           .fontColor(Color.White)
@@ -102,7 +107,7 @@ export struct PlayerTitleView {
       }
       }
 
 
     }
     }
-    .width(this.windowWidth - 100 + 'px')
+    .width(this.windowWidth - 150 + 'px')
     .padding({ left: 16, right: 22 })
     .padding({ left: 16, right: 22 })
     .alignItems(HorizontalAlign.Start)
     .alignItems(HorizontalAlign.Start)
     .visibility(this.isOpenDetail || this.isDragging ? Visibility.None : Visibility.Visible)
     .visibility(this.isOpenDetail || this.isDragging ? Visibility.None : Visibility.Visible)