Merge remote-tracking branch 'origin/main'

@@ -4,7 +4,8 @@ import {
   PageInfoBean,
   PageInfoBean,
   ContentDTO,
   ContentDTO,
   contentListParams,
   contentListParams,
-  InteractDataDTO, TopicInfo
+  InteractDataDTO, TopicInfo,
+  CompInfoBean
 } from 'wdBean';
 } from 'wdBean';
 import { DateTimeUtils, Logger, SPHelper, WindowModel } from 'wdKit/Index';
 import { DateTimeUtils, Logger, SPHelper, WindowModel } from 'wdKit/Index';
 import { PaperReaderSimpleDialog } from '../../dialog/PaperReaderDialog';
 import { PaperReaderSimpleDialog } from '../../dialog/PaperReaderDialog';
@@ -137,8 +138,6 @@ export struct MorningEveningPaperComponent {
       let pageInfoBean = await MorningEveningViewModel.getMorningEveningPageInfo("" + this.dailyPaperTopicPageId) //"25091"
       let pageInfoBean = await MorningEveningViewModel.getMorningEveningPageInfo("" + this.dailyPaperTopicPageId) //"25091"
       this.pageInfoBean = pageInfoBean;
       this.pageInfoBean = pageInfoBean;
 
 
-      let compInfoBean = await MorningEveningViewModel.getMorningEveningCompInfo(pageInfoBean?.id, pageInfoBean?.groups[0]?.id, currentTime + "", pageInfoBean?.topicInfo?.topicId)
-
       // this.title = this.pageInfoBean?.topicInfo?.title
       // this.title = this.pageInfoBean?.topicInfo?.title
       this.setComponentTitle()
       this.setComponentTitle()
       this.topicInfo = this.pageInfoBean?.topicInfo
       this.topicInfo = this.pageInfoBean?.topicInfo
@@ -158,6 +157,17 @@ export struct MorningEveningPaperComponent {
       this.setComponentBgColor(coverUrl)
       this.setComponentBgColor(coverUrl)
 
 
       // this.compInfoBean = compInfoBean
       // this.compInfoBean = compInfoBean
+      //信息流缓存
+      let BeanString = SPHelper.default.getSync('MorningEveningComp'+this.dailyPaperTopicPageId,'') as string
+      let compInfoBean = {} as CompInfoBean
+      if (BeanString.length > 0) {
+        compInfoBean = JSON.parse(BeanString)
+      }else {
+        SPHelper.default.delete('MorningEveningComp'+this.dailyPaperTopicPageId)
+        compInfoBean = await MorningEveningViewModel.getMorningEveningCompInfo(pageInfoBean?.id, pageInfoBean?.groups[0]?.id, currentTime + "", pageInfoBean?.topicInfo?.topicId)
+        SPHelper.default.saveSync('MorningEveningComp'+this.dailyPaperTopicPageId,JSON.stringify(compInfoBean))
+      }
+
       console.log(TAG, "compInfoBean = " + JSON.stringify(compInfoBean))
       console.log(TAG, "compInfoBean = " + JSON.stringify(compInfoBean))
       if (compInfoBean?.compList[0]) {
       if (compInfoBean?.compList[0]) {
         this.compListItem = compInfoBean?.compList[0]
         this.compListItem = compInfoBean?.compList[0]
@@ -180,6 +190,11 @@ export struct MorningEveningPaperComponent {
         this.progressVal = Math.floor(position * 100 / duration);
         this.progressVal = Math.floor(position * 100 / duration);
       }
       }
       this.isNoListContent = this.compListItem && this.compListItem?.operDataList?.length > 0 ?false:true
       this.isNoListContent = this.compListItem && this.compListItem?.operDataList?.length > 0 ?false:true
+
+      if (BeanString.length > 0) {
+        compInfoBean = await MorningEveningViewModel.getMorningEveningCompInfo(pageInfoBean?.id, pageInfoBean?.groups[0]?.id, currentTime + "", pageInfoBean?.topicInfo?.topicId)
+        SPHelper.default.saveSync('MorningEveningComp'+this.dailyPaperTopicPageId,JSON.stringify(compInfoBean))
+      }
     } catch (exception) {
     } catch (exception) {
        this.isContentFailed = true
        this.isContentFailed = true
 
 

@@ -20,6 +20,9 @@ import { PeopleShipMainViewModel } from '../../viewmodel/PeopleShipMainViewModel
 @Entry
 @Entry
 @Component
 @Component
 struct MyCollectionListPage {
 struct MyCollectionListPage {
+  //RmhTitle组件刷新需要设置 该界面为用户主页，所以不需要刷新操作
+  @Provide pageShow: number = -1
+
   @State private browSingModel: PageModel = new PageModel()
   @State private browSingModel: PageModel = new PageModel()
   isloading : boolean = false
   isloading : boolean = false
   @Provide isEditState:boolean = false
   @Provide isEditState:boolean = false
@@ -60,6 +63,7 @@ struct MyCollectionListPage {
   }
   }
 
 
   onPageShow(){
   onPageShow(){
+    this.pageShow = Math.random()
     TrackingPageBrowseUtils.TrackingPageBrowseExposureStart()
     TrackingPageBrowseUtils.TrackingPageBrowseExposureStart()
   }
   }
 
 

@@ -173,7 +173,7 @@ export struct PlayUIComponent {
     .width('100%')
     .width('100%')
     // .width(this.displayDirection == DisplayDirection.VIDEO_HORIZONTAL ? 'calc(100% - 80vp)' : 'calc(100% - 32vp)')
     // .width(this.displayDirection == DisplayDirection.VIDEO_HORIZONTAL ? 'calc(100% - 80vp)' : 'calc(100% - 32vp)')
     .padding({
     .padding({
-      top: 15,
+      top: 11,
       bottom: 6,
       bottom: 6,
       left: this.displayDirection == DisplayDirection.VIDEO_HORIZONTAL ? '40vp' : '16vp',
       left: this.displayDirection == DisplayDirection.VIDEO_HORIZONTAL ? '40vp' : '16vp',
       right: this.displayDirection == DisplayDirection.VIDEO_HORIZONTAL ? '40vp' : '16vp'
       right: this.displayDirection == DisplayDirection.VIDEO_HORIZONTAL ? '40vp' : '16vp'

@@ -76,6 +76,10 @@ export struct PlayerProgressView {
     // .markAnchor({ x: 0, y: '100%' })
     // .markAnchor({ x: 0, y: '100%' })
   }
   }
 
 
+  aboutToDisappear(): void {
+    clearTimeout(this.timer)
+  }
+
   build() {
   build() {
     Stack() {
     Stack() {
       this.playerLoadingBuilder()
       this.playerLoadingBuilder()