iOS Team / LiveVideoCloud · Commits

Commit 8efeddd60fc990b312d2ae582e3d2353e5d2e451

Authored by 朱林
2 parents 854490b6 c6a46445

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

Inline Side-by-side
Showing 36 changed files with 249 additions and 57 deletions
LiveVideoCloud.xcodeproj/project.pbxproj
  View file @8efeddd
... ... @@ -876,14 +876,14 @@
876 876 4B45CE431EB86A590079AFB7 /* Controllers */ = {
877 877 isa = PBXGroup;
878 878 children = (
  879 + 4B45CE481EB86A590079AFB7 /* LVCMineViewController.h */,
  880 + 4B45CE491EB86A590079AFB7 /* LVCMineViewController.m */,
879 881 D2393CFF1F020D5700D3EE17 /* FeedbackViewController.h */,
880 882 D2393D001F020D5700D3EE17 /* FeedbackViewController.m */,
881 883 4B45CE441EB86A590079AFB7 /* BeingAnchorController.h */,
882 884 4B45CE451EB86A590079AFB7 /* BeingAnchorController.m */,
883 885 4B45CE461EB86A590079AFB7 /* IDViewController.h */,
884 886 4B45CE471EB86A590079AFB7 /* IDViewController.m */,
885   - 4B45CE481EB86A590079AFB7 /* LVCMineViewController.h */,
886   - 4B45CE491EB86A590079AFB7 /* LVCMineViewController.m */,
887 887 4B45CE4A1EB86A590079AFB7 /* MineAboutUsController.h */,
888 888 4B45CE4B1EB86A590079AFB7 /* MineAboutUsController.m */,
889 889 4B45CE4C1EB86A590079AFB7 /* MineLiveController.h */,
... ...
LiveVideoCloud/AppCustoms/Main/View/LVCTabBar.m
  View file @8efeddd
... ... @@ -32,7 +32,7 @@
32 32 if (!_liveBtn) {
33 33  
34 34 _liveBtn = [UIButton buttonWithType:UIButtonTypeCustom];
35   - [_liveBtn setImage:[UIImage imageNamed:@"Begin to live"] forState:UIControlStateNormal];
  35 + [_liveBtn setImage:[UIImage imageNamed:@"ic_camera_sel"] forState:UIControlStateNormal];
36 36 [_liveBtn addTarget:self action:@selector(liveBtnClick) forControlEvents:UIControlEventTouchUpInside];
37 37 [self addSubview:_liveBtn];
38 38 }
... ...
LiveVideoCloud/AppCustoms/Main/ZXTabBarController.m
  View file @8efeddd
... ... @@ -51,10 +51,10 @@
51 51  
52 52 - (void)createUI
53 53 {
54   - [self setupOneChildViewController:[[ZXNavigationController alloc]initWithRootViewController:[[LVCVodPlayerListController alloc]init]] title:@"" image:@"home page" selectedImage:@"home page-click on"];
55   - [self setupOneChildViewController:[[ZXNavigationController alloc]initWithRootViewController:[[LVCTelevisioController alloc]init]] title:@"" image:@"live_default" selectedImage:@"live_focused"];
56   - [self setupOneChildViewController:[[ZXNavigationController alloc]initWithRootViewController:[[LVCUGCLiveListController alloc]init]] title:@"" image:@"news_default" selectedImage:@"news_focused"];
57   - [self setupOneChildViewController:[[ZXNavigationController alloc]initWithRootViewController:[[LVCMineViewController alloc]init]] title:@"" image:@"my" selectedImage:@"my-click on"];
  54 + [self setupOneChildViewController:[[ZXNavigationController alloc]initWithRootViewController:[[LVCVodPlayerListController alloc]init]] title:@"" image:@"ic_home" selectedImage:@"ic_home_sel"];
  55 + [self setupOneChildViewController:[[ZXNavigationController alloc]initWithRootViewController:[[UIViewController alloc]init]] title:@"" image:@"ic_live_tv" selectedImage:@"ic_live_tv_sel"];
  56 + [self setupOneChildViewController:[[ZXNavigationController alloc]initWithRootViewController:[[LVCUGCLiveListController alloc]init]] title:@"" image:@"ic_videocam" selectedImage:@"ic_videocam_sel"];
  57 + [self setupOneChildViewController:[[ZXNavigationController alloc]initWithRootViewController:[[LVCMineViewController alloc]init]] title:@"" image:@"ic_person" selectedImage:@"ic_person_sel"];
58 58 }
59 59  
60 60 - (void)setupOneChildViewController:(UIViewController *)vc title:(NSString *)title image:(NSString *)image selectedImage:(NSString *)selectedImage
... ...
LiveVideoCloud/Classes/Sections/UGCSections/Controller/LVCUGCLivePlayerController.m
  View file @8efeddd
... ... @@ -13,6 +13,7 @@
13 13 #import "UIImage+LVCVagueImage.h"
14 14 #import "LiveBaseView.h"
15 15 #import "MineLiveController.h"
  16 +#import "LVCUGCLiveListController.h"
16 17  
17 18 @interface LVCUGCLivePlayerController () {
18 19  
... ... @@ -118,10 +119,10 @@
118 119 MineLiveController *revise =(MineLiveController *)controller;
119 120 [self.navigationController popToViewController:revise animated:YES];
120 121 }
121   -// else if ([controller isKindOfClass:[HomeViewController class]]) {
122   -// HomeViewController *revise =(HomeViewController *)controller;
123   -// [self.navigationController popToViewController:revise animated:YES];
124   -// }
  122 + else if ([controller isKindOfClass:[LVCUGCLiveListController class]]) {
  123 + LVCUGCLiveListController *revise =(LVCUGCLiveListController *)controller;
  124 + [self.navigationController popToViewController:revise animated:YES];
  125 + }
125 126 }
126 127 }
127 128  
... ...
LiveVideoCloud/animation.xcassets/AppIcon.appiconset/Contents.json
  View file @8efeddd
