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

Merge branch 'feature/1.0.9/New_Home_Me_Page#916' into feature/1.0.10/User_Detail_Page_Update#962

Browse Source 
* feature/1.0.9/New_Home_Me_Page#916:
  修正多语言资源名称
  更新礼物面板 icon size
  修正验收问题
This commit is contained in:
eggmanQQQ
2024-06-24 14:23:57 +08:00
parent 7a735411e8 6eab9c66c7
commit fe4c8d5737
16 changed files with 59 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
YuMi/Assets.xcassets/Language/ar/room_across_pk_result_top_fail_en.imageset/Contents.json → YuMi/Assets.xcassets/Language/ar/room_across_pk_result_top_fail_ar.imageset/Contents.json vendored
View File

0
YuMi/Assets.xcassets/Language/ar/room_across_pk_result_top_fail_en.imageset/room_across_pk_result_top_fail_en@2x.png → YuMi/Assets.xcassets/Language/ar/room_across_pk_result_top_fail_ar.imageset/room_across_pk_result_top_fail_en@2x.png vendored
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 62 KiB

After

Width:  |  Height:  |  Size: 62 KiB

0
YuMi/Assets.xcassets/Language/ar/room_across_pk_result_top_fail_en.imageset/room_across_pk_result_top_fail_en@3x.png → YuMi/Assets.xcassets/Language/ar/room_across_pk_result_top_fail_ar.imageset/room_across_pk_result_top_fail_en@3x.png vendored
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 112 KiB

After

Width:  |  Height:  |  Size: 112 KiB

4
YuMi/CustomUI/InputView/InputView/QEmotionHelper.m
View File

@@ -67,7 +67,9 @@
//建议在外部AppDelegate里就设置好image，不建议走这里
e.image = [UIImage imageNamed:e.identifier];
}
[emotionImageDictionary setObject:e.image forKey:e.displayName];
if (e.image) {
[emotionImageDictionary setObject:e.image forKey:e.displayName];
}
}
_cacheTotalImageDictionary = emotionImageDictionary;
}

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

@@ -506,7 +506,6 @@ return view;\
}
#pragma mark - Event Response
-(void)clickAvatarAction{
SDPhotoBrowser *browser = [[SDPhotoBrowser alloc]init];
browser.sourceImagesContainerView = self.avatarView;
browser.delegate = self;

4
YuMi/Modules/YMNewHome/Presenter/XPHomeMinePresenter.h
View File

@@ -13,8 +13,8 @@ NS_ASSUME_NONNULL_BEGIN
- (void)getMyRoom;
- (void)getMyCollectRooms:(NSInteger)page;
- (void)getMyRecentRooms:(NSInteger)page;
//- (void)getMyCollectRooms:(NSInteger)page;
//- (void)getMyRecentRooms:(NSInteger)page;
@end

30
YuMi/Modules/YMNewHome/Presenter/XPHomeMinePresenter.m
View File

@@ -27,21 +27,21 @@
}];
}
- (void)getMyCollectRooms:(NSInteger)page {
[Api getMyCollectRoomsCompletion:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) {
// TODO: 确认 model
}
pageNum:[NSString stringWithFormat:@"%ld", page]
pageSize:@"20"];
}
- (void)getMyRecentRooms:(NSInteger)page {
[Api getMyRecentRoomsCompletion:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) {
// TODO: 确认 model
}
pageNum:[NSString stringWithFormat:@"%ld", page]
pageSize:@"20"];
}
//- (void)getMyCollectRooms:(NSInteger)page {
// [Api getMyCollectRoomsCompletion:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) {
// // TODO: 确认 model
// }
// pageNum:[NSString stringWithFormat:@"%ld", page]
// pageSize:@"20"];
//}
//
//- (void)getMyRecentRooms:(NSInteger)page {
// [Api getMyRecentRoomsCompletion:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) {
// // TODO: 确认 model
// }
// pageNum:[NSString stringWithFormat:@"%ld", page]
// pageSize:@"20"];
//}

6
YuMi/Modules/YMNewHome/Presenter/XPHomePresenter.m
View File

@@ -41,7 +41,7 @@
[[self getView] getHomeRecommendRoomListFail:msg ];
}]
pageNum:[NSString stringWithFormat:@"%ld", page]
pageSize:@"20"
pageSize:@"10"
tabId:tabId];
}
@@ -71,7 +71,7 @@
[[self getView] getMineCollectRoomsSuccess:array];
}
pageNum:[NSString stringWithFormat:@"%ld", page]
pageSize:@"20"];
pageSize:@"10"];
}
- (void)getMyRecentRooms:(NSInteger)page {
@@ -80,7 +80,7 @@
[[self getView] getMineRecentRoomsSuccess:array];
}
pageNum:[NSString stringWithFormat:@"%ld", page]
pageSize:@"20"];
pageSize:@"10"];
}
@end

