no message

zhangxiaowen
1 parent 22da11d4
Showing 23 changed files with 1041 additions and 24 deletions
CNLiveMineModule.podspec
CNLiveMineModule/Assets/CNLiveMineModule.xcassets/mine_front.imageset/Contents.json → CNLiveMineModule/Assets/CNLiveMineModule.xcassets/mine_all_front.imageset/Contents.json
CNLiveMineModule/Assets/CNLiveMineModule.xcassets/mine_front.imageset/mine_front@2x.png → CNLiveMineModule/Assets/CNLiveMineModule.xcassets/mine_all_front.imageset/mine_all_front@2x.png
CNLiveMineModule/Assets/CNLiveMineModule.xcassets/mine_front.imageset/mine_front@3x.png → CNLiveMineModule/Assets/CNLiveMineModule.xcassets/mine_all_front.imageset/mine_all_front@3x.png
CNLiveMineModule/Assets/CNLiveMineModule.xcassets/mine_info_front.imageset/Contents.json
CNLiveMineModule/Assets/CNLiveMineModule.xcassets/mine_info_front.imageset/mine_info_front@2x.png
CNLiveMineModule/Assets/CNLiveMineModule.xcassets/mine_info_front.imageset/mine_info_front@3x.png
CNLiveMineModule/Assets/CNLiveMineModule.xcassets/mine_info_qrcode.imageset/Contents.json
CNLiveMineModule/Assets/CNLiveMineModule.xcassets/mine_info_qrcode.imageset/mine_info_qrcode@2x.png
CNLiveMineModule/Assets/CNLiveMineModule.xcassets/mine_info_qrcode.imageset/mine_info_qrcode@3x.png
CNLiveMineModule/Classes/Controller/CNLiveMineController.m
CNLiveMineModule/Classes/UserInfo/CNLiveInfoUpdateController.h
CNLiveMineModule/Classes/UserInfo/CNLiveInfoUpdateController.m
CNLiveMineModule/Classes/UserInfo/CNLiveUserInfoCell.h
CNLiveMineModule/Classes/UserInfo/CNLiveUserInfoCell.m
CNLiveMineModule/Classes/UserInfo/CNLiveUserInfoController.h
CNLiveMineModule/Classes/UserInfo/CNLiveUserInfoController.m
CNLiveMineModule/Classes/UserInfo/CNLiveUserInfoModel.h
CNLiveMineModule/Classes/UserInfo/CNLiveUserInfoModel.m
CNLiveMineModule/Classes/UserInfo/CNLiveUserInfoNotification.h
@@ -41,6 +41,7 @@ TODO: 网家家-我的模块.
   # Controller
   s.subspec 'Controller' do |ss|
       ss.source_files = 'CNLiveMineModule/Classes/Controller/*.{h,m}'
+      ss.dependency 'CNLiveMineModule/UserInfo'
   end
   # View
@@ -53,6 +54,11 @@ TODO: 网家家-我的模块.
       ss.source_files = 'CNLiveMineModule/Classes/Model/*.{h,m}'
   end
+  # 用户信息/个人资料
+  s.subspec 'UserInfo' do |ss|
+      ss.source_files = 'CNLiveMineModule/Classes/UserInfo/*.{h,m}'
+  end
+  
   s.resource_bundles = {
     'CNLiveMineModule' => ['CNLiveMineModule/Assets/CNLiveMineModule.xcassets']
   }
@@ -6,12 +6,12 @@
     },
     {
       "idiom" : "universal",
-      "filename" : "mine_front@2x.png",
+      "filename" : "mine_all_front@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "mine_front@3x.png",
+      "filename" : "mine_all_front@3x.png",
       "scale" : "3x"
     }
   ],
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "mine_info_front@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "mine_info_front@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "mine_info_qrcode@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "mine_info_qrcode@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
@@ -15,6 +15,7 @@
 #import "CNLiveMineHeaderView.h"
 #import "CNLiveMineCell.h"
 #import "CNLiveMineModel.h"
+#import "CNLiveUserInfoController.h"
 @interface CNLiveMineController()<UITableViewDelegate, UITableViewDataSource, CNLiveMineHeaderViewDelegate, CNLiveMineCellDelegate>
 @property (nonatomic, strong) UITableView *tableView;
