Merge remote-tracking branch 'origin/main'

@@ -84,7 +84,7 @@ export struct ENewspaperPageComponent {
       selectDate: this.selectDate,
       onDateChange: (date: RMCalendarBean) => {
         console.log("onDateChange-日历选择弹框", "date：", JSON.stringify(date))
-        if (date.fullYear && date.month && date.date) {
+        if (date?.fullYear && date?.month && date?.date) {
           let month: number = date.month + 1
           this.calendarDate =
             `${date.fullYear}-${month > 9 ? month : '0' + month}-${date.date > 9 ? date.date : '0' + date.date}`
@@ -94,14 +94,16 @@ export struct ENewspaperPageComponent {
             new Date(date.fullYear ? date.fullYear : 0, date.month ? date.month : 0, date.date ? date.date : 0)
         }
         //日历选择点击
-        TrackingContent.clickWithEvent('date_selection_click', TrackConstants.PageName.NewsPaperPage,
-          TrackConstants.PageName.NewsPaperPage
-          , {
-            'panelNumber': this.newspaperListBean?.list[this.swiperIndex].pageNum,
-            'panelName': this.newspaperListBean?.list[this.swiperIndex].pageName,
-            'currentPanelDate': this.selectDate.toDateString(),
-            'currentNumber': this.swiperIndex,
-          })
+        if (this.newspaperListBean?.list) {
+          TrackingContent.clickWithEvent('date_selection_click', TrackConstants.PageName.NewsPaperPage,
+            TrackConstants.PageName.NewsPaperPage
+            , {
+              'panelNumber': this.newspaperListBean?.list[this.swiperIndex].pageNum,
+              'panelName': this.newspaperListBean?.list[this.swiperIndex].pageName,
+              'currentPanelDate': this.selectDate.toDateString(),
+              'currentNumber': this.swiperIndex,
+            })
+        }
       }
     }),
     alignment: DialogAlignment.Top,

@@ -22,7 +22,7 @@ export  struct InteractMComponent {
 
       Column(){
         Row(){
-          Text(this.messageModel.InteractMsubM.userName)
+          Text(this.messageModel.InteractMsubM?.userName)
             .fontSize('14fp').fontColor('#222222')
 
           Text(this.buildContentString())
@@ -30,7 +30,7 @@ export  struct InteractMComponent {
             .margin({left:5})
         }.width('100%')
 
-        Text(this.getPublishTime(this.messageModel.time,DateTimeUtils.getDateTimestamp(this.messageModel.time)+""))
+        Text(this.messageModel.time?this.getPublishTime(this.messageModel.time,DateTimeUtils.getDateTimestamp(this.messageModel.time)+""):'')
           .margin({top:2})
           .fontSize('12fp').fontColor('#B0B0B0').margin({top:10,bottom:10})
 
@@ -59,7 +59,7 @@ export  struct InteractMComponent {
               Image($r('app.media.MessageOriginTextIcon'))
                 .width('12')
                 .height('12')
-              Text(this.messageModel.InteractMsubM.contentTitle)
+              Text(this.messageModel.InteractMsubM?.contentTitle)
                 .fontSize('12fp')
                 .fontColor('#666666')
                 .maxLines(1)

@@ -560,7 +560,7 @@ export struct PaperSingleColumn999CardView {
         Row() {
           Row() {
             
-            if (this.item.corner.length > 0){
+            if (this.item?.corner?.length > 0){
               Text(this.item.corner)
                 .fontSize(12)
                 .fontColor('#ED2800')
@@ -571,7 +571,7 @@ export struct PaperSingleColumn999CardView {
               Text(this.buildSourceString())
                 .fontSize(12)
                 .fontColor('#B0B0B0')
-                .margin({ left: this.item.corner.length > 0?10:16 })
+                .margin({ left: this.item?.corner?.length > 0?10:16 })
 
               ///不显示时间或者不显示评论
               if (this.getPublishTime().length > 0 || this.item.objectType != '2' && this.interactData && this.interactData.commentNum && Number(this.interactData.commentNum) > 0) {

@@ -60,9 +60,10 @@ export class LiveDetailPageLogic {
 
      // 垫图资源
     if (this.contentDetailData.liveInfo){
-
-      if(this.contentDetailData.liveInfo.padImageUri.length > 0){
-        this.padImageUri =this.contentDetailData.liveInfo.padImageUri
+      if(this.contentDetailData.liveInfo.padImageUri) {
+        if(this.contentDetailData.liveInfo.padImageUri.length > 0){
+          this.padImageUri =this.contentDetailData.liveInfo.padImageUri
+        }
       }
       //this.padImageUri = 'https://uatjdcdnphoto.aikan.pdnews.cn/sjbj-20240515/image/display/cdb84fe86b1440d58f3fc585841b928d.jpg'