2
YuMi/Modules/YMNewHome/View/CustomView/XPNewHomeHeadView.m
View File

@@ -107,7 +107,6 @@
}
- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section {
return self.itemList.count > 0 ? self.itemList.count : 2;
}
@@ -157,7 +156,6 @@
return _collectionView;
}
#pragma mark - 懒加载
- (SDCycleScrollView *)pi_BannerView {
if (!_pi_BannerView) {
_pi_BannerView = [SDCycleScrollView cycleScrollViewWithFrame:CGRectZero delegate:self placeholderImage:[UIImageConstant defaultBannerPlaceholder]];

12
YuMi/Modules/YMNewHome/View/CustomView/XPNewHomeItemCell.m
View File

@@ -57,22 +57,22 @@
[self.contentView addSubview:headDress_1];
[headDress_1 mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerX.mas_equalTo(self.contentView);
make.top.mas_equalTo(self.contentView).offset(9);
make.centerX.mas_equalTo(self.contentView).offset(2);
make.top.mas_equalTo(self.contentView).offset(12);
make.width.mas_equalTo(62);
make.height.mas_equalTo(48);
}];
[headDress_2 mas_makeConstraints:^(MASConstraintMaker *make) {
make.bottom.mas_equalTo(self.contentView).offset(-15);
make.left.mas_equalTo(self.contentView).offset(21);
make.bottom.mas_equalTo(self.contentView).offset(-20);
make.left.mas_equalTo(self.contentView).offset(28);
make.width.mas_equalTo(42);
make.height.mas_equalTo(33);
}];
[headDress_3 mas_makeConstraints:^(MASConstraintMaker *make) {
make.bottom.mas_equalTo(self.contentView).offset(-15);
make.right.mas_equalTo(self.contentView).offset(-21);
make.bottom.mas_equalTo(self.contentView).offset(-16);
make.right.mas_equalTo(self.contentView).offset(-24);
make.width.mas_equalTo(42);
make.height.mas_equalTo(33);
}];

12
YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKInviteView.m
View File

@@ -338,14 +338,16 @@
}
- (UIButton *)rejectButton {
if (!_rejectButton) {\
if (!_rejectButton) {
_rejectButton = [UIButton buttonWithType:UIButtonTypeCustom];
_rejectButton.layer.masksToBounds = YES;
_rejectButton.layer.cornerRadius = 19;
[_rejectButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[UIColorRGBAlpha(0xE6E6E6, 0.4), UIColorRGBAlpha(0xF3F5FA, 0.4)]
gradientType:GradientTypeLeftToRight
imgSize:CGSizeMake(10, 10)]
forState:UIControlStateNormal];
// UIImage *gradientImage = [UIImage gradientColorImageFromColors:@[UIColorRGBAlpha(0xE6E6E6, 1), UIColorRGBAlpha(0xF3F5FA, 1)]
// gradientType:GradientTypeLeftToRight
// imgSize:CGSizeMake(100, 40)];
// [_rejectButton setBackgroundImage:gradientImage
// forState:UIControlStateNormal];
[_rejectButton setBackgroundColor:[UIColor colorWithWhite:1 alpha:0.4]];
[_rejectButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
[_rejectButton setTitle:YMLocalizedString(@"XPAcrossRoomPKInviteView6") forState:UIControlStateNormal];
_rejectButton.titleLabel.font = [UIFont systemFontOfSize:16 weight:UIFontWeightBold];

30
YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKPanelView.m
View File

@@ -108,7 +108,7 @@ static CGFloat MiniHeight = 130.5;
}
- (instancetype)initWithFrame:(CGRect)frame {
if (self = [super initWithFrame:CGRectMake(0, 0, kGetScaleWidth(310), kGetScaleWidth(MaxHeight))]) {
if (self = [super initWithFrame:CGRectMake(0, 0, 310, MaxHeight)]) {
UIPanGestureRecognizer *pan = [[UIPanGestureRecognizer alloc] initWithTarget:self action:@selector(changeLocation:)];
// 这里的delaysTouchesBegan属性很明显就是对touchBegin方法是否进行延迟,
// YES表示延迟,即在系统未识别出来手势为什么手势时先不要调用touchesBegan 方法;
@@ -159,7 +159,7 @@ static CGFloat MiniHeight = 130.5;
[self.backgroundImageView_small mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.left.right.mas_equalTo(self);
make.height.mas_equalTo(kGetScaleWidth(MiniHeight));
make.height.mas_equalTo(MiniHeight);
}];
[topImageView mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -225,7 +225,7 @@ static CGFloat MiniHeight = 130.5;
[self.teamContainerView addSubview:vsMark];
[vsMark mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerX.mas_equalTo(self.teamContainerView);
make.top.mas_equalTo(self.redTitleLabel.mas_bottom).offset(4.5);
make.top.mas_equalTo(self.redTitleLabel.mas_bottom).offset(-4.5);
make.size.mas_equalTo(CGSizeMake(40, 20));
}];
@@ -234,12 +234,12 @@ static CGFloat MiniHeight = 130.5;
[self.redAvatarImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.leading.mas_equalTo(10);
make.width.height.mas_equalTo(44);
make.top.mas_equalTo(self.redTitleLabel.mas_bottom).offset(12);
make.top.mas_equalTo(self.redTitleLabel.mas_bottom).offset(4);
}];
[self.blueAvatarImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.trailing.mas_equalTo(-10);
make.width.height.mas_equalTo(44);
make.top.mas_equalTo(self.blueTitleLabel.mas_bottom).offset(12);
make.top.mas_equalTo(self.blueTitleLabel.mas_bottom).offset(4);
}];
// [self.teamContainerView insertSubview:self.progressView belowSubview:self.redAvatarImageView];
@@ -255,14 +255,14 @@ static CGFloat MiniHeight = 130.5;
[self.teamContainerView insertSubview:self.onLookButton belowSubview:self.blueAvatarImageView];
[self.assistButton mas_makeConstraints:^(MASConstraintMaker *make) {
make.leading.mas_equalTo(self.redAvatarImageView.mas_trailing).offset(-16);
make.bottom.mas_equalTo(self.progressView.mas_top);
make.bottom.mas_equalTo(self.progressView.mas_top).offset(2);
make.width.mas_equalTo(70);
make.height.mas_equalTo(14);
}];
[self.onLookButton mas_makeConstraints:^(MASConstraintMaker *make) {
make.trailing.mas_equalTo(self.blueAvatarImageView.mas_leading).offset(16);
make.bottom.mas_equalTo(self.progressView.mas_top);
make.bottom.mas_equalTo(self.progressView.mas_top).offset(2);
make.width.mas_equalTo(70);
make.height.mas_equalTo(14);
}];
@@ -302,7 +302,7 @@ static CGFloat MiniHeight = 130.5;
[self addSubview:self.foldButton];
[self.foldButton mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerX.mas_equalTo(self);
make.top.mas_equalTo(self).offset(124);
make.top.mas_equalTo(self).offset(104);
make.size.mas_equalTo(CGSizeMake(18, 10));
}];
}
@@ -310,7 +310,7 @@ static CGFloat MiniHeight = 130.5;
- (void)setupInteractiveArea {
[self addSubview:self.userStackView];
[self.userStackView mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.mas_equalTo(self.stackView.mas_bottom).offset(28);
make.top.mas_equalTo(self.stackView.mas_bottom).offset(8);
// make.bottom.mas_equalTo(self).offset(-24);
make.leading.trailing.mas_equalTo(self);
}];
@@ -487,13 +487,13 @@ static CGFloat MiniHeight = 130.5;
self.userStackView.hidden = NO;
self.backgroundImageView.hidden = NO;
self.backgroundImageView_small.hidden = YES;
newFrame.size.height = kGetScaleWidth(MaxHeight);
newFrame.size.height = MaxHeight;
self.foldButton.transform = CGAffineTransformIdentity;
} else {
self.userStackView.hidden = YES;
self.backgroundImageView.hidden = YES;
self.backgroundImageView_small.hidden = NO;
newFrame.size.height = kGetScaleWidth(MiniHeight);
newFrame.size.height = MiniHeight;
self.foldButton.transform = CGAffineTransformMakeRotation(M_PI);
}
self.frame = newFrame;
@@ -959,7 +959,7 @@ static CGFloat MiniHeight = 130.5;
if (!_redCharmStackView) {
_redCharmStackView = [[UIStackView alloc] init];
_redCharmStackView.axis = UILayoutConstraintAxisHorizontal;
_redCharmStackView.distribution = UIStackViewDistributionEqualSpacing;
_redCharmStackView.distribution = UIStackViewDistributionFillEqually;
_redCharmStackView.alignment = UIStackViewAlignmentFill;
_redCharmStackView.spacing = 14;
}
@@ -970,7 +970,7 @@ static CGFloat MiniHeight = 130.5;
if (!_blueCharmStackView) {
_blueCharmStackView = [[UIStackView alloc] init];
_blueCharmStackView.axis = UILayoutConstraintAxisHorizontal;
_blueCharmStackView.distribution = UIStackViewDistributionEqualSpacing;
_blueCharmStackView.distribution = UIStackViewDistributionFillEqually;
_blueCharmStackView.alignment = UIStackViewAlignmentFill;
_blueCharmStackView.spacing = 14;
}
@@ -992,7 +992,7 @@ static CGFloat MiniHeight = 130.5;
if (!_redContributeStackView) {
_redContributeStackView = [[UIStackView alloc] init];
_redContributeStackView.axis = UILayoutConstraintAxisHorizontal;
_redContributeStackView.distribution = UIStackViewDistributionEqualSpacing;
_redContributeStackView.distribution = UIStackViewDistributionFillEqually;
_redContributeStackView.alignment = UIStackViewAlignmentFill;
_redContributeStackView.spacing = 14;
}
@@ -1003,7 +1003,7 @@ static CGFloat MiniHeight = 130.5;
if (!_blueContributeStackView) {
_blueContributeStackView = [[UIStackView alloc] init];
_blueContributeStackView.axis = UILayoutConstraintAxisHorizontal;
_blueContributeStackView.distribution = UIStackViewDistributionEqualSpacing;
_blueContributeStackView.distribution = UIStackViewDistributionFillEqually;
_blueContributeStackView.alignment = UIStackViewAlignmentFill;
_blueContributeStackView.spacing = 14;
}

