修改nickname的混用bug

FuSiLive/Classes/Login/Controller/FUSSetUserInfoViewController.m

@@ -98,6 +98,7 @@
     
     
     _nickLabel.text = FUSLocalizationHelper.localString(@"昵称：");
     _nickLabel.text = FUSLocalizationHelper.localString(@"昵称：");
     _nicknameTextField.placeholder = FUSLocalizationHelper.localString(@"设定您的昵称");
     _nicknameTextField.placeholder = FUSLocalizationHelper.localString(@"设定您的昵称");
+    _nicknameTextField.textColor = [UIColor fus_textColorRich];
     _sexLabel.text = FUSLocalizationHelper.localString(@"性别：");
     _sexLabel.text = FUSLocalizationHelper.localString(@"性别：");
     [_girlButton setTitle:FUSLocalizationHelper.localString(@"女") forState:UIControlStateNormal];
     [_girlButton setTitle:FUSLocalizationHelper.localString(@"女") forState:UIControlStateNormal];
     [_boyButton setTitle:FUSLocalizationHelper.localString(@"男") forState:UIControlStateNormal];
     [_boyButton setTitle:FUSLocalizationHelper.localString(@"男") forState:UIControlStateNormal];
@@ -116,8 +117,8 @@
     _nicknameTextField.delegate = self;
     _nicknameTextField.delegate = self;
     
     
 //    [_nicknameTextField setValue:[UIColor colorWithHex:@"#333333"] forKeyPath:@"_placeholderLabel.textColor"];
 //    [_nicknameTextField setValue:[UIColor colorWithHex:@"#333333"] forKeyPath:@"_placeholderLabel.textColor"];
-    NSAttributedString *attrString = [[NSAttributedString alloc] initWithString:FUSLocalizationHelper.localString(@"设定您的昵称") attributes:@{NSForegroundColorAttributeName:[UIColor colorWithHex:@"#333333"], NSFontAttributeName:_nicknameTextField.font}];
-    _nicknameTextField.attributedPlaceholder = attrString;
+//    NSAttributedString *attrString = [[NSAttributedString alloc] initWithString:FUSLocalizationHelper.localString(@"设定您的昵称") attributes:@{NSForegroundColorAttributeName:[UIColor colorWithHex:@"#333333"], NSFontAttributeName:_nicknameTextField.font}];
+//    _nicknameTextField.attributedPlaceholder = attrString;
 
 
     // 设置默认性别
     // 设置默认性别
     _selSex = -1;
     _selSex = -1;

FuSiLive/Classes/NewLive/Main/View/FunctionView/ShareToChat/FUSLiveShareToChatView.m

@@ -277,7 +277,7 @@
         FUSLiveShareToChatModel *userModel = [[FUSLiveShareToChatModel alloc] init];
         FUSLiveShareToChatModel *userModel = [[FUSLiveShareToChatModel alloc] init];
         userModel.uid = model.uid;
         userModel.uid = model.uid;
         userModel.face = model.faceimg;
         userModel.face = model.faceimg;
-        userModel.nickname = model.nickName;
+        userModel.nickname = model.nickname;
         userModel.level = model.level;
         userModel.level = model.level;
         userModel.privilege = model.privilege;
         userModel.privilege = model.privilege;
         userModel.selected = YES;
         userModel.selected = YES;

FuSiLive/Classes/NewsFeed/RichEditor/Controller/WGBaseRichEditorViewController.m

@@ -799,7 +799,7 @@ WKScriptMessageHandler
     searchVC.fromType = FUSSearchFromAtSomeOne;
     searchVC.fromType = FUSSearchFromAtSomeOne;
     searchVC.modalPresentationStyle = UIModalPresentationCustom;
     searchVC.modalPresentationStyle = UIModalPresentationCustom;
     searchVC.didSelectedModelBlock = ^(FUSMainSearchModel *model) {
     searchVC.didSelectedModelBlock = ^(FUSMainSearchModel *model) {
-        [weakSelf.webView insertAtSomeOneName:model.nickName uid:model.uid index:_atSomeOneArr.count Callback:^(id  _Nullable obj, NSError * _Nullable error) {
+        [weakSelf.webView insertAtSomeOneName:model.nickname uid:model.uid index:_atSomeOneArr.count Callback:^(id  _Nullable obj, NSError * _Nullable error) {
             [weakSelf.webView contentBecomeFirstResponder];
             [weakSelf.webView contentBecomeFirstResponder];
             [self fus_checkInputContent];
             [self fus_checkInputContent];
         }];
         }];

FuSiLive/Classes/Search/Model/FUSMainSearchModel.h

@@ -14,6 +14,8 @@
 @property (nonatomic, copy) NSString *level;
 @property (nonatomic, copy) NSString *level;
 @property (nonatomic, copy) NSString *face;
 @property (nonatomic, copy) NSString *face;
 @property (nonatomic, copy) NSString *lev;
 @property (nonatomic, copy) NSString *lev;
+@property (nonatomic, copy) NSString *nickname;
+/// 昵称，后台N,n不分，导致要写这个兼容
 @property (nonatomic, copy) NSString *nickName;
 @property (nonatomic, copy) NSString *nickName;
 @property (nonatomic, copy) NSString *markname;
 @property (nonatomic, copy) NSString *markname;
 @property (nonatomic, copy) NSString *uid;
 @property (nonatomic, copy) NSString *uid;

FuSiLive/Classes/Search/Model/FUSMainSearchModel.m

@@ -10,4 +10,18 @@
 
 
 @implementation FUSMainSearchModel
 @implementation FUSMainSearchModel
 
 
+- (NSString *)nickname{
+    if ([NSString isNull:_nickname]) {
+        _nickname = _nickName;
+    }
+    return _nickname;
+}
+- (NSString *)nickName{
+    if ([NSString isNull:_nickName]) {
+        _nickName = _nickname;
+    }
+    return _nickName;
+}
+
+
 @end
 @end

FuSiLive/Classes/Search/View/FUSMainSearchTableViewCell.m

@@ -78,7 +78,7 @@
     
     
     NSString *name = @"";
     NSString *name = @"";
     if ([NSString isNull:model.markname]) {
     if ([NSString isNull:model.markname]) {
-        name = model.nickName;
+        name = model.nickname;
     } else {
     } else {
         name = model.markname;
         name = model.markname;
     }
     }

FuSiLive/Classes/Search/View/FUSSearchTableViewCell.swift

@@ -148,7 +148,7 @@ class FUSSearchTableViewCell: UITableViewCell {
                 }
                 }
             }
             }
             
             
-            anchorName.text = searchModel?.nickName
+            anchorName.text = searchModel?.nickname
         }
         }
     }
     }