From 06eacbb38f341978e2d46c4e7a09d3e9080fbe05 Mon Sep 17 00:00:00 2001
From: liyuhua <15626451870@163.com>
Date: Tue, 12 Dec 2023 11:53:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xcshareddata/xcschemes/xplan-ios.xcscheme      |  2 +-
 xplan-ios/Base/UI/Adbvertise/XPAdvertiseView.m     |  2 +-
 .../Message/View/Session/SessionViewController.m   |  6 +++++-
 .../View/SessionList/SessionListViewController.m   | 14 ++++++++++++--
 .../Mine/View/Friend/XPRoomMessageBubbleView.m     |  4 +++-
 .../View/Setting/View/XPRoomRoleViewController.m   |  2 +-
 6 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/xplan-ios.xcodeproj/xcshareddata/xcschemes/xplan-ios.xcscheme b/xplan-ios.xcodeproj/xcshareddata/xcschemes/xplan-ios.xcscheme
index 51c35fc3..670f098f 100644
--- a/xplan-ios.xcodeproj/xcshareddata/xcschemes/xplan-ios.xcscheme
+++ b/xplan-ios.xcodeproj/xcshareddata/xcschemes/xplan-ios.xcscheme
@@ -31,7 +31,7 @@
       </Testables>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Release"
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
diff --git a/xplan-ios/Base/UI/Adbvertise/XPAdvertiseView.m b/xplan-ios/Base/UI/Adbvertise/XPAdvertiseView.m
index 4706e717..41a77526 100644
--- a/xplan-ios/Base/UI/Adbvertise/XPAdvertiseView.m
+++ b/xplan-ios/Base/UI/Adbvertise/XPAdvertiseView.m
@@ -14,7 +14,7 @@
 ///Tool
 #import "UIImage+Utils.h"
 NSString *const adImageName = @"adImageName";
-NSString *const adUrl = @"adUrl";
+
 // 广告显示的时间
 static int const showtime = 3;
 
diff --git a/xplan-ios/Main/Message/View/Session/SessionViewController.m b/xplan-ios/Main/Message/View/Session/SessionViewController.m
index 6dee6f3f..24957641 100644
--- a/xplan-ios/Main/Message/View/Session/SessionViewController.m
+++ b/xplan-ios/Main/Message/View/Session/SessionViewController.m
@@ -645,7 +645,11 @@
     
     [[NIMSDK sharedSDK].conversationManager markAllMessagesReadInSession:self.session];
 }
