no message

zhangxiaowen
1 parent 2783fcea
Showing 7 changed files with 460 additions and 198 deletions
CNLiveMineModule.podspec
CNLiveMineModule/Classes/UserInfo/CNLiveInfoUpdateController.m
CNLiveMineModule/Classes/UserInfo/CNLiveUserInfoCell.m
CNLiveMineModule/Classes/UserInfo/CNLiveUserInfoController.m
CNLiveMineModule/Classes/UserInfo/CNLiveUserInfoNavigationBar.m
Example/CNLiveMineModule.xcodeproj/project.pbxproj
Example/CNLiveMineModule/CNLIVEAppDelegate.m
@@ -68,6 +68,7 @@ TODO: 网家家-我的模块.
   # s.dependency 'AFNetworking', '~> 2.3'
   # pod
+  s.dependency 'CNLiveSDKs/CNLiveUserSystemSDK', '~> 0.3.1.3' #GitHub所以指定版本号
   s.dependency 'CNLiveTripartiteManagement/QMUIKit'
   s.dependency 'CNLiveTripartiteManagement/SDWebImage'
   s.dependency 'CNLiveTripartiteManagement/Masonry'
@@ -9,24 +9,46 @@
 #import "CNLiveInfoUpdateController.h"
 #import "QMUIKit.h"
 #import <SDWebImage/SDWebImage.h>
+#import <Masonry/Masonry.h>
+#import <AVFoundation/AVCaptureDevice.h>
+#import <AVFoundation/AVMediaFormat.h>
+#import "XFCameraController.h"
+#import "TZImagePickerController.h"
 #import "CNUserInfoManager.h"
+#import <CNLiveUserSystemSDK/CNLiveUserSystemCenter.h>
+#import <CNLiveUserSystemSDK/CNLiveUserSystemTypeDef.h>
+#import "NSString+CNLiveExtension.h"
+#import "NSDictionary+Safety.h"
+
+#import "CNLiveAddScoreManager.h"
+#import "CNLiveGoldWhereaboutsView.h"
 #import "CNLiveUserInfoModel.h"
 #import "CNLiveUserInfoNotification.h"
 #import "CNLiveUserInfoNavigationBar.h"
-@interface CNLiveInfoUpdateController ()<UITextFieldDelegate,UITextViewDelegate,CNLiveUserInfoNavigationBarDelegate,QMUIAlertControllerDelegate>
+@interface CNLiveInfoUpdateController ()<UITextFieldDelegate,UITextViewDelegate,CNLiveUserInfoNavigationBarDelegate,QMUIAlertControllerDelegate,UIImagePickerControllerDelegate,UINavigationControllerDelegate,TZImagePickerControllerDelegate>{
+    UIImage *_image;
+}
 @property (nonatomic, strong) CNLiveUserInfoNavigationBar *navigationBar;
 @property (nonatomic, strong) CNLiveUserInfoModel *model;
+@property (nonatomic, strong) UIView *contentView;
+
 @property (nonatomic, strong) UIImageView *imageView;
-@property (nonatomic, weak) UITextField *textField;
-@property (nonatomic, weak) UITextView *textView;
+@property (nonatomic, strong) UITextField *textField;
+@property (nonatomic, strong) UITextView *textView;
+@property (nonatomic, strong) UILabel *textNum;
 @end
 @implementation CNLiveInfoUpdateController
+
+#define _locMaxLength 12
+#define _nickMaxLength 20
+#define MAX_LIMIT_NUMS 30
+
 static const NSInteger margin = 15;
 static const CGFloat timeValue = 1.5;
@@ -39,12 +61,6 @@ static const CGFloat timeValue = 1.5;
     return self;
 }
-#pragma mark - 加载数据
-- (void)sendData {
-    
-    
-}
-
 #pragma mark - 生命周期
 - (void)viewWillAppear:(BOOL)animated{
     [super viewWillAppear:animated];
@@ -60,151 +76,224 @@ static const CGFloat timeValue = 1.5;
         self.automaticallyAdjustsScrollViewInsets = NO;
     }
     [self.view addSubview:self.navigationBar];
