no message

zhangxiaowen
1 parent 5c37b3b8
Showing 14 changed files with 329 additions and 136 deletions
CNLiveMineModule.podspec
CNLiveMineModule/Assets/CNLiveMineModule.xcassets/mine_update_select.imageset/Contents.json
CNLiveMineModule/Assets/CNLiveMineModule.xcassets/mine_update_select.imageset/mine_update_select@2x.png
CNLiveMineModule/Assets/CNLiveMineModule.xcassets/mine_update_select.imageset/mine_update_select@3x.png
CNLiveMineModule/Classes/UserInfo/CNLiveInfoUpdateCell.h
CNLiveMineModule/Classes/UserInfo/CNLiveInfoUpdateCell.m
CNLiveMineModule/Classes/UserInfo/CNLiveInfoUpdateController.m
CNLiveMineModule/Classes/UserInfo/CNLiveUserInfoCell.h
CNLiveMineModule/Classes/UserInfo/CNLiveUserInfoCell.m
CNLiveMineModule/Classes/UserInfo/CNLiveUserInfoController.m
CNLiveMineModule/Classes/UserInfo/CNLiveUserInfoNavigationBar.m
Example/CNLiveMineModule.xcodeproj/project.pbxproj
Example/CNLiveMineModule/CNLIVEAppDelegate.m
Example/CNLiveMineModule/CNLiveMineModule-Info.plist
@@ -92,6 +92,9 @@ TODO: 网家家-我的模块.
   # 设置模块
   s.dependency 'CNLiveSettingModule'
  
