iOS Team / LiveVideoCloud · Commits

Commit b58d3d506e500cd3398f83d5861c1599e4db13b0

Authored by 张旭
1 parent f54a5844

添加临时控制器

Inline Side-by-side
Showing 4 changed files with 72 additions and 1 deletions
LiveVideoCloud/LiveVideoCloud.xcodeproj/project.pbxproj
  View file @b58d3d5
... ... @@ -115,6 +115,7 @@
115 115 D2029D161E6EB00D0027CD92 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = D2029D151E6EB00D0027CD92 /* AppDelegate.m */; };
116 116 D2575C461E76857100E3A8FC /* LVCAnimationManager.m in Sources */ = {isa = PBXBuildFile; fileRef = D2575C451E76857100E3A8FC /* LVCAnimationManager.m */; };
117 117 D2575C4A1E7685DE00E3A8FC /* UIView+Bubbling.m in Sources */ = {isa = PBXBuildFile; fileRef = D2575C481E7685DE00E3A8FC /* UIView+Bubbling.m */; };
  118 + D2575C671E76A25400E3A8FC /* LVCInteractionController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2575C661E76A25400E3A8FC /* LVCInteractionController.m */; };
118 119 D2888D941E6EB8B4003A77C8 /* LVCTabBar.m in Sources */ = {isa = PBXBuildFile; fileRef = D2888D931E6EB8B4003A77C8 /* LVCTabBar.m */; };
119 120 D2888D9E1E6EBF1B003A77C8 /* LVCLiveViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2888D9B1E6EBF1B003A77C8 /* LVCLiveViewController.m */; };
120 121 D2888DB11E6EC05F003A77C8 /* TempViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2888DB01E6EC05F003A77C8 /* TempViewController.m */; };
... ... @@ -378,6 +379,8 @@
378 379 D2575C451E76857100E3A8FC /* LVCAnimationManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCAnimationManager.m; sourceTree = "<group>"; };
379 380 D2575C481E7685DE00E3A8FC /* UIView+Bubbling.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIView+Bubbling.m"; sourceTree = "<group>"; };
380 381 D2575C491E7685DE00E3A8FC /* UIView+Bubbling.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIView+Bubbling.h"; sourceTree = "<group>"; };
  382 + D2575C651E76A25400E3A8FC /* LVCInteractionController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCInteractionController.h; sourceTree = "<group>"; };
  383 + D2575C661E76A25400E3A8FC /* LVCInteractionController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCInteractionController.m; sourceTree = "<group>"; };
381 384 D2888D921E6EB8B4003A77C8 /* LVCTabBar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCTabBar.h; sourceTree = "<group>"; };
382 385 D2888D931E6EB8B4003A77C8 /* LVCTabBar.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCTabBar.m; sourceTree = "<group>"; };
383 386 D2888D9A1E6EBF1B003A77C8 /* LVCLiveViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCLiveViewController.h; sourceTree = "<group>"; };
... ... @@ -1051,6 +1054,8 @@
1051 1054 D2575C431E76846900E3A8FC /* InteractionSections */ = {
1052 1055 isa = PBXGroup;
1053 1056 children = (
  1057 + D2575C651E76A25400E3A8FC /* LVCInteractionController.h */,
  1058 + D2575C661E76A25400E3A8FC /* LVCInteractionController.m */,
1054 1059 D2575C471E7685C500E3A8FC /* heartAnimation */,
1055 1060 D2575C441E76857100E3A8FC /* LVCAnimationManager.h */,
1056 1061 D2575C451E76857100E3A8FC /* LVCAnimationManager.m */,
... ... @@ -1371,6 +1376,7 @@
1371 1376 D2029CB91E6EADE10027CD92 /* SDWebImageCompat.m in Sources */,
1372 1377 D2029CB61E6EADE10027CD92 /* MKAnnotationView+WebCache.m in Sources */,
1373 1378 D2029C981E6EADE10027CD92 /* MJExtensionConst.m in Sources */,
  1379 + D2575C671E76A25400E3A8FC /* LVCInteractionController.m in Sources */,
1374 1380 D2029CAE1E6EADE10027CD92 /* MJRefreshNormalHeader.m in Sources */,
1375 1381 D2029C901E6EADE10027CD92 /* UIActivityIndicatorView+AFNetworking.m in Sources */,
1376 1382 D2029CC61E6EADE10027CD92 /* SSKeychain.m in Sources */,
... ...
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/LVCInteractionController.h 0 → 100644
  View file @b58d3d5
  1 +//
  2 +// LVCInteractionController.h
  3 +// LiveVideoCloud
  4 +//
  5 +// Created by 张旭 on 2017/3/13.
  6 +// Copyright © 2017年 cnlive. All rights reserved.
  7 +//
  8 +
  9 +#import "BaseViewController.h"
  10 +
  11 +@interface LVCInteractionController : BaseViewController
  12 +
  13 +@end
... ...
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/LVCInteractionController.m 0 → 100644
  View file @b58d3d5
  1 +//
  2 +// LVCInteractionController.m
  3 +// LiveVideoCloud
  4 +//
  5 +// Created by 张旭 on 2017/3/13.
  6 +// Copyright © 2017年 cnlive. All rights reserved.
  7 +//
  8 +
  9 +#import "LVCInteractionController.h"
  10 +
  11 +@interface LVCInteractionController ()
  12 +
  13 +@end
  14 +
  15 +@implementation LVCInteractionController
  16 +
  17 +- (void)viewDidLoad {
  18 + [super viewDidLoad];
  19 + // Do any additional setup after loading the view.
  20 +}
  21 +
  22 +- (void)didReceiveMemoryWarning {
  23 + [super didReceiveMemoryWarning];
  24 + // Dispose of any resources that can be recreated.
  25 +}
  26 +
  27 +/*
  28 +#pragma mark - Navigation
  29 +
  30 +// In a storyboard-based application, you will often want to do a little preparation before navigation
  31 +- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
  32 + // Get the new view controller using [segue destinationViewController].
  33 + // Pass the selected object to the new view controller.
  34 +}
  35 +*/
  36 +
  37 +@end
... ...
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/Controller/HomeViewController.m
  View file @b58d3d5
... ... @@ -8,10 +8,12 @@
8 8  
9 9 #import "HomeViewController.h"
10 10 #import "LVCLivePlayerController.h"
  11 +#import "LVCInteractionController.h"
11 12  
12 13 @interface HomeViewController ()
13 14  
14 15  
  16 +
15 17 @end
16 18  
17 19 @implementation HomeViewController
... ... @@ -29,7 +31,12 @@
29 31 [liveBtn addTarget:self action:@selector(liveAction) forControlEvents:UIControlEventTouchUpInside];
30 32 [self.view addSubview:liveBtn];
31 33  
32   -
  34 + UIButton *interactionBtn = [UIButton buttonWithType:UIButtonTypeCustom];
  35 + interactionBtn.frame = CGRectMake(200, 400, 50, 30);
  36 + [interactionBtn setTitle:@"互动" forState:UIControlStateNormal];
  37 + [interactionBtn setTitleColor:[UIColor redColor] forState:UIControlStateNormal];
  38 + [interactionBtn addTarget:self action:@selector(interactionAction) forControlEvents:UIControlEventTouchUpInside];
  39 + [[UIApplication sharedApplication].keyWindow addSubview:interactionBtn];
33 40 }
34 41  
35 42 - (void)liveAction
... ... @@ -39,6 +46,14 @@
39 46 [self.navigationController pushViewController:liveVC animated:YES];
40 47 }
41 48  
  49 +- (void)interactionAction
  50 +{
  51 + LVCInteractionController *intVC = [[LVCInteractionController alloc] init];
  52 + self.navigationController.navigationBar.hidden = YES;
  53 + [self.navigationController pushViewController:intVC animated:YES];
  54 +}
  55 +
  56 +
42 57 - (void)didReceiveMemoryWarning {
43 58 [super didReceiveMemoryWarning];
44 59 // Dispose of any resources that can be recreated.
... ...