Merge remote-tracking branch 'origin/main'

@@ -58,33 +58,40 @@ export struct AppointmentListUI {
           }
         }
       } else {
-        CustomPullToRefresh({
-          alldata:this.data,
-          scroller:this.scroller,
-          customList:()=>{
-            this.ListLayout()
-          },
-          onRefresh:(resolve)=>{
-            this.curPageNum = 1;
-            this.hasMore = true
-            this.isGetRequest = false
-            this.data.clear()
-
-            if (!this.isLoading){
-              this.getNewPageData()
-              if(resolve) resolve('刷新成功')
-            }
-          },
-          onLoadMore:(resolve)=> {
-            if (!this.isLoading) {
-              this.isLoading = true
-              this.getNewPageData()
+        Stack(){
+          Row()
+            .width("100%")
+            .height("100%")
+            .backgroundColor($r('app.color.color_F9F9F9'))
+            .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.BOTTOM])
+          CustomPullToRefresh({
+            alldata:this.data,
+            scroller:this.scroller,
+            customList:()=>{
+              this.ListLayout()
+            },
+            onRefresh:(resolve)=>{
+              this.curPageNum = 1;
+              this.hasMore = true
+              this.isGetRequest = false
+              this.data.clear()
+
+              if (!this.isLoading){
+                this.getNewPageData()
+                if(resolve) resolve('刷新成功')
+              }
+            },
+            onLoadMore:(resolve)=> {
+              if (!this.isLoading) {
+                this.isLoading = true
+                this.getNewPageData()
+              }
             }
-          }
-        })
+          })
+        }
       }
     }
-    .backgroundColor($r('app.color.color_F9F9F9'))
+    .backgroundColor($r('app.color.color_transparent'))
     .height('100%')
     .width('100%')
   }

