Skip to content

Commit

Permalink
Merge pull request #176 from lixm1988/main
Browse files Browse the repository at this point in the history
update version
  • Loading branch information
lixm1988 authored Apr 25, 2023
2 parents 562aa88 + 2d67cb3 commit d66d3b4
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 13 deletions.
4 changes: 2 additions & 2 deletions EaseIMKit.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'EaseIMKit'
s.version = '4.0.1'
s.version = '4.0.2'
s.summary = 'easemob im sdk UIKit'
s.homepage = 'http://docs-im.easemob.com/im/ios/other/easeimkit'
s.description = <<-DESC
Expand All @@ -12,7 +12,7 @@ Pod::Spec.new do |s|
DESC
s.license = { :type => 'MIT', :file => 'LICENSE' }
s.author = { 'easemob' => 'dev@easemob.com' }
s.source = { :git => 'https://github.com/easemob/easeui_ios.git', :tag => 'EaseIMKit_4.0.1'}
s.source = { :git => 'https://github.com/easemob/easeui_ios.git', :tag => 'EaseIMKit_4.0.2'}
s.frameworks = 'UIKit'
s.libraries = 'stdc++'
s.ios.deployment_target = '11.0'
Expand Down
19 changes: 8 additions & 11 deletions EaseIMKit/EaseIMKit/Classes/Chat/EaseChatViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -465,13 +465,6 @@ - (void)messageCellDidLongPress:(UITableViewCell *)aCell cgPoint:(CGPoint)point
NSUInteger index = [weakself.messageList indexOfObject:deleteMsg];
if (index != -1) {
[weakself.messageList removeObject:deleteMsg];
if ([deleteMsg.messageId isEqualToString:weakself.moreMsgId]) {
if ([weakself.messageList count] > 0) {
weakself.moreMsgId = weakself.messageList[0].messageId;
} else {
weakself.moreMsgId = @"";
}
}
}
}
}];
Expand Down Expand Up @@ -845,7 +838,6 @@ - (void)refreshTableViewWithData:(NSArray<EMChatMessage *> *)messages isInsertBo
} else {
[weakself.messageList insertObjects:tempMsgs atIndexes:[NSIndexSet indexSetWithIndexesInRange:NSMakeRange(0, [tempMsgs count])]];
EMChatMessage *msg = tempMsgs[0];
weakself.moreMsgId = msg.messageId;
}

dispatch_async(self.msgQueue, ^{
Expand Down Expand Up @@ -959,9 +951,6 @@ - (void)sendMsgimpl:(EMChatMessage *)message
NSArray *formated = [self formatMessages:@[message]];
[self.dataArray addObjectsFromArray:formated];
[self.messageList addObject:message];
if (!self.moreMsgId)
//新会话的第一条消息
self.moreMsgId = message.messageId;

[weakself refreshTableView:YES];

Expand Down Expand Up @@ -1058,4 +1047,12 @@ - (NSMutableArray *)dataArray {
return _messageList;
}

- (NSString *)moreMsgId
{
if (self.messageList.count > 0 ) {
return self.messageList[0].messageId;
}
return @"";
}

@end

0 comments on commit d66d3b4

Please sign in to comment.