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

代码 & UI 小优化

Browse Source
This commit is contained in:
eggmanQQQ
2024-10-29 17:10:56 +08:00
parent 1f6b060898
commit 0e00f4df11
23 changed files with 80 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
YuMi/CustomUI/TTPopup/View/TTAlertView.m
View File

@@ -208,6 +208,7 @@ static CGFloat const kBtnHeight = 38.f;
if (!_titleLabel) { if (!_titleLabel) {
_titleLabel = [[UILabel alloc] init]; _titleLabel = [[UILabel alloc] init];
_titleLabel.textAlignment = NSTextAlignmentCenter; _titleLabel.textAlignment = NSTextAlignmentCenter;
_titleLabel.numberOfLines = 0;
} }
return _titleLabel ; return _titleLabel ;
} }

2
YuMi/Modules/YMLogin/Presenter/LoginPresenter.m
View File

@@ -293,7 +293,7 @@
[Api phoneSmsCode:[self createHttpCompletion:^(id _Nonnull data) { [Api phoneSmsCode:[self createHttpCompletion:^(id _Nonnull data) {
@kStrongify(self); @kStrongify(self);
[[self getView] phoneSmsCodeSuccess]; [[self getView] phoneSmsCodeSuccess];
}] mobile:desPhone type:[NSString stringWithFormat:@"%lu", (unsigned long)type] phoneAreaCode:phoneAreaCode]; } showLoading:YES errorToast:YES] mobile:desPhone type:[NSString stringWithFormat:@"%lu", (unsigned long)type] phoneAreaCode:phoneAreaCode];
} }
/// 使用手机号和验证码登录 /// 使用手机号和验证码登录

8
YuMi/Modules/YMLogin/View/NewLogin/XPLoginAraeViewController.m
View File

@@ -36,7 +36,13 @@
// 将文件数据化 // 将文件数据化
NSData *data = [[NSData alloc] initWithContentsOfFile:path]; NSData *data = [[NSData alloc] initWithContentsOfFile:path];
// 对数据进行JSON格式化并返回字典形式 // 对数据进行JSON格式化并返回字典形式
NSDictionary *codeData = [NSJSONSerialization JSONObjectWithData:data options:NSJSONReadingMutableLeaves error:nil]; NSError *error = nil;
NSDictionary *codeData = [NSJSONSerialization JSONObjectWithData:data
options:NSJSONReadingMutableLeaves
error:&error];
if (error) {
NSLog(@"JSON Parsing Error: %@", error.localizedDescription);
}
NSArray *codeList = [LoginAreaModel modelsWithArray:codeData[@"RECORDS"]]; NSArray *codeList = [LoginAreaModel modelsWithArray:codeData[@"RECORDS"]];
[self getLocalPlistWithList:codeList]; [self getLocalPlistWithList:codeList];
} }

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

@@ -162,12 +162,12 @@
make.height.mas_equalTo(kGetScaleWidth(48)); make.height.mas_equalTo(kGetScaleWidth(48));
make.width.mas_equalTo(kGetScaleWidth(303)); make.width.mas_equalTo(kGetScaleWidth(303));
}]; }];
} }
- (void)touchesBegan:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event{ - (void)touchesBegan:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event{
[self.view endEditing:YES]; [self.view endEditing:YES];
} }
- (void)racBind { - (void)racBind {
@weakify(self); @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){ 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){
@@ -179,7 +179,6 @@
}] takeUntil:self.rac_willDeallocSignal]; }] takeUntil:self.rac_willDeallocSignal];
} }
/// 登录 /// 登录
- (void)loginBtnClicked { - (void)loginBtnClicked {
[XNDJTDDLoadingTool showOnlyView:self.view]; [XNDJTDDLoadingTool showOnlyView:self.view];
@@ -189,8 +188,7 @@
[self.presenter loginWithPhone:phone password:password]; [self.presenter loginWithPhone:phone password:password];
return; return;
} }
NSString *phone = self.phoneInputView.inputTextField.text; NSString *phone = self.phoneInputView.inputTextField.text;
NSString *smsCode = self.codeInputView.inputTextField.text; NSString *smsCode = self.codeInputView.inputTextField.text;
NSString * phoneStr = [NSString stringWithFormat:@"%@%@",self.pi_phoneAreaCode, phone]; NSString * phoneStr = [NSString stringWithFormat:@"%@%@",self.pi_phoneAreaCode, phone];
@@ -348,7 +346,6 @@
return _loginBtn; return _loginBtn;
} }
- (UIImageView *)bgImageView{ - (UIImageView *)bgImageView{
if(!_bgImageView){ if(!_bgImageView){
_bgImageView = [[UIImageView alloc]init]; _bgImageView = [[UIImageView alloc]init];
@@ -371,8 +368,6 @@
_chooseTypeView = [UIImageView new]; _chooseTypeView = [UIImageView new];
_chooseTypeView.userInteractionEnabled = YES; _chooseTypeView.userInteractionEnabled = YES;
[_chooseTypeView setImage:kImage(@"login_choose_phone_bg")]; [_chooseTypeView setImage:kImage(@"login_choose_phone_bg")];
} }
return _chooseTypeView; return _chooseTypeView;
} }

