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

王军波
2 parents 35955189 67182f12
Showing 20 changed files with 41 additions and 410 deletions
LiveVideoCloud.xcodeproj/project.pbxproj
LiveVideoCloud.xcodeproj/xcuserdata/cnlive.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
LiveVideoCloud/AppDelegate/AppDelegate.h
LiveVideoCloud/AppDelegate/AppDelegate.m
LiveVideoCloud/Classes/Sections/LiveSections/Controller/LVCLiveViewController.m
LiveVideoCloud/Classes/Sections/LiveSections/LVCVerifyLiveAuthService.m
LiveVideoCloud/Classes/Sections/ZXSections/Home/Controller/TempViewController.h
LiveVideoCloud/Classes/Sections/ZXSections/Home/Controller/TempViewController.m
LiveVideoCloud/Classes/Sections/ZXSections/Home/Model/SearchModel.h
LiveVideoCloud/Classes/Sections/ZXSections/Home/Model/SearchModel.m
LiveVideoCloud/Classes/Sections/ZXSections/Home/Model/SearchRecomListModel.h
LiveVideoCloud/Classes/Sections/ZXSections/Home/Model/SearchRecomListModel.m
LiveVideoCloud/Classes/Sections/ZXSections/Home/Presenter/HomeProtocol.h
LiveVideoCloud/Classes/Sections/ZXSections/Home/Presenter/SearchHttp.h
LiveVideoCloud/Classes/Sections/ZXSections/Home/Presenter/SearchHttp.m
LiveVideoCloud/Classes/Sections/ZXSections/Home/Presenter/SearchPresenter.h
LiveVideoCloud/Classes/Sections/ZXSections/Home/Presenter/SearchPresenter.m
LiveVideoCloud/PrefixHeader.pch
LiveVideoCloud/UtilKits/ServerUrl/ZXServerUrl.h
LiveVideoCloud/UtilKits/ServerUrl/ZXServerUrl.m
@@ -161,10 +161,6 @@
 		D2029CC91E6EADE10027CD92 /* SVProgressHUD.bundle in Resources */ = {isa = PBXBuildFile; fileRef = D2029C6F1E6EADE10027CD92 /* SVProgressHUD.bundle */; };
 		D2029CCA1E6EADE10027CD92 /* SVProgressHUD.m in Sources */ = {isa = PBXBuildFile; fileRef = D2029C711E6EADE10027CD92 /* SVProgressHUD.m */; };
 		D2029CCB1E6EADE10027CD92 /* SVRadialGradientLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = D2029C731E6EADE10027CD92 /* SVRadialGradientLayer.m */; };
-		D2029CCD1E6EADE10027CD92 /* SearchModel.m in Sources */ = {isa = PBXBuildFile; fileRef = D2029C7C1E6EADE10027CD92 /* SearchModel.m */; };
-		D2029CCE1E6EADE10027CD92 /* SearchRecomListModel.m in Sources */ = {isa = PBXBuildFile; fileRef = D2029C7E1E6EADE10027CD92 /* SearchRecomListModel.m */; };
-		D2029CCF1E6EADE10027CD92 /* SearchHttp.m in Sources */ = {isa = PBXBuildFile; fileRef = D2029C821E6EADE10027CD92 /* SearchHttp.m */; };
-		D2029CD01E6EADE10027CD92 /* SearchPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = D2029C841E6EADE10027CD92 /* SearchPresenter.m */; };
 		D2029CD41E6EADE70027CD92 /* HttpService.m in Sources */ = {isa = PBXBuildFile; fileRef = D2029CD31E6EADE70027CD92 /* HttpService.m */; };
 		D2029D001E6EAE2E0027CD92 /* NSNumber+ScaleHeight.m in Sources */ = {isa = PBXBuildFile; fileRef = D2029CDF1E6EAE2E0027CD92 /* NSNumber+ScaleHeight.m */; };
 		D2029D011E6EAE2E0027CD92 /* UIColor+HexString.m in Sources */ = {isa = PBXBuildFile; fileRef = D2029CE11E6EAE2E0027CD92 /* UIColor+HexString.m */; };
