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

* 'main' of http://192.168.1.42/developOne/harmonyPool:
  fix |> 20595 后台对拉流直播设置切换垫片后，在直播频道列表进入直播间后，可以正常播放直播
  fix:  人民日报在平板上竖屏使用， 播放视频页面， 点击评论， 视频画面会变的非常小,原因是获取的主窗口宽高有问题
  fix |> 4g网络环境，进入直播间， “正在使用非Wi-Fi网络,播放将产生流量费用” 蒙层未显示，看图
  fix |> 20660 直播详情大家聊中，下拉刷新评论列表后，没有展示最新评论

 import { ContentDetailDTO, PageInfoDTO } from 'wdBean/Index'
 import { ContentDetailDTO, PageInfoDTO } from 'wdBean/Index'
-import { Logger, PublicDialogManager } from 'wdKit/Index'
+import { Logger, PublicDialogManager, WindowModel } from 'wdKit/Index'
 import { TrackConstants } from 'wdTracking/Index'
 import { TrackConstants } from 'wdTracking/Index'
 import { OperRowListView } from '../../view/OperRowListView'
 import { OperRowListView } from '../../view/OperRowListView'
 import { publishCommentModel } from '../model/PublishCommentModel'
 import { publishCommentModel } from '../model/PublishCommentModel'
