Skip to content

Commit 815c184

Browse files
committed
2.9.5
1 parent 1373587 commit 815c184

4 files changed

Lines changed: 23 additions & 11 deletions

File tree

NIMKit.podspec

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
Pod::Spec.new do |s|
22
s.name = 'NIMKit'
3-
s.version = '2.9.2'
4-
s.summary = 'Netease IM UI Kit'
3+
s.version = '2.9.5'
4+
s.summary = 'NetEase IM UI Kit'
55
s.homepage = 'http://netease.im'
6-
s.license = { :'type' => 'Copyright', :'text' => ' Copyright 2017 Netease '}
7-
s.authors = 'Netease IM Team'
8-
s.source = { :git => 'https://github.com/netease-im/NIM_iOS_UIKit.git', :tag => '2.9.2'}
6+
s.license = { :'type' => 'Copyright', :'text' => ' Copyright 2018 NetEase '}
7+
s.authors = 'NetEase IM Team'
8+
s.source = { :git => 'https://github.com/netease-im/NIM_iOS_UIKit.git', :tag => '2.9.5'}
99
s.platform = :ios, '8.0'
1010
s.frameworks = 'CoreText', 'SystemConfiguration', 'AVFoundation', 'CoreTelephony', 'AudioToolbox', 'CoreMedia' , 'VideoToolbox'
1111
s.libraries = 'sqlite3.0', 'z', 'c++'
1212
s.subspec 'Full' do |cs|
1313
cs.source_files = 'NIMKit/NIMKit/**/*.{h,m}'
1414
cs.dependency 'NIMKit/Core'
15-
cs.dependency 'NIMSDK', '~> 5.2.2'
15+
cs.dependency 'NIMSDK', '~> 5.3.0'
1616
end
1717

1818
s.subspec 'Lite' do |cs|
1919
cs.source_files = 'NIMKit/NIMKit/**/*.{h,m}'
2020
cs.dependency 'NIMKit/Core'
21-
cs.dependency 'NIMSDK_LITE', '~> 5.2.2'
21+
cs.dependency 'NIMSDK_LITE', '~> 5.3.0'
2222
end
2323

2424
s.subspec 'Core' do |os|

NIMKit/NIMKit/Classes/Sections/Session/Object/NIMSessionLayoutImpl.m

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,6 @@ - (void)adjustTableView
163163
visiableHeight = visiableHeight + self.tableView.contentSize.height + contentInsets.top + contentInsets.bottom;
164164
visiableHeight = MIN(visiableHeight, rect.size.height);
165165

166-
167-
168166
rect.origin.y = containerSafeHeight - visiableHeight - self.inputView.nim_height;
169167
rect.origin.y = rect.origin.y > 0? 0 : rect.origin.y;
170168

@@ -257,6 +255,12 @@ - (void)remove:(NSArray<NSIndexPath *> *)indexPaths
257255
[self.tableView beginUpdates];
258256
[self.tableView deleteRowsAtIndexPaths:indexPaths withRowAnimation:UITableViewRowAnimationNone];
259257
[self.tableView endUpdates];
258+
NSInteger row = [self.tableView numberOfRowsInSection:0] - 1;
259+
if (row > 0)
260+
{
261+
NSIndexPath *indexPath = [NSIndexPath indexPathForRow:row inSection:0];
262+
[self.tableView scrollToRowAtIndexPath:indexPath atScrollPosition:UITableViewScrollPositionBottom animated:YES];
263+
}
260264
}
261265

262266

NIMKit/NIMKit/Classes/Sections/Session/View/SessionContentView/NIMSessionFileTransContentView.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ - (void)refresh:(NIMMessageModel *)data{
6868

6969
self.sizeLabel.font = [[NIMKit sharedKit].config setting:data.message].font;
7070
long long size = fileObject.fileLength/1024;
71-
self.sizeLabel.text = [NSString stringWithFormat:@"%zdKB",size?: 1];
71+
self.sizeLabel.text = [NSString stringWithFormat:@"%lldKB",size?: 1LL];
7272
[self.sizeLabel sizeToFit];
7373

7474
if (self.model.message.deliveryState == NIMMessageDeliveryStateDelivering) {

NIMKit/NIMKit/Classes/Sections/Session/ViewController/NIMSessionViewController.m

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ - (NSString *)sessionTitle
215215
- (NSString *)sessionSubTitle{return @"";};
216216

217217
#pragma mark - NIMChatManagerDelegate
218-
218+
//开始发送
219219
- (void)willSendMessage:(NIMMessage *)message
220220
{
221221
id<NIMSessionInteractor> interactor = self.interactor;
@@ -229,6 +229,14 @@ - (void)willSendMessage:(NIMMessage *)message
229229
}
230230
}
231231

232+
//上传资源文件成功
233+
- (void)uploadAttachmentSuccess:(NSString *)urlString
234+
forMessage:(NIMMessage *)message
235+
{
236+
//如果需要使用富文本推送,可以在这里进行 message apns payload 的设置
237+
}
238+
239+
232240
//发送结果
233241
- (void)sendMessage:(NIMMessage *)message didCompleteWithError:(NSError *)error
234242
{

0 commit comments

Comments
 (0)