4
YuMi/Modules/YMMessage/View/Session/XPSessionMainViewController.m
View File

@@ -179,7 +179,9 @@
_titleView.contentEdgeInsetRight = 120; _titleView.contentEdgeInsetRight = 120;
_titleView.titles = self.titles; _titleView.titles = self.titles;
_titleView.cellSpacing = 20; _titleView.cellSpacing = 20;
_titleView.customWidth = KScreenWidth - 40; if (isMSTR() || isMSEN()) {
_titleView.customLeading = 40;
}
_titleView.listContainer = (id<JXCategoryViewListContainer>)self.pagingView.listContainerView; _titleView.listContainer = (id<JXCategoryViewListContainer>)self.pagingView.listContainerView;
[_titleView addSubview:self.allCleanBtn]; [_titleView addSubview:self.allCleanBtn];

2
YuMi/Modules/YMMine/Presenter/XPMinePayPwdPresenter.h
View File

@@ -19,7 +19,7 @@ NS_ASSUME_NONNULL_BEGIN
/// @param password 支付密码 /// @param password 支付密码
/// @param phone 手机号 /// @param phone 手机号
/// @param veriftCode 验证码 /// @param veriftCode 验证码
- (void)setPayPassword:(NSString *)password phone:(NSString *)phone veriftCode:(NSString *)veriftCode; //- (void)setPayPassword:(NSString *)password phone:(NSString *)phone veriftCode:(NSString *)veriftCode;
/// 设置支付密码 /// 设置支付密码
/// @param password 支付密码 /// @param password 支付密码

2
YuMi/Modules/YMMine/Presenter/XPMinePayPwdPresenter.m
View File

@@ -25,7 +25,7 @@
NSString * desPhone = [DESEncrypt encryptUseDES:phone key:KeyWithType(KeyType_PasswordEncode)]; NSString * desPhone = [DESEncrypt encryptUseDES:phone key:KeyWithType(KeyType_PasswordEncode)];
[Api phoneSmsCode:[self createHttpCompletion:^(BaseModel * _Nonnull data) { [Api phoneSmsCode:[self createHttpCompletion:^(BaseModel * _Nonnull data) {
[[self getView] phoneSmsCodeSuccess]; [[self getView] phoneSmsCodeSuccess];
}] mobile:desPhone type:typeStr phoneAreaCode:phoneAreaCode]; } showLoading:YES errorToast:YES] mobile:desPhone type:typeStr phoneAreaCode:phoneAreaCode];
} }
/// 设置支付密码 /// 设置支付密码

5
YuMi/Modules/YMMine/View/IncomeRecord/Presenter/XPIncomeRecordPresent.m
View File

