Merge branch 'feature/UI修改版本' of http://git.yabolive.net:88/pidan/FuSiLive into feature/UI修改版本

FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/View/FUSMyHeaderView.m

@@ -244,7 +244,7 @@
         }];
         }];
         
         
         UILabel *jewLabel = jewLabelsList[i];
         UILabel *jewLabel = jewLabelsList[i];
-        jewLabel.font = [UIFont fus_themeBoldFont:22];
+        jewLabel.font = [UIFont fus_themeBoldFont:20];
         [tempBgImgView addSubview:jewLabel];
         [tempBgImgView addSubview:jewLabel];
         [jewLabel mas_makeConstraints:^(MASConstraintMaker *make) {
         [jewLabel mas_makeConstraints:^(MASConstraintMaker *make) {
             make.centerX.equalTo(devImgView.mas_centerX);
             make.centerX.equalTo(devImgView.mas_centerX);

FuSiLive/Classes/FusiVersionFeature/ViewController/ImAnchor/FUSImAnchorViewController.m

@@ -200,7 +200,7 @@ typedef NS_ENUM(NSInteger, FUSImAnchorItemType){
         case FUSImAnchorItemTypeLiveTask: return [NSString fus_localString:@"直播任务"];
         case FUSImAnchorItemTypeLiveTask: return [NSString fus_localString:@"直播任务"];
         case FUSImAnchorItemTypePopular: return [NSString fus_localString:@"人气加成"];
         case FUSImAnchorItemTypePopular: return [NSString fus_localString:@"人气加成"];
         case FUSImAnchorItemTypeLiveTime: return [NSString fus_localString:@"直播时长"];
         case FUSImAnchorItemTypeLiveTime: return [NSString fus_localString:@"直播时长"];
-        case FUSImAnchorItemTypeTotalFire: return [NSString fus_localString:@"累计萤火"];
+        case FUSImAnchorItemTypeTotalFire: return [NSString fus_localString:@"收获萤火"];
         case FUSImAnchorItemTypePrivacyRoomSetting: return [NSString fus_localString:@"私房设置"];
         case FUSImAnchorItemTypePrivacyRoomSetting: return [NSString fus_localString:@"私房设置"];
         case FUSImAnchorItemTypeBroadcastBuild: return [NSString fus_localString:@"主播养成"];
         case FUSImAnchorItemTypeBroadcastBuild: return [NSString fus_localString:@"主播养成"];
         case FUSImAnchorItemTypeActivity: return [NSString fus_localString:@"活动"];
         case FUSImAnchorItemTypeActivity: return [NSString fus_localString:@"活动"];

FuSiLive/Classes/InstantMessaging/View/ToolViews/VideoChat/FunctionViews/FUSVideoChatUserInfoView.m

@@ -576,9 +576,9 @@ if (@available(iOS 11.0, *)) {height = 80 + UIView.fus_SafeBottom;}\
                 self.jewelLabel = label;
                 self.jewelLabel = label;
                 self.jewelLabel.textColor = UIColor.fus_diamondBlue;
                 self.jewelLabel.textColor = UIColor.fus_diamondBlue;
                 
                 
-                UIView *separateView = [[UIView alloc] initWithFrame:CGRectMake(i *viewWidth, (bgView.height - viewHeight * 0.3) / 2, 0.5, viewHeight * 0.3)];
-                separateView.backgroundColor = [[UIColor fus_lineColor] colorWithAlphaComponent:0.4];
-                [_bottomBgView addSubview:separateView];
+//                UIView *separateView = [[UIView alloc] initWithFrame:CGRectMake(i *viewWidth, (bgView.height - viewHeight * 0.3) / 2, 0.5, viewHeight * 0.3)];
+//                separateView.backgroundColor = [[UIColor fus_lineColor] colorWithAlphaComponent:0.4];
+//                [_bottomBgView addSubview:separateView];
             }
             }
                 break;
                 break;
             case 3:
             case 3:
@@ -1135,7 +1135,7 @@ if (@available(iOS 11.0, *)) {height = 80 + UIView.fus_SafeBottom;}\
     
     
     self.creditLabel = [[UILabel alloc] init];
     self.creditLabel = [[UILabel alloc] init];
     self.creditLabel.font = [UIFont fus_themeMediumFont:8];
     self.creditLabel.font = [UIFont fus_themeMediumFont:8];
-    self.creditLabel.text = [NSString fus_localString:@"私房信用："];
+    self.creditLabel.text = [NSString stringWithFormat:@"%@：",[NSString fus_localString:@"私房信用"]];
     self.creditLabel.textColor = [UIColor whiteColor];
     self.creditLabel.textColor = [UIColor whiteColor];
     [self.creditLabel sizeToFit];
     [self.creditLabel sizeToFit];
     [self.creditView addSubview:self.creditLabel];
     [self.creditView addSubview:self.creditLabel];

FuSiLive/Classes/Setting/Controller/FUSChangePasswordViewController.m

@@ -56,6 +56,10 @@
     _pwdOneTextField.textMaxLength = 16;
     _pwdOneTextField.textMaxLength = 16;
     _pwdTwoTextField.textMaxLength = 16;
     _pwdTwoTextField.textMaxLength = 16;
     
     
+    _pwdOldTextField.textColor = [UIColor fus_textColorRich];
+    _pwdOneTextField.textColor = [UIColor fus_textColorRich];
+    _pwdTwoTextField.textColor = [UIColor fus_textColorRich];
+    
     // 设置占位文字
     // 设置占位文字
     _pwdOldTextField.placeholder = [NSString fus_localString:@"请输入旧密码"];
     _pwdOldTextField.placeholder = [NSString fus_localString:@"请输入旧密码"];
     _pwdOneTextField.placeholder = [NSString fus_localString:@"请输入6~16位新密码"];
     _pwdOneTextField.placeholder = [NSString fus_localString:@"请输入6~16位新密码"];

FuSiLive/Classes/ZhaiXin/Main/View/FUSSingleLiveRecordV2TableViewCell.m

@@ -406,7 +406,8 @@
     
     
     //fusi:星星和评分按钮暂时不要
     //fusi:星星和评分按钮暂时不要
     //fusi:又tm要了，很烦
     //fusi:又tm要了，很烦
-//    self.callCommentBtn.hidden = YES;
+    //fusi:第三次，这个按钮又不要了，然后评分还是要
+    self.callCommentBtn.hidden = YES;
 //    self.callAlreadyCommentBgView.hidden = YES;
 //    self.callAlreadyCommentBgView.hidden = YES;
 }
 }
 
 

FuSiLive/Classes/Zone/View/FireFlyView/View/Cell/MyZoneCell/FUSMyZoneInfoCell.m

@@ -124,7 +124,11 @@
     }
     }
     
     
 //    FUSLevelDataModel *levelModel = [[FUSCacheDataShare shareStore].levelModelDict objectForKey:zoneModel.level];
 //    FUSLevelDataModel *levelModel = [[FUSCacheDataShare shareStore].levelModelDict objectForKey:zoneModel.level];
-    _richImageView.image = [UIImage fus_imageWithLevel:zoneModel.level.integerValue];
+    NSInteger level = 0;
+    if ([zoneModel.privilege[@"richPower"] integerValue] == 1) {
+        level = zoneModel.level.intValue;
+    }
+    _richImageView.image = [UIImage fus_imageWithLevel:level];
 //    if (isMyZone) {
 //    if (isMyZone) {
 //        if (zoneModel.level.integerValue > 0) {
 //        if (zoneModel.level.integerValue > 0) {
 //            _richImageView.hidden = NO;
 //            _richImageView.hidden = NO;

FuSiLive/Resources/LocalizationString/Fusi_Chinese.strings

@@ -2192,8 +2192,6 @@
 
 
 "发送验证码" = "獲取驗證碼";
 "发送验证码" = "獲取驗證碼";
 
 
-"私房信用：" = "私房信用：";
-
 "私房信用" = "私房信用";
 "私房信用" = "私房信用";
 
 
 "点赞将消耗%@，是否继续点赞" = "點讚將消耗%@，是否繼續點讚";
 "点赞将消耗%@，是否继续点赞" = "點讚將消耗%@，是否繼續點讚";