Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/LiveVideoCloud

张旭
2 parents c0dcdcad 4aa2d729
Showing 6 changed files with 54 additions and 41 deletions
LiveVideoCloud.xcodeproj/project.pbxproj
LiveVideoCloud/Classes/CNLiveSDK/CNLiveChatManager.framework/CNLiveChatManager
LiveVideoCloud/Classes/CNLiveSDK/CNLiveChatManager.framework/Headers/CNLiveChatManager.h
LiveVideoCloud/Classes/Sections/homeSections/Controller/LVCVodPlayerListController.m
LiveVideoCloud/Classes/Sections/homeSections/View/LVCCommentView.m
LiveVideoCloud/PrefixHeader.pch
@@ -254,12 +254,13 @@
 		D2EBC8961F0241BC00F198FB /* CNLiveMsgTools.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D2EBC88F1F0241AD00F198FB /* CNLiveMsgTools.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		D2EBC8991F025D4700F198FB /* LVCVodPlayerFullController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2EBC8981F025D4700F198FB /* LVCVodPlayerFullController.m */; };
 		D2EBC89B1F03421C00F198FB /* CNLiveChatManager.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D2EBC89A1F03421C00F198FB /* CNLiveChatManager.framework */; };
-		D2EBC89C1F03428700F198FB /* CNLiveChatManager.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D2EBC89A1F03421C00F198FB /* CNLiveChatManager.framework */; };
-		D2EBC89D1F03428700F198FB /* CNLiveChatManager.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D2EBC89A1F03421C00F198FB /* CNLiveChatManager.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		D2EBC8A01F034C5500F198FB /* LVCCommentView.m in Sources */ = {isa = PBXBuildFile; fileRef = D2EBC89F1F034C5500F198FB /* LVCCommentView.m */; };
 		D2EBC8A21F034F3C00F198FB /* CNLivePlayerSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D2EBC8A11F034F3C00F198FB /* CNLivePlayerSDK.framework */; };
 		D2EBC8A31F034F4000F198FB /* CNLivePlayerSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D2EBC8A11F034F3C00F198FB /* CNLivePlayerSDK.framework */; };
 		D2EBC8A41F034F4000F198FB /* CNLivePlayerSDK.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D2EBC8A11F034F3C00F198FB /* CNLivePlayerSDK.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		D2EBC8A61F03926E00F198FB /* CNLiveChatManager.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D2EBC8A51F03926E00F198FB /* CNLiveChatManager.framework */; };
+		D2EBC8A71F03927200F198FB /* CNLiveChatManager.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D2EBC8A51F03926E00F198FB /* CNLiveChatManager.framework */; };
+		D2EBC8A81F03927200F198FB /* CNLiveChatManager.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D2EBC8A51F03926E00F198FB /* CNLiveChatManager.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 /* End PBXBuildFile section */
 /* Begin PBXContainerItemProxy section */
