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

张旭
2 parents c4a0b971 856c9960
Showing 9 changed files with 151 additions and 21 deletions
LiveVideoCloud.xcodeproj/project.pbxproj
LiveVideoCloud/Classes/Sections/homeSections/Controller/LVCLiveActivityInfoService.h
LiveVideoCloud/Classes/Sections/homeSections/Controller/LVCLiveActivityInfoService.m
LiveVideoCloud/Classes/Sections/homeSections/Controller/LVCUGCLiveListView.m
LiveVideoCloud/Classes/Sections/homeSections/Controller/LiveLIstService.h → LiveVideoCloud/Classes/Sections/homeSections/Controller/LiveListService.h
LiveVideoCloud/Classes/Sections/homeSections/Controller/LiveLIstService.m → LiveVideoCloud/Classes/Sections/homeSections/Controller/LiveListService.m
LiveVideoCloud/UtilKits/ServerUrl/ZXServerUrl.h
LiveVideoCloud/UtilKits/ServerUrl/ZXServerUrl.m
LiveVideoCloud/UtilKits/UserTools/UserTools.m
@@ -252,7 +252,7 @@
 		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 */; };
+		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 */; };
 		D2B2ED801E88FC5200F7538A /* LVCUGCLiveEndView.m in Sources */ = {isa = PBXBuildFile; fileRef = D2B2ED7F1E88FC5200F7538A /* LVCUGCLiveEndView.m */; };
@@ -261,6 +261,7 @@
 		D2B7B2571E8261EF00ED084E /* ChatBarrOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = D2B7B2561E8261EF00ED084E /* ChatBarrOperation.m */; };
 		D2CBC13B1ECC157A00E00279 /* LVCVerifyLiveAuthService.m in Sources */ = {isa = PBXBuildFile; fileRef = D2CBC13A1ECC157A00E00279 /* LVCVerifyLiveAuthService.m */; };
 		D2D7D18D1E8A581000217771 /* timg.jpeg in Resources */ = {isa = PBXBuildFile; fileRef = D2D7D18C1E8A581000217771 /* timg.jpeg */; };
+		D2F0486A1EE54E860011E39C /* LVCLiveActivityInfoService.m in Sources */ = {isa = PBXBuildFile; fileRef = D2F048691EE54E860011E39C /* LVCLiveActivityInfoService.m */; };
 /* End PBXBuildFile section */
 /* Begin PBXContainerItemProxy section */
@@ -786,8 +787,8 @@
 		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>"; };
+		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>"; };
@@ -803,6 +804,8 @@
 		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>"; };
+		D2F048681EE54E860011E39C /* LVCLiveActivityInfoService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCLiveActivityInfoService.h; sourceTree = "<group>"; };
+		D2F048691EE54E860011E39C /* LVCLiveActivityInfoService.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCLiveActivityInfoService.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 /* Begin PBXFrameworksBuildPhase section */
@@ -2019,8 +2022,10 @@
 				81A483161E88BED00097A80A /* LVCTVLiveViewController.m */,
 				81A483181E88E19C0097A80A /* LVCMoreProgramViewController.h */,
 				81A483191E88E19C0097A80A /* LVCMoreProgramViewController.m */,
-				D2A089EC1E8A336A0071412C /* LiveLIstService.h */,
-				D2A089ED1E8A336A0071412C /* LiveLIstService.m */,
+				D2A089EC1E8A336A0071412C /* LiveListService.h */,
+				D2A089ED1E8A336A0071412C /* LiveListService.m */,
+				D2F048681EE54E860011E39C /* LVCLiveActivityInfoService.h */,
+				D2F048691EE54E860011E39C /* LVCLiveActivityInfoService.m */,
 			);
 			path = Controller;
 			sourceTree = "<group>";
@@ -2258,7 +2263,7 @@
 				D2029CAF1E6EADE10027CD92 /* MJRefreshStateHeader.m in Sources */,
 				4BD856091EBACD530082061D /* UIRefreshControl+AFNetworking.m in Sources */,
 				81F1C8401E8BC5CC0085C2B8 /* NSArray+Safety.m in Sources */,
