点播列表更换接口

王军波
1 parent 90ae6bf0
Showing 14 changed files with 134 additions and 91 deletions
LiveVideoCloud.xcodeproj/project.pbxproj
LiveVideoCloud/Classes/Sections/homeSections/Controller/LVCVodPlayerController.h
LiveVideoCloud/Classes/Sections/homeSections/Controller/LVCVodPlayerController.m
LiveVideoCloud/Classes/Sections/homeSections/Controller/LVCVodPlayerFullController.h
LiveVideoCloud/Classes/Sections/homeSections/Controller/LVCVodPlayerListController.m
LiveVideoCloud/Classes/Sections/homeSections/Model/LVCCommentModel.h
LiveVideoCloud/Classes/Sections/homeSections/Model/LVCCommentModel.m
LiveVideoCloud/Classes/Sections/homeSections/Model/LVCVodListModel.h
LiveVideoCloud/Classes/Sections/homeSections/Model/LVCVodListModel.m
LiveVideoCloud/Classes/Sections/homeSections/View/LVCCommentTitleCell.h
LiveVideoCloud/Classes/Sections/homeSections/View/LVCCommentTitleCell.m
LiveVideoCloud/Classes/Sections/homeSections/View/LVCCommentView.h
LiveVideoCloud/Classes/Sections/homeSections/View/LVCCommentView.m
LiveVideoCloud/PrefixHeader.pch
@@ -235,9 +235,9 @@
 		D2B7B2511E8247D400ED084E /* ChatBarrageManager.m in Sources */ = {isa = PBXBuildFile; fileRef = D2B7B2501E8247D400ED084E /* ChatBarrageManager.m */; };
 		D2B7B2541E824B2D00ED084E /* ChatBarrageView.m in Sources */ = {isa = PBXBuildFile; fileRef = D2B7B2531E824B2D00ED084E /* ChatBarrageView.m */; };
 		D2B7B2571E8261EF00ED084E /* ChatBarrOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = D2B7B2561E8261EF00ED084E /* ChatBarrOperation.m */; };
+		D2C6A8BF1F04998D00543EFA /* LVCVodListModel.m in Sources */ = {isa = PBXBuildFile; fileRef = D2C6A8BE1F04998D00543EFA /* LVCVodListModel.m */; };
 		D2CBC13B1ECC157A00E00279 /* LVCVerifyLiveAuthService.m in Sources */ = {isa = PBXBuildFile; fileRef = D2CBC13A1ECC157A00E00279 /* LVCVerifyLiveAuthService.m */; };
 		D2D7D18D1E8A581000217771 /* timg.jpeg in Resources */ = {isa = PBXBuildFile; fileRef = D2D7D18C1E8A581000217771 /* timg.jpeg */; };
-		D2EBC8571F01FF9200F198FB /* LVCCommentModel.m in Sources */ = {isa = PBXBuildFile; fileRef = D2EBC8561F01FF9200F198FB /* LVCCommentModel.m */; };
 		D2EBC8711F02108000F198FB /* LiveListService.m in Sources */ = {isa = PBXBuildFile; fileRef = D2EBC8661F02108000F198FB /* LiveListService.m */; };
 		D2EBC8721F02108000F198FB /* LVCLiveActivityInfoService.m in Sources */ = {isa = PBXBuildFile; fileRef = D2EBC8681F02108000F198FB /* LVCLiveActivityInfoService.m */; };
 		D2EBC8741F02108000F198FB /* LVCUGCLiveListController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2EBC86C1F02108000F198FB /* LVCUGCLiveListController.m */; };
