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

fix: 修正 UI 验收问题

Browse Source
This commit is contained in:
edwinQQQ
2025-01-08 12:10:02 +08:00
parent d9e8d6639b
commit 93c3304601
14 changed files with 54 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
YuMi/Assets.xcassets/yna/Position/room_position_lock.imageset/Contents.json vendored
View File

@@ -5,12 +5,11 @@
"scale" : "1x"
},
{
"filename" : "room_position_lock@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "room_position_lock@3x.png",
"filename" : "组 8307@3x.png",
"idiom" : "universal",
"scale" : "3x"
}

BIN
YuMi/Assets.xcassets/yna/Position/room_position_lock.imageset/room_position_lock@2x.png vendored
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.6 KiB

BIN
YuMi/Assets.xcassets/yna/Position/room_position_lock.imageset/room_position_lock@3x.png vendored
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.6 KiB

BIN
YuMi/Assets.xcassets/yna/Position/room_position_lock.imageset/组 8307@3x.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.3 KiB

3
YuMi/Assets.xcassets/yna/Position/room_position_normal.imageset/Contents.json vendored
View File

@@ -5,12 +5,11 @@
"scale" : "1x"
},
{
"filename" : "room_position_normal@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "room_position_normal@3x.png",
"filename" : "组 8307@3x (1).png",
"idiom" : "universal",
"scale" : "3x"
}

BIN
YuMi/Assets.xcassets/yna/Position/room_position_normal.imageset/room_position_normal@2x.png vendored
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 877 B

BIN
YuMi/Assets.xcassets/yna/Position/room_position_normal.imageset/room_position_normal@3x.png vendored
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.3 KiB

BIN
YuMi/Assets.xcassets/yna/Position/room_position_normal.imageset/组 8307@3x (1).png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.5 KiB

2
YuMi/CustomUI/Adbvertise/XPAdvertiseView.m
View File

@@ -225,7 +225,7 @@ static int const showtime = 3;
NSAttributedString *string = [[NSAttributedString alloc] initWithString:content
attributes:@{
NSFontAttributeName: kFontMedium(kGetScaleWidth(24)),
NSForegroundColorAttributeName: UIColorFromRGB(0xF9F8CF)
NSForegroundColorAttributeName: UIColorFromRGB(0xFDF565)
}];
[self.svgaView setAttributedText:string
forKey:key];

24
YuMi/Modules/YMMine/View/Cell/Friend/XPMineFansTableViewCell.m
View File

