Skip to content

pidan / FuSiLive

Go to a project
Commit e5009b0c by pierce
Options

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

parents 7af8be63 203b1947
Inline Side-by-side
Showing with 135 additions and 82 deletions
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Views/ActionSheet/SLActionSheet.m
...@@ -181,7 +181,7 @@ ...@@ -181,7 +181,7 @@
// 上半部分 // 上半部分
UIView *upperPart = [[UIView alloc] init]; UIView *upperPart = [[UIView alloc] init];
upperPart.backgroundColor = [UIColor clearColor]; upperPart.backgroundColor = [UIColor whiteColor];
upperPart.layer.cornerRadius = DefaultCornerRadius; upperPart.layer.cornerRadius = DefaultCornerRadius;
upperPart.layer.masksToBounds = YES; upperPart.layer.masksToBounds = YES;
[_sheet addSubview:upperPart]; [_sheet addSubview:upperPart];
...@@ -235,8 +235,8 @@ ...@@ -235,8 +235,8 @@
[_sheet addSubview:line_title_msg]; [_sheet addSubview:line_title_msg];
[line_title_msg addConstraint:NSLayoutAttributeHeight equalTo:nil offset:1]; [line_title_msg addConstraint:NSLayoutAttributeHeight equalTo:nil offset:1];
[line_title_msg addConstraint:NSLayoutAttributeTop equalTo:titleView toAttribute:NSLayoutAttributeBottom offset:0]; [line_title_msg addConstraint:NSLayoutAttributeTop equalTo:titleView toAttribute:NSLayoutAttributeBottom offset:0];
[line_title_msg addConstraint:NSLayoutAttributeLeft equalTo:titleView offset:0]; [line_title_msg addConstraint:NSLayoutAttributeLeft equalTo:titleView offset:16];
[line_title_msg addConstraint:NSLayoutAttributeRight equalTo:titleView offset:0]; [line_title_msg addConstraint:NSLayoutAttributeRight equalTo:titleView offset:-16];
} }
...@@ -400,6 +400,7 @@ ...@@ -400,6 +400,7 @@
if (idx >0 && otherButtonTitles.count > 1) { if (idx >0 && otherButtonTitles.count > 1) {
[_sheet addSubview:line_otherBtn]; [_sheet addSubview:line_otherBtn];
// 这个是多btn情况下
[line_otherBtn addConstraint:NSLayoutAttributeLeft equalTo:otherBtn offset:16]; [line_otherBtn addConstraint:NSLayoutAttributeLeft equalTo:otherBtn offset:16];
[line_otherBtn addConstraint:NSLayoutAttributeRight equalTo:otherBtn offset:-16]; [line_otherBtn addConstraint:NSLayoutAttributeRight equalTo:otherBtn offset:-16];
[line_otherBtn addConstraint:NSLayoutAttributeTop equalTo:otherBtn toAttribute:NSLayoutAttributeBottom offset:0]; [line_otherBtn addConstraint:NSLayoutAttributeTop equalTo:otherBtn toAttribute:NSLayoutAttributeBottom offset:0];
......
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Views/FUSStyleButton.m
...@@ -128,6 +128,7 @@ ...@@ -128,6 +128,7 @@
_gradientView.cornerRadius = self.layer.cornerRadius; _gradientView.cornerRadius = self.layer.cornerRadius;
[_bgLayer addSublayer:_gradientView.layer]; [_bgLayer addSublayer:_gradientView.layer];
[self setTitleColor:[UIColor fus_textColorRich] forState:(UIControlStateNormal)];
} }
break; break;
case FUSButtonStyleGradientUpsideDown: case FUSButtonStyleGradientUpsideDown:
...@@ -168,6 +169,8 @@ ...@@ -168,6 +169,8 @@
// self.layer.shadowRadius = 0.8; // self.layer.shadowRadius = 0.8;
self.gradientLayer = gradientLayer; self.gradientLayer = gradientLayer;
[_bgLayer addSublayer:gradientLayer]; [_bgLayer addSublayer:gradientLayer];
[self setTitleColor:[UIColor fus_textColorRich] forState:(UIControlStateNormal)];
} }
break; break;
case FUSButtonStyleBlurGradientBorder: case FUSButtonStyleBlurGradientBorder:
...@@ -188,6 +191,8 @@ ...@@ -188,6 +191,8 @@
self.layer.cornerRadius = self.height / 2.0; self.layer.cornerRadius = self.height / 2.0;
[_bgLayer addSublayer:gradientLayer]; [_bgLayer addSublayer:gradientLayer];
[_bgLayer addSublayer:_gradientView.layer]; [_bgLayer addSublayer:_gradientView.layer];
[self setTitleColor:[UIColor fus_diamondBlue] forState:(UIControlStateNormal)];
} }
break; break;
case FUSButtonStyleGradientBorder: case FUSButtonStyleGradientBorder:
...@@ -196,6 +201,8 @@ ...@@ -196,6 +201,8 @@
_gradientView = [FUSGradientView fus_gradientViewWithType:FUSGradientViewTypeGreenAndBlueBorder frame:_bgLayer.bounds]; _gradientView = [FUSGradientView fus_gradientViewWithType:FUSGradientViewTypeGreenAndBlueBorder frame:_bgLayer.bounds];
_gradientView.cornerRadius = self.layer.cornerRadius; _gradientView.cornerRadius = self.layer.cornerRadius;
[_bgLayer addSublayer:_gradientView.layer]; [_bgLayer addSublayer:_gradientView.layer];
[self setTitleColor:[UIColor fus_diamondBlue] forState:(UIControlStateNormal)];
} }
break; break;
case FUSButtonStyleWhiteBorder: case FUSButtonStyleWhiteBorder:
...@@ -216,6 +223,8 @@ ...@@ -216,6 +223,8 @@
_gradientView.cornerRadius = _gradientView.height/2.0; _gradientView.cornerRadius = _gradientView.height/2.0;
[_bgLayer addSublayer:_gradientView.layer]; [_bgLayer addSublayer:_gradientView.layer];
[self.layer insertSublayer:self.imageView.layer above:_bgLayer]; [self.layer insertSublayer:self.imageView.layer above:_bgLayer];
[self setTitleColor:[UIColor fus_textColorLight2] forState:(UIControlStateNormal)];
} }
break; break;
case FUSButtonStyleBlue: case FUSButtonStyleBlue:
...@@ -226,6 +235,8 @@ ...@@ -226,6 +235,8 @@
self.layer.cornerRadius = self.height / 2.0f; self.layer.cornerRadius = self.height / 2.0f;
self.layer.masksToBounds = YES; self.layer.masksToBounds = YES;
self.backgroundColor = [UIColor fus_appMainColor]; self.backgroundColor = [UIColor fus_appMainColor];
[self setTitleColor:[UIColor fus_textColorRich] forState:(UIControlStateNormal)];
} }
break; break;
case FUSButtonStyleBlueBorder: case FUSButtonStyleBlueBorder:
...@@ -237,6 +248,8 @@ ...@@ -237,6 +248,8 @@
self.layer.borderColor = UIColor.fus_diamondBlue.CGColor; self.layer.borderColor = UIColor.fus_diamondBlue.CGColor;
self.layer.borderWidth = 1; self.layer.borderWidth = 1;
self.backgroundColor = [UIColor clearColor]; self.backgroundColor = [UIColor clearColor];
[self setTitleColor:[UIColor fus_diamondBlue] forState:(UIControlStateNormal)];
} }
break; break;
default: default:
......
FuSiLive/Assets.xcassets/Zone/zone_add_news_feed_btn.imageset/Contents.json
...@@ -5,12 +5,12 @@ ...@@ -5,12 +5,12 @@
"scale" : "1x" "scale" : "1x"
}, },
{ {
"filename" : "zone_add_news_feed_btn_press@2x.png", "filename" : "20230519-170121.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "2x" "scale" : "2x"
}, },
{ {
"filename" : "zone_add_news_feed_btn_press@3x.png", "filename" : "20230519-170118.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "3x" "scale" : "3x"
} }
......
FuSiLive/Classes/Authentication/Controller/FUSPhoneAuthViewController.m
...@@ -125,7 +125,7 @@ ...@@ -125,7 +125,7 @@
_verifyCodeBtn.layer.cornerRadius = _verifyCodeBtn.height / 2.0; _verifyCodeBtn.layer.cornerRadius = _verifyCodeBtn.height / 2.0;
_verifyCodeBtn.layer.borderWidth = 1; _verifyCodeBtn.layer.borderWidth = 1;
[_verifyCodeBtn setTitle:[NSString fus_localString:@"验证码"] forState:UIControlStateNormal]; [_verifyCodeBtn setTitle:[NSString fus_localString:@"发送验证码"] forState:UIControlStateNormal];
[self setVerifyCodeBtnEnable:NO]; [self setVerifyCodeBtnEnable:NO];
_confirmBtn.style = FUSButtonStyleBlue; _confirmBtn.style = FUSButtonStyleBlue;
...@@ -283,7 +283,7 @@ ...@@ -283,7 +283,7 @@
[_verifyCodeTimer invalidate]; [_verifyCodeTimer invalidate];
_verifyCodeTimer = nil; _verifyCodeTimer = nil;
[self setVerifyCodeBtnEnable:YES]; [self setVerifyCodeBtnEnable:YES];
[_verifyCodeBtn setTitle:[NSString fus_localString:@"验证码"] forState:UIControlStateNormal]; [_verifyCodeBtn setTitle:[NSString fus_localString:@"发送验证码"] forState:UIControlStateNormal];
return; return;
} }
......
FuSiLive/Classes/Common/Other/FUSCommonCacheOperate.m
...@@ -582,9 +582,10 @@ ...@@ -582,9 +582,10 @@
// 直播间富豪进度条显示开关（0：关、1：开） // 直播间富豪进度条显示开关（0：关、1：开）
[[NSUserDefaults standardUserDefaults] setObject:dataDict[@"liveRichSwitch"] forKey:LIVE_LIVERICHSWITCH]; [[NSUserDefaults standardUserDefaults] setObject:dataDict[@"liveRichSwitch"] forKey:LIVE_LIVERICHSWITCH];
// 视讯评论、按钮控制开关（0：关、1：开） // 视讯评论、按钮控制开关（0：关、1：开）
// [[NSUserDefaults standardUserDefaults] setObject:dataDict[@"videoCommentSwitch"] forKey:VIDEO_COMMENT_SWITCH]; [[NSUserDefaults standardUserDefaults] setObject:dataDict[@"videoCommentSwitch"] forKey:VIDEO_COMMENT_SWITCH];
// ludy:现在统一不打开 // ludy:现在统一不打开
[[NSUserDefaults standardUserDefaults] setObject:@"0" forKey:VIDEO_COMMENT_SWITCH]; // ludy:20240712 又tm要求要打开了，很烦
// [[NSUserDefaults standardUserDefaults] setObject:@"0" forKey:VIDEO_COMMENT_SWITCH];
NSNumber *livechatswitch = dataDict[@"livechatswitch"]; NSNumber *livechatswitch = dataDict[@"livechatswitch"];
if (livechatswitch) { if (livechatswitch) {
......
FuSiLive/Classes/FusiVersionFeature/Others/FUSControllerPushHelper.h
...@@ -30,6 +30,15 @@ NS_ASSUME_NONNULL_BEGIN ...@@ -30,6 +30,15 @@ NS_ASSUME_NONNULL_BEGIN
/// - animate: 动画 /// - animate: 动画
-(void)fus_pushToServiceControllerWithUID:(NSString * _Nullable )uid face:(NSString * _Nullable)facePath nikename:(NSString * _Nullable)nikename welcome:(NSString * _Nullable)welcomeStr animate:(BOOL)animate; -(void)fus_pushToServiceControllerWithUID:(NSString * _Nullable )uid face:(NSString * _Nullable)facePath nikename:(NSString * _Nullable)nikename welcome:(NSString * _Nullable)welcomeStr animate:(BOOL)animate;
/// 详细设置跳转到kf，返回kf的controller
/// - Parameters:
/// - uid: kf的uid
/// - facePath: kf的face
/// - nikename: kf的名字
/// - welcomeStr: 欢迎语句
/// - animate: 动画
-(UIViewController *)fus_controllerPushToServiceControllerWithUID:(NSString * _Nullable )uid face:(NSString * _Nullable)facePath nikename:(NSString * _Nullable)nikename welcome:(NSString * _Nullable)welcomeStr animate:(BOOL)animate;
/// 推出购买vip页面 /// 推出购买vip页面
-(void)fus_pushToBuyVIPControllerWithAnimate:(BOOL)animate; -(void)fus_pushToBuyVIPControllerWithAnimate:(BOOL)animate;
......
FuSiLive/Classes/FusiVersionFeature/Others/FUSControllerPushHelper.m
...@@ -26,7 +26,10 @@ ...@@ -26,7 +26,10 @@
} }
-(void)fus_pushToServiceControllerWithUID:(NSString *)uid face:(NSString *)facePath nikename:(NSString *)nikename welcome:(NSString *)welcomeStr animate:(BOOL)animate{ -(void)fus_pushToServiceControllerWithUID:(NSString *)uid face:(NSString *)facePath nikename:(NSString *)nikename welcome:(NSString *)welcomeStr animate:(BOOL)animate{
[self fus_controllerPushToServiceControllerWithUID:uid face:facePath nikename:nikename welcome:welcomeStr animate:animate];
}
- (UIViewController *)fus_controllerPushToServiceControllerWithUID:(NSString *)uid face:(NSString *)facePath nikename:(NSString *)nikename welcome:(NSString *)welcomeStr animate:(BOOL)animate{
UIViewController *vc = nil; UIViewController *vc = nil;
// 测试原生客服 // 测试原生客服
...@@ -66,9 +69,10 @@ ...@@ -66,9 +69,10 @@
NSArray *viewControllers = self.viewControllers; NSArray *viewControllers = self.viewControllers;
UIViewController *viewVC = [viewControllers lastObject]; UIViewController *viewVC = [viewControllers lastObject];
if ([viewVC isKindOfClass:[FUSSingleChatViewController class]]){ if ([viewVC isKindOfClass:[FUSSingleChatViewController class]]){
return; return viewVC;
} }
[self pushViewController:vc animated:animate]; [self pushViewController:vc animated:animate];
return vc;
} }
- (void)fus_pushToBuyVIPControllerWithAnimate:(BOOL)animate{ - (void)fus_pushToBuyVIPControllerWithAnimate:(BOOL)animate{
......
FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/FUSHomePageViewController.m
...@@ -312,8 +312,9 @@ ...@@ -312,8 +312,9 @@
} }
#pragma mark --- FUSHomeViewBaseDelegate #pragma mark --- FUSHomeViewBaseDelegate
- (void)fus_homeView:(UIView *)view didUpdateCollectionCntentMaxHeightWithFloor:(CGFloat)maxHeight{ - (void)fus_homeView:(UIView *)view didUpdateScrollViewCntentMaxHeightWithFloor:(CGFloat)maxHeight{
self.tabbarView.shouldBarCenterTransparency = maxHeight > (UIView.fus_screenH - [FUSFloatTabbarView fus_barHeight]); // self.tabbarView.shouldBarCenterTransparency = maxHeight > (UIView.fus_screenH - [FUSFloatTabbarView fus_barHeight]);
self.tabbarView.shouldBarCenterTransparency = maxHeight > UIView.fus_screenH;
} }
- (void)fus_homeScrollview:(UIScrollView *)view shouldHideNavigationBar:(BOOL)hidden{ - (void)fus_homeScrollview:(UIScrollView *)view shouldHideNavigationBar:(BOOL)hidden{
[self fus_shouldHideTabBar:hidden]; [self fus_shouldHideTabBar:hidden];
......
FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/View/FUSHomePageBaseView.h
...@@ -20,7 +20,7 @@ NS_ASSUME_NONNULL_BEGIN ...@@ -20,7 +20,7 @@ NS_ASSUME_NONNULL_BEGIN
/// - Parameters: /// - Parameters:
/// - view: 哪一个view /// - view: 哪一个view
/// - maxHeight: 最大高度 /// - maxHeight: 最大高度
-(void)fus_homeView:(UIView *)view didUpdateCollectionCntentMaxHeightWithFloor:(CGFloat)maxHeight; -(void)fus_homeView:(UIView *)view didUpdateScrollViewCntentMaxHeightWithFloor:(CGFloat)maxHeight;
......
FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/View/FUSHomeView.m
...@@ -158,13 +158,14 @@ ...@@ -158,13 +158,14 @@
#pragma mark --- scrollview delegate #pragma mark --- scrollview delegate
- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section { - (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section {
if (self.fus_baseDelegate && [self.fus_baseDelegate respondsToSelector:@selector(fus_homeView:didUpdateCollectionCntentMaxHeightWithFloor:)]) { if (self.fus_baseDelegate && [self.fus_baseDelegate respondsToSelector:@selector(fus_homeView:didUpdateScrollViewCntentMaxHeightWithFloor:)]) {
CGFloat contentH = 0; CGFloat contentH = 0;
NSInteger line = self.viewModel.dataList.count / self.columnsCount; NSInteger line = self.viewModel.dataList.count / self.columnsCount;
NSInteger last = self.viewModel.dataList.count % self.columnsCount; NSInteger last = self.viewModel.dataList.count % self.columnsCount;
contentH = [self fus_itemWidth] * line; contentH = [self fus_itemWidth] * line;
// contentH = contentH + (last > 1 ? 1 : 0) * [self fus_itemWidth]; // contentH = contentH + (last > 1 ? 1 : 0) * [self fus_itemWidth];
[self.fus_baseDelegate fus_homeView:self didUpdateCollectionCntentMaxHeightWithFloor:contentH]; contentH += collectionView.contentInset.top;
[self.fus_baseDelegate fus_homeView:self didUpdateScrollViewCntentMaxHeightWithFloor:contentH];
} }
return self.viewModel.dataList.count; return self.viewModel.dataList.count;
} }
......
FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/View/FUSMyView.m
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
#import "FUSBoundAgentInfoView.h" #import "FUSBoundAgentInfoView.h"
#import "FUSZoneCanSendNewsFeedTipView.h" #import "FUSZoneCanSendNewsFeedTipView.h"
#import "FUSCustomSettingCell.h" #import "FUSCustomSettingCell.h"
#import "FUSControllerPushHelper.h"
typedef NS_ENUM(NSInteger, FUSMySettingItemType){ typedef NS_ENUM(NSInteger, FUSMySettingItemType){
FUSMySettingItemTypeImAnchor = 0, FUSMySettingItemTypeImAnchor = 0,
...@@ -606,9 +607,7 @@ typedef NS_ENUM(NSInteger, FUSMySettingItemType){ ...@@ -606,9 +607,7 @@ typedef NS_ENUM(NSInteger, FUSMySettingItemType){
case FUSMySettingItemTypeHelp:{ case FUSMySettingItemTypeHelp:{
if (FUSConfig.sharedInstanced.devConfigs.appStatus) { if (FUSConfig.sharedInstanced.devConfigs.appStatus) {
FUSSingleChatViewController *serviceChat = [[FUSSingleChatViewController alloc] initWithUID:@(SERVEICE_UID).stringValue face:nil nikename:nil]; [self.parentController.navigationController fus_pushToServiceControllerWithAnimate:YES];
serviceChat.isServiceAccount = YES;
[self.parentController.navigationController pushViewController:serviceChat animated:YES];
} else { } else {
FUSWKWebViewController *webVC = [[FUSWKWebViewController alloc] init]; FUSWKWebViewController *webVC = [[FUSWKWebViewController alloc] init];
// NSString *webURL = FUSLocalizationHelper.isArbicLanguage ? URL_WEB_ARBIC_HELP : URL_WEB_HELP; // NSString *webURL = FUSLocalizationHelper.isArbicLanguage ? URL_WEB_ARBIC_HELP : URL_WEB_HELP;
......
FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/cell/FUSHomeAnchorListSmallCell.m
...@@ -138,6 +138,7 @@ ...@@ -138,6 +138,7 @@
if (model.fus_itemType == 0) { if (model.fus_itemType == 0) {
self.nickNameLabel.hidden = NO; self.nickNameLabel.hidden = NO;
self.nickNameLabel.text = model.nickname; self.nickNameLabel.text = model.nickname;
self.bottomAlphaBgView.hidden = NO;
if ([NSString isNull:model.addr]) { if ([NSString isNull:model.addr]) {
self.locationBtn.hidden = YES; self.locationBtn.hidden = YES;
}else { }else {
...@@ -181,6 +182,7 @@ ...@@ -181,6 +182,7 @@
self.locationBtn.hidden = YES; self.locationBtn.hidden = YES;
self.hotNumBtn.hidden = YES; self.hotNumBtn.hidden = YES;
self.tagView.hidden = YES; self.tagView.hidden = YES;
self.bottomAlphaBgView.hidden = YES;
FUSWeakSelf(weakSelf); FUSWeakSelf(weakSelf);
[self.bgImageView setBaoFangCoverWebImageWithSubURLString:[FUSConfig.sharedInstanced.pathConfigs thumbImageUrl:model.fus_insertModel.cover] placeholder:[UIImage fus_defaultIcon] completion:^(UIImage * _Nullable image, NSURL * _Nonnull url, YYWebImageFromType from, YYWebImageStage stage, NSError * _Nullable error) { [self.bgImageView setBaoFangCoverWebImageWithSubURLString:[FUSConfig.sharedInstanced.pathConfigs thumbImageUrl:model.fus_insertModel.cover] placeholder:[UIImage fus_defaultIcon] completion:^(UIImage * _Nullable image, NSURL * _Nonnull url, YYWebImageFromType from, YYWebImageStage stage, NSError * _Nullable error) {
......
FuSiLive/Classes/FusiVersionFeature/ViewController/Tabbar/FUSFloatTabbarView.h
...@@ -24,7 +24,7 @@ NS_ASSUME_NONNULL_BEGIN ...@@ -24,7 +24,7 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic, assign, readonly) NSInteger currentIndex; @property (nonatomic, assign, readonly) NSInteger currentIndex;
/// 当滑动到中间的时候是否需要透明 /// 当滑动到中间的时候是否需要透明(其实就是home的scrollview是否大于整个screen的高度,大于就是yes)
@property (nonatomic, assign) BOOL shouldBarCenterTransparency; @property (nonatomic, assign) BOOL shouldBarCenterTransparency;
/// 设置选择的index /// 设置选择的index
......
FuSiLive/Classes/Login/Controller/FUSForgetPasswordViewController.m
...@@ -231,8 +231,8 @@ ...@@ -231,8 +231,8 @@
NSAttributedString *attrString4 = [[NSAttributedString alloc] initWithString: [NSString fus_localString:@"请再次输入新密码"] attributes:@{NSForegroundColorAttributeName:[UIColor colorWithHex:@"828282"], NSFontAttributeName:_phoneTextField.font}]; NSAttributedString *attrString4 = [[NSAttributedString alloc] initWithString: [NSString fus_localString:@"请再次输入新密码"] attributes:@{NSForegroundColorAttributeName:[UIColor colorWithHex:@"828282"], NSFontAttributeName:_phoneTextField.font}];
_passwordTextFieldTwo.attributedPlaceholder = attrString4; _passwordTextFieldTwo.attributedPlaceholder = attrString4;
[_verifyCodeButton setTitle:[NSString fus_localString:@"验证码"] forState:UIControlStateNormal]; [_verifyCodeButton setTitle:[NSString fus_localString:@"发送验证码"] forState:UIControlStateNormal];
[_verifyCodeButton2 setTitle:[NSString fus_localString:@"验证码"] forState:UIControlStateNormal]; [_verifyCodeButton2 setTitle:[NSString fus_localString:@"发送验证码"] forState:UIControlStateNormal];
[_enterButton setTitle:[NSString fus_localString:@"确定"] forState:UIControlStateNormal]; [_enterButton setTitle:[NSString fus_localString:@"确定"] forState:UIControlStateNormal];
} }
...@@ -306,7 +306,7 @@ ...@@ -306,7 +306,7 @@
if (_phoneTextField.isFirstResponder) { if (_phoneTextField.isFirstResponder) {
_verifyCodeBtnConstraint.constant = 53; _verifyCodeBtnConstraint.constant = 53;
[_verifyCodeButton setTitle:[NSString fus_localString:@"验证码"] forState:UIControlStateNormal]; [_verifyCodeButton setTitle:[NSString fus_localString:@"发送验证码"] forState:UIControlStateNormal];
[_verifyCodeTimer invalidate]; [_verifyCodeTimer invalidate];
_verifyCodeTimer = nil; _verifyCodeTimer = nil;
} }
......
FuSiLive/Classes/Login/Controller/FUSMessageRegisterViewController.m
...@@ -334,7 +334,7 @@ ...@@ -334,7 +334,7 @@
[atrrStr addAttribute:NSForegroundColorAttributeName value:[UIColor colorWithHex:@"999999"] range:NSMakeRange(0, atrrStr.length - 1)]; [atrrStr addAttribute:NSForegroundColorAttributeName value:[UIColor colorWithHex:@"999999"] range:NSMakeRange(0, atrrStr.length - 1)];
[_turnToLoginBtn setAttributedTitle:atrrStr forState:UIControlStateNormal]; [_turnToLoginBtn setAttributedTitle:atrrStr forState:UIControlStateNormal];
[self setupGetVerifyCodeBtnContent:[NSString fus_localString:@"验证码"]]; [self setupGetVerifyCodeBtnContent:[NSString fus_localString:@"发送验证码"]];
_inviteCodeTextField.placeholder = [NSString fus_localString:@"输入邀请码（选填）"]; _inviteCodeTextField.placeholder = [NSString fus_localString:@"输入邀请码（选填）"];
} }
...@@ -830,7 +830,7 @@ ...@@ -830,7 +830,7 @@
{ {
FUSTextField *textField = notification.object; FUSTextField *textField = notification.object;
NSString *titleStr = [NSString fus_localString:@"重新传送"]; NSString *titleStr = [NSString fus_localString:@"重新传送"];
if ((_phoneTextField.text.length > 0 && _phoneTextField.isFirstResponder) || [_getVerifyCodeBtn.titleLabel.text containsString:titleStr] || ([_getVerifyCodeBtn.titleLabel.text containsString:[NSString fus_localString:@"验证码"]]&&_phoneTextField.text.length > 0)) { if ((_phoneTextField.text.length > 0 && _phoneTextField.isFirstResponder) || [_getVerifyCodeBtn.titleLabel.text containsString:titleStr] || ([_getVerifyCodeBtn.titleLabel.text containsString:[NSString fus_localString:@"发送验证码"]]&&_phoneTextField.text.length > 0)) {
[self setupGetVerifyCodeBtnEnable:YES]; [self setupGetVerifyCodeBtnEnable:YES];
}else{ }else{
[self setupGetVerifyCodeBtnEnable:NO]; [self setupGetVerifyCodeBtnEnable:NO];
...@@ -867,7 +867,7 @@ ...@@ -867,7 +867,7 @@
isPhoneValid = YES; isPhoneValid = YES;
}else{ }else{
_verifyCodeBtnConstrait.constant = 53; _verifyCodeBtnConstrait.constant = 53;
[self setupGetVerifyCodeBtnContent:[NSString fus_localString:@"验证码"]]; [self setupGetVerifyCodeBtnContent:[NSString fus_localString:@"发送验证码"]];
[self setupGetVerifyCodeBtnEnable:NO]; [self setupGetVerifyCodeBtnEnable:NO];
[_verifyCodeTimer invalidate]; [_verifyCodeTimer invalidate];
_verifyCodeTimer = nil; _verifyCodeTimer = nil;
......
FuSiLive/Classes/NewLive/Main/Other/FUSLiveHelper.m
...@@ -757,7 +757,7 @@ ...@@ -757,7 +757,7 @@
结束观看直播，页面关闭后的回调 结束观看直播，页面关闭后的回调
*/ */
+ (void)fus_quitLiveClosedHandler { + (void)fus_quitLiveClosedHandler {
[[FUSLiveHelper shareInstance] fus_quitRoom]; // [[FUSLiveHelper shareInstance] fus_quitRoom];
[[FUSLiveHelper shareInstance] fus_destory]; [[FUSLiveHelper shareInstance] fus_destory];
} }
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/AudienceListView/ContributeList/FUSContributeListView.m
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
self.emptyView.contentAligment = FUSEmptyViewAligmentCenter; self.emptyView.contentAligment = FUSEmptyViewAligmentCenter;
[self.emptyView fus_setEmptyViewIcon:[UIImage imageNamed:@"fireFly_zone_empty_fireCount"] title:[NSString fus_localString:@"当前还没用户上榜"] buttonTittle:nil]; [self.emptyView fus_setEmptyViewIcon:[UIImage imageNamed:@"fireFly_zone_empty_fireCount"] title:[NSString fus_localString:@"当前还没用户上榜"] buttonTittle:nil];
self.emptyView.imageScale = 0.3; self.emptyView.imageScale = 0.3;
self.emptyView.contentVerticalOffset = -30; self.emptyView.contentVerticalOffset = -20;
self.emptyView.backgroundColor = [UIColor clearColor]; self.emptyView.backgroundColor = [UIColor clearColor];
[self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) {
......
FuSiLive/Classes/NewsFeed/Views/FUSNewsFeedCollectionView.m
...@@ -269,8 +269,9 @@ ...@@ -269,8 +269,9 @@
[self.emptyView removeFromSuperview]; [self.emptyView removeFromSuperview];
self.emptyView = nil; self.emptyView = nil;
self.emptyView = [[FUSEmptyView alloc] initWithFrame:frame]; self.emptyView = [[FUSEmptyView alloc] initWithFrame:frame];
self.emptyView.type = FUSEmptyViewTypeBG; self.emptyView.type = FUSEmptyViewTypeImage;
self.emptyView.contentVerticalOffset = 80; self.emptyView.imageScale = 0.3;
self.emptyView.contentVerticalOffset = -20;
switch (self.dataHelper.dataType) { switch (self.dataHelper.dataType) {
case FUSNewsFeedDataTypeRecommond: case FUSNewsFeedDataTypeRecommond:
case FUSNewsFeedDataTypeFollow: case FUSNewsFeedDataTypeFollow:
......
FuSiLive/Classes/Payment/Controller/FUSRechargeViewController.m
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
#import "FUSLiveHelper.h" #import "FUSLiveHelper.h"
#import "EventTrackParams.h" #import "EventTrackParams.h"
#import "FUSNotificationCenter.h" #import "FUSNotificationCenter.h"
#import "FUSControllerPushHelper.h"
#import <FirebaseAnalytics/FirebaseAnalytics.h> #import <FirebaseAnalytics/FirebaseAnalytics.h>
...@@ -464,9 +465,7 @@ ...@@ -464,9 +465,7 @@
- (void)fus_enterServiceRoom{ - (void)fus_enterServiceRoom{
FUSSingleChatViewController *serviceChat = [[FUSSingleChatViewController alloc] initWithUID:IM_SERVEICE_UID face:nil nikename:nil]; [self.navigationController fus_pushToServiceControllerWithAnimate:YES];
serviceChat.isServiceAccount = YES;
[self.navigationController pushViewController:serviceChat animated:YES];
} }
#pragma mark - UITableViewDelegate #pragma mark - UITableViewDelegate
......
FuSiLive/Classes/Setting/View/FUSNetworkCheckCaptureView.m
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
// //
#import "FUSNetworkCheckCaptureView.h" #import "FUSNetworkCheckCaptureView.h"
#import "FUSControllerPushHelper.h"
#import "FUSSingleChatViewController.h" #import "FUSSingleChatViewController.h"
#import "FUSDefine.h" #import "FUSDefine.h"
...@@ -70,16 +71,17 @@ ...@@ -70,16 +71,17 @@
[self tapToClose]; [self tapToClose];
FUSSingleChatViewController *serviceChat = [[FUSSingleChatViewController alloc] initWithUID:[NSString stringWithFormat:@"%d",SERVEICE_UID] face:nil nikename:nil]; UIViewController *vc = [[UINavigationController fus_topViewController].navigationController fus_controllerPushToServiceControllerWithUID:nil face:nil nikename:nil welcome:nil animate:YES];
serviceChat.isServiceAccount = YES;
[[UIViewController fus_topViewController].navigationController pushViewController:serviceChat animated:YES];
NSData *imageData = UIImageJPEGRepresentation(self.captureImage, 1); NSData *imageData = UIImageJPEGRepresentation(self.captureImage, 1);
[self saveImageInfoSanbox:imageData succeed:^(NSString *localPath) { [self saveImageInfoSanbox:imageData succeed:^(NSString *localPath) {
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.3 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.3 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
UIImage *image = self.captureImage; UIImage *image = self.captureImage;
NSURL *imageURL = [NSURL fileURLWithPath:localPath]; NSURL *imageURL = [NSURL fileURLWithPath:localPath];
[serviceChat sendImageWithAssetsURL:imageURL image:image]; if ([vc isKindOfClass:[FUSSingleChatViewController class]]) {
[(FUSSingleChatViewController *)vc sendImageWithAssetsURL:imageURL image:image];
}
// [serviceChat sendImageWithAssetsURL:imageURL image:image];
}); });
}]; }];
} }
......
FuSiLive/Classes/ZhaiXin/IntimatesFriends/View/FUSIntimateFriendTableView.m
...@@ -85,7 +85,10 @@ ...@@ -85,7 +85,10 @@
if (page == 1) { if (page == 1) {
[self.friendsDataList removeAllObjects]; [self.friendsDataList removeAllObjects];
if (friendArray.count == 0) { if (friendArray.count == 0) {
FUSEmptyView *emptyView = [[FUSEmptyView alloc] initWithFrame:CGRectMake(0, 0, UIView.fus_screenW, UIView.fus_screenH - UIView.fus_StatusBarAndNavgationBarHeight - UIView.fus_tabbarHeight)]; // FUSEmptyView *emptyView = [[FUSEmptyView alloc] initWithFrame:CGRectMake(0, 0, UIView.fus_screenW, UIView.fus_screenH - UIView.fus_StatusBarAndNavgationBarHeight - UIView.fus_tabbarHeight)];
FUSEmptyView *emptyView = [[FUSEmptyView alloc] initWithFrame:CGRectMake(0, 0, UIView.fus_screenW, self.height - 100 + 22)];
emptyView.imageScale = 0.3;
emptyView.contentVerticalOffset = -20;
[emptyView fus_setEmptyViewIcon:[UIImage imageNamed:@"com_icon_hot_no_data_empty"] title:[NSString fus_localString:@"您还没有亲密好友"] buttonTittle:nil]; [emptyView fus_setEmptyViewIcon:[UIImage imageNamed:@"com_icon_hot_no_data_empty"] title:[NSString fus_localString:@"您还没有亲密好友"] buttonTittle:nil];
self.tableFooterView = emptyView; self.tableFooterView = emptyView;
} else { } else {
......
FuSiLive/Classes/ZhaiXin/Main/Controller/FUSIMZhaiXinViewController.m
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
#import "FUSSegmentControlView.h" #import "FUSSegmentControlView.h"
#import "FUSZhaiXinSettingPopView.h" #import "FUSZhaiXinSettingPopView.h"
#import "FUSSingleChatViewController.h" #import "FUSControllerPushHelper.h"
#import "FUSZhaiXinModel.h" #import "FUSZhaiXinModel.h"
#import "FUSZhaiXinDBOperate.h" #import "FUSZhaiXinDBOperate.h"
#import "FUSIMChatService.h" #import "FUSIMChatService.h"
...@@ -207,10 +207,13 @@ ...@@ -207,10 +207,13 @@
_segCtrlView.itemSelectedFont = [UIFont fus_themeBoldFont:21]; _segCtrlView.itemSelectedFont = [UIFont fus_themeBoldFont:21];
[_segCtrlView fus_setItemTitleColor:[UIColor fus_textColorLight] forState:UIControlStateNormal]; [_segCtrlView fus_setItemTitleColor:[UIColor fus_textColorLight] forState:UIControlStateNormal];
[_segCtrlView fus_setItemTitleColor:[UIColor fus_textColorRich] forState:UIControlStateSelected]; [_segCtrlView fus_setItemTitleColor:[UIColor fus_textColorRich] forState:UIControlStateSelected];
if (_itemNames.count == 1) { if (_itemNames.count <= 1) {
_segCtrlView.isShowUnderLine = NO; _segCtrlView.isShowUnderLine = NO;
_segCtrlView.underLine.backgroundColor = [UIColor clearColor];
_segCtrlView.itemSelectedFont = [UIFont fus_themeBoldFont:17];
}else { }else {
_segCtrlView.isShowUnderLine = YES; _segCtrlView.isShowUnderLine = YES;
_segCtrlView.underLine.backgroundColor = [UIColor fus_textColorRich];
} }
if (UIView.fus_screenW > 320) { if (UIView.fus_screenW > 320) {
_segCtrlView.space = 30; _segCtrlView.space = 30;
...@@ -323,9 +326,10 @@ ...@@ -323,9 +326,10 @@
} }
- (void)fus_enterServiceRoom{ - (void)fus_enterServiceRoom{
FUSSingleChatViewController *serviceChat = [[FUSSingleChatViewController alloc] initWithUID:@"1000" face:nil nikename:nil]; // FUSSingleChatViewController *serviceChat = [[FUSSingleChatViewController alloc] initWithUID:@"1000" face:nil nikename:nil];
serviceChat.isServiceAccount = YES; // serviceChat.isServiceAccount = YES;
[self.navigationController pushViewController:serviceChat animated:YES]; // [self.navigationController pushViewController:serviceChat animated:YES];
[self.navigationController fus_pushToServiceControllerWithAnimate:YES];
} }
- (void)fus_refreshServiceUnread{ - (void)fus_refreshServiceUnread{
......
FuSiLive/Classes/ZhaiXin/Main/View/FUSSingleLiveRecordV2TableViewCell.m
...@@ -405,8 +405,9 @@ ...@@ -405,8 +405,9 @@
} }
//fusi:星星和评分按钮暂时不要 //fusi:星星和评分按钮暂时不要
self.callCommentBtn.hidden = YES; //fusi:又tm要了，很烦
self.callAlreadyCommentBgView.hidden = YES; // self.callCommentBtn.hidden = YES;
// self.callAlreadyCommentBgView.hidden = YES;
} }
#pragma mark - Action #pragma mark - Action
......
FuSiLive/Classes/ZhaiXin/Main/View/FUSZhaiXinTableView.m
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#import "FUSSingleChatDBOperate.h" #import "FUSSingleChatDBOperate.h"
#import "FUSIMChatService.h" #import "FUSIMChatService.h"
#import "FUSZhaiXinHttpHelper.h" #import "FUSZhaiXinHttpHelper.h"
#import "FUSSingleChatViewController.h" #import "FUSControllerPushHelper.h"
#import "FUSSingleLiveRecordViewController.h" #import "FUSSingleLiveRecordViewController.h"
#import "FUSSettingViewController.h" #import "FUSSettingViewController.h"
#import "FUSNewsFeedListViewController.h" #import "FUSNewsFeedListViewController.h"
...@@ -135,9 +135,10 @@ ...@@ -135,9 +135,10 @@
[model.uid isEqualToString:IM_SERVEICE_UID1]|| [model.uid isEqualToString:IM_SERVEICE_UID1]||
[model.uid isEqualToString:IM_SERVEICE_UID2]) { [model.uid isEqualToString:IM_SERVEICE_UID2]) {
FUSSingleChatViewController *serviceChat = [[FUSSingleChatViewController alloc] initWithUID:model.uid face:model.face nikename:model.nickname]; // FUSSingleChatViewController *serviceChat = [[FUSSingleChatViewController alloc] initWithUID:model.uid face:model.face nikename:model.nickname];
serviceChat.isServiceAccount = YES; // serviceChat.isServiceAccount = YES;
[self.viewController.navigationController pushViewController:serviceChat animated:YES]; // [self.viewController.navigationController pushViewController:serviceChat animated:YES];
[self.viewController.navigationController fus_pushToServiceControllerWithUID:model.uid face:model.face nikename:model.nickname welcome:nil animate:YES];
}else{ }else{
[FUSTalkingData fus_trackEvent:EVENT_MESSAGE_CHATPAGE]; [FUSTalkingData fus_trackEvent:EVENT_MESSAGE_CHATPAGE];
FUSChatDetailViewController *chatDetailVC = [[FUSChatDetailViewController alloc] initWithUid:model.uid faceUrl:model.face nickName:model.nickname]; FUSChatDetailViewController *chatDetailVC = [[FUSChatDetailViewController alloc] initWithUid:model.uid faceUrl:model.face nickName:model.nickname];
...@@ -253,9 +254,9 @@ ...@@ -253,9 +254,9 @@
if (_dataArray.count == 0) { if (_dataArray.count == 0) {
// FUSEmptyView *emptyView = [[FUSEmptyView alloc] initWithFrame:CGRectMake(0, 0, UIView.fus_screenW, UIView.fus_screenH - UIView.fus_StatusBarAndNavgationBarHeight - UIView.fus_tabbarHeight)]; // FUSEmptyView *emptyView = [[FUSEmptyView alloc] initWithFrame:CGRectMake(0, 0, UIView.fus_screenW, UIView.fus_screenH - UIView.fus_StatusBarAndNavgationBarHeight - UIView.fus_tabbarHeight)];
FUSEmptyView *emptyView = [[FUSEmptyView alloc] initWithFrame:CGRectMake(0, 0, UIView.fus_screenW, self.height - self.headerView.height)]; FUSEmptyView *emptyView = [[FUSEmptyView alloc] initWithFrame:CGRectMake(0, 0, UIView.fus_screenW, self.height - self.headerView.height - 100)];
emptyView.imageScale = 0.3; emptyView.imageScale = 0.3;
emptyView.contentVerticalOffset = -30; emptyView.contentVerticalOffset = -20;
[emptyView fus_setEmptyViewIcon:[UIImage imageNamed:@"com_icon_hot_no_data_empty"] title:[NSString fus_localString:@"您还没有收到私信"] buttonTittle:nil]; [emptyView fus_setEmptyViewIcon:[UIImage imageNamed:@"com_icon_hot_no_data_empty"] title:[NSString fus_localString:@"您还没有收到私信"] buttonTittle:nil];
self.tableFooterView = emptyView; self.tableFooterView = emptyView;
} else { } else {
......
FuSiLive/Classes/Zone/Controller/FUSMotoringWareHouseViewController.m
...@@ -130,7 +130,7 @@ ...@@ -130,7 +130,7 @@
FUSEmptyView *emptyView = [[FUSEmptyView alloc] initWithFrame:CGRectMake(0, 0, UIView.fus_screenW, UIView.fus_screenH-UIView.fus_StatusBarAndNavgationBarHeight)]; FUSEmptyView *emptyView = [[FUSEmptyView alloc] initWithFrame:CGRectMake(0, 0, UIView.fus_screenW, UIView.fus_screenH-UIView.fus_StatusBarAndNavgationBarHeight)];
[emptyView fus_setEmptyViewIcon:[UIImage fus_emptyImg] title:[NSString fus_localString:@"暂无座驾以供选择"] buttonTittle:nil]; [emptyView fus_setEmptyViewIcon:[UIImage fus_emptyImg] title:[NSString fus_localString:@"暂无座驾以供选择"] buttonTittle:nil];
emptyView.imageScale = 0.3; emptyView.imageScale = 0.3;
emptyView.contentVerticalOffset = -30; emptyView.contentVerticalOffset = -20;
[self.view addSubview:emptyView]; [self.view addSubview:emptyView];
} }
[self.tableView.mj_header endRefreshing]; [self.tableView.mj_header endRefreshing];
......
FuSiLive/Classes/Zone/View/FireFlyView/View/Cell/MyZoneCell/FUSMyZoneInfoCell.xib
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="vip_icon_none_vip" translatesAutoresizingMaskIntoConstraints="NO" id="taI-i1-CE8"> <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="vip_icon_none_vip" translatesAutoresizingMaskIntoConstraints="NO" id="taI-i1-CE8">
<rect key="frame" x="134.5" y="2.5" width="16" height="16"/> <rect key="frame" x="131.5" y="2.5" width="16" height="16"/>
<constraints> <constraints>
<constraint firstAttribute="height" constant="16" id="Ml7-gx-T7e"/> <constraint firstAttribute="height" constant="16" id="Ml7-gx-T7e"/>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="16" id="lPq-8U-Oe3"/> <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="16" id="lPq-8U-Oe3"/>
...@@ -139,7 +139,7 @@ ...@@ -139,7 +139,7 @@
</constraints> </constraints>
</view> </view>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="f9D-yI-ehB"> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="f9D-yI-ehB">
<rect key="frame" x="124.5" y="-7.5" width="36" height="36"/> <rect key="frame" x="121.5" y="-7.5" width="36" height="36"/>
<inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/> <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
<connections> <connections>
<action selector="fus_clickRichBtnAction:" destination="KGk-i7-Jjw" eventType="touchUpInside" id="o4D-g0-X13"/> <action selector="fus_clickRichBtnAction:" destination="KGk-i7-Jjw" eventType="touchUpInside" id="o4D-g0-X13"/>
...@@ -172,7 +172,7 @@ ...@@ -172,7 +172,7 @@
<constraint firstItem="f9D-yI-ehB" firstAttribute="leading" secondItem="taI-i1-CE8" secondAttribute="leading" constant="-10" id="9aV-g5-gMF"/> <constraint firstItem="f9D-yI-ehB" firstAttribute="leading" secondItem="taI-i1-CE8" secondAttribute="leading" constant="-10" id="9aV-g5-gMF"/>
<constraint firstItem="Yif-2n-DuE" firstAttribute="centerY" secondItem="npl-JZ-Urd" secondAttribute="centerY" id="Af2-9D-TfF"/> <constraint firstItem="Yif-2n-DuE" firstAttribute="centerY" secondItem="npl-JZ-Urd" secondAttribute="centerY" id="Af2-9D-TfF"/>
<constraint firstItem="VBp-ED-tro" firstAttribute="centerY" secondItem="Yif-2n-DuE" secondAttribute="centerY" id="Ezr-V1-rnl"/> <constraint firstItem="VBp-ED-tro" firstAttribute="centerY" secondItem="Yif-2n-DuE" secondAttribute="centerY" id="Ezr-V1-rnl"/>
<constraint firstItem="taI-i1-CE8" firstAttribute="leading" secondItem="W2o-3M-oQx" secondAttribute="trailing" constant="8" id="ODT-rS-ouh"/> <constraint firstItem="taI-i1-CE8" firstAttribute="leading" secondItem="W2o-3M-oQx" secondAttribute="trailing" constant="5" id="ODT-rS-ouh"/>
<constraint firstItem="MP9-4C-psw" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="Q3S-zD-qPI"/> <constraint firstItem="MP9-4C-psw" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="Q3S-zD-qPI"/>
<constraint firstItem="zR6-f6-N6I" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="Rp2-11-nYI"/> <constraint firstItem="zR6-f6-N6I" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="Rp2-11-nYI"/>
<constraint firstItem="mHC-42-xJE" firstAttribute="leading" secondItem="npl-JZ-Urd" secondAttribute="leading" id="RtL-3F-fA5"/> <constraint firstItem="mHC-42-xJE" firstAttribute="leading" secondItem="npl-JZ-Urd" secondAttribute="leading" id="RtL-3F-fA5"/>
......
FuSiLive/Classes/Zone/View/FireFlyView/View/FUSMyZoneTableView.m
...@@ -91,6 +91,10 @@ ...@@ -91,6 +91,10 @@
self.tableFooterView = [UIView new]; self.tableFooterView = [UIView new];
self.separatorStyle = UITableViewCellSeparatorStyleNone; self.separatorStyle = UITableViewCellSeparatorStyleNone;
self.tableHeaderView = zoneHeaderView; self.tableHeaderView = zoneHeaderView;
if (@available(iOS 15.0, *)) {
self.sectionHeaderTopPadding = 0;
}
} }
- (void)fus_initCellManager { - (void)fus_initCellManager {
......
FuSiLive/Classes/Zone/View/TaskCenter/FUSTaskCenterListTableViewCell.m
...@@ -35,6 +35,7 @@ ...@@ -35,6 +35,7 @@
// SaveBtn.titleLabel.adjustsFontSizeToFitWidth = YES; // SaveBtn.titleLabel.adjustsFontSizeToFitWidth = YES;
self.operationBtn.titleLabel.adjustsFontSizeToFitWidth = YES; self.operationBtn.titleLabel.adjustsFontSizeToFitWidth = YES;
self.taskNameLabel.textColor = [UIColor fus_textColorRich]; self.taskNameLabel.textColor = [UIColor fus_textColorRich];
self.taskNameLabel.font = [UIFont fus_themeFont:15];
} }
......
FuSiLive/Classes/Zone/View/TaskCenter/FUSTaskCenterProcessTableViewCell.m
...@@ -210,5 +210,10 @@ ...@@ -210,5 +210,10 @@
} }
} }
- (void)dealloc
{
[_countTimer invalidate];
_countTimer = nil;
}
@end @end
FuSiLive/FUSAPPConfigs/FUSFuSiWebViewEventHelper.m
...@@ -286,14 +286,15 @@ static NSString *FUSWebRightBtnExtraInfoKey = @"FUSWebRightBtnExtraInfoKey"; ...@@ -286,14 +286,15 @@ static NSString *FUSWebRightBtnExtraInfoKey = @"FUSWebRightBtnExtraInfoKey";
case FUSJsWebCidServiceChat: {// CID 为 4，打开客服 case FUSJsWebCidServiceChat: {// CID 为 4，打开客服
NSString *welcomeStr = dataDict[@"msg"]; NSString *welcomeStr = dataDict[@"msg"];
NSArray *viewControllers = wkVC.navigationController.viewControllers; // NSArray *viewControllers = wkVC.navigationController.viewControllers;
UIViewController *viewVC = [viewControllers lastObject]; // UIViewController *viewVC = [viewControllers lastObject];
if (![viewVC isKindOfClass:[FUSSingleChatViewController class]]) { // if (![viewVC isKindOfClass:[FUSSingleChatViewController class]]) {
FUSSingleChatViewController *serviceChatVC = [[FUSSingleChatViewController alloc]initWithUID:serverUid face:serverFace nikename:severNickname]; // FUSSingleChatViewController *serviceChatVC = [[FUSSingleChatViewController alloc]initWithUID:serverUid face:serverFace nikename:severNickname];
serviceChatVC.welcomeStr = welcomeStr; // serviceChatVC.welcomeStr = welcomeStr;
serviceChatVC.isServiceAccount = YES; // serviceChatVC.isServiceAccount = YES;
[wkVC.navigationController pushViewController:serviceChatVC animated:YES]; // [wkVC.navigationController pushViewController:serviceChatVC animated:YES];
} // }
[wkVC.navigationController fus_pushToServiceControllerWithUID:serverUid face:serverFace nikename:severNickname welcome:welcomeStr animate:YES];
break; break;
} }
case FUSJsWebCidOpenOutApplication:// CID 为 5，跳转外链 case FUSJsWebCidOpenOutApplication:// CID 为 5，跳转外链
......
FuSiLive/Resources/LocalizationString/Fusi_Arbic.strings
...@@ -324,7 +324,7 @@ ...@@ -324,7 +324,7 @@
"宝石储值" = "شحن GEMs"; "宝石储值" = "شحن GEMs";
"对方的信用指数低于%.1f分的基础，可能有一定的诚信风险，确认继续通话吗？" = "The credit of the other side is lower than %1$s,which may have potential credit risk ,continue to call?"; "对方的信用指数低于%.1f分的基础，可能有一定的诚信风险，确认继续通话吗？" = "رصيد الجانب الآخر أقل من %1$s، مما قد ينطوي على مخاطر ائتمانية محتملة، هل تريد الاستمرار في الاتصال؟";
"录制时长最短3秒。" = "Record time are 3 seconds at least"; "录制时长最短3秒。" = "Record time are 3 seconds at least";
...@@ -458,7 +458,7 @@ ...@@ -458,7 +458,7 @@
"额头" = "جبين"; "额头" = "جبين";
"人气直播PK" = "تحديPK المذيعين الساخنة"; "热门主播PK" = "تحديPK المذيعين الساخنة";
"%@以上" = "أكثر من %@"; "%@以上" = "أكثر من %@";
...@@ -2156,5 +2156,5 @@ ...@@ -2156,5 +2156,5 @@
"连麦用户获得的礼物收入，主播分成%@，用户分成%@" = "سيتم تقسيم دخل الهدايا الذي يتلقاه مستخدمو Mic إلى %@ بواسطة المذيع و%@ بواسطة المستخدمين."; "连麦用户获得的礼物收入，主播分成%@，用户分成%@" = "سيتم تقسيم دخل الهدايا الذي يتلقاه مستخدمو Mic إلى %@ بواسطة المذيع و%@ بواسطة المستخدمين.";
"发送验证码" = "استلام رمز التحقق"; "发送验证码" = "يرسل";
FuSiLive/Resources/LocalizationString/Fusi_Chinese.strings
...@@ -468,7 +468,7 @@ ...@@ -468,7 +468,7 @@
"额头" = "額頭"; "额头" = "額頭";
"人气直播PK" = "人氣主播PK"; "热门主播PK" = "熱門主播PK";
"%@以上" = "%@以上"; "%@以上" = "%@以上";
......
FuSiLive/Resources/LocalizationString/Fusi_Chinese_Traditional.strings
...@@ -468,7 +468,7 @@ ...@@ -468,7 +468,7 @@
"额头" = "額頭"; "额头" = "額頭";
"人气直播PK" = "人氣主播PK"; "热门主播PK" = "熱門主播PK";
"%@以上" = "%@以上"; "%@以上" = "%@以上";
......
FuSiLive/Resources/LocalizationString/Fusi_English.strings
...@@ -468,7 +468,7 @@ ...@@ -468,7 +468,7 @@
"额头" = "Forehead"; "额头" = "Forehead";
"人气直播PK" = "PK hot broadcasters"; "热门主播PK" = "PK hot broadcasters";
"%@以上" = "More than %@"; "%@以上" = "More than %@";
...@@ -2190,5 +2190,5 @@ ...@@ -2190,5 +2190,5 @@
"连麦用户获得的礼物收入，主播分成%@，用户分成%@" = "The gift income received by Mic users will be divided into %@ by the broadcaster and %@ by the users."; "连麦用户获得的礼物收入，主播分成%@，用户分成%@" = "The gift income received by Mic users will be divided into %@ by the broadcaster and %@ by the users.";
"发送验证码" = "Get verification code"; "发送验证码" = "Send";
FuSiLive/Resources/LocalizationString/Fusi_Indonesian.strings
...@@ -326,7 +326,7 @@ ...@@ -326,7 +326,7 @@
"宝石储值" = "Tambahkan Saldo GEMs"; "宝石储值" = "Tambahkan Saldo GEMs";
"对方的信用指数低于%.1f分的基础，可能有一定的诚信风险，确认继续通话吗？" = "The credit of the other side is lower than %1$s,which may have potential credit risk ,continue to call?"; "对方的信用指数低于%.1f分的基础，可能有一定的诚信风险，确认继续通话吗？" = "Kredit pihak lain lebih rendah dari %1$s, yang mungkin memiliki potensi risiko kredit, terus menelepon?";
"录制时长最短3秒。" = "Record time are 3 seconds at least"; "录制时长最短3秒。" = "Record time are 3 seconds at least";
...@@ -464,7 +464,7 @@ ...@@ -464,7 +464,7 @@
"额头" = "Dahi"; "额头" = "Dahi";
"人气直播PK" = "Penyiar PK populer"; "热门主播PK" = "Penyiar PK populer";
"%@以上" = "Lebih dari %@"; "%@以上" = "Lebih dari %@";
...@@ -2164,5 +2164,5 @@ ...@@ -2164,5 +2164,5 @@
"连麦用户获得的礼物收入，主播分成%@，用户分成%@" = "Pendapatan hadiah yang diterima oleh pengguna Mic akan dibagi menjadi %@ oleh penyiar dan %@ oleh pengguna."; "连麦用户获得的礼物收入，主播分成%@，用户分成%@" = "Pendapatan hadiah yang diterima oleh pengguna Mic akan dibagi menjadi %@ oleh penyiar dan %@ oleh pengguna.";
"发送验证码" = "Dapatkan kode verifikasi"; "发送验证码" = "Mengirim";
FuSiLive/Resources/LocalizationString/Fusi_Japanese.strings
...@@ -328,7 +328,7 @@ ...@@ -328,7 +328,7 @@
"宝石储值" = "GEMsをトップアップ"; "宝石储值" = "GEMsをトップアップ";
"对方的信用指数低于%.1f分的基础，可能有一定的诚信风险，确认继续通话吗？" = "The credit of the other side is lower than %1$s,which may have potential credit risk ,continue to call?"; "对方的信用指数低于%.1f分的基础，可能有一定的诚信风险，确认继续通话吗？" = "相手側の信用度は %1$s より低いため、信用リスクがある可能性があります。引き続き電話をかけますか?";
"录制时长最短3秒。" = "Record time are 3 seconds at least"; "录制时长最短3秒。" = "Record time are 3 seconds at least";
...@@ -466,7 +466,7 @@ ...@@ -466,7 +466,7 @@
"额头" = "額"; "额头" = "額";
"人气直播PK" = "PKホット配信者"; "热门主播PK" = "PKホット配信者";
"%@以上" = "%@以上"; "%@以上" = "%@以上";
...@@ -2168,5 +2168,5 @@ ...@@ -2168,5 +2168,5 @@
"连麦用户获得的礼物收入，主播分成%@，用户分成%@" = "Micユーザーが受け取ったギフト収入は、放送者に%@、ユーザーに%@に分配されます。"; "连麦用户获得的礼物收入，主播分成%@，用户分成%@" = "Micユーザーが受け取ったギフト収入は、放送者に%@、ユーザーに%@に分配されます。";
"发送验证码" = "確認コードを取得"; "发送验证码" = "送信";
FuSiLive/Resources/LocalizationString/Fusi_Thai.strings
...@@ -326,7 +326,7 @@ ...@@ -326,7 +326,7 @@
"宝石储值" = "เติมเงิน GEMs"; "宝石储值" = "เติมเงิน GEMs";
"对方的信用指数低于%.1f分的基础，可能有一定的诚信风险，确认继续通话吗？" = "The credit of the other side is lower than %1$s,which may have potential credit risk ,continue to call?"; "对方的信用指数低于%.1f分的基础，可能有一定的诚信风险，确认继续通话吗？" = "เครดิตของอีกฝั่งต่ำกว่า %1$s ซึ่งอาจมีความเสี่ยงด้านเครดิต เรียกต่อไปหรือไม่?";
"录制时长最短3秒。" = "Record time are 3 seconds at least"; "录制时长最短3秒。" = "Record time are 3 seconds at least";
...@@ -464,7 +464,7 @@ ...@@ -464,7 +464,7 @@
"额头" = "หน้าผาก"; "额头" = "หน้าผาก";
"人气直播PK" = "การออกอากาศด่วน PK"; "热门主播PK" = "การออกอากาศด่วน PK";
"%@以上" = "มากกว่า %@"; "%@以上" = "มากกว่า %@";
...@@ -2164,5 +2164,5 @@ ...@@ -2164,5 +2164,5 @@
"连麦用户获得的礼物收入，主播分成%@，用户分成%@" = "รายได้ของขวัญที่ได้รับจากผู้ใช้ Mic จะถูกแบ่งออกเป็น %@ โดยผู้ถ่ายทอดสด และ %@ โดยผู้ใช้"; "连麦用户获得的礼物收入，主播分成%@，用户分成%@" = "รายได้ของขวัญที่ได้รับจากผู้ใช้ Mic จะถูกแบ่งออกเป็น %@ โดยผู้ถ่ายทอดสด และ %@ โดยผู้ใช้";
"发送验证码" = "รับรหัสยืนยัน"; "发送验证码" = "ส่ง";
FuSiLive/Resources/LocalizationString/Fusi_vietnamese.strings
...@@ -328,7 +328,7 @@ ...@@ -328,7 +328,7 @@
"宝石储值" = "Nạp GEMs"; "宝石储值" = "Nạp GEMs";
"对方的信用指数低于%.1f分的基础，可能有一定的诚信风险，确认继续通话吗？" = "The credit of the other side is lower than %1$s,which may have potential credit risk ,continue to call?"; "对方的信用指数低于%.1f分的基础，可能有一定的诚信风险，确认继续通话吗？" = "Tín dụng của bên kia thấp hơn %1$s, có thể tiềm ẩn rủi ro tín dụng, tiếp tục gọi?";
"录制时长最短3秒。" = "Record time are 3 seconds at least"; "录制时长最短3秒。" = "Record time are 3 seconds at least";
...@@ -466,7 +466,7 @@ ...@@ -466,7 +466,7 @@
"额头" = "Trán"; "额头" = "Trán";
"人气直播PK" = "PK phổ biến"; "热门主播PK" = "PK phổ biến";
"%@以上" = "Nhiều hơn %@"; "%@以上" = "Nhiều hơn %@";
...@@ -2168,5 +2168,5 @@ ...@@ -2168,5 +2168,5 @@
"连麦用户获得的礼物收入，主播分成%@，用户分成%@" = "Thu nhập quà tặng mà người dùng Mic nhận được sẽ được chia thành %@ cho đài truyền hình và %@ cho người dùng."; "连麦用户获得的礼物收入，主播分成%@，用户分成%@" = "Thu nhập quà tặng mà người dùng Mic nhận được sẽ được chia thành %@ cho đài truyền hình và %@ cho người dùng.";
"发送验证码" = "Lấy mã xác minh"; "发送验证码" = "Gửi";
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment