Merge remote-tracking branch 'origin/main'

@@ -26,6 +26,7 @@ import { common } from '@kit.AbilityKit';
 import TrackingPageBrowseUtils from '../../utils/TrackingPageBrowseUtils'
 import TrackingPageBrowseUtils from '../../utils/TrackingPageBrowseUtils'
 import {TrackConstants,TrackParamConvert}from 'wdTracking/Index'
 import {TrackConstants,TrackParamConvert}from 'wdTracking/Index'
 import { ColorUtils } from '../../utils/ColorUtils';
 import { ColorUtils } from '../../utils/ColorUtils';
+import { EmptyComponent,WDViewDefaultType } from '../view/EmptyComponent';
 
 
 const TAG = 'MorningEveningPaperComponent';
 const TAG = 'MorningEveningPaperComponent';
 
 
@@ -37,6 +38,7 @@ export struct MorningEveningPaperComponent {
   @State compListItem: CompList = {} as CompList
   @State compListItem: CompList = {} as CompList
   @Provide  commentList: InteractDataDTO[] = []
   @Provide  commentList: InteractDataDTO[] = []
   @State audioPlayUrl: string = ""
   @State audioPlayUrl: string = ""
+  @State isNoListContent:boolean = false;
   // @Consume dailyPaperTopicPageId: number
   // @Consume dailyPaperTopicPageId: number
   // @Provide compListItem: CompList = {} as CompList
   // @Provide compListItem: CompList = {} as CompList
   // @State morningEveningPaperDTO: MorningEveningPaperDTO = {
   // @State morningEveningPaperDTO: MorningEveningPaperDTO = {
@@ -172,6 +174,7 @@ export struct MorningEveningPaperComponent {
         this.totalTime = DateFormatUtil.secondToTime(duration);
         this.totalTime = DateFormatUtil.secondToTime(duration);
         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
     } catch (exception) {
     } catch (exception) {
 
 
     }
     }
@@ -264,6 +267,9 @@ export struct MorningEveningPaperComponent {
         }
         }
 
 
         ListItem() {
         ListItem() {
+          if(this.isNoListContent){
+            EmptyComponent({emptyType:WDViewDefaultType.WDViewDefaultType_NoListContent})
+          }else {
             SingleColumn999Component({
             SingleColumn999Component({
               compListItem: this.compListItem,
               compListItem: this.compListItem,
             })
             })
@@ -272,6 +278,7 @@ export struct MorningEveningPaperComponent {
               })
               })
           }
           }
         }
         }
+      }
       // .height(`calc(100% - ${this.bottomSafeHeight + this.topSafeHeight + 'vp'})`)
       // .height(`calc(100% - ${this.bottomSafeHeight + this.topSafeHeight + 'vp'})`)
       .edgeEffect(EdgeEffect.None) // 必须设置列表为滑动到边缘无效果
       .edgeEffect(EdgeEffect.None) // 必须设置列表为滑动到边缘无效果
       .scrollBar(BarState.Off)
       .scrollBar(BarState.Off)

@@ -152,7 +152,7 @@ export struct SingleColumn999Component {
         scrollBackward: NestedScrollMode.SELF_FIRST
         scrollBackward: NestedScrollMode.SELF_FIRST
       })
       })
     } else {
     } else {
-      EmptyComponent({emptyType:WDViewDefaultType.WDViewDefaultType_NoListContent})
+      // EmptyComponent({emptyType:WDViewDefaultType.WDViewDefaultType_NoListContent})
     }
     }
   }
   }
 
 