+  #IM
+  s.dependency 'CNLiveIMBaseSDK'
+  
   s.static_framework = true
  
 end
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "mine_update_select@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "mine_update_select@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
+//
+//  CNLiveInfoUpdateCell.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
+static NSString * const kCNLiveInfoUpdateCell = @"CNLiveInfoUpdateCell";
+
+@interface CNLiveInfoUpdateCell : UITableViewCell
+@property (nonatomic, copy) NSString *text;
+@property (nonatomic, assign) BOOL isShow;
+
+@end
+
+NS_ASSUME_NONNULL_END
+//
+//  CNLiveInfoUpdateCell.m
+//  CNLiveMineModule
+//
+//  Created by 153993236@qq.com on 11/12/2019.
+//  Copyright (c) 2019 153993236@qq.com. All rights reserved.
+//
+
+#import "CNLiveInfoUpdateCell.h"
+#import <Masonry/Masonry.h>
+#import <SDWebImage/SDWebImage.h>
+#import "CNLiveUserInfoModel.h"
+
+@interface CNLiveInfoUpdateCell()
+@property (nonatomic, strong) UIView *line;
+@property (nonatomic, strong) UILabel *title;
+
+@property (nonatomic, strong) UIImageView *pic;
+
+@end
+
+@implementation CNLiveInfoUpdateCell
+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.title];
+        [self.contentView addSubview:self.pic];
+        [self.contentView addSubview:self.line];
+
+        [self xw_layoutSubviews];
+        
+    }
+    return self;
+}
+
+- (void)xw_layoutSubviews{
+        
+    [_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.bottom.equalTo(self.contentView.mas_bottom).with.offset(0);
+
+    }];
+    
+    [_pic mas_updateConstraints:^(MASConstraintMaker *make) {
+        make.right.equalTo(self.contentView.mas_right).with.offset(-margin);
+        make.top.equalTo(self.contentView.mas_top).with.offset(0);
+        make.bottom.equalTo(self.contentView.mas_bottom).with.offset(0);
+        
+    }];
+    
+    [_line mas_updateConstraints:^(MASConstraintMaker *make) {
+        make.left.equalTo(self.contentView.mas_left).with.offset(0);
+        make.right.equalTo(self.contentView.mas_right).with.offset(-0);
+        make.bottom.equalTo(self.contentView.mas_bottom).with.offset(0);
+        make.height.offset(0.5);
+        
+    }];
+
+    
+}
+
+- (void)setText:(NSString *)text{
+    _text = text;
+    _title.text = text;
+}
+
+- (void)setIsShow:(BOOL)isShow{
+    _isShow = isShow;
+    _pic.hidden = !isShow;
+}
+
+- (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;
+}
+
+
+- (UIImageView *)pic {
+    if (!_pic) {
+        _pic = [[UIImageView alloc] init];
+        UIImage *xw_image = [self xw_getImageName:@"mine_update_select" bundleName:@"CNLiveMineModule" targetClass:[self class]];
+        _pic.image = xw_image;
+        _pic.hidden = YES;
+        _pic.contentMode = UIViewContentModeCenter;
+
+    }
+    return _pic;
+}
+
+
+/**
+ *  创建图片
+ *
+ *  @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
@@ -21,6 +21,9 @@
 #import "NSString+CNLiveExtension.h"
 #import "NSDictionary+Safety.h"
 #import "UIImage+Common.h"
+#import "CNLiveManager.h"
+#import "TIMAdapter.h"
+#import "CommonLibrary.h"
  
 #import "CNLiveAddScoreManager.h"
 #import "CNLiveGoldWhereaboutsView.h"
@@ -29,7 +32,9 @@
 #import "CNLiveUserInfoNotification.h"
 #import "CNLiveUserInfoNavigationBar.h"
  
-@interface CNLiveInfoUpdateController ()<UITextFieldDelegate,UITextViewDelegate,CNLiveUserInfoNavigationBarDelegate,QMUIAlertControllerDelegate,UIImagePickerControllerDelegate,UINavigationControllerDelegate,TZImagePickerControllerDelegate>{
+#import "CNLiveInfoUpdateCell.h"
+
+@interface CNLiveInfoUpdateController ()<UITextFieldDelegate,UITextViewDelegate,CNLiveUserInfoNavigationBarDelegate,QMUIAlertControllerDelegate,UIImagePickerControllerDelegate,UINavigationControllerDelegate,TZImagePickerControllerDelegate,UITableViewDelegate,UITableViewDataSource>{
     UIImage *_image;
 }
 @property (nonatomic, strong) CNLiveUserInfoNavigationBar *navigationBar;
@@ -42,6 +47,10 @@
 @property (nonatomic, strong) UITextView *textView;
 @property (nonatomic, strong) UILabel *textNum;
  
+// 性别
+@property (nonatomic, strong) UITableView *tableView;
+@property (nonatomic, strong) NSString *gender;
+
 @end
  
 @implementation CNLiveInfoUpdateController
@@ -58,6 +67,7 @@ static const CGFloat timeValue = 1.5;
     self = [super init];
     if (self) {
         self.model = model;
+        self.gender = CNUserShareModel.gender;
     }
     return self;
 }
@@ -213,7 +223,47 @@ static const CGFloat timeValue = 1.5;
 - (void)touchesBegan:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event {
     [self.view endEditing:YES];
 }
+#pragma mark - UITableViewDataSource
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+    return 2;
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+    NSArray *data = @[@"男", @"女"];
+    CNLiveInfoUpdateCell *cell = [tableView dequeueReusableCellWithIdentifier:kCNLiveInfoUpdateCell forIndexPath:indexPath];
+    cell.text = data[indexPath.row];
+    if(indexPath.row == 0){
+        cell.isShow = [CNUserShareModel.gender isEqualToString:@"m"];
+    }else if (indexPath.row == 1){
+        cell.isShow = [CNUserShareModel.gender isEqualToString:@"f"];
+    }
+    return cell;
+}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
+    return 50.0;
+}
+
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
+    [self.tableView qmui_clearsSelection];
+    
+    self.navigationBar.right.userInteractionEnabled = YES;
+    self.navigationBar.right.backgroundColor = [UIColor colorWithRed:35/255.0 green:212/255.0 blue:30/255.0 alpha:1.0];
  
+    CNLiveInfoUpdateCell *cell = [tableView cellForRowAtIndexPath:indexPath];
+    NSArray *visibleCells = [self.tableView visibleCells];
+    for (CNLiveInfoUpdateCell *visibleCell in visibleCells) {
+        visibleCell.isShow = NO;
+    }
+    cell.isShow = YES;
+    
+    if(indexPath.row == 0){
+        self.gender = @"m";
+    }else if(indexPath.row == 1){
+        self.gender = @"f";
+    }
+    
+}
 #pragma mark - CNLiveUserInfoNavigationBarDelegate
 - (void)navigationBar:(CNLiveUserInfoNavigationBar *)navigationBar actionEvents:(NSString *)actionEvents{
     if ([actionEvents isEqualToString:@"1"]) {
@@ -233,6 +283,11 @@ static const CGFloat timeValue = 1.5;
                 [self requestUpdateUserNickname];
             }
                 break;
+            case CNLiveUserInfoDataTypeGender://昵称
+            {
+                [self requestUpdateUserGender];
+            }
+                break;
             case CNLiveUserInfoDataTypeAddress://地区
             {
                 [self requestUpdateUserAddress];
@@ -264,7 +319,7 @@ static const CGFloat timeValue = 1.5;
         if(!strongSelf) return ;
         strongSelf.navigationBar.right.userInteractionEnabled = YES;
         __strong typeof(strongSelf) weakSelf = strongSelf;
-        [strongSelf getAVAuthorizationStatus:^{
+        [CNLiveAuthorizationManager getAVAuthorizationStatus:^{
             __strong typeof(weakSelf) strongSelf = weakSelf;
             if(!strongSelf) return ;
             XFCameraController *cameraController = [[XFCameraController alloc] init];
@@ -291,7 +346,7 @@ static const CGFloat timeValue = 1.5;
         if(!strongSelf) return ;
         strongSelf.navigationBar.right.userInteractionEnabled = YES;
         __strong typeof(strongSelf) weakSelf = strongSelf;
-        [strongSelf getPHAuthorizationStatus:^{
+        [CNLiveAuthorizationManager getPHAuthorizationStatus:^{
             __strong typeof(weakSelf) strongSelf = weakSelf;
             if(!strongSelf) return ;
             TZImagePickerController *picker = [[TZImagePickerController alloc] initWithMaxImagesCount:1 delegate:strongSelf];
@@ -312,7 +367,7 @@ static const CGFloat timeValue = 1.5;
     QMUIAlertAction *action3 = [QMUIAlertAction actionWithTitle:@"保存图片" style:QMUIAlertActionStyleDefault handler:^(__kindof QMUIAlertController *aAlertController, QMUIAlertAction *action) {
        __strong typeof(weakSelf) strongSelf = weakSelf;
        if(!strongSelf) return ;
-       [strongSelf getPHAuthorizationStatus:^{
+       [CNLiveAuthorizationManager getPHAuthorizationStatus:^{
            UIImage *image = [strongSelf generateImage:strongSelf.imageView];
            [QMUITips showLoadingInView:strongSelf.view];
            [strongSelf saveImage:image];
@@ -359,7 +414,7 @@ static const CGFloat timeValue = 1.5;
     [QMUITips showLoading:@"修改中" inView:self.view];
  
     [CNLiveUserSystemCenter uploadIconWithUid:CNUserShareModel.uid icon:image compressionQuality:0.99 success:^(id result) {
-//        [[IMAPlatform sharedInstance].host asyncProfile];
+        [[IMAPlatform sharedInstance].host asyncProfile];
         [QMUITips hideAllToastInView:self.view animated:YES];
         CNUserShareModel.faceUrl = result[@"data"][@"faceUrl"];
         CNUserShareModel.bigFaceUrl = result[@"data"][@"bigFaceUrl"];
@@ -390,93 +445,6 @@ static const CGFloat timeValue = 1.5;
     return newImage;
 }
  
-- (void)getAVAuthorizationStatus:(void (^)(void))block{
-    AVCaptureDevice *device = [AVCaptureDevice defaultDeviceWithMediaType:AVMediaTypeVideo];
-    if (device) {
-        AVAuthorizationStatus status = [AVCaptureDevice authorizationStatusForMediaType:AVMediaTypeVideo];
-        switch (status) {
-            case AVAuthorizationStatusNotDetermined: {
-                [AVCaptureDevice requestAccessForMediaType:AVMediaTypeVideo completionHandler:^(BOOL granted) {
-                    if (granted) {
-                        dispatch_sync(dispatch_get_main_queue(), ^{
-                            block();
-                        });
-                        NSLog(@"用户第一次同意了访问相机权限 - - %@", [NSThread currentThread]);
-                    } else {
-                        NSLog(@"用户第一次拒绝了访问相机权限 - - %@", [NSThread currentThread]);
-                    }
-                }];
-                break;
-            }
-            case AVAuthorizationStatusAuthorized: {
-                block();
-                break;
-            }
-            case AVAuthorizationStatusDenied: {
-                NSDictionary *infoDict = [[NSBundle mainBundle] infoDictionary];
-                NSString *app_Name = [infoDict objectForKey:@"CFBundleDisplayName"];
-                if (app_Name == nil) {
-                    app_Name = [infoDict objectForKey:@"CFBundleName"];
-                }
-                NSString *messageString = [NSString stringWithFormat:@"请在iPhone的\"设置 - 隐私 - 相机\"选项中,允许%@访问你的相机", app_Name];
-                UIAlertController *alertC = [UIAlertController alertControllerWithTitle:nil message:messageString preferredStyle:(UIAlertControllerStyleAlert)];
-                UIAlertAction *alertA = [UIAlertAction actionWithTitle:@"好" style:(UIAlertActionStyleDefault) handler:^(UIAlertAction * _Nonnull action) {
-                    
-                }];
-                
-                [alertC addAction:alertA];
-                [self presentViewController:alertC animated:YES completion:nil];
-                break;
-            }
-            case AVAuthorizationStatusRestricted: {
-                NSLog(@"因为系统原因, 无法访问相册");
-                break;
-            }
-                
-            default:
-                break;
-        }
-        return;
-    }
-    [QMUITips showError:@"未检测到您的摄像头" inView:self.view hideAfterDelay:timeValue];
-}
-
-- (void)getPHAuthorizationStatus:(void (^)(void))block{
-    // 1.获取当前App的相册授权状态
-    PHAuthorizationStatus authorizationStatus = [PHPhotoLibrary authorizationStatus];
-    
-    // 2.判断授权状态
-    if (authorizationStatus == PHAuthorizationStatusAuthorized) {
-        // 2.1 如果已经授权, 保存图片(调用步骤2的方法)
-        block();
-        
-    } else if (authorizationStatus == PHAuthorizationStatusNotDetermined) { // 如果没决定, 弹出指示框, 让用户选择
-        [PHPhotoLibrary requestAuthorization:^(PHAuthorizationStatus status) {
-            // 如果用户选择授权, 则保存图片
-            if (status == PHAuthorizationStatusAuthorized) {
-                dispatch_async(dispatch_get_main_queue(), ^{
-                    block();
-                });
-            }
-        }];
-        
-    } else {
-        NSDictionary *infoDict = [[NSBundle mainBundle] infoDictionary];
-        NSString *app_Name = [infoDict objectForKey:@"CFBundleDisplayName"];
-        if (app_Name == nil) {
-            app_Name = [infoDict objectForKey:@"CFBundleName"];
-        }
-        NSString *messageString = [NSString stringWithFormat:@"请在iPhone的\"设置 - 隐私 - 相机\"选项中,允许%@访问你的相册", app_Name];
-        UIAlertController *alertC = [UIAlertController alertControllerWithTitle:nil message:messageString preferredStyle:(UIAlertControllerStyleAlert)];
-        UIAlertAction *alertA = [UIAlertAction actionWithTitle:@"好" style:(UIAlertActionStyleDefault) handler:^(UIAlertAction * _Nonnull action) {
-            
-        }];
-        
-        [alertC addAction:alertA];
-        [self presentViewController:alertC animated:YES completion:nil];
-    }
-}
-
 // 保存图片
 - (void)saveImage:(UIImage *)image{
     if(!image){
@@ -497,6 +465,7 @@ static const CGFloat timeValue = 1.5;
  
     }];
 }
+
 // UIView转UIImage
 - (UIImage *)generateImage:(UIView *)view{
     // 1.开启上下文
@@ -527,7 +496,6 @@ static const CGFloat timeValue = 1.5;
  
     [QMUITips showLoading:@"修改中" inView:self.view];
     [CNLiveUserSystemCenter modifyUserInfoType:UserInfoTypeNickName uid:CNUserShareModel.uid modifyInfo:text success:^(id result) {
-//        [[IMAPlatform sharedInstance].host asyncProfile];
         CNUserShareModel.nickname = self.textField.text;
         [self showSucceed:@"修改成功"];
  
@@ -545,6 +513,25 @@ static const CGFloat timeValue = 1.5;
  
 }
  
+#pragma mark - 更新性别
+- (void)requestUpdateUserGender{
+    if ([self.gender isEqualToString:CNUserShareModel.gender]) {
+        self.navigationBar.right.userInteractionEnabled = YES;
+        [self goBack];
+        return;
+    }
+    [QMUITips showLoading:@"修改中" inView:self.view];
+    [CNLiveUserSystemCenter modifyUserInfoType:UserInfoTypeGender uid:CNUserShareModel.uid modifyInfo:self.gender success:^(id result) {
+        CNUserShareModel.gender = self.gender;
+        [self showSucceed:@"修改成功"];
+        
+    } failure:^(NSDictionary *errorDic) {
+        [self showError:errorDic[@"errorMessage"]];
+
+    }];
+
+}
+
 #pragma mark - 更新地区
 - (void)requestUpdateUserAddress{
     NSString *text = [self.textField.text trim];
@@ -605,6 +592,7 @@ static const CGFloat timeValue = 1.5;
  
 #pragma mark - 更新提示
 - (void)showSucceed:(NSString *)text{
+    [[IMAPlatform sharedInstance].host asyncProfile];
     [QMUITips hideAllToastInView:self.view animated:YES];
     self.navigationBar.right.userInteractionEnabled = YES;
     [QMUITips showSucceed:text inView:self.view];
@@ -626,28 +614,28 @@ static const CGFloat timeValue = 1.5;
         _navigationBar.backgroundColor = [UIColor whiteColor];
         _navigationBar.delegate = self;
         switch (self.model.dataType) {
-               case CNLiveUserInfoDataTypeHead:
-               {
-                   UIImage *xw_image = [self xw_getImageName:@"mine_info_set" bundleName:@"CNLiveMineModule" targetClass:[CNLiveInfoUpdateController class]];
-                   [_navigationBar.right setImage:xw_image forState:UIControlStateNormal];
-               }
-                   break;
-               default:
-               {
-                   _navigationBar.right.frame = CGRectMake(SCREEN_WIDTH-45-15, StatusBarHeight+10, 45, 24);
-                   [_navigationBar.right setContentHorizontalAlignment:UIControlContentHorizontalAlignmentCenter];
-                   _navigationBar.right.backgroundColor = [UIColor lightGrayColor];
-                   _navigationBar.right.userInteractionEnabled = NO;
-                   _navigationBar.right.titleLabel.font = [UIFont boldSystemFontOfSize:13];
-                   [_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;
-               }
-                   break;
-              
-           }
+            case CNLiveUserInfoDataTypeHead:
+            {
+                UIImage *xw_image = [self xw_getImageName:@"mine_info_set" bundleName:@"CNLiveMineModule" targetClass:[CNLiveInfoUpdateController class]];
+                [_navigationBar.right setImage:xw_image forState:UIControlStateNormal];
+            }
+                break;
+            default:
+            {
+                _navigationBar.right.frame = CGRectMake(SCREEN_WIDTH-45-15, StatusBarHeight+10, 45, 24);
+                [_navigationBar.right setContentHorizontalAlignment:UIControlContentHorizontalAlignmentCenter];
+                _navigationBar.right.backgroundColor = [UIColor lightGrayColor];
+                _navigationBar.right.userInteractionEnabled = NO;
+                _navigationBar.right.titleLabel.font = [UIFont boldSystemFontOfSize:13];
+                [_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;
+          
+            }
+                break;
+        }
     }
     return _navigationBar;
 }
@@ -687,6 +675,16 @@ static const CGFloat timeValue = 1.5;
                 self.textField.text = self.model.content;
             }
                 break;
+            case CNLiveUserInfoDataTypeGender:
+            {
+                self.navigationBar.title.text = @"设置性别";
+                [self.navigationBar.left setTitle:@"取消" forState:UIControlStateNormal];
+                [self.navigationBar.left setTitleColor:[UIColor colorWithRed:30/255.0 green:30/255.0 blue:30/255.0 alpha:1.0] forState:UIControlStateNormal];
+                [self.navigationBar.left setImage:nil forState:UIControlStateNormal];
+                _contentView.frame = CGRectMake(0, NavigationContentTop+margin, SCREEN_WIDTH, 100);
+                [_contentView addSubview:self.tableView];
+            }
+                break;
             case CNLiveUserInfoDataTypeIntroduction:
             {
                 self.navigationBar.title.text = @"设置个性签名";
@@ -694,7 +692,7 @@ static const CGFloat timeValue = 1.5;
                 _contentView.frame = CGRectMake(0, NavigationContentTop+margin, SCREEN_WIDTH, 120);
                 [_contentView addSubview:self.textView];
                 self.textView.text = self.model.content;
-                self.textNum.text = [NSString stringWithFormat:@"%ld",MAX(0,MAX_LIMIT_NUMS - self.textView.text.length)];
+                self.textNum.text = [NSString stringWithFormat:@"%lu",MAX(0,MAX_LIMIT_NUMS - self.textView.text.length)];
  
                 [_contentView addSubview:self.textNum];
                 [self.textNum mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -766,6 +764,20 @@ static const CGFloat timeValue = 1.5;
     return _textNum;
 }
  
+- (UITableView *)tableView {
+    if (!_tableView) {
+        _tableView = [[UITableView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, 100) style:UITableViewStylePlain];
+        _tableView.delegate = self;
+        _tableView.dataSource = self;
+        _tableView.showsVerticalScrollIndicator = NO;
+        _tableView.showsHorizontalScrollIndicator = NO;
+        _tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
+        [_tableView registerClass:[CNLiveInfoUpdateCell class] forCellReuseIdentifier:kCNLiveInfoUpdateCell];
+        _tableView.backgroundColor = [UIColor colorWithRed:242/255.0 green:242/255.0 blue:242/255.0 alpha:1.0];
+    }
+    return _tableView;
+}
+
 #pragma mark - 响应方法
 - (void)goBack {
     [self.textField resignFirstResponder];
 //
-//  CNLiveMineController.m
+//  CNLiveUserInfoCell.m
 //  CNLiveMineModule
 //
 //  Created by 153993236@qq.com on 11/12/2019.
 //
-//  CNLiveMineController.m
+//  CNLiveUserInfoCell.m
 //  CNLiveMineModule
 //
 //  Created by 153993236@qq.com on 11/12/2019.
@@ -160,7 +160,9 @@
             break;
         case CNLiveUserInfoDataTypeGender:
         {
-            [self updateGenderActionSheetView];
+            CNLiveInfoUpdateController *vc = [[CNLiveInfoUpdateController alloc]initWithModel:model];
+            vc.delegate = self;
+            [self.navigationController pushViewController:vc animated:YES];
         }
             break;
         case CNLiveUserInfoDataTypeCode:
@@ -210,19 +212,6 @@
         [self goBack];
     }
 }
-#pragma mark - 私有方法
-// 修改性别
-- (void)updateGenderActionSheetView{
-    __weak typeof(self) weakSelf = self;
-    
-}
-
-// 更新性别
-- (void)requestUpdateUserGender:(NSString *)gender{
-    // 数据请求更新
-   
-    
-}
  
 #pragma mark - 懒加载
 - (CNLiveUserInfoNavigationBar *)navigationBar {
@@ -58,6 +58,7 @@ static const NSInteger margin = 15;
     if (!_left) {
         _left= [UIButton buttonWithType:UIButtonTypeCustom];
         _left.adjustsImageWhenHighlighted = NO;
+        _left.titleLabel.font = [UIFont systemFontOfSize:15];
         _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];
@@ -339,6 +339,7 @@
 				"${BUILT_PRODUCTS_DIR}/CNLiveBaseTools/CNLiveBaseTools.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveBeeHive/CNLiveBeeHive.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveBusinessTools/CNLiveBusinessTools.framework",
+				"${BUILT_PRODUCTS_DIR}/CNLiveCacheManagerKit/CNLiveCacheManagerKit.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveChooseCountry/CNLiveChooseCountry.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveCommonCategory/CNLiveCommonCategory.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveCommonClass/CNLiveCommonClass.framework",
@@ -353,6 +354,7 @@
 				"${BUILT_PRODUCTS_DIR}/CNLiveUploadManager/CNLiveUploadManager.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveUserAgreementManager/CNLiveUserAgreementManager.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveUserManagement/CNLiveUserManagement.framework",
+				"${BUILT_PRODUCTS_DIR}/FMDB/FMDB.framework",
 				"${BUILT_PRODUCTS_DIR}/HappyDNS/HappyDNS.framework",
 				"${BUILT_PRODUCTS_DIR}/JXCategoryView/JXCategoryView.framework",
 				"${BUILT_PRODUCTS_DIR}/MJExtension/MJExtension.framework",
@@ -363,6 +365,7 @@
 				"${BUILT_PRODUCTS_DIR}/SDAutoLayout/SDAutoLayout.framework",
 				"${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework",
 				"${BUILT_PRODUCTS_DIR}/SGQRCode/SGQRCode.framework",
+				"${PODS_ROOT}/TXIMSDK_iOS/ImSDK.framework",
 				"${BUILT_PRODUCTS_DIR}/YYKit/YYKit.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
@@ -373,6 +376,7 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBaseTools.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBeeHive.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBusinessTools.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCacheManagerKit.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveChooseCountry.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCommonCategory.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCommonClass.framework",
@@ -387,6 +391,7 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUploadManager.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUserAgreementManager.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUserManagement.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FMDB.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/HappyDNS.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/JXCategoryView.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MJExtension.framework",
@@ -397,6 +402,7 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDAutoLayout.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SGQRCode.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ImSDK.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYKit.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -610,10 +616,12 @@
 			baseConfigurationReference = A107C92B1363BA9D7027FD97 /* Pods-CNLiveMineModule_Example.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CURRENT_PROJECT_VERSION = 1.0;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "CNLiveMineModule/CNLiveMineModule-Prefix.pch";
 				INFOPLIST_FILE = "CNLiveMineModule/CNLiveMineModule-Info.plist";
+				MARKETING_VERSION = 1.0;
 				MODULE_NAME = ExampleApp;
 				PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.CNLiveNetAdd.CNLiveMineModule;
 				PRODUCT_NAME = "我的模块";
@@ -628,10 +636,12 @@
 			baseConfigurationReference = 75B26F3FEFD98849EC15D9D1 /* Pods-CNLiveMineModule_Example.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CURRENT_PROJECT_VERSION = 1.0;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "CNLiveMineModule/CNLiveMineModule-Prefix.pch";
 				INFOPLIST_FILE = "CNLiveMineModule/CNLiveMineModule-Info.plist";
+				MARKETING_VERSION = 1.0;
 				MODULE_NAME = ExampleApp;
 				PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.CNLiveNetAdd.CNLiveMineModule;
 				PRODUCT_NAME = "我的模块";
@@ -19,7 +19,7 @@
 {
     // Override point for customization after application launch.
     self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
-    [CNLiveEnvironmentManager setEnvironment:CNLiveProductionAppStore];
+    [CNLiveEnvironmentManager setEnvironment:CNLiveDebugAppStore];
     [CNLiveUserSystemCenter setAppId:AppId appKey:APPKey appSecret:AppSecret isTestEnvironment:TestEnvironment];
      if ([CNUserShareManager isLogin]) {
          [CNLiveUserSystemCenter setUserId:CNUserShareModel.uid];
@@ -32,7 +32,7 @@
         @"email":@"",
         @"extInfo":@"",
         @"faceUrl":@"http://yweb0.cnliveimg.com/images/headImg/2019/1030/1572439148697_small.jpg",
-        @"gender":@"m",
+        @"gender":@"f",
         @"hUid":@"",
         @"isNewUser":@"0",
         @"location":@"北京市海淀区",
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.0</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>