-				D2A089EE1E8A336A0071412C /* LiveLIstService.m in Sources */,
+				D2A089EE1E8A336A0071412C /* LiveListService.m in Sources */,
 				D2A089E81E89FA720071412C /* LVCUGCLivePlayerCell.m in Sources */,
 				81A483111E88B8630097A80A /* LVCChannelDetailsModel.m in Sources */,
 				D2029D011E6EAE2E0027CD92 /* UIColor+HexString.m in Sources */,
@@ -2305,6 +2310,7 @@
 				810B65031E779B1F00133E15 /* MASViewConstraint.m in Sources */,
 				D2029BCE1E6EADD70027CD92 /* ZXNavigationController.m in Sources */,
 				81A482F51E88ACC80097A80A /* LVCTelevisionView.m in Sources */,
+				D2F0486A1EE54E860011E39C /* LVCLiveActivityInfoService.m in Sources */,
 				D2029CA21E6EADE10027CD92 /* MJRefreshAutoFooter.m in Sources */,
 				D2029CC71E6EADE10027CD92 /* SVIndefiniteAnimatedView.m in Sources */,
 				D2029CA31E6EADE10027CD92 /* MJRefreshBackFooter.m in Sources */,
+//
+//  LVCLiveActivityInfoService.h
+//  LiveVideoCloud
+//
+//  Created by cnliveJunBo on 17/6/5.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface LVCLiveActivityInfoService : HttpService
+
++ (NSURLSessionDataTask *)getLiveActivityInfoWithActivityId:(NSString *)activityId Handler:(completionHandler)handler;
+
++ (NSString*)sha1:(NSString *)string;
+
++ (NSString *)sortParameters:(NSDictionary*)parameters;
+
+@end
+//
+//  LVCLiveActivityInfoService.m
+//  LiveVideoCloud
+//
+//  Created by cnliveJunBo on 17/6/5.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "LVCLiveActivityInfoService.h"
+#import "CommonCrypto/CommonDigest.h"
+
+@implementation LVCLiveActivityInfoService
+
+// 获取直播活动信息
++ (NSURLSessionDataTask *)getLiveActivityInfoWithActivityId:(NSString *)activityId Handler:(completionHandler)handler
+{
+    NSInteger time = [[NSDate date] timeIntervalSince1970];
+    NSString *timeString = [NSString stringWithFormat:@"%ld", (long)time];
+    NSMutableDictionary *parameter=[@{@"platform_id": [NSBundle mainBundle].bundleIdentifier,
+                                      @"activityId":activityId,
+                                      @"timestamp": timeString,
+                                      @"appId": UserAppId} mutableCopy];
+    NSString *string = [NSString stringWithFormat:@"%@&key=%@", [self sortParameters:parameter], UserAppKey];
+    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 getLiveActivityInfoURL] 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
@@ -7,12 +7,13 @@
 //
 #import "LVCUGCLiveListView.h"
-#import "LiveLIstService.h"
+#import "LiveListService.h"
 #import "LVCUGCLivePlayerCell.h"
 #import "LVCUGCLiveListModel.h"
 #import "LVCUGCLivePlayerModel.h"
 #import "LVCUGCLivePlayerController.h"
 #import "LVCRequestFailedView.h"
+#import "LVCLiveActivityInfoService.h"
 static NSString *cellId = @"cellId";
@@ -50,7 +51,7 @@ static NSString *cellId = @&quot;cellId&quot;;
     _failedView.hidden = YES;
