moliparty/peko-ios
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复bug

Browse Source
This commit is contained in:
liyuhua
2023-08-16 15:50:27 +08:00
parent 21bc7ba70e
commit 218fce3a37
10 changed files with 49 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
YuMi/Modules/YMLogin/View/LoginFullInfoViewController.m
View File

@@ -278,7 +278,7 @@ UIKIT_EXTERN NSString * kUserCompleteInfoFinishKey;
- (void)nextButtonAction:(UIButton *)sender {
if (self.codeTextField.text.length <= 0) {
TTAlertConfig * config = [[TTAlertConfig alloc] init];
config.title = @"";
config.title = YMLocalizedString(@"LoginFullInfoViewController10");
config.message = YMLocalizedString(@"LoginFullInfoViewController0");
[TTPopup alertWithConfig:config confirmHandler:^{
[self updateUserInfo];

4
YuMi/Modules/YMLogin/View/NewLogin/XPForgetPwdViewController.m
View File

@@ -114,7 +114,9 @@
}];
}
- (void)touchesBegan:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event{
[self.view endEditing:YES];
}
- (void)racBind {
RAC(self.sureBtn, enabled) = [[RACSignal combineLatest:@[self.phoneInputView.inputTextField.rac_textSignal, self.pwdInputView.inputTextField.rac_textSignal, self.pwdInputView.inputTextField.rac_textSignal] reduce:^id _Nonnull(NSString *phone, NSString* smsCode, NSString *password){
return @((phone.length > 0) && smsCode.length >= 5 && (password.length >= 6 && password.length <= 16));

4
YuMi/Modules/YMLogin/View/NewLogin/XPLoginPhoneViewController.m
View File

@@ -164,7 +164,9 @@
}
- (void)touchesBegan:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event{
[self.view endEditing:YES];
}
- (void)racBind {
@weakify(self);
RAC(self.loginBtn, enabled) = [[RACSignal combineLatest:@[self.phoneInputView.inputTextField.rac_textSignal, self.codeInputView.inputTextField.rac_textSignal,self.accountView.inputTextField.rac_textSignal,self.accountPwdView.inputTextField.rac_textSignal] reduce:^id _Nonnull(NSString *phone, NSString* smsCode,NSString *account,NSString *accountPwd){

4
YuMi/Modules/YMLogin/View/NewLogin/XPLoginViewController.m
View File

@@ -229,7 +229,9 @@ NSString * const HadAgreePrivacy = @"HadAgreePrivacy";
[self.presenter thirdLoginWithType:type];
} else {
[self showErrorToast:YMLocalizedString(@"PKLoginViewController1")];
[UIView animateWithDuration:0.5 animations:^{
self.authBubbleView.alpha = 1.0;
}];
}
}

4
YuMi/Modules/YMMine/View/Guild/View/Cell/Income/XPGuildPersonIncomeTableViewCell.m
View File

@@ -110,7 +110,8 @@
self.avatarImageView.imageUrl = _userInfo.avatar;
self.nickLabel.text = _userInfo.nick;
self.idLabel.text = [NSString stringWithFormat:@"ID:%@", _userInfo.erbanNo];
self.incomeLabel.text = [NSString getDealNumwithstring:_userInfo.totalGoldNum];
self.incomeLabel.text = _userInfo.totalGoldNum;
}
}
@@ -167,6 +168,7 @@
_incomeLabel.font = [UIFont systemFontOfSize:15 weight:UIFontWeightMedium];
_incomeLabel.textColor = [DJDKMIMOMColor inputTextColor];
_incomeLabel.textAlignment = NSTextAlignmentCenter;
_incomeLabel.numberOfLines = 2;
}
return _incomeLabel;
}

12
YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoHeaderView.m
View File

@@ -319,13 +319,13 @@
[self.tagStackView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(self.usershadowImageView).offset(15);
make.top.mas_equalTo(self.userInfoView).offset(68);
make.right.lessThanOrEqualTo(@70);
make.height.mas_equalTo(25);
}];
[self.experImageView mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -353,9 +353,9 @@
[self.nameplateImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.height.mas_equalTo(20);
make.width.mas_equalTo(60);
make.left.top.mas_equalTo(self.namePlateView);
make.height.mas_equalTo(30);
make.top.mas_equalTo(-5);
make.width.mas_equalTo(80);
}];
[self.nameplateLabel mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -842,7 +842,7 @@
_tagStackView.axis = UILayoutConstraintAxisHorizontal;
_tagStackView.distribution = UIStackViewDistributionFill;
_tagStackView.alignment = UIStackViewAlignmentCenter;
_tagStackView.spacing = 6;
_tagStackView.spacing = 2;
}
return _tagStackView;
}

28
YuMi/Modules/YMMine/View/SubViews/XPMineHeadView.m
View File

