Skip to content

Commit 41ac8ae

Browse files
xhpxhp
committed
Merge branch 'master' of github.com:reactnativecomponent/react-native-netease-im
2 parents a95b47b + 9feb7f8 commit 41ac8ae

File tree

2 files changed

+57
-50
lines changed

2 files changed

+57
-50
lines changed

‎ios/RNNeteaseIm/RNNeteaseIm.xcodeproj/project.xcworkspace/xcuserdata/Dowin.xcuserdatad/UserInterfaceState.xcuserstate‎

250 Bytes
Binary file not shown.

‎ios/RNNeteaseIm/RNNeteaseIm/RNNeteaseIm.m‎

Lines changed: 57 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ - (dispatch_queue_t)methodQueue
2525
//请将 NIMMyAccount 以及 NIMMyToken 替换成您自己提交到此App下的账号和密码
2626
[[NIMSDK sharedSDK].loginManager login:account token:token completion:^(NSError *error) {
2727
if (!error) {
28-
28+
2929
[self setSendState];
3030
[[NIMViewController initWithController] addDelegate];
3131
[[RNNotificationCenter sharedCenter] start];
@@ -57,17 +57,17 @@ - (dispatch_queue_t)methodQueue
5757
//回调最近聊天列表
5858
RCT_EXPORT_METHOD(getRecentContactList:(RCTPromiseResolveBlock)resolve
5959
reject:(RCTPromiseRejectBlock)reject){
60-
[[NIMViewController initWithController]getRecentContactListsuccess:^(id param) {
61-
resolve(param);
62-
} andError:^(NSString *error) {
63-
reject(@"-1",error,nil);
64-
}];
60+
[[NIMViewController initWithController]getRecentContactListsuccess:^(id param) {
61+
resolve(param);
62+
} andError:^(NSString *error) {
63+
reject(@"-1",error,nil);
64+
}];
6565

6666
}
6767
////清空聊天记录
6868
//RCT_EXPORT_METHOD(clearMessage:(nonnull NSString *)sessionId type:(nonnull NSString *)type){
6969
// [[ConversationViewController initWithConversationViewController] clearMsg:sessionId type:type];
70-
//
70+
//
7171
//}
7272
//获取本地用户资料
7373
RCT_EXPORT_METHOD(getUserInfo:(nonnull NSString * )contactId resolve:(RCTPromiseResolveBlock)resolve
@@ -123,13 +123,13 @@ - (dispatch_queue_t)methodQueue
123123
[[NoticeViewController initWithNoticeViewController]onAccept:targetId timestamp:timestamp sucess:^(id param) {
124124
resolve(param);
125125
} error:^(id erro) {
126-
reject(@"-1",erro, nil);
126+
reject(@"-1",erro, nil);
127127
}];
128128
}else{
129-
[[NoticeViewController initWithNoticeViewController]onRefuse:targetId timestamp:timestamp sucess:^(id param) {
129+
[[NoticeViewController initWithNoticeViewController]onRefuse:targetId timestamp:timestamp sucess:^(id param) {
130130
resolve(param);
131131
} error:^(id erro) {
132-
reject(@"-1",erro, nil);
132+
reject(@"-1",erro, nil);
133133
}];
134134
}
135135
}
@@ -203,27 +203,27 @@ - (dispatch_queue_t)methodQueue
203203
}
204204
//获取远程群资料
205205
RCT_EXPORT_METHOD(fetchTeamInfo:(nonnull NSString *)teamId resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject){
206-
[[TeamViewController initWithTeamViewController]fetchTeamInfo:teamId Succ:^(id param) {
207-
resolve(param);
208-
} Err:^(id erro) {
209-
reject(@"-1",erro,nil);
210-
}];
206+
[[TeamViewController initWithTeamViewController]fetchTeamInfo:teamId Succ:^(id param) {
207+
resolve(param);
208+
} Err:^(id erro) {
209+
reject(@"-1",erro,nil);
210+
}];
211211
}
212212
//获取群成员
213213
RCT_EXPORT_METHOD(fetchTeamMemberList:(nonnull NSString *)teamId resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject){
214-
[[TeamViewController initWithTeamViewController] getTeamMemberList:teamId Succ:^(id param) {
215-
resolve(param);
216-
} Err:^(id erro) {
217-
reject(@"-1",erro,nil);
218-
}];
214+
[[TeamViewController initWithTeamViewController] getTeamMemberList:teamId Succ:^(id param) {
215+
resolve(param);
216+
} Err:^(id erro) {
217+
reject(@"-1",erro,nil);
218+
}];
219219
}
220220
//开启/关闭群组消息提醒
221221
RCT_EXPORT_METHOD(setTeamNotify:(nonnull NSString *)teamId needNotify:(nonnull NSString *)needNotify resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject){
222-
[[TeamViewController initWithTeamViewController]muteTeam:teamId mute:needNotify Succ:^(id param) {
223-
resolve(param);
224-
} Err:^(id erro) {
225-
reject(@"-1",erro,nil);
226-
}];
222+
[[TeamViewController initWithTeamViewController]muteTeam:teamId mute:needNotify Succ:^(id param) {
223+
resolve(param);
224+
} Err:^(id erro) {
225+
reject(@"-1",erro,nil);
226+
}];
227227
}
228228
//好友消息提醒开关
229229
RCT_EXPORT_METHOD(setMessageNotify:(nonnull NSString *)contactId needNotify:(nonnull NSString *)needNotify resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject){
@@ -243,11 +243,11 @@ - (dispatch_queue_t)methodQueue
243243
}
244244
//拉人入群
245245
RCT_EXPORT_METHOD(addMembers:(nonnull NSString *)teamId accounts:(nonnull NSArray *)accounts resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject){
246-
[[TeamViewController initWithTeamViewController] addMembers:teamId accounts:accounts Succ:^(id param) {
247-
resolve(param);
248-
} Err:^(id erro) {
249-
reject(@"-1",erro,nil);
250-
}];
246+
[[TeamViewController initWithTeamViewController] addMembers:teamId accounts:accounts Succ:^(id param) {
247+
resolve(param);
248+
} Err:^(id erro) {
249+
reject(@"-1",erro,nil);
250+
}];
251251
}
252252
//踢人出群
253253
RCT_EXPORT_METHOD(removeMember:(nonnull NSString *)teamId accounts:(nonnull NSArray *)count resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject){
@@ -321,7 +321,7 @@ - (dispatch_queue_t)methodQueue
321321
} err:^(id erro) {
322322
reject(@"-1",erro, nil);
323323
}];
324-
324+
325325
}
326326
//本地历史记录
327327
RCT_EXPORT_METHOD(queryMessageEx:(nonnull NSString *)sessionId sessionType:(nonnull NSString *)sessionType timeLong:(nonnull NSString *)timeLong direction:(nonnull NSString *)direction limit:(nonnull NSString *)limit asc:(BOOL)asc resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject){
@@ -331,15 +331,15 @@ - (dispatch_queue_t)methodQueue
331331
}
332332
//转发消息
333333
RCT_EXPORT_METHOD(sendForwardMessage:(nonnull NSString *)messageId sessionId:(nonnull NSString *)sessionId sessionType:(nonnull NSString *)sessionType content:(nonnull NSString *)content resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject){
334-
[[ConversationViewController initWithConversationViewController]forwardMessage:messageId sessionId:sessionId sessionType:sessionType content:content success:^(id param) {
335-
resolve(param);
336-
}];
334+
[[ConversationViewController initWithConversationViewController]forwardMessage:messageId sessionId:sessionId sessionType:sessionType content:content success:^(id param) {
335+
resolve(param);
336+
}];
337337
}
338338
//撤回消息
339339
RCT_EXPORT_METHOD(revokeMessage:(nonnull NSString *)messageId resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject){
340-
[[ConversationViewController initWithConversationViewController]revokeMessage:messageId success:^(id param) {
341-
resolve(param);
342-
}];
340+
[[ConversationViewController initWithConversationViewController]revokeMessage:messageId success:^(id param) {
341+
resolve(param);
342+
}];
343343
}
344344
//删除会话内容
345345
RCT_EXPORT_METHOD(deleteMessage:(nonnull NSString *)messageId){
@@ -427,7 +427,7 @@ - (dispatch_queue_t)methodQueue
427427

428428
//发送提醒消息
429429
RCT_EXPORT_METHOD(sendTipMessage:(nonnull NSString *)content){
430-
// [[ConversationViewController initWithConversationViewController]sendMessage:content];
430+
// [[ConversationViewController initWithConversationViewController]sendMessage:content];
431431
}
432432
//获取黑名单列表
433433
RCT_EXPORT_METHOD(startBlackList){
@@ -437,11 +437,11 @@ - (dispatch_queue_t)methodQueue
437437
}
438438
//添加黑名单
439439
RCT_EXPORT_METHOD(addToBlackList:(nonnull NSString *)contactId resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject){
440-
[[BankListViewController initWithBankListViewController]addToBlackList:contactId success:^(id param) {
441-
resolve(param);
442-
} Err:^(id erro) {
443-
reject(@"-1",erro, nil);
444-
}];
440+
[[BankListViewController initWithBankListViewController]addToBlackList:contactId success:^(id param) {
441+
resolve(param);
442+
} Err:^(id erro) {
443+
reject(@"-1",erro, nil);
444+
}];
445445
}
446446
//移出黑名单
447447
RCT_EXPORT_METHOD(removeFromBlackList:(nonnull NSString *)contactId resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject){
@@ -472,9 +472,12 @@ - (dispatch_queue_t)methodQueue
472472
CGFloat libSize = [self folderSizeAtPath:libCachePath];
473473

474474
NSString *tmpPath = NSTemporaryDirectory();
475-
CGFloat tmpSize = [self folderSizeAtPath:tmpPath];
475+
NSString *tmpNimPath = [tmpPath stringByAppendingPathComponent:@"NIM"];
476+
NSString *tmpPickPath = [tmpPath stringByAppendingPathComponent:@"react-native-image-crop-picker"];
477+
CGFloat tmpNimSize = [self folderSizeAtPath:tmpNimPath];
478+
CGFloat tmpPickSize = [self folderSizeAtPath:tmpPickPath];
476479

477-
NSString *allSize = [NSString stringWithFormat:@"%f",docSize+libSize+tmpSize];
480+
NSString *allSize = [NSString stringWithFormat:@"%f",docSize+libSize+tmpNimSize+tmpPickSize];
478481
NSLog(@"allSize:%@ documentPath:%@",allSize,documentPath);
479482
NSArray *events = @[allSize];
480483
resolve(events);
@@ -504,9 +507,13 @@ - (dispatch_queue_t)methodQueue
504507
[self deleteFilesWithPath:libCachePath andFiles:libFiles];
505508

506509
NSString *tmpPath = NSTemporaryDirectory();
507-
NSArray *tmpFiles = [[NSFileManager defaultManager] subpathsOfDirectoryAtPath:tmpPath error:nil];
508-
[self deleteFilesWithPath:tmpPath andFiles:tmpFiles];
509-
510+
NSString *tmpNimPath = [tmpPath stringByAppendingPathComponent:@"NIM"];
511+
NSString *tmpPickPath = [tmpPath stringByAppendingPathComponent:@"react-native-image-crop-picker"];
512+
NSArray *tmpNimFiles = [[NSFileManager defaultManager] subpathsOfDirectoryAtPath:tmpNimPath error:nil];
513+
[self deleteFilesWithPath:tmpNimPath andFiles:tmpNimFiles];
514+
NSArray *tmpPickFiles = [[NSFileManager defaultManager] subpathsOfDirectoryAtPath:tmpPickPath error:nil];
515+
[self deleteFilesWithPath:tmpPickPath andFiles:tmpPickFiles];
516+
510517
[self removAllRecentSessions];
511518
}
512519

@@ -548,7 +555,7 @@ - (float )folderSizeAtPath:(NSString*) folderPath{
548555
- (void)removAllRecentSessions{
549556
id<NIMConversationManager> manager = [[NIMSDK sharedSDK] conversationManager];
550557
[manager deleteAllMessages:YES];
551-
558+
552559
}
553560

554561

@@ -562,7 +569,7 @@ -(void)setSendState{
562569
break;
563570
case 1:
564571
//最近会话列表
565-
// [_bridge.eventDispatcher sendDeviceEventWithName:@"observeRecentContact" body:@{@"sessionList":param}];
572+
// [_bridge.eventDispatcher sendDeviceEventWithName:@"observeRecentContact" body:@{@"sessionList":param}];
566573
[_bridge.eventDispatcher sendDeviceEventWithName:@"observeRecentContact" body:(NSDictionary *)param];
567574
break;
568575
case 2:

0 commit comments

Comments
 (0)