iOS Team / LiveVideoCloud · Commits

Commit 0321081483033f5d1569c7120c0838fa438370ac

Authored by 王军波
1 parent 9d9e5128

直播前先判断是否已登录

Inline Side-by-side
Showing 4 changed files with 23 additions and 8 deletions
LiveVideoCloud/AppCustoms/Base/BaseViewController.m
  View file @0321081
@@ -67,7 +67,7 @@ @@ -67,7 +67,7 @@
67 negativeSpacer.width = -8;//默认leftItemX == 18,要求距左边10 67 negativeSpacer.width = -8;//默认leftItemX == 18,要求距左边10
68 [self.navigationItem setLeftBarButtonItems:[NSArray arrayWithObjects:negativeSpacer,backItem, nil]]; 68 [self.navigationItem setLeftBarButtonItems:[NSArray arrayWithObjects:negativeSpacer,backItem, nil]];
69 69
70 - if (self.navigationController.viewControllers[0] == self) { 70 + if ((self.navigationController.viewControllers[0] == self) && (self.isModalButton == NO)) {
71 _btnLeft.hidden = YES; 71 _btnLeft.hidden = YES;
72 } 72 }
73 } 73 }
LiveVideoCloud/AppCustoms/Main/ZXTabBarController.m
  View file @0321081
@@ -12,6 +12,7 @@ @@ -12,6 +12,7 @@
12 #import "LVCLiveViewController.h" 12 #import "LVCLiveViewController.h"
13 #import "LVCMineViewController.h" 13 #import "LVCMineViewController.h"
14 #import "LVCTabBar.h" 14 #import "LVCTabBar.h"
  15 +#import "LoginViewController.h"
15 16
16 #import "LVCMineViewController.h"// 17 #import "LVCMineViewController.h"//
17 18
@@ -81,16 +82,23 @@ @@ -81,16 +82,23 @@
81 82
82 -(void)liveBtnClick:(LVCTabBar *)tabBar 83 -(void)liveBtnClick:(LVCTabBar *)tabBar
83 { 84 {
84 -// if ([UserTools isLogin]) { 85 +
  86 + // 判断用户是否登录
  87 + if ([UserTools isLogin]) {
  88 +
85 LVCLiveViewController *liveCtrl = [[LVCLiveViewController alloc] init]; 89 LVCLiveViewController *liveCtrl = [[LVCLiveViewController alloc] init];
86 ZXNavigationController *nav = [[ZXNavigationController alloc] initWithRootViewController:liveCtrl]; 90 ZXNavigationController *nav = [[ZXNavigationController alloc] initWithRootViewController:liveCtrl];
87 [self presentViewController:nav animated:YES completion:nil]; 91 [self presentViewController:nav animated:YES completion:nil];
88 -// }else {  
89 -// LoginViewController *loginCtrl = [[LoginViewController alloc] init]; 92 +
  93 + } else {
  94 +
  95 + LoginViewController *loginCtrl = [[LoginViewController alloc] init];
90 // ZXNavigationController *navCtrl = [[ZXNavigationController alloc] initWithRootViewController:loginCtrl]; 96 // ZXNavigationController *navCtrl = [[ZXNavigationController alloc] initWithRootViewController:loginCtrl];
91 -// loginCtrl.isModalButton = YES;  
92 -// [self presentViewController:navCtrl animated:YES completion:NULL];  
93 -// } 97 + UINavigationController *navCtrl = [[UINavigationController alloc] initWithRootViewController:loginCtrl];
  98 + loginCtrl.isModalButton = YES;
  99 + [self presentViewController:navCtrl animated:YES completion:NULL];
  100 +
  101 + }
94 102
95 } 103 }
96 104
LiveVideoCloud/Classes/Sections/LiveSections/Controller/LVCLiveViewController.m
  View file @0321081
@@ -15,6 +15,7 @@ @@ -15,6 +15,7 @@
15 #import "LVCUGCLiveEndView.h" 15 #import "LVCUGCLiveEndView.h"
16 #import "LVCVerifyLiveAuthService.h" 16 #import "LVCVerifyLiveAuthService.h"
17 #import "LVCVerifyViewController.h" 17 #import "LVCVerifyViewController.h"
  18 +#import "LoginViewController.h"
18 19
19 @interface LVCLiveViewController ()<UIGestureRecognizerDelegate, UIAlertViewDelegate, UINavigationControllerDelegate> { 20 @interface LVCLiveViewController ()<UIGestureRecognizerDelegate, UIAlertViewDelegate, UINavigationControllerDelegate> {
20 21
@@ -50,6 +51,7 @@ @@ -50,6 +51,7 @@
50 51
51 self.navigationController.delegate = self; 52 self.navigationController.delegate = self;
52 self.view.backgroundColor = [UIColor whiteColor]; 53 self.view.backgroundColor = [UIColor whiteColor];
  54 +
53 [self verifyLiveAuthority]; 55 [self verifyLiveAuthority];
54 } 56 }
55 57
LiveVideoCloud/Classes/Sections/Mine/Login/Controller/LoginViewController.m
  View file @0321081
@@ -96,7 +96,11 @@ @@ -96,7 +96,11 @@
96 } 96 }
97 [SVProgressHUD dismiss]; 97 [SVProgressHUD dismiss];
98 [UserTools setLocalUserInfo:chinaCoin withKey:count]; 98 [UserTools setLocalUserInfo:chinaCoin withKey:count];
99 - [self.navigationController popViewControllerAnimated:YES]; 99 + if(self.isModalButton) {
  100 + [self dismissViewControllerAnimated:YES completion:NULL];
  101 + } else {
  102 + [self.navigationController popViewControllerAnimated:YES];
  103 + }
100 }]; 104 }];
101 105
102 } else { 106 } else {
@@ -141,6 +145,7 @@ @@ -141,6 +145,7 @@
141 } 145 }
142 146
143 147
  148 +
144 #pragma mark - touchesBegan 149 #pragma mark - touchesBegan
145 - (void)touchesBegan:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event 150 - (void)touchesBegan:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event
146 { 151 {