Merge remote-tracking branch 'origin/main'

@@ -16,7 +16,7 @@ export struct MessageListUI {
 
   aboutToAppear() {
     this.msgData = MinePageDatasModel.getMessageData()
-    this.getHistoryPush()
+    // this.getHistoryPush()
     this.getMessagePush()
   }
 
@@ -58,19 +58,7 @@ export struct MessageListUI {
           if(value.subscribeCount > 0){
             item.unReadCount = value.subscribeCount
           }
-        } else if (item.title == "系统消息") {
-          if (value.systemInfo != null) {
-            if (value.systemInfo.title) {
-              item.desc = value.systemInfo.title
-            }
-            if (value.systemInfo.time) {
-              item.time = this.getPublishTime(value.subscribeInfo.time,DateTimeUtils.getDateTimestamp(value.systemInfo.time) + "")
-            }
-          }
-          if(value.systemCount > 0){
-            item.unReadCount = value.systemCount
-          }
-        }else if(item.title == "互动消息"){
+        } else if(item.title == "互动消息"){
           if(value.activeCount > 0){
             item.unReadCount = value.activeCount
           }
@@ -82,7 +70,19 @@ export struct MessageListUI {
               item.time = this.getPublishTime(value.subscribeInfo.time,DateTimeUtils.getDateTimestamp(value.activeInfo.time) + "")
             }
           }
-        }
+        }/*else if (item.title == "系统消息") {
+          if (value.systemInfo != null) {
+            if (value.systemInfo.title) {
+              item.desc = value.systemInfo.title
+            }
+            if (value.systemInfo.time) {
+              item.time = this.getPublishTime(value.subscribeInfo.time,DateTimeUtils.getDateTimestamp(value.systemInfo.time) + "")
+            }
+          }
+          if(value.systemCount > 0){
+            item.unReadCount = value.systemCount
+          }
+        }*/
       })
     }).catch((err: Error) => {
       console.log(TAG, JSON.stringify(err))

@@ -62,7 +62,7 @@ export struct MinePageComponent {
   getMessageData(){
     MinePageDatasModel.getMessageUnReadData().then((value) => {
       if(value !=null) {
-        if(value.activeCount >0 ||value.subscribeCount > 0 || value.systemCount > 0){
+        if(value.activeCount >0 ||value.subscribeCount > 0 /*|| value.systemCount > 0*/){
           this.personalData.forEach((value) => {
             if(value.msg == "消息")
               value.isShowRedPoint = true

@@ -112,13 +112,13 @@ class MinePageDatasModel{
    * 包含名字和图标
    */
   getMessageData():MessageItem[]{
-    if(this.messageData.length === 4){
+    if(this.messageData.length === 2){
       return this.messageData
     }
     this.messageData.push(new MessageItem($r('app.media.msg_interact'),"互动消息","",""))
     this.messageData.push(new MessageItem($r('app.media.msg_reserve'),"预约消息","",""))
-    this.messageData.push(new MessageItem($r('app.media.msg_history'),"历史推送","",""))
-    this.messageData.push(new MessageItem($r('app.media.msg_system'),"系统消息","",""))
+    // this.messageData.push(new MessageItem($r('app.media.msg_history'),"历史推送","",""))
+    // this.messageData.push(new MessageItem($r('app.media.msg_system'),"系统消息","",""))
     return this.messageData
   }