Merge remote-tracking branch 'origin/main'

@@ -127,18 +127,20 @@ export struct SingleColumn999Component {
 
 
         ListItem() {
         ListItem() {
           Text("已显示全部内容")
           Text("已显示全部内容")
+            .fontSize(14)
             .width("100%")// .height(100)
             .width("100%")// .height(100)
+            .height(50)
             .padding(9)
             .padding(9)
             .fontColor(Color.White)
             .fontColor(Color.White)
             .fontSize($r('app.float.font_size_14'))
             .fontSize($r('app.float.font_size_14'))
             .fontWeight(400)
             .fontWeight(400)
             .textAlign(TextAlign.Center)
             .textAlign(TextAlign.Center)
-            .align(Alignment.Bottom)
+            .align(Alignment.Top)
             .maxLines(1)
             .maxLines(1)
             .textOverflow({ overflow: TextOverflow.Ellipsis })
             .textOverflow({ overflow: TextOverflow.Ellipsis })
         }
         }
       }
       }
-      .height("100%") // 必须设置height
+      // .height("100%") // 必须设置height
       // .margin({ left: 14, right: 14 })
       // .margin({ left: 14, right: 14 })
       // .listDirection(Axis.Vertical) // 默认值：Axis.Vertical
       // .listDirection(Axis.Vertical) // 默认值：Axis.Vertical
       // .lanes(this.buildLanes()) // 行/列数，一列 // 默认值：1
       // .lanes(this.buildLanes()) // 行/列数，一列 // 默认值：1