-    [LiveLIstService getLiveListWithHandler:^(id data, NSError *error) {
+    [LiveListService getLiveListWithHandler:^(id data, NSError *error) {
         if (error) {
             NSLog(@"失败===>error:%@",error);
@@ -99,11 +100,25 @@ static NSString *cellId = @&quot;cellId&quot;;
 - (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath {
-    LVCUGCLivePlayerController *player = [[LVCUGCLivePlayerController alloc] init];
-    player.index = indexPath.row;
-    player.playArray = _arrayM;
-    player.model = _arrayM[indexPath.row];
-    [self.viewController.navigationController pushViewController:player animated:YES];
+    LVCUGCLivePlayerModel *model = _arrayM[indexPath.row];
+    // 判断此时直播状态
+    [LVCLiveActivityInfoService getLiveActivityInfoWithActivityId:model.activityId Handler:^(id data, NSError *error) {
+        
+        if (error) {
+            
+            [Tools showHUDInView:self withString:@"跳转出错" autoHide:YES];
+            return ;
+        }
+        
+        NSString *activityStatus = [NSString stringWithFormat:@"%@",data[@"activityStatus"]];
+        model.activityStatus = activityStatus ? activityStatus : @"0";
+        
+        LVCUGCLivePlayerController *player = [[LVCUGCLivePlayerController alloc] init];
+        player.index = indexPath.row;
+        player.playArray = _arrayM;
+        player.model = model;
+        [self.viewController.navigationController pushViewController:player animated:YES];
+    }];
 }
 #pragma mark - LVCRequestFailedViewDelegate
@@ -8,12 +8,12 @@
 #import "HttpService.h"
-@interface LiveLIstService : HttpService
+@interface LiveListService : HttpService
+
 + (NSURLSessionDataTask *)getLiveListWithHandler:(completionHandler)handler;
 + (NSString*)sha1:(NSString *)string;
-
 + (NSString *)sortParameters:(NSDictionary*)parameters;
 @end
@@ -6,10 +6,10 @@
 //  Copyright © 2017年 cnlive. All rights reserved.
 //
-#import "LiveLIstService.h"
+#import "LiveListService.h"
 #import "CommonCrypto/CommonDigest.h"
-@implementation LiveLIstService
+@implementation LiveListService
 + (NSURLSessionDataTask *)getLiveListWithHandler:(completionHandler)handler
 {
@@ -30,6 +30,9 @@
 /** 直播列表 */
 + (NSString *)getLiveListURL;
+/** 直播活动详情 */
++ (NSString *)getLiveActivityInfoURL;
+
 /** 验证主播是否有直播权限 */
 + (NSString *)verifyLiveAuthURL;
 @end
@@ -26,6 +26,9 @@ static NSString *g_SearchContentURL = @&quot;/from/huntKeyWordApi/huntKeyWords.do&quot;;//
 /** 直播列表 */
 static NSString *g_LiveListURL = @"/open/api2/live_epg/sp/activityList4App";
+/** 直播活动详情 */
+static NSString *g_LiveActivityInfoURL = @"/open/api2/live_epg/getLiveActivityPlayInfo4App";
+
 /** 验证主播是否有直播权限 */
 static NSString *g_VerifyLiveAuthURL = @"/open/api2/live_epg/channel/info4App";
@@ -63,6 +66,12 @@ static NSString *g_VerifyLiveAuthURL = @&quot;/open/api2/live_epg/channel/info4App&quot;;
     return [NSString stringWithFormat:@"%@%@", serverBaseURL, g_LiveListURL];
 }
+/** 直播活动详情 */
++ (NSString *)getLiveActivityInfoURL
+{
+    return [NSString stringWithFormat:@"%@%@", serverBaseURL, g_LiveActivityInfoURL];
+}
+
 /** 验证主播是否有直播权限 */
 + (NSString *)verifyLiveAuthURL
 {
@@ -249,8 +249,8 @@
     parms[@"platform_id"] = [NSBundle mainBundle].bundleIdentifier;
     parms[@"channelId"] = [UserInformationModel manager].uid;
-    NSString *string = [NSString stringWithFormat:@"%@&key=%@", [LiveLIstService sortParameters:parms], UserAppKey];
-    NSString *signString = [[LiveLIstService sha1:string] uppercaseString];
+    NSString *string = [NSString stringWithFormat:@"%@&key=%@", [LiveListService sortParameters:parms], UserAppKey];
+    NSString *signString = [[LiveListService sha1:string] uppercaseString];
     parms[@"sign"] =  signString ;
@@ -280,8 +280,8 @@
     parms[@"channelId"] = [UserInformationModel manager].uid;   //@"295606";  //
     //parms[@"activityStatus"] = @2;
-    NSString *string = [NSString stringWithFormat:@"%@&key=%@", [LiveLIstService sortParameters:parms], UserAppKey];
-    NSString *signString = [[LiveLIstService sha1:string] uppercaseString];
+    NSString *string = [NSString stringWithFormat:@"%@&key=%@", [LiveListService sortParameters:parms], UserAppKey];
+    NSString *signString = [[LiveListService sha1:string] uppercaseString];
     parms[@"sign"] =  signString ;
 //    activityList4App
     NSString *host = [@"http://api.cnlive.com/open/api2/live_epg/channel/activityList4App" stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];