-    switch (self.model.dataType) {
-        case CNLiveUserInfoDataTypeHead:
-        {
-            self.navigationBar.title.text = @"个人头像";
-            [self image_layoutSubViews];
-        }
-            break;
-        case CNLiveUserInfoDataTypeNickname:
-        {
-            self.navigationBar.title.text = @"设置昵称";
-            [self textField_layoutSubViews];
-            self.textField.placeholder = @"请输入昵称";
+    [self.view addSubview:self.contentView];
+    
+}
+#pragma mark - UITextFieldDelegate
+- (void)textFieldDidChange:(UITextField *)textField {
+    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];
+    
+    NSString *toBeString = textField.text;
+    
+    UITextRange *selectedRange = [textField markedTextRange];
+    UITextPosition *position = [textField positionFromPosition:selectedRange.start offset:0];
+    
+    // 没有高亮选择的字，则对已输入的文字进行字数统计和限制,防止中文被截断
+    if (!position){
+        NSInteger maxLength;
+        maxLength = (self.model.dataType == CNLiveUserInfoDataTypeNickname) ? _nickMaxLength : _locMaxLength;
+        if (toBeString.length > maxLength){
+            //中文和emoj表情存在问题，需要对此进行处理
+            NSRange rangeRange = [toBeString rangeOfComposedCharacterSequencesForRange:NSMakeRange(0, maxLength)];
+            textField.text = [toBeString substringWithRange:rangeRange];
         }
-            break;
-        case CNLiveUserInfoDataTypeAddress:
-        {
-            self.navigationBar.title.text = @"设置地区";
-            [self textField_layoutSubViews];
-            self.textField.placeholder = @"请输入你所在的地区";
+    }
+}
+
+#pragma mark - UITextFieldDelegate
+- (BOOL)textFieldShouldReturn:(UITextField *)textField {
+//    [self compleBtnAction:nil];
+    return YES;
+}
+#pragma mark - UITextViewDelegate
+- (BOOL)textView:(UITextView *)textView shouldChangeTextInRange:(NSRange)range replacementText:(NSString *)text {
+    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];
+
+    if([text length] != 0) {
+        NSLog(@"增");
+        if ([[text removeNewLine] length] == 0) { //换行
+//            [self compleBtnAction:nil];
+            return NO;
         }
-            break;
-        case CNLiveUserInfoDataTypeIntroduction:
-        {
-            self.navigationBar.title.text = @"设置个性签名";
-            [self textView_layoutSubViews];
+    }
+    else {
+        NSLog(@"删");
+        return YES;
+    }
+    NSLog(@"%lu",(unsigned long)textView.text.length);
+    
+    UITextRange *selectedRange = [textView markedTextRange]; //获取高亮部分
+    UITextPosition *pos = [textView positionFromPosition:selectedRange.start offset:0];
+    NSString *selectedtext = [textView textInRange:selectedRange]; //获取高亮部分内容
+    
+    //如果有高亮且当前字数开始位置小于最大限制时允许输入
+    if (selectedRange && pos) {
+        NSInteger startOffset = [textView offsetFromPosition:textView.beginningOfDocument toPosition:selectedRange.start];
+        NSInteger endOffset = [textView offsetFromPosition:textView.beginningOfDocument toPosition:selectedRange.end];
+        NSRange offsetRange = NSMakeRange(startOffset, endOffset - startOffset);
+        
+        if (offsetRange.location < MAX_LIMIT_NUMS && offsetRange.location+selectedtext.length <= MAX_LIMIT_NUMS && offsetRange.location+text.length <= MAX_LIMIT_NUMS) {
+            return YES;
         }
-            break;
-        default:
-        {
-            
+        else {
+            return NO;
         }
-            break;
-       
     }
-}
+    NSString *comcatstr = [textView.text stringByReplacingCharactersInRange:range withString:text];//拼上
+    NSInteger caninputlen = MAX_LIMIT_NUMS - comcatstr.length;//最大减全拼上(拼后剩/超)
+    if (caninputlen >= 0) {
+        return YES;
+    }
+    else {
+        NSInteger len = text.length + caninputlen; //原本剩余的空间
+        //防止当text.length + caninputlen < 0时，使得rg.length为一个非法最大正数出错
+        NSRange rg = {0,MAX(len,0)};
+        
+        if (rg.length > 0) {
+            NSString *s = @"";//正确待拼text
+            //判断是否只普通的字符或asc码(对于中文和表情返回NO)
+            BOOL asc = [text canBeConvertedToEncoding:NSASCIIStringEncoding];
+            if (asc) {
+                s = [text substringWithRange:rg];//因为是ascii码直接取就可以了不会错
+            }
+            else {
+                __block NSInteger idx = 0;
+                __block NSString  *trimString = @"";//截取出的字串
+                //使用字符串遍历，这个方法能准确知道每个emoji是占一个unicode还是两个
+                [text enumerateSubstringsInRange:NSMakeRange(0, [text length])
+                                         options:NSStringEnumerationByComposedCharacterSequences
+                                      usingBlock: ^(NSString* substring, NSRange substringRange, NSRange enclosingRange, BOOL* stop) {
+                                          
+                                          NSInteger steplen = substring.length;
+                                          if (steplen>rg.length) {
+                                              *stop = YES; //取出所需要就break，提高效率
+                                              return ;
+                                          }
+                                          if (idx >= rg.length) {
+                                              *stop = YES; //取出所需要就break，提高效率
+                                              return ;
+                                          }
+                                          
+                                          trimString = [trimString stringByAppendingString:substring];
+                                          idx = idx + steplen;//这里变化了，使用了字串占的长度来作为步长
+                                      }];
+                
+                s = trimString;
+            }
+            //rang是指从当前光标处进行替换处理(注意如果执行此句后面返回的是YES会触发didchange事件)
+            [textView setText:[textView.text stringByReplacingCharactersInRange:range withString:s]];
+            //既然是超出部分截取了，哪一定是最大限制了。
+            self.textNum.text = [NSString stringWithFormat:@"%d",0];
+        }
+        return NO;
+    }
-- (void)dealloc {
-    
-    
 }
-#pragma mark - 更新头像
-- (void)image_layoutSubViews {
-    self.view.backgroundColor = [UIColor blackColor];
+- (void)textViewDidChange:(UITextView *)textView{
+    NSString *nsTextContent = textView.text;      //总text
+    NSInteger existTextNum = nsTextContent.length; //总length
-    UIImageView *imageView = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, SCREEN_WIDTH)];
-    imageView.center = self.view.center;
-    imageView.backgroundColor = [UIColor whiteColor];// 设置背景颜色
-    UIImage *xw_image = [self xw_getImageName:@"default_avatar_f" bundleName:@"CNLiveMineModule" targetClass:[CNLiveInfoUpdateController class]];
-    [imageView sd_setImageWithURL:[NSURL URLWithString:CNUserShareModel.bigFaceUrl?CNUserShareModel.bigFaceUrl:CNUserShareModel.faceUrl] placeholderImage:xw_image];
-    [self.view addSubview:imageView];
-    self.imageView = imageView;
+    if (existTextNum > MAX_LIMIT_NUMS) {
+        //截取到最大位置的字符(由于超出截部分在should时被处理了所在这里这了提高效率不再判断)
+        NSString *s = [nsTextContent substringToIndex:MAX_LIMIT_NUMS];
+        [textView setText:s];
+    }
+    //不让显示负数
+    self.textNum.text = [NSString stringWithFormat:@"%ld",MAX(0,MAX_LIMIT_NUMS - existTextNum)];
 }
-#pragma mark - 更新昵称/地区
-- (void)textField_layoutSubViews {
-    UIView *bgView = [[UIView alloc] initWithFrame:CGRectMake(0, NavigationContentTop+margin, SCREEN_WIDTH, 50)];
-    bgView.backgroundColor = [UIColor whiteColor];
-    [self.view addSubview:bgView];
-    
-    UITextField *textField = [[UITextField alloc] initWithFrame:CGRectMake(margin, NavigationContentTop+margin, SCREEN_WIDTH-2*margin, 50)];
-    textField.delegate = self;
-    textField.backgroundColor = [UIColor whiteColor];// 设置背景颜色
-    textField.textColor = [UIColor blackColor];      // 设置文字的颜色
-    textField.clearsOnBeginEditing = YES;            // 当第二次输入的时候，清空上一次的内容
-    textField.font = [UIFont systemFontOfSize:15.0f];
-    textField.clearButtonMode = UITextFieldViewModeWhileEditing; // 编辑的时候会显示出删除全部的小X
-    [self.view addSubview:textField];
-    self.textField = textField;
-    self.textField.text = self.model.content;
-
+- (void)touchesBegan:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event {
+    [self.view endEditing:YES];
 }
-#pragma mark - 更新个性签名
-- (void)textView_layoutSubViews {
-    UIView *bgView = [[UIView alloc] initWithFrame:CGRectMake(0, NavigationContentTop+margin, SCREEN_WIDTH, 150)];
-    bgView.backgroundColor = [UIColor whiteColor];
-    [self.view addSubview:bgView];
-    
-    UITextView *textView = [[UITextView alloc] initWithFrame:CGRectMake(margin, NavigationContentTop+margin, SCREEN_WIDTH-2*margin, 150)];
-    textView.delegate = self;
-    textView.backgroundColor = [UIColor whiteColor];// 设置背景颜色
-    textView.textColor = [UIColor blackColor];      // 设置文字的颜色
-    textView.font = [UIFont systemFontOfSize:15.0f];
-    [self.view addSubview:textView];
-    self.textView = textView;
-    self.textView.text = self.model.content;
-}
+#pragma mark - CNLiveUserInfoNavigationBarDelegate
+- (void)navigationBar:(CNLiveUserInfoNavigationBar *)navigationBar actionEvents:(NSString *)actionEvents{
+    if ([actionEvents isEqualToString:@"1"]) {
+        [self goBack];
+    }else if ([actionEvents isEqualToString:@"2"]){
+        [self.textField resignFirstResponder];
+        [self.textView resignFirstResponder];
-#pragma mark - UITextFieldDelegate
-- (BOOL)textFieldShouldBeginEditing:(UITextField *)textField{
-    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{
-    
-}
-- (BOOL)textFieldShouldEndEditing:(UITextField *)textField{
-   
-    return YES;
-}
-- (void)textFieldDidEndEditing:(UITextField *)textField{
-    
+        switch (self.model.dataType) {
+            case CNLiveUserInfoDataTypeHead://头像
+            {
+                [self updateHeaderActionSheetView];
+            }
+                break;
+            case CNLiveUserInfoDataTypeNickname://昵称
+            {
+                [self requestUpdateUserNickname];
+            }
+                break;
+            case CNLiveUserInfoDataTypeAddress://地区
+            {
+                [self requestUpdateUserAddress];
+            }
+                break;
+            case CNLiveUserInfoDataTypeIntroduction://简介
+            {
+                [self requestUpdateUserIntroduction];
+            }
+                break;
+                
+            default:
+                break;
+        }
+    }
 }
-#pragma mark - UITextViewDelegate
-- (BOOL)textViewShouldBeginEditing:(UITextView *)textView{
-    self.navigationBar.right.backgroundColor = [UIColor colorWithRed:35/255.0 green:212/255.0 blue:30/255.0 alpha:1.0];
+
+- (void)didHideAlertController:(QMUIAlertController *)alertController{
     self.navigationBar.right.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 - 私有方法
+
+#pragma mark - 更新头像
 // 修改头像
 - (void)updateHeaderActionSheetView{
     __weak typeof(self) weakSelf = self;
     QMUIAlertAction *action1 = [QMUIAlertAction actionWithTitle:@"拍照" style:QMUIAlertActionStyleDefault handler:^(__kindof QMUIAlertController *aAlertController, QMUIAlertAction *action) {
         __strong typeof(weakSelf) strongSelf = weakSelf;
         if(!strongSelf) return ;
-        
+        XFCameraController *cameraController = [[XFCameraController alloc] init];
+        cameraController.isCanShootVideo = NO;
+        cameraController.modalPresentationStyle = UIModalPresentationFullScreen;
+        __weak XFCameraController *weakCameraController = cameraController;
+        __weak typeof(self) weakSelf = self;
+        cameraController.takePhotosCompletionBlock = ^(UIImage *image, NSError *error) {
+            __strong typeof(weakSelf) strongSelf = weakSelf;
+            if(!strongSelf) return ;
+            strongSelf->_image = image;
+            [strongSelf requestUpdateUserHeader:image];
+            dispatch_async(dispatch_get_main_queue(), ^{
+               [weakCameraController dismissViewControllerAnimated:YES completion:nil];
+            });
+        };
+        [self presentViewController:cameraController animated:YES completion:nil];
         self.navigationBar.right.userInteractionEnabled = YES;
     }];
     QMUIAlertAction *action2 = [QMUIAlertAction actionWithTitle:@"从手机相册中选择" style:QMUIAlertActionStyleDefault handler:^(__kindof QMUIAlertController *aAlertController, QMUIAlertAction *action) {
         __strong typeof(weakSelf) strongSelf = weakSelf;
         if(!strongSelf) return ;
-        self.navigationBar.right.userInteractionEnabled = YES;
+        strongSelf.navigationBar.right.userInteractionEnabled = YES;
+        TZImagePickerController *picker = [[TZImagePickerController alloc] initWithMaxImagesCount:1 delegate:strongSelf];
+        picker.modalPresentationStyle = UIModalPresentationFullScreen;
+        picker.allowPickingVideo = NO;
+        picker.allowPreview = NO;
+        __weak typeof(self) weakSelf = self;
+        [picker setDidFinishPickingPhotosHandle:^(NSArray<UIImage *> *photos, NSArray *assets, BOOL isSelectOriginalPhoto) {
+            __strong typeof(weakSelf) strongSelf = weakSelf;
+            if(!strongSelf) return ;
+            strongSelf->_image = [photos firstObject];
+            [strongSelf requestUpdateUserHeader:[photos firstObject]];
+        }];
+        [self presentViewController:picker animated:YES completion:nil];
     }];
     QMUIAlertAction *action3 = [QMUIAlertAction actionWithTitle:@"保存图片" style:QMUIAlertActionStyleDefault handler:^(__kindof QMUIAlertController *aAlertController, QMUIAlertAction *action) {
@@ -250,7 +339,29 @@ static const CGFloat timeValue = 1.5;
 // 更新头像
 - (void)requestUpdateUserHeader:(UIImage *)image{
-    // 数据请求更新
+    [QMUITips showLoading:@"修改中" inView:self.view];
+    [CNLiveUserSystemCenter uploadIconWithUid:CNUserShareModel.uid icon:image compressionQuality:0.99 success:^(id result) {
+//        [[IMAPlatform sharedInstance].host asyncProfile];
+        [QMUITips hideAllToastInView:self.view animated:YES];
+        CNUserShareModel.faceUrl = result[@"data"][@"faceUrl"];
+        CNUserShareModel.bigFaceUrl = result[@"data"][@"bigFaceUrl"];
+        
+        [self.imageView sd_setImageWithURL:[NSURL URLWithString:CNUserShareModel.bigFaceUrl] placeholderImage:self->_image completed:^(UIImage *image, NSError *error, SDImageCacheType cacheType, NSURL *imageURL) {
+            self.imageView.image = image;
+            [QMUITips showSucceed:@"修改成功" inView:self.view hideAfterDelay:timeValue];
+            //增加积分
+            [CNLiveAddScoreManager requestTaskId:@"update_face" contentId:@"" block:^(BOOL isSuccess, NSString *desc, NSString * _Nonnull score) {
+                if(isSuccess){
+                    [CNLiveGoldWhereaboutsView showWithDesc:desc score:score];
+
+                }
+            }];
+        }];
+        
+    } failure:^(NSDictionary *errorDic) {
+        [self showError:errorDic[@"errorMessage"]];
+
+    }];
 }
 - (void)getPHAuthorizationStatus:(void (^)(void))block{
@@ -323,92 +434,112 @@ static const CGFloat timeValue = 1.5;
     return newImage;
 }
-- (void)requestUpdateUserInfo:(NSString *)info{
-    // 数据请求更新
+#pragma mark - 更新昵称
+- (void)requestUpdateUserNickname{
+    NSString *text = [self.textField.text trim];
+    if (text.length == 0) {
+        [QMUITips showError:@"没有输入名字,请重新填写" inView:self.view hideAfterDelay:timeValue];
+        self.navigationBar.right.userInteractionEnabled = YES;
+        return;
+    }
+    if ([text isEqualToString:CNUserShareModel.nickname]) {
+        self.navigationBar.right.userInteractionEnabled = YES;
+        [self goBack];
+        return;
+    }
+    
+    [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:@"修改成功"];
+
+        //增加积分
+        [CNLiveAddScoreManager requestTaskId:@"update_nick" contentId:@"" block:^(BOOL isSuccess, NSString *desc, NSString * _Nonnull score) {
+            if(isSuccess){
+                [CNLiveGoldWhereaboutsView showWithDesc:desc score:score];
+            }
+        }];
+        
+    } failure:^(NSDictionary *errorDic) {
+        [self showError:errorDic[@"errorMessage"]];
+
+    }];
 }
-- (void)updateDataType:(CNLiveUserInfoDataType)dataType info:(NSString *)info{
-    // 1.数据请求成功后更新cell展示信息
-    if (self.delegate && [self.delegate respondsToSelector:@selector(updateSuccess:info:)]) {
-        [self.delegate updateSuccess:dataType info:info];
+#pragma mark - 更新地区
+- (void)requestUpdateUserAddress{
+    NSString *text = [self.textField.text trim];
+    if (text.length == 0) {
+        [QMUITips showError:@"请填写您的位置" inView:self.view hideAfterDelay:timeValue];
+        self.navigationBar.right.userInteractionEnabled = YES;
+        return;
+    }
+    if ([text isEqualToString:CNUserShareModel.location]) {
+        self.navigationBar.right.userInteractionEnabled = YES;
+        [self goBack];
+        return;
     }
-    // 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;
-//    }
+    [QMUITips showLoading:@"修改中" inView:self.view];
+    [CNLiveUserSystemCenter modifyUserInfoType:UserInfoTypeLocation uid:CNUserShareModel.uid modifyInfo:text success:^(id result) {
+        CNUserShareModel.location = self.textField.text;
+        [self showSucceed:@"修改成功"];
+        
+    } failure:^(NSDictionary *errorDic) {
+        [self showError:errorDic[@"errorMessage"]];
+
+    }];
 }
-#pragma mark - 响应方法
-//回退goBack
-- (void)goBack {
-    if (self.presentingViewController != nil) {
-        [self dismissViewControllerAnimated:YES completion:nil];
+#pragma mark - 更新个性签名
+- (void)requestUpdateUserIntroduction {
+    BOOL isNil = [[self.textView.text stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]]length] == 0;
+    
+    if ([self.textView.text isEqualToString:CNUserShareModel.signature]) {
+        self.navigationBar.right.userInteractionEnabled = YES;
+        [self goBack];
     }
-    else {
-        [self.navigationController popViewControllerAnimated:YES];
+    
+    // 签名不可以为空
+    NSString *signature;
+    if (isNil) {
+        signature = @"";
+    } else {
+        signature = [self.textView.text qmui_trim];
     }
-}
-- (void)touchesBegan:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event {
-    [self.view endEditing:YES];
+    
+    NSDictionary *dic = [NSDictionary dictionaryWithObjectsAndKeys:signature,@"userSign", nil];
+    NSString *updateSign = CNLiveNSDictionaryDicToJson(dic);
+    
+    [QMUITips showLoading:@"修改中" inView:self.view];
+    [CNLiveUserSystemCenter updateOtherInfoWithUid:CNUserShareModel.uid extInfo:updateSign success:^(id result) {
+        CNUserShareModel.signature = signature;
+        [self showSucceed:@"修改成功"];
+          
+    } failure:^(NSDictionary *errorDic) {
+        [self showError:errorDic[@"errorMessage"]];
+
+    }];
+
 }
-#pragma mark - CNLiveUserInfoNavigationBarDelegate
-- (void)navigationBar:(CNLiveUserInfoNavigationBar *)navigationBar actionEvents:(NSString *)actionEvents{
-    if ([actionEvents isEqualToString:@"1"]) {
+#pragma mark - 更新提示
+- (void)showSucceed:(NSString *)text{
+    [QMUITips hideAllToastInView:self.view animated:YES];
+    self.navigationBar.right.userInteractionEnabled = YES;
+    [QMUITips showSucceed:text inView:self.view];
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(timeValue * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        [QMUITips hideAllToastInView:self.view animated:YES];
         [self goBack];
-    }else if ([actionEvents isEqualToString:@"2"]){
-        switch (self.model.dataType) {
-            case CNLiveUserInfoDataTypeHead://头像
-            {
-                self.navigationBar.right.userInteractionEnabled = NO;
-                [self updateHeaderActionSheetView];
-            }
-                break;
-            case CNLiveUserInfoDataTypeNickname://昵称
-            case CNLiveUserInfoDataTypeAddress://地区
-            {
-                [self requestUpdateUserInfo:self.textField.text];
-            }
-                break;
-            case CNLiveUserInfoDataTypeIntroduction://简介
-            {
-                [self requestUpdateUserInfo:self.textView.text];
-            }
-                break;
-                
-            default:
-                break;
-        }
-    }
+    });
 }
-
-- (void)didHideAlertController:(QMUIAlertController *)alertController{
+- (void)showError:(NSString *)text{
     self.navigationBar.right.userInteractionEnabled = YES;
-
+    [QMUITips hideAllToastInView:self.view animated:YES];
+    [QMUITips showError:text inView:self.view hideAfterDelay:timeValue];
 }
 #pragma mark - 懒加载
@@ -444,6 +575,133 @@ static const CGFloat timeValue = 1.5;
     return _navigationBar;
 }
+- (UIView *)contentView{
+    if(!_contentView){
+        _contentView = [[UIView alloc] initWithFrame:CGRectMake(0, NavigationContentTop+margin, SCREEN_WIDTH, 50)];
+        _contentView.backgroundColor = [UIColor whiteColor];
+        switch (self.model.dataType) {
+            case CNLiveUserInfoDataTypeHead:
+            {
+                self.view.backgroundColor = [UIColor blackColor];
+                _contentView.backgroundColor = [UIColor blackColor];
+
+                self.navigationBar.title.text = @"个人头像";
+                [self.view addSubview:self.imageView];
+
+            }
+                break;
+            case CNLiveUserInfoDataTypeNickname:
+            {
+                self.navigationBar.title.text = @"设置昵称";
+                
+                [_contentView addSubview:self.textField];
+                self.textField.placeholder = @"请输入昵称";
+
+                self.textField.text = self.model.content;
+            }
+                break;
+            case CNLiveUserInfoDataTypeAddress:
+            {
+                self.navigationBar.title.text = @"设置地区";
+                
+                [_contentView addSubview:self.textField];
+                self.textField.placeholder = @"请输入你所在的地区";
+
+                self.textField.text = self.model.content;
+            }
+                break;
+            case CNLiveUserInfoDataTypeIntroduction:
+            {
+                self.navigationBar.title.text = @"设置个性签名";
+
+                _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)];
+
+                [_contentView addSubview:self.textNum];
+                [self.textNum mas_makeConstraints:^(MASConstraintMaker *make) {
+                    make.right.equalTo(self.textView);
+                    make.bottom.equalTo(self.textView).offset(-margin);
+                }];
+            }
+                break;
+            default:
+            {
+                
+            }
+                break;
+        }
+        
+    }
+    return _contentView;
+    
+}
+
+- (UIImageView *)imageView{
+    if(!_imageView){
+        _imageView = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, SCREEN_WIDTH)];
+        _imageView.center = self.view.center;
+        UIImage *xw_image = [self xw_getImageName:@"default_avatar_f" bundleName:@"CNLiveMineModule" targetClass:[CNLiveInfoUpdateController class]];
+        [_imageView sd_setImageWithURL:[NSURL URLWithString:CNUserShareModel.bigFaceUrl?CNUserShareModel.bigFaceUrl:CNUserShareModel.faceUrl] placeholderImage:xw_image];
+    }
+    return _imageView;
+}
+
+- (UITextField *)textField{
+    if(!_textField){
+        _textField = [[UITextField alloc] initWithFrame:CGRectMake(margin, 0, SCREEN_WIDTH-2*margin, 50)];
+        _textField.delegate = self;
+        _textField.backgroundColor = [UIColor whiteColor];// 设置背景颜色
+        _textField.textColor = [UIColor blackColor];      // 设置文字的颜色
+        _textField.clearsOnBeginEditing = YES;            // 当第二次输入的时候，清空上一次的内容
+        _textField.font = [UIFont systemFontOfSize:15.0f];
+        _textField.clearButtonMode = UITextFieldViewModeWhileEditing; // 编辑的时候会显示出删除全部的小X
+        _textField.clearButtonMode = UITextFieldViewModeAlways;
+        _textField.backgroundColor = [UIColor whiteColor];
+        //设置显示模式为永远显示(默认不显示)
+        _textField.leftViewMode = UITextFieldViewModeAlways;
+        _textField.returnKeyType = UIReturnKeyDone;
+        _textField.delegate = self;
+        [_textField addTarget:self action:@selector(textFieldDidChange:) forControlEvents:UIControlEventEditingChanged];
+    }
+    return _textField;
+}
+
+- (UITextView *)textView{
+    if(!_textView){
+        _textView = [[UITextView alloc] initWithFrame:CGRectMake(margin, 0, SCREEN_WIDTH-2*margin, 120)];
+        _textView.delegate = self;
+        _textView.backgroundColor = [UIColor whiteColor];// 设置背景颜色
+        _textView.textColor = [UIColor blackColor];      // 设置文字的颜色
+        _textView.font = [UIFont systemFontOfSize:16.0f];
+    }
+    return _textView;
+}
+
+- (UILabel *)textNum {
+    if (!_textNum) {
+        _textNum = [[UILabel alloc] init];
+        _textNum.textColor = [UIColor colorWithRed:206/255.0 green:206/255.0 blue:206/255.0 alpha:1.0];
+        _textNum.font = [UIFont systemFontOfSize:16];
+        _textNum.text = @"30";
+    }
+    return _textNum;
+}
+
+#pragma mark - 响应方法
+- (void)goBack {
+    [self.textField resignFirstResponder];
+    [self.textView resignFirstResponder];
+
+    if (self.presentingViewController != nil) {
+        [self dismissViewControllerAnimated:YES completion:nil];
+    }
+    else {
+        [self.navigationController popViewControllerAnimated:YES];
+    }
+}
+
 /**
  *  创建图片
  *
@@ -63,9 +63,9 @@ static const NSInteger margin = 12;
     }else if (model.dataType == CNLiveUserInfoDataTypeGender){
-        if([model.content isEqualToString:@"0"]){
+        if([model.content isEqualToString:@"m"]){
             _content.text = @"男";
-        }else if([model.content isEqualToString:@"1"]){
+        }else if([model.content isEqualToString:@"f"]){
             _content.text = @"女";
         }else{
             _content.text = @"未知";
@@ -189,6 +189,7 @@ static const NSInteger margin = 12;
         _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];
+        _content.textAlignment = NSTextAlignmentRight;
     }
     return _content;
 }
@@ -76,7 +76,7 @@
                           @"layout":@"1",
                           @"data":@"5",
                           @"title":@"个性签名",
-                          @"content":CNUserShareModel.signature?CNUserShareModel.signature:@"懒到没签名!!!",
+                          @"content":CNUserShareModel.signature?CNUserShareModel.signature:@"懒到没签名!",
                           @"height":@"51",
                           @"lineHeight":@"0.5"
                           }
@@ -98,6 +98,7 @@ static const NSInteger margin = 15;
 }
 - (void)rightDidClicked:(UIButton *)btn{
     if (self.delegate && [self.delegate respondsToSelector:@selector(navigationBar:actionEvents:)]) {
+        self.right.userInteractionEnabled = NO;
         [self.delegate navigationBar:self actionEvents:@"2"];
     }
 }
@@ -334,6 +334,7 @@
 				"${BUILT_PRODUCTS_DIR}/CNLiveBaseTools/CNLiveBaseTools.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveBeeHive/CNLiveBeeHive.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveBusinessTools/CNLiveBusinessTools.framework",
+				"${BUILT_PRODUCTS_DIR}/CNLiveChooseCountry/CNLiveChooseCountry.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveCommonCategory/CNLiveCommonCategory.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveCommonClass/CNLiveCommonClass.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveEnvironment/CNLiveEnvironment.framework",
@@ -366,6 +367,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}/CNLiveChooseCountry.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCommonCategory.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCommonClass.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveEnvironment.framework",
@@ -8,7 +8,6 @@
 #import "CNLIVEAppDelegate.h"
 #import "CNLiveMineController.h"
-#import "CNLiveGoldWhereaboutsView.h"
 #import "CNUserInfoManager.h"
 @implementation CNLIVEAppDelegate