Release RongCloud CallKit SDK 2.7.2

ios-rongcallkit/RongCallKit.xcodeproj/project.pbxproj

@@ -7,6 +7,8 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		A6253FFB1D86A9D000408F9D /* RCDAudioFrameObserver.mm in Sources */ = {isa = PBXBuildFile; fileRef = A6253FF91D86A9D000408F9D /* RCDAudioFrameObserver.mm */; };
+		A6253FFC1D86A9D000408F9D /* RCDAudioFrameObserver.h in Headers */ = {isa = PBXBuildFile; fileRef = A6253FFA1D86A9D000408F9D /* RCDAudioFrameObserver.h */; };
 		A68AFAE91CCEFF5B00F16B3D /* RCCallDetailMessageCell.h in Headers */ = {isa = PBXBuildFile; fileRef = A68AFAE51CCEFF5B00F16B3D /* RCCallDetailMessageCell.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		A68AFAEA1CCEFF5B00F16B3D /* RCCallDetailMessageCell.m in Sources */ = {isa = PBXBuildFile; fileRef = A68AFAE61CCEFF5B00F16B3D /* RCCallDetailMessageCell.m */; };
 		A68AFAEB1CCEFF5B00F16B3D /* RCCallTipMessageCell.h in Headers */ = {isa = PBXBuildFile; fileRef = A68AFAE71CCEFF5B00F16B3D /* RCCallTipMessageCell.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -51,6 +53,8 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
+		A6253FF91D86A9D000408F9D /* RCDAudioFrameObserver.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RCDAudioFrameObserver.mm; sourceTree = "<group>"; };
+		A6253FFA1D86A9D000408F9D /* RCDAudioFrameObserver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCDAudioFrameObserver.h; sourceTree = "<group>"; };
 		A68AFAE51CCEFF5B00F16B3D /* RCCallDetailMessageCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCCallDetailMessageCell.h; sourceTree = "<group>"; };
 		A68AFAE61CCEFF5B00F16B3D /* RCCallDetailMessageCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCCallDetailMessageCell.m; sourceTree = "<group>"; };
 		A68AFAE71CCEFF5B00F16B3D /* RCCallTipMessageCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCCallTipMessageCell.h; sourceTree = "<group>"; };
@@ -110,6 +114,15 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		A6253FF81D86A9AB00408F9D /* AudioObserver */ = {
+			isa = PBXGroup;
+			children = (
+				A6253FFA1D86A9D000408F9D /* RCDAudioFrameObserver.h */,
+				A6253FF91D86A9D000408F9D /* RCDAudioFrameObserver.mm */,
+			);
+			path = AudioObserver;
+			sourceTree = "<group>";
+		};
 		A6BE1A441CCE561200FF6BF7 = {
 			isa = PBXGroup;
 			children = (
@@ -130,6 +143,7 @@
 		A6BE1A501CCE561200FF6BF7 /* RongCallKit */ = {
 			isa = PBXGroup;
 			children = (
+				A6253FF81D86A9AB00408F9D /* AudioObserver */,
 				A6EF9B941D0E640E00785C27 /* VideoObserver */,
 				F8D290491D2790C1002BFA65 /* Extension */,
 				A6BE1AFB1CCEFAAC00FF6BF7 /* Cell */,
@@ -283,6 +297,7 @@
 				A6BE1B301CCEFAAC00FF6BF7 /* RCAudioMultiCallUserCollectionLayout.h in Headers */,
 				F8D2904C1D2790E3002BFA65 /* RCCallKitExtensionModule.h in Headers */,
 				A6BE1B221CCEFAAC00FF6BF7 /* RCCallSelectingMemberCell.h in Headers */,
+				A6253FFC1D86A9D000408F9D /* RCDAudioFrameObserver.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -389,6 +404,7 @@
 				A6BE1B351CCEFAAC00FF6BF7 /* RCCallUserCallInfoModel.m in Sources */,
 				A6BE1B311CCEFAAC00FF6BF7 /* RCAudioMultiCallUserCollectionLayout.m in Sources */,
 				A6BE1B2B1CCEFAAC00FF6BF7 /* RCCallSelectMemberViewController.m in Sources */,
+				A6253FFB1D86A9D000408F9D /* RCDAudioFrameObserver.mm in Sources */,
 				A6BE1B231CCEFAAC00FF6BF7 /* RCCallSelectingMemberCell.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;

ios-rongcallkit/RongCallKit/AudioObserver/RCDAudioFrameObserver.h

@@ -0,0 +1,25 @@
+//
+//  RCDAudioFrameObserver.hpp
+//  RongCallKit
+//
+//  Created by litao on 16/9/12.
+//  Copyright © 2016年 Rong Cloud. All rights reserved.
+//
+
+#ifndef RCDAudioFrameObserver_hpp
+#define RCDAudioFrameObserver_hpp
+
+#include <RongCallLib/IVideoFrameObserver.h>
+#import <UIKit/UIKit.h>
+#include <stdio.h>
+#import <AgoraRtcEngineKit/IAgoraMediaEngine.h>
+
+class RCDAudioFrameObserver : public agora::media::IAudioFrameObserver {
+public:
+  static RCDAudioFrameObserver *sharedObserver();
+  bool onRecordAudioFrame(agora::media::IAudioFrameObserver::AudioFrame& audioFrame);
+  bool onPlaybackAudioFrame(agora::media::IAudioFrameObserver::AudioFrame& audioFrame);
+  bool onPlaybackAudioFrameBeforeMixing(unsigned int uid, agora::media::IAudioFrameObserver::AudioFrame& audioFrame);
+};
+
+#endif /* RCDAudioFrameObserver_hpp */

ios-rongcallkit/RongCallKit/AudioObserver/RCDAudioFrameObserver.mm

@@ -0,0 +1,27 @@
+//
+//  RCDAudioFrameObserver.cpp
+//  RongCallKit
+//
+//  Created by litao on 16/9/12.
+//  Copyright © 2016年 Rong Cloud. All rights reserved.
+//
+
+#include "RCDAudioFrameObserver.h"
+
+RCDAudioFrameObserver *RCDAudioFrameObserver::sharedObserver() {
+  static RCDAudioFrameObserver sharedObserver;
+  return &sharedObserver;
+}
+
+
+bool RCDAudioFrameObserver::onRecordAudioFrame(agora::media::IAudioFrameObserver::AudioFrame& audioFrame) {
+  return true;
+}
+bool RCDAudioFrameObserver::onPlaybackAudioFrame(agora::media::IAudioFrameObserver::AudioFrame& audioFrame) {
+  return true;
+}
+bool RCDAudioFrameObserver::onPlaybackAudioFrameBeforeMixing(unsigned int uid, agora::media::IAudioFrameObserver::AudioFrame& audioFrame) {
+  NSString *userId = rcGetUserIdFromAgoraUID(uid);
+  NSLog(@"the user id is %@", userId);
+  return true;
+}

ios-rongcallkit/RongCallKit/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.7.1</string>
+	<string>2.7.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

ios-rongcallkit/RongCallKit/RCCall.mm

@@ -19,6 +19,7 @@
 #import "RCDVideoFrameObserver.h"
 #import "RCUserInfoCacheManager.h"
 #import <AVFoundation/AVFoundation.h>
+#import "RCDAudioFrameObserver.h"
 
 #define AlertWithoutConfirm 1000
 #define AlertWithConfirm 1001
@@ -45,7 +46,8 @@ + (instancetype)sharedRCCall {
       pRongVoIP.callWindows = [[NSMutableArray alloc] init];
       pRongVoIP.locationNotificationList = [[NSMutableArray alloc] init];
 
-      //agoraRegisterVideoFrameObserver(RCDVideoFrameObserver::sharedObserver(), true, true);
+//      agoraRegisterVideoFrameObserver(RCDVideoFrameObserver::sharedObserver(), true, true);
+//      agoraRegisterAudioFrameObserver(RCDAudioFrameObserver::sharedObserver());
     }
   });
   return pRongVoIP;

ios-rongcallkit/RongCallKit/VideoObserver/RCDVideoFrameObserver.mm

@@ -82,6 +82,8 @@
   return true;
 }
 bool RCDVideoFrameObserver::onRenderVideoFrame(unsigned int uid, agora::media::IVideoFrameObserver::VideoFrame& videoFrame) {
+  NSString *userId = rcGetUserIdFromAgoraUID(uid);
+  NSLog(@"the user id is %@", userId);
   return true;
 }
 void RCDVideoFrameObserver::setYUV(unsigned char *yBuffer,

ios-rongcallkit/framework/RongCallLib.framework/Headers/IVideoFrameObserver.h

@@ -1,6 +1,7 @@
 #ifndef _ivideoframeobserve_h
 #define _ivideoframeobserve_h
 
+#import <Foundation/Foundation.h>
 #import <AgoraRtcEngineKit/IAgoraMediaEngine.h>
 
 
@@ -19,6 +20,10 @@ extern "C" {
 #endif
 int agoraRegisterVideoFrameObserver(agora::media::IVideoFrameObserver *observer,
     bool useExternalResource = false, bool localPreview = true);
+
+int agoraRegisterAudioFrameObserver(agora::media::IAudioFrameObserver* observer);
+
+NSString *rcGetUserIdFromAgoraUID(int uid);
 #ifdef __cplusplus
 }
 #endif

ios-rongcallkit/framework/RongIMKit.framework/Headers/RCChatSessionInputBarControl.h

@@ -18,8 +18,8 @@
 #define PLUGIN_BOARD_ITEM_ALBUM_TAG      1001
 #define PLUGIN_BOARD_ITEM_CAMERA_TAG     1002
 #define PLUGIN_BOARD_ITEM_LOCATION_TAG   1003
-//#define PLUGIN_BOARD_ITEM_VOIP_TAG       1101
-//#define PLUGIN_BOARD_ITEM_VIDEO_VOIP_TAG 1102
+#define PLUGIN_BOARD_ITEM_VOIP_TAG       1101
+#define PLUGIN_BOARD_ITEM_VIDEO_VOIP_TAG 1102
 #define PLUGIN_BOARD_ITEM_FILE_TAG       1006
 
 /*!
@@ -330,6 +330,8 @@ __deprecated_msg("已废弃，请勿使用。");
  
  @param status          输入框状态
  @param animated        是否使用动画效果
+ 
+ @discussion 如果需要设置，请在输入框执行containerViewWillAppear之后（即聊天界面viewWillAppear之后）。
  */
 -(void)updateStatus:(KBottomBarStatus)status animated:(BOOL)animated;
 
@@ -525,4 +527,12 @@ __deprecated_msg("已废弃，请勿使用。");
  */
 - (void)getSelectingUserIdList:(void (^)(NSArray<NSString *> *userIdList))completion functionTag:(NSInteger)functionTag;
 
+/*!
+ 获取待选择的UserId的用户信息
+ 
+ @param userId           用户ID
+ @return 用户信息
+ */
+- (RCUserInfo *)getSelectingUserInfo:(NSString *)userId;
+
 @end

ios-rongcallkit/framework/RongIMLib.framework/Headers/RCConversation.h

@@ -88,8 +88,8 @@
 
  @warning **已废弃，请勿使用。**
  */
-@property(nonatomic, strong) __deprecated_msg("已废弃，请勿使用。")
-    NSString *senderUserName;
+@property(nonatomic, strong) NSString *senderUserName
+__deprecated_msg("已废弃，请勿使用。");
 
 /*!
  会话中最后一条消息的消息ID
@@ -103,6 +103,9 @@
 
 /*!
  会话中最后一条消息的json Dictionary
+ 
+ @discussion 此字段存放最后一条消息内容中未编码的json数据。
+ SDK内置的消息，如果消息解码失败，默认会将消息的内容存放到此字段；如果编码和解码正常，此字段会置为nil。
  */
 @property(nonatomic, strong) NSDictionary *jsonDict;