加载数据

王军波
1 parent 5ef3a431
Showing 13 changed files with 199 additions and 60 deletions
LiveVideoCloud/LiveVideoCloud.xcodeproj/project.pbxproj
LiveVideoCloud/LiveVideoCloud/Classes/SDK/AFNetworking/AFURLResponseSerialization.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/Controller/LVCUGCLiveListController.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/Controller/LiveLIstService.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/Controller/LiveLIstService.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/Model/LVCUGCLiveListModel.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/Model/LVCUGCLiveListModel.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/Model/LVCUGCLivePlayerModel.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/Model/LVCUGCLivePlayerModel.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/View/LVCUGCLivePlayerCell.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/View/LVCUGCLivePlayerCell.m
LiveVideoCloud/LiveVideoCloud/UtilKits/ServerUrl/ZXServerUrl.h
LiveVideoCloud/LiveVideoCloud/UtilKits/ServerUrl/ZXServerUrl.m
@@ -190,6 +190,8 @@
 		D29E81ED1E88DC5B008C9906 /* PriChatCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D29E81EC1E88DC5B008C9906 /* PriChatCell.m */; };
 		D2A089E81E89FA720071412C /* LVCUGCLivePlayerCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D2A089E71E89FA720071412C /* LVCUGCLivePlayerCell.m */; };
 		D2A089EB1E8A09CB0071412C /* LVCUGCLivePlayerModel.m in Sources */ = {isa = PBXBuildFile; fileRef = D2A089EA1E8A09CB0071412C /* LVCUGCLivePlayerModel.m */; };
+		D2A089EE1E8A336A0071412C /* LiveLIstService.m in Sources */ = {isa = PBXBuildFile; fileRef = D2A089ED1E8A336A0071412C /* LiveLIstService.m */; };
+		D2A089F11E8A41120071412C /* LVCUGCLiveListModel.m in Sources */ = {isa = PBXBuildFile; fileRef = D2A089F01E8A41120071412C /* LVCUGCLiveListModel.m */; };
 		D2A803081E80BD6F009D6F1C /* TopToolView.m in Sources */ = {isa = PBXBuildFile; fileRef = D2A803071E80BD6F009D6F1C /* TopToolView.m */; };
 		D2B2ED7A1E88F90C00F7538A /* CNLiveChatManager.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D2D236B21E88F8E600B7C517 /* CNLiveChatManager.framework */; };
 		D2B2ED7B1E88F90C00F7538A /* CNLiveChatManager.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D2D236B21E88F8E600B7C517 /* CNLiveChatManager.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
@@ -617,6 +619,10 @@
 		D2A089E71E89FA720071412C /* LVCUGCLivePlayerCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCUGCLivePlayerCell.m; sourceTree = "<group>"; };
 		D2A089E91E8A09CB0071412C /* LVCUGCLivePlayerModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCUGCLivePlayerModel.h; sourceTree = "<group>"; };
 		D2A089EA1E8A09CB0071412C /* LVCUGCLivePlayerModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCUGCLivePlayerModel.m; sourceTree = "<group>"; };
+		D2A089EC1E8A336A0071412C /* LiveLIstService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LiveLIstService.h; sourceTree = "<group>"; };
+		D2A089ED1E8A336A0071412C /* LiveLIstService.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LiveLIstService.m; sourceTree = "<group>"; };
+		D2A089EF1E8A41120071412C /* LVCUGCLiveListModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCUGCLiveListModel.h; sourceTree = "<group>"; };
+		D2A089F01E8A41120071412C /* LVCUGCLiveListModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCUGCLiveListModel.m; sourceTree = "<group>"; };
 		D2A803061E80BD6F009D6F1C /* TopToolView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TopToolView.h; sourceTree = "<group>"; };
 		D2A803071E80BD6F009D6F1C /* TopToolView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TopToolView.m; sourceTree = "<group>"; };
 		D2B2ED7E1E88FC5200F7538A /* LVCUGCLiveEndView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCUGCLiveEndView.h; sourceTree = "<group>"; };
@@ -737,6 +743,8 @@
 				81A4831F1E88F4BF0097A80A /* LVCProgramModel.m */,
 				81A482FF1E88B0130097A80A /* LVCChatRoomModel.h */,
 				81A483001E88B0130097A80A /* LVCChatRoomModel.m */,