-
+- (void)onRecvRevokeMessageNotification:(NIMRevokeMessageNotification *)notification{
+    
+  
+    [[NIMSDK sharedSDK].conversationManager deleteMessage:notification.message];
+}
 - (void)sendMessage:(NIMMessage *)message didCompleteWithError:(NSError *)error {
     if (message.session.sessionType != NIMSessionTypeP2P) {
         return;
diff --git a/xplan-ios/Main/Message/View/SessionList/SessionListViewController.m b/xplan-ios/Main/Message/View/SessionList/SessionListViewController.m
index d1fed1cd..93e88934 100644
--- a/xplan-ios/Main/Message/View/SessionList/SessionListViewController.m
+++ b/xplan-ios/Main/Message/View/SessionList/SessionListViewController.m
@@ -27,7 +27,7 @@ NSString * const kMessageShowReadDotKey = @"kMessageShowReadDotKey";
 
 #import <Masonry/Masonry.h>
 
-@interface SessionListViewController ()<UITableViewDataSource, UITableViewDelegate, NIMLoginManagerDelegate, NIMConversationManagerDelegate, XPSessionListHeadViewDelegate>
+@interface SessionListViewController ()<UITableViewDataSource, UITableViewDelegate, NIMLoginManagerDelegate, NIMConversationManagerDelegate, XPSessionListHeadViewDelegate,NIMChatManagerDelegate>
 
 @property (nonatomic, strong) XPSessionListHeadView *headView;
 /**
@@ -54,6 +54,7 @@ NSString * const kMessageShowReadDotKey = @"kMessageShowReadDotKey";
 - (void)dealloc {
     [[NIMSDK sharedSDK].conversationManager removeDelegate:self];
     [[NIMSDK sharedSDK].loginManager removeDelegate:self];
+    [[NIMSDK sharedSDK].chatManager removeDelegate:self];
 }
 
 - (BOOL)isHiddenNavBar {
@@ -98,6 +99,7 @@ NSString * const kMessageShowReadDotKey = @"kMessageShowReadDotKey";
         [self initDatas];
         [[NIMSDK sharedSDK].conversationManager addDelegate:self];
         [[NIMSDK sharedSDK].loginManager addDelegate:self];
+        [[NIMSDK sharedSDK].chatManager addDelegate:self];
 		///置顶会话同步
 		[[NIMSDKConfig sharedConfig] setShouldSyncStickTopSessionInfos:YES];
     }
@@ -293,7 +295,15 @@ NSString * const kMessageShowReadDotKey = @"kMessageShowReadDotKey";
     [self.sessionListView reloadData];
     [self setTabBarItemBadge:totalUnreadCount];
 }
-
+- (void)onRecvRevokeMessageNotification:(NIMRevokeMessageNotification *)notification{
+    for (NIMRecentSession *recent in self.recentSessions) {
+        if ([recent.session.sessionId isEqualToString:notification.session.sessionId]) {
+            id<NIMConversationManager> manager = [[NIMSDK sharedSDK] conversationManager];
+            [manager deleteRecentSession:recent];
+            break;
+        }
+    }
+}
 - (void)didUpdateRecentSession:(NIMRecentSession *)recentSession
               totalUnreadCount:(NSInteger)totalUnreadCount {
     if(self.openType != SessionListOpenTypeRoom && [[ClientConfig shareConfig].configInfo.officialMsgUids containsObject:recentSession.session.sessionId]) {
diff --git a/xplan-ios/Main/Mine/View/Friend/XPRoomMessageBubbleView.m b/xplan-ios/Main/Mine/View/Friend/XPRoomMessageBubbleView.m
index b2d6acbd..c53d03c0 100644
--- a/xplan-ios/Main/Mine/View/Friend/XPRoomMessageBubbleView.m
+++ b/xplan-ios/Main/Mine/View/Friend/XPRoomMessageBubbleView.m
@@ -72,7 +72,8 @@
 		self.avatarImageView.imageUrl = avatarUrl;
 		self.nickLabel.text = user.userInfo.nickName;
 		[self.nickLabel sizeToFit];
-		self.contentLabel.text = [NIMMessageUtils messageContent:session.lastMessage];
+//		self.contentLabel.text = [NIMMessageUtils messageContent:session.lastMessage];
+        self.contentLabel.text = @"收到一条新消息";
 	}
 }
 
@@ -103,6 +104,7 @@
 		_contentLabel = [[UILabel alloc] init];
 		_contentLabel.font = [UIFont systemFontOfSize:10];
 		_contentLabel.textColor = [ThemeColor mainTextColor];
+        _contentLabel.adjustsFontSizeToFitWidth = YES;
 	}
 	return _contentLabel;
 }
diff --git a/xplan-ios/Main/Room/View/Setting/View/XPRoomRoleViewController.m b/xplan-ios/Main/Room/View/Setting/View/XPRoomRoleViewController.m
index 895250c7..b34db0e8 100644
--- a/xplan-ios/Main/Room/View/Setting/View/XPRoomRoleViewController.m
+++ b/xplan-ios/Main/Room/View/Setting/View/XPRoomRoleViewController.m
@@ -157,7 +157,7 @@
             } roomUid:self.roomUid targetUid:member.userId opt:@"1" isSet:@(NO)];
         }else{
             NIMChatroomMemberUpdateRequest *request = [[NIMChatroomMemberUpdateRequest alloc]init];
-            request.roomId = self.roomUid;
+            request.roomId = self.roomId;
             request.userId = member.userId;
             request.enable = NO;
             [[NIMSDK sharedSDK].chatroomManager markMemberManager:request completion:^(NSError * _Nullable error) {