iOS Team / LiveVideoCloud · Commits

Commit fed1d0a38e4a64525bfa45e24d4c9782fbc60bc0

Authored by 王军波
1 parent cc77629c

更换SDK

Inline Side-by-side
Showing 11 changed files with 237 additions and 15 deletions
LiveVideoCloud.xcodeproj/project.pbxproj
  View file @fed1d0a
... ... @@ -241,10 +241,6 @@
241 241 D2888D941E6EB8B4003A77C8 /* LVCTabBar.m in Sources */ = {isa = PBXBuildFile; fileRef = D2888D931E6EB8B4003A77C8 /* LVCTabBar.m */; };
242 242 D2888D9E1E6EBF1B003A77C8 /* LVCLiveViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2888D9B1E6EBF1B003A77C8 /* LVCLiveViewController.m */; };
243 243 D2888DB11E6EC05F003A77C8 /* TempViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2888DB01E6EC05F003A77C8 /* TempViewController.m */; };
244   - D2994BA81E8F490400E8D2CC /* CNLiveChatManager.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D2994BA41E8F48DE00E8D2CC /* CNLiveChatManager.framework */; };
245   - D2994BA91E8F490400E8D2CC /* CNLiveChatManager.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D2994BA41E8F48DE00E8D2CC /* CNLiveChatManager.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
246   - D2994BAA1E8F490700E8D2CC /* CNLiveMsgTools.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D2994BA51E8F48DE00E8D2CC /* CNLiveMsgTools.framework */; };
247   - D2994BAB1E8F490700E8D2CC /* CNLiveMsgTools.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D2994BA51E8F48DE00E8D2CC /* CNLiveMsgTools.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
248 244 D29D88481E88C53300543A03 /* LVCUGCLivePrepareView.m in Sources */ = {isa = PBXBuildFile; fileRef = D29D88471E88C53300543A03 /* LVCUGCLivePrepareView.m */; };
249 245 D29E81ED1E88DC5B008C9906 /* PriChatCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D29E81EC1E88DC5B008C9906 /* PriChatCell.m */; };
250 246 D2A803081E80BD6F009D6F1C /* TopToolView.m in Sources */ = {isa = PBXBuildFile; fileRef = D2A803071E80BD6F009D6F1C /* TopToolView.m */; };
... ... @@ -268,6 +264,11 @@
268 264 D2EBC8881F0225D900F198FB /* LVCVodPlayerListController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2EBC8871F0225D900F198FB /* LVCVodPlayerListController.m */; };
269 265 D2EBC88B1F02361600F198FB /* LVCUGCLiveListView.m in Sources */ = {isa = PBXBuildFile; fileRef = D2EBC88A1F02361600F198FB /* LVCUGCLiveListView.m */; };
270 266 D2EBC88E1F023AA400F198FB /* LVCVodPlayerController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2EBC88D1F023AA400F198FB /* LVCVodPlayerController.m */; };
  267 + D2EBC8901F0241AD00F198FB /* CNLiveMsgTools.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D2EBC88F1F0241AD00F198FB /* CNLiveMsgTools.framework */; };
  268 + D2EBC8921F0241B500F198FB /* CNLiveChatManager.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D2EBC8911F0241B500F198FB /* CNLiveChatManager.framework */; };
  269 + D2EBC8931F0241B900F198FB /* CNLiveChatManager.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D2EBC8911F0241B500F198FB /* CNLiveChatManager.framework */; };
  270 + D2EBC8941F0241B900F198FB /* CNLiveChatManager.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D2EBC8911F0241B500F198FB /* CNLiveChatManager.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
  271 + D2EBC8961F0241BC00F198FB /* CNLiveMsgTools.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D2EBC88F1F0241AD00F198FB /* CNLiveMsgTools.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
271 272 /* End PBXBuildFile section */
272 273  
273 274 /* Begin PBXContainerItemProxy section */
... ... @@ -295,8 +296,8 @@
295 296 dstSubfolderSpec = 10;
296 297 files = (
297 298 8178D4191F01FA3600AA78A4 /* CNLivePlayerSDK.framework in Embed Frameworks */,
298   - D2994BA91E8F490400E8D2CC /* CNLiveChatManager.framework in Embed Frameworks */,
299   - D2994BAB1E8F490700E8D2CC /* CNLiveMsgTools.framework in Embed Frameworks */,
  299 + D2EBC8941F0241B900F198FB /* CNLiveChatManager.framework in Embed Frameworks */,
  300 + D2EBC8961F0241BC00F198FB /* CNLiveMsgTools.framework in Embed Frameworks */,
300 301 );
301 302 name = "Embed Frameworks";
302 303 runOnlyForDeploymentPostprocessing = 0;
... ... @@ -784,8 +785,6 @@
784 785 D2888D9B1E6EBF1B003A77C8 /* LVCLiveViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCLiveViewController.m; sourceTree = "<group>"; };
785 786 D2888DAF1E6EC05F003A77C8 /* TempViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TempViewController.h; sourceTree = "<group>"; };
786 787 D2888DB01E6EC05F003A77C8 /* TempViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TempViewController.m; sourceTree = "<group>"; };
787   - D2994BA41E8F48DE00E8D2CC /* CNLiveChatManager.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLiveChatManager.framework; sourceTree = "<group>"; };
788   - D2994BA51E8F48DE00E8D2CC /* CNLiveMsgTools.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLiveMsgTools.framework; sourceTree = "<group>"; };
789 788 D29D88461E88C53300543A03 /* LVCUGCLivePrepareView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCUGCLivePrepareView.h; sourceTree = "<group>"; };
790 789 D29D88471E88C53300543A03 /* LVCUGCLivePrepareView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCUGCLivePrepareView.m; sourceTree = "<group>"; };
791 790 D29E81EB1E88DC5B008C9906 /* PriChatCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PriChatCell.h; sourceTree = "<group>"; };
... ... @@ -831,6 +830,8 @@
831 830 D2EBC88A1F02361600F198FB /* LVCUGCLiveListView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCUGCLiveListView.m; sourceTree = "<group>"; };
832 831 D2EBC88C1F023AA400F198FB /* LVCVodPlayerController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCVodPlayerController.h; sourceTree = "<group>"; };
833 832 D2EBC88D1F023AA400F198FB /* LVCVodPlayerController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCVodPlayerController.m; sourceTree = "<group>"; };
  833 + D2EBC88F1F0241AD00F198FB /* CNLiveMsgTools.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLiveMsgTools.framework; sourceTree = "<group>"; };
  834 + D2EBC8911F0241B500F198FB /* CNLiveChatManager.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLiveChatManager.framework; sourceTree = "<group>"; };
834 835 /* End PBXFileReference section */
835 836  
836 837 /* Begin PBXFrameworksBuildPhase section */
... ... @@ -839,11 +840,12 @@
839 840 buildActionMask = 2147483647;
840 841 files = (
841 842 4BD855D31EBAC8B20082061D /* CNLiveUserSystemSDK.framework in Frameworks */,
  843 + D2EBC8901F0241AD00F198FB /* CNLiveMsgTools.framework in Frameworks */,
  844 + D2EBC8931F0241B900F198FB /* CNLiveChatManager.framework in Frameworks */,
842 845 D25BF8A31E80C4FC007FB138 /* Accelerate.framework in Frameworks */,
843 846 8178D4171F01FA2900AA78A4 /* CNLivePlayerSDK.framework in Frameworks */,
844 847 D2575C7D1E76A4F300E3A8FC /* NHGiftAnimtionSDK.a in Frameworks */,
845   - D2994BAA1E8F490700E8D2CC /* CNLiveMsgTools.framework in Frameworks */,
846   - D2994BA81E8F490400E8D2CC /* CNLiveChatManager.framework in Frameworks */,
  848 + D2EBC8921F0241B500F198FB /* CNLiveChatManager.framework in Frameworks */,
847 849 );
848 850 runOnlyForDeploymentPostprocessing = 0;
849 851 };
... ... @@ -1105,9 +1107,9 @@
1105 1107 812E504E1E7699B9004F5FCD /* CNLiveSDK */ = {
1106 1108 isa = PBXGroup;
1107 1109 children = (
  1110 + D2EBC8911F0241B500F198FB /* CNLiveChatManager.framework */,
  1111 + D2EBC88F1F0241AD00F198FB /* CNLiveMsgTools.framework */,
1108 1112 8178D4161F01FA2900AA78A4 /* CNLivePlayerSDK.framework */,
1109   - D2994BA41E8F48DE00E8D2CC /* CNLiveChatManager.framework */,
1110   - D2994BA51E8F48DE00E8D2CC /* CNLiveMsgTools.framework */,
1111 1113 D25BF87C1E7B8C78007FB138 /* KSYGPUResource.bundle */,
1112 1114 );
1113 1115 path = CNLiveSDK;
... ...
LiveVideoCloud/Classes/CNLiveSDK/CNLiveChatManager.framework/CNLiveChatManager
View file @fed1d0a
No preview for this file type
LiveVideoCloud/Classes/CNLiveSDK/CNLiveChatManager.framework/Headers/CNLiveChatManager.h
  View file @fed1d0a
... ... @@ -57,6 +57,12 @@
57 57  
58 58 @interface CNLiveChatManager : NSObject
59 59  
  60 +
  61 +/**
  62 + 是否是测试环境
  63 + */
  64 +@property (nonatomic, readonly, assign) BOOL isTestEnvironment;
  65 +
60 66 /**
61 67 聊天SDK代理,设置代理后,实现代理方法。
62 68 */
... ... @@ -75,7 +81,7 @@
75 81  
76 82 @return SDK版本号
77 83 */
78   -+ (NSString *)getVersion;
  84 ++ (NSString *)getCNLiveChatVersion;
79 85  
80 86  
81 87 /**
... ... @@ -101,6 +107,19 @@
101 107  
102 108  
103 109 /**
  110 + 初始化SDK方法
  111 +
  112 + @param appKey 从视讯云平台获取到的appKey
  113 + @param appId 从视讯云平台获取到的appId
  114 + @param isTestEnvironment 是否是测试环境
  115 + @warning 必传参数
  116 + @discussion 您在使用聊天SDK所有功能之前，您必须先调用此方法初始化SDK。
  117 + 在App整个生命周期中，您只需要执行一次初始化。
  118 + */
  119 +- (void)initWithAppKey:(NSString *)appKey appId:(NSString *)appId isTestEnvironment:(BOOL)isTestEnvironment;
  120 +
  121 +
  122 +/**
104 123 连接到视讯云服务器
105 124  
106 125 @param successBlock 连接建立成功的回调。
... ... @@ -219,5 +238,15 @@
219 238 targetId:(NSString *)targetId
220 239 count:(int)count;
221 240  
  241 +/**
  242 +获取聊天室成员人数
  243 +
  244 +@param targetId 聊天室ID
  245 +@param successBlock 成功回调,返回聊天室成员数量
  246 +@param errorBlock 失败回调,返回错误代码
  247 +*/
  248 +- (void)getChatRoomInfo:(NSString *)targetId
  249 + success:(void (^)(int totalMemberCount))successBlock
  250 + error:(void (^)(CNLiveChatErrorCode status))errorBlock;
222 251  
223 252 @end
... ...
LiveVideoCloud/Classes/CNLiveSDK/CNLiveChatManager.framework/Headers/CNLiveCommentCountResult.h 0 → 100644
  View file @fed1d0a
  1 +//
  2 +// CNLiveCommentCountResult.h
  3 +// CNLiveChatManager
  4 +//
  5 +// Created by cnliveJunBo on 17/6/7.
  6 +// Copyright © 2017年 cnlive. All rights reserved.
  7 +//
  8 +
  9 +#import <Foundation/Foundation.h>
  10 +
  11 +@interface CNLiveCommentCountResult : NSObject
  12 +
  13 +@property (nonatomic, copy) NSString *count;
  14 +
  15 +@property (nonatomic, copy) NSString *programId;
  16 +
  17 +@end
... ...
LiveVideoCloud/Classes/CNLiveSDK/CNLiveChatManager.framework/Headers/CNLiveCommentDetailInfoResult.h 0 → 100644
  View file @fed1d0a
  1 +//
  2 +// CNLiveCommentDetailInfoResult.h
  3 +// CNLiveChatManagerSDKDemo
  4 +//
  5 +// Created by cnliveJunBo on 17/6/6.
  6 +// Copyright © 2017年 cnlive. All rights reserved.
  7 +//
  8 +
  9 +#import <Foundation/Foundation.h>
  10 +
  11 +@interface CNLiveCommentDetailInfoResult : NSObject
  12 +
  13 +// 评论ID
  14 +@property (nonatomic, copy) NSString *commentId;
  15 +// 节目ID
  16 +@property (nonatomic, copy) NSString *pid;
  17 +// 用户ID
  18 +@property (nonatomic, copy) NSString *uid;
  19 +// 昵称
  20 +@property (nonatomic, copy) NSString *nick;
  21 +// 评论者头像
  22 +@property (nonatomic, copy) NSString *facepath;
  23 +// 评论内容
  24 +@property (nonatomic, copy) NSString *content;
  25 +// 评论时间
  26 +@property (nonatomic, copy) NSString *created_at;
  27 +// 点赞数
  28 +@property (nonatomic, copy) NSString *praise;
  29 +
  30 +@end
... ...
LiveVideoCloud/Classes/CNLiveSDK/CNLiveChatManager.framework/Headers/CNLiveCommentListResult.h 0 → 100644
  View file @fed1d0a
  1 +//
  2 +// CNLiveCommentListResult.h
  3 +// CNLiveChatManagerSDKDemo
  4 +//
  5 +// Created by cnliveJunBo on 17/6/6.
  6 +// Copyright © 2017年 cnlive. All rights reserved.
  7 +//
  8 +
  9 +#import <Foundation/Foundation.h>
  10 +#import "CNLiveCommentDetailInfoResult.h"
  11 +
  12 +@interface CNLiveCommentListResult : NSObject
  13 +
  14 +// 下一页
  15 +@property (nonatomic, copy) NSString *next_cursor;
  16 +// 上一页
  17 +@property (nonatomic, copy) NSString *previous_cursor;
  18 +// 总页数
  19 +@property (nonatomic, copy) NSString *total_number;
  20 +// 总条数
  21 +@property (nonatomic, copy) NSString *total_columns;
  22 +// 评论详情数组
  23 +@property (nonatomic, strong) NSArray <CNLiveCommentDetailInfoResult *> *comments;
  24 +
  25 +@end
... ...
LiveVideoCloud/Classes/CNLiveSDK/CNLiveChatManager.framework/Headers/CNLiveCommentManager.h 0 → 100644
  View file @fed1d0a
  1 +//
  2 +// CNLiveCommentManager.h
  3 +// CNLiveChatManager
  4 +//
  5 +// Created by cnliveJunBo on 17/6/6.
  6 +// Copyright © 2017年 cnlive. All rights reserved.
  7 +//
  8 +
  9 +#import <Foundation/Foundation.h>
  10 +#import "CNLiveCommentListResult.h"
  11 +#import "CNLiveCommentCountResult.h"
  12 +
  13 +@interface CNLiveCommentManager : NSObject
  14 +
  15 +/**
  16 + 是否是测试环境
  17 + */
  18 +@property (nonatomic, readonly, assign) BOOL isTestEnvironment;
  19 +
  20 +/**
  21 + 获取SDK版本号
  22 +
  23 + @return SDK版本号
  24 + */
  25 ++ (NSString *)getCNLiveCommentVersion;
  26 +
  27 +
  28 +/**
  29 + 获取视讯评论核心类单例
  30 +
  31 + @return 视讯评论核心类单例
  32 +
  33 + @discussion 您可以通过此方法，获取视讯评论的单例，访问对象中的属性和方法。
  34 + */
  35 ++ (instancetype)sharedCNLiveCommentManager;
  36 +
  37 +
  38 +/**
  39 + 注册视讯评论
  40 +
  41 + @param appId 从视讯云平台获取到的appId
  42 + @param appKey 从视讯云平台获取到的appKey
  43 + */
  44 +- (void)registerWithAppId:(NSString *)appId appKey:(NSString *)appKey;
  45 +
  46 +
  47 +/**
  48 + 注册视讯评论
  49 +
  50 + @param appId 从视讯云平台获取到的appId
  51 + @param appKey 从视讯云平台获取到的appKey
  52 + @param isTestEnvironment 是否是测试环境,YES是测试环境,NO是上线环境
  53 + */
  54 +- (void)registerWithAppId:(NSString *)appId appKey:(NSString *)appKey isTestEnvironment:(BOOL)isTestEnvironment;
  55 +
  56 +/**
  57 + 获取评论列表
  58 +
  59 + @param programId 节目ID
  60 + @param page 页号
  61 + @param pageSize 每页显示的条数
  62 + @param successBlock 获取列表成功回调
  63 + @param errorBlock 获取列表失败回调
  64 + */
  65 +- (void)getCommentListWithProgramId:(NSString *)programId
  66 + page:(NSString *)page
  67 + pageSize:(NSString *)pageSize
  68 + success:(void (^)(CNLiveCommentListResult *result))successBlock
  69 + error:(void (^)(NSString *error))errorBlock;
  70 +
  71 +
  72 +/**
  73 + 评论一条节目
  74 +
  75 + @param programId 节目ID
  76 + @param sid 用户ID
  77 + @param comment 评论内容
  78 + @param completionBlock 评论结果回调,{errorCode:"0",errorMsg:"成功"},
  79 + {errorCode:"xxx",//错误代码(非0）errorMsg:"失败" //错误信息}
  80 + */
  81 +- (void)commentOnProgramWithProgramId:(NSString *)programId
  82 + sid:(NSString *)sid
  83 + comment:(NSString *)comment
  84 + completion:(void (^)(NSString *errorCode, NSString *errorMsg))completionBlock;
  85 +
  86 +
  87 +/**
  88 + 给评论点赞
  89 +
  90 + @param programId 节目ID
  91 + @param sid 用户ID
  92 + @param commentId 评论ID
  93 + @param completionBlock 点赞结果回调,{errorCode:"0",errorMsg:"成功"},
  94 + {errorCode:"xxx",//错误代码(非0）errorMsg:"失败" //错误信息}
  95 + */
  96 +- (void)commentaryLikeWithProgramId:(NSString *)programId
  97 + sid:(NSString *)sid
  98 + commentId:(NSString *)commentId
  99 + completion:(void (^)(NSString *errorCode, NSString *errorMsg))completionBlock;
  100 +
  101 +
  102 +/**
  103 + 获取节目评论数
  104 +
  105 + @param programIds 节目ID数组(数组内可以是字符串类型,可以是NSNumber类型,其他不支持)
  106 + @param completionBlock 获取节目评论数回调结果,{errorCode:"0",errorMsg:"成功"},
  107 + {errorCode:"xxx",//错误代码(非0）errorMsg:"失败" //错误信息}
  108 + commentArray:CNLiveCommentCountResult类型数组,CNLiveCommentCountResult包含节目ID及对应的评论数;
  109 + */
  110 +- (void)getCommentCountWithProgramIds:(NSArray *)programIds
  111 + completion:(void (^)(NSString *errorCode, NSString *errorMsg, NSArray <CNLiveCommentCountResult *>*commentArray))completionBlock;
  112 +
  113 +@end
... ...
LiveVideoCloud/Classes/CNLiveSDK/CNLiveChatManager.framework/Info.plist
View file @fed1d0a
No preview for this file type
LiveVideoCloud/Classes/CNLiveSDK/CNLiveMsgTools.framework/CNLiveMsgTools
View file @fed1d0a
No preview for this file type
LiveVideoCloud/Classes/CNLiveSDK/CNLiveMsgTools.framework/Headers/CNLiveMsgManager.h
  View file @fed1d0a
... ... @@ -10,8 +10,9 @@
10 10  
11 11 @interface CNLiveMsgManager : NSObject
12 12  
  13 +@property (nonatomic, readonly, assign) BOOL isTestEnvironment;
13 14  
14   -+ (NSString *)getVersion;
  15 ++ (NSString *)getCNLiveMsgVersion;
15 16  
16 17  
17 18 + (instancetype)sharedCNLiveMsgManager;
... ... @@ -27,6 +28,9 @@
27 28 - (void)initCNLiveMsgToolsWithAppKey:(NSString *)appKey appId:(NSString *)appId;
28 29  
29 30  
  31 +- (void)initCNLiveMsgToolsWithAppKey:(NSString *)appKey appId:(NSString *)appId isTestEnvironment:(BOOL)isTestEnvironment;
  32 +
  33 +
30 34 - (void)onLineWithMsgToolsInfoId:(NSString *)infoId
31 35 infoName:(NSString *)infoName
32 36 infoUrl:(NSString *)infoUrl
... ... @@ -83,6 +87,8 @@
83 87  
84 88 - (NSArray *)getLatestCarriers:(NSInteger)type targetId:(NSString *)targetId count:(int)count;
85 89  
86   -
  90 +- (void)getMeetingPointContent:(NSString *)pointId
  91 + success:(void (^)(int totalMemberCount))successBlock
  92 + error:(void (^)(NSInteger errors))errorBlock;
87 93  
88 94 @end
... ...
LiveVideoCloud/Classes/CNLiveSDK/CNLiveMsgTools.framework/Info.plist
View file @fed1d0a
No preview for this file type