+				D2A089EF1E8A41120071412C /* LVCUGCLiveListModel.h */,
+				D2A089F01E8A41120071412C /* LVCUGCLiveListModel.m */,
 				D2A089E91E8A09CB0071412C /* LVCUGCLivePlayerModel.h */,
 				D2A089EA1E8A09CB0071412C /* LVCUGCLivePlayerModel.m */,
 			);
@@ -1633,6 +1641,8 @@
 				81A483161E88BED00097A80A /* LVCTVLiveViewController.m */,
 				81A483181E88E19C0097A80A /* LVCMoreProgramViewController.h */,
 				81A483191E88E19C0097A80A /* LVCMoreProgramViewController.m */,
+				D2A089EC1E8A336A0071412C /* LiveLIstService.h */,
+				D2A089ED1E8A336A0071412C /* LiveLIstService.m */,
 			);
 			path = Controller;
 			sourceTree = "<group>";
@@ -1885,6 +1895,7 @@
 				8130911E1E84C0F0005F0BFF /* LVCMessage.m in Sources */,
 				D23696841E7FC6A900E4BF71 /* chatListCell.m in Sources */,
 				D2029CAF1E6EADE10027CD92 /* MJRefreshStateHeader.m in Sources */,
+				D2A089EE1E8A336A0071412C /* LiveLIstService.m in Sources */,
 				D2029C941E6EADE10027CD92 /* UIRefreshControl+AFNetworking.m in Sources */,
 				D2029C911E6EADE10027CD92 /* UIButton+AFNetworking.m in Sources */,
 				D2029C931E6EADE10027CD92 /* UIProgressView+AFNetworking.m in Sources */,
@@ -1956,6 +1967,7 @@
 				D2029C991E6EADE10027CD92 /* MJFoundation.m in Sources */,
 				D2575C461E76857100E3A8FC /* LVCAnimationManager.m in Sources */,
 				D2029C8A1E6EADE10027CD92 /* AFURLRequestSerialization.m in Sources */,
+				D2A089F11E8A41120071412C /* LVCUGCLiveListModel.m in Sources */,
 				D2029D041E6EAE2E0027CD92 /* UILabel+ContentSize.m in Sources */,
 				D25530031E79115100DF38A5 /* AnimQueueManager.m in Sources */,
 				D2029C871E6EADE10027CD92 /* AFHTTPSessionManager.m in Sources */,
@@ -223,7 +223,7 @@ static id AFJSONObjectByRemovingKeysWithNullValues(id JSONObject, NSJSONReadingO
         return nil;
     }
-    self.acceptableContentTypes = [NSSet setWithObjects:@"application/json", @"text/json", @"text/javascript", nil];
+    self.acceptableContentTypes = [NSSet setWithObjects:@"application/json", @"text/json", @"text/javascript", @"text/html", @"text/plain", nil];
     return self;
 }
@@ -7,7 +7,8 @@
 //
 #import "LVCUGCLiveListController.h"
-#import "CommonCrypto/CommonDigest.h"
+#import "LiveLIstService.h"
+#import "LVCUGCLiveListModel.h"
 @interface LVCUGCLiveListController ()