1 1 {
2 2 "images" : [
3 3 {
4   - "idiom" : "iphone",
5 4 "size" : "20x20",
  5 + "idiom" : "iphone",
  6 + "filename" : "ic_launcher40.png",
6 7 "scale" : "2x"
7 8 },
8 9 {
9   - "idiom" : "iphone",
10 10 "size" : "20x20",
  11 + "idiom" : "iphone",
  12 + "filename" : "ic_launcher60.png",
11 13 "scale" : "3x"
12 14 },
13 15 {
14   - "idiom" : "iphone",
15 16 "size" : "29x29",
16   - "scale" : "2x"
17   - },
18   - {
19 17 "idiom" : "iphone",
20   - "size" : "29x29",
21   - "scale" : "3x"
  18 + "filename" : "ic_launcher29.png",
  19 + "scale" : "1x"
22 20 },
23 21 {
  22 + "size" : "29x29",
24 23 "idiom" : "iphone",
25   - "size" : "40x40",
  24 + "filename" : "ic_launcher58.png",
26 25 "scale" : "2x"
27 26 },
28 27 {
  28 + "size" : "29x29",
29 29 "idiom" : "iphone",
30   - "size" : "40x40",
  30 + "filename" : "ic_launcher87.png",
31 31 "scale" : "3x"
32 32 },
33 33 {
  34 + "size" : "40x40",
34 35 "idiom" : "iphone",
35   - "size" : "60x60",
  36 + "filename" : "ic_launcher80.png",
36 37 "scale" : "2x"
37 38 },
38 39 {
  40 + "size" : "40x40",
39 41 "idiom" : "iphone",
40   - "size" : "60x60",
  42 + "filename" : "ic_launcher120-1.png",
41 43 "scale" : "3x"
42 44 },
43 45 {
44   - "idiom" : "ipad",
45   - "size" : "20x20",
46   - "scale" : "1x"
47   - },
48   - {
49   - "idiom" : "ipad",
50   - "size" : "20x20",
51   - "scale" : "2x"
52   - },
53   - {
54   - "idiom" : "ipad",
55   - "size" : "29x29",
56   - "scale" : "1x"
57   - },
58   - {
59   - "idiom" : "ipad",
60   - "size" : "29x29",
61   - "scale" : "2x"
62   - },
63   - {
64   - "idiom" : "ipad",
65   - "size" : "40x40",
  46 + "size" : "57x57",
  47 + "idiom" : "iphone",
  48 + "filename" : "ic_launcher57.png",
66 49 "scale" : "1x"
67 50 },
68 51 {
69   - "idiom" : "ipad",
70   - "size" : "40x40",
  52 + "size" : "57x57",
  53 + "idiom" : "iphone",
  54 + "filename" : "ic_launcher114.png",
71 55 "scale" : "2x"
72 56 },
73 57 {
74   - "idiom" : "ipad",
75   - "size" : "76x76",
76   - "scale" : "1x"
77   - },
78   - {
79   - "idiom" : "ipad",
80   - "size" : "76x76",
  58 + "size" : "60x60",
  59 + "idiom" : "iphone",
  60 + "filename" : "ic_launcher120.png",
81 61 "scale" : "2x"
82 62 },
83 63 {
84   - "idiom" : "ipad",
85   - "size" : "83.5x83.5",
86   - "scale" : "2x"
  64 + "size" : "60x60",
  65 + "idiom" : "iphone",
  66 + "filename" : "ic_launcher180.png",
  67 + "scale" : "3x"
87 68 }
88 69 ],
89 70 "info" : {
... ...
LiveVideoCloud/animation.xcassets/AppIcon.appiconset/ic_launcher114.png 0 → 100644
View file @8efeddd

4.69 KB
LiveVideoCloud/animation.xcassets/AppIcon.appiconset/ic_launcher120-1.png 0 → 100644
View file @8efeddd

5.17 KB
LiveVideoCloud/animation.xcassets/AppIcon.appiconset/ic_launcher120.png 0 → 100644
View file @8efeddd

5.17 KB
LiveVideoCloud/animation.xcassets/AppIcon.appiconset/ic_launcher180.png 0 → 100644
View file @8efeddd

9.3 KB
LiveVideoCloud/animation.xcassets/AppIcon.appiconset/ic_launcher29.png 0 → 100644
View file @8efeddd

1.38 KB
LiveVideoCloud/animation.xcassets/AppIcon.appiconset/ic_launcher40.png 0 → 100644
View file @8efeddd

1.79 KB
LiveVideoCloud/animation.xcassets/AppIcon.appiconset/ic_launcher57.png 0 → 100644
View file @8efeddd

2.62 KB
LiveVideoCloud/animation.xcassets/AppIcon.appiconset/ic_launcher58.png 0 → 100644
View file @8efeddd

2.75 KB
LiveVideoCloud/animation.xcassets/AppIcon.appiconset/ic_launcher60.png 0 → 100644
View file @8efeddd

2.6 KB
LiveVideoCloud/animation.xcassets/AppIcon.appiconset/ic_launcher80.png 0 → 100644
View file @8efeddd

3.42 KB
LiveVideoCloud/animation.xcassets/AppIcon.appiconset/ic_launcher87.png 0 → 100644
View file @8efeddd

3.6 KB
LiveVideoCloud/animation.xcassets/tabBar/ic_camera.imageset/Contents.json 0 → 100644
  View file @8efeddd
  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" : "ic_camera.png",
  14 + "scale" : "3x"
  15 + }
  16 + ],
  17 + "info" : {
  18 + "version" : 1,
  19 + "author" : "xcode"
  20 + }
  21 +}