@@ -769,11 +769,11 @@
 		D2B7B2531E824B2D00ED084E /* ChatBarrageView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ChatBarrageView.m; sourceTree = "<group>"; };
 		D2B7B2551E8261EF00ED084E /* ChatBarrOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChatBarrOperation.h; sourceTree = "<group>"; };
 		D2B7B2561E8261EF00ED084E /* ChatBarrOperation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ChatBarrOperation.m; sourceTree = "<group>"; };
+		D2C6A8BD1F04998D00543EFA /* LVCVodListModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCVodListModel.h; sourceTree = "<group>"; };
+		D2C6A8BE1F04998D00543EFA /* LVCVodListModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCVodListModel.m; sourceTree = "<group>"; };
 		D2CBC1391ECC157A00E00279 /* LVCVerifyLiveAuthService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LVCVerifyLiveAuthService.h; path = ../LVCVerifyLiveAuthService.h; sourceTree = "<group>"; };
 		D2CBC13A1ECC157A00E00279 /* LVCVerifyLiveAuthService.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = LVCVerifyLiveAuthService.m; path = ../LVCVerifyLiveAuthService.m; sourceTree = "<group>"; };
 		D2D7D18C1E8A581000217771 /* timg.jpeg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = timg.jpeg; sourceTree = "<group>"; };
-		D2EBC8551F01FF9200F198FB /* LVCCommentModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCCommentModel.h; sourceTree = "<group>"; };
-		D2EBC8561F01FF9200F198FB /* LVCCommentModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCCommentModel.m; sourceTree = "<group>"; };
 		D2EBC8651F02108000F198FB /* LiveListService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LiveListService.h; sourceTree = "<group>"; };
 		D2EBC8661F02108000F198FB /* LiveListService.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LiveListService.m; sourceTree = "<group>"; };
 		D2EBC8671F02108000F198FB /* LVCLiveActivityInfoService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCLiveActivityInfoService.h; sourceTree = "<group>"; };
@@ -1181,8 +1181,8 @@
 		81A482FC1E88B0130097A80A /* Model */ = {
 			isa = PBXGroup;
 			children = (
-				D2EBC8551F01FF9200F198FB /* LVCCommentModel.h */,
-				D2EBC8561F01FF9200F198FB /* LVCCommentModel.m */,
+				D2C6A8BD1F04998D00543EFA /* LVCVodListModel.h */,
+				D2C6A8BE1F04998D00543EFA /* LVCVodListModel.m */,
 			);
 			path = Model;
 			sourceTree = "<group>";
@@ -2285,6 +2285,7 @@
 				D2029CA01E6EADE10027CD92 /* NSObject+MJProperty.m in Sources */,
 				4BD855FE1EBACD530082061D /* AFSecurityPolicy.m in Sources */,
 				D2029CB51E6EADE10027CD92 /* SDiOSVersion.m in Sources */,
+				D2C6A8BF1F04998D00543EFA /* LVCVodListModel.m in Sources */,
 				4B45CE981EB86A760079AFB7 /* UILabel+createLabel.m in Sources */,
 				D2029C9C1E6EADE10027CD92 /* MJPropertyType.m in Sources */,
 				D22831091E77D8D500627701 /* GiftModel.m in Sources */,
@@ -2346,7 +2347,6 @@
 				4BD856181EBAD35C0082061D /* NSDictionary+Safety.m in Sources */,
 				4BD856011EBACD530082061D /* AFURLResponseSerialization.m in Sources */,
 				D2575C4A1E7685DE00E3A8FC /* UIView+Bubbling.m in Sources */,
-				D2EBC8571F01FF9200F198FB /* LVCCommentModel.m in Sources */,
 				D2EBC88B1F02361600F198FB /* LVCUGCLiveListView.m in Sources */,
 				D2029CA61E6EADE10027CD92 /* MJRefreshHeader.m in Sources */,
 				D2029CC41E6EADE10027CD92 /* UIImageView+WebCache.m in Sources */,
@@ -10,6 +10,6 @@
 @interface LVCVodPlayerController : BaseViewController
-@property (nonatomic, strong) ProgramModel *model;
+@property (nonatomic, strong) LVCVodListModel *model;
 @end
@@ -75,7 +75,7 @@ typedef enum {
     [self.view addSubview:self.commentView];
 }
-- (void)setModel:(ProgramModel *)model {
+- (void)setModel:(LVCVodListModel *)model {
     _model = model;
     //用来更新视频当前播放时间
@@ -88,7 +88,7 @@ typedef enum {
 #pragma mark - 初始化播放器
 - (void)playerInitialize {
-    _player = [[CNLiveMoviePlayerController alloc] initVodPlayWithVId:self.model.mediaId
+    _player = [[CNLiveMoviePlayerController alloc] initVodPlayWithVId:self.model.vId
                                                             authSuccess:^{
                                                                 _isPlaying = YES;
@@ -10,6 +10,4 @@
 @interface LVCVodPlayerFullController : UIViewController
-@property (nonatomic, strong) ProgramModel *model;
-
 @end
@@ -10,6 +10,7 @@
 #import "LVCTelevisionCell.h"
 #import "LVCRequestFailedView.h"
 #import "LVCVodPlayerController.h"
+#import "CommonCrypto/CommonDigest.h"
 static NSString *vodCellId = @"vodCellId";
@@ -45,41 +46,44 @@ 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];
+    NSMutableDictionary *parameter = [@{
+                                @"appId" : UserAppId,
+                                @"pageNumber": @"1",
+                                @"pagesize": @"10",
+                                @"timestamp": timeString,
+                                @"platform_id": [NSBundle mainBundle].bundleIdentifier
+                                } mutableCopy];
+    NSString *string = [NSString stringWithFormat:@"%@&key=%@", [self sortParameters:parameter], UserAppKey];
+    NSString *signString = [[self sha1:string] uppercaseString];
+    [parameter setObject:signString forKey:@"sign"];
+    
+    NSString *vodListURL = @"http://api.cnlive.com/open/api2/vod_epg/getVodListInfo4App";
+    NSString *testVodListURL = @"http://test.open.cnlive.com/openapi/api2/vod_epg/getVodListInfo4App";
+    
+    [[AFHTTPRequestOperationManager manager] POST:testVodListURL parameters:parameter success:^(AFHTTPRequestOperation *operation, id responseObject) {
         responseObject = [responseObject validatedDictionary];
-        
-        if (responseObject[@"programs"] && [responseObject[@"programs"] isKindOfClass:[NSArray class]]) {
-            
-            for (NSDictionary *dic in responseObject[@"programs"]) {
-                ProgramModel *programModel = [ProgramModel modelWithDic:dic];
-                [_programArrayM addObject:programModel];
-                if (dic[@"comments"] && [dic[@"comments"] isKindOfClass:[NSArray class]] && [(NSArray *)dic[@"comments"] count] > 0) {
-                    NSMutableArray *comments = [[NSMutableArray alloc] init];
-                    for (NSDictionary *commentDic in dic[@"comments"]) {
-                        LVCCommentModel *commentModel = [LVCCommentModel modelWithDic:commentDic];
-                        [comments addObject:commentModel];
-                    }
-                    [_programArrayM addObject:comments];
+        if ([responseObject[@"errorCode"] isEqualToString:@"0"]) {
+            if (responseObject[@"data"] && [responseObject[@"data"] isKindOfClass:[NSArray class]]) {
+                
+                for (NSDictionary *dic in responseObject[@"data"]) {
+                    LVCVodListModel *vodListModel = [LVCVodListModel modelWithDic:dic];
+                    [_programArrayM addObject:vodListModel];
                 }
             }
+            _timestamp = [[self timestamp] longLongValue];
+            [self.tableView.header endRefreshing];
+            [self.tableView reloadData];
+        } else {
+            NSLog(@"点播列表请求失败!");
+            _timestamp = [[self timestamp] longLongValue];
+            [self.tableView.header endRefreshing];
+            if (_programArrayM.count == 0) {
+                _failedView.hidden = NO;
+            }
         }
-        _timestamp = [[self timestamp] longLongValue];
-        [self.tableView.header endRefreshing];
-        [self.tableView reloadData];
     } failure:^(AFHTTPRequestOperation *operation, NSError *error) {
@@ -190,20 +194,50 @@ static NSString *vodCellId = @&quot;vodCellId&quot;;
 }
 #pragma mark ------------------------------ 分割线 ----------------------------------------------
-- (NSDictionary *)addParameters:(NSDictionary *)dict {
+//sha1加密
+- (NSString*)sha1:(NSString *)string
+{
+    NSData *data = [string dataUsingEncoding:NSUTF8StringEncoding];
+    
+    uint8_t digest[CC_SHA1_DIGEST_LENGTH];
+    
+    CC_SHA1(data.bytes, data.length, digest);
+    
+    NSMutableString* output = [NSMutableString stringWithCapacity:CC_SHA1_DIGEST_LENGTH * 2];
-    if (![dict isKindOfClass:[NSDictionary class]]) {
-        return dict;
+    for(int i = 0; i < CC_SHA1_DIGEST_LENGTH; i++)
+        [output appendFormat:@"%02x", digest[i]];
+    
+    while ([[output substringToIndex:1] isEqualToString:@"0"]) {
+        output = [[NSMutableString alloc] initWithString:[output substringFromIndex:1]];
     }
-    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];
+    
+    return output;
+}
+//参数排序
+- (NSString *)sortParameters:(NSDictionary*)parameters
+{
+    //对所有传入参数按照字段名的 ASCII 码从小到大排序
+    NSArray *keyArr=[parameters allKeys];
+    NSArray *arr = [keyArr sortedArrayUsingSelector:@selector(compare:)];
+    
+    NSMutableString *string1 = [[NSMutableString alloc]init];
+    for (int i=0; i<arr.count; i++) {
+        
+        NSString *parametersString = parameters[[arr objectAtIndex:i]];
+        if (parametersString.length > 0) {
+            [string1 appendString:[NSString stringWithFormat:@"%@=%@&",[arr objectAtIndex:i],parameters[[arr objectAtIndex:i]]]];
+        }
+    }
+    
+    if (string1.length > 0) {
+        [string1 deleteCharactersInRange:NSMakeRange(string1.length-1, 1)];
     }
+    
+    return string1;
 }
+
 - (void)didReceiveMemoryWarning {
     [super didReceiveMemoryWarning];
     // Dispose of any resources that can be recreated.
-//
-//  LVCCommentModel.h
-//  LiveVideoCloud
-//
-//  Created by cnliveJunBo on 17/6/27.
-//  Copyright © 2017年 cnlive. All rights reserved.
-//
-
-#import "BaseModel.h"
-
-@interface LVCCommentModel : BaseModel
-
-@property (nonatomic, strong)NSString *content;
-@property (nonatomic, strong)NSString *uid;
-@property (nonatomic, strong)NSString *facepath;
-@property (nonatomic, strong)NSString *nick;
-
-@end
-//
-//  LVCCommentModel.m
-//  LiveVideoCloud
-//
-//  Created by cnliveJunBo on 17/6/27.
-//  Copyright © 2017年 cnlive. All rights reserved.
-//
-
-#import "LVCCommentModel.h"
-
-@implementation LVCCommentModel
-
-@end
+//
+//  LVCVodListModel.h
+//  LiveVideoCloud
+//
+//  Created by cnliveJunBo on 17/6/29.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "BaseModel.h"
+
+@interface LVCVodListModel : BaseModel
+
+@property (nonatomic ,copy) NSString * _Nullable            type;
+@property (nonatomic ,copy) NSString * _Nullable            vId;
+@property (nonatomic ,copy) NSString * _Nullable            img;
+@property (nonatomic ,copy) NSString * _Nullable            subTitle;
+@property (nonatomic ,copy) NSString * _Nullable            rates;
+@property (nonatomic ,copy) NSString * _Nullable            desc;
+@property (nonatomic ,copy) NSString * _Nullable            tag;
+@property (nonatomic ,copy) NSString * _Nullable            title;
+@property (nonatomic ,copy) NSString * _Nullable            category;
+
+@end
+//
+//  LVCVodListModel.m
+//  LiveVideoCloud
+//
+//  Created by cnliveJunBo on 17/6/29.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "LVCVodListModel.h"
+
+@implementation LVCVodListModel
+
+- (void)loadModel
+{
+    [super loadModel];
+    
+    [LVCVodListModel mj_setupReplacedKeyFromPropertyName:^NSDictionary *{         return @{
+                                                                                                 @"desc":@"description"
+                                                                                                 };}];
+    
+}
+
+@end
@@ -10,6 +10,6 @@
 @interface LVCCommentTitleCell : UITableViewCell
-@property (nonatomic, strong) ProgramModel *model;
+@property (nonatomic, strong) LVCVodListModel *model;
 @end
@@ -28,7 +28,7 @@
     return self;
 }
-- (void)setModel:(ProgramModel *)model {
+- (void)setModel:(LVCVodListModel *)model {
     self.titleLabel.text = model.title;
     self.contentLabel.text = model.desc;
@@ -10,6 +10,6 @@
 @interface LVCCommentView : UIView
-@property (nonatomic, strong) ProgramModel *model;
+@property (nonatomic, strong) LVCVodListModel *model;
 @end
@@ -43,7 +43,7 @@ static NSString *commentCellId = @&quot;commentCellId&quot;;
     return self;
 }
-- (void)setModel:(ProgramModel *)model {
+- (void)setModel:(LVCVodListModel *)model {
     if (_model != model) {
         _model = model;
@@ -29,9 +29,8 @@
     #import <CNLivePlayerSDK/CNLiveWebcastManager.h>
     #import <CNLiveMsgTools/CNLiveMsgManager.h>
     #import <CNLiveChatManager/CNLiveChatManager.h>
-#import <CNLiveUserSystemSDK/CNLiveUserSystemCenter.h>
-    #import "LVCCommentModel.h"
-
+    #import <CNLiveUserSystemSDK/CNLiveUserSystemCenter.h>
+    #import "LVCVodListModel.h"
     #import "Common.h"
     #import "MJExtension.h"
     #import "CNLiveMacro.h"
@@ -79,9 +78,6 @@
 #define UserAppKey                      @"4c8658abc5d66f270f9bf5dcd1ef11e3597fab4c4e0af9"//@"13c6f0ad6f459cd479834b0b39cff99c6cf20c970815bb"//
 #define UserAppSceret                   @"c2faeb120f0ea2e2d47020d4b03cb8a93bed2585897a94"//@"14c887b76ec2ecdf7083fb4c62808f13f6ab77a0f9dfec"//
-#define JBAppId @"hdtv"
-#define JBAppVersion [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleVersion"]            ///debug用 "CFBundleVersion"
-
 #define PlaceholderImage @"placehodler"
 #define appDelegate ((AppDelegate *)[UIApplication sharedApplication].delegate)