@@ -24,67 +25,19 @@
 - (void)loadData {
-    NSInteger time = [[NSDate date] timeIntervalSince1970];
-    NSString *timeString = [NSString stringWithFormat:@"%ld", (long)time];
-    NSMutableDictionary *parameter=[@{@"platform_id": [NSBundle mainBundle].bundleIdentifier,
-                              @"timestamp": timeString,
-                              @"appId": AppId} mutableCopy];
-    NSString *string = [NSString stringWithFormat:@"%@&key=%@", [self sortParameters:parameter], AppKey];
-    NSString *signString = [[self sha1:string] uppercaseString];
-    [parameter setObject:signString forKey:@"sign"];
-    
-    [[AFHTTPSessionManager manager] GET:@"http://api.cnlive.com/open/api2/live_epg/sp/activityList4App" parameters:parameter progress:nil success:^(NSURLSessionDataTask * _Nonnull task, id  _Nullable responseObject) {
+    [LiveLIstService getLiveListWithHandler:^(id data, NSError *error) {
-        NSLog(@"%@",responseObject);
+        if (error) {
+            NSLog(@"error:%@",error);
+            return ;
+        }
+        NSLog(@"data%@",data);
-    } failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
+        LVCUGCLiveListModel *model = [LVCUGCLiveListModel modelWithDic:data];
-        NSLog(@"%@",error);
+        NSLog(@"%@",model.activityList);
     }];
-        
-}
-//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];
-    
-    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]];
-    }
-    
-    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 {
+//
+//  LiveLIstService.h
+//  LiveVideoCloud
+//
+//  Created by cnliveJunBo on 17/3/28.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "HttpService.h"
+
+@interface LiveLIstService : HttpService
++ (NSURLSessionDataTask *)getLiveListWithHandler:(completionHandler)handler;
+
+@end
+//
+//  LiveLIstService.m
+//  LiveVideoCloud
+//
+//  Created by cnliveJunBo on 17/3/28.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "LiveLIstService.h"
+#import "CommonCrypto/CommonDigest.h"
+
+@implementation LiveLIstService
+
++ (NSURLSessionDataTask *)getLiveListWithHandler:(completionHandler)handler
+{
+    NSInteger time = [[NSDate date] timeIntervalSince1970];
+    NSString *timeString = [NSString stringWithFormat:@"%ld", (long)time];
+    NSMutableDictionary *parameter=[@{@"platform_id": [NSBundle mainBundle].bundleIdentifier,
+                                      @"timestamp": timeString,
+                                      @"appId": @"60_irn9edco29"} mutableCopy];
+    NSString *string = [NSString stringWithFormat:@"%@&key=%@", [self sortParameters:parameter], @"69fe70bda67e059286ad509d9f5377f815955645b52f94"];
+    NSString *signString = [[self sha1:string] uppercaseString];
+    [parameter setObject:signString forKey:@"sign"];
+    
+    NSMutableDictionary *params = parameter.mutableCopy;
+    completionHandler compleionHandler = ^(id data,NSError *error) {
+        handler(data,error);
+    };
+    return [[HttpService service] sendRequestWithHttpMethod:E_HTTP_REQUEST_METHOD_GET URLPath:[ZXServerUrl getLiveListURL] parameters:params completionHandler:compleionHandler];
+}
+
+//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];
+    
+    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]];
+    }
+    
+    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;
+}
+
+
+@end
+//
+//  LVCUGCLiveListModel.h
+//  LiveVideoCloud
+//
+//  Created by cnliveJunBo on 17/3/28.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "BaseModel.h"
+
+@class LVCUGCLivePlayerModel;
+@interface LVCUGCLiveListModel : BaseModel
+
+@property (nonatomic ,copy) NSString * _Nullable            totalCount;
+@property (nonatomic ,copy) NSString * _Nullable            nextCursor;
+@property (nonatomic ,copy) NSArray <LVCUGCLivePlayerModel *> * _Nullable            activityList;
+@property (nonatomic ,copy) NSString * _Nullable            preCursor;
+
+@end
+//
+//  LVCUGCLiveListModel.m
+//  LiveVideoCloud
+//
+//  Created by cnliveJunBo on 17/3/28.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "LVCUGCLiveListModel.h"
+
+@implementation LVCUGCLiveListModel
+
+- (void)loadModel
+{
+    [super loadModel];
+    
+    [LVCUGCLiveListModel mj_setupObjectClassInArray:^NSDictionary *{
+        return @{@"activityList":@"LVCUGCLivePlayerModel"};
+        //        return @{@"list":[SearchRecomListModel class]};二选一
+    }];
+}
+
+@end
@@ -7,7 +7,21 @@
 //
 #import <Foundation/Foundation.h>