@@ -34,7 +34,7 @@ export struct topicInfoView {
 
 
       if (this.frontLinkObject) {
       if (this.frontLinkObject) {
         Row() {
         Row() {
-          Text("查看详情")
+          Text(this.frontLinkObject.linkUrl.length > 0?"查看详情":'')
             .fontSize(14)
             .fontSize(14)
             .fontColor($r('app.color.white'))
             .fontColor($r('app.color.white'))
             .maxLines(1)
             .maxLines(1)
@@ -50,6 +50,7 @@ export struct topicInfoView {
         .margin({ top: 8, left: 16, right: 16, bottom: 16 })
         .margin({ top: 8, left: 16, right: 16, bottom: 16 })
         .borderRadius(2)
         .borderRadius(2)
         .onClick(()=>{
         .onClick(()=>{
+          if (this.frontLinkObject.linkUrl.length === 0) return
           let  contentDTO :ContentDTO = new ContentDTO();
           let  contentDTO :ContentDTO = new ContentDTO();
           contentDTO.objectType = this.frontLinkObject?.newsType.toString()
           contentDTO.objectType = this.frontLinkObject?.newsType.toString()
           contentDTO.objectId = this.frontLinkObject?.newsId
           contentDTO.objectId = this.frontLinkObject?.newsId

@@ -440,6 +440,7 @@ export struct PaperSingleColumn999CardView {
             .borderRadius(5)
             .borderRadius(5)
             .aspectRatio(319 / 179) ///图片设计比例
             .aspectRatio(319 / 179) ///图片设计比例
             .padding({ top: 10 })
             .padding({ top: 10 })
+          //视频
           if (this.item?.videoInfo) {
           if (this.item?.videoInfo) {
             Row() {
             Row() {
               Image($r('app.media.card_play'))
               Image($r('app.media.card_play'))
@@ -468,6 +469,64 @@ export struct PaperSingleColumn999CardView {
             .width(CommonConstants.FULL_PARENT)
             .width(CommonConstants.FULL_PARENT)
             .justifyContent(FlexAlign.End)
             .justifyContent(FlexAlign.End)
           }
           }
+          //直播
+          if (this.item?.objectType === '2') {
+            Row() {
+              Image(this.buildLiveStateImage())
+                .width(14)
+                .height(14)
+                .objectFit(ImageFit.Contain)
+              Text(this.buildLiveStateString())
+                .fontColor(Color.White)
+                .fontSize($r('app.float.vp_12'))
+                .fontWeight(500)
+                .textAlign(TextAlign.End)
+                .lineHeight(18)
+                .textShadow({
+                  radius: 2,
+                  color: 'rgba(0,0,0,0.3)',
+                  offsetY: 2
+                })
+                .margin({
+                  right: 10,
+                  left: 3
+                })
+            }
+            .margin({
+              bottom: 3
+            })
+            .width(CommonConstants.FULL_PARENT)
+            .justifyContent(FlexAlign.End)
+          }
+          //组图
+          if (this.item?.objectType === '9') {
+            Row() {
+              Image($r('app.media.card_image'))
+                .width(14)
+                .height(14)
+                .objectFit(ImageFit.Contain)
+              Text(this.item?.photoNum.toString())
+                .fontColor(Color.White)
+                .fontSize($r('app.float.vp_12'))
+                .fontWeight(500)
+                .textAlign(TextAlign.End)
+                .lineHeight(18)
+                .textShadow({
+                  radius: 2,
+                  color: 'rgba(0,0,0,0.3)',
+                  offsetY: 2
+                })
+                .margin({
+                  right: 10,
+                  left: 3
+                })
+            }
+            .margin({
+              bottom: 3
+            })
+            .width(CommonConstants.FULL_PARENT)
+            .justifyContent(FlexAlign.End)
+          }
         }.margin({ left: 16, right: 16 })
         }.margin({ left: 16, right: 16 })
       }
       }
       if (this.item?.newsSummary) {
       if (this.item?.newsSummary) {
@@ -483,14 +542,14 @@ export struct PaperSingleColumn999CardView {
       if (this.item) {
       if (this.item) {
         Row() {
         Row() {
           Row() {
           Row() {
-            if (this.item?.source.length > 0) {
-              Text(this.item?.source)
+            if (this.buildSourceString().length > 0) {
+              Text(this.buildSourceString())
                 .fontSize(12)
                 .fontSize(12)
                 .fontColor('#B0B0B0')
                 .fontColor('#B0B0B0')
                 .margin({ left: 16 })
                 .margin({ left: 16 })
 
 
               ///不显示时间或者不显示评论
               ///不显示时间或者不显示评论
-              if (this.getPublishTime().length > 0 || this.item.objectType != '2' && this.interactData && this.interactData.commentNum && Number(this.interactData.collectNum) > 0) {
+              if (this.getPublishTime().length > 0 || this.item.objectType != '2' && this.interactData && this.interactData.commentNum && Number(this.interactData.commentNum) > 0) {
                 Image($r('app.media.point'))
                 Image($r('app.media.point'))
                   .width(16)
                   .width(16)
                   .height(16)
                   .height(16)
@@ -502,7 +561,7 @@ export struct PaperSingleColumn999CardView {
               .fontSize(12)
               .fontSize(12)
               .fontColor('#B0B0B0')
               .fontColor('#B0B0B0')
               .margin({ left: this.item?.source.length > 0?0:16 })
               .margin({ left: this.item?.source.length > 0?0:16 })
-            if (this.item.objectType != '2' && this.interactData && this.interactData.commentNum && Number(this.interactData.collectNum) > 0) {
+            if (this.item.objectType != '2' && this.interactData && this.interactData.commentNum && Number(this.interactData.commentNum) > 0) {
               Text(this.interactData.commentNum + "评")
               Text(this.interactData.commentNum + "评")
                 .fontSize(12)
                 .fontSize(12)
                 .fontColor('#B0B0B0')
                 .fontColor('#B0B0B0')
@@ -555,5 +614,39 @@ export struct PaperSingleColumn999CardView {
     }
     }
   }
   }
 
 
+  buildLiveStateString(): string {
+    let contentString: string = ''
+    if (this.item.liveInfo.liveState === 'wait') {
+      contentString = '预约'
+    }else if(this.item.liveInfo.liveState === 'running'){
+      contentString = '直播中'
+    }else if(this.item.liveInfo.liveState === 'end'){
+      contentString = '回看'
+    }
+    return contentString;
+  }
+
+
 
 
+  buildLiveStateImage(): Resource | string {
+    let imageString: Resource | string = ''
+    if (this.item.liveInfo.liveState === 'wait') {
+      imageString = $r('app.media.card_wait')
+    }else if(this.item.liveInfo.liveState === 'running'){
+      imageString = $r('app.media.card_live')
+    }else if(this.item.liveInfo.liveState === 'end'){
+      imageString = $r('app.media.card_play')
+    }
+    return imageString;
+  }
+
+  buildSourceString(): string {
+    let contentString: string = ''
+    if (this.item?.rmhInfo?.rmhName.length > 0) {
+      contentString = this.item?.rmhInfo?.rmhName
+    }else if(this.item?.source.length > 0){
+      contentString = this.item?.source
+    }
+    return contentString;
+  }
 }
 }

@@ -40,12 +40,13 @@ struct MyCollectionListPage {
           TrackingButton.click('morning_evening_news_click',TrackConstants.PageName.My_Collect,TrackConstants.PageName.My_Collect)
           TrackingButton.click('morning_evening_news_click',TrackConstants.PageName.My_Collect,TrackConstants.PageName.My_Collect)
         }
         }
       },
       },
-      titleShow:false,
-      tipValue: this.isAllSelect?'是否确认清空?':'确认删除'+this.deleteNum.toString()+'条收藏'
+      title:this.isAllSelect?'是否确认清空?':'确认删除'+this.deleteNum.toString()+'条收藏',
+      tipShow: false ,
+      leftTextColor:$r('app.color.color_648DF2'),
     }),
     }),
     autoCancel: true,
     autoCancel: true,
     alignment: DialogAlignment.Center,
     alignment: DialogAlignment.Center,
-    customStyle: true
+    customStyle: true,
   })
   })
 
 
   aboutToAppear(){
   aboutToAppear(){

@@ -36,7 +36,7 @@ struct PeopleShipHomePage {
   @Provide @Watch('handleChangeAttentionStata') isLoadingAttention: boolean = false
   @Provide @Watch('handleChangeAttentionStata') isLoadingAttention: boolean = false
   //关注显示
   //关注显示
   @State attentionOpacity: boolean = false
   @State attentionOpacity: boolean = false
-  @Provide topHeight: number = 286
+  @Provide topHeight: number = 214
   @State isLoading: boolean = true
   @State isLoading: boolean = true
   @State topSafeHeight: number = AppStorage.get<number>('topSafeHeight') || 0
   @State topSafeHeight: number = AppStorage.get<number>('topSafeHeight') || 0
 
 
@@ -123,13 +123,12 @@ struct PeopleShipHomePage {
             })
             })
           }
           }
 
 
-        }.expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.BOTTOM])
+        }
+        .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.BOTTOM])
         .alignItems(HorizontalAlign.Start)
         .alignItems(HorizontalAlign.Start)
         .justifyContent(FlexAlign.Start)
         .justifyContent(FlexAlign.Start)
         .width('100%')
         .width('100%')
-        // .height('100%')
       }
       }
