no message

zhangxiaowen
1 parent c2cfe8c4
Showing 7 changed files with 251 additions and 49 deletions
CNLiveMineModule/Assets/CNLiveMineModule.xcassets/mine_back_black_b.imageset/Contents.json
CNLiveMineModule/Assets/CNLiveMineModule.xcassets/mine_back_black_b.imageset/mine_back_black_b@2x.png
CNLiveMineModule/Assets/CNLiveMineModule.xcassets/mine_back_black_b.imageset/mine_back_black_b@3x.png
CNLiveMineModule/Classes/UserInfo/CNLiveInfoUpdateController.m
CNLiveMineModule/Classes/UserInfo/CNLiveUserInfoController.m
CNLiveMineModule/Classes/UserInfo/CNLiveUserInfoNavigationBar.h
CNLiveMineModule/Classes/UserInfo/CNLiveUserInfoNavigationBar.m
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "mine_back_black_b@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "mine_back_black_b@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
@@ -11,10 +11,11 @@
 #import "CNLiveUserInfoModel.h"
 #import "CNLiveUserInfoNotification.h"
+#import "CNLiveUserInfoNavigationBar.h"
-@interface CNLiveInfoUpdateController ()<UITextFieldDelegate,UITextViewDelegate>
+@interface CNLiveInfoUpdateController ()<UITextFieldDelegate,UITextViewDelegate,CNLiveUserInfoNavigationBarDelegate>
+@property (nonatomic, strong) CNLiveUserInfoNavigationBar *navigationBar;
 @property (nonatomic, strong) CNLiveUserInfoModel *model;
-@property (nonatomic, weak) UIButton *rightBtn;
 @property (nonatomic, weak) UITextField *textField;
 @property (nonatomic, weak) UITextView *textView;
@@ -39,6 +40,10 @@ static const NSInteger margin = 15;
 }
 #pragma mark - 生命周期
