iOS Team / LiveVideoCloud · Commits

Commit c4a0b971add2d783c994a971edbc82a76f58d4c3

Authored by 张旭
1 parent 03210814

修改tabbar

Inline Side-by-side
Showing 10 changed files with 94 additions and 3 deletions
LiveVideoCloud/AppCustoms/Main/View/LVCTabBar.m
  View file @c4a0b97
@@ -49,7 +49,7 @@ @@ -49,7 +49,7 @@
49 _liveBtn.height = 195 / 3; 49 _liveBtn.height = 195 / 3;
50 50
51 CGFloat buttonY = 19 - 3;//19 - 3.5; 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 CGFloat buttonH = 30; 53 CGFloat buttonH = 30;
54 54
55 NSInteger index = 0; 55 NSInteger index = 0;
@@ -57,7 +57,7 @@ @@ -57,7 +57,7 @@
57 if(subView.class != NSClassFromString(@"UITabBarButton"))continue; 57 if(subView.class != NSClassFromString(@"UITabBarButton"))continue;
58 58
59 CGFloat buttonX = index * buttonW; 59 CGFloat buttonX = index * buttonW;
60 - if (index >= 1) 60 + if (index >= 2)
61 { 61 {
62 buttonX += 195 / 3; 62 buttonX += 195 / 3;
63 } 63 }
LiveVideoCloud/AppCustoms/Main/ZXTabBarController.m
  View file @c4a0b97
@@ -52,7 +52,8 @@ @@ -52,7 +52,8 @@
52 - (void)createUI 52 - (void)createUI
53 { 53 {
54 [self setupOneChildViewController:[[ZXNavigationController alloc]initWithRootViewController:[[HomeViewController alloc]init]] title:@"" image:@"home page" selectedImage:@"home page-click on"]; 54 [self setupOneChildViewController:[[ZXNavigationController alloc]initWithRootViewController:[[HomeViewController alloc]init]] title:@"" image:@"home page" selectedImage:@"home page-click on"];
55 -// [self setupOneChildViewController:[[ZXNavigationController alloc]initWithRootViewController:[[LVCMyViewController alloc]init]] title:@"" image:@"my" selectedImage:@"my-click on"]; 55 + [self setupOneChildViewController:[[ZXNavigationController alloc]initWithRootViewController:[[UIViewController 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"];
56 [self setupOneChildViewController:[[ZXNavigationController alloc]initWithRootViewController:[[LVCMineViewController alloc]init]] title:@"" image:@"my" selectedImage:@"my-click on"]; 57 [self setupOneChildViewController:[[ZXNavigationController alloc]initWithRootViewController:[[LVCMineViewController alloc]init]] title:@"" image:@"my" selectedImage:@"my-click on"];
57 } 58 }
58 59
LiveVideoCloud/animation.xcassets/tabBar/live_default.imageset/Contents.json 0 → 100644
  View file @c4a0b97
  1 +{
  2 + "images" : [
  3 + {
  4 + "idiom" : "universal",
  5 + "scale" : "1x"
  6 + },
  7 + {
  8 + "idiom" : "universal",
  9 + "scale" : "2x"
  10 + },
  11 + {
  12 + "idiom" : "universal",
  13 + "filename" : "live_default.png",
  14 + "scale" : "3x"
  15 + }
  16 + ],
  17 + "info" : {
  18 + "version" : 1,
  19 + "author" : "xcode"
  20 + }
  21 +}
0 \ No newline at end of file 22 \ No newline at end of file
LiveVideoCloud/animation.xcassets/tabBar/live_default.imageset/live_default.png 0 → 100644
View file @c4a0b97

1.27 KB
LiveVideoCloud/animation.xcassets/tabBar/live_focused.imageset/Contents.json 0 → 100644
  View file @c4a0b97
  1 +{
  2 + "images" : [
  3 + {
  4 + "idiom" : "universal",
  5 + "scale" : "1x"
  6 + },
  7 + {
  8 + "idiom" : "universal",
  9 + "scale" : "2x"
  10 + },
  11 + {
  12 + "idiom" : "universal",
  13 + "filename" : "live_focused.png",
  14 + "scale" : "3x"
  15 + }
  16 + ],
  17 + "info" : {
  18 + "version" : 1,
  19 + "author" : "xcode"
  20 + },
  21 + "properties" : {
  22 + "template-rendering-intent" : "original"
  23 + }
  24 +}
0 \ No newline at end of file 25 \ No newline at end of file
LiveVideoCloud/animation.xcassets/tabBar/live_focused.imageset/live_focused.png 0 → 100644
View file @c4a0b97

2.38 KB
LiveVideoCloud/animation.xcassets/tabBar/news_default.imageset/Contents.json 0 → 100644
  View file @c4a0b97
  1 +{
  2 + "images" : [
  3 + {
  4 + "idiom" : "universal",
  5 + "scale" : "1x"
  6 + },
  7 + {
  8 + "idiom" : "universal",
  9 + "filename" : "news_default.png",
  10 + "scale" : "2x"
  11 + },
  12 + {
  13 + "idiom" : "universal",
  14 + "scale" : "3x"
  15 + }
  16 + ],
  17 + "info" : {
  18 + "version" : 1,
  19 + "author" : "xcode"
  20 + }
  21 +}
0 \ No newline at end of file 22 \ No newline at end of file
LiveVideoCloud/animation.xcassets/tabBar/news_default.imageset/news_default.png 0 → 100644
View file @c4a0b97

1.95 KB
LiveVideoCloud/animation.xcassets/tabBar/news_focused.imageset/Contents.json 0 → 100644
  View file @c4a0b97
  1 +{
  2 + "images" : [
  3 + {
  4 + "idiom" : "universal",
  5 + "scale" : "1x"
  6 + },
  7 + {
  8 + "idiom" : "universal",
  9 + "filename" : "news_focused.png",
  10 + "scale" : "2x"
  11 + },
  12 + {
  13 + "idiom" : "universal",
  14 + "scale" : "3x"
  15 + }
  16 + ],
  17 + "info" : {
  18 + "version" : 1,
  19 + "author" : "xcode"
  20 + },
  21 + "properties" : {
  22 + "template-rendering-intent" : "original"
  23 + }
  24 +}
0 \ No newline at end of file 25 \ No newline at end of file
LiveVideoCloud/animation.xcassets/tabBar/news_focused.imageset/news_focused.png 0 → 100644
View file @c4a0b97

1.97 KB