@@ -142,8 +143,8 @@ static const NSInteger kHEIGHT = 250;
     switch (type) {
         case CNLiveMineHeaderViewTypeUerInfo:
         {
-//            XWUserInfoController *vc = [[XWUserInfoController alloc]init];
-//            [self.navigationController pushViewController:vc animated:YES];
+            CNLiveUserInfoController *vc = [[CNLiveUserInfoController alloc]init];
+            [self.navigationController pushViewController:vc animated:YES];
         }
             break;
         case CNLiveMineHeaderViewTypeCode:
@@ -154,8 +155,7 @@ static const NSInteger kHEIGHT = 250;
             break;
         case CNLiveMineHeaderViewTypeWintess:
         {
-//            XWAddressController *vc = [[XWAddressController alloc]init];
-//            [self.navigationController pushViewController:vc animated:YES];
+
         }
             break;
+//
+//  CNLiveMineController.m
+//  CNLiveMineModule
+//
+//  Created by 153993236@qq.com on 11/12/2019.
+//  Copyright (c) 2019 153993236@qq.com. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+#import "CNLiveUserInfoModel.h"
+
+NS_ASSUME_NONNULL_BEGIN
+@class CNLiveInfoUpdateController;
+
+@protocol CNLiveInfoUpdateDelegate <NSObject>
+- (void)updateSuccess:(CNLiveUserInfoDataType)dataType info:(NSString *)info;
+
+@end
+@interface CNLiveInfoUpdateController : UIViewController
+@property (nonatomic, weak) id<CNLiveInfoUpdateDelegate> delegate;
+
+/**
+ *  @abstract 对象方法 初始化方法
+ *
+ *  @param model 模型
+ */
+- (instancetype)initWithModel:(CNLiveUserInfoModel *)model;
+
+@end
+
+NS_ASSUME_NONNULL_END
+//
+//  CNLiveMineController.m
+//  CNLiveMineModule
+//
+//  Created by 153993236@qq.com on 11/12/2019.
+//  Copyright (c) 2019 153993236@qq.com. All rights reserved.
+//
+
+#import "CNLiveInfoUpdateController.h"
+#import "QMUIKit.h"
+
+#import "CNLiveUserInfoModel.h"
+#import "CNLiveUserInfoNotification.h"
+
+@interface CNLiveInfoUpdateController ()<UITextFieldDelegate,UITextViewDelegate>
+@property (nonatomic, strong) CNLiveUserInfoModel *model;
+@property (nonatomic, weak) UIButton *rightBtn;
+@property (nonatomic, weak) UITextField *textField;
+@property (nonatomic, weak) UITextView *textView;
+
+@end
+
+@implementation CNLiveInfoUpdateController
+#pragma mark - 初始化方法
+- (instancetype)initWithModel:(CNLiveUserInfoModel *)model{
+    self = [super init];
+    if (self) {
+        self.model = model;
+    }
+    return self;
+}
+
+#pragma mark - 加载数据
+- (void)sendData {
+    
+    
+}
+
+#pragma mark - 生命周期
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    self.view.backgroundColor = [UIColor colorWithRed:244.0/255.0 green:244.0/255.0 blue:244.0/255.0 alpha:1.0];
+    if (@available(iOS 11, *)) {
+    }
+    else {
+        self.automaticallyAdjustsScrollViewInsets = NO;
+    }
+    [self createNavigationbar];
+    switch (self.model.dataType) {
+        case CNLiveUserInfoDataTypeNickname:
+        {
+            self.title = @"设置昵称";
+            [self textField_layoutSubViews];
+            self.textField.placeholder = @"请输入昵称";
+
+        }
+            break;
+        case CNLiveUserInfoDataTypeAddress:
+        {
+            self.title = @"设置地区";
+            [self textField_layoutSubViews];
+            self.textField.placeholder = @"请输入你所在的地区";
+
+        }
+            break;
+        case CNLiveUserInfoDataTypeIntroduction:
+        {
+            self.title = @"设置个性签名";
+            [self textView_layoutSubViews];
+        }
+            break;
+        default:
+        {
+            
+        }
+            break;
+       
+    }
+    
+}
+
+- (void)dealloc {
+    
+    
+}
+- (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:15];
+    [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, 0, SCREEN_WIDTH, 50)];
+    bgView.backgroundColor = [UIColor whiteColor];
+    [self.view addSubview:bgView];
+    
+    UITextField *textField = [[UITextField alloc] initWithFrame:CGRectMake(15, 0, SCREEN_WIDTH-30, 50)];
+    textField.delegate = self;
+    textField.backgroundColor = [UIColor whiteColor];// 设置背景颜色
+    textField.textColor = [UIColor blackColor];      // 设置文字的颜色
+    textField.clearsOnBeginEditing = YES;            // 当第二次输入的时候，清空上一次的内容
+    textField.font = [UIFont boldSystemFontOfSize:15.0f];
+    textField.clearButtonMode = UITextFieldViewModeWhileEditing; // 编辑的时候会显示出删除全部的小X
+    [self.view addSubview:textField];
+    self.textField = textField;
+    self.textField.text = self.model.content;
+
+}
+
+- (void)textView_layoutSubViews {
+    UIView *bgView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, 150)];
+    bgView.backgroundColor = [UIColor whiteColor];
+    [self.view addSubview:bgView];
+    
+    UITextView *textView = [[UITextView alloc] initWithFrame:CGRectMake(15, 0, SCREEN_WIDTH-30, 150)];
+    textView.delegate = self;
+    textView.backgroundColor = [UIColor whiteColor];// 设置背景颜色
+    textView.textColor = [UIColor blackColor];      // 设置文字的颜色
+    textView.font = [UIFont boldSystemFontOfSize:15.0f];
+    [self.view addSubview:textView];
+    self.textView = textView;
+    self.textView.text = self.model.content;
+}
+
+#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;
+    return YES;
+}
+- (void)textFieldDidBeginEditing:(UITextField *)textField{
+    
+}
+- (BOOL)textFieldShouldEndEditing:(UITextField *)textField{
+   
+    return YES;
+}
+- (void)textFieldDidEndEditing:(UITextField *)textField{
+    
+}
+#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;
+    return YES;
+}
+- (BOOL)textViewShouldEndEditing:(UITextView *)textView{
+    return YES;
+}
+
+- (void)textViewDidBeginEditing:(UITextView *)textView{
+    
+}
+- (void)textViewDidEndEditing:(UITextView *)textView{
+    
+}
+- (BOOL)textView:(UITextView *)textView shouldChangeTextInRange:(NSRange)range replacementText:(NSString *)text{
+    return YES;
+    
+}
+- (void)textViewDidChange:(UITextView *)textView{
+    
+}
+
+#pragma mark - 响应方法
+//回退goBack
+- (void)goBack {
+    if (self.presentingViewController != nil) {
+        [self dismissViewControllerAnimated:YES completion:nil];
+        
+    }
+    else {
+        [self.navigationController popViewControllerAnimated:YES];
+    }
+}
+- (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{
+    // 数据请求更新
+
+}
+
+- (void)updateDataType:(CNLiveUserInfoDataType)dataType info:(NSString *)info{
+    // 1.数据请求成功后更新cell展示信息
+    if (self.delegate && [self.delegate respondsToSelector:@selector(updateSuccess:info:)]) {
+        [self.delegate updateSuccess:dataType info:info];
+    }
+    
+    // 2.数据请求成功后通知用户信息更新
+    [CNLiveUserInfoNotification postUserInfoUpdateNotificationType:dataType info:info];
+
+    // 3.数据请求成功后修改用户模型
+//    switch (dataType) {
+//        case CNLiveUserInfoDataTypeNickname://昵称
+//        {
+//            [CNLiveUserManager updateUserInfo:CNLiveUserInfoTypeName info:info];
+//        }
+//            break;
+//        case CNLiveUserInfoDataTypeAddress://地区
+//        {
+//            [CNLiveUserManager updateUserInfo:CNLiveUserInfoTypeAddress info:info];
+//        }
+//            break;
+//        case CNLiveUserInfoDataTypeIntroduction://简介
+//        {
+//            [CNLiveUserManager updateUserInfo:CNLiveUserInfoTypeIntroduction info:info];
+//
+//        }
+//            break;
+//
+//        default:
+//            break;
+//    }
+
+}
+
+@end
+//
+//  CNLiveMineController.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 CNLiveUserInfoModel;
+static NSString * const kCNLiveUserInfoCell = @"CNLiveUserInfoCell";
+
+@interface CNLiveUserInfoCell : UITableViewCell
+
+@property (nonatomic, strong) CNLiveUserInfoModel *model;
+@property (nonatomic, strong) UIImage *image;
+
+@end
+
+NS_ASSUME_NONNULL_END
+//
+//  CNLiveMineController.m
+//  CNLiveMineModule
+//
+//  Created by 153993236@qq.com on 11/12/2019.
+//  Copyright (c) 2019 153993236@qq.com. All rights reserved.
+//
+
+#import "CNLiveUserInfoCell.h"
+#import <Masonry/Masonry.h>
+#import <SDWebImage/SDWebImage.h>
+#import "CNLiveUserInfoModel.h"
+
+@interface CNLiveUserInfoCell()
+@property (nonatomic, strong) UIView *line;
+@property (nonatomic, strong) UILabel *title;
+@property (nonatomic, strong) UILabel *content;
+@property (nonatomic, strong) UIImageView *front;
+@property (nonatomic, strong) UIImageView *pic;
+
+@end
+
+@implementation CNLiveUserInfoCell
+static const NSInteger margin = 12;
+
+- (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier {
+    self = [super initWithStyle:style reuseIdentifier:reuseIdentifier];
+    if (self) {
+        self.contentView.backgroundColor = [UIColor whiteColor];
+        
+        [self.contentView addSubview:self.line];
+        [self.contentView addSubview:self.title];
+        [self.contentView addSubview:self.content];
+        [self.contentView addSubview:self.front];
+        [self.contentView addSubview:self.pic];
+        
+    }
+    return self;
+}
+
+- (void)setImage:(UIImage *)image{
+    _image = image;
+    if(self.model.dataType == CNLiveUserInfoDataTypeHead){
+        _pic.image = image;
+    }
+}
+
+- (void)setModel:(CNLiveUserInfoModel *)model{
+    _model = model;
+    _title.text = model.title;
+    
+    _content.text = model.content;
+    
+    if(model.dataType == CNLiveUserInfoDataTypeHead){
+        _pic.backgroundColor = [UIColor whiteColor];
+        _pic.contentMode = UIViewContentModeScaleToFill;
+        _pic.layer.masksToBounds = YES;
+        _pic.layer.cornerRadius = 2;
+        UIImage *xw_image = [self xw_getImageName:model.content bundleName:@"CNLiveMineModule" targetClass:[CNLiveUserInfoCell class]];
+        [_pic sd_setImageWithURL:[NSURL URLWithString:@"头像"] placeholderImage:xw_image];
+
+    }else if (model.dataType == CNLiveUserInfoDataTypeNickname){
+        
+
+    }else if (model.dataType == CNLiveUserInfoDataTypeGender){
+        if([model.content isEqualToString:@"0"]){
+            _content.text = @"男";
+        }else if([model.content isEqualToString:@"1"]){
+            _content.text = @"女";
+        }else{
+            _content.text = @"未知";
+        }
+        
+    }else if (model.dataType == CNLiveUserInfoDataTypeCode){
+        _pic.contentMode = UIViewContentModeCenter;
+        _pic.layer.masksToBounds = NO;
+        _pic.layer.cornerRadius = 0.0;
+        UIImage *xw_image = [self xw_getImageName:@"mine_info_qrcode" bundleName:@"CNLiveMineModule" targetClass:[CNLiveUserInfoCell class]];
+        _pic.image = xw_image;
+        
+    }else if (model.dataType == CNLiveUserInfoDataTypeAddress){
+        
+    }else if (model.dataType == CNLiveUserInfoDataTypeIntroduction){
+        
+    }
+    
+    [self xw_layoutSubviews];
+}
+
+- (void)xw_layoutSubviews{
+    
+    CGFloat line_margin = self.model.lineHeight >= 5?0:margin;
+    
+    [_line mas_updateConstraints:^(MASConstraintMaker *make) {
+        make.left.equalTo(self.contentView.mas_left).with.offset(line_margin);
+        make.right.equalTo(self.contentView.mas_right).with.offset(-line_margin);
+        make.bottom.equalTo(self.contentView.mas_bottom).with.offset(0);
+        make.height.offset(self.model.lineHeight);
+        
+    }];
+    
+    [_title mas_updateConstraints:^(MASConstraintMaker *make) {
+        make.left.equalTo(self.contentView.mas_left).with.offset(margin);
+        make.top.equalTo(self.contentView.mas_top).with.offset(0);
+        make.height.offset(self.model.height-self.model.lineHeight);
+        
+    }];
+    
+    [_front mas_updateConstraints:^(MASConstraintMaker *make) {
+        make.right.equalTo(self.contentView.mas_right).with.offset(-margin);
+        make.top.equalTo(self.title.mas_top).with.offset(0);
+        make.width.with.offset(margin);
+        make.height.equalTo(self.title.mas_height);
+        
+    }];
+    
+    switch (self.model.layoutType) {
+        case CNLiveUserInfoLayoutTypeText:
+        {
+            _content.hidden = NO;
+            _pic.hidden = YES;
+            [_content mas_updateConstraints:^(MASConstraintMaker *make) {
+                make.top.equalTo(self.title.mas_top).with.offset(0);
+                make.left.equalTo(self.title.mas_right).with.offset(margin);
+                make.right.equalTo(self.front.mas_left).with.offset(-margin);
+                make.height.equalTo(self.title.mas_height);
+                
+            }];
+        }
+            break;
+        case CNLiveUserInfoLayoutTypeImage:
+        {
+            CGFloat height = self.model.height-self.model.lineHeight-2*margin;
+            _content.hidden = YES;
+            _pic.hidden = NO;
+            [_pic mas_updateConstraints:^(MASConstraintMaker *make) {
+                make.top.equalTo(self.contentView.mas_top).with.offset(margin);
+                make.right.equalTo(self.front.mas_left).with.offset(-margin);
+                make.width.height.offset(height);
+
+            }];
+            
+        }
+            break;
+            
+        default:
+        {
+            _content.hidden = YES;
+            _pic.hidden = YES;
+            
+        }
+            break;
+    }
+    
+}
+- (void)awakeFromNib {
+    [super awakeFromNib];
+    // Initialization code
+}
+
+- (void)setSelected:(BOOL)selected animated:(BOOL)animated {
+    [super setSelected:selected animated:animated];
+    
+    // Configure the view for the selected state
+}
+#pragma mark - 懒加载
+- (UIView *)line {
+    if (!_line) {
+        _line = [[UIView alloc] init];
+        _line.backgroundColor = [UIColor colorWithRed:235/255.0 green:235/255.0 blue:235/255.0 alpha:1.0];
+    }
+    return _line;
+}
+
+- (UILabel *)title {
+    if (!_title) {
+        _title = [[UILabel alloc] init];
+        _title.numberOfLines = 1;
+        _title.textColor = [UIColor colorWithRed:51/255.0 green:51/255.0 blue:51/255.0 alpha:1.0];
+        _title.font = [UIFont systemFontOfSize:16];
+    }
+    return _title;
+}
+
+- (UILabel *)content {
+    if (!_content) {
+        _content = [[UILabel alloc] init];
+        _content.numberOfLines = 1;
+        _content.lineBreakMode = NSLineBreakByTruncatingTail;
+        _content.textColor = [UIColor colorWithRed:102/255.0 green:102/255.0 blue:102/255.0 alpha:1.0];
+        _content.font = [UIFont systemFontOfSize:14];
+    }
+    return _content;
+}
+
+- (UIImageView *)front {
+    if (!_front) {
+        _front = [[UIImageView alloc] init];
+        UIImage *xw_image = [self xw_getImageName:@"mine_info_front" bundleName:@"CNLiveMineModule" targetClass:[CNLiveUserInfoCell class]];
+        _front.image = xw_image;
+        _front.contentMode = UIViewContentModeCenter;
+
+    }
+    return _front;
+}
+- (UIImageView *)pic {
+    if (!_pic) {
+        _pic = [[UIImageView alloc] init];
+    }
+    return _pic;
+}
+#pragma mark - 响应方法
+- (void)switchChanged:(UISwitch *)sw{
+    
+}
+
+/**
+ *  创建图片
+ *
+ *  @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
+//
+//  CNLiveMineController.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
+
+@interface CNLiveUserInfoController : UIViewController
+
+@end
+
+NS_ASSUME_NONNULL_END
+//
+//  CNLiveMineController.m
+//  CNLiveMineModule
+//
+//  Created by 153993236@qq.com on 11/12/2019.
+//  Copyright (c) 2019 153993236@qq.com. All rights reserved.
+//
+
+#import "CNLiveUserInfoController.h"
+#import "MJExtension.h"
+#import "QMUIKit.h"
+
+#import "CNLiveUserInfoCell.h"
+#import "CNLiveUserInfoModel.h"
+#import "CNLiveInfoUpdateController.h"
+#import "CNLiveUserInfoNotification.h"
+
+@interface CNLiveUserInfoController ()<UITableViewDelegate, UITableViewDataSource, CNLiveInfoUpdateDelegate>{
+    UIImage *_image;
+}
+@property (nonatomic, strong) UITableView *tableView;
+@property (nonatomic, strong) NSMutableArray *data;
+
+@end
+
+@implementation CNLiveUserInfoController
+#pragma mark - 加载数据
+- (void)loadData {
+    NSArray *data = @[
+                      @{
+                          @"layout":@"2",
+                          @"data":@"0",
+                          @"title":@"头像",
+                          @"content":@"default_avatar_f",
+                          @"height":@"81",
+                          @"lineHeight":@"0.5"
+                          },
+                      @{
+                          @"layout":@"1",
+                          @"data":@"1",
+                          @"title":@"昵称",
+                          @"content":@"User_Name",
+                          @"height":@"51",
+                          @"lineHeight":@"0.5"
+                          },
+                      @{
+                          @"layout":@"1",
+                          @"data":@"2",
+                          @"title":@"性别",
+                          @"content":@"User_Gender",
+                          @"height":@"60",
+                          @"lineHeight":@"10"
+                          },
+                      @{
+                          @"layout":@"2",
+                          @"data":@"3",
+                          @"title":@"二维码",
+                          @"content":@"二维码",
+                          @"height":@"51",
+                          @"lineHeight":@"0.5"
+                          },
+                      @{
+                          @"layout":@"1",
+                          @"data":@"4",
+                          @"title":@"地区",
+                          @"content":@"User_Address",
+                          @"height":@"60",
+                          @"lineHeight":@"10"
+                          },
+                      @{
+                          @"layout":@"1",
+                          @"data":@"5",
+                          @"title":@"个性签名",
+//                          @"content":User_Introduction?User_Introduction:@"这个人很懒!!!",
+                          @"content":@"这个人很懒!!!",
+                          @"height":@"51",
+                          @"lineHeight":@"0.5"
+                          }
+                      
+                      ];
+    for(NSDictionary *dic in data){
+        [self.data addObject:[CNLiveUserInfoModel mj_objectWithKeyValues:dic]];
+    }
+    [self.tableView reloadData];
+    
+}
+
+#pragma mark - 生命周期
+- (void)viewWillAppear:(BOOL)animated{
+    [super viewWillAppear:animated];
+    self.navigationController.navigationBarHidden = NO;
+}
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    self.view.backgroundColor = [UIColor whiteColor];
+    if (@available(iOS 11, *)) {
+        self.tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
+    }
+    else {
+        self.automaticallyAdjustsScrollViewInsets = NO;
+    }
+    [self createSubViews];
+    [self loadData];
+    
+}
+
+- (void)dealloc {
+    
+    
+}
+
+- (void)createSubViews {
+    self.title = @"个人资料";
+    [self.view addSubview:self.tableView];
+
+}
+
+#pragma mark - UITableViewDelegate
+- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath{
+    CNLiveUserInfoModel *model = self.data[indexPath.row];
+    return model.height;
+}
+
+#pragma mark - UITableViewDataSource
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+    return self.data.count;
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+    CNLiveUserInfoCell *cell = [tableView dequeueReusableCellWithIdentifier:kCNLiveUserInfoCell];
+    cell.selectionStyle = UITableViewCellSelectionStyleNone;
+    CNLiveUserInfoModel *model = self.data[indexPath.row];
+    cell.model = model;
+    if(_image){
+        cell.image = _image;
+    }
+    return cell;
+}
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{
+    CNLiveUserInfoModel *model = self.data[indexPath.row];
+    switch (model.dataType) {
+        case CNLiveUserInfoDataTypeHead:
+        {
+            [self updateHeaderActionSheetView];
+        }
+            break;
+        case CNLiveUserInfoDataTypeNickname:
+        {
+            CNLiveInfoUpdateController *vc = [[CNLiveInfoUpdateController alloc]initWithModel:model];
+            vc.delegate = self;
+            [self.navigationController pushViewController:vc animated:YES];
+        }
+            break;
+        case CNLiveUserInfoDataTypeGender:
+        {
+            [self updateGenderActionSheetView];
+        }
+            break;
+        case CNLiveUserInfoDataTypeCode:
+        {
+//            CNLiveMyQrCodeController *vc = [[CNLiveMyQrCodeController alloc]init];
+//            [self.navigationController pushViewController:vc animated:YES];
+        }
+            break;
+        case CNLiveUserInfoDataTypeAddress:
+        {
+            CNLiveInfoUpdateController *vc = [[CNLiveInfoUpdateController alloc]initWithModel:model];
+            vc.delegate = self;
+            [self.navigationController pushViewController:vc animated:YES];
+        }
+            break;
+        case CNLiveUserInfoDataTypeIntroduction:
+        {
+            CNLiveInfoUpdateController *vc = [[CNLiveInfoUpdateController alloc]initWithModel:model];
+            vc.delegate = self;
+            [self.navigationController pushViewController:vc animated:YES];
+        }
+            break;
+            
+        default:
+            break;
+    }
+}
+#pragma mark - CNLiveInfoUpdateDelegate
+- (void)updateSuccess:(CNLiveUserInfoDataType)dataType info:(NSString *)info{
+    [self updateDataType:dataType info:info];
+}
+
+#pragma mark - 私有方法
+// 修改头像
+- (void)updateHeaderActionSheetView{
+    __weak typeof(self) weakSelf = self;
+
+}
+
+// 更新头像
+- (void)requestUpdateUserHeader:(UIImage *)image{
+    // 数据请求更新
+    
+
+}
+
+// 修改性别
+- (void)updateGenderActionSheetView{
+    __weak typeof(self) weakSelf = self;
+    
+}
+
+// 更新性别
+- (void)requestUpdateUserGender:(NSString *)gender{
+    // 数据请求更新
+   
+    
+}
+// 更新cell展示信息
+- (void)updateDataType:(CNLiveUserInfoDataType)dataType info:(NSString *)info{
+    for(CNLiveUserInfoModel *model in self.data){
+        if(dataType == model.dataType){
+            model.content = info;
+            break;
+        }
+    }
+    [self.tableView reloadData];
+}
+
+#pragma mark - 懒加载
+- (NSMutableArray *)data {
+    if (!_data) {
+        _data = [NSMutableArray array];
+    }
+    return _data;
+}
+
+- (UITableView *)tableView{
+    if(!_tableView){
+        _tableView = [[UITableView alloc] initWithFrame:CGRectMake(0, NavigationContentTop, SCREEN_WIDTH, SCREEN_HEIGHT-NavigationContentTop) style:UITableViewStylePlain];
+        _tableView.delegate = self;
+        _tableView.dataSource = self;
+        _tableView.bounces = NO;
+        _tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
+        _tableView.backgroundColor = [UIColor whiteColor];
+        _tableView.estimatedRowHeight = 0;
+        _tableView.estimatedSectionHeaderHeight = 0;
+        _tableView.estimatedSectionFooterHeight = 0;
+        [_tableView registerClass:[CNLiveUserInfoCell class] forCellReuseIdentifier:kCNLiveUserInfoCell];
+    }
+    return _tableView;
+}
+
+#pragma mark - 响应方法
+- (void)goBack {
+    if (self.presentingViewController != nil) {
+        [self dismissViewControllerAnimated:YES completion:nil];
+    }
+    else {
+        [self.navigationController popViewControllerAnimated:YES];
+    }
+}
+
+@end
+//
+//  CNLiveMineController.m
+//  CNLiveMineModule
+//
+//  Created by 153993236@qq.com on 11/12/2019.
+//  Copyright (c) 2019 153993236@qq.com. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+typedef NS_ENUM(NSInteger, CNLiveUserInfoLayoutType) {
+    CNLiveUserInfoLayoutTypeDefault          = 0,
+    CNLiveUserInfoLayoutTypeText             = 1,
+    CNLiveUserInfoLayoutTypeImage            = 2
+};
+
+typedef NS_ENUM(NSInteger, CNLiveUserInfoDataType) {
+    CNLiveUserInfoDataTypeNickname          = 0,
+    CNLiveUserInfoDataTypeHead              = 1,
+    CNLiveUserInfoDataTypeGender            = 2,
+    CNLiveUserInfoDataTypeCode              = 3,
+    CNLiveUserInfoDataTypeAddress           = 4,
+    CNLiveUserInfoDataTypeIntroduction      = 5
+
+};
+
+
+@interface CNLiveUserInfoModel : NSObject
+@property (nonatomic, copy) NSString *title;
+@property (nonatomic, copy) NSString *content;
+@property (nonatomic, copy) NSString *layout;
+@property (nonatomic, copy) NSString *data;
+
+@property (nonatomic, assign) CNLiveUserInfoLayoutType layoutType;
+@property (nonatomic, assign) CNLiveUserInfoDataType dataType;
+
+@property (nonatomic, assign) CGFloat height;
+@property (nonatomic, assign) CGFloat lineHeight;
+
+@end
+
+NS_ASSUME_NONNULL_END
+//
+//  CNLiveMineController.m
+//  CNLiveMineModule
+//
+//  Created by 153993236@qq.com on 11/12/2019.
+//  Copyright (c) 2019 153993236@qq.com. All rights reserved.
+//
+
+#import "CNLiveUserInfoModel.h"
+
+@implementation CNLiveUserInfoModel
+- (CNLiveUserInfoLayoutType)layoutType{
+    if([self.layout isEqualToString:@"0"]){
+        return CNLiveUserInfoLayoutTypeDefault;
+    }
+    else if([self.layout isEqualToString:@"1"]){
+        return CNLiveUserInfoLayoutTypeText;
+        
+    }
+    else if([self.layout isEqualToString:@"2"]){
+        return CNLiveUserInfoLayoutTypeImage;
+        
+    }
+    return CNLiveUserInfoLayoutTypeDefault;
+}
+
+- (CNLiveUserInfoDataType)dataType{
+    if([self.data isEqualToString:@"0"]){
+        return CNLiveUserInfoDataTypeHead;
+    }
+    else if([self.data isEqualToString:@"1"]){
+        return CNLiveUserInfoDataTypeNickname;
+        
+    }
+    else if([self.data isEqualToString:@"2"]){
+        return CNLiveUserInfoDataTypeGender;
+
+    }
+    else if([self.data isEqualToString:@"3"]){
+        return CNLiveUserInfoDataTypeCode;
+
+    }
+    else if([self.data isEqualToString:@"4"]){
+        return CNLiveUserInfoDataTypeAddress;
+
+    }
+    else if([self.data isEqualToString:@"5"]){
+        return CNLiveUserInfoDataTypeIntroduction;
+
+    }
+    return CNLiveUserInfoDataTypeNickname;
+}
+
+@end
+//
+//  CNLiveUserInfoNotification.m
+//  CNLiveMineModule
+//
+//  Created by 153993236@qq.com on 11/12/2019.
+//  Copyright (c) 2019 153993236@qq.com. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "CNLiveUserInfoModel.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface CNLiveUserInfoNotification : NSObject
++ (void)postUserInfoUpdateNotificationType:(CNLiveUserInfoDataType)type info:(id)info;
+//NSDictionary *dic = @{@"type":@(type),@"info":info};
++ (void)addUserInfoUpdateObserver:(id)observer selector:(SEL)selector;
+
++ (void)removeObserver:(id)observer;
+
+@end
+
+NS_ASSUME_NONNULL_END
+//
+//  CNLiveUserInfoNotification.m
+//  CNLiveMineModule
+//
+//  Created by 153993236@qq.com on 11/12/2019.
+//  Copyright (c) 2019 153993236@qq.com. All rights reserved.
+//
+
+#import "CNLiveUserInfoNotification.h"
+
+@implementation CNLiveUserInfoNotification
+static NSString * const kCNLiveUserInfoUpdateNotification = @"CNLiveUserInfoUpdateNotification";
+
++ (void)postUserInfoUpdateNotificationType:(CNLiveUserInfoDataType)type info:(id)info{
+    NSDictionary *dic = @{@"type":@(type),@"info":info};
+    [[NSNotificationCenter defaultCenter] postNotificationName:kCNLiveUserInfoUpdateNotification object:nil userInfo:dic];
+    
+}
+
++ (void)addUserInfoUpdateObserver:(id)observer selector:(SEL)selector{
+    [[NSNotificationCenter defaultCenter] addObserver:observer selector:selector name:kCNLiveUserInfoUpdateNotification object:nil];
+    
+}
+
++ (void)removeObserver:(id)observer{
+    [[NSNotificationCenter defaultCenter] removeObserver:observer];
+
+}
+
+@end
@@ -291,10 +291,10 @@
     if(!_allButton){
         _allButton = [UIButton buttonWithType:UIButtonTypeCustom];
         [_allButton setTitle:@"查看全部" forState:UIControlStateNormal];
-        UIImage *xw_image = [self xw_getImageName:@"mine_front" bundleName:@"CNLiveMineModule" targetClass:[CNLiveMineCell class]];
+        UIImage *xw_image = [self xw_getImageName:@"mine_all_front" bundleName:@"CNLiveMineModule" targetClass:[CNLiveMineCell class]];
         [_allButton setImage:xw_image forState:UIControlStateNormal];
         [_allButton setImage:xw_image forState:UIControlStateHighlighted];
-        _allButton.titleLabel.font = [UIFont boldSystemFontOfSize:12];
+        _allButton.titleLabel.font = [UIFont systemFontOfSize:12];
         [_allButton setTitleColor:[UIColor colorWithRed:190.0/255.0 green:190.0/255.0 blue:190.0/255.0 alpha:1.0] forState:UIControlStateNormal];
         _allButton.adjustsImageWhenHighlighted = NO;
         [_allButton addTarget:self action:@selector(allBtnDidClicked:) forControlEvents:UIControlEventTouchUpInside];
@@ -219,14 +219,8 @@ static const NSInteger margin = 20;
         _header.layer.cornerRadius = 30;
         UIImage *xw_image = [self xw_getImageName:@"default_avatar_y" bundleName:@"CNLiveMineModule" targetClass:[CNLiveMineHeaderView class]];
         [_header sd_setImageWithURL:[NSURL URLWithString:@"头像"] placeholderImage:xw_image];
-        __weak typeof(self) weakSelf = self;
-//        [_header addGestureTapEventHandle:^(id  _Nonnull sender, UITapGestureRecognizer * _Nonnull gestureRecognizer) {
-//            __strong typeof(weakSelf) strongSelf = weakSelf;
-//            if(!strongSelf) return ;
-//            if (strongSelf.delegate && [strongSelf.delegate respondsToSelector:@selector(headerView:pushToController:)]) {
-//                [strongSelf.delegate headerView:strongSelf pushToController:CNLiveMineHeaderViewTypeUerInfo];
-//            }
-//        }];
+        UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(headerTapDidClicked:)];
+        [_header addGestureRecognizer:tap];
     }
     return _header;
 }
@@ -239,14 +233,8 @@ static const NSInteger margin = 20;
         _name.textColor = [UIColor whiteColor];
         _name.font = [UIFont systemFontOfSize:16];
         _name.attributedText = [self createAttributedImageName:@"mine_code" string:@"张晓文" isFront:NO];
-        __weak typeof(self) weakSelf = self;
-//        [_name addGestureTapEventHandle:^(id  _Nonnull sender, UITapGestureRecognizer * _Nonnull gestureRecognizer) {
-//            __strong typeof(weakSelf) strongSelf = weakSelf;
-//            if(!strongSelf) return ;
-//            if (strongSelf.delegate && [strongSelf.delegate respondsToSelector:@selector(headerView:pushToController:)]) {
-//                [strongSelf.delegate headerView:strongSelf pushToController:CNLiveMineHeaderViewTypeCode];
-//            }
-//        }];
+        UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(nameTapDidClicked:)];
+        [_name addGestureRecognizer:tap];
     }
     return _name;
@@ -292,6 +280,20 @@ static const NSInteger margin = 20;
 }
 #pragma mark - 响应方法
+- (void)headerTapDidClicked:(UITapGestureRecognizer *)tap{
+    if (self.delegate && [self.delegate respondsToSelector:@selector(headerView:pushToController:)]) {
+        [self.delegate headerView:self pushToController:CNLiveMineHeaderViewTypeUerInfo];
+             
+    }
+    
+}
+- (void)nameTapDidClicked:(UITapGestureRecognizer *)tap{
+    if (self.delegate && [self.delegate respondsToSelector:@selector(headerView:pushToController:)]) {
+        [self.delegate headerView:self pushToController:CNLiveMineHeaderViewTypeCode];
+             
+    }
+    
+}
 - (void)signDidClicked:(UIButton *)btn{
     if (self.delegate && [self.delegate respondsToSelector:@selector(headerView:pushToController:)]) {
         [self.delegate headerView:self pushToController:CNLiveMineHeaderViewTypeSign];