@@ -288,7 +289,7 @@
 			files = (
 				D2EBC8A41F034F4000F198FB /* CNLivePlayerSDK.framework in Embed Frameworks */,
 				D2EBC8961F0241BC00F198FB /* CNLiveMsgTools.framework in Embed Frameworks */,
-				D2EBC89D1F03428700F198FB /* CNLiveChatManager.framework in Embed Frameworks */,
+				D2EBC8A81F03927200F198FB /* CNLiveChatManager.framework in Embed Frameworks */,
 			);
 			name = "Embed Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -801,10 +802,11 @@
 		D2EBC88F1F0241AD00F198FB /* CNLiveMsgTools.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLiveMsgTools.framework; sourceTree = "<group>"; };
 		D2EBC8971F025D4700F198FB /* LVCVodPlayerFullController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCVodPlayerFullController.h; sourceTree = "<group>"; };
 		D2EBC8981F025D4700F198FB /* LVCVodPlayerFullController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCVodPlayerFullController.m; sourceTree = "<group>"; };
-		D2EBC89A1F03421C00F198FB /* CNLiveChatManager.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLiveChatManager.framework; sourceTree = "<group>"; };
+		D2EBC89A1F03421C00F198FB /* CNLiveChatManager.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CNLiveChatManager.framework; path = /Users/cnlive/Desktop/Group/LiveVideoCloud/LiveVideoCloud/Classes/CNLiveSDK/CNLiveChatManager.framework; sourceTree = "<absolute>"; };
 		D2EBC89E1F034C5500F198FB /* LVCCommentView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCCommentView.h; sourceTree = "<group>"; };
 		D2EBC89F1F034C5500F198FB /* LVCCommentView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCCommentView.m; sourceTree = "<group>"; };
 		D2EBC8A11F034F3C00F198FB /* CNLivePlayerSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLivePlayerSDK.framework; sourceTree = "<group>"; };
+		D2EBC8A51F03926E00F198FB /* CNLiveChatManager.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLiveChatManager.framework; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 /* Begin PBXFrameworksBuildPhase section */
@@ -814,13 +816,14 @@
 			files = (
 				D2393D281F02572100D3EE17 /* CoreTelephony.framework in Frameworks */,
 				D2393D261F0256FE00D3EE17 /* libstdc++.tbd in Frameworks */,
+				D2EBC8A61F03926E00F198FB /* CNLiveChatManager.framework in Frameworks */,
+				D2EBC8A71F03927200F198FB /* CNLiveChatManager.framework in Frameworks */,
 				D2393D2C1F02682000D3EE17 /* CNLiveUserSystemSDK.framework in Frameworks */,
 				D2393D241F0256E900D3EE17 /* libz.tbd in Frameworks */,
 				D2393D221F0256DC00D3EE17 /* libc++.tbd in Frameworks */,
 				D2393D201F0256AA00D3EE17 /* libsqlite3.tbd in Frameworks */,
 				D2EBC89B1F03421C00F198FB /* CNLiveChatManager.framework in Frameworks */,
 				D25BF8A31E80C4FC007FB138 /* Accelerate.framework in Frameworks */,
-				D2EBC89C1F03428700F198FB /* CNLiveChatManager.framework in Frameworks */,
 				D2EBC8A31F034F4000F198FB /* CNLivePlayerSDK.framework in Frameworks */,
 				D2393D0E1F0250A100D3EE17 /* libWeChatSDK.a in Frameworks */,
 				D2393D1D1F0250A700D3EE17 /* libWeiboSDK.a in Frameworks */,
@@ -1086,8 +1089,8 @@
 		812E504E1E7699B9004F5FCD /* CNLiveSDK */ = {
 			isa = PBXGroup;
 			children = (
+				D2EBC8A51F03926E00F198FB /* CNLiveChatManager.framework */,
 				D2EBC8A11F034F3C00F198FB /* CNLivePlayerSDK.framework */,
-				D2EBC89A1F03421C00F198FB /* CNLiveChatManager.framework */,
 				D2EBC88F1F0241AD00F198FB /* CNLiveMsgTools.framework */,
 				D2393D2B1F02682000D3EE17 /* CNLiveUserSystemSDK.framework */,
 				D25BF87C1E7B8C78007FB138 /* KSYGPUResource.bundle */,
@@ -107,7 +107,7 @@
 /**
- 初始化SDK方法
+ 初始化SDK方法(同上,区别:可以选择测试环境/上线环境)
  @param appKey             从视讯云平台获取到的appKey
  @param appId              从视讯云平台获取到的appId
@@ -45,20 +45,14 @@ static NSString *vodCellId = @&quot;vodCellId&quot;;
     _failedView.hidden = YES;
-    NSString *uid;
-    if ([UserTools isLogin]) {
-        uid = [UserInformationModel manager].uid;
-    } else {
-        uid = [NSString stringWithFormat:@"%u", arc4random()%3];
-    }
-    NSString *tm = [NSString stringWithFormat:@"%u_%@", arc4random()%10, uid];
-    
-    NSDictionary *parameter = @{@"cid": @"82_news/",
-                                @"page": [NSString stringWithFormat:@"%d", 1],
-                                @"pagesize": @"15",
-                                @"tm": tm};
-    
-    [[AFHTTPRequestOperationManager manager] GET:Newslist parameters:[self addParameters:parameter] success:^(AFHTTPRequestOperation *operation, id responseObject) {
+    NSInteger time = [[NSDate date] timeIntervalSince1970];
+    NSString *timeString = [NSString stringWithFormat:@"%ld", (long)time];
+    NSDictionary *parameter = @{
+                                @"appId" : UserAppId,
+                                @"timestamp": timeString
+                                };
+    
+    [[AFHTTPRequestOperationManager manager] POST:@"http://test.open.cnlive.com/openapi/api2/vod_epg/getVodListInfo4App" parameters:[parameter addParameters] success:^(AFHTTPRequestOperation *operation, id responseObject) {
         responseObject = [responseObject validatedDictionary];
@@ -189,21 +183,6 @@ static NSString *vodCellId = @&quot;vodCellId&quot;;
     self.tableView.scrollsToTop = scrollToTop;
 }
-#pragma mark ------------------------------ 分割线 ----------------------------------------------
-- (NSDictionary *)addParameters:(NSDictionary *)dict {
-    
-    if (![dict isKindOfClass:[NSDictionary class]]) {
-        return dict;
-    }
-    if (!dict) {
-        return @{@"appid": JBAppId, @"plat": @"i", @"version": JBAppVersion};
-    } else {
-        NSMutableDictionary *dic = [[NSMutableDictionary alloc] initWithDictionary:dict];
-        [dic addEntriesFromDictionary:@{@"appid": JBAppId, @"plat": @"i", @"version": JBAppVersion}];
-        return [[NSDictionary alloc] initWithDictionary:dic];
-    }
-}
-
 - (void)didReceiveMemoryWarning {
     [super didReceiveMemoryWarning];
     // Dispose of any resources that can be recreated.
@@ -8,7 +8,7 @@
 #import "LVCCommentView.h"
-@interface LVCCommentView() {
+@interface LVCCommentView()<UITableViewDelegate, UITableViewDataSource> {
     CGSize _contentSize;
 }
@@ -17,6 +17,8 @@
 @property (nonatomic, strong) UILabel *contentLabel;
+@property (nonatomic, strong) UITableView *tableview;
+
 @end
 @implementation LVCCommentView
@@ -34,15 +36,44 @@
 - (void)setModel:(ProgramModel *)model {
     _titleLabel.text = model.title;
+    _contentLabel.text = model.desc;
+}
+
+#pragma mark - UITableViewDelegate !!!!!!!!!!!!!!!!!!!!!
+
+#pragma mark - UITableViewDataSource !!!!!!!!!!!!!!!!!!!!!!!!
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
+    return 2;
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+    
+    return 2;
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+    
+    return nil;
 }
 #pragma mark - GetMethod !!!!!!!!!!!!!!!!!!!!!!
+- (UITableView *)tableview {
+    
+    if (!_tableview) {
+        _tableview = [[UITableView alloc] initWithFrame:self.bounds style:UITableViewStylePlain];
+        _tableview.delegate = self;
+        _tableview.dataSource = self;
+        _tableview.separatorStyle = UITableViewCellSeparatorStyleNone;
+    }
+    return _tableview;
+}
+
 - (UILabel *)titleLabel {
     if (!_titleLabel) {
         _titleLabel = [[UILabel alloc] initWithFrame:CGRectMake(10, 10, KScreenWidth-20, 40)];
         [_contentLabel setFont:[UIFont systemFontOfSize:22]];
-        _titleLabel.text = @"将就开始疯狂涉及到法定分";
+        _titleLabel.text = @"标题";
     }
     return _titleLabel;
 }
@@ -53,7 +84,7 @@
         _contentLabel = [[UILabel alloc] initWithFrame:CGRectMake(10, 60, KScreenWidth-20, 100)];
         [_contentLabel setFont:[UIFont systemFontOfSize:14]];
         _contentLabel.textColor = [UIColor grayColor];
-        _contentLabel.text = @"就当是妇女节阿斯顿和播放控件安徽的播放控件和巴萨的海景房吧圣诞节还发什么你打副本氨基酸等回复看见爱上对方阿斯顿发布密集恐惧恨不得能否";
+        _contentLabel.text = @"描述";
         _contentLabel.numberOfLines = 0;
         [_contentLabel sizeToFit];
         _contentSize = _contentLabel.bounds.size;
@@ -79,8 +79,8 @@
 #define UserAppKey                      @"4c8658abc5d66f270f9bf5dcd1ef11e3597fab4c4e0af9"//@"13c6f0ad6f459cd479834b0b39cff99c6cf20c970815bb"//
 #define UserAppSceret                   @"c2faeb120f0ea2e2d47020d4b03cb8a93bed2585897a94"//@"14c887b76ec2ecdf7083fb4c62808f13f6ab77a0f9dfec"//
-#define JBAppId @"hdtv"
-#define JBAppVersion [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleVersion"]            ///debug用 "CFBundleVersion"
+//#define JBAppId @"hdtv"
+//#define JBAppVersion [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleVersion"]            ///debug用 "CFBundleVersion"
 //#define UserAppId                       @"60_itax25eq82"
 //#define UserAppKey                      @"55a25a7f7e1124937fba06c82999d9a7c18379e2d24784"