@@ -15,8 +15,6 @@
///model ///model
#import "XPIncomeRecordModel.h" #import "XPIncomeRecordModel.h"
#import "XPExchangeDiamondsModel.h" #import "XPExchangeDiamondsModel.h"
#import "XPBindExtractInfoModel.h"
#import "XPWithdrawAccountModel.h"
#import "XPIncomeRecordGoldDetailsModel.h" #import "XPIncomeRecordGoldDetailsModel.h"
@implementation XPIncomeRecordPresent @implementation XPIncomeRecordPresent
- (id<XPIncomeRecordProtocol>)getView { - (id<XPIncomeRecordProtocol>)getView {
@@ -31,13 +29,10 @@
} showLoading:NO errorToast:NO]]; } showLoading:NO errorToast:NO]];
} }
-(void)requestRecordIncome{ -(void)requestRecordIncome{
[Api requestRecordIncome:[self createHttpCompletion:^(BaseModel * _Nonnull data) { [Api requestRecordIncome:[self createHttpCompletion:^(BaseModel * _Nonnull data) {
XPIncomeRecordModel *model = [XPIncomeRecordModel modelWithDictionary:data.data]; XPIncomeRecordModel *model = [XPIncomeRecordModel modelWithDictionary:data.data];
[[self getView]getRecordIncomeSuccess:model]; [[self getView]getRecordIncomeSuccess:model];
} showLoading:YES]]; } showLoading:YES]];
} }
-(void)getExchangeDiamondInformation{ -(void)getExchangeDiamondInformation{
@kWeakify(self); @kWeakify(self);

4
YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoEditViewController.m
View File

@@ -135,10 +135,6 @@ TZImagePickerControllerDelegate>
}]; }];
}]; }];
#if DEBUG
self.userInfo.userVipInfoVO.uploadGifAvatar = YES;
#endif
if (self.userInfo.userVipInfoVO.uploadGifAvatar) { if (self.userInfo.userVipInfoVO.uploadGifAvatar) {
TTActionSheetConfig *gifLibraryConfig = [TTActionSheetConfig normalTitle:YMLocalizedString(@"UserInfoEdit_1.0.17_0") clickAction:^{ TTActionSheetConfig *gifLibraryConfig = [TTActionSheetConfig normalTitle:YMLocalizedString(@"UserInfoEdit_1.0.17_0") clickAction:^{
[YYUtility checkAssetsLibrayAvailable:^{ [YYUtility checkAssetsLibrayAvailable:^{

14
YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoViewController.m
View File

@@ -124,7 +124,7 @@ HWDMP4PlayDelegate>
- (void)viewWillAppear:(BOOL)animated { - (void)viewWillAppear:(BOOL)animated {
[super viewWillAppear:animated]; [super viewWillAppear:animated];
[self.presenter getUserInfoWithUid:@(self.uid).stringValue]; [self initHttpRequest];
if([XPSkillCardPlayerManager shareInstance].isInRoom == YES && [XPSkillCardPlayerManager shareInstance].isInRoomFirstRecharge == NO){ if([XPSkillCardPlayerManager shareInstance].isInRoom == YES && [XPSkillCardPlayerManager shareInstance].isInRoomFirstRecharge == NO){
[XPSkillCardPlayerManager shareInstance].isInRoomFirstRecharge = YES; [XPSkillCardPlayerManager shareInstance].isInRoomFirstRecharge = YES;
@@ -137,6 +137,12 @@ HWDMP4PlayDelegate>
self.playVapCount = 0; self.playVapCount = 0;
[self initSubViews]; [self initSubViews];
[self initSubViewConstraints]; [self initSubViewConstraints];
///上传访问记录
NSString *uid = [NSString stringWithFormat:@"%ld", self.uid];
if (![uid isEqualToString:[[AccountInfoStorage instance] getUid]]) {
[self.presenter visitUser:uid];
}
} }
- (void)viewDidLayoutSubviews { - (void)viewDidLayoutSubviews {
@@ -174,12 +180,8 @@ HWDMP4PlayDelegate>
- (void)initHttpRequest { - (void)initHttpRequest {
NSString *uid = [NSString stringWithFormat:@"%ld", self.uid]; NSString *uid = [NSString stringWithFormat:@"%ld", self.uid];
// [self.presenter getUserInfoWithUid:uid]; // [self.presenter getUserInfoWithUid:uid];
[self.presenter getUserInfoWithUid:uid];
[self.presenter getUserAttentionState:uid]; [self.presenter getUserAttentionState:uid];
///上传访问记录
if (![uid isEqualToString:[[AccountInfoStorage instance] getUid]]) {
[self.presenter visitUser:uid];
}
} }
#pragma mark - 拉黑 移除黑名单 #pragma mark - 拉黑 移除黑名单

12
YuMi/Modules/YMMine/View/Noble/View/VIPCenterViewController.m
View File

@@ -788,12 +788,12 @@ UICollectionViewDataSource>
[model.vipAuthInfos enumerateObjectsUsingBlock:^(NobleAuthInfo * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { [model.vipAuthInfos enumerateObjectsUsingBlock:^(NobleAuthInfo * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
if (obj.authType == 1 || obj.authType == 2 || obj.authType == 5 || obj.authType == 8 || obj.authType == 11 || obj.authType == 12) { if (obj.authType == 1 || obj.authType == 2 || obj.authType == 5 || obj.authType == 8 || obj.authType == 11 || obj.authType == 12) {
[tempArray_1 addObject:obj]; [tempArray_1 addObject:obj];
} else if (obj.authType != 16) { } else {
[tempArray_2 addObject:obj]; [tempArray_2 addObject:obj];
} }
}]; }];
self.vipIdentificationInfoArray = tempArray_1.copy; self.vipIdentificationInfoArray = tempArray_1.copy;
self.vipExclusivePrivilegesInfoArray = tempArray_2.copy; self.vipExclusivePrivilegesInfoArray = model.vipAuthInfos.copy;
if (self.userVIPInfo) { if (self.userVIPInfo) {
self.currentVIPInfo = [self.vipModel.vipInfos xpSafeObjectAtIndex:self.userVIPInfo.vipLevel - 1]; self.currentVIPInfo = [self.vipModel.vipInfos xpSafeObjectAtIndex:self.userVIPInfo.vipLevel - 1];
@@ -994,10 +994,14 @@ UICollectionViewDataSource>
return UIEdgeInsetsMake(10, 0, 10, 0); return UIEdgeInsetsMake(10, 0, 10, 0);
break; break;
case 1: case 1:
return UIEdgeInsetsMake(0, 16, 0, 16); if (iPhoneXSeries) {
return UIEdgeInsetsMake(0, 16, 0, 16);
} else {
return UIEdgeInsetsMake(0, 6, 0, 6);
}
break; break;
case 2: case 2:
return UIEdgeInsetsMake(10, 0, 10, 0); return UIEdgeInsetsMake(14, 0, 6, 0);
break; break;
case 3: case 3:
return UIEdgeInsetsMake(0, 40, 100, 40); return UIEdgeInsetsMake(0, 40, 100, 40);

2
YuMi/Modules/YMMine/View/SubViews/CPGiftBanner.m
View File

@@ -97,7 +97,7 @@
[UIView animateWithDuration:0.25 animations:^{ [UIView animateWithDuration:0.25 animations:^{
bannerView.center = CGPointMake(superView.center.x, height/2 + topSpace); bannerView.center = CGPointMake(superView.center.x, height/2 + topSpace);
} completion:^(BOOL finished) { } completion:^(BOOL finished) {
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
[UIView animateWithDuration:0.25 delay:0 options:UIViewAnimationOptionCurveEaseInOut animations:^{ [UIView animateWithDuration:0.25 delay:0 options:UIViewAnimationOptionCurveEaseInOut animations:^{
bannerView.frame = CGRectMake(-KScreenWidth, topSpace, width, height); bannerView.frame = CGRectMake(-KScreenWidth, topSpace, width, height);
} completion:^(BOOL finished) { } completion:^(BOOL finished) {

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

@@ -975,6 +975,7 @@ return view;\
if (!_reviewIcon) { if (!_reviewIcon) {
_reviewIcon = [[UIImageView alloc] init]; _reviewIcon = [[UIImageView alloc] init];
_reviewIcon.image = [UIImage getLanguageImage:@"mine_album_reviewing"]; _reviewIcon.image = [UIImage getLanguageImage:@"mine_album_reviewing"];
_reviewIcon.contentMode = UIViewContentModeScaleAspectFit;
_reviewIcon.hidden = YES; _reviewIcon.hidden = YES;
} }
return _reviewIcon; return _reviewIcon;

2
YuMi/Modules/YMRoom/Features/Boom/RoomBoomBannerAnimation.m
View File

@@ -54,7 +54,7 @@
[UIView animateWithDuration:0.25 animations:^{ [UIView animateWithDuration:0.25 animations:^{
bannerView.center = CGPointMake(superView.center.x, height/2 + 80); bannerView.center = CGPointMake(superView.center.x, height/2 + 80);
} completion:^(BOOL finished) { } completion:^(BOOL finished) {
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
[UIView animateWithDuration:0.25 delay:0 options:UIViewAnimationOptionCurveEaseInOut animations:^{ [UIView animateWithDuration:0.25 delay:0 options:UIViewAnimationOptionCurveEaseInOut animations:^{
bannerView.frame = CGRectMake(-KScreenWidth, 80, width, height); bannerView.frame = CGRectMake(-KScreenWidth, 80, width, height);
} completion:^(BOOL finished) { } completion:^(BOOL finished) {

24
YuMi/Modules/YMRoom/Features/Boom/RoomBoomEntryView.m
View File

@@ -26,14 +26,13 @@
@kStrongify(self); @kStrongify(self);
self.icon.imageUrl = boomModel.pic; self.icon.imageUrl = boomModel.pic;
CGFloat progress = boomModel.speed * 1.0 / 100.0; CGFloat progress = boomModel.speed * 1.0 / 100.0;
if (progress == 0) { if (progress == 0) {
self.progress.hidden = YES; self.progress.hidden = YES;
} else { } else {
self.progress.hidden = NO; self.progress.hidden = NO;
[UIView animateWithDuration:0.3 animations:^{ [UIView animateWithDuration:0.3 animations:^{
[self.progress mas_updateConstraints:^(MASConstraintMaker *make) { [self.progress mas_updateConstraints:^(MASConstraintMaker *make) {
make.width.mas_equalTo(kGetScaleWidth(32) * progress); make.width.mas_equalTo(46 * progress);
}]; }];
[self layoutIfNeeded]; [self layoutIfNeeded];
}]; }];
@@ -45,24 +44,25 @@
if (self = [super init]) { if (self = [super init]) {
[self addSubview:self.icon]; [self addSubview:self.icon];
[self.icon mas_makeConstraints:^(MASConstraintMaker *make) { [self.icon mas_makeConstraints:^(MASConstraintMaker *make) {
make.center.mas_equalTo(self); make.centerX.mas_equalTo(self);
make.size.mas_equalTo(CGSizeMake(kGetScaleWidth(40), kGetScaleWidth(40))); make.bottom.mas_equalTo(-10);
make.size.mas_equalTo(CGSizeMake(55,55));
}]; }];
[self addSubview:self.progressBG]; [self addSubview:self.progressBG];
[self.progressBG mas_makeConstraints:^(MASConstraintMaker *make) { [self.progressBG mas_makeConstraints:^(MASConstraintMaker *make) {
make.bottom.mas_equalTo(self.icon).offset(3); make.bottom.mas_equalTo(self).offset(-3);
make.leading.mas_equalTo(self.icon).offset(3); make.centerX.mas_equalTo(self);
make.trailing.mas_equalTo(self.icon).offset(-3); make.width.mas_equalTo(47);
make.height.mas_equalTo(7); make.height.mas_equalTo(8);
}]; }];
[self addSubview:self.progress]; [self.progressBG addSubview:self.progress];
[self.progress mas_makeConstraints:^(MASConstraintMaker *make) { [self.progress mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerY.mas_equalTo(self.progressBG); make.centerY.mas_equalTo(self.progressBG);
make.leading.mas_equalTo(self.icon).offset(4.5); make.leading.mas_equalTo(self.progress).offset(0.5);
make.width.mas_equalTo(0); make.width.mas_equalTo(0);
make.height.mas_equalTo(5); make.height.mas_equalTo(7);
}]; }];
} }
return self; return self;
@@ -80,7 +80,7 @@
- (UIImageView *)progress { - (UIImageView *)progress {
if (!_progress) { if (!_progress) {
UIImage *progressImage = [kImage(@"room_boom_entry_progress_bar") resizableImageWithCapInsets:UIEdgeInsetsMake(0, 10, 0, 3) resizingMode:UIImageResizingModeTile]; UIImage *progressImage = [kImage(@"room_boom_entry_progress_bar") resizableImageWithCapInsets:UIEdgeInsetsMake(0, 6, 0, 6) resizingMode:UIImageResizingModeStretch];
_progress = [[UIImageView alloc] initWithImage:progressImage]; _progress = [[UIImageView alloc] initWithImage:progressImage];
_progress.userInteractionEnabled = YES; _progress.userInteractionEnabled = YES;
_progress.hidden = NO; _progress.hidden = NO;

13
YuMi/Modules/YMRoom/View/ActivityContainerView/XPRoomActivityContainerView.m
View File

@@ -166,6 +166,7 @@ UIKIT_EXTERN NSString *kShowFirstRechargeView;
CGFloat scrollItemWidth = KScreenHeight > 667 ? 65 : 55 * kScreenHeightScale; CGFloat scrollItemWidth = KScreenHeight > 667 ? 65 : 55 * kScreenHeightScale;
CGSize itemSize = CGSizeMake(scrollItemWidth , scrollItemWidth); CGSize itemSize = CGSizeMake(scrollItemWidth , scrollItemWidth);
CGSize itemSize_game_rocket = CGSizeMake(55 , 55);
[self.pi_cycleScrollView mas_makeConstraints:^(MASConstraintMaker *make) { [self.pi_cycleScrollView mas_makeConstraints:^(MASConstraintMaker *make) {
make.size.mas_equalTo(itemSize); make.size.mas_equalTo(itemSize);
}]; }];
@@ -181,12 +182,12 @@ UIKIT_EXTERN NSString *kShowFirstRechargeView;
[self.gambleMenuButton mas_makeConstraints:^(MASConstraintMaker *make) { [self.gambleMenuButton mas_makeConstraints:^(MASConstraintMaker *make) {
make.leading.mas_equalTo(0); make.leading.mas_equalTo(0);
make.size.mas_equalTo(itemSize); make.size.mas_equalTo(itemSize_game_rocket);
}]; }];
[self.boomView mas_makeConstraints:^(MASConstraintMaker *make) { [self.boomView mas_makeConstraints:^(MASConstraintMaker *make) {
make.leading.mas_equalTo(0); make.leading.mas_equalTo(0);
make.size.mas_equalTo(itemSize); make.size.mas_equalTo(itemSize_game_rocket);
}]; }];
[self.configEntranceMenuButton mas_makeConstraints:^(MASConstraintMaker *make) { [self.configEntranceMenuButton mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -787,9 +788,9 @@ UIKIT_EXTERN NSString *kShowFirstRechargeView;
if (!_stackView) { if (!_stackView) {
_stackView = [[UIStackView alloc] init]; _stackView = [[UIStackView alloc] init];
_stackView.axis = UILayoutConstraintAxisVertical; _stackView.axis = UILayoutConstraintAxisVertical;
_stackView.distribution = UIStackViewDistributionFill; _stackView.distribution = UIStackViewDistributionFillProportionally;
_stackView.alignment = UIStackViewAlignmentCenter; _stackView.alignment = UIStackViewAlignmentCenter;
_stackView.spacing = 0; _stackView.spacing = 14;
} }
return _stackView; return _stackView;
} }
@@ -831,7 +832,7 @@ UIKIT_EXTERN NSString *kShowFirstRechargeView;
b.imageView.contentMode = UIViewContentModeScaleAspectFit; b.imageView.contentMode = UIViewContentModeScaleAspectFit;
b.contentHorizontalAlignment = UIControlContentHorizontalAlignmentFill; b.contentHorizontalAlignment = UIControlContentHorizontalAlignmentFill;
b.contentVerticalAlignment = UIControlContentVerticalAlignmentFill; b.contentVerticalAlignment = UIControlContentVerticalAlignmentFill;
b.imageEdgeInsets = UIEdgeInsetsMake(10, 10, 10, 10); // b.imageEdgeInsets = UIEdgeInsetsMake(10, 10, 10, 10);
b.hidden = YES; b.hidden = YES;
_gambleMenuButton = b; _gambleMenuButton = b;
} }
@@ -846,7 +847,7 @@ UIKIT_EXTERN NSString *kShowFirstRechargeView;
b.imageView.contentMode = UIViewContentModeScaleAspectFit; b.imageView.contentMode = UIViewContentModeScaleAspectFit;
b.contentHorizontalAlignment = UIControlContentHorizontalAlignmentFill; b.contentHorizontalAlignment = UIControlContentHorizontalAlignmentFill;
b.contentVerticalAlignment = UIControlContentVerticalAlignmentFill; b.contentVerticalAlignment = UIControlContentVerticalAlignmentFill;
b.imageEdgeInsets = UIEdgeInsetsMake(10, 10, 10, 10); // b.imageEdgeInsets = UIEdgeInsetsMake(10, 10, 10, 10);
b.hidden = YES; b.hidden = YES;
_configEntranceMenuButton = b; _configEntranceMenuButton = b;
} }

6
YuMi/Modules/YMRoom/View/AnimationView/GameUniversalBannerView.m
View File

@@ -49,7 +49,7 @@
[UIView animateWithDuration:0.25 animations:^{ [UIView animateWithDuration:0.25 animations:^{
bannerView.center = CGPointMake(superView.center.x, height/2 + 80); bannerView.center = CGPointMake(superView.center.x, height/2 + 80);
} completion:^(BOOL finished) { } completion:^(BOOL finished) {
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
[UIView animateWithDuration:0.25 delay:0 options:UIViewAnimationOptionCurveEaseInOut animations:^{ [UIView animateWithDuration:0.25 delay:0 options:UIViewAnimationOptionCurveEaseInOut animations:^{
bannerView.frame = CGRectMake(-KScreenWidth, 80, width, height); bannerView.frame = CGRectMake(-KScreenWidth, 80, width, height);
} completion:^(BOOL finished) { } completion:^(BOOL finished) {
@@ -200,9 +200,9 @@
[self.bgImageView loadImageWithUrl:model.resourceContent completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) { [self.bgImageView loadImageWithUrl:model.resourceContent completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) {
@kStrongify(self); @kStrongify(self);
if (image) { if (image) {
[self loadLocalSVGA];
} else {
self.bgImageView.image = image; self.bgImageView.image = image;
} else {
[self loadLocalSVGA];
} }
}]; }];
} }

2
YuMi/Modules/YMRoom/View/AnimationView/LuckyGiftWinningBannerView.m
View File

@@ -87,7 +87,7 @@ exitCurrentRoom:(void(^)(void))exit {
[UIView animateWithDuration:0.25 animations:^{ [UIView animateWithDuration:0.25 animations:^{
bannerView.center = CGPointMake(superView.center.x, height/2 + 80); bannerView.center = CGPointMake(superView.center.x, height/2 + 80);
} completion:^(BOOL finished) { } completion:^(BOOL finished) {
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
[UIView animateWithDuration:0.25 delay:0 options:UIViewAnimationOptionCurveEaseInOut animations:^{ [UIView animateWithDuration:0.25 delay:0 options:UIViewAnimationOptionCurveEaseInOut animations:^{
bannerView.frame = CGRectMake(-KScreenWidth, 80, width, height); bannerView.frame = CGRectMake(-KScreenWidth, 80, width, height);
} completion:^(BOOL finished) { } completion:^(BOOL finished) {

2
YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeBuySuccessView.m
View File

@@ -131,7 +131,7 @@
- (UIImageView *)bgImageView{ - (UIImageView *)bgImageView{
if(!_bgImageView){ if(!_bgImageView){
_bgImageView = [UIImageView new]; _bgImageView = [UIImageView new];
_bgImageView.image = kImage(@"room_candy_tree_buy_love__bg"); _bgImageView.image = [UIImage getLanguageImage:@"room_candy_tree_buy_love__bg"];//kImage(@"room_candy_tree_buy_love__bg");
_bgImageView.userInteractionEnabled = YES; _bgImageView.userInteractionEnabled = YES;
} }
return _bgImageView; return _bgImageView;

5
YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeConfirmBuyView.m
View File

@@ -277,7 +277,7 @@
- (UIImageView *)bgImageView{ - (UIImageView *)bgImageView{
if(!_bgImageView){ if(!_bgImageView){
_bgImageView = [UIImageView new]; _bgImageView = [UIImageView new];
_bgImageView.image = kImage(@"room_candy_tree_confirm_buy_bg"); _bgImageView.image = [UIImage getLanguageImage:@"room_candy_tree_confirm_buy_bg"];//kImage(@"room_candy_tree_confirm_buy_bg");
_bgImageView.userInteractionEnabled = YES; _bgImageView.userInteractionEnabled = YES;
} }
return _bgImageView; return _bgImageView;
@@ -334,7 +334,8 @@
- (UIButton *)buyBtn{ - (UIButton *)buyBtn{
if(!_buyBtn){ if(!_buyBtn){
_buyBtn = [UIButton new]; _buyBtn = [UIButton new];
[_buyBtn setBackgroundImage:kImage(@"room_candy_tree_buy_love_but_btn") forState:UIControlStateNormal]; [_buyBtn setBackgroundImage:[UIImage getLanguageImage:@"room_candy_tree_buy_love_but_btn"]//kImage(@"room_candy_tree_buy_love_but_btn")
forState:UIControlStateNormal];
// [_buyBtn setTitle:YMLocalizedString(@"PITreasureFairyBuyElfShardView1") forState:UIControlStateNormal]; // [_buyBtn setTitle:YMLocalizedString(@"PITreasureFairyBuyElfShardView1") forState:UIControlStateNormal];
// [_buyBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; // [_buyBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
// _buyBtn.titleLabel.font = kFontMedium(14); // _buyBtn.titleLabel.font = kFontMedium(14);

44
YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeViewController.m
View File

@@ -51,8 +51,6 @@
///获得糖果 ///获得糖果
@property (nonatomic,strong) UIImageView *moreImageView; @property (nonatomic,strong) UIImageView *moreImageView;
///动画管理类 ///动画管理类
@property (strong, nonatomic) SVGAParser *parser; @property (strong, nonatomic) SVGAParser *parser;
///糖果树魔天輪 ///糖果树魔天輪
@@ -62,8 +60,6 @@
@property(nonatomic,strong) UIImageView *lampView; @property(nonatomic,strong) UIImageView *lampView;
///砸蛋特效 ///砸蛋特效
@property (nonatomic,strong) SVGAImageView *candyTreeOpenView; @property (nonatomic,strong) SVGAImageView *candyTreeOpenView;
@@ -93,7 +89,6 @@
- (void)dealloc { - (void)dealloc {
[[NIMSDK sharedSDK].systemNotificationManager removeDelegate:self]; [[NIMSDK sharedSDK].systemNotificationManager removeDelegate:self];
} }
- (instancetype)initWithDelegate:(id<RoomHostDelegate>)delegate { - (instancetype)initWithDelegate:(id<RoomHostDelegate>)delegate {
@@ -117,35 +112,32 @@
[self initSubViewConstraints]; [self initSubViewConstraints];
[self.presenter getCandyTreeInfo]; [self.presenter getCandyTreeInfo];
[self.presenter getLoveSettingInfo]; [self.presenter getLoveSettingInfo];
} }
- (void)touchesBegan:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event { - (void)touchesBegan:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event {
[self.view endEditing:YES]; [self.view endEditing:YES];
} }
#pragma mark -XPCandyRankContainerViewDelegate #pragma mark -XPCandyRankContainerViewDelegate
- (void)didClickHeadHandle:(NSInteger)uid{ - (void)didClickHeadHandle:(NSInteger)uid{
[TTPopup dismiss]; [TTPopup dismiss];
XPMineUserInfoViewController * userInfoVC = [[XPMineUserInfoViewController alloc] init]; XPMineUserInfoViewController * userInfoVC = [[XPMineUserInfoViewController alloc] init];
userInfoVC.uid = uid; userInfoVC.uid = uid;
[self.hostDelegate.getCurrentNav pushViewController:userInfoVC animated:YES]; [self.hostDelegate.getCurrentNav pushViewController:userInfoVC animated:YES];
} }
#pragma mark - XPCandyTreeProtocol #pragma mark - XPCandyTreeProtocol
- (void)getCandyTreeInfoSuccess:(CandyTreeInfoModel *)info { - (void)getCandyTreeInfoSuccess:(CandyTreeInfoModel *)info {
[self hideHUD]; [self hideHUD];
self.candyInfo = info; self.candyInfo = info;
} }
-(void)getLoveSettingInfoSuccess:(PICandyTreeSetModel *)setModel{ -(void)getLoveSettingInfoSuccess:(PICandyTreeSetModel *)setModel{
self.setModel = setModel; self.setModel = setModel;
self.buyView.num = self.setModel.ticketNum; self.buyView.num = self.setModel.ticketNum;
} }
- (void)buyLoveTicketSuccessWithNum:(NSString *)num{
- (void)buyLoveTicketSuccessWithNum:(NSString *)num{
NSString *time = [NSDate getNowTimeTimestamp]; NSString *time = [NSDate getNowTimeTimestamp];
NSString *curTime = [NSDate timestampSwitchTime:[time integerValue] andFormatter:@"yyyy-MM-dd"]; NSString *curTime = [NSDate timestampSwitchTime:[time integerValue] andFormatter:@"yyyy-MM-dd"];
NSDictionary *timeDic = [[NSUserDefaults standardUserDefaults]valueForKey:@"kBuyLoveNumSuccessNoPrompt"]; NSDictionary *timeDic = [[NSUserDefaults standardUserDefaults]valueForKey:@"kBuyLoveNumSuccessNoPrompt"];
@@ -248,10 +240,8 @@
} }
#pragma mark - Private Method #pragma mark - Private Method
- (void)initSubViews { - (void)initSubViews {
self.view.backgroundColor = [UIColor clearColor]; self.view.backgroundColor = [UIColor clearColor];
[self.view addSubview:self.backView]; [self.view addSubview:self.backView];
[self.view addSubview:self.bgImageView]; [self.view addSubview:self.bgImageView];
@@ -272,20 +262,16 @@
[self.bgImageView addSubview:self.animationView]; [self.bgImageView addSubview:self.animationView];
[self.bgImageView addSubview:self.buyView]; [self.bgImageView addSubview:self.buyView];
@kWeakify(self);
[self.parser parseWithNamed:@"pi_happy_egg_smash" inBundle:[NSBundle mainBundle] completionBlock:^(SVGAVideoEntity * _Nonnull videoItem) {
@kStrongify(self);
self.candyTreeOpenView.loops = 1;
@kWeakify(self); self.candyTreeOpenView.clearsAfterStop = NO;
[self.parser parseWithNamed:@"pi_happy_egg_smash" inBundle:[NSBundle mainBundle] completionBlock:^(SVGAVideoEntity * _Nonnull videoItem) { self.candyTreeOpenView.videoItem = videoItem;
@kStrongify(self); } failureBlock:^(NSError * _Nonnull error) {
self.candyTreeOpenView.loops = 1;
self.candyTreeOpenView.clearsAfterStop = NO; }];
self.candyTreeOpenView.videoItem = videoItem;
} failureBlock:^(NSError * _Nonnull error) {
}];
} }
- (void)initSubViewConstraints { - (void)initSubViewConstraints {

3
YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftUsersView.m
View File

@@ -103,7 +103,8 @@
}]; }];
[self.allMicroButton mas_makeConstraints:^(MASConstraintMaker *make) { [self.allMicroButton mas_makeConstraints:^(MASConstraintMaker *make) {
make.size.mas_equalTo(CGSizeMake(60, 28)); make.height.mas_equalTo(28);
make.width.mas_greaterThanOrEqualTo(60);
}]; }];
[self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) {

1
YuMi/Modules/YMRoom/View/Setting/Presenter/XPRoomSettingPresenter.m
View File

@@ -50,7 +50,6 @@
XPRoomSettingItemModel *avatarItem = [[XPRoomSettingItemModel alloc] init]; XPRoomSettingItemModel *avatarItem = [[XPRoomSettingItemModel alloc] init];
avatarItem.title = YMLocalizedString(@"RoomSetting_1.0.17_0"); avatarItem.title = YMLocalizedString(@"RoomSetting_1.0.17_0");
avatarItem.subTitle = roomInfo.roomTag;
avatarItem.avatar = roomInfo.avatar; avatarItem.avatar = roomInfo.avatar;
avatarItem.type = RoomSettingItemType_Avatar; avatarItem.type = RoomSettingItemType_Avatar;