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

@@ -233,7 +233,7 @@ export struct ZhSingleColumn09 {
             .fontSize(14)
             .fontSize(14)
             .fontColor(this.compDTO?.operDataList.length > 8 && !this.fullyTraversed ? 0xed2800 : 0xB0B0B0)
             .fontColor(this.compDTO?.operDataList.length > 8 && !this.fullyTraversed ? 0xed2800 : 0xB0B0B0)
             .margin({ right: 4 })
             .margin({ right: 4 })
-          Image(this.compDTO?.operDataList.length > 8 ? $r('app.media.icon_refresh') : $r('app.media.ic_refresh'))
+          Image(this.compDTO?.operDataList.length > 8 && !this.fullyTraversed ? $r('app.media.icon_refresh') : $r('app.media.ic_refresh'))
             .width(14)
             .width(14)
             .height(14)
             .height(14)
         }
         }

@@ -437,6 +437,9 @@ export struct ZhSingleRow03 {
                 .fontSize(12)
                 .fontSize(12)
                 .textAlign(TextAlign.Center)
                 .textAlign(TextAlign.Center)
                 .borderRadius(3)
                 .borderRadius(3)
+                .borderStyle(BorderStyle.Solid)
+                .borderWidth(this.isReserved(Number(item.objectId)) ? 1 : 0)
+                .borderColor('#e5e5e5')
                 .onClick(() => {
                 .onClick(() => {
                   this.bookAndCancel(item.relId, item.objectId, !this.isReserved(Number(item.objectId)))
                   this.bookAndCancel(item.relId, item.objectId, !this.isReserved(Number(item.objectId)))
                 })
                 })

@@ -17,6 +17,8 @@ import TrackingPageBrowseUtils from '../../utils/TrackingPageBrowseUtils'
 import { TrackConstants, TrackingButton, TrackingContent, TrackParamConvert } from 'wdTracking/Index';
 import { TrackConstants, TrackingButton, TrackingContent, TrackParamConvert } from 'wdTracking/Index';
 
 
 import { PeopleShipMainViewModel } from '../../viewmodel/PeopleShipMainViewModel';
 import { PeopleShipMainViewModel } from '../../viewmodel/PeopleShipMainViewModel';
+import { router } from '@kit.ArkUI';
+
 @Entry
 @Entry
 @Component
 @Component
 struct MyCollectionListPage {
 struct MyCollectionListPage {
@@ -148,7 +150,10 @@ struct MyCollectionListPage {
     .scrollBar(BarState.Off)
     .scrollBar(BarState.Off)
     .height(CommonConstants.FULL_PARENT)
     .height(CommonConstants.FULL_PARENT)
     .edgeEffect(EdgeEffect.None) // 必须设置列表为滑动到边缘无效果
     .edgeEffect(EdgeEffect.None) // 必须设置列表为滑动到边缘无效果
-    .margin({
+    .margin(router.getState().name === 'MyCollectionListPage' ? {
+      left: 6,
+      right: 6
+    } : {
       left: 16,
       left: 16,
       right: 16
       right: 16
     })
     })
@@ -167,7 +172,6 @@ struct MyCollectionListPage {
       }
       }
       Column() {
       Column() {
         BigPicCardComponent({compDTO:new CompDTO,contentDTO:compDTO,pageId:TrackConstants.PageName.My_Collect,pageName:TrackConstants.PageName.My_Collect})
         BigPicCardComponent({compDTO:new CompDTO,contentDTO:compDTO,pageId:TrackConstants.PageName.My_Collect,pageName:TrackConstants.PageName.My_Collect})
-        Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 });
       }
       }
     }.onVisibleAreaChange([0.0, 1.0], (isVisible: boolean, currentRatio: number) => {
     }.onVisibleAreaChange([0.0, 1.0], (isVisible: boolean, currentRatio: number) => {
       if (isVisible && !this.isEditState) {
       if (isVisible && !this.isEditState) {

 import { CommonConstants, ViewType } from 'wdConstant';
 import { CommonConstants, ViewType } from 'wdConstant';
-import { Logger, NetworkUtil } from 'wdKit';
+import { EmitterEventId, EmitterUtils, Logger, NetworkUtil } from 'wdKit';
 import { EmptyComponent } from '../view/EmptyComponent';
 import { EmptyComponent } from '../view/EmptyComponent';
 import PageModel from '../../viewmodel/PageModel';
 import PageModel from '../../viewmodel/PageModel';
 import { autoRefresh, onActionEnd, onActionStart, onActionUpdate } from '../../utils/PullDownRefresh';
 import { autoRefresh, onActionEnd, onActionStart, onActionUpdate } from '../../utils/PullDownRefresh';
@@ -43,6 +43,7 @@ export struct PageComponent {
   // 国殇灰度管理
   // 国殇灰度管理
   GrayManage: SubscribedAbstractProperty<GrayManageModel> =  AppStorage.link<GrayManageModel>('GrayManage')
   GrayManage: SubscribedAbstractProperty<GrayManageModel> =  AppStorage.link<GrayManageModel>('GrayManage')
   @State netStatus: number | undefined = undefined // 存储网络状态
   @State netStatus: number | undefined = undefined // 存储网络状态
+  isRMH:boolean = false
 
 
   build() {
   build() {
     Column() {
     Column() {
@@ -282,6 +283,16 @@ export struct PageComponent {
       this.needload = false;
       this.needload = false;
       // console.log(TAG, 'aboutToAppear onAutoRefresh111 ' + this.needload)
       // console.log(TAG, 'aboutToAppear onAutoRefresh111 ' + this.needload)
     }
     }
+
+    //人民号推荐 监听登录事件（刷新页面）
+    EmitterUtils.receiveEvent(EmitterEventId.LOGIN_SUCCESS, () => {
+      if(this.navIndex === this.currentTopNavSelectedIndex && this.isRMH){
+        this.listScroller.scrollEdge(Edge.Top)
+        this.pageModel.viewType = ViewType.LOADING;
+        this.getData()
+      }
+    })
+
   }
   }
 
 
   onChange() {
   onChange() {

@@ -97,10 +97,10 @@ export struct TopNavigationComponentNew {
                 if (!this.isBroadcast(navItem) && !this.isLayout(navItem)) {
                 if (!this.isBroadcast(navItem) && !this.isLayout(navItem)) {
                   if (CompUtils.isNews(this.navItem)) {
                   if (CompUtils.isNews(this.navItem)) {
                     this.createPageComponent(navItem, index,
                     this.createPageComponent(navItem, index,
-                      (channelId) => this.GrayManage.get().isNewsMourning(channelId));
+                      (channelId) => this.GrayManage.get().isNewsMourning(channelId),false);
                   } else if (CompUtils.isRMH(this.navItem)) {
                   } else if (CompUtils.isRMH(this.navItem)) {
                     this.createPageComponent(navItem, index,
                     this.createPageComponent(navItem, index,
-                      (channelId) => this.GrayManage.get().isRmhMourning(channelId));
+                      (channelId) => this.GrayManage.get().isRmhMourning(channelId),true);
                   }
                   }
 
 
                 } else {
                 } else {
@@ -165,7 +165,7 @@ export struct TopNavigationComponentNew {
 
 
   }
   }
   @Builder
   @Builder
-   createPageComponent(navItem: TopNavDTO, index: number, mourningCheckFn: (channelId: string) => boolean) {
+   createPageComponent(navItem: TopNavDTO, index: number, mourningCheckFn: (channelId: string) => boolean,isRMH:boolean = false) {
     PageComponent({
     PageComponent({
       currentTopNavSelectedIndex: this.currentTopNavSelectedIndex,
       currentTopNavSelectedIndex: this.currentTopNavSelectedIndex,
       navIndex: index,
       navIndex: index,
@@ -173,6 +173,7 @@ export struct TopNavigationComponentNew {
       channelId: navItem?.channelId + '',
       channelId: navItem?.channelId + '',
       autoRefresh: this.autoRefresh2Page,
       autoRefresh: this.autoRefresh2Page,
       isMourning: mourningCheckFn(`${navItem.channelId}`),
       isMourning: mourningCheckFn(`${navItem.channelId}`),
+      isRMH:isRMH
     })
     })
       // .margin({
       // .margin({
       //   left: 6,
       //   left: 6,

@@ -569,10 +569,10 @@ export struct PeopleShipMainComponent {
     }
     }
 
 
     //退出登录的时候 刷新界面
     //退出登录的时候 刷新界面
-    let userID = UserDataLocal.getUserId()
-    if (!StringUtils.isNotEmpty(userID)) {
-      this.getData()
-    }
+    // let userID = UserDataLocal.getUserId()
+    // if (!StringUtils.isNotEmpty(userID)) {
+    //   this.getData()
+    // }
   }
   }
 
 
   onAutoRefresh(changedPropertyName: string) {
   onAutoRefresh(changedPropertyName: string) {

@@ -141,9 +141,9 @@ export struct TopPlayComponent {
       this.isHideLoading = false
       this.isHideLoading = false
     } else {
     } else {
       this.isWait = this.contentDetailData?.liveInfo?.liveState == 'wait'
       this.isWait = this.contentDetailData?.liveInfo?.liveState == 'wait'
-      if (this.isWait) {
-        this.isHideLoading = true
-      }
+      // if (this.isWait) {
+      //   this.isHideLoading = true
+      // }
     }
     }
 
 
     this.isEnd = this.contentDetailData?.liveInfo?.liveState === 'end' &&
     this.isEnd = this.contentDetailData?.liveInfo?.liveState === 'end' &&
@@ -269,6 +269,14 @@ export struct TopPlayComponent {
           Visibility.None)//  .contrast(this.isEnd ? 0.4 : 1)
           Visibility.None)//  .contrast(this.isEnd ? 0.4 : 1)
           .blur(this.isEnd ? 20 : 0)
           .blur(this.isEnd ? 20 : 0)
           .width('100%')
           .width('100%')
+          .onComplete(event=>{
+            if (event?.loadingStatus == 1) {
+                this.isHideLoading = true
+            }
+          })
+          .onError(()=>{
+            this.isHideLoading = true
+          })
 
 
 
 
         if (this.liveDetailPageLogic.showPad) {
         if (this.liveDetailPageLogic.showPad) {