diff --git a/ios-rongcallkit/RongCallKit/Extension/RCCallKitExtensionModel.m b/ios-rongcallkit/RongCallKit/Extension/RCCallKitExtensionModel.m index f749e51..a9530c8 100644 --- a/ios-rongcallkit/RongCallKit/Extension/RCCallKitExtensionModel.m +++ b/ios-rongcallkit/RongCallKit/Extension/RCCallKitExtensionModel.m @@ -70,6 +70,19 @@ - (CGSize)getMessageCellSize:(RCConversationType)conversationType return CGSizeMake(0, 0); } +- (BOOL)isMessageCellPortraitDisplayed:(RCConversationType)conversationType + targetId:(NSString *)targetId + messageContent:(RCMessageContent *)messageContent { + if ([messageContent isKindOfClass:[RCCallSummaryMessage class]]) { + if (conversationType == ConversationType_PRIVATE) { + return YES; + } else if (conversationType == ConversationType_GROUP || conversationType == ConversationType_DISCUSSION) { + return NO; + } + } + return NO; +} + - (BOOL)didHoldMessageCellTapEvent:(RCConversationType)conversationType targetId:(NSString *)targetId messageContent:(RCMessageContent *)messageContent { diff --git a/ios-rongcallkit/RongCallKit/Header/RongIMKitExtensionModel.h b/ios-rongcallkit/RongCallKit/Header/RongIMKitExtensionModel.h index 55633c0..ac9a96f 100644 --- a/ios-rongcallkit/RongCallKit/Header/RongIMKitExtensionModel.h +++ b/ios-rongcallkit/RongCallKit/Header/RongIMKitExtensionModel.h @@ -34,6 +34,10 @@ typedef void (^RCConversationPluginItemTapBlock)(); messageContent:(RCMessageContent *)messageContent collectionViewSize:(CGSize)collectionViewSize; +- (BOOL)isMessageCellPortraitDisplayed:(RCConversationType)conversationType + targetId:(NSString *)targetId + messageContent:(RCMessageContent *)messageContent; + - (BOOL)didHoldMessageCellTapEvent:(RCConversationType)conversationType targetId:(NSString *)targetId messageContent:(RCMessageContent *)messageContent; diff --git a/ios-rongcallkit/RongCallKit/Info.plist b/ios-rongcallkit/RongCallKit/Info.plist index 4f8b64c..05613b3 100644 --- a/ios-rongcallkit/RongCallKit/Info.plist +++ b/ios-rongcallkit/RongCallKit/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 2.6.5 + 2.6.6 CFBundleSignature ???? CFBundleVersion diff --git a/ios-rongcallkit/RongCallKit/RCCall.mm b/ios-rongcallkit/RongCallKit/RCCall.mm index 0bf09ce..8eb8a66 100644 --- a/ios-rongcallkit/RongCallKit/RCCall.mm +++ b/ios-rongcallkit/RongCallKit/RCCall.mm @@ -355,7 +355,7 @@ - (void)didReceiveCallRemoteNotification:(NSString *)callId } callNotification.userInfo = userDict; - callNotification.soundName = @"voip_call.caf"; + callNotification.soundName = @"RongCloud.bundle/voip/voip_call.caf"; // VoIP Push和接收消息的通话排重 for (UILocalNotification *notification in self.locationNotificationList) { diff --git a/ios-rongcallkit/framework/RongCallLib.framework/Info.plist b/ios-rongcallkit/framework/RongCallLib.framework/Info.plist index 5803de6..7f894f0 100644 Binary files a/ios-rongcallkit/framework/RongCallLib.framework/Info.plist and b/ios-rongcallkit/framework/RongCallLib.framework/Info.plist differ diff --git a/ios-rongcallkit/framework/RongCallLib.framework/RongCallLib b/ios-rongcallkit/framework/RongCallLib.framework/RongCallLib index 9ed1327..5bfc220 100644 Binary files a/ios-rongcallkit/framework/RongCallLib.framework/RongCallLib and b/ios-rongcallkit/framework/RongCallLib.framework/RongCallLib differ diff --git a/ios-rongcallkit/framework/RongCloud.bundle/block_notification@2x.png b/ios-rongcallkit/framework/RongCloud.bundle/block_notification@2x.png index 086996f..e20d7c3 100644 Binary files a/ios-rongcallkit/framework/RongCloud.bundle/block_notification@2x.png and b/ios-rongcallkit/framework/RongCloud.bundle/block_notification@2x.png differ diff --git a/ios-rongcallkit/framework/RongCloud.bundle/bubble.png b/ios-rongcallkit/framework/RongCloud.bundle/bubble.png index ccac4f7..a614ea4 100644 Binary files a/ios-rongcallkit/framework/RongCloud.bundle/bubble.png and b/ios-rongcallkit/framework/RongCloud.bundle/bubble.png differ diff --git a/ios-rongcallkit/framework/RongCloud.bundle/chat_from_bg_normal@2x.png b/ios-rongcallkit/framework/RongCloud.bundle/chat_from_bg_normal@2x.png index 4629d12..767f544 100644 Binary files a/ios-rongcallkit/framework/RongCloud.bundle/chat_from_bg_normal@2x.png and b/ios-rongcallkit/framework/RongCloud.bundle/chat_from_bg_normal@2x.png differ diff --git a/ios-rongcallkit/framework/RongCloud.bundle/chat_to_bg_normal@2x.png b/ios-rongcallkit/framework/RongCloud.bundle/chat_to_bg_normal@2x.png index e727e43..f8d3471 100644 Binary files a/ios-rongcallkit/framework/RongCloud.bundle/chat_to_bg_normal@2x.png and b/ios-rongcallkit/framework/RongCloud.bundle/chat_to_bg_normal@2x.png differ diff --git a/ios-rongcallkit/framework/RongCloud.bundle/message_fail.png b/ios-rongcallkit/framework/RongCloud.bundle/message_fail.png new file mode 100644 index 0000000..e26a270 Binary files /dev/null and b/ios-rongcallkit/framework/RongCloud.bundle/message_fail.png differ diff --git a/ios-rongcallkit/framework/RongCloud.bundle/message_read_status@2x 2.png b/ios-rongcallkit/framework/RongCloud.bundle/message_read_status@2x 2.png new file mode 100644 index 0000000..5595f63 Binary files /dev/null and b/ios-rongcallkit/framework/RongCloud.bundle/message_read_status@2x 2.png differ diff --git a/ios-rongcallkit/framework/RongCloud.bundle/message_read_status@2x.png b/ios-rongcallkit/framework/RongCloud.bundle/message_read_status@2x.png index 5595f63..52f5afb 100644 Binary files a/ios-rongcallkit/framework/RongCloud.bundle/message_read_status@2x.png and b/ios-rongcallkit/framework/RongCloud.bundle/message_read_status@2x.png differ diff --git a/ios-rongcallkit/framework/RongCloud.bundle/message_send_fail_status@2x.png b/ios-rongcallkit/framework/RongCloud.bundle/message_send_fail_status@2x.png index 0a2f022..c332223 100644 Binary files a/ios-rongcallkit/framework/RongCloud.bundle/message_send_fail_status@2x.png and b/ios-rongcallkit/framework/RongCloud.bundle/message_send_fail_status@2x.png differ diff --git a/ios-rongcallkit/framework/RongCloud.bundle/navigation_back@2x.png b/ios-rongcallkit/framework/RongCloud.bundle/navigation_back@2x.png deleted file mode 100755 index 633b9e6..0000000 Binary files a/ios-rongcallkit/framework/RongCloud.bundle/navigation_back@2x.png and /dev/null differ diff --git a/ios-rongcallkit/framework/RongCloud.bundle/navigator_btn_back.png b/ios-rongcallkit/framework/RongCloud.bundle/navigator_btn_back.png index b744f6f..dcfd306 100644 Binary files a/ios-rongcallkit/framework/RongCloud.bundle/navigator_btn_back.png and b/ios-rongcallkit/framework/RongCloud.bundle/navigator_btn_back.png differ diff --git a/ios-rongcallkit/framework/RongCloud.bundle/network_fail.png b/ios-rongcallkit/framework/RongCloud.bundle/network_fail.png index f5e109c..584777a 100644 Binary files a/ios-rongcallkit/framework/RongCloud.bundle/network_fail.png and b/ios-rongcallkit/framework/RongCloud.bundle/network_fail.png differ diff --git a/ios-rongcallkit/framework/RongCloud.bundle/no_message_img@2x.png b/ios-rongcallkit/framework/RongCloud.bundle/no_message_img@2x.png old mode 100755 new mode 100644 index 3e574f1..db01806 Binary files a/ios-rongcallkit/framework/RongCloud.bundle/no_message_img@2x.png and b/ios-rongcallkit/framework/RongCloud.bundle/no_message_img@2x.png differ diff --git a/ios-rongcallkit/framework/RongCloud.bundle/selected_full.png b/ios-rongcallkit/framework/RongCloud.bundle/selected_full.png index f923747..05e1738 100644 Binary files a/ios-rongcallkit/framework/RongCloud.bundle/selected_full.png and b/ios-rongcallkit/framework/RongCloud.bundle/selected_full.png differ diff --git a/ios-rongcallkit/framework/RongCloud.bundle/sendMsg_failed_tip.png b/ios-rongcallkit/framework/RongCloud.bundle/sendMsg_failed_tip.png new file mode 100644 index 0000000..9bfd123 Binary files /dev/null and b/ios-rongcallkit/framework/RongCloud.bundle/sendMsg_failed_tip.png differ diff --git a/ios-rongcallkit/framework/RongCloud.bundle/unselected_full.png b/ios-rongcallkit/framework/RongCloud.bundle/unselected_full.png index d261e54..54191d5 100644 Binary files a/ios-rongcallkit/framework/RongCloud.bundle/unselected_full.png and b/ios-rongcallkit/framework/RongCloud.bundle/unselected_full.png differ diff --git a/ios-rongcallkit/framework/RongCloud.bundle/up.png b/ios-rongcallkit/framework/RongCloud.bundle/up.png index 0bc520f..a30d8b2 100644 Binary files a/ios-rongcallkit/framework/RongCloud.bundle/up.png and b/ios-rongcallkit/framework/RongCloud.bundle/up.png differ diff --git a/ios-rongcallkit/framework/RongCloud.bundle/voice_unread.png b/ios-rongcallkit/framework/RongCloud.bundle/voice_unread.png new file mode 100644 index 0000000..5c0084b Binary files /dev/null and b/ios-rongcallkit/framework/RongCloud.bundle/voice_unread.png differ diff --git a/ios-rongcallkit/framework/RongCloud.bundle/voice_unread@2x.png b/ios-rongcallkit/framework/RongCloud.bundle/voice_unread@2x.png deleted file mode 100644 index 4e5c888..0000000 Binary files a/ios-rongcallkit/framework/RongCloud.bundle/voice_unread@2x.png and /dev/null differ diff --git a/ios-rongcallkit/framework/RongCloud.bundle/voip/voip_call.caf b/ios-rongcallkit/framework/RongCloud.bundle/voip/voip_call.caf new file mode 100644 index 0000000..f316df2 Binary files /dev/null and b/ios-rongcallkit/framework/RongCloud.bundle/voip/voip_call.caf differ diff --git a/ios-rongcallkit/framework/RongCloud.bundle/voip/voip_call.mp3 b/ios-rongcallkit/framework/RongCloud.bundle/voip/voip_call.mp3 index dabccb5..5e3a11d 100644 Binary files a/ios-rongcallkit/framework/RongCloud.bundle/voip/voip_call.mp3 and b/ios-rongcallkit/framework/RongCloud.bundle/voip/voip_call.mp3 differ diff --git a/ios-rongcallkit/framework/RongCloud.bundle/voip/voip_calling_ring.mp3 b/ios-rongcallkit/framework/RongCloud.bundle/voip/voip_calling_ring.mp3 index cfd8cfe..9eee3b0 100644 Binary files a/ios-rongcallkit/framework/RongCloud.bundle/voip/voip_calling_ring.mp3 and b/ios-rongcallkit/framework/RongCloud.bundle/voip/voip_calling_ring.mp3 differ diff --git a/ios-rongcallkit/framework/RongIMKit.framework/Info.plist b/ios-rongcallkit/framework/RongIMKit.framework/Info.plist index 9434b16..704a54e 100644 Binary files a/ios-rongcallkit/framework/RongIMKit.framework/Info.plist and b/ios-rongcallkit/framework/RongIMKit.framework/Info.plist differ diff --git a/ios-rongcallkit/framework/RongIMKit.framework/RongIMKit b/ios-rongcallkit/framework/RongIMKit.framework/RongIMKit index c10eb7a..88130f2 100644 Binary files a/ios-rongcallkit/framework/RongIMKit.framework/RongIMKit and b/ios-rongcallkit/framework/RongIMKit.framework/RongIMKit differ diff --git a/ios-rongcallkit/framework/RongIMLib.framework/Headers/RCUtilities.h b/ios-rongcallkit/framework/RongIMLib.framework/Headers/RCUtilities.h index d6871cd..d1e5e4b 100644 --- a/ios-rongcallkit/framework/RongIMLib.framework/Headers/RCUtilities.h +++ b/ios-rongcallkit/framework/RongIMLib.framework/Headers/RCUtilities.h @@ -61,6 +61,16 @@ + (UIImage *)imageByScalingAndCropSize:(UIImage *)image targetSize:(CGSize)targetSize; +/*! + generate thumbnail from image + + @param image image + @param targetSize targetSize + + @return image + */ ++ (UIImage *)generateThumbnail:(UIImage *)image + targetSize:(CGSize)targetSize; /*! compressedImageWithMaxDataLength diff --git a/ios-rongcallkit/framework/RongIMLib.framework/Info.plist b/ios-rongcallkit/framework/RongIMLib.framework/Info.plist index f251f24..efa55cb 100644 Binary files a/ios-rongcallkit/framework/RongIMLib.framework/Info.plist and b/ios-rongcallkit/framework/RongIMLib.framework/Info.plist differ diff --git a/ios-rongcallkit/framework/RongIMLib.framework/RongIMLib b/ios-rongcallkit/framework/RongIMLib.framework/RongIMLib index ba98767..441cb80 100644 Binary files a/ios-rongcallkit/framework/RongIMLib.framework/RongIMLib and b/ios-rongcallkit/framework/RongIMLib.framework/RongIMLib differ diff --git a/ios-rongcallkit/framework/en.lproj/RongCloudKit.strings b/ios-rongcallkit/framework/en.lproj/RongCloudKit.strings index 3f476a5..0894c1c 100644 --- a/ios-rongcallkit/framework/en.lproj/RongCloudKit.strings +++ b/ios-rongcallkit/framework/en.lproj/RongCloudKit.strings @@ -40,8 +40,8 @@ "Back"="Back"; "IsDeleteHistoryMsg"="Do you want to delete history message?"; "ConnectionIsNotReachable"="Network unavailable,check network"; -"Album"="Album"; -"Photo"="Photo"; +"Camera"="Camera"; +"Photos"="Photos"; "Location"="Location"; "Audio"="Audio"; "Albums"="Albums"; diff --git a/ios-rongcallkit/framework/zh-Hans.lproj/RongCloudKit.strings b/ios-rongcallkit/framework/zh-Hans.lproj/RongCloudKit.strings index fabb981..5765349 100644 --- a/ios-rongcallkit/framework/zh-Hans.lproj/RongCloudKit.strings +++ b/ios-rongcallkit/framework/zh-Hans.lproj/RongCloudKit.strings @@ -40,8 +40,8 @@ "Back"="返回"; "IsDeleteHistoryMsg"="是否删除历史消息？"; "ConnectionIsNotReachable"="当前网络不可用，请检查你的网络设置"; -"Album"="相册"; -"Photo"="照相"; +"Camera"="拍摄"; +"Photos"="照片"; "Location"="位置"; "Audio"="语音通话"; "Albums"="相册列表";