0 22 \ No newline at end of file
... ...
LiveVideoCloud/animation.xcassets/tabBar/ic_camera.imageset/ic_camera.png 0 → 100644
View file @8efeddd

3.39 KB
LiveVideoCloud/animation.xcassets/tabBar/ic_camera_sel.imageset/Contents.json 0 → 100644
  View file @8efeddd
  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" : "ic_camera_sel.png",
  14 + "scale" : "3x"
  15 + }
  16 + ],
  17 + "info" : {
  18 + "version" : 1,
  19 + "author" : "xcode"
  20 + }
  21 +}
0 22 \ No newline at end of file
... ...
LiveVideoCloud/animation.xcassets/tabBar/ic_camera_sel.imageset/ic_camera_sel.png 0 → 100644
View file @8efeddd

4.77 KB
LiveVideoCloud/animation.xcassets/tabBar/ic_home.imageset/Contents.json 0 → 100644
  View file @8efeddd
  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" : "ic_home.png",
  14 + "scale" : "3x"
  15 + }
  16 + ],
  17 + "info" : {
  18 + "version" : 1,
  19 + "author" : "xcode"
  20 + }
  21 +}
0 22 \ No newline at end of file
... ...
LiveVideoCloud/animation.xcassets/tabBar/ic_home.imageset/ic_home.png 0 → 100644
View file @8efeddd