+- (void)viewWillAppear:(BOOL)animated{
+    [super viewWillAppear:animated];
+    self.navigationController.navigationBarHidden = YES;
+}
 - (void)viewDidLoad {
     [super viewDidLoad];
@@ -48,11 +53,11 @@ static const NSInteger margin = 15;
     else {
         self.automaticallyAdjustsScrollViewInsets = NO;
     }
-    [self createNavigationbar];
+    [self.view addSubview:self.navigationBar];
     switch (self.model.dataType) {
         case CNLiveUserInfoDataTypeNickname:
         {
-            self.title = @"设置昵称";
+            self.navigationBar.title.text = @"设置昵称";
             [self textField_layoutSubViews];
             self.textField.placeholder = @"请输入昵称";
@@ -60,7 +65,7 @@ static const NSInteger margin = 15;
             break;
         case CNLiveUserInfoDataTypeAddress:
         {
-            self.title = @"设置地区";
+            self.navigationBar.title.text = @"设置地区";
             [self textField_layoutSubViews];
             self.textField.placeholder = @"请输入你所在的地区";
@@ -68,7 +73,7 @@ static const NSInteger margin = 15;
             break;
         case CNLiveUserInfoDataTypeIntroduction:
         {
-            self.title = @"设置个性签名";
+            self.navigationBar.title.text = @"设置个性签名";
             [self textView_layoutSubViews];
         }
             break;
@@ -86,22 +91,7 @@ static const NSInteger margin = 15;
 }
-- (void)createNavigationbar{
-    UIButton *rightBtn = [UIButton buttonWithType:UIButtonTypeCustom];
-    rightBtn.frame = CGRectMake(0, 0, 50, 25);
-    rightBtn.backgroundColor = [UIColor lightGrayColor];
-    rightBtn.userInteractionEnabled = NO;
-    rightBtn.titleLabel.font = [UIFont boldSystemFontOfSize:14];
-    [rightBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
-    [rightBtn setTitle:@"完成" forState:UIControlStateNormal];
-    rightBtn.adjustsImageWhenHighlighted = NO;
-    [rightBtn addTarget:self action:@selector(rightDidClicked:) forControlEvents:UIControlEventTouchUpInside];
-    rightBtn.layer.masksToBounds = YES;
-    rightBtn.layer.cornerRadius = 5;
-    self.rightBtn = rightBtn;
-    UIBarButtonItem *rightItem = [[UIBarButtonItem alloc]initWithCustomView:rightBtn];
-    self.navigationItem.rightBarButtonItem = rightItem;
-}
+
 - (void)textField_layoutSubViews {
     UIView *bgView = [[UIView alloc] initWithFrame:CGRectMake(0, NavigationContentTop, SCREEN_WIDTH, 50)];
     bgView.backgroundColor = [UIColor whiteColor];
@@ -137,8 +127,8 @@ static const NSInteger margin = 15;
 #pragma mark - UITextFieldDelegate
 - (BOOL)textFieldShouldBeginEditing:(UITextField *)textField{
-    self.rightBtn.backgroundColor = [UIColor colorWithRed:35/255.0 green:212/255.0 blue:30/255.0 alpha:1.0];
-    self.rightBtn.userInteractionEnabled = YES;
+    self.navigationBar.right.backgroundColor = [UIColor colorWithRed:35/255.0 green:212/255.0 blue:30/255.0 alpha:1.0];
+    self.navigationBar.right.userInteractionEnabled = YES;
     return YES;
 }
 - (void)textFieldDidBeginEditing:(UITextField *)textField{
@@ -153,8 +143,8 @@ static const NSInteger margin = 15;
 }
 #pragma mark - UITextViewDelegate
 - (BOOL)textViewShouldBeginEditing:(UITextView *)textView{
-    self.rightBtn.backgroundColor = [UIColor colorWithRed:35/255.0 green:212/255.0 blue:30/255.0 alpha:1.0];
-    self.rightBtn.userInteractionEnabled = YES;
+    self.navigationBar.right.backgroundColor = [UIColor colorWithRed:35/255.0 green:212/255.0 blue:30/255.0 alpha:1.0];
+    self.navigationBar.right.userInteractionEnabled = YES;
     return YES;
 }
 - (BOOL)textViewShouldEndEditing:(UITextView *)textView{
@@ -179,7 +169,6 @@ static const NSInteger margin = 15;
 - (void)goBack {
     if (self.presentingViewController != nil) {
         [self dismissViewControllerAnimated:YES completion:nil];
-        
     }
     else {
         [self.navigationController popViewControllerAnimated:YES];
@@ -188,25 +177,6 @@ static const NSInteger margin = 15;
 - (void)touchesBegan:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event {
     [self.view endEditing:YES];
 }
-- (void)rightDidClicked:(UIButton *)btn{
-    switch (self.model.dataType) {
-        case CNLiveUserInfoDataTypeNickname://昵称
-        case CNLiveUserInfoDataTypeAddress://地区
-        {
-            [self requestUpdateUserInfo:self.textField.text];
-        }
-            break;
-        case CNLiveUserInfoDataTypeIntroduction://简介
-        {
-            [self requestUpdateUserInfo:self.textView.text];
-        }
-            break;
-            
-        default:
-            break;
-    }
-
-}
 #pragma mark - 私有方法
 - (void)requestUpdateUserInfo:(NSString *)info{
@@ -248,4 +218,46 @@ static const NSInteger margin = 15;
 }
+- (void)navigationBar:(CNLiveUserInfoNavigationBar *)navigationBar actionEvents:(NSString *)actionEvents{
+    if ([actionEvents isEqualToString:@"1"]) {
+        [self goBack];
+    }else if ([actionEvents isEqualToString:@"2"]){
+        switch (self.model.dataType) {
+            case CNLiveUserInfoDataTypeNickname://昵称
+            case CNLiveUserInfoDataTypeAddress://地区
+            {
+                [self requestUpdateUserInfo:self.textField.text];
+            }
+                break;
+            case CNLiveUserInfoDataTypeIntroduction://简介
+            {
+                [self requestUpdateUserInfo:self.textView.text];
+            }
+                break;
+                
+            default:
+                break;
+        }
+    }
+}
+#pragma mark - 懒加载
+- (CNLiveUserInfoNavigationBar *)navigationBar {
+    if (!_navigationBar) {
+        _navigationBar = [[CNLiveUserInfoNavigationBar alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, NavigationContentTop)];
+        _navigationBar.delegate = self;
+        _navigationBar.title.text = @"个人资料";
+        _navigationBar.right.frame = CGRectMake(SCREEN_WIDTH-44-15, StatusBarHeight+10, 44, 24);
+        [_navigationBar.right setContentHorizontalAlignment:UIControlContentHorizontalAlignmentCenter];
+        _navigationBar.right.backgroundColor = [UIColor lightGrayColor];
+        _navigationBar.right.userInteractionEnabled = NO;
+        _navigationBar.right.titleLabel.font = [UIFont boldSystemFontOfSize:14];
+        [_navigationBar.right setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
+        [_navigationBar.right setTitle:@"完成" forState:UIControlStateNormal];
+        _navigationBar.right.adjustsImageWhenHighlighted = NO;
+        _navigationBar.right.layer.masksToBounds = YES;
+        _navigationBar.right.layer.cornerRadius = 5;
+    }
+    return _navigationBar;
+}
+
 @end
@@ -15,10 +15,12 @@
 #import "CNLiveInfoUpdateController.h"
 #import "CNLiveUserInfoNotification.h"
 #import "CNLiveMyQrCodeController.h"
+#import "CNLiveUserInfoNavigationBar.h"
-@interface CNLiveUserInfoController ()<UITableViewDelegate, UITableViewDataSource, CNLiveInfoUpdateDelegate>{
+@interface CNLiveUserInfoController ()<UITableViewDelegate, UITableViewDataSource, CNLiveInfoUpdateDelegate, CNLiveUserInfoNavigationBarDelegate>{
     UIImage *_image;
 }
+@property (nonatomic, strong) CNLiveUserInfoNavigationBar *navigationBar;
 @property (nonatomic, strong) UITableView *tableView;
 @property (nonatomic, strong) NSMutableArray *data;
@@ -89,7 +91,7 @@
 #pragma mark - 生命周期
 - (void)viewWillAppear:(BOOL)animated{
     [super viewWillAppear:animated];
-    self.navigationController.navigationBarHidden = NO;
+    self.navigationController.navigationBarHidden = YES;
 }
 - (void)viewDidLoad {
@@ -112,7 +114,7 @@
 }
 - (void)createSubViews {
-    self.title = @"个人资料";
+    [self.view addSubview:self.navigationBar];
     [self.view addSubview:self.tableView];
 }
@@ -188,6 +190,11 @@
     [self updateDataType:dataType info:info];
 }
+- (void)navigationBar:(CNLiveUserInfoNavigationBar *)navigationBar actionEvents:(NSString *)actionEvents{
+    if ([actionEvents isEqualToString:@"1"]) {
+        [self goBack];
+    }
+}
 #pragma mark - 私有方法
 // 修改头像
 - (void)updateHeaderActionSheetView{
@@ -226,6 +233,16 @@
 }
 #pragma mark - 懒加载
+- (CNLiveUserInfoNavigationBar *)navigationBar {
+    if (!_navigationBar) {
+        _navigationBar = [[CNLiveUserInfoNavigationBar alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, NavigationContentTop)];
+        _navigationBar.delegate = self;
+        _navigationBar.title.text = @"个人资料";
+        _navigationBar.right = nil;
+    }
+    return _navigationBar;
+}
+
 - (NSMutableArray *)data {
     if (!_data) {
         _data = [NSMutableArray array];
+//
+//  CNLiveUserInfoNavigationBar.m
+//  CNLiveMineModule
+//
+//  Created by 153993236@qq.com on 11/12/2019.
+//  Copyright (c) 2019 153993236@qq.com. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+@class CNLiveUserInfoNavigationBar;
+
+@protocol CNLiveUserInfoNavigationBarDelegate <NSObject>
+- (void)navigationBar:(CNLiveUserInfoNavigationBar *)navigationBar actionEvents:(NSString *)actionEvents;
+
+@end
+
+@interface CNLiveUserInfoNavigationBar : UIView
+@property (nonatomic, weak) id<CNLiveUserInfoNavigationBarDelegate> delegate;
+@property (nonatomic, strong) UIView *navView;
+@property (nonatomic, strong) UIButton *left;
+@property (nonatomic, strong) UILabel *title;
+@property (nonatomic, strong, nullable) UIButton *right;
+
+
+@end
+
+NS_ASSUME_NONNULL_END
+//
+//  CNLiveUserInfoNavigationBar.m
+//  CNLiveQrCodeModule
+//
+//  Created by 153993236@qq.com on 11/12/2019.
+//  Copyright © 2019 153993236@qq.com. All rights reserved.
+//
+
+#import "CNLiveUserInfoNavigationBar.h"
+#import "QMUIKit.h"
+
+@interface CNLiveUserInfoNavigationBar ()
+
+@end
+
+@implementation CNLiveUserInfoNavigationBar
+static const NSInteger margin = 15;
+
+- (instancetype)initWithFrame:(CGRect)frame{
+    self = [super initWithFrame:frame];
+    if(self){
+        self.userInteractionEnabled = YES;
+        self.backgroundColor = [UIColor clearColor];
+        [self createSubViews];
+    }
+    return self;
+}
+
+- (void)dealloc {
+    NSLog(@"CNLiveUserInfoNavigationBar -- dealloc");
+}
+
+- (void)createSubViews {
+    [self addSubview:self.navView];
+    [self addSubview:self.left];
+    [self addSubview:self.title];
+    [self addSubview:self.right];
+}
+
+/*
+ // Only override drawRect: if you perform custom drawing.
+ // An empty implementation adversely affects performance during animation.
+ - (void)drawRect:(CGRect)rect {
+ // Drawing code
+ }
+ */
+
+#pragma mark - 懒加载
+- (UIView *)navView {
+    if (!_navView) {
+        _navView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, [UIScreen mainScreen].bounds.size.width, NavigationContentTop)];
+        _navView.backgroundColor = [UIColor clearColor];
+    }
+    return _navView;
+}
+
+- (UIButton *)left {
+    if (!_left) {
+        _left= [UIButton buttonWithType:UIButtonTypeCustom];
+        _left.adjustsImageWhenHighlighted = NO;
+        _left.frame = CGRectMake(margin, StatusBarHeight, NavigationBarHeight, NavigationBarHeight);
+        UIImage *image = [self xw_getImageName:@"mine_back_black_b" bundleName:@"CNLiveMineModule" targetClass:[CNLiveUserInfoNavigationBar class]];
+        [_left setImage:[image imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal] forState:UIControlStateNormal];
+        [_left setContentHorizontalAlignment:UIControlContentHorizontalAlignmentLeft];
+        [_left addTarget:self action:@selector(goBack) forControlEvents:UIControlEventTouchUpInside];
+    }
+    return _left;
+}
+
+- (UILabel *)title {
+    if (!_title) {
+        _title = [[UILabel alloc] initWithFrame:CGRectMake(margin+NavigationBarHeight, StatusBarHeight, SCREEN_WIDTH-2*(margin+NavigationBarHeight), NavigationBarHeight)];
+        [_title setFont:[UIFont systemFontOfSize:18]];
+        _title.textColor = [UIColor blackColor];
+        _title.textAlignment = NSTextAlignmentCenter;
+    }
+    return _title;
+}
+
+- (UIButton *)right {
+    if (!_right) {
+        _right = [UIButton buttonWithType:UIButtonTypeCustom];
+        _right.frame = CGRectMake(SCREEN_WIDTH-50-margin, StatusBarHeight, 50, NavigationBarHeight);
+        [_right setContentHorizontalAlignment:UIControlContentHorizontalAlignmentRight];
+        _right.adjustsImageWhenHighlighted = NO;
+        _right.titleLabel.font = [UIFont systemFontOfSize:15];
+        [_right setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
+        [_right addTarget:self action:@selector(rightDidClicked:) forControlEvents:UIControlEventTouchUpInside];
+    }
+    return _right;
+}
+
+#pragma mark - 响应方法
+- (void)goBack{
+    if (self.delegate && [self.delegate respondsToSelector:@selector(navigationBar:actionEvents:)]) {
+        [self.delegate navigationBar:self actionEvents:@"1"];
+    }
+}
+- (void)rightDidClicked:(UIButton *)btn{
+    if (self.delegate && [self.delegate respondsToSelector:@selector(navigationBar:actionEvents:)]) {
+        [self.delegate navigationBar:self actionEvents:@"2"];
+    }
+}
+
+/**
+ *  创建图片
+ *
+ *  @param imageName 图片名字
+ *  @param bundleName 图片所在的bundle名字
+ *  @param targetClass 类和bundle的同级目录
+ *  @return 返回UIImage
+ */
+- (UIImage *)xw_getImageName:(NSString *)imageName bundleName:(NSString *)bundleName targetClass:(Class)targetClass{
+    NSBundle *bundle = [NSBundle bundleForClass:targetClass];
+    NSURL *url = [bundle URLForResource:bundleName withExtension:@"bundle"];
+    NSBundle *targetBundle = [NSBundle bundleWithURL:url];
+    UIImage *image = [UIImage imageNamed:imageName inBundle:targetBundle compatibleWithTraitCollection:nil];
+    return image?image:[UIImage imageNamed:imageName inBundle:[NSBundle mainBundle] compatibleWithTraitCollection:nil];
+    
+}
+
+@end