@@ -10,8 +10,8 @@ const TAG = "CommentListDialogView"
 /// 评论列表弹框
 /// 评论列表弹框
 @Component
 @Component
 export struct CommentListDialogView {
 export struct CommentListDialogView {
-  @State windowWidth: number = AppStorage.get<number>('windowWidth') || 0
-  @State windowHeight: number = AppStorage.get<number>('windowHeight') || 0
+  @State windowWidth: number = WindowModel.shared.getWindowClass().getWindowProperties()?.windowRect.width
+  @State windowHeight: number = WindowModel.shared.getWindowClass().getWindowProperties()?.windowRect.height
   @Link showCommentList: boolean
   @Link showCommentList: boolean
   @Link contentDetailData: ContentDetailDTO // 详情页传
   @Link contentDetailData: ContentDetailDTO // 详情页传
   @Link pageInfo: PageInfoDTO           // 专题页传
   @Link pageInfo: PageInfoDTO           // 专题页传
@@ -24,12 +24,13 @@ export struct CommentListDialogView {
   @State isPad:boolean = this.currentBreakpoint == "md" || this.currentBreakpoint == "lg"?true:false
   @State isPad:boolean = this.currentBreakpoint == "md" || this.currentBreakpoint == "lg"?true:false
 
 
   aboutToAppear(): void {
   aboutToAppear(): void {
-    if (this.isPad) {
-      this.maxHeight = this.windowHeight * 0.6
-    }else {
+    // if (this.isPad) {
+    //   this.maxHeight = this.windowHeight * 0.6
+    // }else {
+    //   this.maxHeight = this.windowHeight - this.windowWidth * 9 / 16
+    // }
     this.maxHeight = this.windowHeight - this.windowWidth * 9 / 16
     this.maxHeight = this.windowHeight - this.windowWidth * 9 / 16
   }
   }
-  }
 
 
   build() {
   build() {
     Row() {
     Row() {

@@ -49,28 +49,8 @@ export struct DetailPlayLivePage {
   @Provide banComment: boolean = true
   @Provide banComment: boolean = true
   @State isEnd: boolean = false
   @State isEnd: boolean = false
   @Consume liveDetailPageLogic: LiveDetailPageLogic
   @Consume liveDetailPageLogic: LiveDetailPageLogic
-  @State toastText: ResourceStr = "这是一个非Wi-Fi环境。请注意流量消耗"
   @State topPlayHeight:number = this.getTopPlayHeight()
   @State topPlayHeight:number = this.getTopPlayHeight()
   @StorageProp('currentBreakpoint') @Watch("currentChanged")currentBreakpoint: string = 'sm';
   @StorageProp('currentBreakpoint') @Watch("currentChanged")currentBreakpoint: string = 'sm';
-  dialogToast: CustomDialogController = new CustomDialogController({
-    builder: CustomToast({
-      bgColor: 0xB3000000,
-      opacityValue: 1,
-      fontSizeValue: "25lpx",
-      lineHeightValue: "36lpx",
-      msg: this.toastText,
-      marginTop:211/2+px2vp(this.topSafeHeight)-px2vp(84/2)
-    }),
-    autoCancel: false,
-    alignment: DialogAlignment.Top,
-    customStyle: true,
-    maskColor: "#00000000"
-  })
-
-  showToastTip(msg: ResourceStr) {
-    this.toastText = msg
-    this.dialogToast.open()
-  }
 
 
   async aboutToAppear(): Promise<void> {
   async aboutToAppear(): Promise<void> {
     Logger.info(TAG, `wyj-aboutToAppear`)
     Logger.info(TAG, `wyj-aboutToAppear`)
@@ -86,13 +66,6 @@ export struct DetailPlayLivePage {
     })
     })
     this.getLiveDetails()
     this.getLiveDetails()
     this.getLiveRoomData()
     this.getLiveRoomData()
-
-    if (this.liveDetailPageLogic.dealOrShowToast()) {
-      if(!await onlyWifiLoadVideo()){
-        this.showToastTip(this.toastText)
-      }
-    }
-
     this.configChatRoom()
     this.configChatRoom()
   }
   }
 
 

@@ -80,7 +80,7 @@ export class LiveDetailPageLogic {
 
 
     // 只有直播中的才会有垫片
     // 只有直播中的才会有垫片
     if(this.liveState === 'running'){
     if(this.liveState === 'running'){
-      if (this.contentDetailData.liveInfo.vlive.count > 0) {
+      if (this.contentDetailData.liveInfo.vlive && this.contentDetailData.liveInfo.vlive.length > 0) {
         this.showPad = this.contentDetailData.liveInfo.vlive[index].showPad
         this.showPad = this.contentDetailData.liveInfo.vlive[index].showPad
       }
       }
     }
     }
@@ -94,7 +94,16 @@ export class LiveDetailPageLogic {
     return ''
     return ''
   }
   }
 
 
-  dealOrShowToast(): boolean {
+  livingNeedShowNoWifiTip(): boolean {
+    if (this.liveState == 'running') {
+      if (this.contentDetailData.liveInfo.liveWay == 0) { ///直播视频
+        return true
+      }
+    }
+    return false
+  }
+
+  noLivingNeedShowNoWifiTip(): boolean {
     if (this.liveState == 'wait') {
     if (this.liveState == 'wait') {
       if (this.contentDetailData.liveInfo
       if (this.contentDetailData.liveInfo
         && this.contentDetailData.liveInfo.previewUrl.length > 0
         && this.contentDetailData.liveInfo.previewUrl.length > 0
@@ -102,7 +111,7 @@ export class LiveDetailPageLogic {
         return true
         return true
       }
       }
     }
     }
-    if (this.liveState == 'running') {
+    if (this.liveState == 'end') {
       if (this.contentDetailData.liveInfo.liveWay == 0) { ///直播视频
       if (this.contentDetailData.liveInfo.liveWay == 0) { ///直播视频
         return true
         return true
       }
       }

+
+@Component
+export struct NoWifiTipComponent {
+  @State toastText: ResourceStr = "正在使用非Wi-Fi网络，播放将产生流量费用"
+
+  onContinue?: () => void
+
+  aboutToAppear(): void {
+
+  }
+  aboutToDisappear(): void {
+
+  }
+
+  build() {
+    Row() {
+      Column() {
+        Column() {
+          Text(this.toastText)
+            .fontFamily('PingFang SC-Regular')
+            .fontWeight(FontWeight.Regular)
+            .fontColor('#FFFFFF')
+            .fontSize(16)
+            .lineHeight(24)
+            .textAlign(TextAlign.Center)
+        }
+
+        Column() {
+          Text("使用流量播放")
+            .fontFamily('PingFang SC-Regular')
+            .fontWeight(FontWeight.Regular)
+            .fontColor(Color.White)
+            .fontSize(14)
+            .lineHeight(20)
+            .textAlign(TextAlign.Center)
+            .margin({
+              top: 5,
+              bottom: 5,
+              left: 8,
+              right: 8
+            })
+        }
+        .border({ width: 1, color: '#4DFFFFFF', radius: 4 })
+        .height(30)
+        .alignItems(HorizontalAlign.Center)
+        .justifyContent(FlexAlign.Center)
+        .margin({
+          top: 16
+        })
+        .onClick(() => {
+          if (this.onContinue) {
+            this.onContinue()
+          }
+        })
+      }
+      .width('100%')
+      .height(64)
+    }
+    .width('100%')
+    .height('100%')
+    .alignItems(VerticalAlign.Center)
+    .justifyContent(FlexAlign.Center)
+    .backgroundColor('#222222')
+    .opacity(0.7)
+  }
+}

@@ -146,7 +146,7 @@ export struct TabChatComponent {
         (data) => {
         (data) => {
           this.pageModel.isLoading = false
           this.pageModel.isLoading = false
           if (resolve) {
           if (resolve) {
-            if (this.pageModel.currentPage == 1) {
+            if (this.pageModel.currentPage != 1) {
               resolve('已更新至最新')
               resolve('已更新至最新')
             } else {
             } else {
               resolve('')
               resolve('')
@@ -158,7 +158,11 @@ export struct TabChatComponent {
           Logger.debug(TAG, `${JSON.stringify(data)}`)
           Logger.debug(TAG, `${JSON.stringify(data)}`)
           if (data.barrageResponses && data.barrageResponses.length > 0) {
           if (data.barrageResponses && data.barrageResponses.length > 0) {
             this.pageModel.viewType = ViewType.LOADED;
             this.pageModel.viewType = ViewType.LOADED;
+            if (this.pageModel.currentPage === 1) {
               this.liveChatList.push(...data.barrageResponses)
               this.liveChatList.push(...data.barrageResponses)
+            }else {
+              this.liveChatList.addItems(data.barrageResponses, 0)
+            }
 
 
             if (this.pageModel.currentPage === 1) {
             if (this.pageModel.currentPage === 1) {
               setTimeout(() => {
               setTimeout(() => {

 import { ContentDetailDTO, LiveRoomItemBean } from 'wdBean/Index';
 import { ContentDetailDTO, LiveRoomItemBean } from 'wdBean/Index';
-import { Logger, StringUtils, WindowModel } from 'wdKit/Index';
+import { CustomToast, Logger, StringUtils, WindowModel } from 'wdKit/Index';
 import { PlayerConstants, WDAliPlayerController, WDPlayerRenderLiveView } from 'wdPlayer/Index';
 import { PlayerConstants, WDAliPlayerController, WDPlayerRenderLiveView } from 'wdPlayer/Index';
 import { PlayUIComponent } from './PlayUIComponent';
 import { PlayUIComponent } from './PlayUIComponent';
 import { PictureLoading } from '../../vertical/PictureLoading';
 import { PictureLoading } from '../../vertical/PictureLoading';
@@ -8,6 +8,8 @@ import { LiveDetailPageLogic } from '../../../viewModel/LiveDetailPageLogic';
 import { LiveEmptyComponent, WDLiveViewDefaultType } from 'wdComponent/Index';
 import { LiveEmptyComponent, WDLiveViewDefaultType } from 'wdComponent/Index';
 import { LiveMessageOptType } from 'wdBean/src/main/ets/bean/live/LiveRoomBean';
 import { LiveMessageOptType } from 'wdBean/src/main/ets/bean/live/LiveRoomBean';
 import { window } from '@kit.ArkUI';
 import { window } from '@kit.ArkUI';
+import { onlyWifiLoadVideo } from 'wdComponent/src/main/ets/utils/lazyloadImg';
+import { NoWifiTipComponent } from '../../common/NoWifiTipComponent';
 
 
 const TAG: string = 'TopPlayComponent'
 const TAG: string = 'TopPlayComponent'
 
 
@@ -39,6 +41,7 @@ export struct TopPlayComponent {
   @Consume liveDetailPageLogic: LiveDetailPageLogic
   @Consume liveDetailPageLogic: LiveDetailPageLogic
   @Consume @Watch('pageShowChange') pageShow: number
   @Consume @Watch('pageShowChange') pageShow: number
   @Consume @Watch('pageHideChange') pageHide: number
   @Consume @Watch('pageHideChange') pageHide: number
+  @Consume topSafeHeight: number
   init: boolean = false
   init: boolean = false
   @Prop @Watch("liveIMControlMessageChange") lastLiveControl: LiveRoomItemBean = {} as LiveRoomItemBean // IM 控制消息
   @Prop @Watch("liveIMControlMessageChange") lastLiveControl: LiveRoomItemBean = {} as LiveRoomItemBean // IM 控制消息
   ///是否是手动点击暂停，手动暂停的，页面重新出现时，不自动恢复播放
   ///是否是手动点击暂停，手动暂停的，页面重新出现时，不自动恢复播放
@@ -48,6 +51,9 @@ export struct TopPlayComponent {
   @State isZDP: boolean = false // 是否折叠屏 默认false
   @State isZDP: boolean = false // 是否折叠屏 默认false
   @State windowWidth: number = AppStorage.get<number>('windowWidth') || 0
   @State windowWidth: number = AppStorage.get<number>('windowWidth') || 0
 
 
+  @State showNoWifiTip: boolean = false  // 直播预告和直播回放
+  livingDialogToast?: CustomDialogController // 直播中
+
   pageShowChange() {
   pageShowChange() {
     if (this.manualClickPauseOrPlay) {
     if (this.manualClickPauseOrPlay) {
       return
       return
@@ -60,7 +66,7 @@ export struct TopPlayComponent {
     this.playerController?.pause()
     this.playerController?.pause()
   }
   }
 
 
-  aboutToAppear(): void {
+  aboutToAppear() {
     if (this.playerController) {
     if (this.playerController) {
 
 
       this.playerController.onCanplay = () => {
       this.playerController.onCanplay = () => {
@@ -85,6 +91,12 @@ export struct TopPlayComponent {
         }
         }
 
 
       }
       }
+
+      this.playerController.onFirstFrameDisplay = () => {
+        if (this.showNoWifiTip) {
+          this.playerController?.pause()
+        }
+      }
     }
     }
     this.updateData()
     this.updateData()
 
 
@@ -94,6 +106,33 @@ export struct TopPlayComponent {
     // 2000折叠屏 TODO DeviceUtil 方法完善了换判断条件
     // 2000折叠屏 TODO DeviceUtil 方法完善了换判断条件
     this.isZDP = this.screenWidth > 2000 ? true : false
     this.isZDP = this.screenWidth > 2000 ? true : false
     this.resizeWindow()
     this.resizeWindow()
+
+    if (this.liveDetailPageLogic.livingNeedShowNoWifiTip()) {
+      this.livingDialogToast = new CustomDialogController({
+        builder: CustomToast({
+          bgColor: 0xB3000000,
+          opacityValue: 1,
+          fontSizeValue: "25lpx",
+          lineHeightValue: "36lpx",
+          msg: "正在使用非Wi-Fi网络，播放将产生流量费用",
+          marginTop:211/2+px2vp(this.topSafeHeight)-px2vp(84/2)
+        }),
+        autoCancel: false,
+        alignment: DialogAlignment.Top,
+        customStyle: true,
+        maskColor: "#00000000"
+      })
+      this.livingDialogToast.open()
+    } else if (this.liveDetailPageLogic.noLivingNeedShowNoWifiTip()) {
+      onlyWifiLoadVideo().then((onlyWifiLoadVideo) => {
+        if (!onlyWifiLoadVideo) {
+          this.showNoWifiTip = true
+          if (this.playerController?.getStatus() == PlayerConstants.STATUS_START) {
+            this.playerController?.pause()
+          }
+        }
+      })
+    }
   }
   }
 
 
   resizeWindow() {
   resizeWindow() {
@@ -344,6 +383,16 @@ export struct TopPlayComponent {
       Visibility.None)
       Visibility.None)
       .margin({top:40})
       .margin({top:40})
 
 
+      if (this.showNoWifiTip) {
+        NoWifiTipComponent({
+          onContinue: () => {
+            this.showNoWifiTip = false
+            if (this.playerController?.getStatus() == PlayerConstants.STATUS_PAUSE) {
+              this.playerController?.play()
+            }
+          }
+        })
+      }
     }
     }
     .width('100%')
     .width('100%')
     .alignSelf(ItemAlign.Center)
     .alignSelf(ItemAlign.Center)

@@ -46,8 +46,10 @@ export struct DetailPlayShortVideoPage {
   @Consume @Watch('videoStatusChange') switchVideoStatus: boolean
   @Consume @Watch('videoStatusChange') switchVideoStatus: boolean
   @State isPlay: boolean = true // 视频手动播放暂停
   @State isPlay: boolean = true // 视频手动播放暂停
   @Consume @Watch('pageShowChange') pageShow: number
   @Consume @Watch('pageShowChange') pageShow: number
-  @Consume windowWidth: number
-  @Consume windowHeight: number
+  // @Consume windowWidth: number
+  @State windowWidth: number = WindowModel.shared.getWindowClass().getWindowProperties()?.windowRect.width
+  // @Consume windowHeight: number
+  @State windowHeight: number = WindowModel.shared.getWindowClass().getWindowProperties()?.windowRect.height
   @Consume topSafeHeight: number
   @Consume topSafeHeight: number
   @Consume showComment: boolean // 是否显示底部评论，首页视频频道传false
   @Consume showComment: boolean // 是否显示底部评论，首页视频频道传false
   @State imageVisible: boolean = true
   @State imageVisible: boolean = true