From 0e00f4df112b7e92b3c9f6ed2ce5f91ee20acfeb Mon Sep 17 00:00:00 2001 From: eggmanQQQ <3671373519@qq.com> Date: Tue, 29 Oct 2024 17:10:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=20&=20UI=20=E5=B0=8F?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- YuMi/CustomUI/TTPopup/View/TTAlertView.m | 1 + .../YMLogin/Presenter/LoginPresenter.m | 2 +- .../View/NewLogin/XPLoginAraeViewController.m | 8 +++- .../NewLogin/XPLoginPhoneViewController.m | 11 ++--- .../Session/XPSessionMainViewController.m | 4 +- .../YMMine/Presenter/XPMinePayPwdPresenter.h | 2 +- .../YMMine/Presenter/XPMinePayPwdPresenter.m | 2 +- .../Presenter/XPIncomeRecordPresent.m | 5 --- .../XPMineUserInfoEditViewController.m | 4 -- .../MineInfo/XPMineUserInfoViewController.m | 14 +++--- .../View/Noble/View/VIPCenterViewController.m | 12 +++-- .../YMMine/View/SubViews/CPGiftBanner.m | 2 +- .../MineInfo/XPMineUserInfoHeaderView.m | 1 + .../Features/Boom/RoomBoomBannerAnimation.m | 2 +- .../YMRoom/Features/Boom/RoomBoomEntryView.m | 24 +++++----- .../XPRoomActivityContainerView.m | 13 +++--- .../AnimationView/GameUniversalBannerView.m | 6 +-- .../LuckyGiftWinningBannerView.m | 2 +- .../View/XPCandyTreeBuySuccessView.m | 2 +- .../View/XPCandyTreeConfirmBuyView.m | 5 ++- .../View/XPCandyTreeViewController.m | 44 +++++++------------ .../View/SendGiftView/View/XPGiftUsersView.m | 3 +- .../Presenter/XPRoomSettingPresenter.m | 1 - 23 files changed, 80 insertions(+), 90 deletions(-) diff --git a/YuMi/CustomUI/TTPopup/View/TTAlertView.m b/YuMi/CustomUI/TTPopup/View/TTAlertView.m index e77d9803..3d0a7037 100644 --- a/YuMi/CustomUI/TTPopup/View/TTAlertView.m +++ b/YuMi/CustomUI/TTPopup/View/TTAlertView.m @@ -208,6 +208,7 @@ static CGFloat const kBtnHeight = 38.f; if (!_titleLabel) { _titleLabel = [[UILabel alloc] init]; _titleLabel.textAlignment = NSTextAlignmentCenter; + _titleLabel.numberOfLines = 0; } return _titleLabel ; } diff --git a/YuMi/Modules/YMLogin/Presenter/LoginPresenter.m b/YuMi/Modules/YMLogin/Presenter/LoginPresenter.m index 054b3780..ac3b3963 100644 --- a/YuMi/Modules/YMLogin/Presenter/LoginPresenter.m +++ b/YuMi/Modules/YMLogin/Presenter/LoginPresenter.m @@ -293,7 +293,7 @@ [Api phoneSmsCode:[self createHttpCompletion:^(id _Nonnull data) { @kStrongify(self); [[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]; } /// 使用手机号和验证码登录 diff --git a/YuMi/Modules/YMLogin/View/NewLogin/XPLoginAraeViewController.m b/YuMi/Modules/YMLogin/View/NewLogin/XPLoginAraeViewController.m index d8567070..f113c104 100644 --- a/YuMi/Modules/YMLogin/View/NewLogin/XPLoginAraeViewController.m +++ b/YuMi/Modules/YMLogin/View/NewLogin/XPLoginAraeViewController.m @@ -36,7 +36,13 @@ // 将文件数据化 NSData *data = [[NSData alloc] initWithContentsOfFile:path]; // 对数据进行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"]]; [self getLocalPlistWithList:codeList]; } diff --git a/YuMi/Modules/YMLogin/View/NewLogin/XPLoginPhoneViewController.m b/YuMi/Modules/YMLogin/View/NewLogin/XPLoginPhoneViewController.m index 81cf74de..15fe44c6 100644 --- a/YuMi/Modules/YMLogin/View/NewLogin/XPLoginPhoneViewController.m +++ b/YuMi/Modules/YMLogin/View/NewLogin/XPLoginPhoneViewController.m @@ -162,12 +162,12 @@ make.height.mas_equalTo(kGetScaleWidth(48)); make.width.mas_equalTo(kGetScaleWidth(303)); }]; - - } + - (void)touchesBegan:(NSSet *)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){ @@ -179,7 +179,6 @@ }] takeUntil:self.rac_willDeallocSignal]; } - /// 登录 - (void)loginBtnClicked { [XNDJTDDLoadingTool showOnlyView:self.view]; @@ -189,8 +188,7 @@ [self.presenter loginWithPhone:phone password:password]; return; } - - + NSString *phone = self.phoneInputView.inputTextField.text; NSString *smsCode = self.codeInputView.inputTextField.text; NSString * phoneStr = [NSString stringWithFormat:@"%@%@",self.pi_phoneAreaCode, phone]; @@ -348,7 +346,6 @@ return _loginBtn; } - - (UIImageView *)bgImageView{ if(!_bgImageView){ _bgImageView = [[UIImageView alloc]init]; @@ -371,8 +368,6 @@ _chooseTypeView = [UIImageView new]; _chooseTypeView.userInteractionEnabled = YES; [_chooseTypeView setImage:kImage(@"login_choose_phone_bg")]; - - } return _chooseTypeView; } diff --git a/YuMi/Modules/YMMessage/View/Session/XPSessionMainViewController.m b/YuMi/Modules/YMMessage/View/Session/XPSessionMainViewController.m index a65787f7..54fc4188 100644 --- a/YuMi/Modules/YMMessage/View/Session/XPSessionMainViewController.m +++ b/YuMi/Modules/YMMessage/View/Session/XPSessionMainViewController.m @@ -179,7 +179,9 @@ _titleView.contentEdgeInsetRight = 120; _titleView.titles = self.titles; _titleView.cellSpacing = 20; - _titleView.customWidth = KScreenWidth - 40; + if (isMSTR() || isMSEN()) { + _titleView.customLeading = 40; + } _titleView.listContainer = (id)self.pagingView.listContainerView; [_titleView addSubview:self.allCleanBtn]; diff --git a/YuMi/Modules/YMMine/Presenter/XPMinePayPwdPresenter.h b/YuMi/Modules/YMMine/Presenter/XPMinePayPwdPresenter.h index e72259c9..b697ad6c 100644 --- a/YuMi/Modules/YMMine/Presenter/XPMinePayPwdPresenter.h +++ b/YuMi/Modules/YMMine/Presenter/XPMinePayPwdPresenter.h @@ -19,7 +19,7 @@ NS_ASSUME_NONNULL_BEGIN /// @param password 支付密码 /// @param phone 手机号 /// @param veriftCode 验证码 -- (void)setPayPassword:(NSString *)password phone:(NSString *)phone veriftCode:(NSString *)veriftCode; +//- (void)setPayPassword:(NSString *)password phone:(NSString *)phone veriftCode:(NSString *)veriftCode; /// 设置支付密码 /// @param password 支付密码 diff --git a/YuMi/Modules/YMMine/Presenter/XPMinePayPwdPresenter.m b/YuMi/Modules/YMMine/Presenter/XPMinePayPwdPresenter.m index ad4cad3e..80e51b10 100644 --- a/YuMi/Modules/YMMine/Presenter/XPMinePayPwdPresenter.m +++ b/YuMi/Modules/YMMine/Presenter/XPMinePayPwdPresenter.m @@ -25,7 +25,7 @@ NSString * desPhone = [DESEncrypt encryptUseDES:phone key:KeyWithType(KeyType_PasswordEncode)]; [Api phoneSmsCode:[self createHttpCompletion:^(BaseModel * _Nonnull data) { [[self getView] phoneSmsCodeSuccess]; - }] mobile:desPhone type:typeStr phoneAreaCode:phoneAreaCode]; + } showLoading:YES errorToast:YES] mobile:desPhone type:typeStr phoneAreaCode:phoneAreaCode]; } /// 设置支付密码 diff --git a/YuMi/Modules/YMMine/View/IncomeRecord/Presenter/XPIncomeRecordPresent.m b/YuMi/Modules/YMMine/View/IncomeRecord/Presenter/XPIncomeRecordPresent.m index ac116eb1..ab99f11b 100644 --- a/YuMi/Modules/YMMine/View/IncomeRecord/Presenter/XPIncomeRecordPresent.m +++ b/YuMi/Modules/YMMine/View/IncomeRecord/Presenter/XPIncomeRecordPresent.m @@ -15,8 +15,6 @@ ///model #import "XPIncomeRecordModel.h" #import "XPExchangeDiamondsModel.h" -#import "XPBindExtractInfoModel.h" -#import "XPWithdrawAccountModel.h" #import "XPIncomeRecordGoldDetailsModel.h" @implementation XPIncomeRecordPresent - (id)getView { @@ -31,13 +29,10 @@ } showLoading:NO errorToast:NO]]; } -(void)requestRecordIncome{ - [Api requestRecordIncome:[self createHttpCompletion:^(BaseModel * _Nonnull data) { XPIncomeRecordModel *model = [XPIncomeRecordModel modelWithDictionary:data.data]; [[self getView]getRecordIncomeSuccess:model]; } showLoading:YES]]; - - } -(void)getExchangeDiamondInformation{ @kWeakify(self); diff --git a/YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoEditViewController.m b/YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoEditViewController.m index 9dcbc7f3..ef37b38e 100644 --- a/YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoEditViewController.m +++ b/YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoEditViewController.m @@ -135,10 +135,6 @@ TZImagePickerControllerDelegate> }]; }]; -#if DEBUG - self.userInfo.userVipInfoVO.uploadGifAvatar = YES; -#endif - if (self.userInfo.userVipInfoVO.uploadGifAvatar) { TTActionSheetConfig *gifLibraryConfig = [TTActionSheetConfig normalTitle:YMLocalizedString(@"UserInfoEdit_1.0.17_0") clickAction:^{ [YYUtility checkAssetsLibrayAvailable:^{ diff --git a/YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoViewController.m b/YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoViewController.m index f2de7ccd..d7eb3147 100644 --- a/YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoViewController.m +++ b/YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoViewController.m @@ -124,7 +124,7 @@ HWDMP4PlayDelegate> - (void)viewWillAppear:(BOOL)animated { [super viewWillAppear:animated]; - [self.presenter getUserInfoWithUid:@(self.uid).stringValue]; + [self initHttpRequest]; if([XPSkillCardPlayerManager shareInstance].isInRoom == YES && [XPSkillCardPlayerManager shareInstance].isInRoomFirstRecharge == NO){ [XPSkillCardPlayerManager shareInstance].isInRoomFirstRecharge = YES; @@ -137,6 +137,12 @@ HWDMP4PlayDelegate> self.playVapCount = 0; [self initSubViews]; [self initSubViewConstraints]; + + ///上传访问记录 + NSString *uid = [NSString stringWithFormat:@"%ld", self.uid]; + if (![uid isEqualToString:[[AccountInfoStorage instance] getUid]]) { + [self.presenter visitUser:uid]; + } } - (void)viewDidLayoutSubviews { @@ -174,12 +180,8 @@ HWDMP4PlayDelegate> - (void)initHttpRequest { NSString *uid = [NSString stringWithFormat:@"%ld", self.uid]; // [self.presenter getUserInfoWithUid:uid]; + [self.presenter getUserInfoWithUid:uid]; [self.presenter getUserAttentionState:uid]; - - ///上传访问记录 - if (![uid isEqualToString:[[AccountInfoStorage instance] getUid]]) { - [self.presenter visitUser:uid]; - } } #pragma mark - 拉黑 移除黑名单 diff --git a/YuMi/Modules/YMMine/View/Noble/View/VIPCenterViewController.m b/YuMi/Modules/YMMine/View/Noble/View/VIPCenterViewController.m index 7b35979a..5a710acb 100644 --- a/YuMi/Modules/YMMine/View/Noble/View/VIPCenterViewController.m +++ b/YuMi/Modules/YMMine/View/Noble/View/VIPCenterViewController.m @@ -788,12 +788,12 @@ UICollectionViewDataSource> [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) { [tempArray_1 addObject:obj]; - } else if (obj.authType != 16) { + } else { [tempArray_2 addObject:obj]; } }]; self.vipIdentificationInfoArray = tempArray_1.copy; - self.vipExclusivePrivilegesInfoArray = tempArray_2.copy; + self.vipExclusivePrivilegesInfoArray = model.vipAuthInfos.copy; if (self.userVIPInfo) { self.currentVIPInfo = [self.vipModel.vipInfos xpSafeObjectAtIndex:self.userVIPInfo.vipLevel - 1]; @@ -994,10 +994,14 @@ UICollectionViewDataSource> return UIEdgeInsetsMake(10, 0, 10, 0); break; case 1: - return UIEdgeInsetsMake(0, 16, 0, 16); + if (iPhoneXSeries) { + return UIEdgeInsetsMake(0, 16, 0, 16); + } else { + return UIEdgeInsetsMake(0, 6, 0, 6); + } break; case 2: - return UIEdgeInsetsMake(10, 0, 10, 0); + return UIEdgeInsetsMake(14, 0, 6, 0); break; case 3: return UIEdgeInsetsMake(0, 40, 100, 40); diff --git a/YuMi/Modules/YMMine/View/SubViews/CPGiftBanner.m b/YuMi/Modules/YMMine/View/SubViews/CPGiftBanner.m index 484910ce..102deeae 100644 --- a/YuMi/Modules/YMMine/View/SubViews/CPGiftBanner.m +++ b/YuMi/Modules/YMMine/View/SubViews/CPGiftBanner.m @@ -97,7 +97,7 @@ [UIView animateWithDuration:0.25 animations:^{ bannerView.center = CGPointMake(superView.center.x, height/2 + topSpace); } 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:^{ bannerView.frame = CGRectMake(-KScreenWidth, topSpace, width, height); } completion:^(BOOL finished) { diff --git a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoHeaderView.m b/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoHeaderView.m index 3eb61451..87ba5023 100644 --- a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoHeaderView.m +++ b/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoHeaderView.m @@ -975,6 +975,7 @@ return view;\ if (!_reviewIcon) { _reviewIcon = [[UIImageView alloc] init]; _reviewIcon.image = [UIImage getLanguageImage:@"mine_album_reviewing"]; + _reviewIcon.contentMode = UIViewContentModeScaleAspectFit; _reviewIcon.hidden = YES; } return _reviewIcon; diff --git a/YuMi/Modules/YMRoom/Features/Boom/RoomBoomBannerAnimation.m b/YuMi/Modules/YMRoom/Features/Boom/RoomBoomBannerAnimation.m index 868398e5..7f00ed3e 100644 --- a/YuMi/Modules/YMRoom/Features/Boom/RoomBoomBannerAnimation.m +++ b/YuMi/Modules/YMRoom/Features/Boom/RoomBoomBannerAnimation.m @@ -54,7 +54,7 @@ [UIView animateWithDuration:0.25 animations:^{ bannerView.center = CGPointMake(superView.center.x, height/2 + 80); } 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:^{ bannerView.frame = CGRectMake(-KScreenWidth, 80, width, height); } completion:^(BOOL finished) { diff --git a/YuMi/Modules/YMRoom/Features/Boom/RoomBoomEntryView.m b/YuMi/Modules/YMRoom/Features/Boom/RoomBoomEntryView.m index a168c56f..96fb82af 100644 --- a/YuMi/Modules/YMRoom/Features/Boom/RoomBoomEntryView.m +++ b/YuMi/Modules/YMRoom/Features/Boom/RoomBoomEntryView.m @@ -26,14 +26,13 @@ @kStrongify(self); self.icon.imageUrl = boomModel.pic; CGFloat progress = boomModel.speed * 1.0 / 100.0; - if (progress == 0) { self.progress.hidden = YES; } else { self.progress.hidden = NO; [UIView animateWithDuration:0.3 animations:^{ [self.progress mas_updateConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(kGetScaleWidth(32) * progress); + make.width.mas_equalTo(46 * progress); }]; [self layoutIfNeeded]; }]; @@ -45,24 +44,25 @@ if (self = [super init]) { [self addSubview:self.icon]; [self.icon mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(self); - make.size.mas_equalTo(CGSizeMake(kGetScaleWidth(40), kGetScaleWidth(40))); + make.centerX.mas_equalTo(self); + make.bottom.mas_equalTo(-10); + make.size.mas_equalTo(CGSizeMake(55,55)); }]; [self addSubview:self.progressBG]; [self.progressBG mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(self.icon).offset(3); - make.leading.mas_equalTo(self.icon).offset(3); - make.trailing.mas_equalTo(self.icon).offset(-3); - make.height.mas_equalTo(7); + make.bottom.mas_equalTo(self).offset(-3); + make.centerX.mas_equalTo(self); + make.width.mas_equalTo(47); + make.height.mas_equalTo(8); }]; - [self addSubview:self.progress]; + [self.progressBG addSubview:self.progress]; [self.progress mas_makeConstraints:^(MASConstraintMaker *make) { 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.height.mas_equalTo(5); + make.height.mas_equalTo(7); }]; } return self; @@ -80,7 +80,7 @@ - (UIImageView *)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.userInteractionEnabled = YES; _progress.hidden = NO; diff --git a/YuMi/Modules/YMRoom/View/ActivityContainerView/XPRoomActivityContainerView.m b/YuMi/Modules/YMRoom/View/ActivityContainerView/XPRoomActivityContainerView.m index 9df7fa58..72fb1d35 100644 --- a/YuMi/Modules/YMRoom/View/ActivityContainerView/XPRoomActivityContainerView.m +++ b/YuMi/Modules/YMRoom/View/ActivityContainerView/XPRoomActivityContainerView.m @@ -166,6 +166,7 @@ UIKIT_EXTERN NSString *kShowFirstRechargeView; CGFloat scrollItemWidth = KScreenHeight > 667 ? 65 : 55 * kScreenHeightScale; CGSize itemSize = CGSizeMake(scrollItemWidth , scrollItemWidth); + CGSize itemSize_game_rocket = CGSizeMake(55 , 55); [self.pi_cycleScrollView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(itemSize); }]; @@ -181,12 +182,12 @@ UIKIT_EXTERN NSString *kShowFirstRechargeView; [self.gambleMenuButton mas_makeConstraints:^(MASConstraintMaker *make) { make.leading.mas_equalTo(0); - make.size.mas_equalTo(itemSize); + make.size.mas_equalTo(itemSize_game_rocket); }]; [self.boomView mas_makeConstraints:^(MASConstraintMaker *make) { make.leading.mas_equalTo(0); - make.size.mas_equalTo(itemSize); + make.size.mas_equalTo(itemSize_game_rocket); }]; [self.configEntranceMenuButton mas_makeConstraints:^(MASConstraintMaker *make) { @@ -787,9 +788,9 @@ UIKIT_EXTERN NSString *kShowFirstRechargeView; if (!_stackView) { _stackView = [[UIStackView alloc] init]; _stackView.axis = UILayoutConstraintAxisVertical; - _stackView.distribution = UIStackViewDistributionFill; + _stackView.distribution = UIStackViewDistributionFillProportionally; _stackView.alignment = UIStackViewAlignmentCenter; - _stackView.spacing = 0; + _stackView.spacing = 14; } return _stackView; } @@ -831,7 +832,7 @@ UIKIT_EXTERN NSString *kShowFirstRechargeView; b.imageView.contentMode = UIViewContentModeScaleAspectFit; b.contentHorizontalAlignment = UIControlContentHorizontalAlignmentFill; b.contentVerticalAlignment = UIControlContentVerticalAlignmentFill; - b.imageEdgeInsets = UIEdgeInsetsMake(10, 10, 10, 10); +// b.imageEdgeInsets = UIEdgeInsetsMake(10, 10, 10, 10); b.hidden = YES; _gambleMenuButton = b; } @@ -846,7 +847,7 @@ UIKIT_EXTERN NSString *kShowFirstRechargeView; b.imageView.contentMode = UIViewContentModeScaleAspectFit; b.contentHorizontalAlignment = UIControlContentHorizontalAlignmentFill; b.contentVerticalAlignment = UIControlContentVerticalAlignmentFill; - b.imageEdgeInsets = UIEdgeInsetsMake(10, 10, 10, 10); +// b.imageEdgeInsets = UIEdgeInsetsMake(10, 10, 10, 10); b.hidden = YES; _configEntranceMenuButton = b; } diff --git a/YuMi/Modules/YMRoom/View/AnimationView/GameUniversalBannerView.m b/YuMi/Modules/YMRoom/View/AnimationView/GameUniversalBannerView.m index 67541464..77e08f45 100644 --- a/YuMi/Modules/YMRoom/View/AnimationView/GameUniversalBannerView.m +++ b/YuMi/Modules/YMRoom/View/AnimationView/GameUniversalBannerView.m @@ -49,7 +49,7 @@ [UIView animateWithDuration:0.25 animations:^{ bannerView.center = CGPointMake(superView.center.x, height/2 + 80); } 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:^{ bannerView.frame = CGRectMake(-KScreenWidth, 80, width, height); } completion:^(BOOL finished) { @@ -200,9 +200,9 @@ [self.bgImageView loadImageWithUrl:model.resourceContent completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) { @kStrongify(self); if (image) { - [self loadLocalSVGA]; - } else { self.bgImageView.image = image; + } else { + [self loadLocalSVGA]; } }]; } diff --git a/YuMi/Modules/YMRoom/View/AnimationView/LuckyGiftWinningBannerView.m b/YuMi/Modules/YMRoom/View/AnimationView/LuckyGiftWinningBannerView.m index 057ca386..bbf251c6 100644 --- a/YuMi/Modules/YMRoom/View/AnimationView/LuckyGiftWinningBannerView.m +++ b/YuMi/Modules/YMRoom/View/AnimationView/LuckyGiftWinningBannerView.m @@ -87,7 +87,7 @@ exitCurrentRoom:(void(^)(void))exit { [UIView animateWithDuration:0.25 animations:^{ bannerView.center = CGPointMake(superView.center.x, height/2 + 80); } 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:^{ bannerView.frame = CGRectMake(-KScreenWidth, 80, width, height); } completion:^(BOOL finished) { diff --git a/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeBuySuccessView.m b/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeBuySuccessView.m index 40cc07b4..21ef71a4 100644 --- a/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeBuySuccessView.m +++ b/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeBuySuccessView.m @@ -131,7 +131,7 @@ - (UIImageView *)bgImageView{ if(!_bgImageView){ _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; } return _bgImageView; diff --git a/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeConfirmBuyView.m b/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeConfirmBuyView.m index 210d55b1..afd42a47 100644 --- a/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeConfirmBuyView.m +++ b/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeConfirmBuyView.m @@ -277,7 +277,7 @@ - (UIImageView *)bgImageView{ if(!_bgImageView){ _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; } return _bgImageView; @@ -334,7 +334,8 @@ - (UIButton *)buyBtn{ if(!_buyBtn){ _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 setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; // _buyBtn.titleLabel.font = kFontMedium(14); diff --git a/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeViewController.m b/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeViewController.m index dfd057ab..6c9dd218 100644 --- a/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeViewController.m +++ b/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeViewController.m @@ -51,8 +51,6 @@ ///获得糖果 @property (nonatomic,strong) UIImageView *moreImageView; - - ///动画管理类 @property (strong, nonatomic) SVGAParser *parser; ///糖果树魔天輪 @@ -62,8 +60,6 @@ @property(nonatomic,strong) UIImageView *lampView; - - ///砸蛋特效 @property (nonatomic,strong) SVGAImageView *candyTreeOpenView; @@ -93,7 +89,6 @@ - (void)dealloc { [[NIMSDK sharedSDK].systemNotificationManager removeDelegate:self]; - } - (instancetype)initWithDelegate:(id)delegate { @@ -117,35 +112,32 @@ [self initSubViewConstraints]; [self.presenter getCandyTreeInfo]; [self.presenter getLoveSettingInfo]; - } - (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event { [self.view endEditing:YES]; } + #pragma mark -XPCandyRankContainerViewDelegate - (void)didClickHeadHandle:(NSInteger)uid{ [TTPopup dismiss]; XPMineUserInfoViewController * userInfoVC = [[XPMineUserInfoViewController alloc] init]; userInfoVC.uid = uid; [self.hostDelegate.getCurrentNav pushViewController:userInfoVC animated:YES]; - - - } + #pragma mark - XPCandyTreeProtocol - (void)getCandyTreeInfoSuccess:(CandyTreeInfoModel *)info { [self hideHUD]; self.candyInfo = info; - } + -(void)getLoveSettingInfoSuccess:(PICandyTreeSetModel *)setModel{ self.setModel = setModel; self.buyView.num = self.setModel.ticketNum; } -- (void)buyLoveTicketSuccessWithNum:(NSString *)num{ - +- (void)buyLoveTicketSuccessWithNum:(NSString *)num{ NSString *time = [NSDate getNowTimeTimestamp]; NSString *curTime = [NSDate timestampSwitchTime:[time integerValue] andFormatter:@"yyyy-MM-dd"]; NSDictionary *timeDic = [[NSUserDefaults standardUserDefaults]valueForKey:@"kBuyLoveNumSuccessNoPrompt"]; @@ -248,10 +240,8 @@ } #pragma mark - Private Method - (void)initSubViews { - self.view.backgroundColor = [UIColor clearColor]; - - + [self.view addSubview:self.backView]; [self.view addSubview:self.bgImageView]; @@ -272,20 +262,16 @@ [self.bgImageView addSubview:self.animationView]; [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; - self.candyTreeOpenView.clearsAfterStop = NO; - self.candyTreeOpenView.videoItem = videoItem; - } failureBlock:^(NSError * _Nonnull error) { - - }]; + + @kWeakify(self); + [self.parser parseWithNamed:@"pi_happy_egg_smash" inBundle:[NSBundle mainBundle] completionBlock:^(SVGAVideoEntity * _Nonnull videoItem) { + @kStrongify(self); + self.candyTreeOpenView.loops = 1; + self.candyTreeOpenView.clearsAfterStop = NO; + self.candyTreeOpenView.videoItem = videoItem; + } failureBlock:^(NSError * _Nonnull error) { + + }]; } - (void)initSubViewConstraints { diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftUsersView.m b/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftUsersView.m index 89a2ac8f..9c6d4464 100644 --- a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftUsersView.m +++ b/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftUsersView.m @@ -103,7 +103,8 @@ }]; [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) { diff --git a/YuMi/Modules/YMRoom/View/Setting/Presenter/XPRoomSettingPresenter.m b/YuMi/Modules/YMRoom/View/Setting/Presenter/XPRoomSettingPresenter.m index 8094058a..05d1f9cf 100644 --- a/YuMi/Modules/YMRoom/View/Setting/Presenter/XPRoomSettingPresenter.m +++ b/YuMi/Modules/YMRoom/View/Setting/Presenter/XPRoomSettingPresenter.m @@ -50,7 +50,6 @@ XPRoomSettingItemModel *avatarItem = [[XPRoomSettingItemModel alloc] init]; avatarItem.title = YMLocalizedString(@"RoomSetting_1.0.17_0"); - avatarItem.subTitle = roomInfo.roomTag; avatarItem.avatar = roomInfo.avatar; avatarItem.type = RoomSettingItemType_Avatar;