更换SDK

王军波
1 parent cc77629c
Showing 11 changed files with 237 additions and 15 deletions
LiveVideoCloud.xcodeproj/project.pbxproj
LiveVideoCloud/Classes/CNLiveSDK/CNLiveChatManager.framework/CNLiveChatManager
LiveVideoCloud/Classes/CNLiveSDK/CNLiveChatManager.framework/Headers/CNLiveChatManager.h
LiveVideoCloud/Classes/CNLiveSDK/CNLiveChatManager.framework/Headers/CNLiveCommentCountResult.h
LiveVideoCloud/Classes/CNLiveSDK/CNLiveChatManager.framework/Headers/CNLiveCommentDetailInfoResult.h
LiveVideoCloud/Classes/CNLiveSDK/CNLiveChatManager.framework/Headers/CNLiveCommentListResult.h
LiveVideoCloud/Classes/CNLiveSDK/CNLiveChatManager.framework/Headers/CNLiveCommentManager.h
LiveVideoCloud/Classes/CNLiveSDK/CNLiveChatManager.framework/Info.plist
LiveVideoCloud/Classes/CNLiveSDK/CNLiveMsgTools.framework/CNLiveMsgTools
LiveVideoCloud/Classes/CNLiveSDK/CNLiveMsgTools.framework/Headers/CNLiveMsgManager.h
LiveVideoCloud/Classes/CNLiveSDK/CNLiveMsgTools.framework/Info.plist
@@ -241,10 +241,6 @@
 		D2888D941E6EB8B4003A77C8 /* LVCTabBar.m in Sources */ = {isa = PBXBuildFile; fileRef = D2888D931E6EB8B4003A77C8 /* LVCTabBar.m */; };
 		D2888D9E1E6EBF1B003A77C8 /* LVCLiveViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2888D9B1E6EBF1B003A77C8 /* LVCLiveViewController.m */; };
 		D2888DB11E6EC05F003A77C8 /* TempViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2888DB01E6EC05F003A77C8 /* TempViewController.m */; };
-		D2994BA81E8F490400E8D2CC /* CNLiveChatManager.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D2994BA41E8F48DE00E8D2CC /* CNLiveChatManager.framework */; };
-		D2994BA91E8F490400E8D2CC /* CNLiveChatManager.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D2994BA41E8F48DE00E8D2CC /* CNLiveChatManager.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
-		D2994BAA1E8F490700E8D2CC /* CNLiveMsgTools.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D2994BA51E8F48DE00E8D2CC /* CNLiveMsgTools.framework */; };
-		D2994BAB1E8F490700E8D2CC /* CNLiveMsgTools.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D2994BA51E8F48DE00E8D2CC /* CNLiveMsgTools.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		D29D88481E88C53300543A03 /* LVCUGCLivePrepareView.m in Sources */ = {isa = PBXBuildFile; fileRef = D29D88471E88C53300543A03 /* LVCUGCLivePrepareView.m */; };
 		D29E81ED1E88DC5B008C9906 /* PriChatCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D29E81EC1E88DC5B008C9906 /* PriChatCell.m */; };
 		D2A803081E80BD6F009D6F1C /* TopToolView.m in Sources */ = {isa = PBXBuildFile; fileRef = D2A803071E80BD6F009D6F1C /* TopToolView.m */; };
@@ -268,6 +264,11 @@
 		D2EBC8881F0225D900F198FB /* LVCVodPlayerListController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2EBC8871F0225D900F198FB /* LVCVodPlayerListController.m */; };
 		D2EBC88B1F02361600F198FB /* LVCUGCLiveListView.m in Sources */ = {isa = PBXBuildFile; fileRef = D2EBC88A1F02361600F198FB /* LVCUGCLiveListView.m */; };
 		D2EBC88E1F023AA400F198FB /* LVCVodPlayerController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2EBC88D1F023AA400F198FB /* LVCVodPlayerController.m */; };
+		D2EBC8901F0241AD00F198FB /* CNLiveMsgTools.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D2EBC88F1F0241AD00F198FB /* CNLiveMsgTools.framework */; };
+		D2EBC8921F0241B500F198FB /* CNLiveChatManager.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D2EBC8911F0241B500F198FB /* CNLiveChatManager.framework */; };
+		D2EBC8931F0241B900F198FB /* CNLiveChatManager.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D2EBC8911F0241B500F198FB /* CNLiveChatManager.framework */; };
+		D2EBC8941F0241B900F198FB /* CNLiveChatManager.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D2EBC8911F0241B500F198FB /* CNLiveChatManager.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		D2EBC8961F0241BC00F198FB /* CNLiveMsgTools.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D2EBC88F1F0241AD00F198FB /* CNLiveMsgTools.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 /* End PBXBuildFile section */
 /* Begin PBXContainerItemProxy section */
