iOS Team / LiveVideoCloud · Commits

Commit 9578757dd9fef7372a66b800b8d97c81481d53ea

Authored by 张旭
2 parents d5031810 d451b0f3

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

# Conflicts:
#	LiveVideoCloud/AppDelegate/AppDelegate.m
Inline Side-by-side
Showing 3 changed files with 4 additions and 1 deletions
LiveVideoCloud/AppDelegate/AppDelegate.m
  View file @9578757
... ... @@ -54,6 +54,7 @@
54 54  
55 55 CNLiveChatUserInfo *userInfo = [[CNLiveChatUserInfo alloc] initWithUserId:@"20170328ll" name:@"20170328" portrait:@"http://b.hiphotos.baidu.com/zhidao/wh%3D450%2C600/sign=f0c5c08030d3d539c16807c70fb7c566/8ad4b31c8701a18bbef9f231982f07082838feba.jpg"];
56 56  
  57 +
57 58 [[CNLiveChatManager sharedCNLiveChatManager] loginServer:userInfo success:^(NSString *userId) {
58 59 NSLog(@"连接服务器-----success");
59 60  
... ...
LiveVideoCloud/Classes/Sections/UGCSections/Controller/LiveListService.m
  View file @9578757
... ... @@ -16,6 +16,7 @@
16 16 NSInteger time = [[NSDate date] timeIntervalSince1970];
17 17 NSString *timeString = [NSString stringWithFormat:@"%ld", (long)time];
18 18 NSMutableDictionary *parameter=[@{@"platform_id": [NSBundle mainBundle].bundleIdentifier,
  19 + @"activityStatus": @"1,2",
19 20 @"timestamp": timeString,
20 21 @"appId": UserAppId} mutableCopy];
21 22 NSString *string = [NSString stringWithFormat:@"%@&key=%@", [self sortParameters:parameter], UserAppKey];
... ...
LiveVideoCloud/Classes/Sections/homeSections/Controller/LVCVodPlayerListController.m
  View file @9578757
... ... @@ -62,7 +62,8 @@ static NSString *vodCellId = @"vodCellId";
62 62 NSString *vodListURL = @"http://api.cnlive.com/open/api2/vod_epg/getVodListInfo4App";
63 63 NSString *testVodListURL = @"http://test.open.cnlive.com/openapi/api2/vod_epg/getVodListInfo4App";
64 64  
65   - [[AFHTTPRequestOperationManager manager] POST:testVodListURL parameters:parameter success:^(AFHTTPRequestOperation *operation, id responseObject) {
  65 + NSString *url = appDelegate.isTestEnvironment ? testVodListURL : vodListURL;
  66 + [[AFHTTPRequestOperationManager manager] POST:url parameters:parameter success:^(AFHTTPRequestOperation *operation, id responseObject) {
66 67  
67 68 responseObject = [responseObject validatedDictionary];
68 69 if ([responseObject[@"errorCode"] isEqualToString:@"0"]) {
... ...