Skip to content

Commit 3ad4e6f

Browse files
author
JmoVxia
committed
增加三级联动菜单
1 parent df9f7c3 commit 3ad4e6f

File tree

60 files changed

+23104
-249
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+23104
-249
lines changed

CLDemo-OC/CLDemo-OC/Class/Base/CLTabbarController/Controller/CLTabbarController.m

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#import "CLCustomTabbar.h"
1515
#import "Tools.h"
1616
#import "CLMyController.h"
17-
17+
#import "UIColor+CLHex.h"
1818
@interface CLTabbarController ()
1919
{
2020
NSTimeInterval _lastSameIndexTapTime;
@@ -41,6 +41,12 @@ - (void)initUI
4141
}];
4242
[self setValue:tabbar forKeyPath:@"tabBar"];
4343

44+
45+
self.view.backgroundColor = [UIColor whiteColor];
46+
[UITabBar appearance].unselectedItemTintColor = [UIColor colorWithHex:@"999999"];
47+
[UITabBar appearance].tintColor = [UIColor colorWithHex:@"24C065"];
48+
49+
4450
CLHomepageController *mc = [[CLHomepageController alloc] init];
4551
CLNavigationController *nc1 = [[CLNavigationController alloc] initWithRootViewController:mc];
4652
[Tools setControllerTabBarItem:nc1 Title:NSLocalizedString(@"主页", nil) andFoneSize:13 withFoneName:nil selectedImage:@"tabBar_friendTrends_click_icon" withTitleColor:[UIColor blackColor] unselectedImage:@"tabBar_friendTrends_icon" withTitleColor:[UIColor lightGrayColor]];

CLDemo-OC/CLDemo-OC/Class/Base/CLTabbarController/View/CLCustomTabbar.m

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ - (instancetype)initWithFrame:(CGRect)frame {
4141
self = [super initWithFrame:frame];
4242
if (self) {
4343
[self setTranslucent:NO];
44+
self.backgroundColor = [UIColor whiteColor];
4445
}
4546
return self;
4647
}

CLDemo-OC/CLDemo-OC/Class/CLCustomTransitionController/CLCustomPresentTransitionAnimated/CLCustomTransitionAnimatedTransitioning.m

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ - (void)presentAnimation:(id<UIViewControllerContextTransitioning>)transitionCon
9292

9393
//创建CAShapeLayer进行遮盖
9494
CAShapeLayer *maskLayer = [CAShapeLayer layer];
95-
maskLayer.path = endCycle.CGPath;
9695
//将maskLayer作为toView的遮盖
9796
toView.layer.mask = maskLayer;
9897
//创建路径动画

CLDemo-OC/CLDemo-OC/Class/CLCustomTransitionController/CLCustomTransitionAnimationController.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ - (instancetype)init {
2929

3030
- (void)viewDidLoad {
3131
[super viewDidLoad];
32-
self.view.backgroundColor = [UIColor greenColor];
32+
self.view.backgroundColor = [UIColor whiteColor];
3333
UIImageView *imageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"pic1.jpg"]];
3434
[self.view addSubview:imageView];
3535
imageView.frame = self.view.frame;

CLDemo-Swift/CLDemo-Swift.xcodeproj/project.pbxproj

Lines changed: 114 additions & 6 deletions
Large diffs are not rendered by default.
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
{
2+
"images" : [
3+
{
4+
"idiom" : "universal",
5+
"scale" : "1x"
6+
},
7+
{
8+
"filename" : "[email protected]",
9+
"idiom" : "universal",
10+
"scale" : "2x"
11+
},
12+
{
13+
"filename" : "[email protected]",
14+
"idiom" : "universal",
15+
"scale" : "3x"
16+
}
17+
],
18+
"info" : {
19+
"author" : "xcode",
20+
"version" : 1
21+
}
22+
}
442 Bytes
Loading
768 Bytes
Loading
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
{
2+
"images" : [
3+
{
4+
"idiom" : "universal",
5+
"scale" : "1x"
6+
},
7+
{
8+
"filename" : "[email protected]",
9+
"idiom" : "universal",
10+
"scale" : "2x"
11+
},
12+
{
13+
"filename" : "[email protected]",
14+
"idiom" : "universal",
15+
"scale" : "3x"
16+
}
17+
],
18+
"info" : {
19+
"author" : "xcode",
20+
"version" : 1
21+
}
22+
}
501 Bytes
Loading

0 commit comments

Comments
 (0)