diff --git a/ios-rongimdemo/RCDContactSelectedTableViewController.m b/ios-rongimdemo/RCDContactSelectedTableViewController.m index c77c1427..e0e3d3e6 100644 --- a/ios-rongimdemo/RCDContactSelectedTableViewController.m +++ b/ios-rongimdemo/RCDContactSelectedTableViewController.m @@ -285,24 +285,13 @@ - (void)clickedDone:(id)sender { [self.navigationController pushViewController:chat animated:YES]; }); } else { - NSArray *indexPaths = [self.tableView indexPathsForSelectedRows]; // get seleted users NSMutableArray *seletedUsers = [NSMutableArray new]; NSMutableArray *seletedUsersId = [NSMutableArray new]; - for (NSIndexPath *indexPath in indexPaths) { - NSString *key = [self.allKeys objectAtIndex:indexPath.section]; - NSArray *arrayForKey = [self.allFriends objectForKey:key]; - RCDUserInfo *user = arrayForKey[indexPath.row]; - //转成RCDUserInfo - RCUserInfo *userInfo = [RCUserInfo new]; - userInfo.userId = user.userId; - userInfo.name = user.name; - userInfo.portraitUri = user.portraitUri; - [[RCIM sharedRCIM] refreshUserInfoCache:userInfo - withUserId:userInfo.userId]; + for (RCUserInfo *user in self.collectionViewResource) { [seletedUsersId addObject:user.userId]; - [seletedUsers addObject:userInfo]; } + seletedUsers = [self.collectionViewResource mutableCopy]; if (_selectUserList) { NSArray *userList = [NSArray arrayWithArray:seletedUsers]; _selectUserList(userList); @@ -927,7 +916,7 @@ - (void)searchBar:(UISearchBar *)searchBar } - (BOOL)searchBarShouldBeginEditing:(UISearchBar *)searchBar { - if ([self.searchField.text isEqualToString:@"搜索"]) { + if ([self.searchField.text isEqualToString:@"搜索"] || [self.searchField.text isEqualToString:@"Search"]) { self.searchField.leftView = nil; self.searchField.text = @""; } diff --git a/ios-rongimdemo/RCDCreateGroupViewController.m b/ios-rongimdemo/RCDCreateGroupViewController.m index 4e3579eb..e5b6a8c9 100644 --- a/ios-rongimdemo/RCDCreateGroupViewController.m +++ b/ios-rongimdemo/RCDCreateGroupViewController.m @@ -437,7 +437,7 @@ - (void)imagePickerController:(UIImagePickerController *)picker UIImage *originImage = [info objectForKey:UIImagePickerControllerOriginalImage]; CGRect captureRect = [[info objectForKey:UIImagePickerControllerCropRect] CGRectValue]; - UIImage *captureImage = [self getSubImage:originImage Rect:captureRect]; + UIImage *captureImage = [self getSubImage:originImage Rect:captureRect imageOrientation:originImage.imageOrientation]; UIImage *scaleImage = [self scaleImage:captureImage toScale:0.8]; data = UIImageJPEGRepresentation(scaleImage, 0.00001); @@ -450,7 +450,7 @@ - (void)imagePickerController:(UIImagePickerController *)picker }); } --(UIImage*)getSubImage:(UIImage *)originImage Rect:(CGRect)rect +-(UIImage*)getSubImage:(UIImage *)originImage Rect:(CGRect)rect imageOrientation:(UIImageOrientation)imageOrientation { CGImageRef subImageRef = CGImageCreateWithImageInRect(originImage.CGImage, rect); CGRect smallBounds = CGRectMake(0, 0, CGImageGetWidth(subImageRef), CGImageGetHeight(subImageRef)); @@ -458,9 +458,8 @@ -(UIImage*)getSubImage:(UIImage *)originImage Rect:(CGRect)rect UIGraphicsBeginImageContext(smallBounds.size); CGContextRef context = UIGraphicsGetCurrentContext(); CGContextDrawImage(context, smallBounds, subImageRef); - UIImage* smallImage = [UIImage imageWithCGImage:subImageRef]; + UIImage* smallImage = [UIImage imageWithCGImage:subImageRef scale:1.f orientation:imageOrientation]; UIGraphicsEndImageContext(); - return smallImage; } diff --git a/ios-rongimdemo/RCDGroupSettingsTableViewController.m b/ios-rongimdemo/RCDGroupSettingsTableViewController.m index 23e8c166..be47a8d5 100644 --- a/ios-rongimdemo/RCDGroupSettingsTableViewController.m +++ b/ios-rongimdemo/RCDGroupSettingsTableViewController.m @@ -392,7 +392,7 @@ - (void)imagePickerController:(UIImagePickerController *)picker UIImage *originImage = [info objectForKey:UIImagePickerControllerOriginalImage]; CGRect captureRect = [[info objectForKey:UIImagePickerControllerCropRect] CGRectValue]; - UIImage *captureImage = [self getSubImage:originImage Rect:captureRect]; + UIImage *captureImage = [self getSubImage:originImage Rect:captureRect imageOrientation:originImage.imageOrientation]; UIImage *scaleImage = [self scaleImage:captureImage toScale:0.8]; data = UIImageJPEGRepresentation(scaleImage, 0.00001); @@ -465,7 +465,7 @@ - (void)imagePickerController:(UIImagePickerController *)picker }); } --(UIImage*)getSubImage:(UIImage *)originImage Rect:(CGRect)rect +-(UIImage*)getSubImage:(UIImage *)originImage Rect:(CGRect)rect imageOrientation:(UIImageOrientation)imageOrientation { CGImageRef subImageRef = CGImageCreateWithImageInRect(originImage.CGImage, rect); CGRect smallBounds = CGRectMake(0, 0, CGImageGetWidth(subImageRef), CGImageGetHeight(subImageRef)); @@ -473,9 +473,8 @@ -(UIImage*)getSubImage:(UIImage *)originImage Rect:(CGRect)rect UIGraphicsBeginImageContext(smallBounds.size); CGContextRef context = UIGraphicsGetCurrentContext(); CGContextDrawImage(context, smallBounds, subImageRef); - UIImage* smallImage = [UIImage imageWithCGImage:subImageRef]; + UIImage* smallImage = [UIImage imageWithCGImage:subImageRef scale:1.f orientation:imageOrientation]; UIGraphicsEndImageContext(); - return smallImage; } @@ -894,7 +893,8 @@ - (void)collectionView:(UICollectionView *)collectionView contactSelectedVC.groupId = _Group.groupId; contactSelectedVC.isAllowsMultipleSelection = YES; NSMutableArray *membersId = [NSMutableArray new]; - for (id user in collectionViewResource) { + NSMutableArray *groupMemberList = [[RCDataBaseManager shareInstance] getGroupMember:_Group.groupId]; + for (id user in groupMemberList) { if ([user isKindOfClass:[RCUserInfo class]]) { NSString *userId = ((RCUserInfo*)user).userId; [membersId addObject:userId]; @@ -917,7 +917,7 @@ - (void)collectionView:(UICollectionView *)collectionView } contactSelectedVC.titleStr = @"移除成员"; NSMutableArray *members = [NSMutableArray new]; - for (id user in collectionViewResource) { + for (id user in groupMemberList) { if ([user isKindOfClass:[RCUserInfo class]]) { if (![((RCUserInfo *)user).userId isEqualToString:creatorId]) { [members addObject:user]; diff --git a/ios-rongimdemo/RCDSearchHistoryMessageController.m b/ios-rongimdemo/RCDSearchHistoryMessageController.m index d8bd70ca..89018254 100644 --- a/ios-rongimdemo/RCDSearchHistoryMessageController.m +++ b/ios-rongimdemo/RCDSearchHistoryMessageController.m @@ -122,7 +122,12 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath [[RCDChatViewController alloc] init]; _conversationVC.conversationType = model.conversationType; _conversationVC.targetId = model.targetId; - _conversationVC.userName = model.name; + if (model.conversationType == ConversationType_GROUP) { + RCDGroupInfo *groupInfo = [[RCDataBaseManager shareInstance] getGroupByGroupId:model.targetId]; + _conversationVC.title = groupInfo.groupName; + }else { + _conversationVC.title = model.name; + } int unreadCount = [[RCIMClient sharedRCIMClient] getUnreadCount:model.conversationType targetId:model.targetId]; _conversationVC.unReadMessage = unreadCount; _conversationVC.enableNewComingMessageIcon = YES; //开启消息提醒 diff --git a/ios-rongimdemo/RCDSettingServerUrlViewController.m b/ios-rongimdemo/RCDSettingServerUrlViewController.m index ddc1ca31..571b3533 100644 --- a/ios-rongimdemo/RCDSettingServerUrlViewController.m +++ b/ios-rongimdemo/RCDSettingServerUrlViewController.m @@ -605,10 +605,10 @@ - (IBAction)btnDoneClicked:(id)sender { if (![self checkContent]) return; - RCNetworkStatus stauts = + RCNetworkStatus status = [[RCIMClient sharedRCIMClient] getCurrentNetworkStatus]; - if (RC_NotReachable == stauts) { + if (RC_NotReachable == status) { _errorMsgLb.text = @"当前网络不可用，请检查！"; } NSString *appKeyString = [(UITextField *)[self.view viewWithTag:appKeyTextFieldTag] text]; diff --git a/ios-rongimdemo/RCloudMessage.xcodeproj/project.pbxproj b/ios-rongimdemo/RCloudMessage.xcodeproj/project.pbxproj index d3299db3..8a5f1da5 100644 --- a/ios-rongimdemo/RCloudMessage.xcodeproj/project.pbxproj +++ b/ios-rongimdemo/RCloudMessage.xcodeproj/project.pbxproj @@ -40,12 +40,16 @@ 27C42EED1DE30637003E2306 /* RongCloudiFly.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 27C42EEB1DE30637003E2306 /* RongCloudiFly.bundle */; }; 27D6FF9C1DFE4D2100053F69 /* RCDSettingServerUrlViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 27D6FF9B1DFE4D2100053F69 /* RCDSettingServerUrlViewController.m */; }; 27D6FF9F1DFE4D2C00053F69 /* RCDSettingUserDefaults.m in Sources */ = {isa = PBXBuildFile; fileRef = 27D6FF9E1DFE4D2C00053F69 /* RCDSettingUserDefaults.m */; }; - 2E29FF351DC1BE7300AF2DF0 /* JrmfInfo.strings in Resources */ = {isa = PBXBuildFile; fileRef = 2E29FF2F1DC1BE7300AF2DF0 /* JrmfInfo.strings */; }; - 2E29FF361DC1BE7300AF2DF0 /* JResource.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 2E29FF311DC1BE7300AF2DF0 /* JResource.bundle */; }; - 2E29FF371DC1BE7300AF2DF0 /* JrmfPacketKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2E29FF321DC1BE7300AF2DF0 /* JrmfPacketKit.framework */; }; - 2E29FF381DC1BE7300AF2DF0 /* JYangToolKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2E29FF331DC1BE7300AF2DF0 /* JYangToolKit.framework */; }; 2E29FF3C1DC1BE8400AF2DF0 /* AlipaySDK.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 2E29FF3A1DC1BE8400AF2DF0 /* AlipaySDK.bundle */; }; 2E29FF3D1DC1BE8400AF2DF0 /* AlipaySDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2E29FF3B1DC1BE8400AF2DF0 /* AlipaySDK.framework */; }; + 2E6B9A1A1E127BF7006EA6B4 /* JrmfInfo.strings in Resources */ = {isa = PBXBuildFile; fileRef = 2E6B9A181E127BF7006EA6B4 /* JrmfInfo.strings */; }; + 2E6B9A1E1E127C0C006EA6B4 /* JrmfInfo.strings in Resources */ = {isa = PBXBuildFile; fileRef = 2E6B9A1C1E127C0C006EA6B4 /* JrmfInfo.strings */; }; + 2E7A36E11E03A876005231BE /* JResource.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 2E7A36DB1E03A876005231BE /* JResource.bundle */; }; + 2E7A36E21E03A876005231BE /* jrmf.cer in Resources */ = {isa = PBXBuildFile; fileRef = 2E7A36DC1E03A876005231BE /* jrmf.cer */; }; + 2E7A36E31E03A876005231BE /* JrmfPacketKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2E7A36DD1E03A876005231BE /* JrmfPacketKit.framework */; }; + 2E7A36E41E03A876005231BE /* JrmfWalletKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2E7A36DE1E03A876005231BE /* JrmfWalletKit.framework */; }; + 2E7A36E51E03A876005231BE /* JYangToolKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2E7A36DF1E03A876005231BE /* JYangToolKit.framework */; }; + 2E7A36E61E03A876005231BE /* WalletResource.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 2E7A36E01E03A876005231BE /* WalletResource.bundle */; }; 466684241B5DEA10000B7504 /* RCDSettingBaseViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 466684231B5DEA10000B7504 /* RCDSettingBaseViewController.m */; }; 466684271B5DEA5B000B7504 /* RCDConversationSettingBaseViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 466684261B5DEA5B000B7504 /* RCDConversationSettingBaseViewController.m */; }; 4666842A1B5DEC04000B7504 /* RCDConversationSettingClearMessageCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 466684291B5DEC04000B7504 /* RCDConversationSettingClearMessageCell.m */; }; @@ -375,13 +379,16 @@ 27D6FF9B1DFE4D2100053F69 /* RCDSettingServerUrlViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCDSettingServerUrlViewController.m; sourceTree = SOURCE_ROOT; }; 27D6FF9D1DFE4D2C00053F69 /* RCDSettingUserDefaults.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCDSettingUserDefaults.h; sourceTree = SOURCE_ROOT; }; 27D6FF9E1DFE4D2C00053F69 /* RCDSettingUserDefaults.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCDSettingUserDefaults.m; sourceTree = SOURCE_ROOT; }; - 2E29FF301DC1BE7300AF2DF0 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/JrmfInfo.strings; sourceTree = ""; }; - 2E29FF311DC1BE7300AF2DF0 /* JResource.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = JResource.bundle; sourceTree = ""; }; - 2E29FF321DC1BE7300AF2DF0 /* JrmfPacketKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = JrmfPacketKit.framework; sourceTree = ""; }; - 2E29FF331DC1BE7300AF2DF0 /* JYangToolKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = JYangToolKit.framework; sourceTree = ""; }; - 2E29FF341DC1BE7300AF2DF0 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/JrmfInfo.strings"; sourceTree = ""; }; 2E29FF3A1DC1BE8400AF2DF0 /* AlipaySDK.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = AlipaySDK.bundle; sourceTree = ""; }; 2E29FF3B1DC1BE8400AF2DF0 /* AlipaySDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = AlipaySDK.framework; sourceTree = ""; }; + 2E6B9A191E127BF7006EA6B4 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = JrmfInfo.strings; sourceTree = ""; }; + 2E6B9A1D1E127C0C006EA6B4 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = JrmfInfo.strings; sourceTree = ""; }; + 2E7A36DB1E03A876005231BE /* JResource.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = JResource.bundle; sourceTree = ""; }; + 2E7A36DC1E03A876005231BE /* jrmf.cer */ = {isa = PBXFileReference; lastKnownFileType = file; path = jrmf.cer; sourceTree = ""; }; + 2E7A36DD1E03A876005231BE /* JrmfPacketKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = JrmfPacketKit.framework; sourceTree = ""; }; + 2E7A36DE1E03A876005231BE /* JrmfWalletKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = JrmfWalletKit.framework; sourceTree = ""; }; + 2E7A36DF1E03A876005231BE /* JYangToolKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = JYangToolKit.framework; sourceTree = ""; }; + 2E7A36E01E03A876005231BE /* WalletResource.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = WalletResource.bundle; sourceTree = ""; }; 466684221B5DEA10000B7504 /* RCDSettingBaseViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = RCDSettingBaseViewController.h; path = RCloudMessage/RCDSettingBaseViewController.h; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; 466684231B5DEA10000B7504 /* RCDSettingBaseViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; name = RCDSettingBaseViewController.m; path = RCloudMessage/RCDSettingBaseViewController.m; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.objc; }; 466684251B5DEA5B000B7504 /* RCDConversationSettingBaseViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = RCDConversationSettingBaseViewController.h; path = RCloudMessage/RCDConversationSettingBaseViewController.h; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; @@ -854,12 +861,14 @@ files = ( E4C4E7E41A0A2F2800140067 /* CoreGraphics.framework in Frameworks */, 27AADC281DDC4DD800E1AE31 /* Foundation.framework in Frameworks */, + 2E7A36E31E03A876005231BE /* JrmfPacketKit.framework in Frameworks */, E4C4E7E61A0A2F2E00140067 /* UIKit.framework in Frameworks */, 27AADC271DDC4DCE00E1AE31 /* QuartzCore.framework in Frameworks */, E4C3310E1A0C72A000E31B9A /* SystemConfiguration.framework in Frameworks */, E4C330F41A0C722300E31B9A /* AudioToolbox.framework in Frameworks */, 27AADC261DDC4DB800E1AE31 /* AddressBook.framework in Frameworks */, E4C330F21A0C721D00E31B9A /* AVFoundation.framework in Frameworks */, + 2E7A36E51E03A876005231BE /* JYangToolKit.framework in Frameworks */, E4C330FC1A0C724A00E31B9A /* CoreTelephony.framework in Frameworks */, 27C42ED51DE2FD7B003E2306 /* RongiFlyKit.framework in Frameworks */, E4C497211A24849E00098C8A /* CoreLocation.framework in Frameworks */, @@ -867,10 +876,8 @@ F82B55401DE03E40007392BD /* SafariServices.framework in Frameworks */, F880EA791D0808B300FD5CC4 /* VideoToolbox.framework in Frameworks */, A68AFAF41CCF0B3700F16B3D /* RongCallKit.framework in Frameworks */, - 2E29FF371DC1BE7300AF2DF0 /* JrmfPacketKit.framework in Frameworks */, F8AD4A5B1CAE5782006C1CBB /* CoreMotion.framework in Frameworks */, E4C330FA1A0C724400E31B9A /* CoreMedia.framework in Frameworks */, - 2E29FF381DC1BE7300AF2DF0 /* JYangToolKit.framework in Frameworks */, F8AD4A571CAE5702006C1CBB /* libicucore.tbd in Frameworks */, F8AD4A551CAE56A4006C1CBB /* PushKit.framework in Frameworks */, A68AFAFD1CCF1ECE00F16B3D /* AgoraRtcEngineKit.framework in Frameworks */, @@ -887,6 +894,7 @@ 5111B07B1AE6A11A00317E71 /* RongIMKit.framework in Frameworks */, F8B7DBD21BAC189700E9F9BD /* libopencore-amrnb.a in Frameworks */, E4C330FE1A0C725200E31B9A /* CoreVideo.framework in Frameworks */, + 2E7A36E41E03A876005231BE /* JrmfWalletKit.framework in Frameworks */, 27C42EEC1DE30637003E2306 /* iflyMSC.framework in Frameworks */, E4C330F81A0C723A00E31B9A /* CoreAudio.framework in Frameworks */, A6BD04181B1EEA6B00ACAF17 /* RongIMLib.framework in Frameworks */, @@ -994,10 +1002,14 @@ 2E29FF2E1DC1BE7300AF2DF0 /* JrmfIMLib */ = { isa = PBXGroup; children = ( - 2E29FF2F1DC1BE7300AF2DF0 /* JrmfInfo.strings */, - 2E29FF311DC1BE7300AF2DF0 /* JResource.bundle */, - 2E29FF321DC1BE7300AF2DF0 /* JrmfPacketKit.framework */, - 2E29FF331DC1BE7300AF2DF0 /* JYangToolKit.framework */, + 2E6B9A171E127BF7006EA6B4 /* en.lproj */, + 2E7A36DB1E03A876005231BE /* JResource.bundle */, + 2E7A36DC1E03A876005231BE /* jrmf.cer */, + 2E7A36DD1E03A876005231BE /* JrmfPacketKit.framework */, + 2E7A36DE1E03A876005231BE /* JrmfWalletKit.framework */, + 2E7A36DF1E03A876005231BE /* JYangToolKit.framework */, + 2E7A36E01E03A876005231BE /* WalletResource.bundle */, + 2E6B9A1B1E127C0C006EA6B4 /* zh-Hans.lproj */, ); name = JrmfIMLib; path = framework/JrmfIMLib; @@ -1013,6 +1025,23 @@ path = framework/AlipaySDK; sourceTree = SOURCE_ROOT; }; + 2E6B9A171E127BF7006EA6B4 /* en.lproj */ = { + isa = PBXGroup; + children = ( + 2E6B9A181E127BF7006EA6B4 /* JrmfInfo.strings */, + ); + path = en.lproj; + sourceTree = ""; + }; + 2E6B9A1B1E127C0C006EA6B4 /* zh-Hans.lproj */ = { + isa = PBXGroup; + children = ( + 2E6B9A1C1E127C0C006EA6B4 /* JrmfInfo.strings */, + ); + name = "zh-Hans.lproj"; + path = "framework/JrmfIMLib/zh-Hans.lproj"; + sourceTree = SOURCE_ROOT; + }; 46A831B81AC014B2001A533F /* FindPsw */ = { isa = PBXGroup; children = ( @@ -2116,14 +2145,17 @@ F894EC391DF7E47600EFD084 /* BQMM.bundle in Resources */, 2E29FF3C1DC1BE8400AF2DF0 /* AlipaySDK.bundle in Resources */, 27C42EED1DE30637003E2306 /* RongCloudiFly.bundle in Resources */, - 2E29FF351DC1BE7300AF2DF0 /* JrmfInfo.strings in Resources */, + 2E6B9A1E1E127C0C006EA6B4 /* JrmfInfo.strings in Resources */, + 2E6B9A1A1E127BF7006EA6B4 /* JrmfInfo.strings in Resources */, + 2E7A36E11E03A876005231BE /* JResource.bundle in Resources */, 8C55EB511B2A8CE5004285F4 /* Emoji.plist in Resources */, - 2E29FF361DC1BE7300AF2DF0 /* JResource.bundle in Resources */, E42A2E5A1AAEE76800F4C3AB /* Main.storyboard in Resources */, 5111B07D1AE6A11A00317E71 /* RongCloud.bundle in Resources */, + 2E7A36E21E03A876005231BE /* jrmf.cer in Resources */, A6CF8A351BD4CB6E00F3EA1A /* RCConfig.plist in Resources */, E4BFAE251A121839007165B1 /* Images.xcassets in Resources */, 510624851AD63A9E00348452 /* RongCloudKit.strings in Resources */, + 2E7A36E61E03A876005231BE /* WalletResource.bundle in Resources */, 987653631D796C5B008A6BF0 /* Launch Screen.storyboard in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -2400,11 +2432,18 @@ name = MainInterface.storyboard; sourceTree = ""; }; - 2E29FF2F1DC1BE7300AF2DF0 /* JrmfInfo.strings */ = { + 2E6B9A181E127BF7006EA6B4 /* JrmfInfo.strings */ = { + isa = PBXVariantGroup; + children = ( + 2E6B9A191E127BF7006EA6B4 /* en */, + ); + name = JrmfInfo.strings; + sourceTree = ""; + }; + 2E6B9A1C1E127C0C006EA6B4 /* JrmfInfo.strings */ = { isa = PBXVariantGroup; children = ( - 2E29FF301DC1BE7300AF2DF0 /* en */, - 2E29FF341DC1BE7300AF2DF0 /* zh-Hans */, + 2E6B9A1D1E127C0C006EA6B4 /* zh-Hans */, ); name = JrmfInfo.strings; sourceTree = ""; diff --git a/ios-rongimdemo/RCloudMessage/AppDelegate.m b/ios-rongimdemo/RCloudMessage/AppDelegate.m index 39484f35..f42b2475 100644 --- a/ios-rongimdemo/RCloudMessage/AppDelegate.m +++ b/ios-rongimdemo/RCloudMessage/AppDelegate.m @@ -29,9 +29,9 @@ #import "RCDSettingUserDefaults.h" #import "RCDSettingServerUrlViewController.h" -//#define RONGCLOUD_IM_APPKEY @"e0x9wycfx7flq" //offline key +#define RONGCLOUD_IM_APPKEY @"n19jmcy59f1q9" //offline key //#define RONGCLOUD_IM_APPKEY @"c9kqb3rdkbb8j" // pre key -#define RONGCLOUD_IM_APPKEY @"n19jmcy59f1q9" // online key +//#define RONGCLOUD_IM_APPKEY @"e0x9wycfx7flq" // online key #define UMENG_APPKEY @"563755cbe0f55a5cb300139c" @@ -127,7 +127,7 @@ - (BOOL)application:(UIApplication *)application // 注册自定义测试消息 [[RCIM sharedRCIM] registerMessageType:[RCDTestMessage class]]; - //设置会话列表头像和会话界面头像 + //设置会话列表头像和会话页面头像 [[RCIM sharedRCIM] setConnectionStatusDelegate:self]; [RCIMClient sharedRCIMClient].logLevel = RC_Log_Level_Info; diff --git a/ios-rongimdemo/RCloudMessage/EmoticonExtention/RCDCustomerEmoticonTab.h b/ios-rongimdemo/RCloudMessage/EmoticonExtention/RCDCustomerEmoticonTab.h index 6c99c355..8b304a8d 100644 --- a/ios-rongimdemo/RCloudMessage/EmoticonExtention/RCDCustomerEmoticonTab.h +++ b/ios-rongimdemo/RCloudMessage/EmoticonExtention/RCDCustomerEmoticonTab.h @@ -38,6 +38,6 @@ */ - (UIView *)loadEmoticonView:(NSString *)identify index:(int)index; -@property(nonatomic, weak) RCDChatViewController *chartView; +//@property(nonatomic, weak) RCDChatViewController *chartView; @end diff --git a/ios-rongimdemo/RCloudMessage/EmoticonExtention/RCDCustomerEmoticonTab.m b/ios-rongimdemo/RCloudMessage/EmoticonExtention/RCDCustomerEmoticonTab.m index 3310db52..2f60557d 100644 --- a/ios-rongimdemo/RCloudMessage/EmoticonExtention/RCDCustomerEmoticonTab.m +++ b/ios-rongimdemo/RCloudMessage/EmoticonExtention/RCDCustomerEmoticonTab.m @@ -14,6 +14,26 @@ @interface RCDCustomerEmoticonTab() @implementation RCDCustomerEmoticonTab - (UIView *)loadEmoticonView:(NSString *)identify index:(int)index { - return [self.chartView loadEmoticonView:identify index:index]; + UIView *view11 = [[UIView alloc] + initWithFrame:CGRectMake(0, 0, [[UIScreen mainScreen] bounds].size.width, 186)]; + view11.backgroundColor = [UIColor blackColor]; + switch (index) { + case 1: + view11.backgroundColor = [UIColor yellowColor]; + break; + case 2: + view11.backgroundColor = [UIColor redColor]; + break; + case 3: + view11.backgroundColor = [UIColor greenColor]; + break; + case 4: + view11.backgroundColor = [UIColor grayColor]; + break; + + default: + break; + } + return view11; } @end diff --git a/ios-rongimdemo/RCloudMessage/Info.plist b/ios-rongimdemo/RCloudMessage/Info.plist index a76834a2..354e3687 100644 --- a/ios-rongimdemo/RCloudMessage/Info.plist +++ b/ios-rongimdemo/RCloudMessage/Info.plist @@ -19,7 +19,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 2.8.4 Stable + 2.8.5 Dev CFBundleSignature ???? CFBundleURLTypes @@ -42,7 +42,7 @@ CFBundleVersion - 201612191851 + 201701092341 LSRequiresIPhoneOS NSAppTransportSecurity @@ -58,38 +58,11 @@ NSExceptionAllowsInsecureHTTPLoads - alipay.com - - NSExceptionAllowsInsecureHTTPLoads - - NSExceptionMinimumTLSVersion - TLSv1.0 - NSExceptionRequiresForwardSecrecy - - NSIncludesSubdomains - - - alipayobjects.com - - NSExceptionAllowsInsecureHTTPLoads - - NSExceptionMinimumTLSVersion - TLSv1.0 - NSExceptionRequiresForwardSecrecy - - NSIncludesSubdomains - - api.hitalk.im NSExceptionAllowsInsecureHTTPLoads - api.jrmf360.com - - NSExceptionAllowsInsecureHTTPLoads - - api.sealtalk.im NSExceptionAllowsInsecureHTTPLoads @@ -120,6 +93,11 @@ NSExceptionAllowsInsecureHTTPLoads + public.rongcloud.cn + + NSExceptionAllowsInsecureHTTPLoads + + rongcloud-file.ronghub.com NSExceptionAllowsInsecureHTTPLoads @@ -143,7 +121,7 @@ NSPhotoLibraryUsageDescription 访问相册 SealTalk Version - 1.1.10 + 1.1.11 UIBackgroundModes audio diff --git a/ios-rongimdemo/RCloudMessage/RCDChatListViewController.m b/ios-rongimdemo/RCloudMessage/RCDChatListViewController.m index 6589665d..5f175f1d 100644 --- a/ios-rongimdemo/RCloudMessage/RCDChatListViewController.m +++ b/ios-rongimdemo/RCloudMessage/RCDChatListViewController.m @@ -225,7 +225,7 @@ - (void)updateBadgeValueForTabBarItem { } /** - * 点击进入会话界面 + * 点击进入会话页面 * * @param conversationModelType 会话类型 * @param model 会话数据 diff --git a/ios-rongimdemo/RCloudMessage/RCDChatViewController.m b/ios-rongimdemo/RCloudMessage/RCDChatViewController.m index 64b15ead..ff7060f0 100644 --- a/ios-rongimdemo/RCloudMessage/RCDChatViewController.m +++ b/ios-rongimdemo/RCloudMessage/RCDChatViewController.m @@ -60,7 +60,9 @@ - (void)viewWillAppear:(BOOL)animated { // self.defaultInputType = RCChatSessionInputBarInputExtention; } } - + //默认输入类型为语音 + //self.defaultInputType = RCChatSessionInputBarInputExtention; + [self refreshTitle]; } @@ -186,7 +188,7 @@ - (void)viewDidLoad { //默认输入类型为语音 // self.defaultInputType = RCChatSessionInputBarInputExtention; - /***********如何在会话界面插入提醒消息*********************** + /***********如何在会话页面插入提醒消息*********************** RCInformationNotificationMessage *warningMsg = [RCInformationNotificationMessage @@ -365,7 +367,7 @@ - (void)rightBarButtonItemClicked:(id)sender { settingVC.conversationType = self.conversationType; settingVC.targetId = self.targetId; settingVC.conversationTitle = self.userName; - //设置讨论组标题时，改变当前聊天界面的标题 + //设置讨论组标题时，改变当前会话页面的标题 settingVC.setDiscussTitleCompletion = ^(NSString *discussTitle) { self.title = discussTitle; }; @@ -549,13 +551,13 @@ - (RCRealTimeLocationStatus)getStatus { - (void)onShowRealTimeLocationView { [self showRealTimeLocationViewController]; } -- (RCMessageContent *)willSendMessage:(RCMessageContent *)messageCotent { +- (RCMessageContent *)willSendMessage:(RCMessageContent *)messageContent { //可以在这里修改将要发送的消息 - if ([messageCotent isMemberOfClass:[RCTextMessage class]]) { - // RCTextMessage *textMsg = (RCTextMessage *)messageCotent; + if ([messageContent isMemberOfClass:[RCTextMessage class]]) { + // RCTextMessage *textMsg = (RCTextMessage *)messageContent; // textMsg.extra = @""; } - return messageCotent; + return messageContent; } #pragma mark override diff --git a/ios-rongimdemo/RCloudMessage/RCDCustomerServiceViewController.m b/ios-rongimdemo/RCloudMessage/RCDCustomerServiceViewController.m index 0b3980ff..59cf9ab7 100644 --- a/ios-rongimdemo/RCloudMessage/RCDCustomerServiceViewController.m +++ b/ios-rongimdemo/RCloudMessage/RCDCustomerServiceViewController.m @@ -71,7 +71,7 @@ - (void)leftBarButtonItemPressed:(id)sender { //需要调用super的实现 [super leftBarButtonItemPressed:sender]; - [self.navigationController popViewControllerAnimated:YES]; + [self.navigationController popToRootViewControllerAnimated:YES]; } //评价客服，并离开当前会话 diff --git a/ios-rongimdemo/RCloudMessage/RCDLoginViewController.m b/ios-rongimdemo/RCloudMessage/RCDLoginViewController.m index 4795de10..eb5e5662 100644 --- a/ios-rongimdemo/RCloudMessage/RCDLoginViewController.m +++ b/ios-rongimdemo/RCloudMessage/RCDLoginViewController.m @@ -719,10 +719,10 @@ - (void)loginRongCloud:(NSString *)userName */ - (void)login:(NSString *)userName password:(NSString *)password { - RCNetworkStatus stauts = + RCNetworkStatus status = [[RCIMClient sharedRCIMClient] getCurrentNetworkStatus]; - if (RC_NotReachable == stauts) { + if (RC_NotReachable == status) { _errorMsgLb.text = @"当前网络不可用，请检查！"; return; } else { diff --git a/ios-rongimdemo/RCloudMessage/RCDMeInfoTableViewController.m b/ios-rongimdemo/RCloudMessage/RCDMeInfoTableViewController.m index 34a51b9a..cd14b59a 100644 --- a/ios-rongimdemo/RCloudMessage/RCDMeInfoTableViewController.m +++ b/ios-rongimdemo/RCloudMessage/RCDMeInfoTableViewController.m @@ -240,7 +240,7 @@ - (void)imagePickerController:(UIImagePickerController *)picker //获取截取区域 CGRect captureRect = [[info objectForKey:UIImagePickerControllerCropRect] CGRectValue]; //获取截取区域的图像 - UIImage *captureImage = [self getSubImage:originImage Rect:captureRect]; + UIImage *captureImage = [self getSubImage:originImage Rect:captureRect imageOrientation:originImage.imageOrientation]; UIImage *scaleImage = [self scaleImage:captureImage toScale:0.8]; data = UIImageJPEGRepresentation(scaleImage, 0.00001); } @@ -306,7 +306,7 @@ - (void)imagePickerController:(UIImagePickerController *)picker }]; } --(UIImage*)getSubImage:(UIImage *)originImage Rect:(CGRect)rect +-(UIImage*)getSubImage:(UIImage *)originImage Rect:(CGRect)rect imageOrientation:(UIImageOrientation)imageOrientation { CGImageRef subImageRef = CGImageCreateWithImageInRect(originImage.CGImage, rect); CGRect smallBounds = CGRectMake(0, 0, CGImageGetWidth(subImageRef), CGImageGetHeight(subImageRef)); @@ -314,9 +314,8 @@ -(UIImage*)getSubImage:(UIImage *)originImage Rect:(CGRect)rect UIGraphicsBeginImageContext(smallBounds.size); CGContextRef context = UIGraphicsGetCurrentContext(); CGContextDrawImage(context, smallBounds, subImageRef); - UIImage* smallImage = [UIImage imageWithCGImage:subImageRef]; + UIImage* smallImage = [UIImage imageWithCGImage:subImageRef scale:1.f orientation:imageOrientation]; UIGraphicsEndImageContext(); - return smallImage; } diff --git a/ios-rongimdemo/RCloudMessage/RCDMeTableViewController.m b/ios-rongimdemo/RCloudMessage/RCDMeTableViewController.m index 125cfdfa..36ebefa6 100644 --- a/ios-rongimdemo/RCloudMessage/RCDMeTableViewController.m +++ b/ios-rongimdemo/RCloudMessage/RCDMeTableViewController.m @@ -27,7 +27,11 @@ #import "RCDMeCell.h" /* RedPacket_FTR */ -#import +#import + +#define SERVICE_ID @"KEFU146001495753714" +#define SERVICE_ID_XIAONENG1 @"kf_4029_1483495902343" +#define SERVICE_ID_XIAONENG2 @"op_1000_1483495280515" @interface RCDMeTableViewController () @property(nonatomic) BOOL hasNewVersion; @@ -91,7 +95,11 @@ - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger break; case 2: +#if RCDDebugTestFunction + rows = 4; +#else rows = 2; +#endif break; default: @@ -169,6 +177,18 @@ - (UITableViewCell *)tableView:(UITableView *)tableView return cell; } break; +#if RCDDebugTestFunction + case 2:{ + [cell setCellWithImageName:@"sevre_inactive" labelName:@"小能客服1"]; + return cell; + } + break; + case 3:{ + [cell setCellWithImageName:@"sevre_inactive" labelName:@"小能客服2"]; + return cell; + } + break; +#endif default: break; } @@ -216,7 +236,7 @@ -(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath * break; /* RedPacket_FTR */ //open my wallet case 1: { - [JrmfPacketManager getEventOpenWallet]; + [JrmfWalletSDK openWallet]; } break; @@ -229,7 +249,7 @@ -(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath * case 2: { switch (indexPath.row) { case 0: { - [self chatWithCustomerService]; + [self chatWithCustomerService:SERVICE_ID]; } break; @@ -238,6 +258,16 @@ -(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath * [self.navigationController pushViewController:vc animated:YES]; } break; +#if RCDDebugTestFunction + case 2: { + [self chatWithCustomerService:SERVICE_ID_XIAONENG1]; + } + break; + case 3: { + [self chatWithCustomerService:SERVICE_ID_XIAONENG2]; + } + break; +#endif default: break; } @@ -257,15 +287,15 @@ - (void)setUserPortrait:(NSNotification *)notifycation { userPortrait = [notifycation object]; } -- (void)chatWithCustomerService { +- (void)chatWithCustomerService:(NSString *)kefuId { RCDCustomerServiceViewController *chatService = [[RCDCustomerServiceViewController alloc] init]; - #define SERVICE_ID @"KEFU146001495753714" + // live800 KEFU146227005669524 live800的客服ID // zhichi KEFU146001495753714 智齿的客服ID chatService.conversationType = ConversationType_CUSTOMERSERVICE; - chatService.targetId = SERVICE_ID; + chatService.targetId = kefuId; //上传用户信息，nickname是必须要填写的 RCCustomerServiceInfo *csInfo = [[RCCustomerServiceInfo alloc] init]; diff --git a/ios-rongimdemo/RCloudMessage/RCDRegisterViewController.m b/ios-rongimdemo/RCloudMessage/RCDRegisterViewController.m index caa83713..eae1196f 100644 --- a/ios-rongimdemo/RCloudMessage/RCDRegisterViewController.m +++ b/ios-rongimdemo/RCloudMessage/RCDRegisterViewController.m @@ -800,10 +800,10 @@ - (IBAction)btnDoneClicked:(id)sender { if (![self checkContent]) return; - RCNetworkStatus stauts = + RCNetworkStatus status = [[RCIMClient sharedRCIMClient] getCurrentNetworkStatus]; - if (RC_NotReachable == stauts) { + if (RC_NotReachable == status) { _errorMsgLb.text = @"当前网络不可用，请检查！"; } NSString *userName = diff --git a/ios-rongimdemo/RCloudMessage/RCDSettingBaseViewController.h b/ios-rongimdemo/RCloudMessage/RCDSettingBaseViewController.h index 16c22926..b77d186b 100644 --- a/ios-rongimdemo/RCloudMessage/RCDSettingBaseViewController.h +++ b/ios-rongimdemo/RCloudMessage/RCDSettingBaseViewController.h @@ -34,7 +34,7 @@ typedef void(^rcdClearHistory)(BOOL isSuccess); @property(nonatomic, assign) RCConversationType conversationType; /** - * 清除历史消息后，会话界面调用roload data + * 清除历史消息后，会话页面调用roload data */ @property(nonatomic, copy) rcdClearHistory clearHistoryCompletion; diff --git a/ios-rongimdemo/RCloudMessage/Utilities/DefaultPortraitView.m b/ios-rongimdemo/RCloudMessage/Utilities/DefaultPortraitView.m index 7e7cfe85..3d8c3a13 100644 --- a/ios-rongimdemo/RCloudMessage/Utilities/DefaultPortraitView.m +++ b/ios-rongimdemo/RCloudMessage/Utilities/DefaultPortraitView.m @@ -40,7 +40,12 @@ - (void)setColorAndLabel:(NSString *)userId Nickname:(NSString *)nickname { //设置字母Label UILabel *firstCharacterLabel = [[UILabel alloc] init]; - NSString *firstLetter = [nickname substringToIndex:1]; + NSString *firstLetter = nil; + if(nickname.length > 0){ + firstLetter = [nickname substringToIndex:1]; + }else { + firstLetter = @"#"; + } firstCharacterLabel.text = firstLetter; firstCharacterLabel.textColor = [UIColor whiteColor]; firstCharacterLabel.textAlignment = NSTextAlignmentCenter; diff --git a/ios-rongimdemo/SealTalkShareExtension/RCDShareChatListController.m b/ios-rongimdemo/SealTalkShareExtension/RCDShareChatListController.m index d6b01c57..b0e53615 100644 --- a/ios-rongimdemo/SealTalkShareExtension/RCDShareChatListController.m +++ b/ios-rongimdemo/SealTalkShareExtension/RCDShareChatListController.m @@ -19,7 +19,7 @@ @interface RCDShareChatListController () #define ReuseIdentifier @"cellReuseIdentifier" #define DemoServer @"http://api.sealtalk.im/" //线上正式环境 -//#define DemoServer @"http://api.hitalk.im/" //测试环境 +//#define DemoServer @"http://api.sealtalk.im/" //测试环境 @implementation RCDShareChatListController diff --git a/ios-rongimdemo/autobuild.sh b/ios-rongimdemo/autobuild.sh index cc4d7c58..59d1c736 100644 --- a/ios-rongimdemo/autobuild.sh +++ b/ios-rongimdemo/autobuild.sh @@ -128,6 +128,9 @@ if [ ${ENV_FLAG} == "dev" ]; then elif [ ${ENV_FLAG} == "pre" ]; then sed -i '' -e '/SERVICE_ID/s/@"KEFU146001495753714"/@"KEFU147980517733135"/g' ./RCloudMessage/RCDMeTableViewController.m sed -i '' -e 's/nav.cn.ronghub.com/navqa.cn.ronghub.com/g' ./RCloudMessage/Info.plist +elif [ ${ENV_FLAG} == "pri" ]; then + sed -i '' -e '/SERVICE_ID_XIAONENG1/s/@"kf_4029_1483495902343"/@"zf_1000_1481459114694"/g' ./RCloudMessage/RCDMeTableViewController.m + sed -i '' -e '/SERVICE_ID_XIAONENG2/s/@"op_1000_1483495280515"/@"zf_1000_1480591492399"/g' ./RCloudMessage/RCDMeTableViewController.m fi if [ ${ENV_FLAG} == "pri" ]; then diff --git a/ios-rongimdemo/framework/AlipaySDK/AlipaySDK.framework/AlipaySDK b/ios-rongimdemo/framework/AlipaySDK/AlipaySDK.framework/AlipaySDK index ac05041f..87c72da9 100644 Binary files a/ios-rongimdemo/framework/AlipaySDK/AlipaySDK.framework/AlipaySDK and b/ios-rongimdemo/framework/AlipaySDK/AlipaySDK.framework/AlipaySDK differ diff --git a/ios-rongimdemo/framework/AlipaySDK/AlipaySDK.framework/Headers/AlipaySDK.h b/ios-rongimdemo/framework/AlipaySDK/AlipaySDK.framework/Headers/AlipaySDK.h index f5dbc4cc..6cfd1238 100644 --- a/ios-rongimdemo/framework/AlipaySDK/AlipaySDK.framework/Headers/AlipaySDK.h +++ b/ios-rongimdemo/framework/AlipaySDK/AlipaySDK.framework/Headers/AlipaySDK.h @@ -37,12 +37,17 @@ typedef void(^CompletionBlock)(NSDictionary *resultDic); */ + (AlipaySDK *)defaultService; +/** + * 用于设置SDK使用的window，如果没有自行创建window无需设置此接口 + */ +@property (nonatomic, weak) UIWindow *targetWindow; + /** * 支付接口 * * @param orderStr 订单信息 * @param schemeStr 调用支付的app注册在info.plist中的scheme - * @param compltionBlock 支付结果回调Block + * @param compltionBlock 支付结果回调Block，用于wap支付结果回调（非跳转钱包支付） */ - (void)payOrder:(NSString *)orderStr fromScheme:(NSString *)schemeStr @@ -51,12 +56,21 @@ typedef void(^CompletionBlock)(NSDictionary *resultDic); /** * 处理钱包或者独立快捷app支付跳回商户app携带的支付结果Url * - * @param resultUrl 支付结果url，传入后由SDK解析，统一在上面的pay方法的callback中回调 - * @param completionBlock 跳钱包支付结果回调，保证跳转钱包支付过程中，即使调用方app被系统kill时，能通过这个回调取到支付结果。 + * @param resultUrl 支付结果url + * @param completionBlock 支付结果回调 */ - (void)processOrderWithPaymentResult:(NSURL *)resultUrl standbyCallback:(CompletionBlock)completionBlock; + + +/** + * 获取交易token。 + * + * @return 交易token，若无则为空。 + */ +- (NSString *)fetchTradeToken; + /** * 是否已经使用过 * @@ -118,8 +132,9 @@ typedef void(^CompletionBlock)(NSDictionary *resultDic); /** * 快登授权 - * @param authInfo 需授权信息 - * @param completionBlock 授权结果回调 + * @param authInfo 需授权信息 + * @param completionBlock 授权结果回调，若在授权过程中，调用方应用被系统终止，则此block无效， + 需要调用方在appDelegate中调用processAuthResult:standbyCallback:方法获取授权结果 */ - (void)authWithInfo:(APayAuthInfo *)authInfo callback:(CompletionBlock)completionBlock; @@ -128,8 +143,8 @@ typedef void(^CompletionBlock)(NSDictionary *resultDic); /** * 处理授权信息Url * - * @param resultUrl 钱包返回的授权结果url - * @param completionBlock 跳授权结果回调，保证跳转钱包授权过程中，即使调用方app被系统kill时，能通过这个回调取到支付结果。 + * @param resultUrl 钱包返回的授权结果url + * @param completionBlock 授权结果回调 */ - (void)processAuthResult:(NSURL *)resultUrl standbyCallback:(CompletionBlock)completionBlock; @@ -141,9 +156,10 @@ typedef void(^CompletionBlock)(NSDictionary *resultDic); /** * 快登授权2.0 * - * @param infoStr 授权请求信息字符串 - * @param schemeStr 调用授权的app注册在info.plist中的scheme - * @param completionBlock 授权结果回调 + * @param infoStr 授权请求信息字符串 + * @param schemeStr 调用授权的app注册在info.plist中的scheme + * @param completionBlock 授权结果回调，若在授权过程中，调用方应用被系统终止，则此block无效， + 需要调用方在appDelegate中调用processAuth_V2Result:standbyCallback:方法获取授权结果 */ - (void)auth_V2WithInfo:(NSString *)infoStr fromScheme:(NSString *)schemeStr @@ -152,8 +168,8 @@ typedef void(^CompletionBlock)(NSDictionary *resultDic); /** * 处理授权信息Url * - * @param resultUrl 钱包返回的授权结果url - * @param completionBlock 跳授权结果回调，保证跳转钱包授权过程中，即使调用方app被系统kill时，能通过这个回调取到支付结果。 + * @param resultUrl 钱包返回的授权结果url + * @param completionBlock 授权结果回调 */ - (void)processAuth_V2Result:(NSURL *)resultUrl standbyCallback:(CompletionBlock)completionBlock; diff --git a/ios-rongimdemo/framework/AlipaySDK/AlipaySDK.framework/Info.plist b/ios-rongimdemo/framework/AlipaySDK/AlipaySDK.framework/Info.plist index d76966ea..ce250c38 100644 Binary files a/ios-rongimdemo/framework/AlipaySDK/AlipaySDK.framework/Info.plist and b/ios-rongimdemo/framework/AlipaySDK/AlipaySDK.framework/Info.plist differ diff --git a/ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/bg_from_hongbao.png b/ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/bg_from_hongbao@2x.png similarity index 100% rename from ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/bg_from_hongbao.png rename to ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/bg_from_hongbao@2x.png diff --git a/ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/bg_pwd_L.png b/ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/bg_pwd_L@2x.png similarity index 100% rename from ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/bg_pwd_L.png rename to ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/bg_pwd_L@2x.png diff --git a/ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/bg_to_hongbao.png b/ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/bg_to_hongbao@2x.png similarity index 100% rename from ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/bg_to_hongbao.png rename to ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/bg_to_hongbao@2x.png diff --git a/ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/btn_code.png b/ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/btn_code@2x.png similarity index 100% rename from ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/btn_code.png rename to ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/btn_code@2x.png diff --git a/ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/btn_code_dis.png b/ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/btn_code_dis@2x.png similarity index 100% rename from ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/btn_code_dis.png rename to ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/btn_code_dis@2x.png diff --git a/ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/btn_exit.png b/ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/btn_exit@2x.png similarity index 100% rename from ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/btn_exit.png rename to ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/btn_exit@2x.png diff --git a/ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/btn_line@2x.png b/ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/btn_line@2x.png new file mode 100644 index 00000000..1a8aa24b Binary files /dev/null and b/ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/btn_line@2x.png differ diff --git a/ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/btn_next.png b/ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/btn_next@2x.png similarity index 100% rename from ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/btn_next.png rename to ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/btn_next@2x.png diff --git a/ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/ic_alipay.png b/ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/ic_alipay@2x.png similarity index 100% rename from ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/ic_alipay.png rename to ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/ic_alipay@2x.png diff --git a/ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/ic_arrow.png b/ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/ic_arrow@2x.png similarity index 100% rename from ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/ic_arrow.png rename to ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/ic_arrow@2x.png diff --git a/ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/ic_card.png b/ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/ic_card@2x.png similarity index 100% rename from ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/ic_card.png rename to ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/ic_card@2x.png diff --git a/ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/ic_case.png b/ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/ic_case@2x.png similarity index 100% rename from ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/ic_case.png rename to ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/ic_case@2x.png diff --git a/ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/ic_charge.png b/ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/ic_charge@2x.png similarity index 100% rename from ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/ic_charge.png rename to ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/ic_charge@2x.png diff --git a/ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/ic_check_off.png b/ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/ic_check_off@2x.png similarity index 100% rename from ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/ic_check_off.png rename to ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/ic_check_off@2x.png diff --git a/ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/ic_check_on.png b/ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/ic_check_on@2x.png similarity index 100% rename from ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/ic_check_on.png rename to ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/ic_check_on@2x.png diff --git a/ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/ic_circle@2x.png b/ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/ic_circle@2x.png new file mode 100644 index 00000000..b0db8f0b Binary files /dev/null and b/ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/ic_circle@2x.png differ diff --git a/ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/ic_crown@2x.png b/ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/ic_crown@2x.png new file mode 100644 index 00000000..662297eb Binary files /dev/null and b/ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/ic_crown@2x.png differ diff --git a/ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/ic_envelope.png b/ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/ic_envelope@2x.png similarity index 100% rename from ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/ic_envelope.png rename to ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/ic_envelope@2x.png diff --git a/ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/ic_hongbao.png b/ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/ic_hongbao@2x.png similarity index 100% rename from ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/ic_hongbao.png rename to ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/ic_hongbao@2x.png diff --git a/ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/ic_line.png b/ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/ic_line@2x.png similarity index 100% rename from ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/ic_line.png rename to ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/ic_line@2x.png diff --git a/ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/ic_me@2x.png b/ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/ic_me@2x.png new file mode 100644 index 00000000..40a59a12 Binary files /dev/null and b/ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/ic_me@2x.png differ diff --git a/ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/ic_op_check@2x.png b/ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/ic_op_check@2x.png new file mode 100755 index 00000000..b8758a43 Binary files /dev/null and b/ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/ic_op_check@2x.png differ diff --git a/ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/ic_pin.png b/ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/ic_pin@2x.png similarity index 100% rename from ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/ic_pin.png rename to ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/ic_pin@2x.png diff --git a/ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/ic_point.png b/ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/ic_point@2x.png similarity index 100% rename from ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/ic_point.png rename to ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/ic_point@2x.png diff --git a/ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/ic_pressed.png b/ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/ic_pressed@2x.png similarity index 100% rename from ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/ic_pressed.png rename to ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/ic_pressed@2x.png diff --git a/ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/ic_pwd.png b/ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/ic_pwd@2x.png similarity index 100% rename from ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/ic_pwd.png rename to ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/ic_pwd@2x.png diff --git a/ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/ic_top_back_white.png b/ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/ic_top_back_white@2x.png similarity index 100% rename from ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/ic_top_back_white.png rename to ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/ic_top_back_white@2x.png diff --git a/ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/ic_top_back_white_s.png b/ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/ic_top_back_white_s@2x.png similarity index 100% rename from ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/ic_top_back_white_s.png rename to ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/ic_top_back_white_s@2x.png diff --git a/ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/ic_wx.png b/ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/ic_wx@2x.png similarity index 100% rename from ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/ic_wx.png rename to ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/ic_wx@2x.png diff --git a/ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/pck_openBG@2x.png b/ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/pck_openBG@2x.png new file mode 100755 index 00000000..e0b57e7e Binary files /dev/null and b/ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/pck_openBG@2x.png differ diff --git a/ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/pck_openBtn@2x.png b/ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/pck_openBtn@2x.png new file mode 100755 index 00000000..ecb29d1e Binary files /dev/null and b/ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/pck_openBtn@2x.png differ diff --git a/ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/pck_openExit@2x.png b/ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/pck_openExit@2x.png new file mode 100755 index 00000000..ee175a6c Binary files /dev/null and b/ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/pck_openExit@2x.png differ diff --git a/ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/xiaobao_icon.png b/ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/xiaobao_icon@2x.png similarity index 100% rename from ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/xiaobao_icon.png rename to ios-rongimdemo/framework/JrmfIMLib/JResource.bundle/xiaobao_icon@2x.png diff --git a/ios-rongimdemo/framework/JrmfIMLib/JYangToolKit.framework/Headers/JYangLib.h b/ios-rongimdemo/framework/JrmfIMLib/JYangToolKit.framework/Headers/JYangLib.h index 8693c775..1de6cd15 100644 --- a/ios-rongimdemo/framework/JrmfIMLib/JYangToolKit.framework/Headers/JYangLib.h +++ b/ios-rongimdemo/framework/JrmfIMLib/JYangToolKit.framework/Headers/JYangLib.h @@ -8,25 +8,77 @@ // 注：该framework为金融魔方SDK工具类，若集成多个金融魔方SDK，导入一个即可 // （勿动.h文件中内容） +// 2016-12-06 V 1.2 Https版本 #import #import +/** + * 宏定义请求成功的block + * + * @param responseObj 请求成功返回的数据 + */ +typedef void (^JYResponseSuccess)(NSURLSessionDataTask * task, NSDictionary * responseObj); + +/** + * 宏定义请求失败的block + * + * @param error 报错信息 + */ +typedef void (^JYResponseFail)(NSURLSessionDataTask * task, NSError * error); + + + @interface JYangLib : NSObject -#pragma mark - 获取网络图片 +/** + 获取网络图片 + @param imageView 视图View + @param url 图片地址 + @param placeholder 默认图片 + */ + (void)JYangLibsetImageWithImageView:(UIImageView *)imageView URL:(NSURL *)url placeholderImage:(UIImage *)placeholder; #pragma mark - 等待框 +/** + 显示等待框 -+ (void)JYangLibShowWaitInViewController:(UIViewController *)viewController View:(UIView *)view hint:(NSString *)hint; + @param viewController 当前视图 + @param hint 提示文字 + */ ++ (void)JYangLibShowWaitInViewController:(UIViewController *)viewController hint:(NSString *)hint; +/** + 隐藏等待框 + + @param viewController 当前视图 + */ + (void)JYangLibHideWaitWithViewController:(UIViewController *)viewController; +/** + 提示框 + + @param hint 提示文字 + @param viewController 显示视图 + */ + (void)JYangLibShowWait:(NSString *)hint InViewController:(UIViewController *)viewController; +#pragma mark - 网络请求 +/** + 普通post方法请求网络数据 + + @param reqUrl 请求网址路径 + @param param 请求参数 + @param success 成功回调 + @param fail 失败回调 + */ ++ (NSURLSessionDataTask *)postGetRequestWithLink:(NSString *)reqUrl parameter:(NSString *)param Success:(JYResponseSuccess)success Fail:(JYResponseFail)fail; + +#pragma mark - Msg ++ (NSString *)GetJYangToolLibMsg; + @end diff --git a/ios-rongimdemo/framework/JrmfIMLib/JYangToolKit.framework/Headers/JYangToolKit.h b/ios-rongimdemo/framework/JrmfIMLib/JYangToolKit.framework/Headers/JYangToolKit.h index f94c70b7..3b34242c 100644 --- a/ios-rongimdemo/framework/JrmfIMLib/JYangToolKit.framework/Headers/JYangToolKit.h +++ b/ios-rongimdemo/framework/JrmfIMLib/JYangToolKit.framework/Headers/JYangToolKit.h @@ -16,5 +16,14 @@ FOUNDATION_EXPORT const unsigned char JYangToolKitVersionString[]; // In this header, you should import all the public headers of your framework using statements like #import +// 工具类 #import +#import +#import +#import +// 控件类 +#import +#import +#import +#import diff --git a/ios-rongimdemo/framework/JrmfIMLib/JYangToolKit.framework/Headers/JYangTools.h b/ios-rongimdemo/framework/JrmfIMLib/JYangToolKit.framework/Headers/JYangTools.h new file mode 100644 index 00000000..21609578 --- /dev/null +++ b/ios-rongimdemo/framework/JrmfIMLib/JYangToolKit.framework/Headers/JYangTools.h @@ -0,0 +1,232 @@ +// +// JYangTools.h +// JYangToolKit +// +// Created by 金阳 on 16/3/18. +// Copyright © 2016年 JYang. All rights reserved. +// + +#import +#import + +@interface JYangTools : NSObject + +/** + * 获取规定文字在规定范围的Size + * + * @param text 默认文本 + * @param size 规定范围 + * @param font 字体大小 + * + * @return 文本Size值 + */ ++ (CGSize)getSize:(NSString *)text sizeBy:(CGSize)size font:(UIFont *)font; + + +/** + * 获取字符串末4位数 + * + * @param sourceString 源字符串 + * + * @return 末4位字符串 + */ ++ (NSString *)getLastForthStringFromString:(NSString *)sourceString; + + +/** + * 网络地址的汉字转换操作 + * + * @param dataString 待格式化网址 + * + * @return 标准网络地址 + */ ++ (NSString *)getFormatURLFromString:(NSString *)dataString; + +/** + * 身份证号校验 + * + * @param value 输入的字符串 + * + * @return YES 正确 NO 错误 + */ ++ (BOOL)validateIDCardNumber:(NSString *)value; + +/** + * 银行卡号校验 + * + * @param _text 输入的银行卡号 + * + * @return YES 正确 NO 错误 + */ ++ (BOOL)CheckCardNumberInput:(NSString *)_text; + + +/** + * alert信息弹框 + * + * @param msg 展示信息 + * @param presentVC iOS9 之后的present视图 + */ ++ (void)showAlertViewWithMsg:(NSString*)msg presentVC:(UIViewController *)presentVC; + +/** + * alert信息弹框 + * + * @param msg 展示信息 + * @param delegate 代理 + * @param btntxt 按钮文字 + * @param handler 按钮回调 + * @param tag Tag值 + */ ++ (void)showAlertViewWithMsg:(NSString*)msg alertViewDelegate:(UIViewController *)delegate btnTxt:(NSString *)btntxt handler:(void (^)())handler tag:(NSInteger)tag; + +/** + * alert信息弹框 + * + * @param viewController 展示视图 + * @param msg 信息 + * @param lTxt 左按钮文字 + * @param leftHandler 左按钮回调 + * @param rTxt 右按钮文字 + * @param rightHandler 右按钮回调 + * @param tag Tag值 + */ ++ (void)showAlertView:(UIViewController *)viewController message:(NSString *)msg leftTxt:(NSString *)lTxt leftHandler:(void (^)())leftHandler rightTxt:(NSString *)rTxt rightHandler:(void (^)())rightHandler tag:(NSInteger)tag; + + +/** + * 校验手机号是否合法 + * + * @param _text 手机号 + * + * @return YES 正确 NO 错误 + */ ++(BOOL)CheckPhoneInput:(NSString *)_text; + +/** + * 判空 + * + * @param string 输入的字符串 + * + * @return 是否为空 + */ ++ (BOOL)CheckEmptyWithString:(NSString *)string; + +/** + * 格式化身份证号码 + * + * @param sourceString 原字符串 + * + * @return 格式化后的身份证号码 + */ ++ (NSString *)getIDCardNumberHideFromString:(NSString *)sourceString; + +/** + * 获取时间戳 + * + * @return 时间戳 + */ ++ (NSString*)getCurTimeLong; + +/** + 时间戳转日期 + + @param stemp 时间戳 + + @return 日期 + */ ++ (NSString *)getCurTimeDateWithTimeStemp:(NSString *)stemp; + +/** + * 时间戳间隔是否为1Min + * + * @param string 比较时间戳 + * + * @return YES:超过1Min; NO:没超过1Min + */ ++ (NSInteger)isTimeStempForOneMinutes:(NSString *)string; + +/** + * 从bundle中读取图片 + * + * @param name 图片名称 + * + * @return image + */ + ++ (UIImage*)imagesNamedFromCustomBundle:(NSString *)name; + +/** + * 从bundle中读取图片 + + @param bundle bundle名称 + @param name 图片名称 + @return image + */ ++ (UIImage*)imagesNamedFromCustomBundle:(NSString *)bundle imgName:(NSString *)name; + +/** + * 格式化电话号码（131****761） + * + * @param sourceString 源字符串 + * + * @return 格式化后字符串 + */ ++ (NSString *)getPhoneNumberHideFromString:(NSString *)sourceString; + +/** + * 16进制制色 + * + * @param color 16进制字符串 支持@“#123456”、 @“0X123456”、 @“123456”三种格式 + * @param alpha 透明度 + * @param defaultColor 默认颜色 + * + * @return UIColor类型 + */ ++ (UIColor *)colorWithHexString:(NSString *)color alpha:(CGFloat)alpha defaultColor:(UIColor *)defaultColor; + +/** + * base64编码 + * + * @param string 源字符串 + * + * @return 编码后字符串 + */ ++ (NSString *)stringByBase64Encode:(NSString *)string; + +/** + * base64解码 + * + * @param string base64字符串 + * + * @return 解码字符串 + */ ++ (NSString *)stringByBase64Decode:(NSString *)string; + +/** + * 银行卡简单格式校验 + * + * @param cardNo 待校验银行卡号 + * + * @return 格式是否正确 + */ ++ (BOOL)checkBankCardNo:(NSString*)cardNo; + +/** + 颜色生成图片 + + @param color 颜色值 + @return 图片 + */ ++ (UIImage *)createImageWithColor:(UIColor *) color; + +/** + 去除字符串首尾空格 + + @param string 源字符串 + @return 格式化后字符串 + */ ++ (NSString *)TrimmingSpaceCharacterWithString:(NSString *)string; + + +@end diff --git a/ios-rongimdemo/framework/JrmfIMLib/JYangToolKit.framework/Headers/NSDictionary+SafeObj.h b/ios-rongimdemo/framework/JrmfIMLib/JYangToolKit.framework/Headers/NSDictionary+SafeObj.h new file mode 100644 index 00000000..de422965 --- /dev/null +++ b/ios-rongimdemo/framework/JrmfIMLib/JYangToolKit.framework/Headers/NSDictionary+SafeObj.h @@ -0,0 +1,15 @@ +// +// NSDictionary+SafeObj.h +// JYangToolKit +// +// Created by 一路财富 on 16/11/3. +// Copyright © 2016年 JYang. All rights reserved. +// + +#import + +@interface NSDictionary (SafeObj) + +- (NSString *)safeObjectForKey:(id)key; + +@end diff --git a/ios-rongimdemo/framework/JrmfIMLib/JYangToolKit.framework/Headers/UIScrollView+JrmfRefresh.h b/ios-rongimdemo/framework/JrmfIMLib/JYangToolKit.framework/Headers/UIScrollView+JrmfRefresh.h new file mode 100755 index 00000000..6c997366 --- /dev/null +++ b/ios-rongimdemo/framework/JrmfIMLib/JYangToolKit.framework/Headers/UIScrollView+JrmfRefresh.h @@ -0,0 +1,111 @@ +// +// UIScrollView+JrmfRefresh.h +// JrmfRefreshExample +// +// Created by MJ Lee on 14-5-28. +// Copyright (c) 2014年 itcast. All rights reserved. +// + +// 版权属于原作者 +// http://code4app.com (cn) http://code4app.net (en) +// 发布代码于最专业的源码分享网站: Code4App.com + +#import + +@interface UIScrollView (JrmfRefresh) +#pragma mark - 下拉刷新 +/** + * 添加一个下拉刷新头部控件 + * + * @param callback 回调 + */ +- (void)addJrmfHeaderWithCallback:(void (^)())callback; + +/** + * 添加一个下拉刷新头部控件 + * + * @param target 目标 + * @param action 回调方法 + */ +- (void)addJrmfHeaderWithTarget:(id)target action:(SEL)action; + +/** + * 移除下拉刷新头部控件 + */ +- (void)removeJrmfHeader; + +/** + * 主动让下拉刷新头部控件进入刷新状态 + */ +- (void)JrmfheaderBeginRefreshing; + +/** + * 让下拉刷新头部控件停止刷新状态 + */ +- (void)JrmfheaderEndRefreshing; + +/** + * 下拉刷新头部控件的可见性 + */ +@property (nonatomic, assign, getter = isJrmfHeaderHidden) BOOL JrmfheaderHidden; + +/** + * 是否正在下拉刷新 + */ +@property (nonatomic, assign, readonly, getter = isJrmfHeaderRefreshing) BOOL headerRefreshing; + +#pragma mark - 上拉刷新 +/** + * 添加一个上拉刷新尾部控件 + * + * @param callback 回调 + */ +- (void)addJrmfFooterWithCallback:(void (^)())callback; + +/** + * 添加一个上拉刷新尾部控件 + * + * @param target 目标 + * @param action 回调方法 + */ +- (void)addJrmfFooterWithTarget:(id)target action:(SEL)action; + +/** + * 移除上拉刷新尾部控件 + */ +- (void)removeJrmfFooter; + +/** + * 主动让上拉刷新尾部控件进入刷新状态 + */ +- (void)JrmffooterBeginRefreshing; + +/** + * 让上拉刷新尾部控件停止刷新状态 + */ +- (void)JrmffooterEndRefreshing; + +/** + * 上拉刷新头部控件的可见性 + */ +@property (nonatomic, assign, getter = isJrmfFooterHidden) BOOL JrmffooterHidden; + +/** + * 是否正在上拉刷新 + */ +@property (nonatomic, assign, readonly, getter = isJrmfFooterRefreshing) BOOL footerRefreshing; + +/** + * 设置尾部控件的文字 + */ +@property (copy, nonatomic) NSString *JrmffooterPullToRefreshText; // 默认:@"上拉可以加载更多数据" +@property (copy, nonatomic) NSString *JrmffooterReleaseToRefreshText; // 默认:@"松开立即加载更多数据" +@property (copy, nonatomic) NSString *JrmffooterRefreshingText; // 默认:@"正在加载数据..." + +/** + * 设置头部控件的文字 + */ +@property (copy, nonatomic) NSString *JrmfheaderPullToRefreshText; // 默认:@"下拉可以刷新" +@property (copy, nonatomic) NSString *JrmfheaderReleaseToRefreshText; // 默认:@"松开立即刷新" +@property (copy, nonatomic) NSString *JrmfheaderRefreshingText; // 默认:@"正在刷新..." +@end diff --git a/ios-rongimdemo/framework/JrmfIMLib/JYangToolKit.framework/Headers/UISecretTextField.h b/ios-rongimdemo/framework/JrmfIMLib/JYangToolKit.framework/Headers/UISecretTextField.h new file mode 100644 index 00000000..fcc21c0e --- /dev/null +++ b/ios-rongimdemo/framework/JrmfIMLib/JYangToolKit.framework/Headers/UISecretTextField.h @@ -0,0 +1,14 @@ +// +// UISecretTextField.h +// RedEnvelopeDemo +// +// Created by 一路财富 on 16/3/31. +// Copyright © 2016年 一路财富. All rights reserved. +// +// 不允许复制粘贴的UITextFied + +#import + +@interface UISecretTextField : UITextField + +@end diff --git a/ios-rongimdemo/framework/JrmfIMLib/JYangToolKit.framework/Headers/UITapLabel.h b/ios-rongimdemo/framework/JrmfIMLib/JYangToolKit.framework/Headers/UITapLabel.h new file mode 100644 index 00000000..f825bf5b --- /dev/null +++ b/ios-rongimdemo/framework/JrmfIMLib/JYangToolKit.framework/Headers/UITapLabel.h @@ -0,0 +1,41 @@ +// +// UITapLabel.h +// RedEnvelopeDemo +// +// Created by 一路财富 on 16/2/27. +// Copyright © 2016年 一路财富. All rights reserved. +// +// 可点击的UILabel + +#import + +@class UITapLabel; +@protocol UITapLabelDelegate + +@required +/** + * UITapLabel 代理函数 + * + * @param tapLabel 当前UITapLabel + * @param tag 当前UITapLabel的Tag值 + */ +- (void)tapLabel:(UITapLabel *)tapLabel touchesWithTag:(NSInteger)tag; + +@end + +@interface UITapLabel : UILabel + +@property (nonatomic, assign) id delegate; + +/** + * 字体颜色 + */ +@property (nonatomic, strong) UIColor * txtColor; + +/** + * 是否可点击 + */ +@property (nonatomic, assign) BOOL enable; + + +@end diff --git a/ios-rongimdemo/framework/JrmfIMLib/JYangToolKit.framework/Headers/UIThemeButton.h b/ios-rongimdemo/framework/JrmfIMLib/JYangToolKit.framework/Headers/UIThemeButton.h new file mode 100644 index 00000000..50d897cb --- /dev/null +++ b/ios-rongimdemo/framework/JrmfIMLib/JYangToolKit.framework/Headers/UIThemeButton.h @@ -0,0 +1,32 @@ +// +// UIThemeButton.h +// JrmfWalletKit +// +// Created by 一路财富 on 16/10/31. +// Copyright © 2016年 JYang. All rights reserved. +// + +#import + +@interface UIThemeButton : UIButton + +/** + 自定义按钮 + + @param Ori_Y Y值 + @param bgColor 默认颜色 + @return 按钮 + */ +- (instancetype)initWithOri_Y:(float)Ori_Y WithThemeColor:(UIColor *)bgColor; + +/** + 自定义按钮 + + @param frame 位置 + @param bgColor 默认颜色 + @return 按钮 + */ +- (instancetype)initWithFrame:(CGRect)frame WithThemeColor:(UIColor *)bgColor; + + +@end diff --git a/ios-rongimdemo/framework/JrmfIMLib/JYangToolKit.framework/Headers/UIView+Frame.h b/ios-rongimdemo/framework/JrmfIMLib/JYangToolKit.framework/Headers/UIView+Frame.h new file mode 100644 index 00000000..3ce98cb2 --- /dev/null +++ b/ios-rongimdemo/framework/JrmfIMLib/JYangToolKit.framework/Headers/UIView+Frame.h @@ -0,0 +1,21 @@ +// +// UIView+Frame.h +// JrmfWalletKit +// +// Created by 一路财富 on 16/11/2. +// Copyright © 2016年 JYang. All rights reserved. +// + +#import + +@interface UIView (Frame) + +@property (nonatomic, assign) CGFloat x; +@property (nonatomic, assign) CGFloat y; +@property (nonatomic, assign) CGFloat width; +@property (nonatomic, assign) CGFloat height; +@property (nonatomic, assign) CGPoint origin; +@property (nonatomic, assign) CGSize size; + + +@end diff --git a/ios-rongimdemo/framework/JrmfIMLib/JYangToolKit.framework/Info.plist b/ios-rongimdemo/framework/JrmfIMLib/JYangToolKit.framework/Info.plist index 7ec9cf6d..4229e813 100644 Binary files a/ios-rongimdemo/framework/JrmfIMLib/JYangToolKit.framework/Info.plist and b/ios-rongimdemo/framework/JrmfIMLib/JYangToolKit.framework/Info.plist differ diff --git a/ios-rongimdemo/framework/JrmfIMLib/JYangToolKit.framework/JYangToolKit b/ios-rongimdemo/framework/JrmfIMLib/JYangToolKit.framework/JYangToolKit index 60f2ba3c..6a72730b 100644 Binary files a/ios-rongimdemo/framework/JrmfIMLib/JYangToolKit.framework/JYangToolKit and b/ios-rongimdemo/framework/JrmfIMLib/JYangToolKit.framework/JYangToolKit differ diff --git a/ios-rongimdemo/framework/JrmfIMLib/JrmfPacketKit.framework/Headers/JrmfPacketKit.h b/ios-rongimdemo/framework/JrmfIMLib/JrmfPacketKit.framework/Headers/JrmfPacketKit.h index c8c4e8ef..37467406 100644 --- a/ios-rongimdemo/framework/JrmfIMLib/JrmfPacketKit.framework/Headers/JrmfPacketKit.h +++ b/ios-rongimdemo/framework/JrmfIMLib/JrmfPacketKit.framework/Headers/JrmfPacketKit.h @@ -17,5 +17,5 @@ FOUNDATION_EXPORT const unsigned char JrmfPacketManagerKitVersionString[]; // In this header, you should import all the public headers of your framework using statements like #import -#import +#import diff --git a/ios-rongimdemo/framework/JrmfIMLib/JrmfPacketKit.framework/Headers/JrmfPacketManager.h b/ios-rongimdemo/framework/JrmfIMLib/JrmfPacketKit.framework/Headers/JrmfPacketManager.h index 85195392..5a688f0a 100644 --- a/ios-rongimdemo/framework/JrmfIMLib/JrmfPacketKit.framework/Headers/JrmfPacketManager.h +++ b/ios-rongimdemo/framework/JrmfIMLib/JrmfPacketKit.framework/Headers/JrmfPacketManager.h @@ -13,11 +13,6 @@ @interface JrmfPacketManager : NSObject -/** - 打开我的钱包 - */ -+ (void)getEventOpenWallet; - /** 获取当前SDK版本 diff --git a/ios-rongimdemo/framework/JrmfIMLib/JrmfPacketKit.framework/Info.plist b/ios-rongimdemo/framework/JrmfIMLib/JrmfPacketKit.framework/Info.plist index 75b601cf..84942103 100644 Binary files a/ios-rongimdemo/framework/JrmfIMLib/JrmfPacketKit.framework/Info.plist and b/ios-rongimdemo/framework/JrmfIMLib/JrmfPacketKit.framework/Info.plist differ diff --git a/ios-rongimdemo/framework/JrmfIMLib/JrmfPacketKit.framework/JrmfPacketKit b/ios-rongimdemo/framework/JrmfIMLib/JrmfPacketKit.framework/JrmfPacketKit index cdf6f54d..7638c7c5 100644 Binary files a/ios-rongimdemo/framework/JrmfIMLib/JrmfPacketKit.framework/JrmfPacketKit and b/ios-rongimdemo/framework/JrmfIMLib/JrmfPacketKit.framework/JrmfPacketKit differ diff --git a/ios-rongimdemo/framework/JrmfIMLib/JrmfWalletKit.framework/Headers/JrmfWalletKit.h b/ios-rongimdemo/framework/JrmfIMLib/JrmfWalletKit.framework/Headers/JrmfWalletKit.h new file mode 100644 index 00000000..6d5a6709 --- /dev/null +++ b/ios-rongimdemo/framework/JrmfIMLib/JrmfWalletKit.framework/Headers/JrmfWalletKit.h @@ -0,0 +1,19 @@ +// +// JrmfWalletKit.h +// JrmfWalletKit +// +// Created by 一路财富 on 16/10/17. +// Copyright © 2016年 JYang. All rights reserved. +// + +#import + +//! Project version number for JrmfWalletKit. +FOUNDATION_EXPORT double JrmfWalletKitVersionNumber; + +//! Project version string for JrmfWalletKit. +FOUNDATION_EXPORT const unsigned char JrmfWalletKitVersionString[]; + +// In this header, you should import all the public headers of your framework using statements like #import + +#import diff --git a/ios-rongimdemo/framework/JrmfIMLib/JrmfWalletKit.framework/Headers/JrmfWalletSDK.h b/ios-rongimdemo/framework/JrmfIMLib/JrmfWalletKit.framework/Headers/JrmfWalletSDK.h new file mode 100644 index 00000000..1c95ac38 --- /dev/null +++ b/ios-rongimdemo/framework/JrmfIMLib/JrmfWalletKit.framework/Headers/JrmfWalletSDK.h @@ -0,0 +1,88 @@ +// +// JrmfWalletSDK.h +// JrmfWalletKit +// +// Created by 一路财富 on 16/10/17. +// Copyright © 2016年 JYang. All rights reserved. +// + +#import +#import + +@interface JrmfWalletSDK : NSObject + +/** + 标准字体大小，默认14.f; + */ +@property (nonatomic, assign) CGFloat themeFontSize; + +/** + 钱包页顶部主题色，默认#157EFB + */ +@property (nonatomic, strong) UIColor * themePageColor; + +/** + 钱包页，充值、提现按钮颜色，默认#0665D6 + */ +@property (nonatomic, strong) UIColor * pageBtnColor; + +/** + 按钮主题色，默认#157EFB + */ +@property (nonatomic, strong) UIColor * themeBtnColor; + +/** + Navigation主题色，默认#157EFB + */ +@property (nonatomic, strong) UIColor * themeNavColor; + +/** + 标题颜色，默认白色 + */ +@property (nonatomic, strong) UIColor * NavTitColor; + +/** + 标题栏字体大小，默认16.f + */ +@property (nonatomic, assign) CGFloat NavTitfontSize; + +/** + 首页金额大小，默认22.f + */ +@property (nonatomic, assign) CGFloat pageChargeFont; + +/** + 钱包标题，默认“我的钱包” + */ +@property (nonatomic, strong) NSString * pageTitleStr; + + +/** + 初始化函数 + + @param partnerId 渠道ID（我们分配给贵公司的渠道名称） + */ ++ (void)instanceJrmfWalletSDKWithPartnerId:(NSString *)partnerId; + + +/** + 初始化三方令牌 + + @param thirdToken 三方令牌 + */ ++ (void)instanceJrmfWalletSDKWithThirdToken:(NSString *)thirdToken; + + +/** + 打开我的钱包 + */ ++ (void)openWallet; + +/** + 获取当前版本 + + @return 版本号 + */ ++ (NSString *)getCurrentVersion; + +@end diff --git a/ios-rongimdemo/framework/JrmfIMLib/JrmfWalletKit.framework/Info.plist b/ios-rongimdemo/framework/JrmfIMLib/JrmfWalletKit.framework/Info.plist new file mode 100644 index 00000000..988441a4 Binary files /dev/null and b/ios-rongimdemo/framework/JrmfIMLib/JrmfWalletKit.framework/Info.plist differ diff --git a/ios-rongimdemo/framework/JrmfIMLib/JrmfWalletKit.framework/JrmfWalletKit b/ios-rongimdemo/framework/JrmfIMLib/JrmfWalletKit.framework/JrmfWalletKit new file mode 100644 index 00000000..545bdb20 Binary files /dev/null and b/ios-rongimdemo/framework/JrmfIMLib/JrmfWalletKit.framework/JrmfWalletKit differ diff --git a/ios-rongimdemo/framework/JrmfIMLib/WalletResource.bundle/arrow@2x.png b/ios-rongimdemo/framework/JrmfIMLib/WalletResource.bundle/arrow@2x.png new file mode 100755 index 00000000..a016473b Binary files /dev/null and b/ios-rongimdemo/framework/JrmfIMLib/WalletResource.bundle/arrow@2x.png differ diff --git a/ios-rongimdemo/framework/JrmfIMLib/WalletResource.bundle/bg_pwd@2x.png b/ios-rongimdemo/framework/JrmfIMLib/WalletResource.bundle/bg_pwd@2x.png new file mode 100644 index 00000000..e5a52e35 Binary files /dev/null and b/ios-rongimdemo/framework/JrmfIMLib/WalletResource.bundle/bg_pwd@2x.png differ diff --git a/ios-rongimdemo/framework/JrmfIMLib/WalletResource.bundle/bg_pwd_L@2x.png b/ios-rongimdemo/framework/JrmfIMLib/WalletResource.bundle/bg_pwd_L@2x.png new file mode 100644 index 00000000..b13218b0 Binary files /dev/null and b/ios-rongimdemo/framework/JrmfIMLib/WalletResource.bundle/bg_pwd_L@2x.png differ diff --git a/ios-rongimdemo/framework/JrmfIMLib/WalletResource.bundle/btn_exit@2x.png b/ios-rongimdemo/framework/JrmfIMLib/WalletResource.bundle/btn_exit@2x.png new file mode 100644 index 00000000..c831e2fc Binary files /dev/null and b/ios-rongimdemo/framework/JrmfIMLib/WalletResource.bundle/btn_exit@2x.png differ diff --git a/ios-rongimdemo/framework/JrmfIMLib/WalletResource.bundle/btn_line@2x.png b/ios-rongimdemo/framework/JrmfIMLib/WalletResource.bundle/btn_line@2x.png new file mode 100644 index 00000000..0f272a0c Binary files /dev/null and b/ios-rongimdemo/framework/JrmfIMLib/WalletResource.bundle/btn_line@2x.png differ diff --git a/ios-rongimdemo/framework/JrmfIMLib/WalletResource.bundle/ic_add@2x.png b/ios-rongimdemo/framework/JrmfIMLib/WalletResource.bundle/ic_add@2x.png new file mode 100644 index 00000000..9a8db8bc Binary files /dev/null and b/ios-rongimdemo/framework/JrmfIMLib/WalletResource.bundle/ic_add@2x.png differ diff --git a/ios-rongimdemo/framework/JrmfIMLib/WalletResource.bundle/ic_arrow@2x.png b/ios-rongimdemo/framework/JrmfIMLib/WalletResource.bundle/ic_arrow@2x.png new file mode 100644 index 00000000..68924cf3 Binary files /dev/null and b/ios-rongimdemo/framework/JrmfIMLib/WalletResource.bundle/ic_arrow@2x.png differ diff --git a/ios-rongimdemo/framework/JrmfIMLib/WalletResource.bundle/ic_card@2x.png b/ios-rongimdemo/framework/JrmfIMLib/WalletResource.bundle/ic_card@2x.png new file mode 100644 index 00000000..5a8b1312 Binary files /dev/null and b/ios-rongimdemo/framework/JrmfIMLib/WalletResource.bundle/ic_card@2x.png differ diff --git a/ios-rongimdemo/framework/JrmfIMLib/WalletResource.bundle/ic_charge@2x.png b/ios-rongimdemo/framework/JrmfIMLib/WalletResource.bundle/ic_charge@2x.png new file mode 100644 index 00000000..e6cab032 Binary files /dev/null and b/ios-rongimdemo/framework/JrmfIMLib/WalletResource.bundle/ic_charge@2x.png differ diff --git a/ios-rongimdemo/framework/JrmfIMLib/WalletResource.bundle/ic_crown@2x.png b/ios-rongimdemo/framework/JrmfIMLib/WalletResource.bundle/ic_crown@2x.png new file mode 100644 index 00000000..662297eb Binary files /dev/null and b/ios-rongimdemo/framework/JrmfIMLib/WalletResource.bundle/ic_crown@2x.png differ diff --git a/ios-rongimdemo/framework/JrmfIMLib/WalletResource.bundle/ic_in@2x.png b/ios-rongimdemo/framework/JrmfIMLib/WalletResource.bundle/ic_in@2x.png new file mode 100644 index 00000000..5581aea5 Binary files /dev/null and b/ios-rongimdemo/framework/JrmfIMLib/WalletResource.bundle/ic_in@2x.png differ diff --git a/ios-rongimdemo/framework/JrmfIMLib/WalletResource.bundle/ic_me@2x.png b/ios-rongimdemo/framework/JrmfIMLib/WalletResource.bundle/ic_me@2x.png new file mode 100644 index 00000000..c7c015e1 Binary files /dev/null and b/ios-rongimdemo/framework/JrmfIMLib/WalletResource.bundle/ic_me@2x.png differ diff --git a/ios-rongimdemo/framework/JrmfIMLib/WalletResource.bundle/ic_null@2x.png b/ios-rongimdemo/framework/JrmfIMLib/WalletResource.bundle/ic_null@2x.png new file mode 100644 index 00000000..a1d8828c Binary files /dev/null and b/ios-rongimdemo/framework/JrmfIMLib/WalletResource.bundle/ic_null@2x.png differ diff --git a/ios-rongimdemo/framework/JrmfIMLib/WalletResource.bundle/ic_out@2x.png b/ios-rongimdemo/framework/JrmfIMLib/WalletResource.bundle/ic_out@2x.png new file mode 100644 index 00000000..52e47af0 Binary files /dev/null and b/ios-rongimdemo/framework/JrmfIMLib/WalletResource.bundle/ic_out@2x.png differ diff --git a/ios-rongimdemo/framework/JrmfIMLib/WalletResource.bundle/ic_pin@2x.png b/ios-rongimdemo/framework/JrmfIMLib/WalletResource.bundle/ic_pin@2x.png new file mode 100644 index 00000000..41bd7b66 Binary files /dev/null and b/ios-rongimdemo/framework/JrmfIMLib/WalletResource.bundle/ic_pin@2x.png differ diff --git a/ios-rongimdemo/framework/JrmfIMLib/WalletResource.bundle/ic_point@2x.png b/ios-rongimdemo/framework/JrmfIMLib/WalletResource.bundle/ic_point@2x.png new file mode 100644 index 00000000..a48181f1 Binary files /dev/null and b/ios-rongimdemo/framework/JrmfIMLib/WalletResource.bundle/ic_point@2x.png differ diff --git a/ios-rongimdemo/framework/JrmfIMLib/WalletResource.bundle/ic_selected@2x.png b/ios-rongimdemo/framework/JrmfIMLib/WalletResource.bundle/ic_selected@2x.png new file mode 100644 index 00000000..d0a39993 Binary files /dev/null and b/ios-rongimdemo/framework/JrmfIMLib/WalletResource.bundle/ic_selected@2x.png differ diff --git a/ios-rongimdemo/framework/JrmfIMLib/WalletResource.bundle/ic_selected_blue@2x.png b/ios-rongimdemo/framework/JrmfIMLib/WalletResource.bundle/ic_selected_blue@2x.png new file mode 100644 index 00000000..300b6bca Binary files /dev/null and b/ios-rongimdemo/framework/JrmfIMLib/WalletResource.bundle/ic_selected_blue@2x.png differ diff --git a/ios-rongimdemo/framework/JrmfIMLib/WalletResource.bundle/ic_success@2x.png b/ios-rongimdemo/framework/JrmfIMLib/WalletResource.bundle/ic_success@2x.png new file mode 100644 index 00000000..c6da27f9 Binary files /dev/null and b/ios-rongimdemo/framework/JrmfIMLib/WalletResource.bundle/ic_success@2x.png differ diff --git a/ios-rongimdemo/framework/JrmfIMLib/WalletResource.bundle/ic_top_back_white@2x.png b/ios-rongimdemo/framework/JrmfIMLib/WalletResource.bundle/ic_top_back_white@2x.png new file mode 100644 index 00000000..e67ae65c Binary files /dev/null and b/ios-rongimdemo/framework/JrmfIMLib/WalletResource.bundle/ic_top_back_white@2x.png differ diff --git a/ios-rongimdemo/framework/JrmfIMLib/WalletResource.bundle/pic_card@2x.png b/ios-rongimdemo/framework/JrmfIMLib/WalletResource.bundle/pic_card@2x.png new file mode 100644 index 00000000..197cebac Binary files /dev/null and b/ios-rongimdemo/framework/JrmfIMLib/WalletResource.bundle/pic_card@2x.png differ diff --git a/ios-rongimdemo/framework/JrmfIMLib/WalletResource.bundle/pic_charge@2x.png b/ios-rongimdemo/framework/JrmfIMLib/WalletResource.bundle/pic_charge@2x.png new file mode 100644 index 00000000..2526a52b Binary files /dev/null and b/ios-rongimdemo/framework/JrmfIMLib/WalletResource.bundle/pic_charge@2x.png differ diff --git a/ios-rongimdemo/framework/JrmfIMLib/WalletResource.bundle/pic_list@2x.png b/ios-rongimdemo/framework/JrmfIMLib/WalletResource.bundle/pic_list@2x.png new file mode 100644 index 00000000..6b036ba4 Binary files /dev/null and b/ios-rongimdemo/framework/JrmfIMLib/WalletResource.bundle/pic_list@2x.png differ diff --git a/ios-rongimdemo/framework/JrmfIMLib/WalletResource.bundle/pic_packet@2x.png b/ios-rongimdemo/framework/JrmfIMLib/WalletResource.bundle/pic_packet@2x.png new file mode 100644 index 00000000..d4ba0a1f Binary files /dev/null and b/ios-rongimdemo/framework/JrmfIMLib/WalletResource.bundle/pic_packet@2x.png differ diff --git a/ios-rongimdemo/framework/JrmfIMLib/WalletResource.bundle/pic_safe@2x.png b/ios-rongimdemo/framework/JrmfIMLib/WalletResource.bundle/pic_safe@2x.png new file mode 100644 index 00000000..796e43cd Binary files /dev/null and b/ios-rongimdemo/framework/JrmfIMLib/WalletResource.bundle/pic_safe@2x.png differ diff --git a/ios-rongimdemo/framework/JrmfIMLib/WalletResource.bundle/pic_user@2x.png b/ios-rongimdemo/framework/JrmfIMLib/WalletResource.bundle/pic_user@2x.png new file mode 100644 index 00000000..a245484b Binary files /dev/null and b/ios-rongimdemo/framework/JrmfIMLib/WalletResource.bundle/pic_user@2x.png differ diff --git a/ios-rongimdemo/framework/JrmfIMLib/jrmf.cer b/ios-rongimdemo/framework/JrmfIMLib/jrmf.cer new file mode 100644 index 00000000..806afb33 Binary files /dev/null and b/ios-rongimdemo/framework/JrmfIMLib/jrmf.cer differ diff --git a/ios-rongimdemo/framework/RongCallKit.framework/Headers/RCCallSingleCallViewController.h b/ios-rongimdemo/framework/RongCallKit.framework/Headers/RCCallSingleCallViewController.h index 97102b7f..23aaeb5b 100644 --- a/ios-rongimdemo/framework/RongCallKit.framework/Headers/RCCallSingleCallViewController.h +++ b/ios-rongimdemo/framework/RongCallKit.framework/Headers/RCCallSingleCallViewController.h @@ -24,6 +24,11 @@ */ @property(nonatomic, strong) UILabel *remoteNameLabel; +/*! + 全屏的视频View + */ +@property(nonatomic, strong) UIView *mainVideoView; + /*! 通话接通后，界面右上角的视频View */ diff --git a/ios-rongimdemo/framework/RongCallKit.framework/Info.plist b/ios-rongimdemo/framework/RongCallKit.framework/Info.plist index 7dc2db35..88b999f5 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 ed11c8bf..f5979096 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/Headers/RCCallClient.h b/ios-rongimdemo/framework/RongCallLib.framework/Headers/RCCallClient.h index c5b1720c..2156565e 100644 --- a/ios-rongimdemo/framework/RongCallLib.framework/Headers/RCCallClient.h +++ b/ios-rongimdemo/framework/RongCallLib.framework/Headers/RCCallClient.h @@ -110,19 +110,13 @@ */ - (BOOL)isVideoCallEnabled:(RCConversationType)conversationType; -/*! - 是否支持在服务器端录制当前通话 - - @return 是否支持在服务器端录制当前通话 - */ -- (BOOL)isServerRecordingEnabled; - /** * 设置本地视频属性，可用此接口设置本地视频分辨率。 * * @param profile profile */ - (void)setVideoProfile:(RCVideoProfile)profile; + /*! 当前的通话会话实体 */ diff --git a/ios-rongimdemo/framework/RongCallLib.framework/Headers/RCCallCommonDefine.h b/ios-rongimdemo/framework/RongCallLib.framework/Headers/RCCallCommonDefine.h index 417e87d8..e6e9861a 100644 --- a/ios-rongimdemo/framework/RongCallLib.framework/Headers/RCCallCommonDefine.h +++ b/ios-rongimdemo/framework/RongCallLib.framework/Headers/RCCallCommonDefine.h @@ -23,6 +23,19 @@ typedef NS_ENUM(NSInteger, RCCallMediaType) { RCCallMediaVideo = 2, }; +/*! + 通话质量 + */ +typedef NS_ENUM(NSUInteger, RCCallQuality) { + RCCall_Quality_Unknown = 0, + RCCall_Quality_Excellent = 1, + RCCall_Quality_Good = 2, + RCCall_Quality_Poor = 3, + RCCall_Quality_Bad = 4, + RCCall_Quality_VBad = 5, + RCCall_Quality_Down = 6, +}; + #pragma mark - Call /*! diff --git a/ios-rongimdemo/framework/RongCallLib.framework/Headers/RCCallSession.h b/ios-rongimdemo/framework/RongCallLib.framework/Headers/RCCallSession.h index d7ebf12f..0788072f 100644 --- a/ios-rongimdemo/framework/RongCallLib.framework/Headers/RCCallSession.h +++ b/ios-rongimdemo/framework/RongCallLib.framework/Headers/RCCallSession.h @@ -105,41 +105,13 @@ - (void)errorDidOccur:(RCCallErrorCode)error; /*! - 开启在服务器录制当前通话的回调 + 当前通话网络状态的回调，该回调方法每两秒触发一次 - @param startSuccess 是否成功开始录制 - @param channel 正在录制的频道 - @param mediaId 当前用户的媒体连接id - @param errorCode 失败的错误码 + @param txQuality 上行网络质量 + @param rxQuality 下行网络质量 */ -- (void)resultForStartServerRecording:(BOOL)startSuccess - recordingChannel:(NSString *)channel - recordingMediaId:(int)mediaId - errorCode:(RCCallErrorCode)errorCode; - -/*! - 停止在服务器录制当前通话的回调 - - @param stopSuccess 是否成功停止 - @param errorCode 失败的错误码 - */ -- (void)resultForStopServerRecording:(BOOL)stopSuccess - errorCode:(RCCallErrorCode)errorCode; - -/*! - 查询当前通话在服务器的录制状态的回调 - - @param fetchSuccess 是否成功查询成功。如果为YES，则表示查询成功，isRecording为服务器当前是否正在录制的状态 - @param channel 正在录制的频道 - @param mediaId 当前用户的媒体连接id - @param isRecording 服务器是否正在录制 - @param errorCode 查询失败的错误码 - */ -- (void)resultForFetchServerRecordingStatus:(BOOL)fetchSuccess - recordingChannel:(NSString *)channel - recordingMediaId:(int)mediaId - status:(BOOL)isRecording - errorCode:(RCCallErrorCode)errorCode; +- (void)networkTxQuality:(RCCallQuality)txQuality + rxQuality:(RCCallQuality)rxQuality; @end @@ -311,25 +283,4 @@ */ - (BOOL)switchCameraMode; -/*! - 开始在服务器录制当前通话 - - @discussion 调用此接口的时候，当前通话必须已经接通。 - */ -- (void)startServerRecording; - -/*! - 停止在服务器录制当前通话 - - @discussion 调用此接口的时候，当前通话必须已经接通。 - */ -- (void)stopServerRecording; - -/*! - 查询当前通话在服务器端的录制状态 - - @discussion 调用此接口的时候，当前通话必须已经接通。 - */ -- (void)fetchServerRecordingStatus; - @end diff --git a/ios-rongimdemo/framework/RongCallLib.framework/Info.plist b/ios-rongimdemo/framework/RongCallLib.framework/Info.plist index 36599fda..894bc64a 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 76a38fa9..e50c3dea 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/RongCloud.bundle/Comment.png b/ios-rongimdemo/framework/RongCloud.bundle/Comment.png new file mode 100644 index 00000000..648ffedd Binary files /dev/null and b/ios-rongimdemo/framework/RongCloud.bundle/Comment.png differ diff --git a/ios-rongimdemo/framework/RongCloud.bundle/Resolved-hover.png b/ios-rongimdemo/framework/RongCloud.bundle/Resolved-hover.png new file mode 100644 index 00000000..87a61183 Binary files /dev/null and b/ios-rongimdemo/framework/RongCloud.bundle/Resolved-hover.png differ diff --git a/ios-rongimdemo/framework/RongCloud.bundle/Resolved.png b/ios-rongimdemo/framework/RongCloud.bundle/Resolved.png new file mode 100644 index 00000000..a7b4c25a Binary files /dev/null and b/ios-rongimdemo/framework/RongCloud.bundle/Resolved.png differ diff --git a/ios-rongimdemo/framework/RongCloud.bundle/blue.png b/ios-rongimdemo/framework/RongCloud.bundle/blue.png new file mode 100644 index 00000000..f95a51c2 Binary files /dev/null and b/ios-rongimdemo/framework/RongCloud.bundle/blue.png differ diff --git "a/ios-rongimdemo/framework/RongCloud.bundle/blue\357\274\215hover.png" "b/ios-rongimdemo/framework/RongCloud.bundle/blue\357\274\215hover.png" new file mode 100644 index 00000000..f1da00c3 Binary files /dev/null and "b/ios-rongimdemo/framework/RongCloud.bundle/blue\357\274\215hover.png" differ diff --git a/ios-rongimdemo/framework/RongCloud.bundle/close.png b/ios-rongimdemo/framework/RongCloud.bundle/close.png new file mode 100644 index 00000000..9ceb1457 Binary files /dev/null and b/ios-rongimdemo/framework/RongCloud.bundle/close.png differ diff --git a/ios-rongimdemo/framework/RongCloud.bundle/follow-hover.png b/ios-rongimdemo/framework/RongCloud.bundle/follow-hover.png new file mode 100644 index 00000000..ecbc4d29 Binary files /dev/null and b/ios-rongimdemo/framework/RongCloud.bundle/follow-hover.png differ diff --git a/ios-rongimdemo/framework/RongCloud.bundle/follow.png b/ios-rongimdemo/framework/RongCloud.bundle/follow.png new file mode 100644 index 00000000..42d72433 Binary files /dev/null and b/ios-rongimdemo/framework/RongCloud.bundle/follow.png differ diff --git a/ios-rongimdemo/framework/RongCloud.bundle/noSolve-hover.png b/ios-rongimdemo/framework/RongCloud.bundle/noSolve-hover.png new file mode 100644 index 00000000..c253bd2a Binary files /dev/null and b/ios-rongimdemo/framework/RongCloud.bundle/noSolve-hover.png differ diff --git a/ios-rongimdemo/framework/RongCloud.bundle/noSolve.png b/ios-rongimdemo/framework/RongCloud.bundle/noSolve.png new file mode 100644 index 00000000..b29512a2 Binary files /dev/null and b/ios-rongimdemo/framework/RongCloud.bundle/noSolve.png differ diff --git a/ios-rongimdemo/framework/RongIMKit.framework/Headers/RCChatSessionInputBarControl.h b/ios-rongimdemo/framework/RongIMKit.framework/Headers/RCChatSessionInputBarControl.h index 85eaf422..061a737f 100644 --- a/ios-rongimdemo/framework/RongIMKit.framework/Headers/RCChatSessionInputBarControl.h +++ b/ios-rongimdemo/framework/RongIMKit.framework/Headers/RCChatSessionInputBarControl.h @@ -21,6 +21,7 @@ #define PLUGIN_BOARD_ITEM_VOIP_TAG 1101 #define PLUGIN_BOARD_ITEM_VIDEO_VOIP_TAG 1102 #define PLUGIN_BOARD_ITEM_FILE_TAG 1006 +#define PLUGIN_BOARD_ITEM_EVA_TAG 1103 /*! @@ -222,7 +223,7 @@ typedef NS_ENUM(NSInteger, KBottomBarStatus) { @property(strong, nonatomic) UIButton *additionalButton; /*! - 所处的聊天界面View + 所处的会话页面View */ @property(assign, nonatomic, readonly) UIView *containerView; @@ -231,7 +232,7 @@ typedef NS_ENUM(NSInteger, KBottomBarStatus) { */ @property(nonatomic) KBottomBarStatus currentBottomBarStatus; /*! - 所处的聊天界面View + 所处的会话页面View @warning **已废弃，请勿使用。** 升级说明：如果您之前使用了此属性，可以直接替换为contextView属性，行为和实现完全一致。 @@ -291,7 +292,7 @@ __deprecated_msg("已废弃，请勿使用。"); 初始化输入工具栏 @param frame 显示的Frame - @param containerView 所处的聊天界面View + @param containerView 所处的会话页面View @param controlType 菜单类型 @param controlStyle 显示布局 @param defaultInputType 默认的输入模式 @@ -310,7 +311,7 @@ __deprecated_msg("已废弃，请勿使用。"); @param type 菜单类型 @param style 显示布局 - @discussion 您可以在聊天界面RCConversationViewController的viewDidLoad之后设置，改变输入工具栏的样式。 + @discussion 您可以在会话页面RCConversationViewController的viewDidLoad之后设置，改变输入工具栏的样式。 */ - (void)setInputBarType:(RCChatSessionInputBarControlType)type style:(RCChatSessionInputBarControlStyle)style; @@ -350,7 +351,7 @@ __deprecated_msg("已废弃，请勿使用。"); @param status 输入框状态 @param animated 是否使用动画效果 - @discussion 如果需要设置，请在输入框执行containerViewWillAppear之后（即聊天界面viewWillAppear之后）。 + @discussion 如果需要设置，请在输入框执行containerViewWillAppear之后（即会话页面viewWillAppear之后）。 */ -(void)updateStatus:(KBottomBarStatus)status animated:(BOOL)animated; diff --git a/ios-rongimdemo/framework/RongIMKit.framework/Headers/RCConversationListViewController.h b/ios-rongimdemo/framework/RongIMKit.framework/Headers/RCConversationListViewController.h index 9d65f0da..966ee26f 100644 --- a/ios-rongimdemo/framework/RongIMKit.framework/Headers/RCConversationListViewController.h +++ b/ios-rongimdemo/framework/RongIMKit.framework/Headers/RCConversationListViewController.h @@ -147,7 +147,7 @@ @param model 当前点击的会话的Model @param indexPath 当前会话在列表数据源中的索引值 - @discussion 您需要重写此点击事件，跳转到指定会话的聊天界面。 + @discussion 您需要重写此点击事件，跳转到指定会话的会话页面。 如果点击聚合Cell进入具体的子会话列表，在跳转时，需要将isEnteredToCollectionViewController设置为YES。 */ - (void)onSelectedTableRow:(RCConversationModelType)conversationModelType diff --git a/ios-rongimdemo/framework/RongIMKit.framework/Headers/RCConversationViewController.h b/ios-rongimdemo/framework/RongIMKit.framework/Headers/RCConversationViewController.h index 7427923f..a94526f7 100644 --- a/ios-rongimdemo/framework/RongIMKit.framework/Headers/RCConversationViewController.h +++ b/ios-rongimdemo/framework/RongIMKit.framework/Headers/RCConversationViewController.h @@ -37,7 +37,7 @@ typedef NS_ENUM(NSUInteger, RCCustomerServiceStatus) { }; /*! - 聊天界面类 + 会话页面类 */ @interface RCConversationViewController: RCBaseViewController @@ -45,12 +45,12 @@ typedef NS_ENUM(NSUInteger, RCCustomerServiceStatus) { #pragma mark - 初始化 /*! - 初始化聊天界面 + 初始化会话页面 @param conversationType 会话类型 @param targetId 目标会话ID - @return 聊天界面对象 + @return 会话页面对象 */ - (id)initWithConversationType:(RCConversationType)conversationType targetId:(NSString *)targetId; @@ -74,7 +74,7 @@ typedef NS_ENUM(NSUInteger, RCCustomerServiceStatus) { */ @property(nonatomic, strong) __deprecated_msg("已废弃，请勿使用。") NSString *userName; -#pragma mark - 聊天界面属性 +#pragma mark - 会话页面属性 /*! 聊天内容的消息Cell数据模型的数据源 @@ -84,12 +84,12 @@ typedef NS_ENUM(NSUInteger, RCCustomerServiceStatus) { @property(nonatomic, strong) NSMutableArray *conversationDataRepository; /*! - 聊天界面的CollectionView + 会话页面的CollectionView */ @property(nonatomic, strong) UICollectionView *conversationMessageCollectionView; /*! - 聊天界面的CollectionView Layout + 会话页面的CollectionView Layout */ @property(nonatomic, strong) UICollectionViewFlowLayout *customFlowLayout; @@ -114,7 +114,7 @@ typedef NS_ENUM(NSUInteger, RCCustomerServiceStatus) { 当收到的消息超过一个屏幕时，进入会话之后，是否在右上角提示上方存在的未读消息数 @discussion 默认值为NO。 - 开启该提示功能之后，当一个会话收到大量消息时（操作一个屏幕能显示的内容）， + 开启该提示功能之后，当一个会话收到大量消息时（超过一个屏幕能显示的内容）， 进入该会话后，会在右上角提示用户上方存在的未读消息数，用户点击该提醒按钮，会跳转到最开始的未读消息。 */ @property(nonatomic, assign) BOOL enableUnreadMessageIcon; @@ -138,10 +138,10 @@ typedef NS_ENUM(NSUInteger, RCCustomerServiceStatus) { #pragma mark 右下角的未读消息数提示 /*! - 当前阅读区域的下方收到消息时，是否在聊天界面的右下角提示下方存在未读消息 + 当前阅读区域的下方收到消息时，是否在会话页面的右下角提示下方存在未读消息 @discussion 默认值为NO。 - 开启该提示功能之后，当聊天界面滑动到最下方时，此会话中收到消息会自动更新； + 开启该提示功能之后，当会话页面滑动到最下方时，此会话中收到消息会自动更新； 当用户停留在上方某个区域阅读时，此会话收到消息时，会在右下角显示未读消息提示，而不会自动滚动到最下方， 用户点击该提醒按钮，会滚动到最下方。 */ @@ -155,7 +155,7 @@ typedef NS_ENUM(NSUInteger, RCCustomerServiceStatus) { #pragma mark - 输入工具栏 /*! - 聊天界面下方的输入工具栏 + 会话页面下方的输入工具栏 */ @property(nonatomic, strong) RCChatSessionInputBarControl *chatSessionInputBarControl; @@ -228,12 +228,12 @@ __deprecated_msg("已废弃，请勿使用。"); 设置进入聊天室需要获取的历史消息数量（仅在当前会话为聊天室时生效） @discussion 此属性需要在viewDidLoad之前进行设置。 - -1表示不获取任何历史消息，0表示不特殊设置而使用SDK默认的设置（默认为获取10条），0 *)getPluginBoardItemInfoList:(RCConversationType)conversationType targetId:(NSString *)targetId; @@ -189,4 +189,14 @@ //- (void)pluginBoard:(RCPluginBoardView *)pluginBoardView // clickedItemWithTag:(NSInteger)tag // inInputBar:(RCChatSessionInputBarControl *)inputBarControl; + +/*! + 是否正在使用声音通道 + */ +- (BOOL)isAudioHolding; + +/*! + 是否正在使用摄像头 + */ +- (BOOL)isCameraHolding; @end diff --git a/ios-rongimdemo/framework/RongIMKit.framework/Headers/RCIM.h b/ios-rongimdemo/framework/RongIMKit.framework/Headers/RCIM.h index c32daa34..d61c7765 100644 --- a/ios-rongimdemo/framework/RongIMKit.framework/Headers/RCIM.h +++ b/ios-rongimdemo/framework/RongIMKit.framework/Headers/RCIM.h @@ -615,7 +615,7 @@ __deprecated_msg("已废弃，请使用sendMediaMessage函数。"); /*! 是否开启已读回执功能，默认值是NO - @discussion 开启后会在聊天页面消息显示之后会发送已读回执给对方。 + @discussion 开启后会在会话页面消息显示之后会发送已读回执给对方。 @warning **已废弃，请勿使用。** 升级说明:请使用enabledReadReceiptConversationTypeList，设置开启回执的会话类型 @@ -625,7 +625,7 @@ __deprecated_msg("已废弃，请使用sendMediaMessage函数。"); /*! 开启已读回执功能的会话类型，默认为空 - @discussion 这些会话类型的消息在聊天界面显示了之后会发送已读回执。目前仅支持单聊、群聊和讨论组。 + @discussion 这些会话类型的消息在会话页面显示了之后会发送已读回执。目前仅支持单聊、群聊和讨论组。 */ @property(nonatomic, copy) NSArray* enabledReadReceiptConversationTypeList; @@ -652,12 +652,12 @@ __deprecated_msg("已废弃，请使用sendMediaMessage函数。"); @property(nonatomic, assign) NSUInteger maxRecallDuration; /*! - 是否在聊天界面和会话列表界面显示未注册的消息类型，默认值是NO + 是否在会话页面和会话列表界面显示未注册的消息类型，默认值是NO @discussion App不断迭代开发，可能会在以后的新版本中不断增加某些自定义类型的消息，但是已经发布的老版本无法识别此类消息。 针对这种情况，可以预先定义好未注册的消息的显示，以提升用户体验（如提示当前版本不支持，引导用户升级版本等） - 未注册的消息，可以通过RCConversationViewController中的rcUnkownConversationCollectionView:cellForItemAtIndexPath:和rcUnkownConversationCollectionView:layout:sizeForItemAtIndexPath:方法定制在聊天界面的显示。 + 未注册的消息，可以通过RCConversationViewController中的rcUnkownConversationCollectionView:cellForItemAtIndexPath:和rcUnkownConversationCollectionView:layout:sizeForItemAtIndexPath:方法定制在会话页面的显示。 未注册的消息，可以通过修改unknown_message_cell_tip字符串资源定制在会话列表界面的显示。 */ @property(nonatomic, assign) BOOL showUnkownMessage; @@ -837,7 +837,7 @@ __deprecated_msg("已废弃，请使用sendMediaMessage函数。"); @discussion 使用此方法，可以更新SDK缓存的用户信息。 但是处于性能和使用场景权衡，SDK不会在当前View立即自动刷新（会在切换到其他View的时候再刷新该用户的显示信息）。 - 如果您想立即刷新，您可以在会话列表或者聊天界面reload强制刷新。 + 如果您想立即刷新，您可以在会话列表或者会话页面reload强制刷新。 */ - (void)refreshUserInfoCache:(RCUserInfo *)userInfo withUserId:(NSString *)userId; @@ -855,7 +855,7 @@ __deprecated_msg("已废弃，请使用sendMediaMessage函数。"); @discussion 使用此方法，会清空SDK中所有的用户信息缓存。 但是处于性能和使用场景权衡，SDK不会在当前View立即自动刷新（会在切换到其他View的时候再刷新所显示的用户信息）。 - 如果您想立即刷新，您可以在会话列表或者聊天界面reload强制刷新。 + 如果您想立即刷新，您可以在会话列表或者会话页面reload强制刷新。 */ - (void)clearUserInfoCache; @@ -875,7 +875,7 @@ __deprecated_msg("已废弃，请使用sendMediaMessage函数。"); @discussion 使用此方法，可以更新SDK缓存的群组信息。 但是处于性能和使用场景权衡，SDK不会在当前View立即自动刷新（会在切换到其他View的时候再刷新该群组的显示信息）。 - 如果您想立即刷新，您可以在会话列表或者聊天界面reload强制刷新。 + 如果您想立即刷新，您可以在会话列表或者会话页面reload强制刷新。 */ - (void)refreshGroupInfoCache:(RCGroup *)groupInfo withGroupId:(NSString *)groupId; @@ -893,7 +893,7 @@ __deprecated_msg("已废弃，请使用sendMediaMessage函数。"); @discussion 使用此方法，会清空SDK中所有的群组信息缓存。 但是处于性能和使用场景权衡，SDK不会在当前View立即自动刷新（会在切换到其他View的时候再刷新所显示的群组信息）。 - 如果您想立即刷新，您可以在会话列表或者聊天界面reload强制刷新。 + 如果您想立即刷新，您可以在会话列表或者会话页面reload强制刷新。 */ - (void)clearGroupInfoCache; @@ -925,7 +925,7 @@ __deprecated_msg("已废弃，请使用sendMediaMessage函数。"); @discussion 使用此方法，可以更新SDK缓存的群名片信息。 但是处于性能和使用场景权衡，SDK不会在当前View立即自动刷新（会在切换到其他View的时候再刷新该群名片的显示信息）。 - 如果您想立即刷新，您可以在会话列表或者聊天界面reload强制刷新。 + 如果您想立即刷新，您可以在会话列表或者会话页面reload强制刷新。 */ - (void)refreshGroupUserInfoCache:(RCUserInfo *)userInfo withUserId:(NSString *)userId @@ -936,7 +936,7 @@ __deprecated_msg("已废弃，请使用sendMediaMessage函数。"); @discussion 使用此方法，会清空SDK中所有的群名片信息缓存。 但是处于性能和使用场景权衡，SDK不会在当前View立即自动刷新（会在切换到其他View的时候再刷新所显示的群名片信息）。 - 如果您想立即刷新，您可以在会话列表或者聊天界面reload强制刷新。 + 如果您想立即刷新，您可以在会话列表或者会话页面reload强制刷新。 */ - (void)clearGroupUserInfoCache; @@ -973,21 +973,21 @@ __deprecated_msg("已废弃，请使用sendMediaMessage函数。"); @property(nonatomic) CGSize globalConversationPortraitSize; /*! - SDK聊天界面中显示的头像形状，矩形或者圆形 + SDK会话页面中显示的头像形状，矩形或者圆形 @discussion 默认值为矩形，即RC_USER_AVATAR_RECTANGLE */ @property(nonatomic) RCUserAvatarStyle globalMessageAvatarStyle; /*! - SDK聊天界面中显示的头像大小 + SDK会话页面中显示的头像大小 @discussion 默认值为40*40 */ @property(nonatomic) CGSize globalMessagePortraitSize; /*! - SDK会话列表界面和聊天界面的头像的圆角曲率半径 + SDK会话列表界面和会话页面的头像的圆角曲率半径 @discussion 默认值为4，只有当头像形状设置为矩形时才会生效。 参考RCIM的globalConversationAvatarStyle和globalMessageAvatarStyle。 diff --git a/ios-rongimdemo/framework/RongIMKit.framework/Headers/RCKitUtility.h b/ios-rongimdemo/framework/RongIMKit.framework/Headers/RCKitUtility.h index b15afaca..e03e3773 100644 --- a/ios-rongimdemo/framework/RongIMKit.framework/Headers/RCKitUtility.h +++ b/ios-rongimdemo/framework/RongIMKit.framework/Headers/RCKitUtility.h @@ -214,7 +214,6 @@ __deprecated_msg("已废弃，请勿使用。"); */ + (void)openURLInSafariViewOrWebView:(NSString *)url base:(UIViewController *)viewController; - /** 检查url是否以http或https开头，如果不是，为其头部追加http:// @@ -224,4 +223,13 @@ __deprecated_msg("已废弃，请勿使用。"); */ + (NSString *)checkOrAppendHttpForUrl:(NSString *)url; +/*! + 验证手机号 + */ ++ (BOOL)validateCellPhoneNumber:(NSString *)cellNum; + +/*! + 验证邮箱 + */ ++ (BOOL) validateEmail:(NSString *)email; @end diff --git a/ios-rongimdemo/framework/RongIMKit.framework/Headers/RCPublicServiceChatViewController.h b/ios-rongimdemo/framework/RongIMKit.framework/Headers/RCPublicServiceChatViewController.h index 3c40e681..cafcac63 100644 --- a/ios-rongimdemo/framework/RongIMKit.framework/Headers/RCPublicServiceChatViewController.h +++ b/ios-rongimdemo/framework/RongIMKit.framework/Headers/RCPublicServiceChatViewController.h @@ -10,7 +10,7 @@ #import "RCConversationViewController.h" /*! - 公众服务聊天界面的ViewController + 公众服务会话页面的ViewController */ @interface RCPublicServiceChatViewController : RCConversationViewController diff --git a/ios-rongimdemo/framework/RongIMKit.framework/Headers/RCPublicServiceProfileViewController.h b/ios-rongimdemo/framework/RongIMKit.framework/Headers/RCPublicServiceProfileViewController.h index e81d9b79..2340b41b 100644 --- a/ios-rongimdemo/framework/RongIMKit.framework/Headers/RCPublicServiceProfileViewController.h +++ b/ios-rongimdemo/framework/RongIMKit.framework/Headers/RCPublicServiceProfileViewController.h @@ -40,7 +40,7 @@ @property(nonatomic) RCUserAvatarStyle portraitStyle; /*! - 当前界面的是否源于聊天会话界面 + 当前界面的是否源于聊天会话页面 */ @property(nonatomic) BOOL fromConversation; diff --git a/ios-rongimdemo/framework/RongIMKit.framework/Headers/RCSettingViewController.h b/ios-rongimdemo/framework/RongIMKit.framework/Headers/RCSettingViewController.h index 66a370fd..59a94bc0 100644 --- a/ios-rongimdemo/framework/RongIMKit.framework/Headers/RCSettingViewController.h +++ b/ios-rongimdemo/framework/RongIMKit.framework/Headers/RCSettingViewController.h @@ -34,7 +34,7 @@ typedef void (^clearHistory)(BOOL isSuccess); /*! 清空会话中所有消息的回调 - @discussion 在清空消息的的回调中,您需要调用聊天界面的reloadData进行刷新。 + @discussion 在清空消息的的回调中,您需要调用会话页面的reloadData进行刷新。 */ @property(nonatomic, copy) clearHistory clearHistoryCompletion; diff --git a/ios-rongimdemo/framework/RongIMKit.framework/Headers/RCTextView.h b/ios-rongimdemo/framework/RongIMKit.framework/Headers/RCTextView.h index b50cd5a9..e84b6f47 100644 --- a/ios-rongimdemo/framework/RongIMKit.framework/Headers/RCTextView.h +++ b/ios-rongimdemo/framework/RongIMKit.framework/Headers/RCTextView.h @@ -8,6 +8,15 @@ #import +@class RCTextView; + +@protocol RCTextViewDelegate + +@optional +- (void)rctextView:(RCTextView *)textView textDidChange:(NSString *)text; + +@end + /*! 文本输入框的View */ @@ -20,4 +29,6 @@ */ @property(nonatomic, assign) BOOL disableActionMenu; +@property(nonatomic, weak) id textChangeDelegate; + @end diff --git a/ios-rongimdemo/framework/RongIMKit.framework/Headers/RongIMKit.h b/ios-rongimdemo/framework/RongIMKit.framework/Headers/RongIMKit.h index b6f9dca9..f6d256c9 100644 --- a/ios-rongimdemo/framework/RongIMKit.framework/Headers/RongIMKit.h +++ b/ios-rongimdemo/framework/RongIMKit.framework/Headers/RongIMKit.h @@ -19,7 +19,7 @@ FOUNDATION_EXPORT const unsigned char RongIMKitVersionString[]; /// 会话列表相关类 #import #import -/// 聊天界面相关类 +/// 会话页面相关类 #import #import #import diff --git a/ios-rongimdemo/framework/RongIMKit.framework/Headers/RongIMKitExtensionModule.h b/ios-rongimdemo/framework/RongIMKit.framework/Headers/RongIMKitExtensionModule.h index 504d3864..91e8af99 100644 --- a/ios-rongimdemo/framework/RongIMKit.framework/Headers/RongIMKitExtensionModule.h +++ b/ios-rongimdemo/framework/RongIMKit.framework/Headers/RongIMKitExtensionModule.h @@ -20,14 +20,14 @@ #pragma mark - Cell /*! - 获取会话界面的cell信息。 + 获取会话页面的cell信息。 @param conversationType 会话类型 @param targetId targetId @return cell信息列表。 - @discussion 当进入到会话界面时，SDK需要了解扩展模块的消息对应的MessageCell和reuseIdentifier。 + @discussion 当进入到会话页面时，SDK需要了解扩展模块的消息对应的MessageCell和reuseIdentifier。 */ - (NSArray *)getMessageCellInfoList:(RCConversationType)conversationType targetId:(NSString *)targetId; diff --git a/ios-rongimdemo/framework/RongIMKit.framework/Info.plist b/ios-rongimdemo/framework/RongIMKit.framework/Info.plist index 440f15f5..1786d16c 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 fc2254b7..b6c68089 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/RCCSLeaveMessage.h b/ios-rongimdemo/framework/RongIMLib.framework/Headers/RCCSLeaveMessage.h new file mode 100644 index 00000000..e799eca7 --- /dev/null +++ b/ios-rongimdemo/framework/RongIMLib.framework/Headers/RCCSLeaveMessage.h @@ -0,0 +1,13 @@ +// +// RCCSLeaveMessage.h +// RongIMLib +// +// Created by 张改红 on 2016/12/7. +// Copyright © 2016年 RongCloud. All rights reserved. +// + +#import +#define RCCSLeaveMessageTypeIdentifier @"RC:CsLM" +@interface RCCSLeaveMessage : RCMessageContent +@property (nonatomic, strong)NSDictionary *leaveMessageDic; +@end diff --git a/ios-rongimdemo/framework/RongIMLib.framework/Headers/RCCSLeaveMessageItem.h b/ios-rongimdemo/framework/RongIMLib.framework/Headers/RCCSLeaveMessageItem.h new file mode 100644 index 00000000..f8f94f3f --- /dev/null +++ b/ios-rongimdemo/framework/RongIMLib.framework/Headers/RCCSLeaveMessageItem.h @@ -0,0 +1,31 @@ +// +// RCCSLeaveMessageItem.h +// RongIMLib +// +// Created by 张改红 on 2016/12/6. +// Copyright © 2016年 RongCloud. All rights reserved. +// + +#import +//客服留言配置model +@interface RCCSLeaveMessageItem : NSObject +//信息名 +@property(nonatomic, copy) NSString *title; +//信息名对应的key值，在用户填了信息之后，需要把信息和此key对应构成字典 +@property(nonatomic, copy) NSString *name; +//输入区域是单行还是多行：@"text" 单行；@"textarea":多行 +@property(nonatomic, copy) NSString *type; +//输入区域默认提示信息 +@property(nonatomic, copy) NSString *defaultText; +//是否是必填项 +@property(nonatomic, assign) BOOL required; +//需要验证的类型 +@property(nonatomic, copy) NSString *verification; +//验证后提示信息 +@property(nonatomic, strong) NSArray *message; +//最大字数限制 +@property(nonatomic, assign)int max; + ++ (instancetype)modelWithDic:(NSDictionary *)dic; +- (instancetype)initWithDic:(NSDictionary *)dic; +@end diff --git a/ios-rongimdemo/framework/RongIMLib.framework/Headers/RCCSPullLeaveMessage.h b/ios-rongimdemo/framework/RongIMLib.framework/Headers/RCCSPullLeaveMessage.h new file mode 100644 index 00000000..29dad341 --- /dev/null +++ b/ios-rongimdemo/framework/RongIMLib.framework/Headers/RCCSPullLeaveMessage.h @@ -0,0 +1,13 @@ +// +// RCCSLeaveMessage.h +// RongIMLib +// +// Created by 张改红 on 2016/12/6. +// Copyright © 2016年 RongCloud. All rights reserved. +// + +#import +#define RCCSPullLeaveMessageTypeIdentifier @"RC:CsPLM" +@interface RCCSPullLeaveMessage : RCMessageContent +@property (nonatomic,copy)NSString *content; +@end diff --git a/ios-rongimdemo/framework/RongIMLib.framework/Headers/RCCustomerServiceConfig.h b/ios-rongimdemo/framework/RongIMLib.framework/Headers/RCCustomerServiceConfig.h index 6dcefcb5..879afe20 100644 --- a/ios-rongimdemo/framework/RongIMLib.framework/Headers/RCCustomerServiceConfig.h +++ b/ios-rongimdemo/framework/RongIMLib.framework/Headers/RCCustomerServiceConfig.h @@ -7,7 +7,8 @@ // #import - +#import "RCStatusDefine.h" +#import "RCCSLeaveMessageItem.h" // onResult:(void(^)(int isSuccess, NSString *errMsg))resultBlock // onBlocked:(void(^)(void))blockedBlock // onCompanyInfo:(void(^)(NSString *companyName, NSString @@ -51,4 +52,44 @@ @property(nonatomic) int userTipTime; @property(nonatomic, strong) NSString *userTipWord; +/*! + * 评价时机 + */ +@property(nonatomic, assign) RCCSEvaEntryPoint evaEntryPoint; + +/*! + * 评价类型 + 如果 evaType 为 RCCSEvaSeparately，发送机器人评价消息调用RCIMClient中evaluateCustomerService: knownledgeId: robotValue: suggest: + 发送人工评价消息调用RCIMClient中 + evaluateCustomerService: dialogId: humanValue: suggest: + + 如果 evaType 为 EVA_UNIFIED，发送评价消息调用RCIMClient中 + evaluateCustomerService: dialogId: starValue: suggest: resolveStatus: + */ +@property(nonatomic, assign) RCCSEvaType evaType; + +/*! + * 是否显示解决状态:0.不显示；1显示 + */ +@property(nonatomic, assign) int reportResolveStatus; + +/*! + * 留言样式:0.默认跳转留言界面；1.跳转url留言 + */ +@property(nonatomic, assign) RCCSLMType leaveMessageType; + +/*! + * 是否支持地图发送：0.支持；1.不支持 + */ +@property(nonatomic, assign) int disableLocation; + +/*! + * 自定义评价 + */ +@property(nonatomic, copy) NSString *leaveMessageWebUrl; + +/*! + * 默认评价样式 + */ +@property(nonatomic, copy) NSArray *leaveMessageNativeInfo; @end diff --git a/ios-rongimdemo/framework/RongIMLib.framework/Headers/RCCustomerServiceInfo.h b/ios-rongimdemo/framework/RongIMLib.framework/Headers/RCCustomerServiceInfo.h index 1ef9d798..a2632340 100644 --- a/ios-rongimdemo/framework/RongIMLib.framework/Headers/RCCustomerServiceInfo.h +++ b/ios-rongimdemo/framework/RongIMLib.framework/Headers/RCCustomerServiceInfo.h @@ -36,5 +36,7 @@ @property(nonatomic, strong) NSString *skillId; @property(nonatomic, strong) NSArray *listUrl; @property(nonatomic, strong) NSString *define; //自定义信息 +@property(nonatomic, strong) NSString *productId;//商品id + - (NSData *)encode; @end diff --git a/ios-rongimdemo/framework/RongIMLib.framework/Headers/RCIMClient.h b/ios-rongimdemo/framework/RongIMLib.framework/Headers/RCIMClient.h index b2103a2a..5ef4b280 100644 --- a/ios-rongimdemo/framework/RongIMLib.framework/Headers/RCIMClient.h +++ b/ios-rongimdemo/framework/RongIMLib.framework/Headers/RCIMClient.h @@ -483,7 +483,7 @@ /*! - 发送媒体消息（图片消息或文本消息） + 发送媒体消息（图片消息或文件消息） @param conversationType 发送消息的会话类型 @param targetId 发送消息的目标会话ID @@ -1786,7 +1786,7 @@ getConversationNotificationStatus:(RCConversationType)conversationType @discussion 可以通过传入的messageCount设置加入聊天室成功之后，需要获取的历史消息数量。 - -1表示不获取任何历史消息，0表示不特殊设置而使用SDK默认的设置（默认为获取10条），0 #import #import +#import +#import /// 工具类 #import #import @@ -59,6 +61,7 @@ FOUNDATION_EXPORT const unsigned char RongIMLibVersionString[]; ///客服 #import #import +#import /// 其他 #import diff --git a/ios-rongimdemo/framework/RongIMLib.framework/Info.plist b/ios-rongimdemo/framework/RongIMLib.framework/Info.plist index 1044f052..b7bccfcc 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 ca63aaa6..a5f2b0e9 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 a1cddfdd..cb63d334 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 ea011ba4..04f74e77 100644 Binary files a/ios-rongimdemo/framework/RongiFlyKit.framework/RongiFlyKit and b/ios-rongimdemo/framework/RongiFlyKit.framework/RongiFlyKit differ diff --git a/ios-rongimdemo/framework/bqmm/BQMM.bundle/cateogryResponse.plist b/ios-rongimdemo/framework/bqmm/BQMM.bundle/cateogryResponse.plist index 5765cbee..0ddbb7ea 100644 --- a/ios-rongimdemo/framework/bqmm/BQMM.bundle/cateogryResponse.plist +++ b/ios-rongimdemo/framework/bqmm/BQMM.bundle/cateogryResponse.plist @@ -15,13 +15,13 @@ author 表情mm banner - http://7xl6jm.com2.z0.glb.qiniucdn.com/@/emoticonPacket/0deac6c5657241fba7e17b3956fcb8e0/banner/1469097895308_750x400.jpg + https://dn-bqmm.qbox.me/@/emoticonPacket/0deac6c5657241fba7e17b3956fcb8e0/banner/1469097895308_750x400.jpg chat_icon - http://7xl6jm.com2.z0.glb.qiniucdn.com/@/emoticonPacket/0deac6c5657241fba7e17b3956fcb8e0/chaticon/1469004682730_50x50.png + https://dn-bqmm.qbox.me/@/emoticonPacket/0deac6c5657241fba7e17b3956fcb8e0/chaticon/1469004682730_50x50.png copyright 表情mm cover - http://7xl6jm.com2.z0.glb.qiniucdn.com/@/emoticonPacket/0deac6c5657241fba7e17b3956fcb8e0/cover/1469097865862_240x240.png + https://dn-bqmm.qbox.me/@/emoticonPacket/0deac6c5657241fba7e17b3956fcb8e0/cover/1469097865862_240x240.png createtime 1469004803000 emoticions @@ -38,11 +38,11 @@ is_emoji main_image - http://7xl6jm.com2.z0.glb.qiniucdn.com/@/emoticonPacket/0deac6c5657241fba7e17b3956fcb8e0/mainicon/1469004703228_01.gif + https://dn-bqmm.qbox.me/@/emoticonPacket/0deac6c5657241fba7e17b3956fcb8e0/mainicon/1469004703228_01.gif package_id 0deac6c5657241fba7e17b3956fcb8e0 thumbail - http://7xl6jm.com2.z0.glb.qiniucdn.com/@/emoticonPacket/0deac6c5657241fba7e17b3956fcb8e0/thumicon/1469004703328_01.png + https://dn-bqmm.qbox.me/@/emoticonPacket/0deac6c5657241fba7e17b3956fcb8e0/thumicon/1469004703328_01.png emo_code @@ -56,11 +56,11 @@ is_emoji main_image - http://7xl6jm.com2.z0.glb.qiniucdn.com/@/emoticonPacket/0deac6c5657241fba7e17b3956fcb8e0/mainicon/1469004703550_02.gif + https://dn-bqmm.qbox.me/@/emoticonPacket/0deac6c5657241fba7e17b3956fcb8e0/mainicon/1469004703550_02.gif package_id 0deac6c5657241fba7e17b3956fcb8e0 thumbail - http://7xl6jm.com2.z0.glb.qiniucdn.com/@/emoticonPacket/0deac6c5657241fba7e17b3956fcb8e0/thumicon/1469004703564_02.png + https://dn-bqmm.qbox.me/@/emoticonPacket/0deac6c5657241fba7e17b3956fcb8e0/thumicon/1469004703564_02.png emo_code @@ -74,11 +74,11 @@ is_emoji main_image - http://7xl6jm.com2.z0.glb.qiniucdn.com/@/emoticonPacket/0deac6c5657241fba7e17b3956fcb8e0/mainicon/1469004703844_03.gif + https://dn-bqmm.qbox.me/@/emoticonPacket/0deac6c5657241fba7e17b3956fcb8e0/mainicon/1469004703844_03.gif package_id 0deac6c5657241fba7e17b3956fcb8e0 thumbail - http://7xl6jm.com2.z0.glb.qiniucdn.com/@/emoticonPacket/0deac6c5657241fba7e17b3956fcb8e0/thumicon/1469004704105_03.png + https://dn-bqmm.qbox.me/@/emoticonPacket/0deac6c5657241fba7e17b3956fcb8e0/thumicon/1469004704105_03.png emo_code @@ -92,11 +92,11 @@ is_emoji main_image - http://7xl6jm.com2.z0.glb.qiniucdn.com/@/emoticonPacket/0deac6c5657241fba7e17b3956fcb8e0/mainicon/1469004704339_04.gif + https://dn-bqmm.qbox.me/@/emoticonPacket/0deac6c5657241fba7e17b3956fcb8e0/mainicon/1469004704339_04.gif package_id 0deac6c5657241fba7e17b3956fcb8e0 thumbail - http://7xl6jm.com2.z0.glb.qiniucdn.com/@/emoticonPacket/0deac6c5657241fba7e17b3956fcb8e0/thumicon/1469004704713_04.png + https://dn-bqmm.qbox.me/@/emoticonPacket/0deac6c5657241fba7e17b3956fcb8e0/thumicon/1469004704713_04.png emo_code @@ -110,11 +110,11 @@ is_emoji main_image - http://7xl6jm.com2.z0.glb.qiniucdn.com/@/emoticonPacket/0deac6c5657241fba7e17b3956fcb8e0/mainicon/1469004705032_05.gif + https://dn-bqmm.qbox.me/@/emoticonPacket/0deac6c5657241fba7e17b3956fcb8e0/mainicon/1469004705032_05.gif package_id 0deac6c5657241fba7e17b3956fcb8e0 thumbail - http://7xl6jm.com2.z0.glb.qiniucdn.com/@/emoticonPacket/0deac6c5657241fba7e17b3956fcb8e0/thumicon/1469004705332_05.png + https://dn-bqmm.qbox.me/@/emoticonPacket/0deac6c5657241fba7e17b3956fcb8e0/thumicon/1469004705332_05.png emo_code @@ -128,11 +128,11 @@ is_emoji main_image - http://7xl6jm.com2.z0.glb.qiniucdn.com/@/emoticonPacket/0deac6c5657241fba7e17b3956fcb8e0/mainicon/1469004705573_06.gif + https://dn-bqmm.qbox.me/@/emoticonPacket/0deac6c5657241fba7e17b3956fcb8e0/mainicon/1469004705573_06.gif package_id 0deac6c5657241fba7e17b3956fcb8e0 thumbail - http://7xl6jm.com2.z0.glb.qiniucdn.com/@/emoticonPacket/0deac6c5657241fba7e17b3956fcb8e0/thumicon/1469004705657_06.png + https://dn-bqmm.qbox.me/@/emoticonPacket/0deac6c5657241fba7e17b3956fcb8e0/thumicon/1469004705657_06.png emo_code @@ -146,11 +146,11 @@ is_emoji main_image - http://7xl6jm.com2.z0.glb.qiniucdn.com/@/emoticonPacket/0deac6c5657241fba7e17b3956fcb8e0/mainicon/1469004706004_07.gif + https://dn-bqmm.qbox.me/@/emoticonPacket/0deac6c5657241fba7e17b3956fcb8e0/mainicon/1469004706004_07.gif package_id 0deac6c5657241fba7e17b3956fcb8e0 thumbail - http://7xl6jm.com2.z0.glb.qiniucdn.com/@/emoticonPacket/0deac6c5657241fba7e17b3956fcb8e0/thumicon/1469004706182_07.png + https://dn-bqmm.qbox.me/@/emoticonPacket/0deac6c5657241fba7e17b3956fcb8e0/thumicon/1469004706182_07.png emo_code @@ -164,11 +164,11 @@ is_emoji main_image - http://7xl6jm.com2.z0.glb.qiniucdn.com/@/emoticonPacket/0deac6c5657241fba7e17b3956fcb8e0/mainicon/1469004706641_08.gif + https://dn-bqmm.qbox.me/@/emoticonPacket/0deac6c5657241fba7e17b3956fcb8e0/mainicon/1469004706641_08.gif package_id 0deac6c5657241fba7e17b3956fcb8e0 thumbail - http://7xl6jm.com2.z0.glb.qiniucdn.com/@/emoticonPacket/0deac6c5657241fba7e17b3956fcb8e0/thumicon/1469004706669_08.png + https://dn-bqmm.qbox.me/@/emoticonPacket/0deac6c5657241fba7e17b3956fcb8e0/thumicon/1469004706669_08.png guid diff --git a/ios-rongimdemo/framework/bqmm/BQMM.bundle/cateogryResponse_en.plist b/ios-rongimdemo/framework/bqmm/BQMM.bundle/cateogryResponse_en.plist index ae46d534..f7925476 100644 --- a/ios-rongimdemo/framework/bqmm/BQMM.bundle/cateogryResponse_en.plist +++ b/ios-rongimdemo/framework/bqmm/BQMM.bundle/cateogryResponse_en.plist @@ -15,13 +15,13 @@ author Mojif banner - http://7xl6jm.com2.z0.glb.qiniucdn.com/@/emoticonPacket/d455625bb12a44669e310546981c0457/banner/1466064045001_750x400.jpg + https://dn-bqmm.qbox.me/@/emoticonPacket/d455625bb12a44669e310546981c0457/banner/1466064045001_750x400.jpg chat_icon - http://7xl6jm.com2.z0.glb.qiniucdn.com/@/emoticonPacket/d455625bb12a44669e310546981c0457/chaticon/1466064826964_50x50_color.png + https://dn-bqmm.qbox.me/@/emoticonPacket/d455625bb12a44669e310546981c0457/chaticon/1466064826964_50x50_color.png copyright Mojif cover - http://7xl6jm.com2.z0.glb.qiniucdn.com/@/emoticonPacket/d455625bb12a44669e310546981c0457/cover/1466064816559_240x240.png + https://dn-bqmm.qbox.me/@/emoticonPacket/d455625bb12a44669e310546981c0457/cover/1466064816559_240x240.png createtime 1466065150000 emoticions @@ -38,11 +38,11 @@ is_emoji main_image - http://7xl6jm.com2.z0.glb.qiniucdn.com/@/emoticonPacket/d455625bb12a44669e310546981c0457/mainicon/1466064847799_01.gif + https://dn-bqmm.qbox.me/@/emoticonPacket/d455625bb12a44669e310546981c0457/mainicon/1466064847799_01.gif package_id d455625bb12a44669e310546981c0457 thumbail - http://7xl6jm.com2.z0.glb.qiniucdn.com/@/emoticonPacket/d455625bb12a44669e310546981c0457/thumicon/1466064876054_01.png + https://dn-bqmm.qbox.me/@/emoticonPacket/d455625bb12a44669e310546981c0457/thumicon/1466064876054_01.png emo_code @@ -56,11 +56,11 @@ is_emoji main_image - http://7xl6jm.com2.z0.glb.qiniucdn.com/@/emoticonPacket/d455625bb12a44669e310546981c0457/mainicon/1466064908639_02.gif + https://dn-bqmm.qbox.me/@/emoticonPacket/d455625bb12a44669e310546981c0457/mainicon/1466064908639_02.gif package_id d455625bb12a44669e310546981c0457 thumbail - http://7xl6jm.com2.z0.glb.qiniucdn.com/@/emoticonPacket/d455625bb12a44669e310546981c0457/thumicon/1466064912775_02.png + https://dn-bqmm.qbox.me/@/emoticonPacket/d455625bb12a44669e310546981c0457/thumicon/1466064912775_02.png emo_code @@ -74,11 +74,11 @@ is_emoji main_image - http://7xl6jm.com2.z0.glb.qiniucdn.com/@/emoticonPacket/d455625bb12a44669e310546981c0457/mainicon/1466064924856_03.gif + https://dn-bqmm.qbox.me/@/emoticonPacket/d455625bb12a44669e310546981c0457/mainicon/1466064924856_03.gif package_id d455625bb12a44669e310546981c0457 thumbail - http://7xl6jm.com2.z0.glb.qiniucdn.com/@/emoticonPacket/d455625bb12a44669e310546981c0457/thumicon/1466064928898_03.png + https://dn-bqmm.qbox.me/@/emoticonPacket/d455625bb12a44669e310546981c0457/thumicon/1466064928898_03.png emo_code @@ -92,11 +92,11 @@ is_emoji main_image - http://7xl6jm.com2.z0.glb.qiniucdn.com/@/emoticonPacket/d455625bb12a44669e310546981c0457/mainicon/1466064942646_04.gif + https://dn-bqmm.qbox.me/@/emoticonPacket/d455625bb12a44669e310546981c0457/mainicon/1466064942646_04.gif package_id d455625bb12a44669e310546981c0457 thumbail - http://7xl6jm.com2.z0.glb.qiniucdn.com/@/emoticonPacket/d455625bb12a44669e310546981c0457/thumicon/1466064960499_04.png + https://dn-bqmm.qbox.me/@/emoticonPacket/d455625bb12a44669e310546981c0457/thumicon/1466064960499_04.png emo_code @@ -110,11 +110,11 @@ is_emoji main_image - http://7xl6jm.com2.z0.glb.qiniucdn.com/@/emoticonPacket/d455625bb12a44669e310546981c0457/mainicon/1466064973749_05.gif + https://dn-bqmm.qbox.me/@/emoticonPacket/d455625bb12a44669e310546981c0457/mainicon/1466064973749_05.gif package_id d455625bb12a44669e310546981c0457 thumbail - http://7xl6jm.com2.z0.glb.qiniucdn.com/@/emoticonPacket/d455625bb12a44669e310546981c0457/thumicon/1466064976312_05.png + https://dn-bqmm.qbox.me/@/emoticonPacket/d455625bb12a44669e310546981c0457/thumicon/1466064976312_05.png emo_code @@ -128,11 +128,11 @@ is_emoji main_image - http://7xl6jm.com2.z0.glb.qiniucdn.com/@/emoticonPacket/d455625bb12a44669e310546981c0457/mainicon/1466064980403_06.gif + https://dn-bqmm.qbox.me/@/emoticonPacket/d455625bb12a44669e310546981c0457/mainicon/1466064980403_06.gif package_id d455625bb12a44669e310546981c0457 thumbail - http://7xl6jm.com2.z0.glb.qiniucdn.com/@/emoticonPacket/d455625bb12a44669e310546981c0457/thumicon/1466064982674_06.png + https://dn-bqmm.qbox.me/@/emoticonPacket/d455625bb12a44669e310546981c0457/thumicon/1466064982674_06.png emo_code @@ -146,11 +146,11 @@ is_emoji main_image - http://7xl6jm.com2.z0.glb.qiniucdn.com/@/emoticonPacket/d455625bb12a44669e310546981c0457/mainicon/1466064987249_07.gif + https://dn-bqmm.qbox.me/@/emoticonPacket/d455625bb12a44669e310546981c0457/mainicon/1466064987249_07.gif package_id d455625bb12a44669e310546981c0457 thumbail - http://7xl6jm.com2.z0.glb.qiniucdn.com/@/emoticonPacket/d455625bb12a44669e310546981c0457/thumicon/1466064990182_07.png + https://dn-bqmm.qbox.me/@/emoticonPacket/d455625bb12a44669e310546981c0457/thumicon/1466064990182_07.png emo_code @@ -164,11 +164,11 @@ is_emoji main_image - http://7xl6jm.com2.z0.glb.qiniucdn.com/@/emoticonPacket/d455625bb12a44669e310546981c0457/mainicon/1466064994963_08.gif + https://dn-bqmm.qbox.me/@/emoticonPacket/d455625bb12a44669e310546981c0457/mainicon/1466064994963_08.gif package_id d455625bb12a44669e310546981c0457 thumbail - http://7xl6jm.com2.z0.glb.qiniucdn.com/@/emoticonPacket/d455625bb12a44669e310546981c0457/thumicon/1466064997273_08.png + https://dn-bqmm.qbox.me/@/emoticonPacket/d455625bb12a44669e310546981c0457/thumicon/1466064997273_08.png emo_code @@ -182,11 +182,11 @@ is_emoji main_image - http://7xl6jm.com2.z0.glb.qiniucdn.com/@/emoticonPacket/d455625bb12a44669e310546981c0457/mainicon/1466065001923_09.gif + https://dn-bqmm.qbox.me/@/emoticonPacket/d455625bb12a44669e310546981c0457/mainicon/1466065001923_09.gif package_id d455625bb12a44669e310546981c0457 thumbail - http://7xl6jm.com2.z0.glb.qiniucdn.com/@/emoticonPacket/d455625bb12a44669e310546981c0457/thumicon/1466065004095_09.png + https://dn-bqmm.qbox.me/@/emoticonPacket/d455625bb12a44669e310546981c0457/thumicon/1466065004095_09.png emo_code @@ -200,11 +200,11 @@ is_emoji main_image - http://7xl6jm.com2.z0.glb.qiniucdn.com/@/emoticonPacket/d455625bb12a44669e310546981c0457/mainicon/1466065008157_10.gif + https://dn-bqmm.qbox.me/@/emoticonPacket/d455625bb12a44669e310546981c0457/mainicon/1466065008157_10.gif package_id d455625bb12a44669e310546981c0457 thumbail - http://7xl6jm.com2.z0.glb.qiniucdn.com/@/emoticonPacket/d455625bb12a44669e310546981c0457/thumicon/1466065010226_10.png + https://dn-bqmm.qbox.me/@/emoticonPacket/d455625bb12a44669e310546981c0457/thumicon/1466065010226_10.png emo_code @@ -218,11 +218,11 @@ is_emoji main_image - http://7xl6jm.com2.z0.glb.qiniucdn.com/@/emoticonPacket/d455625bb12a44669e310546981c0457/mainicon/1466065014530_11.gif + https://dn-bqmm.qbox.me/@/emoticonPacket/d455625bb12a44669e310546981c0457/mainicon/1466065014530_11.gif package_id d455625bb12a44669e310546981c0457 thumbail - http://7xl6jm.com2.z0.glb.qiniucdn.com/@/emoticonPacket/d455625bb12a44669e310546981c0457/thumicon/1466065017674_11.png + https://dn-bqmm.qbox.me/@/emoticonPacket/d455625bb12a44669e310546981c0457/thumicon/1466065017674_11.png emo_code @@ -236,11 +236,11 @@ is_emoji main_image - http://7xl6jm.com2.z0.glb.qiniucdn.com/@/emoticonPacket/d455625bb12a44669e310546981c0457/mainicon/1466065021828_12.gif + https://dn-bqmm.qbox.me/@/emoticonPacket/d455625bb12a44669e310546981c0457/mainicon/1466065021828_12.gif package_id d455625bb12a44669e310546981c0457 thumbail - http://7xl6jm.com2.z0.glb.qiniucdn.com/@/emoticonPacket/d455625bb12a44669e310546981c0457/thumicon/1466065023945_12.png + https://dn-bqmm.qbox.me/@/emoticonPacket/d455625bb12a44669e310546981c0457/thumicon/1466065023945_12.png emo_code @@ -254,11 +254,11 @@ is_emoji main_image - http://7xl6jm.com2.z0.glb.qiniucdn.com/@/emoticonPacket/d455625bb12a44669e310546981c0457/mainicon/1466065029243_13.gif + https://dn-bqmm.qbox.me/@/emoticonPacket/d455625bb12a44669e310546981c0457/mainicon/1466065029243_13.gif package_id d455625bb12a44669e310546981c0457 thumbail - http://7xl6jm.com2.z0.glb.qiniucdn.com/@/emoticonPacket/d455625bb12a44669e310546981c0457/thumicon/1466065031201_13.png + https://dn-bqmm.qbox.me/@/emoticonPacket/d455625bb12a44669e310546981c0457/thumicon/1466065031201_13.png emo_code @@ -272,11 +272,11 @@ is_emoji main_image - http://7xl6jm.com2.z0.glb.qiniucdn.com/@/emoticonPacket/d455625bb12a44669e310546981c0457/mainicon/1466065035640_14.gif + https://dn-bqmm.qbox.me/@/emoticonPacket/d455625bb12a44669e310546981c0457/mainicon/1466065035640_14.gif package_id d455625bb12a44669e310546981c0457 thumbail - http://7xl6jm.com2.z0.glb.qiniucdn.com/@/emoticonPacket/d455625bb12a44669e310546981c0457/thumicon/1466065037875_14.png + https://dn-bqmm.qbox.me/@/emoticonPacket/d455625bb12a44669e310546981c0457/thumicon/1466065037875_14.png emo_code @@ -290,11 +290,11 @@ is_emoji main_image - http://7xl6jm.com2.z0.glb.qiniucdn.com/@/emoticonPacket/d455625bb12a44669e310546981c0457/mainicon/1466065041536_15.gif + https://dn-bqmm.qbox.me/@/emoticonPacket/d455625bb12a44669e310546981c0457/mainicon/1466065041536_15.gif package_id d455625bb12a44669e310546981c0457 thumbail - http://7xl6jm.com2.z0.glb.qiniucdn.com/@/emoticonPacket/d455625bb12a44669e310546981c0457/thumicon/1466065043325_15.png + https://dn-bqmm.qbox.me/@/emoticonPacket/d455625bb12a44669e310546981c0457/thumicon/1466065043325_15.png emo_code @@ -308,11 +308,11 @@ is_emoji main_image - http://7xl6jm.com2.z0.glb.qiniucdn.com/@/emoticonPacket/d455625bb12a44669e310546981c0457/mainicon/1466065047042_16.gif + https://dn-bqmm.qbox.me/@/emoticonPacket/d455625bb12a44669e310546981c0457/mainicon/1466065047042_16.gif package_id d455625bb12a44669e310546981c0457 thumbail - http://7xl6jm.com2.z0.glb.qiniucdn.com/@/emoticonPacket/d455625bb12a44669e310546981c0457/thumicon/1466065049601_16.png + https://dn-bqmm.qbox.me/@/emoticonPacket/d455625bb12a44669e310546981c0457/thumicon/1466065049601_16.png guid @@ -329,11 +329,11 @@ packageType 0 preload - http://7xl6jm.com2.z0.glb.qiniucdn.com/@/emoticonPacket/d455625bb12a44669e310546981c0457/preload/1466064828959_50x50_grey.png + https://dn-bqmm.qbox.me/@/emoticonPacket/d455625bb12a44669e310546981c0457/preload/1466064828959_50x50_grey.png promotion recommend_pic - http://7xl6jm.com2.z0.glb.qiniucdn.com/@/emoticonPacket/d455625bb12a44669e310546981c0457/recommendPic/1466064824622_262x262.png + https://dn-bqmm.qbox.me/@/emoticonPacket/d455625bb12a44669e310546981c0457/recommendPic/1466064824622_262x262.png updatetime 1466663720000 diff --git a/ios-rongimdemo/framework/bqmm/BQMM.bundle/mm_emoji_error@2x.png b/ios-rongimdemo/framework/bqmm/BQMM.bundle/mm_emoji_error@2x.png index cef525a3..cdc76ead 100644 Binary files a/ios-rongimdemo/framework/bqmm/BQMM.bundle/mm_emoji_error@2x.png and b/ios-rongimdemo/framework/bqmm/BQMM.bundle/mm_emoji_error@2x.png differ diff --git a/ios-rongimdemo/framework/bqmm/BQMM.bundle/mm_emoji_error@3x.png b/ios-rongimdemo/framework/bqmm/BQMM.bundle/mm_emoji_error@3x.png new file mode 100644 index 00000000..791c4c24 Binary files /dev/null and b/ios-rongimdemo/framework/bqmm/BQMM.bundle/mm_emoji_error@3x.png differ diff --git a/ios-rongimdemo/framework/bqmm/BQMMRongCloudExt.framework/BQMMRongCloudExt b/ios-rongimdemo/framework/bqmm/BQMMRongCloudExt.framework/BQMMRongCloudExt index ff44738f..dd401e82 100644 Binary files a/ios-rongimdemo/framework/bqmm/BQMMRongCloudExt.framework/BQMMRongCloudExt and b/ios-rongimdemo/framework/bqmm/BQMMRongCloudExt.framework/BQMMRongCloudExt differ diff --git a/ios-rongimdemo/framework/en.lproj/RongCloudKit.strings b/ios-rongimdemo/framework/en.lproj/RongCloudKit.strings index cde54568..a940bb77 100644 --- a/ios-rongimdemo/framework/en.lproj/RongCloudKit.strings +++ b/ios-rongimdemo/framework/en.lproj/RongCloudKit.strings @@ -92,7 +92,8 @@ "JoinChatRoomFailed"="Failed to join chatroom"; "Connecting..."="Connecting..."; "FromFriendInvitation"="From %@ friend invitation"; -"AddFriendInvitation"="Add Friend Invitation"; +"AcceptFriendRequest"="Accept your friend request"; +"AddFriendRequest"="Add Friend Invitation"; "ReadAll"="Read all"; "OfficialAccounts"="Official Accounts"; "Share"="Share Name Card"; @@ -130,6 +131,7 @@ "VoIPVideoCall"="Video Call"; "VoIPAudioCallExistedWarning"="Voice call is on. Try again later."; "VoIPVideoCallExistedWarning"="Video call is on. Try again later."; +"AudioHoldingWarning"="Audio is holding by other function. Try again later."; "VoIPCallSelectMember"="Select Members"; "VoIPAudioCallMaxNumSelectMember"="Up to %d members"; "VoIPVideoCallMaxNumSelectMember"="Up to %d members"; diff --git a/ios-rongimdemo/framework/zh-Hans.lproj/RongCloudKit.strings b/ios-rongimdemo/framework/zh-Hans.lproj/RongCloudKit.strings index 9bfba62e..aada416d 100644 --- a/ios-rongimdemo/framework/zh-Hans.lproj/RongCloudKit.strings +++ b/ios-rongimdemo/framework/zh-Hans.lproj/RongCloudKit.strings @@ -92,6 +92,7 @@ "JoinChatRoomFailed"="加入聊天室失败"; "Connecting..."="连接中..."; "FromFriendInvitation"="来自%@的好友请求"; +"AcceptFriendRequest"="通过了你的好友请求"; "AddFriendInvitation"="添加好友请求"; "ReadAll"="阅读全文"; "OfficialAccounts"="公共账号"; @@ -130,6 +131,7 @@ "VoIPVideoCall"="视频通话"; "VoIPAudioCallExistedWarning"="正在进行语音通话，请稍后再试"; "VoIPVideoCallExistedWarning"="正在进行视频通话，请稍后再试"; +"AudioHoldingWarning"="声音通道正被占用，请稍后再试"; "VoIPCallSelectMember"="选择成员"; "VoIPAudioCallMaxNumSelectMember"="最多允许%d人同时语音聊天"; "VoIPVideoCallMaxNumSelectMember"="最多允许%d人同时视频聊天"; diff --git a/ios-rongimdemo/xcodebuild.sh b/ios-rongimdemo/xcodebuild.sh index 652f2126..cfaff892 100644 --- a/ios-rongimdemo/xcodebuild.sh +++ b/ios-rongimdemo/xcodebuild.sh @@ -2,15 +2,19 @@ echo "Copy 3rd framework start." if [ -d "../ios-3rd-vendor/jrmf/AlipaySDK" ]; then +rm -rf ./framework/AlipaySDK cp -rf ../ios-3rd-vendor/jrmf/AlipaySDK ./framework/ fi if [ -d "../ios-3rd-vendor/jrmf/JrmfIMLib" ]; then +rm -rf ./framework/JrmfIMLib cp -rf ../ios-3rd-vendor/jrmf/JrmfIMLib ./framework/ fi if [ -d "../ios-3rd-vendor/ifly" ]; then +rm -rf ./framework/ifly cp -rf ../ios-3rd-vendor/ifly ./framework/ fi if [ -d "../ios-3rd-vendor/bqmm" ]; then +rm -rf ./framework/bqmm cp -rf ../ios-3rd-vendor/bqmm ./framework/ fi echo "Copy 3rd framework end." 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 f74a0152..c981c6ab 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.4 Stable + 2.8.5 Dev CFBundleSignature ???? CFBundleVersion - 201612191851 + 201701092341 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 0c7ffb11..ea92015c 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.4 Stable + 2.8.5 Dev CFBundleSignature ???? CFBundleVersion - 201612191851 + 201701092341 NSExtension NSExtensionAttributes