4
YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRomPKResultTitleLabel.m
View File

@@ -51,9 +51,9 @@
- (void)setGroupType:(GroupType)groupType {
_groupType = groupType;
if (_groupType == GroupType_Red) {
self.contentLabel.textColor = UIColorFromRGB(0xfd4d0e);
self.contentLabel.textColor = UIColorFromRGB(0xff396f);
} else if(_groupType == GroupType_Blue) {
self.contentLabel.textColor = UIColorFromRGB(0x59b9fb);
self.contentLabel.textColor = UIColorFromRGB(0x73b8ff);
}
}

2
YuMi/Modules/YMRoom/View/RoomPK/View/XPRoomPKPanelView.m
View File

@@ -1272,7 +1272,7 @@
[transparentRoundedCornersBackgroundView addSubview:self.countDownLabel];
[self.countDownLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerY.mas_equalTo(transparentRoundedCornersBackgroundView);
make.centerY.mas_equalTo(transparentRoundedCornersBackgroundView).offset(-0.5);
make.right.mas_equalTo(transparentRoundedCornersBackgroundView.mas_right).offset(-6);
make.width.mas_greaterThanOrEqualTo(40);
}];

5
YuMi/Modules/YMRoom/View/RoomPK/View/XPRoomPKResultView.m
View File

