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

@@ -8,4 +8,5 @@ export const enum BottomNavi {
   VIDEO=2,
   VIDEO=2,
   SERVICE=3,
   SERVICE=3,
   MINE=4,
   MINE=4,
+  TEMPLATE=5,
 }
 }

@@ -112,6 +112,7 @@ export class ContentDTO implements BaseDTO {
   sameContentList:ContentDTO[] = []
   sameContentList:ContentDTO[] = []
   sameContentListJson:string = ""
   sameContentListJson:string = ""
   sameContentListSize:number = 0
   sameContentListSize:number = 0
+  sameContentListId:string = ""
   /*
   /*
      本地辅助字段
      本地辅助字段
    */
    */

 import { CompDTO, ContentDTO } from 'wdBean';
 import { CompDTO, ContentDTO } from 'wdBean';
-import { CommonConstants, CompStyle } from 'wdConstant/Index';
+import { BottomNavi, CommonConstants, CompStyle } from 'wdConstant/Index';
 import PageModel from '../viewmodel/PageModel';
 import PageModel from '../viewmodel/PageModel';
 import { CardParser } from './CardParser';
 import { CardParser } from './CardParser';
 import { Card2Component } from './cardview/Card2Component';
 import { Card2Component } from './cardview/Card2Component';
@@ -42,6 +42,7 @@ export struct CompParser {
   @State private pageModel: PageModel = new PageModel();
   @State private pageModel: PageModel = new PageModel();
   @State audioItems: ContentDTO[] = [];
   @State audioItems: ContentDTO[] = [];
   @State noneAudioItems: ContentDTO[] = [];
   @State noneAudioItems: ContentDTO[] = [];
+  bottomNavi:BottomNavi = BottomNavi.PEOPLE
 
 
   aboutToAppear(): void {
   aboutToAppear(): void {
 
 
@@ -167,7 +168,7 @@ export struct CompParser {
         ZhGridLayout03({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName, loadImg: this.pageModel.loadImg })
         ZhGridLayout03({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName, loadImg: this.pageModel.loadImg })
         this.getBehindDivider()
         this.getBehindDivider()
       } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_04) {
       } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_04) {
-        ZhSingleRow04({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName, loadImg: this.pageModel.loadImg })
+        ZhSingleRow04({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName, loadImg: this.pageModel.loadImg ,bottomNavi:this.bottomNavi})
         this.getBehindDivider()
         this.getBehindDivider()
       } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_05) {
       } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_05) {
         // ZhSingleRow05({ compDTO })
         // ZhSingleRow05({ compDTO })

@@ -681,6 +681,7 @@ struct commentHeaderView {
   @Consume inDialog: boolean
   @Consume inDialog: boolean
   private dialogBeforeJumpOtherPageAction: () => void = () => {}
   private dialogBeforeJumpOtherPageAction: () => void = () => {}
   private leftGap: number = 64
   private leftGap: number = 64
+  @State isCanClickHeader:boolean = true
 
 
   build() {
   build() {
     Column() {
     Column() {
@@ -800,12 +801,20 @@ struct commentHeaderView {
     .margin({ left: 8 + 4 })
     .margin({ left: 8 + 4 })
     .alignContent(Alignment.Center)
     .alignContent(Alignment.Center)
     .onClick(() => {
     .onClick(() => {
+      if (this.isCanClickHeader === true){
+        this.isCanClickHeader = false
 
 
-      commentViewModel.jumpToAccountPage(this.item, () => {
-        if (this.inDialog) {
-          if (this.dialogBeforeJumpOtherPageAction) { this.dialogBeforeJumpOtherPageAction() }
-        }
-      })
+        commentViewModel.jumpToAccountPage(this.item, () => {
+          if (this.inDialog) {
+            if (this.dialogBeforeJumpOtherPageAction) { this.dialogBeforeJumpOtherPageAction() }
+          }
+        })
+
+      }
+      let timer = setInterval(() => {
+        this.isCanClickHeader = true
+        clearInterval(timer);
+      }, 1000);
     })
     })
   }
   }
 
 

 import { CompDTO, ContentDTO } from 'wdBean';
 import { CompDTO, ContentDTO } from 'wdBean';
-import { CommonConstants } from 'wdConstant';
+import { BottomNavi, CommonConstants } from 'wdConstant';
 import { DateTimeUtils } from 'wdKit';
 import { DateTimeUtils } from 'wdKit';
 import { ProcessUtils } from 'wdRouter';
 import { ProcessUtils } from 'wdRouter';
 import { InfomationCardClick } from '../../utils/infomationCardClick';
 import { InfomationCardClick } from '../../utils/infomationCardClick';
@@ -15,6 +15,7 @@ export struct ZhSingleRow04 {
   @State pageId: string = '';
   @State pageId: string = '';
   @State pageName: string = '';
   @State pageName: string = '';
   @State compDTO: CompDTO = {} as CompDTO
   @State compDTO: CompDTO = {} as CompDTO
+  bottomNavi:BottomNavi = BottomNavi.PEOPLE
 
 
   build() {
   build() {
     Column() {
     Column() {
@@ -32,30 +33,33 @@ export struct ZhSingleRow04 {
             .lineHeight(25)
             .lineHeight(25)
         }
         }
 
 
-        Row() {
-          Text("更多")
-            .fontSize($r("app.float.font_size_14"))
-            .fontColor($r("app.color.color_999999"))
-            .margin({ right: 1 })
-          Image($r("app.media.more"))
-            .width(14)
-            .height(14)
-        }
-        .visibility(this.compDTO?.objectType === '0' || this.compDTO?.objectType === '' ? Visibility.None :
-        Visibility.Visible)
-        .onClick(() => {
-          if (this.compDTO?.objectType === '11') {
-            ProcessUtils.jumpChannelTab(this.compDTO.objectId, this.compDTO.pageId as string, this.compDTO.objectTitle)
-          } else {
-            const contentDTO: ContentDTO = {
-              objectId: this.compDTO.objectId,
-              objectType: this.compDTO.objectType,
-              linkUrl: this.compDTO.linkUrl,
-              pageId: this.compDTO.pageId
-            } as ContentDTO
-            ProcessUtils.processPage(contentDTO)
+
+        if(this.bottomNavi === BottomNavi.NEWS){
+          Row() {
+            Text("更多")
+              .fontSize($r("app.float.font_size_14"))
+              .fontColor($r("app.color.color_999999"))
+              .margin({ right: 1 })
+            Image($r("app.media.more"))
+              .width(14)
+              .height(14)
           }
           }
-        })
+          .visibility(this.compDTO?.objectType === '0' || this.compDTO?.objectType === '' ? Visibility.None :
+          Visibility.Visible)
+          .onClick(() => {
+            if (this.compDTO?.objectType === '11') {
+              ProcessUtils.jumpChannelTab(this.compDTO.objectId, this.compDTO.pageId as string, this.compDTO.objectTitle)
+            } else {
+              const contentDTO: ContentDTO = {
+                objectId: this.compDTO.objectId,
+                objectType: this.compDTO.objectType,
+                linkUrl: this.compDTO.linkUrl,
+                pageId: this.compDTO.pageId
+              } as ContentDTO
+              ProcessUtils.processPage(contentDTO)
+            }
+          })
+        }
       }
       }
       .justifyContent(FlexAlign.SpaceBetween)
       .justifyContent(FlexAlign.SpaceBetween)
       .margin({ bottom: 8 })
       .margin({ bottom: 8 })

@@ -2,7 +2,7 @@ import { AppointmentListChildComponent } from './AppointmentListChildComponent';
 import { CustomTitleUI } from '../../reusable/CustomTitleUI'
 import { CustomTitleUI } from '../../reusable/CustomTitleUI'
 import { ListHasNoMoreDataUI } from '../../reusable/ListHasNoMoreDataUI';
 import { ListHasNoMoreDataUI } from '../../reusable/ListHasNoMoreDataUI';
 import { MineAppointmentItem } from '../../../viewmodel/MineAppointmentItem';
 import { MineAppointmentItem } from '../../../viewmodel/MineAppointmentItem';
-import { LazyDataSource, NetworkUtil, StringUtils } from 'wdKit';
+import { LazyDataSource, NetworkUtil, StringUtils, ToastUtils } from 'wdKit';
 import MinePageDatasModel from '../../../model/MinePageDatasModel';
 import MinePageDatasModel from '../../../model/MinePageDatasModel';
 import { EmptyComponent } from '../../view/EmptyComponent';
 import { EmptyComponent } from '../../view/EmptyComponent';
 import { Action, ContentDTO } from 'wdBean/Index';
 import { Action, ContentDTO } from 'wdBean/Index';
@@ -102,6 +102,7 @@ export struct AppointmentListUI {
       LazyForEach(this.data, (item: MineAppointmentItem, index: number) => {
       LazyForEach(this.data, (item: MineAppointmentItem, index: number) => {
         ListItem() {
         ListItem() {
           AppointmentListChildComponent({ item: item,confirmCallback:((deleteItem) =>{
           AppointmentListChildComponent({ item: item,confirmCallback:((deleteItem) =>{
+            ToastUtils.shortToast('取消预约成功')
             this.data.deleteItem(this.data.getIndexOf(deleteItem))
             this.data.deleteItem(this.data.getIndexOf(deleteItem))
             this.count = this.data.totalCount()
             this.count = this.data.totalCount()
           })})
           })})

@@ -4,7 +4,8 @@ import PageModel from '../../viewmodel/PageModel';
 import { CommonConstants, ViewType } from 'wdConstant'
 import { CommonConstants, ViewType } from 'wdConstant'
 import { EmptyComponent,WDViewDefaultType } from '../view/EmptyComponent'
 import { EmptyComponent,WDViewDefaultType } from '../view/EmptyComponent'
 import { ErrorComponent } from '../view/ErrorComponent'
 import { ErrorComponent } from '../view/ErrorComponent'
-import { CompDTO, ContentDTO, contentListParams,contentListItem, InteractDataDTO } from 'wdBean'
+import { CompDTO, ContentDTO, contentListParams,contentListItem, InteractDataDTO,
+  postExecuteCollectRecordParams } from 'wdBean'
 import NoMoreLayout from './NoMoreLayout'
 import NoMoreLayout from './NoMoreLayout'
 import { CustomSelectUI } from '../view/CustomSelectUI';
 import { CustomSelectUI } from '../view/CustomSelectUI';
 import { CustomBottomFuctionUI } from '../view/CustomBottomFuctionUI';
 import { CustomBottomFuctionUI } from '../view/CustomBottomFuctionUI';
@@ -12,7 +13,7 @@ import { BigPicCardComponent } from '../view/BigPicCardComponent';
 import { contentListItemParams, MyCollectionItem } from '../../model/MyCollectionModel';
 import { contentListItemParams, MyCollectionItem } from '../../model/MyCollectionModel';
 import { CustomPullToRefresh } from '../reusable/CustomPullToRefresh';
 import { CustomPullToRefresh } from '../reusable/CustomPullToRefresh';
 import { MyCustomDialog } from '../reusable/MyCustomDialog'
 import { MyCustomDialog } from '../reusable/MyCustomDialog'
-import { DateTimeUtils, NetworkUtil } from 'wdKit/Index';
+import { DateTimeUtils, NetworkUtil, SPHelper } from 'wdKit/Index';
 import TrackingPageBrowseUtils from '../../utils/TrackingPageBrowseUtils'
 import TrackingPageBrowseUtils from '../../utils/TrackingPageBrowseUtils'
 import { TrackConstants, TrackingButton, TrackingContent, TrackParamConvert } from 'wdTracking/Index';
 import { TrackConstants, TrackingButton, TrackingContent, TrackParamConvert } from 'wdTracking/Index';
 
 
@@ -67,12 +68,31 @@ struct MyCollectionListPage {
   onPageShow(){
   onPageShow(){
     this.pageShow = Math.random()
     this.pageShow = Math.random()
     TrackingPageBrowseUtils.TrackingPageBrowseExposureStart()
     TrackingPageBrowseUtils.TrackingPageBrowseExposureStart()
+
+    this.refreshCollectList()
   }
   }
 
 
   onPageHide(): void {
   onPageHide(): void {
     TrackingPageBrowseUtils.TrackingPageBrowseExposureEnd(TrackConstants.PageName.My_Collect,TrackConstants.PageName.My_Collect)
     TrackingPageBrowseUtils.TrackingPageBrowseExposureEnd(TrackConstants.PageName.My_Collect,TrackConstants.PageName.My_Collect)
   }
   }
 
 
+  refreshCollectList(){
+    let compStr = SPHelper.default.getSync('CompCollectStatus','') as string
+    if (compStr.length > 0) {
+      let collectRecordParams:postExecuteCollectRecordParams = JSON.parse(compStr)
+      if (collectRecordParams.status === '0'){
+        let deleteIndex:number = 0
+        this.allDatas.forEach((item,index) => {
+          if (item.objectId === collectRecordParams.contentList[0].contentId) {
+            deleteIndex = index
+          }
+        })
+        this.allDatas.splice(deleteIndex,1)
+      }
+      SPHelper.default.delete('CompCollectStatus')
+    }
+  }
+
   build() {
   build() {
     Column(){
     Column(){
       CustomTitleAndEditUI({titleName:'我的收藏',isDisplayButton:this.isDisplayButton,editCallback:()=>{
       CustomTitleAndEditUI({titleName:'我的收藏',isDisplayButton:this.isDisplayButton,editCallback:()=>{

@@ -125,7 +125,8 @@ export struct PageComponent {
                   nextCompDTO: compIndex === this.pageModel.compList.getDataArray().length - 1 ? new CompDTO() : this.pageModel.compList.get(compIndex + 1) as CompDTO,
                   nextCompDTO: compIndex === this.pageModel.compList.getDataArray().length - 1 ? new CompDTO() : this.pageModel.compList.get(compIndex + 1) as CompDTO,
                   compDTO: compDTO,
                   compDTO: compDTO,
                   compIndex: compIndex,
                   compIndex: compIndex,
-                  pageId: this.pageId
+                  pageId: this.pageId,
+                  bottomNavi:this.bottomNavi
                 }
                 }
               )
               )
             }
             }

@@ -51,6 +51,7 @@ struct PeopleShipHomePage {
 
 
   onPageShow(): void {
   onPageShow(): void {
     WindowModel.shared.setWindowSystemBarProperties({ statusBarContentColor: '#ffffff'})
     WindowModel.shared.setWindowSystemBarProperties({ statusBarContentColor: '#ffffff'})
+    this.loadFollowData()
   }
   }
 
 
   onPageHide(): void {
   onPageHide(): void {
@@ -218,6 +219,10 @@ struct PeopleShipHomePage {
       this.isHasHomePage = false
       this.isHasHomePage = false
     }
     }
 
 
+    // this.loadFollowData()
+  }
+
+  async loadFollowData(){
     try {
     try {
       // 获取关注
       // 获取关注
       // 登录后获取，是否关注
       // 登录后获取，是否关注
@@ -230,6 +235,7 @@ struct PeopleShipHomePage {
     } catch (exception) {
     } catch (exception) {
       this.isLoading = false
       this.isLoading = false
     }
     }
+
   }
   }
 
 
   findFollowStata(followList: QueryListIsFollowedItem[]) {
   findFollowStata(followList: QueryListIsFollowedItem[]) {

@@ -9,6 +9,7 @@ import LoadMoreLayout from '../LoadMoreLayout'
 import TemplatePageHelp from './TemplatePageHelp'
 import TemplatePageHelp from './TemplatePageHelp'
 import TemplatePageModel from './TemplatePageModel'
 import TemplatePageModel from './TemplatePageModel'
 import { TemplatePageStateType } from './TemplatePageStateType'
 import { TemplatePageStateType } from './TemplatePageStateType'
+import { BottomNavi} from 'wdConstant/Index';
 
 
 
 
 const TAG: string = 'TemplatePageComponent';
 const TAG: string = 'TemplatePageComponent';
@@ -126,7 +127,8 @@ export default struct TemplatePageComponent {
               nextCompDTO: index === this.templatePage.compList.getDataArray().length - 1 ? new CompDTO() : this.templatePage.compList.get(index + 1) as CompDTO,
               nextCompDTO: index === this.templatePage.compList.getDataArray().length - 1 ? new CompDTO() : this.templatePage.compList.get(index + 1) as CompDTO,
               compIndex: index,
               compIndex: index,
               pageId: this.pageId,
               pageId: this.pageId,
-              pageName: this.pageName
+              pageName: this.pageName,
+              bottomNavi:BottomNavi.TEMPLATE
             });
             });
           }
           }
         }
         }

@@ -62,7 +62,6 @@ export struct SearchResultContentComponent {
 
 
       this.curPageNum = 1
       this.curPageNum = 1
       this.hasMore = true
       this.hasMore = true
-      this.isLoading = false
       this.getNewSearchResultData()
       this.getNewSearchResultData()
     }
     }
 
 
@@ -86,6 +85,10 @@ export struct SearchResultContentComponent {
   }
   }
 
 
   getNewSearchResultData() {
   getNewSearchResultData() {
+    if (this.isLoading){
+      return
+    }
+
     this.isLoading = true
     this.isLoading = true
     if (this.hasMore) {
     if (this.hasMore) {
       SearcherAboutDataModel.getSearchResultListData("20", `${this.curPageNum}`, this.searchType, this.keywords,
       SearcherAboutDataModel.getSearchResultListData("20", `${this.curPageNum}`, this.searchType, this.keywords,
@@ -178,6 +181,8 @@ export struct SearchResultContentComponent {
         this.isLoading = false
         this.isLoading = false
         this.count = this.count === -1 ? 0 : this.count
         this.count = this.count === -1 ? 0 : this.count
       })
       })
+    }else{
+      this.isLoading = false
     }
     }
   }
   }
 
 
@@ -236,12 +241,23 @@ export struct SearchResultContentComponent {
             // }
             // }
             let contentDTO = this.dataTransform(rem, value, photos);
             let contentDTO = this.dataTransform(rem, value, photos);
             if (value.data.type != "13") {
             if (value.data.type != "13") {
-              this.data.push(contentDTO)
-              if (value.data.sameContentList != null && value.data.sameContentList.length > 0) {
-                let contentDTO2 = new ContentDTO();
-                contentDTO2.sameContentListJson = JSON.stringify(value.data.sameContentList)
-                contentDTO2.sameContentListSize = value.data.sameContentList.length
-                this.data.push(contentDTO2)
+              //避免 重复（偶现bug 暂时处理）
+              let index = this.data.getDataArray().findIndex(obj => obj.objectId == contentDTO.objectId);
+              if (index === -1) {
+                this.data.push(contentDTO)
+
+                if (value.data.sameContentList != null && value.data.sameContentList.length > 0) {
+                  let contentDTO2 = new ContentDTO();
+                  contentDTO2.sameContentListId = contentDTO.objectId + value.data.sameContentList[0].id
+                  contentDTO2.sameContentListJson = JSON.stringify(value.data.sameContentList)
+                  contentDTO2.sameContentListSize = value.data.sameContentList.length
+
+                  let index = this.data.getDataArray().findIndex(obj => obj.sameContentListId == contentDTO2.sameContentListId)
+                  if (index === -1){
+                    this.data.push(contentDTO2)
+                  }
+                }
+
               }
               }
             }
             }
           })
           })
@@ -256,6 +272,7 @@ export struct SearchResultContentComponent {
           }
           }
           this.isLoading = false
           this.isLoading = false
         }).catch((err: Error) => {
         }).catch((err: Error) => {
+          this.isLoading = false
           console.log(TAG, JSON.stringify(err))
           console.log(TAG, JSON.stringify(err))
         })
         })
       }).catch((err: Error) => {
       }).catch((err: Error) => {
@@ -265,6 +282,7 @@ export struct SearchResultContentComponent {
       })
       })
     } else {
     } else {
       this.hasMore = false
       this.hasMore = false
+      this.isLoading = false
     }
     }
   }
   }
 
 