@@ -295,8 +296,8 @@
 			dstSubfolderSpec = 10;
 			files = (
 				8178D4191F01FA3600AA78A4 /* CNLivePlayerSDK.framework in Embed Frameworks */,
-				D2994BA91E8F490400E8D2CC /* CNLiveChatManager.framework in Embed Frameworks */,
-				D2994BAB1E8F490700E8D2CC /* CNLiveMsgTools.framework in Embed Frameworks */,
+				D2EBC8941F0241B900F198FB /* CNLiveChatManager.framework in Embed Frameworks */,
+				D2EBC8961F0241BC00F198FB /* CNLiveMsgTools.framework in Embed Frameworks */,
 			);
 			name = "Embed Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -784,8 +785,6 @@
 		D2888D9B1E6EBF1B003A77C8 /* LVCLiveViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCLiveViewController.m; sourceTree = "<group>"; };
 		D2888DAF1E6EC05F003A77C8 /* TempViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TempViewController.h; sourceTree = "<group>"; };
 		D2888DB01E6EC05F003A77C8 /* TempViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TempViewController.m; sourceTree = "<group>"; };
-		D2994BA41E8F48DE00E8D2CC /* CNLiveChatManager.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLiveChatManager.framework; sourceTree = "<group>"; };
-		D2994BA51E8F48DE00E8D2CC /* CNLiveMsgTools.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLiveMsgTools.framework; sourceTree = "<group>"; };
 		D29D88461E88C53300543A03 /* LVCUGCLivePrepareView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCUGCLivePrepareView.h; sourceTree = "<group>"; };
 		D29D88471E88C53300543A03 /* LVCUGCLivePrepareView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCUGCLivePrepareView.m; sourceTree = "<group>"; };
 		D29E81EB1E88DC5B008C9906 /* PriChatCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PriChatCell.h; sourceTree = "<group>"; };
@@ -831,6 +830,8 @@
 		D2EBC88A1F02361600F198FB /* LVCUGCLiveListView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCUGCLiveListView.m; sourceTree = "<group>"; };
 		D2EBC88C1F023AA400F198FB /* LVCVodPlayerController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCVodPlayerController.h; sourceTree = "<group>"; };
 		D2EBC88D1F023AA400F198FB /* LVCVodPlayerController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCVodPlayerController.m; sourceTree = "<group>"; };
+		D2EBC88F1F0241AD00F198FB /* CNLiveMsgTools.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLiveMsgTools.framework; sourceTree = "<group>"; };
+		D2EBC8911F0241B500F198FB /* CNLiveChatManager.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLiveChatManager.framework; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 /* Begin PBXFrameworksBuildPhase section */
@@ -839,11 +840,12 @@
 			buildActionMask = 2147483647;
 			files = (
 				4BD855D31EBAC8B20082061D /* CNLiveUserSystemSDK.framework in Frameworks */,
+				D2EBC8901F0241AD00F198FB /* CNLiveMsgTools.framework in Frameworks */,
+				D2EBC8931F0241B900F198FB /* CNLiveChatManager.framework in Frameworks */,
 				D25BF8A31E80C4FC007FB138 /* Accelerate.framework in Frameworks */,
 				8178D4171F01FA2900AA78A4 /* CNLivePlayerSDK.framework in Frameworks */,
 				D2575C7D1E76A4F300E3A8FC /* NHGiftAnimtionSDK.a in Frameworks */,
-				D2994BAA1E8F490700E8D2CC /* CNLiveMsgTools.framework in Frameworks */,
-				D2994BA81E8F490400E8D2CC /* CNLiveChatManager.framework in Frameworks */,
+				D2EBC8921F0241B500F198FB /* CNLiveChatManager.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1105,9 +1107,9 @@
 		812E504E1E7699B9004F5FCD /* CNLiveSDK */ = {
 			isa = PBXGroup;
 			children = (
+				D2EBC8911F0241B500F198FB /* CNLiveChatManager.framework */,
+				D2EBC88F1F0241AD00F198FB /* CNLiveMsgTools.framework */,
 				8178D4161F01FA2900AA78A4 /* CNLivePlayerSDK.framework */,
-				D2994BA41E8F48DE00E8D2CC /* CNLiveChatManager.framework */,
-				D2994BA51E8F48DE00E8D2CC /* CNLiveMsgTools.framework */,
 				D25BF87C1E7B8C78007FB138 /* KSYGPUResource.bundle */,
 			);
 			path = CNLiveSDK;
@@ -57,6 +57,12 @@
 @interface CNLiveChatManager : NSObject
+
+/**
+ 是否是测试环境
+ */
+@property (nonatomic, readonly, assign) BOOL isTestEnvironment;
+
 /**
  聊天SDK代理,设置代理后,实现代理方法。
  */
@@ -75,7 +81,7 @@
  @return SDK版本号
  */
-+ (NSString *)getVersion;
++ (NSString *)getCNLiveChatVersion;
 /**
@@ -101,6 +107,19 @@
 /**
+ 初始化SDK方法
+ 
+ @param appKey             从视讯云平台获取到的appKey
+ @param appId              从视讯云平台获取到的appId
+ @param isTestEnvironment  是否是测试环境
+ @warning                  必传参数
+ @discussion               您在使用聊天SDK所有功能之前，您必须先调用此方法初始化SDK。
+ 在App整个生命周期中，您只需要执行一次初始化。
+ */
+- (void)initWithAppKey:(NSString *)appKey appId:(NSString *)appId isTestEnvironment:(BOOL)isTestEnvironment;
+
+
+/**
  连接到视讯云服务器
  @param successBlock 连接建立成功的回调。
@@ -219,5 +238,15 @@
                       targetId:(NSString *)targetId
                          count:(int)count;
+/**
+获取聊天室成员人数
+
+@param targetId     聊天室ID
+@param successBlock 成功回调,返回聊天室成员数量
+@param errorBlock   失败回调,返回错误代码
+*/
+- (void)getChatRoomInfo:(NSString *)targetId
+                success:(void (^)(int totalMemberCount))successBlock
+                  error:(void (^)(CNLiveChatErrorCode status))errorBlock;
 @end
+//
+//  CNLiveCommentCountResult.h
+//  CNLiveChatManager
+//
+//  Created by cnliveJunBo on 17/6/7.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface CNLiveCommentCountResult : NSObject
+
+@property (nonatomic, copy) NSString *count;
+
+@property (nonatomic, copy) NSString *programId;
+
+@end
+//
+//  CNLiveCommentDetailInfoResult.h
+//  CNLiveChatManagerSDKDemo
+//
+//  Created by cnliveJunBo on 17/6/6.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface CNLiveCommentDetailInfoResult : NSObject
+
+// 评论ID
+@property (nonatomic, copy) NSString *commentId;
+// 节目ID
+@property (nonatomic, copy) NSString *pid;
+// 用户ID
+@property (nonatomic, copy) NSString *uid;
+// 昵称
+@property (nonatomic, copy) NSString *nick;
+// 评论者头像
+@property (nonatomic, copy) NSString *facepath;
+// 评论内容
+@property (nonatomic, copy) NSString *content;
+// 评论时间
+@property (nonatomic, copy) NSString *created_at;
+// 点赞数
+@property (nonatomic, copy) NSString *praise;
+
+@end
+//
+//  CNLiveCommentListResult.h
+//  CNLiveChatManagerSDKDemo
+//
+//  Created by cnliveJunBo on 17/6/6.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "CNLiveCommentDetailInfoResult.h"
+
+@interface CNLiveCommentListResult : NSObject
+
+// 下一页
+@property (nonatomic, copy) NSString *next_cursor;
+// 上一页
+@property (nonatomic, copy) NSString *previous_cursor;
+// 总页数
+@property (nonatomic, copy) NSString *total_number;
+// 总条数
+@property (nonatomic, copy) NSString *total_columns;
+// 评论详情数组
+@property (nonatomic, strong) NSArray <CNLiveCommentDetailInfoResult *> *comments;
+
+@end
+//
+//  CNLiveCommentManager.h
+//  CNLiveChatManager
+//
+//  Created by cnliveJunBo on 17/6/6.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "CNLiveCommentListResult.h"
+#import "CNLiveCommentCountResult.h"
+
+@interface CNLiveCommentManager : NSObject
+
+/**
+ 是否是测试环境
+ */
+@property (nonatomic, readonly, assign) BOOL isTestEnvironment;
+
+/**
+ 获取SDK版本号
+ 
+ @return SDK版本号
+ */
++ (NSString *)getCNLiveCommentVersion;
+
+
+/**
+ 获取视讯评论核心类单例
+ 
+ @return 视讯评论核心类单例
+ 
+ @discussion 您可以通过此方法，获取视讯评论的单例，访问对象中的属性和方法。
+ */
++ (instancetype)sharedCNLiveCommentManager;
+
+
+/**
+ 注册视讯评论
+ 
+ @param appId  从视讯云平台获取到的appId
+ @param appKey 从视讯云平台获取到的appKey
+ */
+- (void)registerWithAppId:(NSString *)appId appKey:(NSString *)appKey;
+
+
+/**
+ 注册视讯评论
+
+ @param appId             从视讯云平台获取到的appId
+ @param appKey            从视讯云平台获取到的appKey
+ @param isTestEnvironment 是否是测试环境,YES是测试环境,NO是上线环境
+ */
+- (void)registerWithAppId:(NSString *)appId appKey:(NSString *)appKey isTestEnvironment:(BOOL)isTestEnvironment;
+
+/**
+ 获取评论列表
+ 
+ @param programId       节目ID
+ @param page            页号
+ @param pageSize        每页显示的条数
+ @param successBlock    获取列表成功回调
+ @param errorBlock      获取列表失败回调
+ */
+- (void)getCommentListWithProgramId:(NSString *)programId
+                               page:(NSString *)page
+                           pageSize:(NSString *)pageSize
+                            success:(void (^)(CNLiveCommentListResult *result))successBlock
+                              error:(void (^)(NSString *error))errorBlock;
+
+
+/**
+ 评论一条节目
+
+ @param programId       节目ID
+ @param sid             用户ID
+ @param comment         评论内容
+ @param completionBlock 评论结果回调,{errorCode:"0",errorMsg:"成功"},
+                                   {errorCode:"xxx",//错误代码(非0）errorMsg:"失败" //错误信息}
+ */
+- (void)commentOnProgramWithProgramId:(NSString *)programId
+                                  sid:(NSString *)sid
+                              comment:(NSString *)comment
+                           completion:(void (^)(NSString *errorCode, NSString *errorMsg))completionBlock;
+
+
+/**
+ 给评论点赞
+
+ @param programId       节目ID
+ @param sid             用户ID
+ @param commentId       评论ID
+ @param completionBlock 点赞结果回调,{errorCode:"0",errorMsg:"成功"},
+                                   {errorCode:"xxx",//错误代码(非0）errorMsg:"失败" //错误信息}
+ */
+- (void)commentaryLikeWithProgramId:(NSString *)programId
+                                sid:(NSString *)sid
+                          commentId:(NSString *)commentId
+                         completion:(void (^)(NSString *errorCode, NSString *errorMsg))completionBlock;
+
+
+/**
+ 获取节目评论数
+ 
+ @param programIds      节目ID数组(数组内可以是字符串类型,可以是NSNumber类型,其他不支持)
+ @param completionBlock 获取节目评论数回调结果,{errorCode:"0",errorMsg:"成功"},
+                                           {errorCode:"xxx",//错误代码(非0）errorMsg:"失败" //错误信息}
+                                           commentArray:CNLiveCommentCountResult类型数组,CNLiveCommentCountResult包含节目ID及对应的评论数;
+ */
+- (void)getCommentCountWithProgramIds:(NSArray *)programIds
+                           completion:(void (^)(NSString *errorCode, NSString *errorMsg, NSArray <CNLiveCommentCountResult *>*commentArray))completionBlock;
+
+@end
@@ -10,8 +10,9 @@
 @interface CNLiveMsgManager : NSObject
+@property (nonatomic, readonly, assign) BOOL isTestEnvironment;
-+ (NSString *)getVersion;
++ (NSString *)getCNLiveMsgVersion;
 + (instancetype)sharedCNLiveMsgManager;
@@ -27,6 +28,9 @@
 - (void)initCNLiveMsgToolsWithAppKey:(NSString *)appKey appId:(NSString *)appId;
+- (void)initCNLiveMsgToolsWithAppKey:(NSString *)appKey appId:(NSString *)appId isTestEnvironment:(BOOL)isTestEnvironment;
+
+
 - (void)onLineWithMsgToolsInfoId:(NSString *)infoId
                         infoName:(NSString *)infoName
                          infoUrl:(NSString *)infoUrl
@@ -83,6 +87,8 @@
 - (NSArray *)getLatestCarriers:(NSInteger)type targetId:(NSString *)targetId count:(int)count;
-
+- (void)getMeetingPointContent:(NSString *)pointId
+                       success:(void (^)(int totalMemberCount))successBlock
+                         error:(void (^)(NSInteger errors))errorBlock;
 @end