@@ -79,7 +79,6 @@
[self.stackView addArrangedSubview:self.nickLabel];
// [self.stackView addArrangedSubview:self.sexImageView];
[self.stackView addArrangedSubview:self.experImageView];
[self.stackView addArrangedSubview:self.charmImageView];
[self.stackView addArrangedSubview:self.nobleImageView];
@@ -136,9 +135,7 @@
_fansInfo = fansInfo;
if (_fansInfo) {
self.avatarImageView.imageUrl = _fansInfo.avatar;
// if(_fansInfo.nick.length > 5){
// _fansInfo.nick = [NSString stringWithFormat:@"%@...",[_fansInfo.nick substringToIndex:5]];
// }
self.nickLabel.text = _fansInfo.nick;
self.signLabel.text = _fansInfo.userDesc && _fansInfo.userDesc.length > 0? _fansInfo.userDesc : YMLocalizedString(@"XPMineFansTableViewCell0");
if (_fansInfo.useingType != ContactUseingType_In_Room && _fansInfo.useingType != ContactUseingType_Share) {
@@ -158,18 +155,6 @@
self.attentionButton.enabled = !isMyFriend;
self.attentionButton.hidden = NO;
if (isMyFriend) {
[self.attentionButton setCornerRadius:15
corners:kCALayerMinXMinYCorner | kCALayerMaxXMinYCorner | kCALayerMinXMaxYCorner | kCALayerMaxXMaxYCorner
borderWidth:0
borderColor:[UIColor clearColor]];
} else {
[self.attentionButton setCornerRadius:15
corners:kCALayerMinXMinYCorner | kCALayerMaxXMinYCorner | kCALayerMinXMaxYCorner | kCALayerMaxXMaxYCorner
borderWidth:1
borderColor:UIColorFromRGB(0xFF8C03)];
}
UIImage *nobleImage = self.nobleImageView.image;
if (nobleImage) {
CGFloat scale = nobleImage.size.width / nobleImage.size.height;
@@ -293,11 +278,12 @@
[_attentionButton setBackgroundImage:[UIImage imageWithColor:[UIColor whiteColor]] forState:UIControlStateNormal];
[_attentionButton setTitle:YMLocalizedString(@"XPMineFansTableViewCell2") forState:UIControlStateDisabled];
[_attentionButton setTitleColor:UIColorFromRGB(0xffffff) forState:UIControlStateDisabled];
[_attentionButton setBackgroundImage:[UIImage imageWithColor:[DJDKMIMOMColor disableButtonColor]] forState:UIControlStateDisabled];
[_attentionButton addTarget:self action:@selector(attentionButtonAction:) forControlEvents:UIControlEventTouchUpInside];
[_attentionButton setCornerRadius:15
corners:kCALayerMinXMinYCorner | kCALayerMaxXMinYCorner | kCALayerMinXMaxYCorner | kCALayerMaxXMaxYCorner
borderWidth:1
borderColor:UIColorFromRGB(0xFF8C03)];
[_attentionButton setCornerRadius:15];
}
return _attentionButton;

26
YuMi/Modules/YMRoom/View/RoomMode/RoomModeViewController.m
View File

@@ -21,6 +21,7 @@
@property(nonatomic, strong) SVGAParser *parser;
@property(nonatomic, strong) UILabel *nameLabel;
@property(nonatomic, assign) BOOL isForRoomType;
@property(nonatomic, copy) NSString *roomTypeImageName;
+ (void)registerTo:(UICollectionView *)collectionView;
+ (RoomModeCollectionCell *)cellFro:(UICollectionView *)collectionView indexPath:(NSIndexPath *)indexPath displayName:(BOOL)displayName;
@@ -79,6 +80,10 @@
self.imageView.image = kImage(@"room_mode_default_skin");
}else {
self.imageView.image = kImage(@"room_mic_normal");
[self.imageView mas_remakeConstraints:^(MASConstraintMaker *make) {
make.center.mas_equalTo(self.statusView);
make.width.height.mas_equalTo(self.statusView.mas_height).multipliedBy(0.9);
}];
}
} else {
if (micInfoModel.dressType == MicResourceType_Skin) {
@@ -92,7 +97,8 @@
- (void)setIsForRoomType:(BOOL)isForRoomType {
_isForRoomType = isForRoomType;
if (isForRoomType) {
[self.imageView mas_updateConstraints:^(MASConstraintMaker *make) {
[self.imageView mas_remakeConstraints:^(MASConstraintMaker *make) {
make.center.mas_equalTo(self.statusView);
make.width.height.mas_equalTo(self.statusView.mas_height).multipliedBy(0.8);
}];
}
@@ -102,7 +108,6 @@
if (!_svgaImageView) {
[self.contentView addSubview:self.svgaImageView];
[self.svgaImageView mas_makeConstraints:^(MASConstraintMaker *make) {
// make.edges.mas_equalTo(self.imageView);
make.center.mas_equalTo(self.statusView);
make.width.height.mas_equalTo(self.statusView.mas_height).multipliedBy(0.85);
}];
@@ -146,6 +151,10 @@
self.statusView.layer.borderWidth = selected ? 1 : 0;
self.statusView.backgroundColor = selected ? UIColorRGBAlpha(0xFF8C03, 0.1) : UIColorFromRGB(0x1b1b1d);
self.nameLabel.textColor = [UIColor colorWithWhite:1 alpha:selected ? 1 : 0.5];
if (self.isForRoomType) {
NSString *imageName = [NSString stringWithFormat:@"%@_%@", self.roomTypeImageName, selected ? @"on" : @"off"];
self.imageView.image = kImage(imageName);
}
}
- (UIView *)statusView {
@@ -323,7 +332,7 @@
[self.contentView addSubview:self.expToNextLabel];
[self.expToNextLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerX.mas_equalTo(self.backgroundImageView);
make.bottom.mas_equalTo(self.backgroundImageView).offset(-16);
make.bottom.mas_equalTo(self.backgroundImageView).offset(-13);
make.height.mas_equalTo(18);
}];
}
@@ -494,9 +503,11 @@
NSDictionary *dic = [self.dataSource xpSafeObjectAtIndex:indexPath.row];
if (dic) {
cell.selected = [[dic objectForKey:@"isUses"] boolValue];
NSString *imageName = [NSString stringWithFormat:@"room_mode_mic_%@_%@", [dic objectForKey:@"type"], cell.isSelected ? @"on" : @"off"];
NSString *imageName = [NSString stringWithFormat:@"room_mode_mic_%@_%@", [dic objectForKey:@"type"], cell.selected ? @"on" : @"off"];
cell.imageView.image = kImage(imageName);
cell.roomTypeImageName = [NSString stringWithFormat:@"room_mode_mic_%@", [dic objectForKey:@"type"]];
cell.nameLabel.text = [dic objectForKey:@"name"];
}
@@ -504,6 +515,13 @@
}
- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath {
// RoomModeCollectionCell *cell = [RoomModeCollectionCell cellFro:collectionView indexPath:indexPath displayName:YES];
// NSDictionary *dic = [self.dataSource xpSafeObjectAtIndex:indexPath.row];
// if (dic) {
// NSString *imageName = [NSString stringWithFormat:@"room_mode_mic_%@_%@", [dic objectForKey:@"type"], cell.selected ? @"on" : @"off"];
// cell.imageView.image = kImage(imageName);
// }
if (_updateSelectedType) {
RoomType selectedType = RoomType_Game;
switch (indexPath.row) {

29
YuMi/Modules/YMRoom/View/UserCard/View/UserRoomCardViewController.m
View File

@@ -1087,6 +1087,8 @@
@property(nonatomic, assign) BOOL upMicFlag;
@property(nonatomic, assign) CGFloat collectionHeight;
@property(nonatomic, strong) UIView *toastView;
@end
@implementation UserRoomCardViewController
@@ -1224,8 +1226,6 @@
}
break;
case UserCardItemType_Manager: {
[TTPopup popupView:[self managerLimitToast] style:TTPopupStyleAlert];
return;
if (item.isSelect) {
if ([self isSuperUser]) {
[self.presenter superAdminHandleUser:self.cardInfo.uid opt:@"1" roomUid:roomUid isSet:!item.isSelect];
@@ -1242,7 +1242,7 @@
[self.presenter makeUserManager:self.cardInfo.uid roomId:roomId enable:!item.isSelect];
}
} failure:^(NSError * _Nonnull error) {
if (error.code == 20505) {
if (error.code == 20504) { // 管理员数量已达上限
[TTPopup popupView:[self managerLimitToast] style:TTPopupStyleAlert];
}
}];
@@ -1261,8 +1261,12 @@
}
}
- (void)removeManagerLimitToast {
[TTPopup dismiss];
}
- (UIView *)managerLimitToast {
UIView *view = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth-80, kGetScaleWidth(290))];
UIView *view = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth-80, kGetScaleWidth(410))];
[view setBackgroundColor:[UIColor whiteColor]];
[view setCornerRadius:16];
@@ -1271,7 +1275,10 @@
UILabel *tipContentLabel = [UILabel labelInitWithText:YMLocalizedString(@"1.0.33_text_19") font:kFontMedium(15) textColor:UIColorFromRGB(0x313131)];
tipContentLabel.numberOfLines = 0;
UIImageView *ruleImageView = [[UIImageView alloc] initWithImage:kImage(@"room_manager_limit")];
// ruleImageView.contentMode = UIViewContentModeScaleAspectFit;
UIButton *confirmButton = [UIButton buttonWithType:UIButtonTypeCustom];
[confirmButton addTarget:self action:@selector(removeManagerLimitToast) forControlEvents:UIControlEventTouchUpInside];
[confirmButton setTitle:YMLocalizedString(@"TTAlertConfig0") forState:UIControlStateNormal];
[confirmButton setCornerRadius:18];
[confirmButton addGradientBackgroundWithColors:@[
UIColorFromRGB(0xE29030), UIColorFromRGB(0xFCC074)
@@ -1292,18 +1299,20 @@
make.leading.trailing.mas_equalTo(view).inset(23);
}];
[ruleImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.leading.trailing.mas_equalTo(tipContentLabel);
make.top.mas_equalTo(tipContentLabel.mas_bottom).offset(12);
make.height.mas_equalTo(kGetScaleWidth(238));
}];
[confirmButton mas_makeConstraints:^(MASConstraintMaker *make) {
make.bottom.mas_equalTo(view).offset(-14);
make.leading.trailing.mas_equalTo(tipContentLabel);
make.height.mas_equalTo(36);
}];
[ruleImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.leading.trailing.mas_equalTo(tipContentLabel);
make.top.mas_equalTo(tipTitleLabel.mas_bottom).offset(70);
make.bottom.mas_equalTo(confirmButton.mas_top).offset(-10);
// make.top.mas_equalTo(view).offset(kGetScaleWidth(10));
// make.bottom.mas_equalTo(view.mas_bottom).offset(-kGetScaleWidth(60));
}];
return view;
}