@@ -233,7 +229,6 @@
 		D25BF8A51E80EC76007FB138 /* 头像.jpg in Resources */ = {isa = PBXBuildFile; fileRef = D25BF8A41E80EC76007FB138 /* 头像.jpg */; };
 		D2888D941E6EB8B4003A77C8 /* LVCTabBar.m in Sources */ = {isa = PBXBuildFile; fileRef = D2888D931E6EB8B4003A77C8 /* LVCTabBar.m */; };
 		D2888D9E1E6EBF1B003A77C8 /* LVCLiveViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2888D9B1E6EBF1B003A77C8 /* LVCLiveViewController.m */; };
-		D2888DB11E6EC05F003A77C8 /* TempViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2888DB01E6EC05F003A77C8 /* TempViewController.m */; };
 		D29D88481E88C53300543A03 /* LVCUGCLivePrepareView.m in Sources */ = {isa = PBXBuildFile; fileRef = D29D88471E88C53300543A03 /* LVCUGCLivePrepareView.m */; };
 		D29E81ED1E88DC5B008C9906 /* PriChatCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D29E81EC1E88DC5B008C9906 /* PriChatCell.m */; };
 		D2A803081E80BD6F009D6F1C /* TopToolView.m in Sources */ = {isa = PBXBuildFile; fileRef = D2A803071E80BD6F009D6F1C /* TopToolView.m */; };
@@ -620,15 +615,6 @@
 		D2029C711E6EADE10027CD92 /* SVProgressHUD.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SVProgressHUD.m; sourceTree = "<group>"; };
 		D2029C721E6EADE10027CD92 /* SVRadialGradientLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVRadialGradientLayer.h; sourceTree = "<group>"; };
 		D2029C731E6EADE10027CD92 /* SVRadialGradientLayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SVRadialGradientLayer.m; sourceTree = "<group>"; };
-		D2029C7B1E6EADE10027CD92 /* SearchModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SearchModel.h; sourceTree = "<group>"; };
-		D2029C7C1E6EADE10027CD92 /* SearchModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SearchModel.m; sourceTree = "<group>"; };
-		D2029C7D1E6EADE10027CD92 /* SearchRecomListModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SearchRecomListModel.h; sourceTree = "<group>"; };
-		D2029C7E1E6EADE10027CD92 /* SearchRecomListModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SearchRecomListModel.m; sourceTree = "<group>"; };
-		D2029C801E6EADE10027CD92 /* HomeProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HomeProtocol.h; sourceTree = "<group>"; };
-		D2029C811E6EADE10027CD92 /* SearchHttp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SearchHttp.h; sourceTree = "<group>"; };
-		D2029C821E6EADE10027CD92 /* SearchHttp.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SearchHttp.m; sourceTree = "<group>"; };
-		D2029C831E6EADE10027CD92 /* SearchPresenter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SearchPresenter.h; sourceTree = "<group>"; };
-		D2029C841E6EADE10027CD92 /* SearchPresenter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SearchPresenter.m; sourceTree = "<group>"; };
 		D2029CD21E6EADE70027CD92 /* HttpService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HttpService.h; sourceTree = "<group>"; };
 		D2029CD31E6EADE70027CD92 /* HttpService.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HttpService.m; sourceTree = "<group>"; };
 		D2029CD61E6EADFB0027CD92 /* PrefixHeader.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PrefixHeader.pch; sourceTree = "<group>"; };
@@ -769,8 +755,6 @@
 		D2888D931E6EB8B4003A77C8 /* LVCTabBar.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCTabBar.m; sourceTree = "<group>"; };
 		D2888D9A1E6EBF1B003A77C8 /* LVCLiveViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCLiveViewController.h; sourceTree = "<group>"; };
 		D2888D9B1E6EBF1B003A77C8 /* LVCLiveViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCLiveViewController.m; sourceTree = "<group>"; };
-		D2888DAF1E6EC05F003A77C8 /* TempViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TempViewController.h; sourceTree = "<group>"; };
-		D2888DB01E6EC05F003A77C8 /* TempViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TempViewController.m; sourceTree = "<group>"; };
 		D29D88461E88C53300543A03 /* LVCUGCLivePrepareView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCUGCLivePrepareView.h; sourceTree = "<group>"; };
 		D29D88471E88C53300543A03 /* LVCUGCLivePrepareView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCUGCLivePrepareView.m; sourceTree = "<group>"; };
 		D29E81EB1E88DC5B008C9906 /* PriChatCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PriChatCell.h; sourceTree = "<group>"; };
@@ -1571,71 +1555,10 @@
 				8178D41A1F02030500AA78A4 /* PGCSections */,
 				D2888D951E6EBAA7003A77C8 /* LiveSections */,
 				D2575C431E76846900E3A8FC /* InteractionSections */,
