yangchenggong1_wd

fix:bug[17915] 评论消息后互动信息中显示的内容不一致

1 import { DateTimeUtils, StringUtils, ToastUtils } from 'wdKit/Index' 1 import { DateTimeUtils, StringUtils, ToastUtils } from 'wdKit/Index'
2 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index' 2 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index'
3 -import { WDMessageCenterMessageType } from '../../../model/InteractMessageModel' 3 +import { Remark, WDMessageCenterMessageType } from '../../../model/InteractMessageModel'
4 import MinePageDatasModel from '../../../model/MinePageDatasModel' 4 import MinePageDatasModel from '../../../model/MinePageDatasModel'
5 import { MessageItem } from '../../../viewmodel/MessageItem' 5 import { MessageItem } from '../../../viewmodel/MessageItem'
6 import { CustomPullToRefresh } from '../../reusable/CustomPullToRefresh' 6 import { CustomPullToRefresh } from '../../reusable/CustomPullToRefresh'
@@ -66,6 +66,24 @@ export struct MessageListUI { @@ -66,6 +66,24 @@ export struct MessageListUI {
66 if (value.activeInfo.title) { 66 if (value.activeInfo.title) {
67 item.desc = value.activeInfo.title.replace("null","") 67 item.desc = value.activeInfo.title.replace("null","")
68 } 68 }
  69 + let remark = JSON.parse(value.activeInfo.remark) as Remark
  70 + switch (value.activeInfo.contentType){
  71 + case "204":
  72 + item.desc = remark.userName + "关注了你"
  73 + break;
  74 + case "206":
  75 + item.desc = remark.userName +"赞了你的作品"
  76 + break;
  77 + case "207":
  78 + item.desc = remark.userName + "赞了你的评论"
  79 + break;
  80 + case "208":
  81 + item.desc = remark.userName + "评论了你的作品"
  82 + break;
  83 + case "209":
  84 + item.desc = remark.userName + "回复了你的评论"
  85 + break;
  86 + }
69 if (value.activeInfo.time) { 87 if (value.activeInfo.time) {
70 item.time = this.getPublishTime(value.subscribeInfo.time,DateTimeUtils.getDateTimestamp(value.activeInfo.time) + "") 88 item.time = this.getPublishTime(value.subscribeInfo.time,DateTimeUtils.getDateTimestamp(value.activeInfo.time) + "")
71 } 89 }
@@ -109,4 +109,5 @@ export class Remark{ @@ -109,4 +109,5 @@ export class Remark{
109 coverImageUrl:string = "" 109 coverImageUrl:string = ""
110 relationId:string = "" 110 relationId:string = ""
111 status:string = "" 111 status:string = ""
  112 + userName:string = ""
112 } 113 }
@@ -41,11 +41,23 @@ class SystemInfo{ @@ -41,11 +41,23 @@ class SystemInfo{
41 time: string = "" 41 time: string = ""
42 title: string = "" 42 title: string = ""
43 userId: number = -1 43 userId: number = -1
  44 + remark: string = ""
44 } 45 }
45 46
46 class ActiveInfo{ 47 class ActiveInfo{
47 - id:string = "" 48 + classify: string = ""
  49 + contentId: string = ""
  50 + contentType: string = ""
  51 + id: number = -1
48 message: string = "" 52 message: string = ""
  53 + platform: string = ""
  54 + privateMailId: number = -1
  55 + privateMailIds: string = ""
  56 + privateMailNum: number = -1
  57 + read: boolean = false
  58 + source: string = ""
49 time: string = "" 59 time: string = ""
50 title: string = "" 60 title: string = ""
  61 + userId: number = -1
  62 + remark: string = ""
51 } 63 }