iOS Team / LiveVideoCloud · Commits

Commit 679d2964add9be4bcb2820c26df35b84b8706f41

Authored by 王军波
2 parents bf3232cb 363373d2

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

Inline Side-by-side
Showing 2 changed files with 4 additions and 4 deletions
LiveVideoCloud/AppCustoms/Main/View/LVCTabBar.m
  View file @679d296
... ... @@ -49,7 +49,7 @@
49 49 _liveBtn.height = 195 / 3;
50 50  
51 51 CGFloat buttonY = 19 - 3;//19 - 3.5;
52   - CGFloat buttonW = (self.width - 195 / 3)/ 2;
  52 + CGFloat buttonW = (self.width - 195 / 3)/ 4;
53 53 CGFloat buttonH = 30;
54 54  
55 55 NSInteger index = 0;
... ... @@ -57,7 +57,7 @@
57 57 if(subView.class != NSClassFromString(@"UITabBarButton"))continue;
58 58  
59 59 CGFloat buttonX = index * buttonW;
60   - if (index >= 1)
  60 + if (index >= 2)
61 61 {
62 62 buttonX += 195 / 3;
63 63 }
... ...
LiveVideoCloud/AppCustoms/Main/ZXTabBarController.m
  View file @679d296
... ... @@ -52,8 +52,8 @@
52 52 - (void)createUI
53 53 {
54 54 [self setupOneChildViewController:[[ZXNavigationController alloc]initWithRootViewController:[[HomeViewController alloc]init]] title:@"" image:@"home page" selectedImage:@"home page-click on"];
55   -// [self setupOneChildViewController:[[ZXNavigationController alloc]initWithRootViewController:[[HomeViewController alloc]init]] title:@"" image:@"live_default" selectedImage:@"live_focused"];
56   -// [self setupOneChildViewController:[[ZXNavigationController alloc]initWithRootViewController:[[UIViewController alloc]init]] title:@"" image:@"news_default" selectedImage:@"news_focused"];
  55 + [self setupOneChildViewController:[[ZXNavigationController alloc]initWithRootViewController:[[HomeViewController alloc]init]] title:@"" image:@"live_default" selectedImage:@"live_focused"];
  56 + [self setupOneChildViewController:[[ZXNavigationController alloc]initWithRootViewController:[[UIViewController alloc]init]] title:@"" image:@"news_default" selectedImage:@"news_focused"];
57 57 [self setupOneChildViewController:[[ZXNavigationController alloc]initWithRootViewController:[[LVCMineViewController alloc]init]] title:@"" image:@"my" selectedImage:@"my-click on"];
58 58 }
59 59  
... ...