1.24 KB
LiveVideoCloud/animation.xcassets/tabBar/ic_home_sel.imageset/Contents.json 0 → 100644
  View file @8efeddd
  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" : "ic_home_sel.png",
  14 + "scale" : "3x"
  15 + }
  16 + ],
  17 + "info" : {
  18 + "version" : 1,
  19 + "author" : "xcode"
  20 + }
  21 +}
0 22 \ No newline at end of file
... ...
LiveVideoCloud/animation.xcassets/tabBar/ic_home_sel.imageset/ic_home_sel.png 0 → 100644
View file @8efeddd

1.56 KB
LiveVideoCloud/animation.xcassets/tabBar/ic_live_tv.imageset/Contents.json 0 → 100644
  View file @8efeddd
  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" : "ic_live_tv.png",
  14 + "scale" : "3x"
  15 + }
  16 + ],
  17 + "info" : {
  18 + "version" : 1,
  19 + "author" : "xcode"
  20 + }
  21 +}
0 22 \ No newline at end of file
... ...
LiveVideoCloud/animation.xcassets/tabBar/ic_live_tv.imageset/ic_live_tv.png 0 → 100644
View file @8efeddd

1.56 KB
LiveVideoCloud/animation.xcassets/tabBar/ic_live_tv_sel.imageset/Contents.json 0 → 100644
  View file @8efeddd
  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" : "ic_live_tv_sel.png",
  14 + "scale" : "3x"
  15 + }
  16 + ],
  17 + "info" : {
  18 + "version" : 1,
  19 + "author" : "xcode"
  20 + }
  21 +}
0 22 \ No newline at end of file
... ...
LiveVideoCloud/animation.xcassets/tabBar/ic_live_tv_sel.imageset/ic_live_tv_sel.png 0 → 100644
View file @8efeddd

2.07 KB
LiveVideoCloud/animation.xcassets/tabBar/ic_person.imageset/Contents.json 0 → 100644
  View file @8efeddd
  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" : "ic_person.png",
  14 + "scale" : "3x"
  15 + }
  16 + ],
  17 + "info" : {
  18 + "version" : 1,
  19 + "author" : "xcode"
  20 + }
  21 +}
0 22 \ No newline at end of file
... ...
LiveVideoCloud/animation.xcassets/tabBar/ic_person.imageset/ic_person.png 0 → 100644
View file @8efeddd

1.39 KB
LiveVideoCloud/animation.xcassets/tabBar/ic_person_sel.imageset/Contents.json 0 → 100644
  View file @8efeddd
  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" : "ic_person_sel.png",
  14 + "scale" : "3x"
  15 + }
  16 + ],
  17 + "info" : {
  18 + "version" : 1,
  19 + "author" : "xcode"
  20 + }
  21 +}
0 22 \ No newline at end of file
... ...
LiveVideoCloud/animation.xcassets/tabBar/ic_person_sel.imageset/ic_person_sel.png 0 → 100644
View file @8efeddd

1.79 KB
LiveVideoCloud/animation.xcassets/tabBar/ic_videocam.imageset/Contents.json 0 → 100644
  View file @8efeddd
  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" : "ic_videocam.png",
  14 + "scale" : "3x"
  15 + }
  16 + ],
  17 + "info" : {
  18 + "version" : 1,
  19 + "author" : "xcode"
  20 + }
  21 +}
0 22 \ No newline at end of file
... ...
LiveVideoCloud/animation.xcassets/tabBar/ic_videocam.imageset/ic_videocam.png 0 → 100644
View file @8efeddd

1.04 KB
LiveVideoCloud/animation.xcassets/tabBar/ic_videocam_sel.imageset/Contents.json 0 → 100644
  View file @8efeddd
  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" : "ic_videocam_sel.png",
  14 + "scale" : "3x"
  15 + }
  16 + ],
  17 + "info" : {
  18 + "version" : 1,
  19 + "author" : "xcode"
  20 + }
  21 +}
0 22 \ No newline at end of file
... ...
LiveVideoCloud/animation.xcassets/tabBar/ic_videocam_sel.imageset/ic_videocam_sel.png 0 → 100644
View file @8efeddd

1.29 KB