-      // .height('100%')
       .width('100%')
       .width('100%')
 
 
   }
   }

@@ -627,7 +627,9 @@ export struct TopNavigationComponentNew {
         }else {
         }else {
           ToastUtils.showToast('暂无早晚报信息', 1000)
           ToastUtils.showToast('暂无早晚报信息', 1000)
         }
         }
-      }).catch()
+      }).catch((err:string) =>{
+        ToastUtils.showToast('暂无早晚报信息', 1000)
+      })
     } else {
     } else {
       ToastUtils.showToast('网络出小差了，请检查网络后重试', 1000)
       ToastUtils.showToast('网络出小差了，请检查网络后重试', 1000)
     }
     }

@@ -28,7 +28,7 @@ export struct PeopleShipHomePageTopComponent {
   @State collapseTxt: string = '…展开';
   @State collapseTxt: string = '…展开';
   private subTxt: string = '';
   private subTxt: string = '';
   @State content: string = ''
   @State content: string = ''
-  @State topFixedHeight: number = 286
+  @State topFixedHeight: number = 214
   @State lineInNum: number = 1
   @State lineInNum: number = 1
   @Link topHeight: number
   @Link topHeight: number
   @State provinceName: string = ''
   @State provinceName: string = ''
@@ -39,7 +39,7 @@ export struct PeopleShipHomePageTopComponent {
         // 顶部图片
         // 顶部图片
         Image($r('app.media.home_page_bg'))
         Image($r('app.media.home_page_bg'))
           .width('100%')
           .width('100%')
-          .height('120vp')
+          .height('48vp')
           .objectFit(ImageFit.Fill)
           .objectFit(ImageFit.Fill)
           .backgroundColor(Color.White)
           .backgroundColor(Color.White)
         // 头像和名称
         // 头像和名称
@@ -83,7 +83,7 @@ export struct PeopleShipHomePageTopComponent {
 
 
       }
       }
       .width('100%')
       .width('100%')
-      .height('180vp')
+      .height('108vp')
       .backgroundColor(Color.Transparent)
       .backgroundColor(Color.Transparent)
 
 
       // 认证id:1蓝2黄，蓝v 只有官方认证，黄v有领域和身份认证
       // 认证id:1蓝2黄，蓝v 只有官方认证，黄v有领域和身份认证
@@ -321,7 +321,7 @@ export struct PeopleShipHomePageTopComponent {
       }
       }
     }
     }
     if (this.detailModel) {
     if (this.detailModel) {
-      this.topFixedHeight = 286
+      this.topFixedHeight = 214
       if (this.detailModel.region && this.detailModel.region.length > 0) {
       if (this.detailModel.region && this.detailModel.region.length > 0) {
         this.provinceName = this.detailModel.region
         this.provinceName = this.detailModel.region
       } else {
       } else {