8
YuMi/Modules/YMRoom/View/XPRoomViewController.m
View File

@@ -1861,10 +1861,10 @@ XPCandyTreeInsufficientBalanceViewDelegate>
NIMNotificationObject *notiMsg = (NIMNotificationObject *)message.messageObject;
NIMChatroomNotificationContent *content = (NIMChatroomNotificationContent *)notiMsg.content;
NSLog(@" --- Message Content class: %@", [notiMsg.content class]);
if ([notiMsg.content isKindOfClass:[NIMUnsupportedNotificationContent class]]) {
NSLog(@"Fuck %@", message);
}
// NSLog(@" --- Message Content class: %@", [notiMsg.content class]);
// if ([notiMsg.content isKindOfClass:[NIMUnsupportedNotificationContent class]]) {
// NSLog(@"Fuck %@", message);
// }
if (![notiMsg.content isKindOfClass:[NIMChatroomNotificationContent class]]) {
return;

1
YuMi/en.lproj/Localizable.strings
View File

@@ -3848,3 +3848,4 @@
"1.0.33_text_17" = "1. You can contact the official customer service and provide relevant evidence to improve the star rating.\n2. The star rating is divided into 1~5 stars.5 stars is the best recharge agent.\n3. The star rating will be displayed when the user found the recharge agent.\n4. The higher the star rating, the higher the ranking in the transfer list.\n5. All interpretation rights belong to the official and have nothing to do with Google or Apple.";
"1.0.33_text_18" = "Room Lv. >=%@ Can be used";
"1.0.33_text_19" = "The number of admins corresponding to your current room level is full, please upgrade first and then add!";