no message

zhangxiaowen
1 parent 4d1ebc9c
Showing 15 changed files with 53 additions and 14 deletions
CNLiveCustomControl/Classes/NavigationBar/CNLiveNavigationBar.h
CNLiveCustomControl/Classes/NavigationBar/CNLiveNavigationBar.m
Example/CNLiveCustomControl/CNLIVEViewController.m
@@ -6,12 +6,12 @@
     },
     {
       "idiom" : "universal",
-      "filename" : "mine_back_black_b@2x.png",
+      "filename" : "cnlive_back_black_b@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "mine_back_black_b@3x.png",
+      "filename" : "cnlive_back_black_b@3x.png",
       "scale" : "3x"
     }
   ],
@@ -6,12 +6,12 @@
     },
     {
       "idiom" : "universal",
-      "filename" : "mine_back_white_b@2x.png",
+      "filename" : "cnlive_back_white_b@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "mine_back_white_b@3x.png",
+      "filename" : "cnlive_back_white_b@3x.png",
       "scale" : "3x"
     }
   ],
@@ -6,12 +6,12 @@
     },
     {
       "idiom" : "universal",
-      "filename" : "mine_code_more@2x.png",
+      "filename" : "cnlive_black_more@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "mine_code_more@3x.png",
+      "filename" : "cnlive_black_more@3x.png",
       "scale" : "3x"
     }
   ],
@@ -6,12 +6,12 @@
     },
     {
       "idiom" : "universal",
-      "filename" : "mine_info_set@2x.png",
+      "filename" : "cnlive_white_more@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "mine_info_set@3x.png",
+      "filename" : "cnlive_white_more@3x.png",
       "scale" : "3x"
     }
   ],
@@ -17,15 +17,23 @@ NS_ASSUME_NONNULL_BEGIN
  
 // 左边按钮
 @property (nonatomic, strong) UIButton *left;
+// 左边按钮图片
+@property (nonatomic, strong) UIImage *leftImage;
+// 左边按钮文字
+@property (nonatomic, copy) NSString *leftTitle;
  
 // 标题
 @property (nonatomic, strong) UILabel *title;
  
+// 右边按钮
+@property (nonatomic, strong) UIButton *right;
 // 右边按钮图片
 @property (nonatomic, strong) UIImage *rightImage;
 // 右边按钮文字
 @property (nonatomic, copy) NSString *rightTitle;
  
+// 线是否隐藏
+@property (nonatomic, assign) BOOL lineHidden;
  
 + (instancetype)navigationBar;
  
@@ -12,7 +12,7 @@
  
 @interface CNLiveNavigationBar ()
 @property (nonatomic, strong) UIView *navView;
-@property (nonatomic, strong) UIButton *right;
+@property (nonatomic, strong) UIView *line;
  
 @end
  
@@ -51,9 +51,28 @@ static const NSInteger margin = 15;
     [self addSubview:self.left];
     [self addSubview:self.title];
     [self addSubview:self.right];
+    [self addSubview:self.line];
+
 }
  
 #pragma mark - Setter方法
+- (void)setLeftTitle:(NSString *)leftTitle{
+    _leftTitle = leftTitle;
+    if(leftTitle&&![leftTitle isEqualToString:@""]){
+        _left.hidden = NO;
+        [_left setTitle:leftTitle forState:UIControlStateNormal];
+    }
+
+}
+
+- (void)setLeftImage:(UIImage *)leftImage{
+    _leftImage = leftImage;
+    if(leftImage){
+        _left.hidden = NO;
+        [_left setImage:leftImage forState:UIControlStateNormal];
+    }
+
+}
 - (void)setRightTitle:(NSString *)rightTitle{
     _rightTitle = rightTitle;
     if(rightTitle&&![rightTitle isEqualToString:@""]){
@@ -72,6 +91,11 @@ static const NSInteger margin = 15;
  
 }
  
+- (void)setLineHidden:(BOOL)lineHidden{
+    _lineHidden = lineHidden;
+    _line.hidden = lineHidden;
+}
+
 /*
  // Only override drawRect: if you perform custom drawing.
  // An empty implementation adversely affects performance during animation.
@@ -107,7 +131,7 @@ static const NSInteger margin = 15;
         _left= [UIButton buttonWithType:UIButtonTypeCustom];
         _left.adjustsImageWhenHighlighted = NO;
         _left.frame = CGRectMake(margin, StatusBarHeight, NavigationBarHeight, NavigationBarHeight);
-        UIImage *image = [self getImageWithImageName:@"mine_back_black_b" bundleName:@"CNLiveCustomControl" targetClass:[self class]];
+        UIImage *image = [self getImageWithImageName:@"cnlive_back_black_b" bundleName:@"CNLiveCustomControl" targetClass:[self class]];
         [_left setImage:[image imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal] forState:UIControlStateNormal];
         _left.titleLabel.font = [UIFont systemFontOfSize:15];
         [_left setContentHorizontalAlignment:UIControlContentHorizontalAlignmentLeft];
@@ -140,4 +164,12 @@ static const NSInteger margin = 15;
     return _right;
 }
  
+- (UIView *)line {
+    if (!_line) {
+        _line = [[UIView alloc] initWithFrame:CGRectMake(0, NavigationContentTop-0.5, SCREEN_WIDTH, 0.5)];
+        _line.backgroundColor = [UIColor colorWithRed:(CGFloat)(218.0/255.0) green:(CGFloat)(218.0/255.0) blue:(CGFloat)(218.0/255.0) alpha:1.0];
+    }
+    return _line;
+}
+
 @end
@@ -25,6 +25,8 @@
 {
     [super viewDidLoad];
 	// Do any additional setup after loading the view, typically from a nib.
+    self.view.backgroundColor = [UIColor redColor];
+
     [self.view addSubview:self.navigationBar];
  
 }
@@ -34,15 +36,12 @@
     [super didReceiveMemoryWarning];
     // Dispose of any resources that can be recreated.
 }
-- (void)navigationBar:(CNLiveNavigationBar *)navigationBar actionEvents:(NSString *)actionEvents{
-    NSLog(@"%@",actionEvents);
-    
-}
  
 - (CNLiveNavigationBar *)navigationBar {
     if (!_navigationBar) {
         _navigationBar = [CNLiveNavigationBar navigationBar];
         _navigationBar.title.text = @"首页";
+        _navigationBar.backgroundColor = [UIColor clearColor];
 //        _navigationBar.rightTitle = @"相册";
         _navigationBar.onClickLeftButton = ^{
             NSLog(@"左");