@@ -103,7 +103,8 @@
}];
[self.topImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.mas_equalTo(self).offset(-40);
// make.top.mas_equalTo(self).offset(-40);
make.centerY.mas_equalTo(self.mas_top);
make.centerX.mas_equalTo(self);
make.width.mas_equalTo(UIScreen.mainScreen.bounds.size.width);
make.height.mas_equalTo(125);
@@ -608,7 +609,7 @@
if (!_resultButton) {
_resultButton = [UIButton buttonWithType:UIButtonTypeCustom];
[_resultButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
_resultButton.titleLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightBold];
_resultButton.titleLabel.font = [UIFont systemFontOfSize:12 weight:UIFontWeightBold];
[_resultButton setBackgroundImage:[UIImage imageNamed:@"room_pk_result_team_bg"] forState:UIControlStateNormal];
}
return _resultButton;

5
YuMi/Modules/YMRoom/View/SendGiftView/View/PIGiftInfoSegmentedView.m
View File

@@ -74,8 +74,6 @@
}];
[self.titleView mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.leading.equalTo(self);
// make.leading.equalTo(self).offset(8);
// make.trailing.mas_equalTo(self.packGiftButton.mas_leading).offset(-16);
make.height.mas_equalTo(34);
make.width.mas_equalTo(kGetScaleWidth(200));
@@ -86,7 +84,7 @@
make.centerY.mas_equalTo(self.titleView);
// make.height.mas_equalTo(self.titleView);
// make.width.mas_equalTo(isMSRTL() ? 70:40);
make.size.mas_equalTo(CGSizeMake(20, 20));
make.size.mas_equalTo(CGSizeMake(14, 14));
}];
// [self.totalValueLabel mas_makeConstraints:^(MASConstraintMaker *make) {
// make.trailing.mas_equalTo(self.packGiftButton.mas_leading).mas_offset(-3);
@@ -375,6 +373,7 @@
[_packGiftButton setBackgroundImage:[UIImage imageNamed:@"gift_bag_icon"] forState:UIControlStateNormal];
_packGiftButton.tag = GiftSegmentType_Pack;
[_packGiftButton addTarget:self action:@selector(didClickGiftSegmentAction:) forControlEvents:UIControlEventTouchUpInside];
[_packGiftButton setEnlargeEdgeWithTop:10 right:10 bottom:10 left:10];
}
return _packGiftButton;
}