diff --git a/ios-rongimdemo/RCDCreateGroupViewController.m b/ios-rongimdemo/RCDCreateGroupViewController.m index e5b6a8c9..53f24449 100644 --- a/ios-rongimdemo/RCDCreateGroupViewController.m +++ b/ios-rongimdemo/RCDCreateGroupViewController.m @@ -300,40 +300,46 @@ - (IBAction)ClickDoneBtn:(id)sender { .currentUserInfo.userId ImageData:data success:^(NSString *url) { - RCGroup *groupInfo = [RCGroup new]; - groupInfo.portraitUri = url; - groupInfo.groupId = groupId; - groupInfo.groupName = nameStr; - dispatch_async(dispatch_get_main_queue(), ^{ - [RCDHTTPTOOL - setGroupPortraitUri:url - groupId:groupId - complete:^(BOOL result) { - [[RCIM sharedRCIM] - refreshGroupInfoCache: - groupInfo - withGroupId: - groupId]; - if (result == YES) { - [self gotoChatView:groupInfo.groupId groupName:groupInfo.groupName]; - //关闭HUD - [hud hide:YES]; - [RCDHTTPTOOL getGroupByID:groupInfo.groupId - successCompletion:^(RCDGroupInfo *group) { - [[RCDataBaseManager shareInstance] insertGroupToDB:group]; - }]; - } - if (result == NO) { - self.navigationItem - .rightBarButtonItem - .enabled = - YES; //关闭HUD - [hud hide:YES]; - [self Alert:@"创建群组失败，请检查你的网络设置。"]; - } - }]; - }); - + if (url) { + RCGroup *groupInfo = [RCGroup new]; + groupInfo.portraitUri = url; + groupInfo.groupId = groupId; + groupInfo.groupName = nameStr; + dispatch_async(dispatch_get_main_queue(), ^{ + [RCDHTTPTOOL + setGroupPortraitUri:url + groupId:groupId + complete:^(BOOL result) { + [[RCIM sharedRCIM] + refreshGroupInfoCache: + groupInfo + withGroupId: + groupId]; + if (result == YES) { + [self gotoChatView:groupInfo.groupId groupName:groupInfo.groupName]; + //关闭HUD + [hud hide:YES]; + [RCDHTTPTOOL getGroupByID:groupInfo.groupId + successCompletion:^(RCDGroupInfo *group) { + [[RCDataBaseManager shareInstance] insertGroupToDB:group]; + }]; + } + if (result == NO) { + self.navigationItem + .rightBarButtonItem + .enabled = + YES; //关闭HUD + [hud hide:YES]; + [self Alert:@"创建群组失败，请检查你的网络设置。"]; + } + }]; + }); + }else{ + [self gotoChatView:groupId groupName:nameStr]; + //关闭HUD + [hud hide:YES]; + } + } failure:^(NSError *err) { self.navigationItem.rightBarButtonItem @@ -459,6 +465,7 @@ -(UIImage*)getSubImage:(UIImage *)originImage Rect:(CGRect)rect imageOrientation CGContextRef context = UIGraphicsGetCurrentContext(); CGContextDrawImage(context, smallBounds, subImageRef); UIImage* smallImage = [UIImage imageWithCGImage:subImageRef scale:1.f orientation:imageOrientation]; + CGImageRelease(subImageRef); UIGraphicsEndImageContext(); return smallImage; } diff --git a/ios-rongimdemo/RCDGroupSettingsTableViewController.m b/ios-rongimdemo/RCDGroupSettingsTableViewController.m index be47a8d5..d2f018d3 100644 --- a/ios-rongimdemo/RCDGroupSettingsTableViewController.m +++ b/ios-rongimdemo/RCDGroupSettingsTableViewController.m @@ -416,35 +416,47 @@ - (void)imagePickerController:(UIImagePickerController *)picker weakSelf.Group.portraitUri = url; [[RCIM sharedRCIM] refreshGroupInfoCache:groupInfo withGroupId:groupInfo.groupId]; - [RCDHTTPTOOL setGroupPortraitUri:url - groupId:weakSelf.Group.groupId - complete:^(BOOL result) { - if (result == YES) { - dispatch_async(dispatch_get_main_queue(), ^{ - RCDBaseSettingTableViewCell *cell = - (RCDBaseSettingTableViewCell *) - [self.tableView viewWithTag:1000]; - [cell.rightImageView sd_setImageWithURL:[NSURL URLWithString:self.Group.portraitUri]]; - //在修改群组头像成功后，更新本地数据库。 - [[RCDataBaseManager shareInstance] insertGroupToDB:self.Group]; -// cell.PortraitImg.image = image; - //关闭HUD - [hud hide:YES]; - }); - } - if (result == NO) { - //关闭HUD - [hud hide:YES]; - UIAlertView *alert = [[UIAlertView alloc] - initWithTitle:nil - message:@"上传头像失败" - delegate:self - cancelButtonTitle:@"确定" - otherButtonTitles:nil]; - [alert show]; - } - }]; - + if (url) { + [RCDHTTPTOOL setGroupPortraitUri:url + groupId:weakSelf.Group.groupId + complete:^(BOOL result) { + if (result == YES) { + dispatch_async(dispatch_get_main_queue(), ^{ + RCDBaseSettingTableViewCell *cell = + (RCDBaseSettingTableViewCell *) + [self.tableView viewWithTag:1000]; + [cell.rightImageView sd_setImageWithURL:[NSURL URLWithString:self.Group.portraitUri]]; + //在修改群组头像成功后，更新本地数据库。 + [[RCDataBaseManager shareInstance] insertGroupToDB:self.Group]; + // cell.PortraitImg.image = image; + //关闭HUD + [hud hide:YES]; + }); + } + if (result == NO) { + //关闭HUD + [hud hide:YES]; + UIAlertView *alert = [[UIAlertView alloc] + initWithTitle:nil + message:@"上传头像失败" + delegate:self + cancelButtonTitle:@"确定" + otherButtonTitles:nil]; + [alert show]; + } + }]; + + }else{ + //关闭HUD + [hud hide:YES]; + UIAlertView *alert = [[UIAlertView alloc] + initWithTitle:nil + message:@"上传头像失败" + delegate:self + cancelButtonTitle:@"确定" + otherButtonTitles:nil]; + [alert show]; + } } failure:^(NSError *err) { //关闭HUD @@ -474,6 +486,7 @@ -(UIImage*)getSubImage:(UIImage *)originImage Rect:(CGRect)rect imageOrientation CGContextRef context = UIGraphicsGetCurrentContext(); CGContextDrawImage(context, smallBounds, subImageRef); UIImage* smallImage = [UIImage imageWithCGImage:subImageRef scale:1.f orientation:imageOrientation]; + CGImageRelease(subImageRef); UIGraphicsEndImageContext(); return smallImage; } diff --git a/ios-rongimdemo/RCDHttpTool.m b/ios-rongimdemo/RCDHttpTool.m index 08232e1c..6e41f221 100644 --- a/ios-rongimdemo/RCDHttpTool.m +++ b/ios-rongimdemo/RCDHttpTool.m @@ -704,13 +704,32 @@ - (void)uploadImageToQiNiu:(NSString *)userId [AFHttpTool uploadFile:image userId:userId success:^(id response) { + NSString* imageUrl = nil; if ([response[@"key"] length] > 0) { NSString *key = response[@"key"]; NSString *QiNiuDomai = [DEFAULTS objectForKey:@"QiNiuDomain"]; - NSString *imageUrl = + imageUrl = [NSString stringWithFormat:@"http://%@/%@", QiNiuDomai, key]; - success(imageUrl); } + else{ + NSDictionary *downloadInfo = response[@"rc_url"]; + if (downloadInfo) { + NSString* fileInfo = downloadInfo[@"path"]; + if ([downloadInfo[@"type"] intValue] == 0) { + NSString *url = response[@"domain"]; + if ([url hasSuffix:@"/"]) { + url = [url substringToIndex:url.length - 1]; + } + if ([fileInfo hasPrefix:@"/"]) { + imageUrl = [url stringByAppendingString:fileInfo]; + } + else{ + imageUrl = [url stringByAppendingPathComponent:fileInfo]; + } + } + } + } + success(imageUrl); } failure:^(NSError *err) { failure(err); diff --git a/ios-rongimdemo/RCDSettingServerUrlViewController.m b/ios-rongimdemo/RCDSettingServerUrlViewController.m index 99e2858d..14ff289e 100644 --- a/ios-rongimdemo/RCDSettingServerUrlViewController.m +++ b/ios-rongimdemo/RCDSettingServerUrlViewController.m @@ -604,7 +604,7 @@ - (void)forgetPswEvent { - (IBAction)btnDoneClicked:(id)sender { if (![self checkContent]) return; - + RCNetworkStatus status = [[RCIMClient sharedRCIMClient] getCurrentNetworkStatus]; diff --git a/ios-rongimdemo/RCloudMessage/AFHttpTool.m b/ios-rongimdemo/RCloudMessage/AFHttpTool.m index 512885ab..2c40f421 100644 --- a/ios-rongimdemo/RCloudMessage/AFHttpTool.m +++ b/ios-rongimdemo/RCloudMessage/AFHttpTool.m @@ -353,6 +353,10 @@ + (void)uploadFile:(NSData *)fileData if ([response[@"code"] integerValue] == 200) { NSDictionary *result = response[@"result"]; NSString *defaultDomain = result[@"domain"]; + NSString *uploadUrl = result[@"upload_url"]; + if (uploadUrl.length > 0 && ![uploadUrl hasPrefix:@"http"]) { + uploadUrl = [NSString stringWithFormat:@"http://%@",uploadUrl]; + } [DEFAULTS setObject:defaultDomain forKey:@"QiNiuDomain"]; [DEFAULTS synchronize]; @@ -382,12 +386,17 @@ + (void)uploadFile:(NSData *)fileData NSMutableDictionary *ret = [NSMutableDictionary dictionary]; [params addEntriesFromDictionary:ret]; - NSString *url = @"https://up.qbox.me"; + NSString *url = uploadUrl.length > 0 ? uploadUrl : @"https://up.qbox.me"; NSData *imageData = fileData; AFHTTPRequestOperationManager *manager = [AFHTTPRequestOperationManager manager]; + if (uploadUrl.length > 0) { + NSMutableSet *contentTypes = [[NSMutableSet alloc] initWithSet:manager.responseSerializer.acceptableContentTypes]; + [contentTypes addObject:@"text/html"]; + manager.responseSerializer.acceptableContentTypes = [contentTypes copy]; + } [manager POST:url parameters:params constructingBodyWithBlock:^(id formData) { @@ -397,7 +406,15 @@ + (void)uploadFile:(NSData *)fileData mimeType:@"application/octet-stream"]; } success:^(AFHTTPRequestOperation *operation, id responseObject) { - success(responseObject); + if (uploadUrl.length > 0) { + NSMutableDictionary* responseDic = [[NSMutableDictionary alloc] initWithDictionary:responseObject]; + [responseDic setValue:defaultDomain forKey:@"domain"]; + success([responseDic copy]); + } + else{ + success(responseObject); + } + } failure:^(AFHTTPRequestOperation *operation, NSError *error) { NSLog(@"请求失败"); diff --git a/ios-rongimdemo/RCloudMessage/Info.plist b/ios-rongimdemo/RCloudMessage/Info.plist index c1ddfc56..097d215b 100644 --- a/ios-rongimdemo/RCloudMessage/Info.plist +++ b/ios-rongimdemo/RCloudMessage/Info.plist @@ -19,7 +19,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 2.8.10 Dev + 2.8.11 Stable CFBundleSignature ???? CFBundleURLTypes @@ -42,7 +42,7 @@ CFBundleVersion - 201704191439 + 201705091856 LSRequiresIPhoneOS NSAppTransportSecurity @@ -126,7 +126,7 @@ NSPhotoLibraryUsageDescription 访问相册 SealTalk Version - 1.2.0 + 1.2.1 UIBackgroundModes audio diff --git a/ios-rongimdemo/RCloudMessage/RCDChatViewController.m b/ios-rongimdemo/RCloudMessage/RCDChatViewController.m index 4064a8fb..26e08a65 100644 --- a/ios-rongimdemo/RCloudMessage/RCDChatViewController.m +++ b/ios-rongimdemo/RCloudMessage/RCDChatViewController.m @@ -65,7 +65,7 @@ - (void)viewWillAppear:(BOOL)animated { } [self refreshTitle]; - [self.chatSessionInputBarControl updateStatus:self.chatSessionInputBarControl.currentBottomBarStatus animated:NO]; +// [self.chatSessionInputBarControl updateStatus:self.chatSessionInputBarControl.currentBottomBarStatus animated:NO]; } - (void)viewWillDisappear:(BOOL)animated { diff --git a/ios-rongimdemo/RCloudMessage/RCDMeInfoTableViewController.m b/ios-rongimdemo/RCloudMessage/RCDMeInfoTableViewController.m index cd14b59a..6529b588 100644 --- a/ios-rongimdemo/RCloudMessage/RCDMeInfoTableViewController.m +++ b/ios-rongimdemo/RCloudMessage/RCDMeInfoTableViewController.m @@ -254,44 +254,55 @@ - (void)imagePickerController:(UIImagePickerController *)picker [RCDHTTPTOOL uploadImageToQiNiu:[RCIM sharedRCIM].currentUserInfo.userId ImageData:data success:^(NSString *url) { - [RCDHTTPTOOL - setUserPortraitUri:url - complete:^(BOOL result) { - if (result == YES) { - [RCIM sharedRCIM].currentUserInfo.portraitUri = url; - RCUserInfo *userInfo = - [RCIM sharedRCIM].currentUserInfo; - userInfo.portraitUri = url; - [DEFAULTS setObject:url forKey:@"userPortraitUri"]; - [DEFAULTS synchronize]; - [[RCIM sharedRCIM] - refreshUserInfoCache:userInfo - withUserId:[RCIM sharedRCIM] - .currentUserInfo.userId]; - [[RCDataBaseManager shareInstance] - insertUserToDB:userInfo]; - [[NSNotificationCenter defaultCenter] - postNotificationName:@"setCurrentUserPortrait" - object:image]; - dispatch_async(dispatch_get_main_queue(), ^{ - [self.tableView reloadData]; - //关闭HUD - [hud hide:YES]; - }); - } - if (result == NO) { - //关闭HUD - [hud hide:YES]; - UIAlertView *alert = [[UIAlertView alloc] - initWithTitle:nil - message:@"上传头像失败" - delegate:self - cancelButtonTitle:@"确定" - otherButtonTitles:nil]; - [alert show]; - } - }]; - + if (url) { + [RCDHTTPTOOL + setUserPortraitUri:url + complete:^(BOOL result) { + if (result == YES) { + [RCIM sharedRCIM].currentUserInfo.portraitUri = url; + RCUserInfo *userInfo = + [RCIM sharedRCIM].currentUserInfo; + userInfo.portraitUri = url; + [DEFAULTS setObject:url forKey:@"userPortraitUri"]; + [DEFAULTS synchronize]; + [[RCIM sharedRCIM] + refreshUserInfoCache:userInfo + withUserId:[RCIM sharedRCIM] + .currentUserInfo.userId]; + [[RCDataBaseManager shareInstance] + insertUserToDB:userInfo]; + [[NSNotificationCenter defaultCenter] + postNotificationName:@"setCurrentUserPortrait" + object:image]; + dispatch_async(dispatch_get_main_queue(), ^{ + [self.tableView reloadData]; + //关闭HUD + [hud hide:YES]; + }); + } + if (result == NO) { + //关闭HUD + [hud hide:YES]; + UIAlertView *alert = [[UIAlertView alloc] + initWithTitle:nil + message:@"上传头像失败" + delegate:self + cancelButtonTitle:@"确定" + otherButtonTitles:nil]; + [alert show]; + } + }]; + }else{ + //关闭HUD + [hud hide:YES]; + UIAlertView *alert = + [[UIAlertView alloc] initWithTitle:nil + message:@"上传头像失败" + delegate:self + cancelButtonTitle:@"确定" + otherButtonTitles:nil]; + [alert show]; + } } failure:^(NSError *err) { //关闭HUD @@ -315,6 +326,7 @@ -(UIImage*)getSubImage:(UIImage *)originImage Rect:(CGRect)rect imageOrientation CGContextRef context = UIGraphicsGetCurrentContext(); CGContextDrawImage(context, smallBounds, subImageRef); UIImage* smallImage = [UIImage imageWithCGImage:subImageRef scale:1.f orientation:imageOrientation]; + CGImageRelease(subImageRef); UIGraphicsEndImageContext(); return smallImage; } diff --git a/ios-rongimdemo/RCloudMessage/RCDMeTableViewController.m b/ios-rongimdemo/RCloudMessage/RCDMeTableViewController.m index 36ebefa6..00d20a5e 100644 --- a/ios-rongimdemo/RCloudMessage/RCDMeTableViewController.m +++ b/ios-rongimdemo/RCloudMessage/RCDMeTableViewController.m @@ -290,7 +290,6 @@ - (void)setUserPortrait:(NSNotification *)notifycation { - (void)chatWithCustomerService:(NSString *)kefuId { RCDCustomerServiceViewController *chatService = [[RCDCustomerServiceViewController alloc] init]; - // live800 KEFU146227005669524 live800的客服ID // zhichi KEFU146001495753714 智齿的客服ID chatService.conversationType = ConversationType_CUSTOMERSERVICE; diff --git a/ios-rongimdemo/framework/RongCallKit.framework/Info.plist b/ios-rongimdemo/framework/RongCallKit.framework/Info.plist index e242529b..a5f2048e 100644 Binary files a/ios-rongimdemo/framework/RongCallKit.framework/Info.plist and b/ios-rongimdemo/framework/RongCallKit.framework/Info.plist differ diff --git a/ios-rongimdemo/framework/RongCallKit.framework/RongCallKit b/ios-rongimdemo/framework/RongCallKit.framework/RongCallKit index 30e5a4dd..033e4f5b 100644 Binary files a/ios-rongimdemo/framework/RongCallKit.framework/RongCallKit and b/ios-rongimdemo/framework/RongCallKit.framework/RongCallKit differ diff --git a/ios-rongimdemo/framework/RongCallLib.framework/Info.plist b/ios-rongimdemo/framework/RongCallLib.framework/Info.plist index b53c660c..7c8144de 100644 Binary files a/ios-rongimdemo/framework/RongCallLib.framework/Info.plist and b/ios-rongimdemo/framework/RongCallLib.framework/Info.plist differ diff --git a/ios-rongimdemo/framework/RongCallLib.framework/RongCallLib b/ios-rongimdemo/framework/RongCallLib.framework/RongCallLib index 60f801d3..9666ca8a 100644 Binary files a/ios-rongimdemo/framework/RongCallLib.framework/RongCallLib and b/ios-rongimdemo/framework/RongCallLib.framework/RongCallLib differ diff --git a/ios-rongimdemo/framework/RongContactCard.framework/RongContactCard b/ios-rongimdemo/framework/RongContactCard.framework/RongContactCard index 7a8b3d3f..0eebfb1d 100644 Binary files a/ios-rongimdemo/framework/RongContactCard.framework/RongContactCard and b/ios-rongimdemo/framework/RongContactCard.framework/RongContactCard differ diff --git a/ios-rongimdemo/framework/RongIMKit.framework/Headers/RCChatSessionInputBarControl.h b/ios-rongimdemo/framework/RongIMKit.framework/Headers/RCChatSessionInputBarControl.h index ae43174b..63041799 100644 --- a/ios-rongimdemo/framework/RongIMKit.framework/Headers/RCChatSessionInputBarControl.h +++ b/ios-rongimdemo/framework/RongIMKit.framework/Headers/RCChatSessionInputBarControl.h @@ -505,6 +505,11 @@ __deprecated_msg("已废弃，请勿使用。"); */ - (void)recordDidBegin; +/*! + 取消录制语音消息 + */ +- (void)recordDidCancel; + /*! 结束录制语音消息 */ diff --git a/ios-rongimdemo/framework/RongIMKit.framework/Headers/RCConversationViewController.h b/ios-rongimdemo/framework/RongIMKit.framework/Headers/RCConversationViewController.h index 1e85aa2d..c47b8e70 100644 --- a/ios-rongimdemo/framework/RongIMKit.framework/Headers/RCConversationViewController.h +++ b/ios-rongimdemo/framework/RongIMKit.framework/Headers/RCConversationViewController.h @@ -700,6 +700,10 @@ __deprecated_msg("已废弃，请勿使用。"); */ - (void)onEndRecordEvent; +/*! + 取消录制语音消息的回调(不会再走 onEndRecordEvent) + */ +-(void)onCancelRecordEvent; /*! 是否开启语音消息连续播放 diff --git a/ios-rongimdemo/framework/RongIMKit.framework/Info.plist b/ios-rongimdemo/framework/RongIMKit.framework/Info.plist index a3896760..6d3e9cd9 100644 Binary files a/ios-rongimdemo/framework/RongIMKit.framework/Info.plist and b/ios-rongimdemo/framework/RongIMKit.framework/Info.plist differ diff --git a/ios-rongimdemo/framework/RongIMKit.framework/RongIMKit b/ios-rongimdemo/framework/RongIMKit.framework/RongIMKit index 59071233..6242746c 100644 Binary files a/ios-rongimdemo/framework/RongIMKit.framework/RongIMKit and b/ios-rongimdemo/framework/RongIMKit.framework/RongIMKit differ diff --git a/ios-rongimdemo/framework/RongIMLib.framework/Headers/RCChatRoomInfo.h b/ios-rongimdemo/framework/RongIMLib.framework/Headers/RCChatRoomInfo.h index b1310837..8c9d2a1f 100644 --- a/ios-rongimdemo/framework/RongIMLib.framework/Headers/RCChatRoomInfo.h +++ b/ios-rongimdemo/framework/RongIMLib.framework/Headers/RCChatRoomInfo.h @@ -29,7 +29,7 @@ @discussion 如果成员类型为RC_ChatRoom_Member_Asc，则为最早加入的成员列表，按成员加入时间升序排列； - 如果成员类型为RC_ChatRoom_Member_Desc，则为最晚加入的成员列表，按成员加入时间升序排列。 + 如果成员类型为RC_ChatRoom_Member_Desc，则为最晚加入的成员列表，按成员加入时间降序排列。 */ @property(nonatomic, strong) NSArray *memberInfoArray; diff --git a/ios-rongimdemo/framework/RongIMLib.framework/Headers/RCCustomerServiceConfig.h b/ios-rongimdemo/framework/RongIMLib.framework/Headers/RCCustomerServiceConfig.h index c12933c1..10052066 100644 --- a/ios-rongimdemo/framework/RongIMLib.framework/Headers/RCCustomerServiceConfig.h +++ b/ios-rongimdemo/framework/RongIMLib.framework/Headers/RCCustomerServiceConfig.h @@ -52,6 +52,7 @@ @property(nonatomic) int userTipTime; @property(nonatomic, strong) NSString *userTipWord; + /*! * 评价时机 */ diff --git a/ios-rongimdemo/framework/RongIMLib.framework/Headers/RCIMClient.h b/ios-rongimdemo/framework/RongIMLib.framework/Headers/RCIMClient.h index 49dc55ba..7787cd6c 100644 --- a/ios-rongimdemo/framework/RongIMLib.framework/Headers/RCIMClient.h +++ b/ios-rongimdemo/framework/RongIMLib.framework/Headers/RCIMClient.h @@ -673,6 +673,23 @@ __deprecated_msg("已废弃，请勿使用。"); targetId:(NSString *)targetId sentStatus:(RCSentStatus)sentStatus content:(RCMessageContent *)content; +/*! + 插入接收的消息 + + @param conversationType 会话类型 + @param targetId 目标会话ID + @param senderUserId 发送者ID + @param receivedStatus 接收状态 + @param content 消息的内容 + @return 插入的消息实体 + + @discussion 此方法不支持聊天室的会话类型。 + */ +- (RCMessage *)insertIncomingMessage:(RCConversationType)conversationType + targetId:(NSString *)targetId + senderUserId:(NSString *)senderUserId + receivedStatus:(RCReceivedStatus)receivedStatus + content:(RCMessageContent *)content; /*! 插入向外发送的、指定时间的消息 diff --git a/ios-rongimdemo/framework/RongIMLib.framework/Headers/RCStatusDefine.h b/ios-rongimdemo/framework/RongIMLib.framework/Headers/RCStatusDefine.h index 514e9118..866e532e 100644 --- a/ios-rongimdemo/framework/RongIMLib.framework/Headers/RCStatusDefine.h +++ b/ios-rongimdemo/framework/RongIMLib.framework/Headers/RCStatusDefine.h @@ -357,7 +357,11 @@ typedef NS_ENUM(NSInteger, RCErrorCode) { /*! push设置参数无效。 */ - RC_PUSHSETTING_PARAMETER_INVALID = 26001 + RC_PUSHSETTING_PARAMETER_INVALID = 26001, + /*! + 操作被禁止。 + */ + RC_OPERATION_BLOCKED = 20605 }; #pragma mark - 连接状态 diff --git a/ios-rongimdemo/framework/RongIMLib.framework/Info.plist b/ios-rongimdemo/framework/RongIMLib.framework/Info.plist index b9d884de..a5053e89 100644 Binary files a/ios-rongimdemo/framework/RongIMLib.framework/Info.plist and b/ios-rongimdemo/framework/RongIMLib.framework/Info.plist differ diff --git a/ios-rongimdemo/framework/RongIMLib.framework/RongIMLib b/ios-rongimdemo/framework/RongIMLib.framework/RongIMLib index fd0f3cc2..33520907 100644 Binary files a/ios-rongimdemo/framework/RongIMLib.framework/RongIMLib and b/ios-rongimdemo/framework/RongIMLib.framework/RongIMLib differ diff --git a/ios-rongimdemo/framework/RongiFlyKit.framework/Info.plist b/ios-rongimdemo/framework/RongiFlyKit.framework/Info.plist index f389024a..a050a8c3 100644 Binary files a/ios-rongimdemo/framework/RongiFlyKit.framework/Info.plist and b/ios-rongimdemo/framework/RongiFlyKit.framework/Info.plist differ diff --git a/ios-rongimdemo/framework/RongiFlyKit.framework/RongiFlyKit b/ios-rongimdemo/framework/RongiFlyKit.framework/RongiFlyKit index 533968a2..447f3122 100644 Binary files a/ios-rongimdemo/framework/RongiFlyKit.framework/RongiFlyKit and b/ios-rongimdemo/framework/RongiFlyKit.framework/RongiFlyKit differ diff --git "a/ios-rongimdemo/\350\236\215\344\272\221 Demo WatchKit App/Info.plist" "b/ios-rongimdemo/\350\236\215\344\272\221 Demo WatchKit App/Info.plist" index e3ae6c3a..43119b39 100644 --- "a/ios-rongimdemo/\350\236\215\344\272\221 Demo WatchKit App/Info.plist" +++ "b/ios-rongimdemo/\350\236\215\344\272\221 Demo WatchKit App/Info.plist" @@ -17,11 +17,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 2.8.10 Dev + 2.8.11 Stable CFBundleSignature ???? CFBundleVersion - 201704191439 + 201705091856 UISupportedInterfaceOrientations UIInterfaceOrientationPortrait diff --git "a/ios-rongimdemo/\350\236\215\344\272\221 Demo WatchKit Extension/Info.plist" "b/ios-rongimdemo/\350\236\215\344\272\221 Demo WatchKit Extension/Info.plist" index 96d48e46..10353412 100644 --- "a/ios-rongimdemo/\350\236\215\344\272\221 Demo WatchKit Extension/Info.plist" +++ "b/ios-rongimdemo/\350\236\215\344\272\221 Demo WatchKit Extension/Info.plist" @@ -17,11 +17,11 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 2.8.10 Dev + 2.8.11 Stable CFBundleSignature ???? CFBundleVersion - 201704191439 + 201705091856 NSExtension NSExtensionAttributes