+#import "BaseModel.h"
-@interface LVCUGCLivePlayerModel : NSObject
+@interface LVCUGCLivePlayerModel : BaseModel
+
+@property (nonatomic ,copy) NSString * _Nullable            startTime;
+@property (nonatomic ,copy) NSString * _Nullable            isHorizontalScreen;
+@property (nonatomic ,copy) NSString * _Nullable            activityId;
+@property (nonatomic ,copy) NSString * _Nullable            createTime;
+@property (nonatomic ,copy) NSString * _Nullable            coverImgUrl;
+@property (nonatomic ,copy) NSString * _Nullable            channelId;
+@property (nonatomic ,copy) NSString * _Nullable            activityStatus;
+@property (nonatomic ,copy) NSString * _Nullable            rates;
+@property (nonatomic ,copy) NSString * _Nullable            activityCategory;
+@property (nonatomic ,copy) NSString * _Nullable            endTime;
+@property (nonatomic ,copy) NSString * _Nullable            extensions;
+@property (nonatomic ,copy) NSString * _Nullable            activityName;
 @end
@@ -10,4 +10,10 @@
 @implementation LVCUGCLivePlayerModel
+- (void)loadModel
+{
+    [super loadModel];
+
+}
+
 @end
@@ -8,6 +8,7 @@
 #import <UIKit/UIKit.h>
 #import "LVCUGCPlayerLoadingView.h"
+#import "LVCUGCLivePlayerModel.h"
 @interface LVCUGCLivePlayerCell : UICollectionViewCell
@@ -15,4 +16,6 @@
 @property (nonatomic, strong) CNLiveMoviePlayerController *player; // 播放器
+@property (nonatomic, strong) LVCUGCLivePlayerModel *model;
+
 @end
@@ -22,6 +22,15 @@
     return self;
 }
+#pragma mark - SetMethod !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+- (void)setModel:(LVCUGCLivePlayerModel *)model {
+    
+    if (_model != model) {
+        _model = model;
+    }
+    
+}
+
 #pragma mark - GetMethod !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 - (LVCUGCPlayerLoadingView *)loadingView {
@@ -27,4 +27,6 @@
 /** 搜索页内容 */
 + (NSString *)getSearchContentURL;
+/** 直播列表 */
++ (NSString *)getLiveListURL;
 @end
@@ -9,7 +9,7 @@
 #import "ZXServerUrl.h"
 #ifdef DEBUG
-static NSString *serverBaseURL     = @"http://120.92.4.46:8080";//é€šç”¨æµ‹è¯•æœåŠ¡å™¨åŸŸå
+static NSString *serverBaseURL     = @"http://api.cnlive.com";//é€šç”¨æµ‹è¯•æœåŠ¡å™¨åŸŸå
 static NSString *serverChatBaseURL = @"http://120.92.4.46:8081";//èŠå¤©æµ‹è¯•æœåŠ¡å™¨åŸŸå
 #else
 static NSString *serverBaseURL     = @"https://perapi.svipmovie.com";//é€šç”¨æ£å¼æœåŠ¡å™¨åŸŸå
@@ -23,6 +23,8 @@ static NSString *serverChatBaseURL = @&quot;https://perapi.svipmovie1.com&quot;;//èŠå¤©æ
 /** æœç´¢é¡µå†…å®¹ */
 static NSString *g_SearchContentURL = @"/from/huntKeyWordApi/huntKeyWords.do";//@"api/findMessage";//å‘çŽ°æ¶ˆæ¯
+/** ç›´æ’åˆ—è¡¨ */
+static NSString *g_LiveListURL = @"/open/api2/live_epg/sp/activityList4App";
 @implementation ZXServerUrl
@@ -53,4 +55,10 @@ static NSString *g_SearchContentURL = @&quot;/from/huntKeyWordApi/huntKeyWords.do&quot;;//
     return [NSString stringWithFormat:@"%@%@", serverBaseURL, g_SearchContentURL];
 }
+/** ç›´æ’åˆ—è¡¨ */
++ (NSString *)getLiveListURL
+{
+    return [NSString stringWithFormat:@"%@%@", serverBaseURL, g_LiveListURL];
+}
+
 @end