From 6b1f150b658993042418bcfb8edf6a0e653cff77 Mon Sep 17 00:00:00 2001
From: liyuhua <15626451870@163.com>
Date: Thu, 26 Oct 2023 16:53:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E5=B1=8F=E5=8D=A1=E9=A1=BF=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Tool/XPRoomMessageParser.m                | 44 ++++++++++++-------
 1 file changed, 27 insertions(+), 17 deletions(-)

diff --git a/YuMi/Modules/YMRoom/View/MessageContainerView/Tool/XPRoomMessageParser.m b/YuMi/Modules/YMRoom/View/MessageContainerView/Tool/XPRoomMessageParser.m
index f0f26a19..6bfbbdc0 100644
--- a/YuMi/Modules/YMRoom/View/MessageContainerView/Tool/XPRoomMessageParser.m
+++ b/YuMi/Modules/YMRoom/View/MessageContainerView/Tool/XPRoomMessageParser.m
@@ -79,15 +79,25 @@
             break;
         }
         case NIMMessageTypeTip:
-            return [self makeTipsAttribute:message messageInfo:messageInfo];
-            
+        {
+            XPMessageInfoModel *model = [self makeTipsAttribute:message messageInfo:messageInfo];
+            return model != nil ? model : [XPMessageInfoModel new];
+            break;
+        }
         case NIMMessageTypeNotification:
-            return [self makeNotificationAttribute:message messageInfo:messageInfo];
-			
+        {
+            XPMessageInfoModel *model = [self makeNotificationAttribute:message messageInfo:messageInfo];
+            return model != nil ? model : [XPMessageInfoModel new];
+            break;
+        }
 		case NIMMessageTypeCustom:
-			return [self makeCustomAttribute:message messageInfo:messageInfo];
+        {
+            XPMessageInfoModel *model = [self makeCustomAttribute:message messageInfo:messageInfo];
+            return model != nil ? model : [XPMessageInfoModel new];
+            break;
+        }
         default:
-            return nil;
+            return [XPMessageInfoModel new];
     }
 }
 
@@ -1205,18 +1215,18 @@
 		CGFloat scale = image.size.width / image.size.height;
 		imageView.bounds = CGRectMake(0, 0, 18 * scale, 18);
 	} else {
-		NSURL *imgUrl = [NSURL URLWithString:imageName];
-		UIImage *myImage = [UIImage imageWithData:[NSData dataWithContentsOfURL:imgUrl]];
-		if (myImage) {
-			CGFloat scale = myImage.size.width / myImage.size.height;
-			if (scale == 0) {
-				imageView.bounds = CGRectMake(0, 0, 60, 18);
-			}else {
-				imageView.bounds = CGRectMake(0, 0, 18* scale, 18);
-			}
-		} else {
+//		NSURL *imgUrl = [NSURL URLWithString:imageName];
+//		UIImage *myImage = [UIImage imageWithData:[NSData dataWithContentsOfURL:imgUrl]];
+//		if (myImage) {
+//			CGFloat scale = myImage.size.width / myImage.size.height;
+//			if (scale == 0) {
+//				imageView.bounds = CGRectMake(0, 0, 60, 18);
+//			}else {
+//				imageView.bounds = CGRectMake(0, 0, 18* scale, 18);
+//			}
+//		} else {
 			imageView.bounds = CGRectMake(0, 0, 60, 18);
-		}
+//		}
 	}
 	imageView.contentMode = UIViewContentModeScaleAspectFit;
 	// 铭牌文字