fix: 消息页面夜间模式异常 issues #309 | 包含撤回消息时显示异常

lib/http/msg.dart

@@ -70,10 +70,14 @@ class MsgHttp {
     });
     var res = await Request().get(Api.sessionMsg, data: params);
     if (res.data['code'] == 0) {
+      try {
         return {
           'status': true,
           'data': SessionMsgDataModel.fromJson(res.data['data']),
         };
+      } catch (err) {
+        print(err);
+      }
     } else {
       return {
         'status': false,

lib/models/msg/session.dart

@@ -199,7 +199,7 @@ class MessageItem {
   int? receiverType;
   int? receiverId;
   int? msgType;
-  Map? content;
+  dynamic content;
   int? msgSeqno;
   int? timestamp;
   List? atUids;
@@ -212,7 +212,7 @@ class MessageItem {
     senderUid = json['sender_uid'];
     receiverType = json['receiver_type'];
     receiverId = json['receiver_id'];
-    // 1 文本 2 图片 18 系统提示 10 系统通知
+    // 1 文本 2 图片 18 系统提示 10 系统通知  5 撤回的消息
     msgType = json['msg_type'];
     content = jsonDecode(json['content']);
     msgSeqno = json['msg_seqno'];

lib/pages/whisperDetail/view.dart

@@ -93,6 +93,9 @@ class _WhisperDetailPageState extends State<WhisperDetailPage> {
         future: _futureBuilderFuture,
         builder: (context, snapshot) {
           if (snapshot.connectionState == ConnectionState.done) {
+            if (snapshot.data == null) {
+              return const SizedBox();
+            }
             Map data = snapshot.data as Map;
             if (data['status']) {
               List messageList = _whisperDetailController.messageList;
@@ -138,7 +141,6 @@ class _WhisperDetailPageState extends State<WhisperDetailPage> {
           bottom: MediaQuery.of(context).padding.bottom,
         ),
         decoration: BoxDecoration(
-          color: Colors.white,
           border: Border(
             top: BorderSide(
               width: 4,

lib/pages/whisperDetail/widget/chat_item.dart

@@ -15,21 +15,24 @@ class ChatItem extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     bool isOwner = item.senderUid == 17340771;
-    bool isPic = item.msgType == 2;
+    bool isPic = item.msgType == 2; // 图片
-    bool isText = item.msgType == 1;
+    bool isText = item.msgType == 1; // 文本
-    bool isAchive = item.msgType == 11;
+    bool isAchive = item.msgType == 11; // 投稿
-    bool isArticle = item.msgType == 12;
+    bool isArticle = item.msgType == 12; // 专栏
+    bool isRevoke = item.msgType == 5; // 撤回消息
 
     bool isSystem =
         item.msgType == 18 || item.msgType == 10 || item.msgType == 13;
     int msgType = item.msgType;
-    Map content = item.content ?? '';
+    dynamic content = item.content ?? '';
     return isSystem
         ? (msgType == 10
             ? SystemNotice(item: item)
             : msgType == 13
                 ? SystemNotice2(item: item)
                 : const SizedBox())
+        : isRevoke
+            ? const SizedBox()
             : Row(
                 children: [
                   if (!isOwner) const SizedBox(width: 12),
@@ -66,7 +69,9 @@ class ChatItem extends StatelessWidget {
                                 content['content'],
                                 style: TextStyle(
                                     color: isOwner
-                                    ? Theme.of(context).colorScheme.onPrimary
+                                        ? Theme.of(context)
+                                            .colorScheme
+                                            .onPrimary
                                         : Theme.of(context)
                                             .colorScheme
                                             .onSecondaryContainer),
@@ -74,15 +79,22 @@ class ChatItem extends StatelessWidget {
                             : isPic
                                 ? NetworkImgLayer(
                                     width: 220,
-                                height:
+                                    height: 220 *
-                                    220 * content['height'] / content['width'],
+                                        content['height'] /
+                                        content['width'],
                                     src: content['url'],
                                   )
                                 : const SizedBox(),
                         SizedBox(height: isPic ? 7 : 2),
+                        Row(
+                          mainAxisSize: MainAxisSize.min,
+                          children: [
                             Text(
                               Utils.dateFormat(item.timestamp),
-                      style: Theme.of(context).textTheme.labelSmall!.copyWith(
+                              style: Theme.of(context)
+                                  .textTheme
+                                  .labelSmall!
+                                  .copyWith(
                                       color: isOwner
                                           ? Theme.of(context)
                                               .colorScheme
@@ -92,6 +104,15 @@ class ChatItem extends StatelessWidget {
                                               .colorScheme
                                               .onSecondaryContainer
                                               .withOpacity(0.8)),
+                            ),
+                            item.msgStatus == 1
+                                ? Text(
+                                    '  已撤回',
+                                    style:
+                                        Theme.of(context).textTheme.labelSmall!,
+                                  )
+                                : const SizedBox()
+                          ],
                         )
                       ],
                     ),