fix：1）直播详情页面修改优化

@@ -69,3 +69,5 @@ export { newsSkeleton } from "./src/main/ets/components/skeleton/newsSkeleton"
 
 
 export { LiveCommentComponent } from "./src/main/ets/components/comment/view/LiveCommentComponent"
 export { LiveCommentComponent } from "./src/main/ets/components/comment/view/LiveCommentComponent"
 
 
+export { WDViewDefaultType } from "./src/main/ets/components/view/EmptyComponent"
+

@@ -11,7 +11,7 @@ export struct LiveCommentComponent {
 
 
   build() {
   build() {
     Row() {
     Row() {
-      Image($r('app.media.back_icon'))
+      Image($r('app.media.iv_back_left_black'))
         .width(24)
         .width(24)
         .height(24)
         .height(24)
         .margin({
         .margin({
@@ -71,7 +71,7 @@ export struct LiveCommentComponent {
             left: 6,
             left: 6,
             right: 2
             right: 2
           })
           })
-        Image(this.isLike ? $r('app.media.iv_live_comment_hert_light') : $r('app.media.comment_like_normal'))
+        Image(this.isLike ? $r('app.media.icon_like_selected_redheart') : $r('app.media.iv_live_heart_normal'))
           .width(24)
           .width(24)
           .height(24)
           .height(24)
           .margin({
           .margin({

 import { LiveDetailsBean, LiveRoomItemBean } from 'wdBean/Index'
 import { LiveDetailsBean, LiveRoomItemBean } from 'wdBean/Index'
-import { EmptyComponent, ErrorComponent, ListHasNoMoreDataUI } from 'wdComponent/Index'
+import { EmptyComponent, ErrorComponent, ListHasNoMoreDataUI,WDViewDefaultType } from 'wdComponent/Index'
 import CustomRefreshLoadLayout from 'wdComponent/src/main/ets/components/page/CustomRefreshLoadLayout'
 import CustomRefreshLoadLayout from 'wdComponent/src/main/ets/components/page/CustomRefreshLoadLayout'
 import LoadMoreLayout from 'wdComponent/src/main/ets/components/page/LoadMoreLayout'
 import LoadMoreLayout from 'wdComponent/src/main/ets/components/page/LoadMoreLayout'
 import RefreshLayout from 'wdComponent/src/main/ets/components/page/RefreshLayout'
 import RefreshLayout from 'wdComponent/src/main/ets/components/page/RefreshLayout'
@@ -79,7 +79,7 @@ export struct TabChatComponent {
   getLiveChatList() {
   getLiveChatList() {
     this.pageModel.currentPage = 1
     this.pageModel.currentPage = 1
     this.liveViewModel.getLiveChatList(
     this.liveViewModel.getLiveChatList(
-      1,
+      this.pageModel.currentPage,
       this.liveDetailsBean?.liveInfo?.mlive?.mliveId,
       this.liveDetailsBean?.liveInfo?.mlive?.mliveId,
       this.liveDetailsBean?.newsId,
       this.liveDetailsBean?.newsId,
       20,)
       20,)

 import { LiveDetailsBean, LiveRoomItemBean } from 'wdBean/Index'
 import { LiveDetailsBean, LiveRoomItemBean } from 'wdBean/Index'
-import { ListHasNoMoreDataUI } from 'wdComponent/Index'
+import { EmptyComponent, ErrorComponent, ListHasNoMoreDataUI } from 'wdComponent/Index'
 import { StringUtils } from 'wdKit/Index'
 import { StringUtils } from 'wdKit/Index'
 import { LiveViewModel } from '../../viewModel/LiveViewModel'
 import { LiveViewModel } from '../../viewModel/LiveViewModel'
 import { TabLiveItemComponent } from './TabLiveItemComponent'
 import { TabLiveItemComponent } from './TabLiveItemComponent'
+import CustomRefreshLoadLayout from 'wdComponent/src/main/ets/components/page/CustomRefreshLoadLayout'
+import { RefreshLayoutBean } from 'wdComponent/src/main/ets/components/page/RefreshLayoutBean'
+import PageModel from 'wdComponent/src/main/ets/viewmodel/PageModel'
+import { ViewType } from 'wdConstant/Index'
+import LoadMoreLayout from 'wdComponent/src/main/ets/components/page/LoadMoreLayout'
+import RefreshLayout from 'wdComponent/src/main/ets/components/page/RefreshLayout'
 
 
 @Component
 @Component
 export struct TabLiveComponent {
 export struct TabLiveComponent {
   liveViewModel: LiveViewModel = new LiveViewModel()
   liveViewModel: LiveViewModel = new LiveViewModel()
   @State liveList: Array<LiveRoomItemBean> = []
   @State liveList: Array<LiveRoomItemBean> = []
   @Consume @Watch('updateDate') liveDetailsBean: LiveDetailsBean
   @Consume @Watch('updateDate') liveDetailsBean: LiveDetailsBean
+  @State private pageModel: PageModel = new PageModel()
 
 
   updateDate() {
   updateDate() {
     this.getLiveList()
     this.getLiveList()
@@ -20,36 +27,70 @@ export struct TabLiveComponent {
 
 
   build() {
   build() {
     Stack() {
     Stack() {
-      if (this.liveList.length == 0) {
-        ListHasNoMoreDataUI({ style: 2 })
+      if (this.pageModel.viewType == ViewType.LOADING) {
+        this.LoadingLayout()
+      } else if (this.pageModel.viewType == ViewType.ERROR) {
+        ErrorComponent()
+      } else if (this.pageModel.viewType == ViewType.EMPTY) {
+        EmptyComponent()
       } else {
       } else {
+        this.ListLayout()
+      }
+    }
+    .alignContent(Alignment.Top)
+    .backgroundColor('#F5F5F5')
+    .height('100%')
+    .width('100%')
+  }
+
+  @Builder
+  ListLayout() {
     List() {
     List() {
+      ListItem() {
+        // 下拉刷新
+        RefreshLayout({
+          refreshBean: new RefreshLayoutBean(this.pageModel.isVisiblePullDown, this.pageModel.pullDownRefreshImage,
+            this.pageModel.pullDownRefreshText, this.pageModel.pullDownRefreshHeight)
+        })
+      }
+
       ForEach(this.liveList, (item: LiveRoomItemBean) => {
       ForEach(this.liveList, (item: LiveRoomItemBean) => {
         ListItem() {
         ListItem() {
           TabLiveItemComponent({ item: item })
           TabLiveItemComponent({ item: item })
         }
         }
       })
       })
+      // 加载更多
       ListItem() {
       ListItem() {
+        if (this.pageModel.hasMore) {
+          LoadMoreLayout({
+            refreshBean: new RefreshLayoutBean(this.pageModel.isVisiblePullUpLoad, this.pageModel.pullUpLoadImage,
+              this.pageModel.pullUpLoadText, this.pageModel.pullUpLoadHeight)
+          })
+        } else {
           ListHasNoMoreDataUI()
           ListHasNoMoreDataUI()
         }
         }
       }
       }
     }
     }
   }
   }
-    .alignContent(Alignment.Top)
-    .backgroundColor('#F5F5F5')
-    .height('100%')
-    .width('100%')
 
 
+  @Builder
+  LoadingLayout() {
+    CustomRefreshLoadLayout({
+      refreshBean: new RefreshLayoutBean(true,
+        $r('app.media.ic_pull_up_load'), $r('app.string.pull_up_load_text'), this.pageModel.pullDownRefreshHeight)
+    })
   }
   }
 
 
   getLiveList() {
   getLiveList() {
+    this.pageModel.currentPage = 1
     this.liveViewModel.getLiveList(
     this.liveViewModel.getLiveList(
-      1,
+      this.pageModel.currentPage,
       this.liveDetailsBean?.liveInfo?.mlive?.mliveId,
       this.liveDetailsBean?.liveInfo?.mlive?.mliveId,
       this.liveDetailsBean?.newsId,
       this.liveDetailsBean?.newsId,
       20)
       20)
       .then(
       .then(
         (data) => {
         (data) => {
+          if (data.barrageResponses && data.barrageResponses.length > 0) {
             /**
             /**
              * 在直播聊天添加一条新内容逻辑：
              * 在直播聊天添加一条新内容逻辑：
              判断 oldNewsId：迁移id非空 且 直播状态不是预约："wait"
              判断 oldNewsId：迁移id非空 且 直播状态不是预约："wait"
@@ -58,13 +99,26 @@ export struct TabLiveComponent {
              2.名称固定：人民日报主持人
              2.名称固定：人民日报主持人
              3.内容：详情接口的简介，newIntroduction
              3.内容：详情接口的简介，newIntroduction
              */
              */
-          if (StringUtils.isNotEmpty(this.liveDetailsBean.oldNewsId) && this.liveDetailsBean && this.liveDetailsBean.liveInfo.liveState != 'wait') {
+            if (StringUtils.isNotEmpty(this.liveDetailsBean.oldNewsId)
+              && this.liveDetailsBean
+              && this.liveDetailsBean.liveInfo.liveState != 'wait'
+              && this.pageModel.currentPage == 1) {
               let liveRoomItemBeanTemp: LiveRoomItemBean = {} as LiveRoomItemBean
               let liveRoomItemBeanTemp: LiveRoomItemBean = {} as LiveRoomItemBean
               liveRoomItemBeanTemp.text = this.liveDetailsBean.newIntroduction
               liveRoomItemBeanTemp.text = this.liveDetailsBean.newIntroduction
               liveRoomItemBeanTemp.senderUserName = '人民日报主持人'
               liveRoomItemBeanTemp.senderUserName = '人民日报主持人'
               data.barrageResponses.push(liveRoomItemBeanTemp)
               data.barrageResponses.push(liveRoomItemBeanTemp)
             }
             }
-          this.liveList = data.barrageResponses
+            this.pageModel.viewType = ViewType.LOADED;
+            this.liveList.push(...data.barrageResponses)
+            if (data.barrageResponses.length === this.pageModel.pageSize) {
+              this.pageModel.currentPage++;
+              this.pageModel.hasMore = true;
+            } else {
+              this.pageModel.hasMore = false;
+            }
+          } else {
+            this.pageModel.viewType = ViewType.EMPTY;
+          }
         },
         },
         () => {
         () => {
 
 

-import { LiveRoomItemBean } from 'wdBean/Index'
+import { LiveRoomItemBean, PhotoListBean } from 'wdBean/Index'
 import { DateTimeUtils, StringUtils } from 'wdKit/Index'
 import { DateTimeUtils, StringUtils } from 'wdKit/Index'
 
 
 @Component
 @Component
 export struct TabLiveItemComponent {
 export struct TabLiveItemComponent {
   item: LiveRoomItemBean = {} as LiveRoomItemBean
   item: LiveRoomItemBean = {} as LiveRoomItemBean
+  photoList: PhotoListBean[] = []
 
 
   aboutToAppear(): void {
   aboutToAppear(): void {
 
 
@@ -86,8 +87,17 @@ export struct TabLiveItemComponent {
               .aspectRatio(310 / 174)
               .aspectRatio(310 / 174)
               .objectFit(ImageFit.Auto)
               .objectFit(ImageFit.Auto)
               .borderRadius(4)
               .borderRadius(4)
+          }.onClick(() => {
+            for (let item of this.item.pictureUrls) {
+              this.photoList.push({
+                width: 0,
+                height: 0,
+                picPath: item,
+                picDesc: ''
+              })
             }
             }
           })
           })
+        })
       }.margin({
       }.margin({
         left: 32,
         left: 32,
         top: 8
         top: 8

@@ -200,6 +200,8 @@ export struct PlayUIComponent {
       } else {
       } else {
         Blank()
         Blank()
       }
       }
+      if (this.liveDetailsBean?.liveInfo?.liveState == 'running'
+        || this.liveDetailsBean?.liveInfo?.liveState == 'end') {
         Image($r('app.media.icon_live_player_full_screen'))
         Image($r('app.media.icon_live_player_full_screen'))
           .width(24)
           .width(24)
           .height(24)
           .height(24)
@@ -213,6 +215,7 @@ export struct PlayUIComponent {
             window.Orientation.LANDSCAPE);
             window.Orientation.LANDSCAPE);
           })
           })
       }
       }
+    }
     .alignItems(VerticalAlign.Center)
     .alignItems(VerticalAlign.Center)
     .linearGradient({ angle: 0, colors: [['#99000000', 0], ['#00000000', 1]] })
     .linearGradient({ angle: 0, colors: [['#99000000', 0], ['#00000000', 1]] })
     .width('100%')
     .width('100%')

@@ -85,7 +85,7 @@ export struct WDPlayerRenderLiveView {
           console.log('insId===', this.insId)
           console.log('insId===', this.insId)
           this.xComponentController.setXComponentSurfaceSize({
           this.xComponentController.setXComponentSurfaceSize({
             surfaceWidth: 1920,
             surfaceWidth: 1920,
-            surfaceHeight: 1080
+            surfaceHeight: 720
           });
           });
           this.playerController?.setXComponentController(this.xComponentController)
           this.playerController?.setXComponentController(this.xComponentController)
           if (this.onLoad) {
           if (this.onLoad) {