@@ -432,6 +432,7 @@ export struct LiveOperRowListView {
     }
     }
     console.log(TAG, '收藏点击', JSON.stringify(params))
     console.log(TAG, '收藏点击', JSON.stringify(params))
     PageRepository.postExecuteCollectRecord(params).then(res => {
     PageRepository.postExecuteCollectRecord(params).then(res => {
+      SPHelper.default.saveSync('CompCollectStatus',JSON.stringify(params))
       if (this.newsStatusOfUser && res.code == 0) {
       if (this.newsStatusOfUser && res.code == 0) {
         this.newsStatusOfUser.collectStatus = this.newsStatusOfUser?.collectStatus === 1 ? 0 : 1
         this.newsStatusOfUser.collectStatus = this.newsStatusOfUser?.collectStatus === 1 ? 0 : 1
         if (this.newsStatusOfUser.collectStatus === 1) {
         if (this.newsStatusOfUser.collectStatus === 1) {

@@ -551,6 +551,7 @@ export struct OperRowListView {
 
 
     // console.log(TAG, '收藏点击', JSON.stringify(params))
     // console.log(TAG, '收藏点击', JSON.stringify(params))
     PageRepository.postExecuteCollectRecord(params).then(res => {
     PageRepository.postExecuteCollectRecord(params).then(res => {
+      SPHelper.default.saveSync('CompCollectStatus',JSON.stringify(params))
       if (this.newsStatusOfUser && res.code == 0) {
       if (this.newsStatusOfUser && res.code == 0) {
         this.newsStatusOfUser.collectStatus = this.newsStatusOfUser?.collectStatus === 1 ? 0 : 1
         this.newsStatusOfUser.collectStatus = this.newsStatusOfUser?.collectStatus === 1 ? 0 : 1
         if (this.newsStatusOfUser.collectStatus === 1) {
         if (this.newsStatusOfUser.collectStatus === 1) {

@@ -45,7 +45,7 @@ export struct ENewspaperListDialog {
   public closeDialog?: () => void
   public closeDialog?: () => void
   // 手势滑动相关
   // 手势滑动相关
   private panOption: PanGestureOptions = new PanGestureOptions({ direction: PanDirection.Up | PanDirection.Down })
   private panOption: PanGestureOptions = new PanGestureOptions({ direction: PanDirection.Up | PanDirection.Down })
-  private topFixedHeight = 124
+  private topFixedHeight = 204
   @State topHeight: number = 204
   @State topHeight: number = 204
   private deviceHeight: number = 0
   private deviceHeight: number = 0
 
 

@@ -51,4 +51,7 @@ export class LiveDetailChatRoomController {
       room.enterRoom()
       room.enterRoom()
     }
     }
   }
   }
+  disconnectLiveRoom() {
+    LiveRoomManager.sharedManager().disconnect()
+  }
 }
 }

@@ -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()
   }
   }
 
 
@@ -100,6 +73,7 @@ export struct DetailPlayLivePage {
     Logger.info(TAG, `wyj-aboutToDisappear`)
     Logger.info(TAG, `wyj-aboutToDisappear`)
     await this.playerController?.stop()
     await this.playerController?.stop()
     await this.playerController?.release()
     await this.playerController?.release()
+    this.chatRoomController.disconnectLiveRoom()
   }
   }
 
 
   configChatRoom() {
   configChatRoom() {

@@ -84,6 +84,7 @@ export struct DetailPlayVLivePage {
 
 
   aboutToDisappear(): void {
   aboutToDisappear(): void {
     this.closeFullScreen()
     this.closeFullScreen()
+    this.chatRoomController.disconnectLiveRoom()
   }
   }
 
 
   openFullScreen() {
   openFullScreen() {

@@ -94,15 +94,24 @@ 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
         && this.contentDetailData.liveInfo.previewType == 1) { ///预告视频
         && this.contentDetailData.liveInfo.previewType == 1) { ///预告视频
-          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;
-            this.liveChatList.push(...data.barrageResponses)
+            if (this.pageModel.currentPage === 1) {
+              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)

@@ -117,6 +117,7 @@ export struct OperationListView {
 
 
     }
     }
     ContentDetailRequest.postExecuteCollectRecord(params).then(res => {
     ContentDetailRequest.postExecuteCollectRecord(params).then(res => {
+      SPHelper.default.saveSync('CompCollectStatus',JSON.stringify(params))
       if (this.newsStatusOfUser && res.code == 0) {
       if (this.newsStatusOfUser && res.code == 0) {
         this.newsStatusOfUser.collectStatus = this.newsStatusOfUser?.collectStatus === 1 ? 0 : 1
         this.newsStatusOfUser.collectStatus = this.newsStatusOfUser?.collectStatus === 1 ? 0 : 1
         // this.queryContentInteractCount()
         // this.queryContentInteractCount()

@@ -141,6 +141,7 @@ export struct PlayerRightView {
 
 
     }
     }
     ContentDetailRequest.postExecuteCollectRecord(params).then(res => {
     ContentDetailRequest.postExecuteCollectRecord(params).then(res => {
+      SPHelper.default.saveSync('CompCollectStatus',JSON.stringify(params))
       if (this.newsStatusOfUser && res.code == 0) {
       if (this.newsStatusOfUser && res.code == 0) {
         this.newsStatusOfUser.collectStatus = this.newsStatusOfUser?.collectStatus === 1 ? 0 : 1
         this.newsStatusOfUser.collectStatus = this.newsStatusOfUser?.collectStatus === 1 ? 0 : 1
         // this.queryContentInteractCount()
         // this.queryContentInteractCount()
@@ -257,6 +258,7 @@ export struct PlayerRightView {
       Image(this.getHeadUrl())
       Image(this.getHeadUrl())
         .width('100%')
         .width('100%')
         .borderRadius(24)
         .borderRadius(24)
+        .backgroundColor(Color.White)
         .aspectRatio(1)
         .aspectRatio(1)
         .border({ width: 1, color: Color.White, style: BorderStyle.Solid })
         .border({ width: 1, color: Color.White, style: BorderStyle.Solid })
         .onClick(() => {
         .onClick(() => {

@@ -32,6 +32,7 @@ export function setupPlayerConfig(player: AliPlayer) {
     config.mMaxBufferDuration = 50000
     config.mMaxBufferDuration = 50000
     config.mHighBufferDuration = 3000
     config.mHighBufferDuration = 3000
     config.mStartBufferDuration = 50
     config.mStartBufferDuration = 50
+    config.mEnableLowLatencyMode = true
     player.setConfig(config)
     player.setConfig(config)
   }
   }
 }
 }