Skip to content

pidan / FuSiLive

Go to a project
Commit 0e591228 by ludi
Options

修复一部分bug

parent 1eb0470e
Inline Side-by-side
Showing with 169 additions and 62 deletions
DevelopmentPods/FUSCommon/FUSCommon/Classes/FUSAPPConfigs/FUSFuSiConfigs.m
......@@ -72,12 +72,12 @@
/// App Version
- (NSString *)appVersion {
return @"7590";
return @"7591";
}
/// App Dot Version
- (NSString *)appDotVersion {
return @"7.5.9.0";
return @"7.5.9.1";
}
/// App Id
......
DevelopmentPods/FUSCommon/FUSCommon/FUSRouter/Routers/LiveRouter/FUSPublicModels/Live/FUSRoomInfoModel.h
......@@ -77,6 +77,9 @@
/// 人气排名
@property (nonatomic, assign) NSInteger popularRank;
/// 新星主播
@property (nonatomic, assign) BOOL anchorNew;
/// 直播间状态/开关信息
@property (nonatomic, strong) FUSLiveRoomStateSwitchModel *stateSwitch;
......
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Tools/Categories/NSString/NSStringSwiftExt.swift 0 → 100644
//
// NSStringSwiftExt.swift
// FUSFoundation
//
// Created by aaa on 2024/10/21.
//
import UIKit
@objc public extension NSString{
@objc func fus_count() -> Int{
let swiftString = self as String
return swiftString.count
}
@objc func fus_stringWithRemoveLast() -> NSString {
var swiftString = self as String
swiftString.removeLast()
return swiftString as NSString
}
}
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Views/CustomControls/FUSTextView.m
......@@ -8,6 +8,7 @@
#import "FUSTextView.h"
#import <YYKit/YYKit.h>
#import <FUSFoundation/FUSFoundation-Swift.h>
@interface FUSTextView () <UITextViewDelegate>
......@@ -191,8 +192,9 @@
- (long)textLength
{
//!< 获取文本框中的文字的长度
return [[self.text dataUsingEncoding:CFStringConvertEncodingToNSStringEncoding(kCFStringEncodingGB_18030_2000)] length];
// return [[self.text dataUsingEncoding:CFStringConvertEncodingToNSStringEncoding(kCFStringEncodingGB_18030_2000)] length];
// return self.text.length;
return [self.text fus_count];
}
......@@ -229,36 +231,44 @@
// 获取字符串Data数据的长度
// NSInteger dataLength = [[textStr dataUsingEncoding:CFStringConvertEncodingToNSStringEncoding(kCFStringEncodingGB_18030_2000)] length];
NSInteger dataLength = textStr.length;
if (dataLength > self.textMaxLength)
{
// 注释：更换删除方法，采用系统deleteBackward
// for (long strIndex = textStr.length - 1; strIndex >= 0; strIndex--) {
// // 截取字符串
// NSString *subStr = [textStr substringToIndex:strIndex];
// // 获取截取字符串Data数据的长度
// NSInteger subLen = [[subStr dataUsingEncoding:CFStringConvertEncodingToNSStringEncoding(kCFStringEncodingGB_18030_2000)] length];
// // 判断Data数据长度是否符合要求
// if (subLen <= self.textMaxLength) {
// textView.text = subStr;
// // 计算内容大小
// CGSize contentSize = [subStr boundingRectWithSize:CGSizeMake(textView.frame.size.width, CGFLOAT_MAX) options:NSStringDrawingUsesLineFragmentOrigin attributes:@{NSFontAttributeName:textView.font}context:nil].size;
// contentSize.height = contentSize.height + 8;
// [textView setContentSize:contentSize];
// return;
// }
// }
// while ([[textView.text dataUsingEncoding:CFStringConvertEncodingToNSStringEncoding(kCFStringEncodingGB_18030_2000)] length] > self.textMaxLength) {
// NSInteger dataLength = textStr.length;
// if (dataLength > self.textMaxLength)
// {
// // 注释：更换删除方法，采用系统deleteBackward
//// for (long strIndex = textStr.length - 1; strIndex >= 0; strIndex--) {
//// // 截取字符串
//// NSString *subStr = [textStr substringToIndex:strIndex];
//// // 获取截取字符串Data数据的长度
//// NSInteger subLen = [[subStr dataUsingEncoding:CFStringConvertEncodingToNSStringEncoding(kCFStringEncodingGB_18030_2000)] length];
//// // 判断Data数据长度是否符合要求
//// if (subLen <= self.textMaxLength) {
//// textView.text = subStr;
//// // 计算内容大小
//// CGSize contentSize = [subStr boundingRectWithSize:CGSizeMake(textView.frame.size.width, CGFLOAT_MAX) options:NSStringDrawingUsesLineFragmentOrigin attributes:@{NSFontAttributeName:textView.font}context:nil].size;
//// contentSize.height = contentSize.height + 8;
//// [textView setContentSize:contentSize];
//// return;
//// }
//// }
//
//// while ([[textView.text dataUsingEncoding:CFStringConvertEncodingToNSStringEncoding(kCFStringEncodingGB_18030_2000)] length] > self.textMaxLength) {
//// // 截取字符串
//// [textView deleteBackward];
//// }
//
// while (self.textLength > self.textMaxLength) {
// // 截取字符串
// [textView deleteBackward];
// }
//
// }
while (self.textLength > self.textMaxLength) {
// 截取字符串
[textView deleteBackward];
if ([textStr fus_count] > self.textMaxLength) {
while ([textStr fus_count] > self.textMaxLength) {
textStr = [textStr fus_stringWithRemoveLast];
}
self.text = @"";
[self insertText:textStr];
}
}
}
......
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Views/FUSEditTextFieldView.swift
......@@ -129,7 +129,7 @@ import SnapKit
self.sureBtn.setTitleColor(.fus_textColorRich(), for: .normal)
self.sureBtn.titleLabel?.font = .fus_themeFont(15)
self.sureBtn.setTitle(.fus_localString("确定"), for: .normal)
self.sureBtn.setTitle(.fus_versionLocalString("确认"), for: .normal)
self.contentView.addSubview(self.sureBtn)
self.sureBtn.titleLabel?.sizeToFit()
......@@ -209,7 +209,7 @@ import SnapKit
// 设置 "最大数值" 的文本属性（包括颜色和下划线）
let maxTextAttributes: [NSAttributedString.Key: Any] = [
.foregroundColor: UIColor.white,
.foregroundColor: UIColor.fus_textColorMedium(),
]
let maxRange = NSRange(location: countString.count, length: maxCountString.count) // 的范围
attributedString.addAttributes(maxTextAttributes, range: maxRange)
......
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Views/FUSPanGestureAlertView.m
......@@ -58,7 +58,7 @@
CGFloat lineWidth = 56;
CGFloat lineHeight = 5;
UIView *lineColorView = [[UIView alloc] initWithFrame:CGRectMake((width - lineWidth)/2.0, 9, lineWidth, lineHeight)];
lineColorView.backgroundColor = [UIColor colorWithWhite:1 alpha:0.1];
lineColorView.backgroundColor = [UIColor colorWithHex:@"#E4E4E4"];
lineColorView.layer.cornerRadius = lineHeight/2.0;
lineColorView.layer.masksToBounds = YES;
[self.lineView addSubview:lineColorView];
......
Modules/FUSChatCenterModule/FUSChatCenterModule.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist
......@@ -7,12 +7,12 @@
<key>FUSChatCenterBundle.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>76</integer>
<integer>73</integer>
</dict>
<key>FUSChatCenterModule.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>71</integer>
<integer>74</integer>
</dict>
</dict>
</dict>
......
Modules/FUSShowRoomModule/FUSShowRoomModule.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist
......@@ -7,12 +7,12 @@
<key>FUSShowRoomBundle.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>74</integer>
<integer>72</integer>
</dict>
<key>FUSShowRoomModule.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>73</integer>
<integer>71</integer>
</dict>
</dict>
</dict>
......
Modules/FUSShowRoomModule/FUSShowRoomModule/FUSShowRoomBundle.bundle/FUSShowRoomAssets.xcassets/live/live_icon_headNew.imageset/Contents.json 0 → 100644
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "live_icon_headNew@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/HomePage/View/AlertView/FUSSevenDayCheckinAlertView.m
......@@ -162,8 +162,8 @@
[self.noticeRemindBtn setTitleColor:[UIColor fus_textColorRich] forState:UIControlStateNormal];
self.noticeRemindBtn.titleLabel.font = [UIFont fus_themeFont:13];
self.noticeRemindBtn.imageEdgeInsets = UIEdgeInsetsMake(0, -2, 0, 2);
[self.noticeRemindBtn setImage:[FUSShowRoomCenterBunble imageNamed:@"live_share_check_unselected"] forState:UIControlStateNormal];
[self.noticeRemindBtn setImage:[FUSShowRoomCenterBunble imageNamed:@"live_share_check_selected"] forState:UIControlStateSelected];
[self.noticeRemindBtn setImage:[[FUSShowRoomCenterBunble imageNamed:@"live_share_check_unselected"] resizedImageToSize:CGSizeMake(14, 14)] forState:UIControlStateNormal];
[self.noticeRemindBtn setImage:[[FUSShowRoomCenterBunble imageNamed:@"live_share_check_selected"] resizedImageToSize:CGSizeMake(14, 14)] forState:UIControlStateSelected];
self.noticeRemindBtn.imageView.contentMode = UIViewContentModeScaleAspectFit;
[self.contentView addSubview:self.noticeRemindBtn];
[self.noticeRemindBtn addTarget:self action:@selector(noticeRemindBtnDidClicked:) forControlEvents:UIControlEventTouchUpInside];
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/HomePage/View/AlertView/View/FUSNewUserMultiRewardItemCell.swift
......@@ -65,10 +65,10 @@ public class FUSNewUserMultiRewardItemCell: FUSSwiftCollectionViewCell {
self.contentView.addSubview(self.addedRewardView)
self.addedRewardTipLabel.text = .fus_versionLocalString("首充加赠")
self.addedRewardTipLabel.textColor = .fus_theme()
self.addedRewardTipLabel.textColor = .fus_textColorRich()
self.addedRewardTipLabel.font = .fus_themeMediumFont(7)
self.addedRewardTipLabel.textAlignment = .center
self.addedRewardTipLabel.backgroundColor = .init(white: 1, alpha: 0.13)
self.addedRewardTipLabel.backgroundColor = .white
self.addedRewardTipLabel.layer.cornerRadius = 5
self.addedRewardTipLabel.layer.masksToBounds = true
self.addedRewardTipLabel.adjustsFontSizeToFitWidth = true
......@@ -77,7 +77,7 @@ public class FUSNewUserMultiRewardItemCell: FUSSwiftCollectionViewCell {
self.addedRewardImageView.contentMode = .scaleAspectFit
self.addedRewardView.addSubview(self.addedRewardImageView)
self.addedRewardNameLabel.textColor = .white
self.addedRewardNameLabel.textColor = .fus_textColorRich()
self.addedRewardNameLabel.font = .fus_themeMediumFont(8.5)
self.addedRewardNameLabel.textAlignment = .center
self.addedRewardView.addSubview(self.addedRewardNameLabel)
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/Other/FUSLiveHelper.m
......@@ -661,8 +661,9 @@
[FUSLiveHelper shareInstance].roomInfoModel = roomInfoModel;
}
// ludy: 修改了这里，不知道会不会出bug，会就打开
// 设置为已追踪不显示追踪按钮，待收到 socket 之后在设置追踪按钮
[FUSLiveHelper shareInstance].roomInfoModel.liked = @"1";
// [FUSLiveHelper shareInstance].roomInfoModel.liked = @"1";
[[FUSLiveHelper shareInstance] initLiveViewController];
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/ChatInputView/FUSLiveBottomToolSubView.m
......@@ -129,7 +129,7 @@
{
if (bottomToolView.gameEntranceModel) {
[[FUSLiveHelper shareInstance].currentFunctionView fus_showHalfWebView:bottomToolView.gameEntranceModel];
[[FUSLiveHelper shareInstance].currentFunctionView fus_clearHalfWebView];
// [[FUSLiveHelper shareInstance].currentFunctionView fus_clearHalfWebView];
} else {
[[FUSLiveHelper shareInstance].currentFunctionView fus_showGameCatalogueListView];
}
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/FUSLiveFunctionView.m
......@@ -4981,8 +4981,10 @@ UIGestureRecognizerDelegate
- (void)fus_refreshFunctionView
{
if ([FUSLiveHelper shareInstance].liveType != FUSLiveTypeAnchor) {
if ([[[FUSLiveHelper shareInstance] roomInfoModel] liked] != nil) {
[_headView fus_setupLiked:[[[[FUSLiveHelper shareInstance] roomInfoModel] liked] boolValue]];
}
}
}
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/HeadView/FUSLivePortraitView.m
......@@ -57,6 +57,9 @@
@property (nonatomic, strong) UIImageView *offlineImgView;
@property (nonatomic, strong) UIImageView *animImgView;
/// 头像new的图片
@property (nonatomic, strong) UIImageView *headNewImageView;
@end
@implementation FUSLivePortraitView
......@@ -163,6 +166,12 @@
[_grayView addSubview:_offlineImgView];
_offlineImgView.hidden = YES;
_grayView.hidden = YES;
_headNewImageView = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, 30, 10)];
_headNewImageView.center = CGPointMake(_faceImageView.x + _faceImageView.width/2.0 + 3, CGRectGetMaxY(_faceImageView.frame) - 3);
_headNewImageView.image = [FUSShowRoomCenterBunble imageNamed:@"live_icon_headNew"];
[self addSubview:_headNewImageView];
_headNewImageView.hidden = YES;
}
/**
......@@ -210,7 +219,7 @@
[self addSubview:_likeBtn];
}
[_likeBtn setImage:[FUSShowRoomCenterBunble imageNamed:@"live_head_follow_btn"] forState:UIControlStateNormal];
[_likeBtn setImage:[FUSShowRoomCenterBunble imageNamed:@"live_room_card_followed_btn"] forState:UIControlStateNormal];
[_likeBtn setImage:[FUSShowRoomCenterBunble imageNamed:@"live_head_follow_tick_btn"] forState:UIControlStateSelected];
_likeBtn.hidden = NO;
......@@ -302,6 +311,9 @@
// 设置头像
[_faceImageView.imageView setLiveFaceWebImageWithSubURLString:model.face placeholder:nil];
// 设置是否新主播
_headNewImageView.hidden = !model.anchorNew;
// // 赋值文字内容
// _autoScrollNicknameLabel.text = model.nickName;
// // 更新 Frame
......@@ -337,12 +349,12 @@
}
_autoScrollMsgLabel.attributedText = [NSAttributedString sj_UIKitText:^(id<SJUIKitTextMakerProtocol> _Nonnull make) {
make.appendImage(^(id<SJUTImageAttachment> _Nonnull make) {
make.image = [UIImage fus_boyIcon];
make.image = model.sex.integerValue == 0 ? [[UIImage fus_girlIcon] resizedImageToSize:CGSizeMake(5, 8)] : [[UIImage fus_boyIcon] resizedImageToSize:CGSizeMake(8, 8)];
make.alignment = SJUTVerticalAlignmentCenter;
make.bounds = CGRectMake(0, 0, 10, 10);
// make.bounds = CGRectMake(0, 0, 8, 8);
});
make.append(@" ");
make.append(ageStr).textColor([UIColor colorWithHex:@"#76C4FF"]);
make.append(ageStr).textColor(model.sex.integerValue == 0 ? [UIColor colorWithHex:@"#FE96B0"] : [UIColor colorWithHex:@"#76C4FF"]);
make.append(@" ");
make.append(addrStr).textColor([UIColor colorWithHex:@"#BBBAB8"]);
make.font([UIFont fus_themeFont:10]);
......@@ -377,7 +389,10 @@
// // 未追踪
// [self fus_setLike:NO];
// }
if (![model.roomId isEqualToString:[[FUSCacheDataShare shareStore]userDetailInfo].uid] &&
model.liked) {
[self fus_setLike:[model.liked boolValue]];
}
// // 设置富豪等级 头像边框
// if (model.level.integerValue == 0) {
......@@ -790,8 +805,7 @@
/// 显示点击关注的动画，给外面某些比如一个接口就是送礼并且自动关注的动作调用
-(void)fus_showClickLikeAnimateWithIsFollow:(BOOL)isFollow{
self.likeBtn.hidden = NO;
self.likeBtn.selected = isFollow;
[self fus_setLike:isFollow];
if (isFollow == YES) {
// [self.likeBtn setImage:[FUSShowRoomCenterBunble imageNamed:@"live_head_follow_tick_btn"] forState:UIControlStateNormal];
[FUSDialogView fus_showDialog:[NSString fus_localString:@"追踪成功"]];
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/Other/FUSLiveQuickChatSetAlertView.m
......@@ -105,7 +105,7 @@
// 创建并添加分割线视图
UIView *lineView = [[UIView alloc] init];
lineView.backgroundColor = [UIColor fus_lineColor];
lineView.backgroundColor = [UIColor clearColor];
[self.contentView addSubview:lineView];
[lineView mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.equalTo(self.titleLabel.mas_bottom).offset(17);
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/Other/FUSPatAudienceGiftCell.swift
......@@ -56,6 +56,7 @@ import UIKit
}
costBtn.titleLabel?.font = .fus_themeMediumFont(12)
costBtn.imageView?.contentMode = .scaleAspectFit
bgImageView.addSubview(costBtn)
costBtn.snp.makeConstraints { make in
make.centerX.equalToSuperview()
......@@ -69,6 +70,7 @@ import UIKit
public func fus_setup(model: FUSPatAudienceGiftModel) {
iconImageView.image = nil
if model.fus_modelType == -1 {
iconImageView.image = FUSShowRoomCenterBunble.imageNamed("live_chat_patAudience_gift_follow")
nameLabel.text = .fus_versionLocalString("关注")
......@@ -89,11 +91,11 @@ import UIKit
switch giftCurrency{
case 3:
return .fus_diamonIcon()
return .fus_diamonIcon().resizedImage(toFit: CGSizeMake(10, 12), isScale: false)
case 5:
return .fus_dewIcon()
case 6:
return .fus_diamonIcon()
return .fus_diamonIcon().resizedImage(toFit: CGSizeMake(10, 12), isScale: false)
default:
return nil
}
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/Other/FUSPatAudiencePromptAlertView.m
......@@ -118,9 +118,9 @@
self.patImageView.contentMode = UIViewContentModeScaleAspectFit;
[self.contentView addSubview:self.patImageView];
[self.patImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(self.patTextLabel.mas_right).offset(-1);
make.left.equalTo(self.patTextLabel.mas_right).offset(-6);
make.centerY.equalTo(self.patTextLabel).offset(-2);
make.size.mas_equalTo(CGSizeMake(24, 29));
make.size.mas_equalTo(CGSizeMake(32, 38));
}];
UIView *dashLine = [[UIView alloc] init];
......@@ -228,12 +228,14 @@
}
-(void)fus_sendGift:(FUSPatAudienceGiftModel *)giftModel{
MJWeakSelf
[FUSLoadingView fus_showProgressViewWithMessage:@"" canTouchBottomView:NO];
if (giftModel.fus_modelType == -1) {
// 关注
[FUSLiveHttpHelper fus_livePatReplyWithRoomId:self.roomId type:1 gid:@"" succeed:^(NSMutableDictionary *changed) {
[FUSLoadingView fus_dismissProgressView];
[[FUSLiveHelper shareInstance].currentFunctionView fus_showClickLikeAnimateWithIsFollow:YES];
[weakSelf fus_dismissWithAnimation];
} failure:^(NSString *msg, NSInteger code) {
[FUSLoadingView fus_dismissProgressView];
[FUSDialogView fus_showDialog:msg];
......@@ -419,6 +421,12 @@
}
- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath{
self.itemSelect = indexPath.row;
FUSPatAudienceGiftModel *model = self.dataSourceList[self.itemSelect];
if (model.fus_modelType == -1) {
self.giftTextLabel.text = [NSString fus_versionLocalString:@"回撩她并关注"];
}else {
self.giftTextLabel.text = [NSString fus_versionLocalString:@"回撩她并送出礼物"];
}
[collectionView reloadData];
}
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NovaList/View/FUSHomeNovaListCollectionView.m
......@@ -120,8 +120,8 @@
[FUSLoadingView fus_showProgressViewWithMessage:nil];
[FUSBaoFangHttpHelper fus_requestRoomNovaBatchLikesWithMark:self.mark success:^{
[FUSLoadingView fus_showProgressViewWithMessage:[NSString fus_localString:@"追踪成功"]];
[FUSLoadingView fus_dismissProgressView];
[FUSDialogView fus_showDialog:[NSString fus_localString:@"追踪成功"]];
self.isFollowAll = YES;
if (self.followAllStatusDidChange) {
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NovaList/cell/FFHomeListNovaListCollectionViewSmallCell.m
......@@ -406,7 +406,7 @@
//布局
[self layout_contentViews];
if (![FUSConfig sharedInstanced].devConfigs.appStatus) {
if ([FUSConfig sharedInstanced].devConfigs.appStatus) {
self.offTimeLabel.hidden = YES;
self.starBgView.hidden = YES;
self.remarkLabel.hidden = YES;
......
Modules/FUSUserCenterModule/FUSUserCenterModule.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist
......@@ -7,7 +7,7 @@
<key>FUSUserCenterModule.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>72</integer>
<integer>76</integer>
</dict>
<key>FUSUserCenterModuleBundle.xcscheme_^#shared#^_</key>
<dict>
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/Login/Controller/FUSMessageRegisterViewController.m
......@@ -363,7 +363,10 @@
[_turnToLoginBtn setAttributedTitle:atrrStr forState:UIControlStateNormal];
[self setupGetVerifyCodeBtnContent:[NSString fus_localString:@"发送验证码"]];
_inviteCodeTextField.placeholder = [NSString fus_localString:@"输入邀请码（选填）"];
// _inviteCodeTextField.placeholder = [NSString fus_localString:@"输入邀请码（选填）"];
_inviteCodeTextField.attributedText = [NSAttributedString sj_UIKitText:^(id<SJUIKitTextMakerProtocol> _Nonnull make) {
make.append([NSString fus_localString:@"输入邀请码（选填）"]).textColor([UIColor fus_textColorMedium]);
}];
_registCodeTextField.attributedPlaceholder = [NSAttributedString sj_UIKitText:^(id<SJUIKitTextMakerProtocol> _Nonnull make) {
make.append([NSString fus_localString:@"输入注册码"]).textColor([UIColor fus_textColorMedium]);
}];
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/Login/Controller/FUSStartPageViewController.m
......@@ -544,7 +544,11 @@
[FIRAnalytics logEventWithName:@"openapplication" parameters:@{@"loginstatus":isAutoLogin ? @"haslogin" : @"nologin"}];
if (isAutoLogin) {
// 获取上次登录信息
FUSUserVerifyModel *userVerify = [FUSHistoryLoginStore getLastHistoryLoginVerify];
// FUSUserVerifyModel *userVerify = [FUSHistoryLoginStore getLastHistoryLoginVerify];
FUSUserVerifyModel *userVerify = [FUSCacheDataShare shareStore].userVerifyInfo;
if (userVerify == nil) {
userVerify = [FUSHistoryLoginStore getLastHistoryLoginVerify];
}
if (userVerify && ![NSObject isNullWithString:userVerify.uid]) {
// 设置共享登录信息
[[FUSCacheDataShare shareStore] setUserVerifyInfo:userVerify];
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/Zone/View/FireFlyView/View/Cell/MyZoneCell/FUSMyZoneInfoCell.m
......@@ -21,6 +21,7 @@
// 性别，年龄
@property (weak, nonatomic) IBOutlet UIButton *sexAndAgeButton;
@property (weak, nonatomic) IBOutlet NSLayoutConstraint *sexAndAgeButtonWidthConstraint;
@property (weak, nonatomic) IBOutlet UIImageView *richImageView;
@property (strong, nonatomic) IBOutlet UIButton *richBtn;
......@@ -93,6 +94,7 @@
_levelLabel.text = [NSString stringWithFormat:@"%@",zoneModel.lev];
}
// w:32
if (zoneModel.sex.integerValue == 0) {//女
[_sexAndAgeButton setBackgroundImage:UIImage.fus_girlBgImg forState:UIControlStateNormal];
}else if (zoneModel.sex.integerValue == 1) {// 男
......@@ -100,10 +102,13 @@
}else if (zoneModel.sex.integerValue == -1) {
[_sexAndAgeButton setBackgroundImage:UIImage.fus_secretBgImg forState:UIControlStateNormal];
}
_sexAndAgeButtonWidthConstraint.constant = 32;
// w: 13
if ([NSString isNull:zoneModel.birth]) {
[_sexAndAgeButton setBackgroundImage:nil forState:UIControlStateNormal];
[_sexAndAgeButton setTitle:nil forState:UIControlStateNormal];
_sexAndAgeButtonWidthConstraint.constant = 13;
if (zoneModel.sex.integerValue == 0) {
[_sexAndAgeButton setImage:[UIImage fus_ImageNamed:@"myuser_my_zone_sex_famale_no_age"] forState:UIControlStateNormal];
}else if (zoneModel.sex.integerValue == 1) {
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/Zone/View/FireFlyView/View/Cell/MyZoneCell/FUSMyZoneInfoCell.xib
......@@ -17,16 +17,17 @@
<autoresizingMask key="autoresizingMask"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Yif-2n-DuE">
<rect key="frame" x="54" y="25.5" width="27.5" height="16"/>
<rect key="frame" x="54" y="25.5" width="32" height="16"/>
<constraints>
<constraint firstAttribute="width" constant="32" id="GNl-XO-lJZ"/>
<constraint firstAttribute="height" constant="16" id="YPT-qZ-Xte"/>
</constraints>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="10"/>
<inset key="titleEdgeInsets" minX="8" minY="0.0" maxX="0.0" maxY="0.0"/>
<state key="normal" title="20" backgroundImage="video_chat_userinfo_sex_secret_bg"/>
<state key="normal" title="20" backgroundImage="video_chat_userinfo_sex_female_bg"/>
</button>
<imageView hidden="YES" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="baofang_vchat_verified_img" translatesAutoresizingMaskIntoConstraints="NO" id="VBp-ED-tro">
<rect key="frame" x="87.5" y="25.5" width="53.5" height="15.5"/>
<rect key="frame" x="92" y="25.5" width="53.5" height="15.5"/>
<constraints>
<constraint firstAttribute="width" secondItem="VBp-ED-tro" secondAttribute="height" multiplier="38:11" id="wSM-y2-pQl"/>
<constraint firstAttribute="height" constant="15.5" id="xgW-5n-vBi"/>
......@@ -205,6 +206,7 @@
<outlet property="richBtn" destination="f9D-yI-ehB" id="bjD-M5-icF"/>
<outlet property="richImageView" destination="taI-i1-CE8" id="pBZ-yJ-Bf8"/>
<outlet property="sexAndAgeButton" destination="Yif-2n-DuE" id="DYv-Nb-oO6"/>
<outlet property="sexAndAgeButtonWidthConstraint" destination="GNl-XO-lJZ" id="bMY-nN-Vuw"/>
<outlet property="verifiedImageView" destination="VBp-ED-tro" id="wzB-yB-A36"/>
</connections>
<point key="canvasLocation" x="44.799999999999997" y="96.7016491754123"/>
......@@ -212,7 +214,7 @@
</objects>
<resources>
<image name="baofang_vchat_verified_img" width="41.5" height="13"/>
<image name="video_chat_userinfo_sex_secret_bg" width="27.5" height="13"/>
<image name="video_chat_userinfo_sex_female_bg" width="27" height="13"/>
<image name="vip_icon_none_vip" width="13" height="13"/>
<image name="zone_record_btn_img" width="12.5" height="14"/>
</resources>
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Router/FUSUserCenterRouter.m
......@@ -571,6 +571,12 @@
- (void)fus_startAPPPages {
// ludy:这里加一个，防止一开始请求checkappversion请求不到
FUSUserVerifyModel *userVerify = [FUSHistoryLoginStore getLastHistoryLoginVerify];
if (userVerify != nil) {
[[FUSCacheDataShare shareStore] setUserVerifyInfo:userVerify];
}
FUSStartPageViewController *mainViewCtrl = [[FUSStartPageViewController alloc] initNeedWaitTime:YES];
UINavigationController *mainNavCtrl = [[UINavigationController alloc] initWithRootViewController:mainViewCtrl];
UIApplication.sharedApplication.keyWindow.rootViewController = mainNavCtrl;
......
Pods/Pods.xcodeproj/project.pbxproj
......@@ -196,6 +196,7 @@
00844F5624A692EA251CB0344D19457C /* Range.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8C1D70EA9145D3B431F1AC38130BEFC5 /* Range.swift */; };
0095DE581C4567E1415F27E5D0031D2F /* NSDate+OSS.h in Headers */ = {isa = PBXBuildFile; fileRef = D3FBFFB1CF81E08BAF5DD70058FDC6C3 /* NSDate+OSS.h */; settings = {ATTRIBUTES = (Public, ); }; };
009FE3E57D6BB669AF7CD8DAA0E7419E /* YYTextRubyAnnotation.h in Headers */ = {isa = PBXBuildFile; fileRef = A1D2B11D8DB4DF5962AAEA0E1AF053CB /* YYTextRubyAnnotation.h */; settings = {ATTRIBUTES = (Public, ); }; };
00A9FD7C2CC60B4A00A94259 /* NSStringSwiftExt.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00A9FD7B2CC60B4A00A94259 /* NSStringSwiftExt.swift */; };
00EC18B9EB9938D65069D0AF13C1B64F /* YYWebImageManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 12598D597441AFA73045DDC15655D9C9 /* YYWebImageManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
00EEFDAC224F8E90E6CFB28BB3AE1353 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F6BF02295DA5EEA5C1C858929DF49244 /* Foundation.framework */; };
0101D68882C879B27599C56C13C683FA /* NSString+Dictionary.h in Headers */ = {isa = PBXBuildFile; fileRef = 6DC9D8A5A3AF54D4FCA2D7821BF92B14 /* NSString+Dictionary.h */; settings = {ATTRIBUTES = (Public, ); }; };
......@@ -5231,6 +5232,7 @@
0086DCC36B366CC7E12F9D5340B8CB1F /* GTMSessionFetcher.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = GTMSessionFetcher.release.xcconfig; sourceTree = "<group>"; };
00915806814200F8949A396722977959 /* AliyunOSSiOS-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "AliyunOSSiOS-umbrella.h"; sourceTree = "<group>"; };
00971F2C0691752CD361BC57AE82D76F /* FUSUserAssetType.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = FUSUserAssetType.h; sourceTree = "<group>"; };
00A9FD7B2CC60B4A00A94259 /* NSStringSwiftExt.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NSStringSwiftExt.swift; sourceTree = "<group>"; };
00B861766FF31CB0D49A77CF77A15876 /* MASViewConstraint.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = MASViewConstraint.m; path = Masonry/MASViewConstraint.m; sourceTree = "<group>"; };
00FE915918EB79BAA5D6E25CC13A909B /* GTMAppAuth.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = GTMAppAuth.release.xcconfig; sourceTree = "<group>"; };
0106A9B6F8D4D229E8AB531BE1BDF6D5 /* AppAuth-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "AppAuth-dummy.m"; sourceTree = "<group>"; };
......@@ -12802,6 +12804,7 @@
46BBF4DEAF366A1C81BEB94AEF946683 /* NSString+MD5.m */,
E4280481FCC8964C04F60A48A3207A14 /* NSString+RichText.h */,
F5BCA9F4424870D4E3F0C26CE43E1563 /* NSString+RichText.m */,
00A9FD7B2CC60B4A00A94259 /* NSStringSwiftExt.swift */,
);
path = NSString;
sourceTree = "<group>";
......@@ -20309,6 +20312,7 @@
ABBB9BB58E956D4C99B78026B0A228A8 /* UILabel+FontSize.m in Sources */,
10818C99E6DBA320E4550DFB8F8EFF6B /* UILabel+ParagraphStyle.m in Sources */,
F529B5A540AE19D8183F4C32D71F343B /* UINavigationBar+Awesome.m in Sources */,
00A9FD7C2CC60B4A00A94259 /* NSStringSwiftExt.swift in Sources */,
D50BF2DF5642B848C34B4322DF7234C7 /* UINavigationController+FUSExpand.m in Sources */,
1EADDB58B010016526CEE66CD53D43C4 /* UIScrollView+FUSTouchEvent.m in Sources */,
E84F3ECB2C76E2F7B82B06A28F866CC3 /* UITextField+FUSInputType.m in Sources */,
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