@@ -71,7 +71,6 @@ export struct DetailPlayLiveCommon {
       .then((data: Array<ContentDetailDTO>) => {
         console.log(TAG, '查询视频详情用于评论展示 getContentDetail:', JSON.stringify(data))
         if (data) {
-
           let detailData = data[0]
           this.liveLandscape =
             detailData?.liveInfo?.liveLandScape //String(this.contentDetailData?.liveInfo?.liveLandScape || '')

@@ -84,6 +84,7 @@ export struct DetailPlayLivePage {
         }
       }).visibility(this.displayDirection == DisplayDirection.VERTICAL ? Visibility.Visible : Visibility.None)
 
+
       // LiveCommentComponent({ heartNum: this.liveRoomDataBean.likeNum })
       //   .visibility(this.displayDirection == DisplayDirection.VERTICAL ? Visibility.Visible : Visibility.None)
     }

@@ -12,6 +12,10 @@ import { publishCommentModel } from 'wdComponent/src/main/ets/components/comment
 
 const TAG: string = 'TabChatComponent';
 
+/**
+ *
+ * 非沉浸式---大家聊
+ */
 @Component
 export struct TabChatComponent {
   @State private pageModel: PageModel = new PageModel()

@@ -13,11 +13,9 @@ export struct TabComponent {
   @State currentIndex: number = 0
   private controller: TabsController = new TabsController()
   @Prop tabs: string[] = []
-
   aboutToAppear(): void {
 
   }
-
   /**
    * 评论切换到大家聊
    */

 import { ContentDetailDTO, LiveDetailsBean } from 'wdBean/Index'
 import { LiveCountdownComponent } from './LiveCountdownComponent'
 
+/**
+ * 非沉浸式---简介
+ */
 @Component
 export struct TabInfoComponent {
   @Consume contentDetailData: ContentDetailDTO

-import { ContentDetailDTO, LiveDetailsBean, LiveRoomItemBean } from 'wdBean/Index'
-import { EmptyComponent, ErrorComponent, ListHasNoMoreDataUI, WDViewDefaultType } from 'wdComponent/Index'
+import { ContentDetailDTO, LiveRoomItemBean } from 'wdBean/Index'
+import { CustomPullToRefresh, EmptyComponent, ErrorComponent, WDViewDefaultType } from 'wdComponent/Index'
 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 RefreshLayout from 'wdComponent/src/main/ets/components/page/RefreshLayout'
-import { StringUtils } from 'wdKit/Index'
+import { LazyDataSource, StringUtils } from 'wdKit/Index'
 import { LiveViewModel } from '../../viewModel/LiveViewModel'
 import { Logger } from 'wdKit'
+import LoadMoreLayout from 'wdComponent/src/main/ets/components/page/LoadMoreLayout'
+import { PeopleShipNoMoreData } from 'wdComponent/src/main/ets/components/reusable/PeopleShipNoMoreData'
 
 const TAG: string = 'TabLiveComponent';
 
@@ -18,12 +19,13 @@ const TAG: string = 'TabLiveComponent';
 @Component
 export struct TabLiveComponent {
   liveViewModel: LiveViewModel = new LiveViewModel()
-  @State liveList: Array<LiveRoomItemBean> = []
+  @State liveList: LazyDataSource<LiveRoomItemBean> = new LazyDataSource();
   @Consume @Watch('updateData') contentDetailData: ContentDetailDTO
   @State private pageModel: PageModel = new PageModel()
+  private scroller: Scroller = new Scroller()
 
   aboutToAppear(): void {
-    this.getLiveList()
+      this.getLiveList()
   }
 
   build() {
@@ -35,7 +37,19 @@ export struct TabLiveComponent {
       } else if (this.pageModel.viewType == ViewType.EMPTY) {
         EmptyComponent({ emptyType: WDViewDefaultType.WDViewDefaultType_NoContent1 })
       } else {
-        this.ListLayout()
+        CustomPullToRefresh({
+          alldata: this.liveList,
+          scroller: this.scroller,
+          hasMore: false,
+          customList: () => {
+            this.ListLayout()
+          },
+          onRefresh: (resolve) => {
+            this.pageModel.currentPage = 1
+            this.getLiveList(resolve)
+          },
+        })
+
       }
     }
     .alignContent(Alignment.Top)
@@ -46,32 +60,35 @@ export struct TabLiveComponent {
 
   @Builder
   ListLayout() {
-    List() {
-      ListItem() {
-        // 下拉刷新 TODO 待对接新的下拉刷新组件
-        // RefreshLayout({
-        //   refreshBean: new RefreshLayoutBean(this.pageModel.isVisiblePullDown, this.pageModel.pullDownRefreshImage,
-        //     this.pageModel.pullDownRefreshText, this.pageModel.pullDownRefreshHeight)
-        // })
-      }
 
-      ForEach(this.liveList, (item: LiveRoomItemBean) => {
+    List({ scroller: this.scroller }) {
+      // 下拉刷新
+      LazyForEach(this.liveList, (item: LiveRoomItemBean, index: number) => {
         ListItem() {
           TabLiveItemComponent({ item: item })
         }
-      })
+      },
+        (item: LiveRoomItemBean, contentIndex: number) => JSON.stringify(item)
+      )
       // 加载更多
       ListItem() {
-        if (this.pageModel.hasMore) {
-          // LoadMoreLayout({
-          //   refreshBean: new RefreshLayoutBean(this.pageModel.isVisiblePullUpLoad, this.pageModel.pullUpLoadImage,
-          //     this.pageModel.pullUpLoadText, this.pageModel.pullUpLoadHeight)
-          // })
-        } else {
-          ListHasNoMoreDataUI()
+        if (this.pageModel.hasMore && this.liveList && this.liveList.totalCount() > 0) {
+          LoadMoreLayout({ isVisible: this.pageModel.hasMore })
+        } else if (!this.pageModel.hasMore && !this.pageModel.isLoading) {
+          PeopleShipNoMoreData()
         }
       }
     }
+    .edgeEffect(EdgeEffect.None)
+    .scrollBar(BarState.Off)
+    .onReachEnd(() => {
+      Logger.debug(TAG, "触底了");
+      if (!this.pageModel.isLoading && this.pageModel.hasMore) {
+        //加载分页数据
+        //this.currentPage++;
+         this.getLiveList()
+      }
+    })
   }
 
   @Builder
@@ -82,19 +99,35 @@ export struct TabLiveComponent {
     })
   }
 
-  getLiveList() {
+  async getLiveList(resolve?: (value: string | PromiseLike<string>) => void) {
     if (!this.contentDetailData || !this.contentDetailData.newsId) {
       // 参数不够，直接拦截接口
       return
     }
+    if (this.pageModel.isLoading) {
+
+      if (resolve) {
+        resolve('已更新至最新')
+      }
+      return
+    }
+    this.pageModel.isLoading = true
     this.pageModel.currentPage = 1
     this.liveViewModel.getLiveList(
       this.pageModel.currentPage,
       this.contentDetailData?.liveInfo?.mlive?.mliveId,
-      this.contentDetailData?.newsId+'',
+      this.contentDetailData?.newsId + '',
       20)
       .then(
         (data) => {
+          this.pageModel.isLoading = false
+          if (resolve) {
+            if (this.pageModel.currentPage == 1) {
+              resolve('已更新至最新')
+            } else {
+              resolve('')
+            }
+          }
           Logger.debug(TAG, '直播间数据：' + `${JSON.stringify(data)}`)
           if (data.barrageResponses && data.barrageResponses.length > 0) {
             /**
@@ -106,6 +139,10 @@ export struct TabLiveComponent {
              3.内容：详情接口的简介，newIntroduction
              */
             this.pageModel.viewType = ViewType.LOADED;
+            if(this.pageModel.currentPage ===1){
+              this.liveList.clear()
+            }
+
             this.liveList.push(...data.barrageResponses)
             if (data.barrageResponses.length === this.pageModel.pageSize) {
               this.pageModel.currentPage++;
@@ -124,9 +161,11 @@ export struct TabLiveComponent {
               && this.contentDetailData.liveInfo.liveState != 'wait') {
               this.pageModel.viewType = ViewType.LOADED;
               this.updateLiveListData()
+              this.pageModel.hasMore = false;
             } else {
               this.pageModel.viewType = ViewType.EMPTY;
             }
+
           }
         },
         () => {
@@ -155,7 +194,7 @@ export struct TabLiveComponent {
   }
 
   updateData() {
-    if (this.liveList.length > 0) {
+    if (this.liveList.totalCount() > 0) {
       // TODO 拦截刷新？根据业务斟酌下
       return
     }

@@ -63,7 +63,6 @@ export struct TopPlayComponent {
   }
 
   updateData() {
-
     // 检测等待中的直播预告是否视频资源
     if (this.contentDetailData.liveInfo && this.contentDetailData.liveInfo.previewType === 1
       && this.contentDetailData.liveInfo.previewUrl &&