@@ -37,6 +37,9 @@
@property (nonatomic,strong) UILabel *idLabel;
///性别
@property (nonatomic,strong) UIImageView *sexImageView;
///星座
@property(nonatomic,strong) UILabel *starVeiw;
///显示等级
@property (nonatomic,strong) YYLabel *levelLabel;
///关注、粉丝的容器
@@ -75,6 +78,7 @@
[self.nameStackView addArrangedSubview:self.nameLabel];
[self.idStackView addArrangedSubview:self.idLabel];
[self.idStackView addArrangedSubview:self.sexImageView];
[self.idStackView addArrangedSubview:self.starVeiw];
[self addSubview:self.levelLabel];
[self addSubview:self.attentionStackView];
@@ -107,13 +111,16 @@
make.height.mas_equalTo(16);
make.right.mas_equalTo(-15);
}];
[self.idStackView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(self.nobleImageView);
make.top.mas_equalTo(self.nameStackView.mas_bottom).offset(13);
make.height.mas_equalTo(16);
}];
[self.starVeiw mas_makeConstraints:^(MASConstraintMaker *make) {
make.width.mas_equalTo(47);
make.height.mas_equalTo(17);
}];
[self.levelLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(self.nobleImageView);
make.top.mas_equalTo(self.idStackView.mas_bottom).offset(5);
@@ -370,10 +377,7 @@
[attributedString appendAttributedString:[self createSapceAttribute:4]];
}
// constellation 星座
if (userInfo.birth) {
[attributedString appendAttributedString:[self makeDateLabel:userInfo.birth]];
}
if(complete){
complete(attributedString);
@@ -424,6 +428,7 @@
} else {
sexName = @"common_female";
}
self.starVeiw.text = [NSString stringWithFormat:@" %@ ",[self calculateConstellationWithMonth:_userInfo.birth]];
self.sexImageView.image = [UIImage imageNamed:sexName];
self.levelLabel.attributedText = _userInfo.levelAtt;
self.fansView.number = [NSString stringWithFormat:@"%ld",_userInfo.fansNum];
@@ -582,4 +587,15 @@
}
return _reviewView;
}
- (UILabel *)starVeiw{
if(!_starVeiw){
_starVeiw = [UILabel labelInitWithText:@"" font:[UIFont boldSystemFontOfSize:10] textColor:[UIColor whiteColor]];
_starVeiw.textAlignment = NSTextAlignmentCenter;
UIImage *image = [UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor], [DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(50, 17)];
_starVeiw.backgroundColor = [UIColor colorWithPatternImage:image];
_starVeiw.layer.cornerRadius = 17/2;
_starVeiw.layer.masksToBounds = YES;
}
return _starVeiw;
}
@end

2
YuMi/Modules/YMRoom/View/MessageContainerView/Tool/XPRoomMessageParser.m
View File

@@ -54,6 +54,8 @@
#import "XPTreasureFairyViewController.h"
@implementation XPRoomMessageParser
- (XPMessageInfoModel*)parseMessageAttribute:(NIMMessage *)message {
NIMMessageType messageType = message.messageType;
XPMessageInfoModel * messageInfo = [[XPMessageInfoModel alloc] init];

5
YuMi/zh-Hans.lproj/Localizable.strings
View File

@@ -2189,7 +2189,7 @@
"XPLoginBindSuccessView0" = "恭喜您！绑定成功";
"XPLoginBindSuccessView1" = "关闭";
"LoginFullInfoViewController0" = "当前未填写邀请码哦～ \n 确认继续下一步吗";
"LoginFullInfoViewController0" = "确认继续下一步吗";
"LoginFullInfoViewController1" = "完善资料";
"LoginFullInfoViewController2" = "性别后期无法进行修改";
"LoginFullInfoViewController3" = "昵称";
@@ -2197,8 +2197,9 @@
"LoginFullInfoViewController5" = "请输入邀请码（选填）";
"LoginFullInfoViewController6" = "完成";
"LoginFullInfoViewController7" = "本软件只提供给18岁或以上用户使用";
"LoginFullInfoViewController8" = "請選擇您的性別";
"LoginFullInfoViewController8" = "请选择您的性别";
"LoginFullInfoViewController9" = "随机";
"LoginFullInfoViewController10" = "未填写邀请码";
"LoginBindPhoneViewController0" = "第三方登录需绑定手机号喔~";
"LoginBindPhoneViewController1" = "手机格式不正确";

4
YuMi/zh-Hant.lproj/Localizable.strings
View File

@@ -2194,7 +2194,7 @@
"XPLoginBindSuccessView0" = "恭喜您！綁定成功";
"XPLoginBindSuccessView1" = "關閉";
"LoginFullInfoViewController0" = "當前未填寫邀請碼哦～ \n 確認繼續下一步嗎";
"LoginFullInfoViewController0" = "確認繼續下一步嗎";
"LoginFullInfoViewController1" = "完善資料";
"LoginFullInfoViewController2" = "性別後期無法進行修改";
"LoginFullInfoViewController3" = "昵稱";
@@ -2204,6 +2204,8 @@
"LoginFullInfoViewController7" = "本軟件只提供給18歲或以上用戶使用";
"LoginFullInfoViewController8" = "請選擇您的性別";
"LoginFullInfoViewController9" = "隨機";
"LoginFullInfoViewController10" = "未填寫邀請碼";
"LoginBindPhoneViewController0" = "第三方登錄需綁定手機號喔~";
"LoginBindPhoneViewController1" = "手機格式不正確";