Release RongCloud CallKit SDK 2.6.6

rongcloud · Jul 12, 2016 · feb8da2 · feb8da2
1 parent 80c6206
commit feb8da2
Show file tree

Hide file tree

Showing 34 changed files with 33 additions and 6 deletions.
diff --git 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
@@ -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
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.6.5</string>
+	<string>2.6.6</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git 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
diff --git a/ios-rongcallkit/framework/RongCallLib.framework/RongCallLib b/ios-rongcallkit/framework/RongCallLib.framework/RongCallLib
diff --git a/ios-rongcallkit/framework/RongCloud.bundle/[email protected] b/ios-rongcallkit/framework/RongCloud.bundle/[email protected]
diff --git a/ios-rongcallkit/framework/RongCloud.bundle/bubble.png b/ios-rongcallkit/framework/RongCloud.bundle/bubble.png
diff --git a/ios-rongcallkit/framework/RongCloud.bundle/[email protected] b/ios-rongcallkit/framework/RongCloud.bundle/[email protected]
diff --git a/ios-rongcallkit/framework/RongCloud.bundle/[email protected] b/ios-rongcallkit/framework/RongCloud.bundle/[email protected]
diff --git a/ios-rongcallkit/framework/RongCloud.bundle/message_fail.png b/ios-rongcallkit/framework/RongCloud.bundle/message_fail.png
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
diff --git a/ios-rongcallkit/framework/RongCloud.bundle/[email protected] b/ios-rongcallkit/framework/RongCloud.bundle/[email protected]
diff --git a/ios-rongcallkit/framework/RongCloud.bundle/[email protected] b/ios-rongcallkit/framework/RongCloud.bundle/[email protected]
diff --git a/ios-rongcallkit/framework/RongCloud.bundle/[email protected] b/ios-rongcallkit/framework/RongCloud.bundle/[email protected]
diff --git a/ios-rongcallkit/framework/RongCloud.bundle/navigator_btn_back.png b/ios-rongcallkit/framework/RongCloud.bundle/navigator_btn_back.png
diff --git a/ios-rongcallkit/framework/RongCloud.bundle/network_fail.png b/ios-rongcallkit/framework/RongCloud.bundle/network_fail.png
diff --git a/ios-rongcallkit/framework/RongCloud.bundle/[email protected] b/ios-rongcallkit/framework/RongCloud.bundle/[email protected]
diff --git a/ios-rongcallkit/framework/RongCloud.bundle/selected_full.png b/ios-rongcallkit/framework/RongCloud.bundle/selected_full.png
diff --git a/ios-rongcallkit/framework/RongCloud.bundle/sendMsg_failed_tip.png b/ios-rongcallkit/framework/RongCloud.bundle/sendMsg_failed_tip.png
diff --git a/ios-rongcallkit/framework/RongCloud.bundle/unselected_full.png b/ios-rongcallkit/framework/RongCloud.bundle/unselected_full.png
diff --git a/ios-rongcallkit/framework/RongCloud.bundle/up.png b/ios-rongcallkit/framework/RongCloud.bundle/up.png
diff --git a/ios-rongcallkit/framework/RongCloud.bundle/voice_unread.png b/ios-rongcallkit/framework/RongCloud.bundle/voice_unread.png
diff --git a/ios-rongcallkit/framework/RongCloud.bundle/[email protected] b/ios-rongcallkit/framework/RongCloud.bundle/[email protected]
diff --git a/ios-rongcallkit/framework/RongCloud.bundle/voip/voip_call.caf b/ios-rongcallkit/framework/RongCloud.bundle/voip/voip_call.caf
diff --git a/ios-rongcallkit/framework/RongCloud.bundle/voip/voip_call.mp3 b/ios-rongcallkit/framework/RongCloud.bundle/voip/voip_call.mp3
diff --git a/ios-rongcallkit/framework/RongCloud.bundle/voip/voip_calling_ring.mp3 b/ios-rongcallkit/framework/RongCloud.bundle/voip/voip_calling_ring.mp3
diff --git a/ios-rongcallkit/framework/RongIMKit.framework/Info.plist b/ios-rongcallkit/framework/RongIMKit.framework/Info.plist
diff --git a/ios-rongcallkit/framework/RongIMKit.framework/RongIMKit b/ios-rongcallkit/framework/RongIMKit.framework/RongIMKit
diff --git 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
diff --git a/ios-rongcallkit/framework/RongIMLib.framework/RongIMLib b/ios-rongcallkit/framework/RongIMLib.framework/RongIMLib
diff --git 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
@@ -40,8 +40,8 @@
 "Back"="返回";
 "IsDeleteHistoryMsg"="是否删除历史消息？";
 "ConnectionIsNotReachable"="当前网络不可用，请检查你的网络设置";
-"Album"="相册";
-"Photo"="照相";
+"Camera"="拍摄";
+"Photos"="照片";
 "Location"="位置";
 "Audio"="语音通话";
 "Albums"="相册列表";