-				D2029C751E6EADE10027CD92 /* ZXSections(例子) */,
 			);
 			path = Sections;
 			sourceTree = "<group>";
 		};
-		D2029C751E6EADE10027CD92 /* ZXSections(例子) */ = {
-			isa = PBXGroup;
-			children = (
-				D2029C761E6EADE10027CD92 /* Temp */,
-			);
-			name = "ZXSections(例子)";
-			path = ZXSections;
-			sourceTree = "<group>";
-		};
-		D2029C761E6EADE10027CD92 /* Temp */ = {
-			isa = PBXGroup;
-			children = (
-				D2029C771E6EADE10027CD92 /* Controller */,
-				D2029C7A1E6EADE10027CD92 /* Model */,
-				D2029C7F1E6EADE10027CD92 /* Presenter */,
-				D2029C851E6EADE10027CD92 /* View */,
-			);
-			name = Temp;
-			path = Home;
-			sourceTree = "<group>";
-		};
-		D2029C771E6EADE10027CD92 /* Controller */ = {
-			isa = PBXGroup;
-			children = (
-				D2888DAF1E6EC05F003A77C8 /* TempViewController.h */,
-				D2888DB01E6EC05F003A77C8 /* TempViewController.m */,
-			);
-			path = Controller;
-			sourceTree = "<group>";
-		};
-		D2029C7A1E6EADE10027CD92 /* Model */ = {
-			isa = PBXGroup;
-			children = (
-				D2029C7B1E6EADE10027CD92 /* SearchModel.h */,
-				D2029C7C1E6EADE10027CD92 /* SearchModel.m */,
-				D2029C7D1E6EADE10027CD92 /* SearchRecomListModel.h */,
-				D2029C7E1E6EADE10027CD92 /* SearchRecomListModel.m */,
-			);
-			path = Model;
-			sourceTree = "<group>";
-		};
-		D2029C7F1E6EADE10027CD92 /* Presenter */ = {
-			isa = PBXGroup;
-			children = (
-				D2029C801E6EADE10027CD92 /* HomeProtocol.h */,
-				D2029C811E6EADE10027CD92 /* SearchHttp.h */,
-				D2029C821E6EADE10027CD92 /* SearchHttp.m */,
-				D2029C831E6EADE10027CD92 /* SearchPresenter.h */,
-				D2029C841E6EADE10027CD92 /* SearchPresenter.m */,
-			);
-			path = Presenter;
-			sourceTree = "<group>";
-		};
-		D2029C851E6EADE10027CD92 /* View */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			path = View;
-			sourceTree = "<group>";
-		};
 		D2029CD11E6EADE70027CD92 /* HttpService */ = {
 			isa = PBXGroup;
 			children = (
@@ -2356,7 +2279,6 @@
 				4B45CE981EB86A760079AFB7 /* UILabel+createLabel.m in Sources */,
 				D2029C9C1E6EADE10027CD92 /* MJPropertyType.m in Sources */,
 				D22831091E77D8D500627701 /* GiftModel.m in Sources */,
-				D2029CCD1E6EADE10027CD92 /* SearchModel.m in Sources */,
 				4BD8560F1EBACEF80082061D /* CNLiveWebView.m in Sources */,
 				810B65051E779B1F00133E15 /* NSLayoutConstraint+MASDebugAdditions.m in Sources */,
 				D2029CCB1E6EADE10027CD92 /* SVRadialGradientLayer.m in Sources */,
@@ -2384,14 +2306,12 @@
 				D2029CB71E6EADE10027CD92 /* NSData+ImageContentType.m in Sources */,
 				D23DC1551ECC41C100103B0E /* LVCVerifyViewController.m in Sources */,
 				D29E81ED1E88DC5B008C9906 /* PriChatCell.m in Sources */,
-				D2029CD01E6EADE10027CD92 /* SearchPresenter.m in Sources */,
 				D2029CBE1E6EADE10027CD92 /* SDWebImagePrefetcher.m in Sources */,
 				D2EBC8991F025D4700F198FB /* LVCVodPlayerFullController.m in Sources */,
 				D2A803081E80BD6F009D6F1C /* TopToolView.m in Sources */,
 				D2B7B2571E8261EF00ED084E /* ChatBarrOperation.m in Sources */,
 				D209AD6B1EC580F100D82E3B /* LVCWebViewController.m in Sources */,
 				810B65011E779B1F00133E15 /* MASLayoutConstraint.m in Sources */,
-				D2029CCE1E6EADE10027CD92 /* SearchRecomListModel.m in Sources */,
 				D2029CA11E6EADE10027CD92 /* NSString+MJExtension.m in Sources */,
 				4B45CE7A1EB86A590079AFB7 /* MineLiveController.m in Sources */,
 				D2029BCB1E6EADD70027CD92 /* BaseTableViewCell.m in Sources */,
@@ -2471,7 +2391,6 @@
 				D2029C9F1E6EADE10027CD92 /* NSObject+MJKeyValue.m in Sources */,
 				D209AD6E1EC583B700D82E3B /* MineMessageController.m in Sources */,
 				D25BF8A01E80C4BD007FB138 /* UIImage+LVCVagueImage.m in Sources */,
-				D2888DB11E6EC05F003A77C8 /* TempViewController.m in Sources */,
 				810B65021E779B1F00133E15 /* MASViewAttribute.m in Sources */,
 				8178D46B1F021ED800AA78A4 /* LVCTelevisionModel.m in Sources */,
 				D2B7B2511E8247D400ED084E /* ChatBarrageManager.m in Sources */,
@@ -2540,7 +2459,6 @@
 				D2029D061E6EAE2E0027CD92 /* UIView+Extension.m in Sources */,
 				D25530001E7909AC00DF38A5 /* GiftAnimOperation.m in Sources */,
 				D2029C9D1E6EADE10027CD92 /* NSObject+MJClass.m in Sources */,
-				D2029CCF1E6EADE10027CD92 /* SearchHttp.m in Sources */,
 				810B65001E779B1F00133E15 /* MASConstraintMaker.m in Sources */,
 				8178D4711F0239AD00AA78A4 /* LVCPlayerLoadingView.m in Sources */,
 				D2EBC8A01F034C5500F198FB /* LVCCommentView.m in Sources */,
-<?xml version="1.0" encoding="UTF-8"?>
-<Bucket
-   type = "1"
-   version = "2.0">
-   <Breakpoints>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "LiveVideoCloud/Classes/Sections/homeSections/Controller/LVCVodPlayerController.m"
-            timestampString = "520320963.334972"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "298"
-            endingLineNumber = "298"
-            landmarkName = "-deviceOrientationChanged:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-   </Breakpoints>
-</Bucket>
@@ -10,6 +10,8 @@
 @interface AppDelegate : UIResponder <UIApplicationDelegate>
+@property (nonatomic) BOOL                     isTestEnvironment;
+
 @property (strong, nonatomic) UIWindow *_Nonnull window;
 @property (nonatomic ,copy)   NSString *_Nonnull deviceName;
@@ -22,14 +22,17 @@
     self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
     self.window.rootViewController = [[ZXTabBarController alloc] init];
+    //测试环境开关,只在初始化时有效
+    self.isTestEnvironment = YES;
+    
     //APP 启动是初始化直播SDK
-    [[CNLiveWebcastManager manager] initWithAppId:UserAppId appKey:UserAppKey isTestEnvironment:YES];
+    [[CNLiveWebcastManager manager] initWithAppId:UserAppId appKey:UserAppKey isTestEnvironment:self.isTestEnvironment];
     //初始化聊天SDK并连接服务器
-    [[CNLiveChatManager sharedCNLiveChatManager] initWithAppKey:UserAppKey appId:UserAppId isTestEnvironment:YES];
+    [[CNLiveChatManager sharedCNLiveChatManager] initWithAppKey:UserAppKey appId:UserAppId isTestEnvironment:self.isTestEnvironment];
     //初始化用户SDK
-    [CNLiveUserSystemCenter setAppId:UserAppId appKey:UserAppKey appSecret:UserAppSceret isTestEnvironment:YES];
+    [CNLiveUserSystemCenter setAppId:UserAppId appKey:UserAppKey appSecret:UserAppSceret isTestEnvironment:self.isTestEnvironment];
     /*
      [[CNLiveChatManager sharedCNLiveChatManager] connectServerSuccess:^{
@@ -48,7 +48,7 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
-    
+
     self.navigationController.delegate = self;
     self.view.backgroundColor = [UIColor whiteColor];
@@ -58,6 +58,7 @@
 #pragma mark - 验证是否有主播权限
 - (void)verifyLiveAuthority {
+    
     [SVProgressHUD setDefaultMaskType:SVProgressHUDMaskTypeClear];
     [SVProgressHUD showWithStatus:@"正在加载..."];
     [LVCVerifyLiveAuthService verifyLiveAuthWithHandler:^(id data, NSError *error) {
@@ -39,7 +39,7 @@
     uint8_t digest[CC_SHA1_DIGEST_LENGTH];
-    CC_SHA1(data.bytes, data.length, digest);
+    CC_SHA1(data.bytes, (int)data.length, digest);
     NSMutableString* output = [NSMutableString stringWithCapacity:CC_SHA1_DIGEST_LENGTH * 2];
-//
-//  TempViewController.h
-//  LiveVideoCloud
-//
-//  Created by 张旭 on 2017/3/7.
-//  Copyright © 2017年 cnlive. All rights reserved.
-//
-
-#import "BaseViewController.h"
-
-@interface TempViewController : BaseViewController
-
-@end
-//
-//  TempViewController.m
-//  LiveVideoCloud
-//
-//  Created by 张旭 on 2017/3/7.
-//  Copyright © 2017年 cnlive. All rights reserved.
-//
-
-#import "TempViewController.h"
-#import "SearchPresenter.h"
-//#import "SearchHttp.h"
-//#import "SearchModel.h"
-//#import "SearchRecomListModel.h"
-@interface TempViewController ()
-
-@property (nonatomic ,strong) SearchPresenter    *presenter;
-
-@end
-
-@implementation TempViewController
-
-- (void)viewDidLoad {
-    [super viewDidLoad];
-    // Do any additional setup after loading the view.
-    self.view.backgroundColor = [UIColor redColor];
-}
-
-- (void)touchesBegan:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event
-{
-    TempViewController *vc = [TempViewController new];
-    vc.view.backgroundColor = ZXRandomColor;
-    [self.navigationController pushViewController:vc animated:YES];
-}
-
-- (void)bindAction
-{
-    [self.presenter requestSearchData:^(id  _Nullable data) {
-        NSLog(@"%@",data);
-    } failure:^(NSError * _Nullable error) {
-        NSLog(@"%@",error);
-    }];
-}
-
-- (SearchPresenter *)presenter
-{
-    if (!_presenter)
-    {
-        _presenter = [[SearchPresenter alloc] init];
-    }
-    return _presenter;
-}
-
-
-- (void)didReceiveMemoryWarning {
-    [super didReceiveMemoryWarning];
-    // Dispose of any resources that can be recreated.
-}
-
-/*
-#pragma mark - Navigation
-
-// In a storyboard-based application, you will often want to do a little preparation before navigation
-- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
-    // Get the new view controller using [segue destinationViewController].
-    // Pass the selected object to the new view controller.
-}
-*/
-
-@end
-//
-//  SearchModel.h
-//  ZXBaseProject
-//
-//  Created by 张旭 on 2017/1/12.
-//  Copyright © 2017年 cnlive. All rights reserved.
-//
-
-#import "BaseModel.h"
-@class SearchRecomListModel;
-@interface SearchModel :BaseModel
-
-@property (nonatomic ,copy)   NSString             * _Nullable        hotMovieName;
-@property (nonatomic ,strong) NSArray <SearchRecomListModel *>* _Nullable        list;
-@property (nonatomic ,copy)   NSString             * _Nullable        title;
-
-@end
-//
-//  SearchModel.m
-//  ZXBaseProject
-//
-//  Created by 张旭 on 2017/1/12.
-//  Copyright © 2017年 cnlive. All rights reserved.
-//
-
-#import "SearchModel.h"
-
-@implementation SearchModel
-
-- (void)loadModel
-{
-    [super loadModel];
-
-    [SearchModel mj_setupReplacedKeyFromPropertyName:^NSDictionary *{         return @{
-                    @"list":@"recomList",
-                    @"title":@"recomList[0].title",
-                };}];
-    
-    [SearchModel mj_setupObjectClassInArray:^NSDictionary *{
-        return @{@"list":@"SearchRecomListModel"};
-//        return @{@"list":[SearchRecomListModel class]};二选一
-    }];
-}
-
-@end
-//
-//  SearchRecomListModel.h
-//  ZXBaseProject
-//
-//  Created by 张旭 on 2017/1/17.
-//  Copyright © 2017年 cnlive. All rights reserved.
-//
-
-#import "BaseModel.h"
-
-@interface SearchRecomListModel : BaseModel
-
-@property (nonatomic ,copy) NSString * _Nullable            angleImage;
-@property (nonatomic ,copy) NSString * _Nullable            loadType;
-@property (nonatomic ,copy) NSString * _Nullable            loadUrl;
-@property (nonatomic ,copy) NSString * _Nullable            movieId;
-@property (nonatomic ,copy) NSString * _Nullable            pic;
-@property (nonatomic ,copy) NSString * _Nullable            title;
-
-@end
-//
-//  SearchRecomListModel.m
-//  ZXBaseProject
-//
-//  Created by 张旭 on 2017/1/17.
-//  Copyright © 2017年 cnlive. All rights reserved.
-//
-
-#import "SearchRecomListModel.h"
-
-@implementation SearchRecomListModel
-
-- (void)loadModel
-{
-    [super loadModel];
-    [SearchRecomListModel mj_setupReplacedKeyFromPropertyName:^NSDictionary *{
-        return @{@"angleImage":@"angleIcon"};
-    }];
-}
-
-@end
-//
-//  HomeProtocol.h
-//  ZXBaseProject
-//
-//  Created by 张旭 on 2017/2/14.
-//  Copyright © 2017年 cnlive. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import <UIKit/UIKit.h>
-
-typedef void(^SuccessBlock)(id _Nullable data);
-typedef void(^FailureBlock)(NSError *_Nullable error);
-
-@protocol HomeProtocol <NSObject>
-
-- (void)requestSearchData:(SuccessBlock _Nullable)success failure:(FailureBlock _Nullable)failure;
-@end
-//
-//  SearchHttp.h
-//  ZXBaseProject
-//
-//  Created by 张旭 on 2017/1/12.
-//  Copyright © 2017年 cnlive. All rights reserved.
-//
-
-#import "HttpService.h"
-
-@interface SearchHttp : HttpService
-
-+ (NSURLSessionDataTask *)getSearchContentWithHandler:(completionHandler)handler;
-
-@end
-//
-//  SearchHttp.m
-//  ZXBaseProject
-//
-//  Created by 张旭 on 2017/1/12.
-//  Copyright © 2017年 cnlive. All rights reserved.
-//
-
-#import "SearchHttp.h"
-
-@implementation SearchHttp
-
-+ (NSURLSessionDataTask *)getSearchContentWithHandler:(completionHandler)handler
-{
-    NSMutableDictionary *params = @{}.mutableCopy;
-    completionHandler compleionHandler = ^(id data,NSError *error) {
-        handler(data,error);
-    };
-    return [[HttpService service] sendRequestWithHttpMethod:E_HTTP_REQUEST_METHOD_GET URLPath:[ZXServerUrl getSearchContentURL] parameters:params completionHandler:compleionHandler];
-}
-
-
-@end
-//
-//  SearchPresenter.h
-//  ZXBaseProject
-//
-//  Created by 张旭 on 2017/2/14.
-//  Copyright © 2017年 cnlive. All rights reserved.
-//
-
-#import "HomeProtocol.h"
-
-@interface SearchPresenter : NSObject <HomeProtocol>
-
-@end
-//
-//  SearchPresenter.m
-//  ZXBaseProject
-//
-//  Created by 张旭 on 2017/2/14.
-//  Copyright © 2017年 cnlive. All rights reserved.
-//
-
-#import "SearchPresenter.h"
-#import "SearchHttp.h"
-#import "SearchModel.h"
-
-@implementation SearchPresenter
-
-- (void)requestSearchData:(SuccessBlock)success failure:(FailureBlock)failure
-{
-    [SearchHttp getSearchContentWithHandler:^(id data, NSError *error) {
-        if (error) {
-            NSLog(@"error = %@",error);
-            failure(error);
-//            FailureBlock failure = ^(NSError *err){
-//                failure(err);
-//            };
-        }
-        NSLog(@"%@",data);
-//        SuccessBlock success = ^(id data){
-//            success(data);
-//        };
-        success(data);
-        SearchModel *model = [SearchModel modelWithDic:data];
-        NSLog(@"%@",model.list);
-    }];
-}
-
-@end
@@ -55,6 +55,7 @@
     #import "ProgramModel.h"
     #import "WXApi.h"
     #import "WeiboSDK.h"
+    #import "AppDelegate.h"
 #if TARGET_OS_IPHONE
@@ -92,7 +93,7 @@
 //#define UserAppSceret                   @"ee844ea67b6be7303b6f5d9365af10ac09933c0828aba7"
 #define PlaceholderImage @"placehodler"
-
+#define appDelegate ((AppDelegate *)[UIApplication sharedApplication].delegate)
 #define ThirdLoginSuccess           @"ThirdLoginSuccess"
 #define ThirdLoginFailure           @"ThirdLoginFailure"
@@ -17,16 +17,13 @@
 /** 获取服务器baseUrl */
 + (NSString *)getServerBaseURL;
-/** 获取聊天服务器baseUrl */
-+ (NSString *)getServerChatBaseURL;
+///** 获取聊天服务器baseUrl */
+//+ (NSString *)getServerChatBaseURL;
 ////////////////////////////////////////////////////////
 ////////////          BusinessUrls
 ////////////////////////////////////////////////////////
-/** 搜索页内容 */
-+ (NSString *)getSearchContentURL;
-
 /** 直播列表 */
 + (NSString *)getLiveListURL;
@@ -9,28 +9,28 @@
 #import "ZXServerUrl.h"
 #ifdef DEBUG
-static NSString *serverBaseURL     = @"http://test.open.cnlive.com/openapi/api2/";//@"http://api.cnlive.com";//通用测试服务器域名
-static NSString *serverChatBaseURL = @"http://120.92.4.46:8081";//聊天测试服务器域名
+#define serverBaseURL appDelegate.isTestEnvironment ? @"http://test.open.cnlive.com/openapi/api2" : @"https://api.cnlive.com/open/api2";//@"http://api.cnlive.com";//通用测试服务器域名
+//static NSString *serverChatBaseURL = @"http://120.92.4.46:8081";//聊天测试服务器域名
 #else
-static NSString *serverBaseURL     = @"https://perapi.svipmovie.com";//通用正式服务器域名
-static NSString *serverChatBaseURL = @"https://perapi.svipmovie1.com";//聊天正式服务器域名
+#define serverBaseURL @"https://api.cnlive.com/open/api2";//通用正式服务器域名
+//static NSString *serverChatBaseURL = @"https://perapi.svipmovie1.com";//聊天正式服务器域名
 #endif
 ////////////////////////////////////////////////////////
 ////////////           具体请求接口URL
 ////////////////////////////////////////////////////////
-/** 搜索页内容 */
-static NSString *g_SearchContentURL = @"/from/huntKeyWordApi/huntKeyWords.do";//@"api/findMessage";//发现消息
+/** 点播列表 */
+static NSString *g_VodListURL = @"/vod_epg/getVodInfo4App";
-/** 直播列表 */
-static NSString *g_LiveListURL = @"live_epg/sp/activityList4App";///open/api2/
+/** UGC直播列表 */
+static NSString *g_LiveListURL = @"/live_epg/sp/activityList4App";
 /** 直播活动详情 */
-static NSString *g_LiveActivityInfoURL = @"/open/api2/live_epg/getLiveActivityPlayInfo4App";
+static NSString *g_LiveActivityInfoURL = @"/live_epg/getLiveActivityPlayInfo4App";
 /** 验证主播是否有直播权限 */
-static NSString *g_VerifyLiveAuthURL = @"/open/api2/live_epg/channel/info4App";
+static NSString *g_VerifyLiveAuthURL = @"/live_epg/channel/info4App";
 @implementation ZXServerUrl
@@ -45,37 +45,41 @@ static NSString *g_VerifyLiveAuthURL = @&quot;/open/api2/live_epg/channel/info4App&quot;;
 }
 /** 获取聊天服务器baseUrl */
-+ (NSString *)getServerChatBaseURL
-{
-    return serverChatBaseURL;
-}
+//+ (NSString *)getServerChatBaseURL
+//{
+//    return serverChatBaseURL;
+//}
 ////////////////////////////////////////////////////////
 ////////////          BusinessUrls
 ////////////////////////////////////////////////////////
-/** 搜索页内容 */
-+ (NSString *)getSearchContentURL
+
+/** 点播列表 */
++ (NSString *)getVodListURL
 {
-    return [NSString stringWithFormat:@"%@%@", serverBaseURL, g_SearchContentURL];
+    NSString *url = serverBaseURL;
+    return [NSString stringWithFormat:@"%@%@", url, g_VodListURL];
 }
-
-/** 直播列表 */
+/** UGC直播列表 */
 + (NSString *)getLiveListURL
 {
-    return [NSString stringWithFormat:@"%@%@", serverBaseURL, g_LiveListURL];
+    NSString *url = serverBaseURL;
+    return [NSString stringWithFormat:@"%@%@", url, g_LiveListURL];
 }
 /** 直播活动详情 */
 + (NSString *)getLiveActivityInfoURL
 {
-    return [NSString stringWithFormat:@"%@%@", serverBaseURL, g_LiveActivityInfoURL];
+    NSString *url = serverBaseURL;
+    return [NSString stringWithFormat:@"%@%@", url, g_LiveActivityInfoURL];
 }
 /** 验证主播是否有直播权限 */
 + (NSString *)verifyLiveAuthURL
 {
-    return [NSString stringWithFormat:@"%@%@", serverBaseURL, g_VerifyLiveAuthURL];
+    NSString *url = serverBaseURL;
+    return [NSString stringWithFormat:@"%@%@", url, g_VerifyLiveAuthURL];
 }
 @end