@@ -26,7 +26,7 @@ export struct PeopleShipRecommendComponent {
           .height('30vp')
           .height('30vp')
           .fontColor($r('app.color.color_222222'))
           .fontColor($r('app.color.color_222222'))
           .fontWeight(600)
           .fontWeight(600)
-          .fontSize($r('app.float.vp_18'))
+          .fontSize($r('app.float.vp_15_7'))
 
 
         Blank()
         Blank()
         Button({ type: ButtonType.Normal, stateEffect: false }) {
         Button({ type: ButtonType.Normal, stateEffect: false }) {
@@ -35,7 +35,7 @@ export struct PeopleShipRecommendComponent {
               .height('30vp')
               .height('30vp')
               .fontColor($r('app.color.color_999999'))
               .fontColor($r('app.color.color_999999'))
               .fontWeight(400)
               .fontWeight(400)
-              .fontSize($r('app.float.vp_14'))
+              .fontSize($r('app.float.vp_13'))
             Image($r('app.media.ic_refresh'))
             Image($r('app.media.ic_refresh'))
               .width('14vp')
               .width('14vp')
               .height('14vp')
               .height('14vp')
@@ -56,7 +56,7 @@ export struct PeopleShipRecommendComponent {
       .width('100%')
       .width('100%')
       .alignSelf(ItemAlign.Start)
       .alignSelf(ItemAlign.Start)
       .margin({
       .margin({
-        top: '10vp',
+        top: '-50vp',
         bottom: '10vp'
         bottom: '10vp'
       })
       })
 
 
@@ -75,7 +75,7 @@ export struct PeopleShipRecommendComponent {
       .columnsTemplate('1fr 1fr 1fr')
       .columnsTemplate('1fr 1fr 1fr')
       .columnsGap(20)
       .columnsGap(20)
       .rowsGap(16)
       .rowsGap(16)
-      .height(Math.ceil(this.rmhList.length / 3.0) * 132)
+      .height(Math.ceil(this.rmhList.length / 3.0) * 126)
       .backgroundColor(Color.Transparent)
       .backgroundColor(Color.Transparent)
       .margin({
       .margin({
         right: '20vp',
         right: '20vp',
@@ -94,7 +94,7 @@ export struct PeopleShipRecommendComponent {
         .borderRadius('3vp')
         .borderRadius('3vp')
         .fontColor($r('app.color.color_999999'))
         .fontColor($r('app.color.color_999999'))
         .fontWeight(500)
         .fontWeight(500)
-        .fontSize($r('app.float.vp_14'))
+        .fontSize($r('app.float.vp_13'))
         .fontColor(Color.White)
         .fontColor(Color.White)
         .onClick(() => {
         .onClick(() => {
           // 点击一键关注
           // 点击一键关注

@@ -11,8 +11,8 @@ export struct PeopleShipRecommendHeadComponent {
     Column(){
     Column(){
       Stack({ alignContent: Alignment.BottomEnd }) {
       Stack({ alignContent: Alignment.BottomEnd }) {
         Image(this.rmhInfo.headPhotoUrl.length > 0 ? this.rmhInfo.headPhotoUrl : $r('app.media.WDAccountOwnerHedaerDefaultIcon'))
         Image(this.rmhInfo.headPhotoUrl.length > 0 ? this.rmhInfo.headPhotoUrl : $r('app.media.WDAccountOwnerHedaerDefaultIcon'))
-          .width('44vp')
-          .height('44vp')
+          .width('40vp')
+          .height('40vp')
           .borderRadius('22vp')
           .borderRadius('22vp')
           .objectFit(ImageFit.Cover)
           .objectFit(ImageFit.Cover)
 
 
@@ -23,12 +23,12 @@ export struct PeopleShipRecommendHeadComponent {
           .margin({
           .margin({
             right: '-3vp'
             right: '-3vp'
           })
           })
-      }.margin({ top: 12, bottom: 8 })
+      }.margin({ top: 4, bottom: 8 })
 
 
       Row() {
       Row() {
         Text(this.rmhInfo.userName)
         Text(this.rmhInfo.userName)
           .fontColor($r('app.color.color_222222'))
           .fontColor($r('app.color.color_222222'))
-          .fontSize($r('app.float.vp_14'))
+          .fontSize($r('app.float.vp_13'))
           .fontWeight(600)
           .fontWeight(600)
           .maxLines(1)
           .maxLines(1)
           .textOverflow({overflow: TextOverflow.Ellipsis})
           .textOverflow({overflow: TextOverflow.Ellipsis})
@@ -49,14 +49,14 @@ export struct PeopleShipRecommendHeadComponent {
 
 
       Text(this.rmhInfo.introduction)
       Text(this.rmhInfo.introduction)
         .fontColor($r('app.color.color_B0B0B0'))
         .fontColor($r('app.color.color_B0B0B0'))
-        .fontSize($r('app.float.vp_12'))
-        .margin({ top: 8, bottom: 14 })
+        .fontSize($r('app.float.vp_11'))
+        .margin({ top: 6, bottom: 14 })
         .textOverflow({overflow: TextOverflow.Ellipsis})
         .textOverflow({overflow: TextOverflow.Ellipsis})
         .maxLines(2)
         .maxLines(2)
         .height(34)
         .height(34)
     }
     }
     .width('100%')
     .width('100%')
-    .height('116vp')
+    .height('110vp')
 
 
   }
   }