feat: 优化 UI 体验

2025-01-02 14:34:56 +08:00
parent 54cc9ebde3
commit ed25b30a35
6 changed files with 122 additions and 80 deletions
--- a/YuMi/Modules/ShoppingMall/ShoppingMallCategoryListView.m
+++ b/YuMi/Modules/ShoppingMall/ShoppingMallCategoryListView.m
@@ -40,6 +40,11 @@
    return self;
 }

+- (void)prepareForReuse {
+    [super prepareForReuse];
+    self.selected = NO;
+}
+
 - (UILabel *)defaultLabel {
    if (!_defaultLabel) {
        _defaultLabel = [UILabel labelInitWithText:YMLocalizedString(@"XPMomentsRecommendViewController0")
@@ -174,6 +179,7 @@

 - (void)prepareForReuse {
    [super prepareForReuse];
+    self.selected = NO;
    [self.mp4View stopHWDMP4];
 }

@@ -883,6 +889,7 @@
        collectionView.backgroundColor = [UIColor clearColor];
        collectionView.tag = i;
        collectionView.contentInset = UIEdgeInsetsMake(16, 0, 0, 0);
+        collectionView.allowsMultipleSelection = NO;
        [collectionView registerClass:[UICollectionViewCell class] forCellWithReuseIdentifier:@"cell"];
        [collectionView registerClass:[ShoppingMallItemCard class] forCellWithReuseIdentifier:@"ShoppingMallItemCard"];
        [collectionView registerClass:[ShoppingMallEmptyCard class] forCellWithReuseIdentifier:@"ShoppingMallEmptyCard"];
@@ -957,7 +964,14 @@
    }
    for (UICollectionView *itemView in self.itemCollectionViewArray) {
        [itemView reloadData];
-        [itemView selectItemAtIndexPath:[NSIndexPath indexPathForRow:0 inSection:0] animated:NO scrollPosition:UICollectionViewScrollPositionNone];
+        NSInteger selectedIndex = 0;
+        for (MyDressingDataModel *model in [self.myDressingDataCache objectForKey:@(index)]) {
+            if (model.used) {
+                selectedIndex = [[self.myDressingDataCache objectForKey:@(index)] indexOfObject:model]+1;
+                break;
+            }
+        }
+        [itemView selectItemAtIndexPath:[NSIndexPath indexPathForRow:selectedIndex inSection:0] animated:NO scrollPosition:UICollectionViewScrollPositionNone];
        if (self.returnSelectedModel) {
            NSArray *data = self.dataCache[@(itemView.tag)];
            self.returnSelectedModel(data.firstObject);
@@ -1033,6 +1047,11 @@
 }

 - (void)updateSelectedItem:(NSIndexPath *)indexPath {
+    UICollectionView *itemView = [self.itemCollectionViewArray xpSafeObjectAtIndex:self.currengCategoryIndex];
+    if (itemView) {
+        [itemView selectItemAtIndexPath:indexPath animated:NO scrollPosition:UICollectionViewScrollPositionNone];
+    }
+
    [self refreshCurrentPageData];
 }

--- a/YuMi/Modules/YMMessage/View/Session/Cell/SessionUserInfoTableViewCell.m
+++ b/YuMi/Modules/YMMessage/View/Session/Cell/SessionUserInfoTableViewCell.m
@@ -89,8 +89,7 @@
@property (nonatomic,strong) UIStackView *tagStackView;
 ///性别
@property (nonatomic,strong) UIButton *sexButton;
-///星座
-@property (nonatomic,strong) UIImageView *constellationButton;
+
 ///签名
@property (nonatomic,strong) UILabel *signLabel;
 ///列表
@@ -126,10 +125,10 @@
 	[self.userView addSubview:self.tagStackView];
 	[self.userView addSubview:self.signLabel];

-	[self.tagStackView addArrangedSubview:self.nobleImageView];
+	
 	[self.tagStackView addArrangedSubview:self.nickLabel];
 	[self.tagStackView addArrangedSubview:self.sexButton];
-	[self.tagStackView addArrangedSubview:self.constellationButton];
+    [self.tagStackView addArrangedSubview:self.nobleImageView];
 }

 - (void)initSubViewConstraints {
@@ -175,11 +174,6 @@
 	[self.sexButton mas_makeConstraints:^(MASConstraintMaker *make) {
 		make.size.mas_equalTo(CGSizeMake(32, 14));
 	}];
-    CGFloat starWidth = 14 * 46 / 18;
-	[self.constellationButton mas_makeConstraints:^(MASConstraintMaker *make) {
-		make.size.mas_equalTo(CGSizeMake(starWidth,14));
-	}];
-
 	[self.signLabel mas_makeConstraints:^(MASConstraintMaker *make) {
 		make.leading.mas_equalTo(self.tagStackView);
 		make.trailing.mas_lessThanOrEqualTo(self.userView).offset(-5);
@@ -272,8 +266,24 @@
 		}
 		self.nickLabel.text = nick;
 		self.signLabel.text = _userInfo.userDesc.length > 0 ? _userInfo.userDesc : YMLocalizedString(@"XPTreasureFairyFriendCell0");
-		self.nobleImageView.imageUrl = _userInfo.userVipInfoVO.vipIcon;
-		self.nobleImageView.hidden = _userInfo.userVipInfoVO.vipIcon.length > 0 ? NO : YES;
+        
+		self.nobleImageView.hidden = _userInfo.userVipInfoVO.nameplateUrl.length > 0 ? NO : YES;
+        @kWeakify(self);
+        [self.nobleImageView loadImageWithUrl:_userInfo.userVipInfoVO.nameplateUrl completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) {
+            @kStrongify(self);
+            if (image) {
+                self.nobleImageView.image = image;
+                CGFloat scale = image.size.width / image.size.height;
+                [self.nobleImageView mas_remakeConstraints:^(MASConstraintMaker *make) {
+                    make.size.mas_equalTo(CGSizeMake(20* scale, 20));
+                }];
+            } else {
+                [self.nobleImageView mas_remakeConstraints:^(MASConstraintMaker *make) {
+                    make.size.mas_equalTo(CGSizeMake(0, 20));
+                }];
+            }
+        }];
+        
 		NSString * headurl = userInfo.headwearEffect.length > 0 ? userInfo.headwearEffect : userInfo.headwearPic;
 		if (headurl.length == 0) {
            self.headWearImageView.hidden = YES;
@@ -448,12 +458,5 @@
 	return _sexButton;
 }

- (UIImageView *)constellationButton {
-	if (!_constellationButton) {
-		_constellationButton = [UIImageView new];
-        _constellationButton.hidden = YES;
-	}
-	return _constellationButton;
-}

@end
--- a/YuMi/Modules/YMMine/View/Cell/Friend/XPMineAttentionTableViewCell.m
+++ b/YuMi/Modules/YMMine/View/Cell/Friend/XPMineAttentionTableViewCell.m
@@ -76,12 +76,12 @@
    [container addSubview:self.signLabel];
    [container addSubview:self.findButton];

-    [self.stackView addArrangedSubview:self.nobleImageView];
    [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];
+    
    _container = container;
 }

@@ -147,7 +147,7 @@
        if (_fansInfo.useingType != ContactUseingType_In_Room && _fansInfo.useingType != ContactUseingType_Share) {
            self.experImageView.hidden = NO;
            self.charmImageView.hidden = NO;
-            if (_fansInfo.userVipInfoVO.vipIcon != nil) {
+            if (_fansInfo.userVipInfoVO.nameplateUrl != nil) {
                self.nobleImageView.hidden = NO;
            }else{
                self.nobleImageView.hidden = YES;
@@ -155,7 +155,7 @@
            self.sexImageView.hidden = NO;
            self.experImageView.imageUrl = _fansInfo.experUrl;
            self.charmImageView.imageUrl = _fansInfo.charmUrl;
-            self.nobleImageView.imageUrl = _fansInfo.userVipInfoVO.vipIcon;
+            self.nobleImageView.imageUrl = _fansInfo.userVipInfoVO.nameplateUrl;
            [self.sexImageView setTitle:[NSString getAgeWithBirth:_fansInfo.birth] forState:UIControlStateNormal];
            self.sexImageView.backgroundColor = _fansInfo.gender == GenderType_Male ? UIColorFromRGB(0x6BB3FF) :UIColorFromRGB(0xFF80CC);
            self.sexImageView.titleEdgeInsets =  _fansInfo.gender != GenderType_Male ? UIEdgeInsetsMake(0, 2, 0, 0):UIEdgeInsetsMake(0, -1, 0, 0);
--- a/YuMi/Modules/YMMine/View/Cell/Friend/XPMineFansTableViewCell.m
+++ b/YuMi/Modules/YMMine/View/Cell/Friend/XPMineFansTableViewCell.m
@@ -23,7 +23,7 @@
 ///昵称
@property (nonatomic,strong) UILabel *nickLabel;
 ///性别
-@property (nonatomic,strong) UIButton *sexImageView;
+//@property (nonatomic,strong) UIButton *sexImageView;
 ///等级
@property (nonatomic,strong) NetImageView *experImageView;
 ///魅力等级
@@ -77,12 +77,12 @@
    [container addSubview:self.signLabel];
    [container addSubview:self.attentionButton];

-    [self.stackView addArrangedSubview:self.nobleImageView];
+    
    [self.stackView addArrangedSubview:self.nickLabel];
-    [self.stackView addArrangedSubview:self.sexImageView];
+//    [self.stackView addArrangedSubview:self.sexImageView];
    [self.stackView addArrangedSubview:self.experImageView];
    [self.stackView addArrangedSubview:self.charmImageView];
-
+    [self.stackView addArrangedSubview:self.nobleImageView];
    _container = container;
 }

@@ -99,10 +99,6 @@
        make.height.mas_equalTo(20);
        make.top.equalTo(self.avatarImageView.mas_top).mas_offset((3));
    }];
-    [self.sexImageView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.width.mas_equalTo(28);
-        make.height.mas_equalTo(14);
-    }];

    [self.signLabel mas_makeConstraints:^(MASConstraintMaker *make) {
        make.leading.mas_equalTo(self.stackView);
@@ -148,21 +144,16 @@
        if (_fansInfo.useingType != ContactUseingType_In_Room && _fansInfo.useingType != ContactUseingType_Share) {
            self.experImageView.hidden = NO;
            self.charmImageView.hidden = NO;
-            if (_fansInfo.userVipInfoVO.vipIcon != nil) {
+            if (_fansInfo.userVipInfoVO.nameplateUrl != nil) {
                self.nobleImageView.hidden = NO;
            }else{
                self.nobleImageView.hidden = YES;
            }
-            self.sexImageView.hidden = NO;
+
            self.attentionButton.hidden = NO;
            self.experImageView.imageUrl = _fansInfo.experUrl;
            self.charmImageView.imageUrl = _fansInfo.charmUrl;
-            self.nobleImageView.imageUrl = _fansInfo.userVipInfoVO.vipIcon;
-   
-            [self.sexImageView setTitle:[NSString getAgeWithBirth:_fansInfo.birth] forState:UIControlStateNormal];
-            self.sexImageView.backgroundColor = _fansInfo.gender == GenderType_Male ? UIColorFromRGB(0x6BB3FF) :UIColorFromRGB(0xFF80CC);
-            self.sexImageView.selected =  _fansInfo.gender != GenderType_Male;
-            self.sexImageView.titleEdgeInsets =  _fansInfo.gender != GenderType_Male ? UIEdgeInsetsMake(0, 2, 0, 0):UIEdgeInsetsMake(0, 0, 0, 0);
+            self.nobleImageView.imageUrl = _fansInfo.userVipInfoVO.nameplateUrl;
            
            BOOL isMyFriend = [[NIMSDK sharedSDK].userManager isMyFriend:_fansInfo.uid];
            self.attentionButton.enabled = !isMyFriend;
@@ -191,7 +182,6 @@
            self.experImageView.hidden = YES;
            self.charmImageView.hidden = YES;
            self.nobleImageView.hidden = YES;
-            self.sexImageView.hidden = YES;
            self.attentionButton.hidden = YES;
            self.nickLabel.textColor = UIColorFromRGB(0x333333);
        }
@@ -248,20 +238,6 @@
    return _nickLabel;
 }

- (UIButton *)sexImageView {
-    if (!_sexImageView) {
-        _sexImageView = [[UIButton alloc] init];
-        [_sexImageView setImage:kImage(@"home_age_boy_icon") forState:UIControlStateNormal];
-        [_sexImageView setImage:kImage(@"home_age_girl_icon") forState:UIControlStateSelected];
-        _sexImageView.titleLabel.font = [UIFont systemFontOfSize:10 weight:UIFontWeightMedium];
-        [_sexImageView setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
-        _sexImageView.imageEdgeInsets = UIEdgeInsetsMake(0, 0, 0, 0);
-        _sexImageView.layer.cornerRadius = 14/2;
-        _sexImageView.layer.masksToBounds = YES;
-    }
-    return _sexImageView;
-}
-
 - (NetImageView *)experImageView {
    if (!_experImageView) {
        NetImageConfig * config = [[NetImageConfig alloc]init];
--- a/YuMi/Modules/YMMine/View/Cell/Friend/XPMineFriendTableViewCell.m
+++ b/YuMi/Modules/YMMine/View/Cell/Friend/XPMineFriendTableViewCell.m
@@ -23,11 +23,13 @@
 ///昵称
@property (nonatomic,strong) UILabel *nickLabel;
 ///性别
-@property (nonatomic,strong) UIButton *sexImageView;
+//@property (nonatomic,strong) UIButton *sexImageView;
 ///等级
@property (nonatomic,strong) NetImageView *experImageView;
 ///魅力等级
@property (nonatomic,strong) NetImageView *charmImageView;
+@property(nonatomic, strong) NetImageView *VIPImageView;
+
 ///签名
@property (nonatomic,strong) UILabel *signLabel;

@@ -73,9 +75,10 @@
    [container addSubview:self.signLabel];

    [self.stackView addArrangedSubview:self.nickLabel];
-    [self.stackView addArrangedSubview:self.sexImageView];
+//    [self.stackView addArrangedSubview:self.sexImageView];
    [self.stackView addArrangedSubview:self.experImageView];
    [self.stackView addArrangedSubview:self.charmImageView];
+    [self.stackView addArrangedSubview:self.VIPImageView];

    _container = container;
 }
@@ -89,13 +92,19 @@
    
    [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) {
        make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(10);
-        make.trailing.mas_equalTo(self.container).offset(-10);
+        make.trailing.mas_lessThanOrEqualTo(self.container).offset(-10);
        make.bottom.mas_equalTo(self.avatarImageView.mas_centerY).offset(-2);
+        
+        
+//        make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset((10));
+//        make.trailing.mas_lessThanOrEqualTo(self.container).mas_offset(-0);
+//        make.height.mas_equalTo(((20)));
+//        make.top.equalTo(self.avatarImageView.mas_top).mas_offset((3));
    }];
-    [self.sexImageView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.width.mas_equalTo(28);
-        make.height.mas_equalTo(14);
-    }];
+//    [self.sexImageView mas_makeConstraints:^(MASConstraintMaker *make) {
+//        make.width.mas_equalTo(28);
+//        make.height.mas_equalTo(14);
+//    }];
    [self.signLabel mas_makeConstraints:^(MASConstraintMaker *make) {
        make.leading.mas_equalTo(self.stackView);
        make.top.mas_equalTo(self.stackView.mas_bottom).offset(7);
@@ -109,6 +118,11 @@
        make.height.mas_equalTo(20);
        make.width.mas_equalTo(width);
    }];
+    
+    [self.VIPImageView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.height.mas_equalTo(20);
+        make.width.mas_equalTo(width);
+    }];
 }

 #pragma mark - Getters And Setters
@@ -123,10 +137,28 @@
        self.charmImageView.hidden = NO;
        self.experImageView.imageUrl = _userInfo.userLevelVo.experUrl;
        self.charmImageView.imageUrl = _userInfo.userLevelVo.charmUrl;
-        [self.sexImageView setTitle:[NSString getAgeWithBirth:_userInfo.birth] forState:UIControlStateNormal];
-        self.sexImageView.backgroundColor = _userInfo.gender == GenderType_Male ? UIColorFromRGB(0x6BB3FF) :UIColorFromRGB(0xFF80CC);
-        self.sexImageView.titleEdgeInsets =  _userInfo.gender != GenderType_Male ? UIEdgeInsetsMake(0, 2, 0, 0):UIEdgeInsetsMake(0, -1, 0, 0);
-        self.sexImageView.selected =  _userInfo.gender != GenderType_Male;
+//        [self.sexImageView setTitle:[NSString getAgeWithBirth:_userInfo.birth] forState:UIControlStateNormal];
+//        self.sexImageView.backgroundColor = _userInfo.gender == GenderType_Male ? UIColorFromRGB(0x6BB3FF) :UIColorFromRGB(0xFF80CC);
+//        self.sexImageView.titleEdgeInsets =  _userInfo.gender != GenderType_Male ? UIEdgeInsetsMake(0, 2, 0, 0):UIEdgeInsetsMake(0, -1, 0, 0);
+//        self.sexImageView.selected =  _userInfo.gender != GenderType_Male;
+        
+        if (userInfo.userVipInfoVO) {
+            self.VIPImageView.hidden = userInfo.userVipInfoVO.vipLevel == 0;
+            self.VIPImageView.imageUrl = userInfo.userVipInfoVO.nameplateUrl;
+            @kWeakify(self);
+            [self.VIPImageView loadImageWithUrl:userInfo.userVipInfoVO.nameplateUrl completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) {
+                if (image) {
+                    @kStrongify(self);
+                    CGFloat scale = image.size.width / image.size.height;
+                    [self.VIPImageView mas_remakeConstraints:^(MASConstraintMaker *make) {
+                        make.size.mas_equalTo(CGSizeMake(20* scale, 20));
+                    }];
+                    [self.stackView layoutIfNeeded];
+                }
+            }];
+        } else {
+            self.VIPImageView.hidden = YES;
+        }
    }
 }

@@ -148,7 +180,7 @@
        _stackView.axis = UILayoutConstraintAxisHorizontal;
        _stackView.distribution = UIStackViewDistributionFill;
        _stackView.alignment = UIStackViewAlignmentCenter;
-        _stackView.spacing = 10;
+        _stackView.spacing = 4;
    }
    return _stackView;
 }
@@ -162,19 +194,19 @@
    return _nickLabel;
 }

- (UIButton *)sexImageView {
-    if (!_sexImageView) {
-        _sexImageView = [[UIButton alloc] init];
-        [_sexImageView setImage:kImage(@"home_age_boy_icon") forState:UIControlStateNormal];
-        [_sexImageView setImage:kImage(@"home_age_girl_icon") forState:UIControlStateSelected];
-        _sexImageView.titleLabel.font = [UIFont systemFontOfSize:10 weight:UIFontWeightMedium];
-        [_sexImageView setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
-        _sexImageView.imageEdgeInsets = UIEdgeInsetsMake(0, 0, 0, 0);
-        _sexImageView.layer.cornerRadius = 14/2;
-        _sexImageView.layer.masksToBounds = YES;
-    }
-    return _sexImageView;
-}
+//- (UIButton *)sexImageView {
+//    if (!_sexImageView) {
+//        _sexImageView = [[UIButton alloc] init];
+//        [_sexImageView setImage:kImage(@"home_age_boy_icon") forState:UIControlStateNormal];
+//        [_sexImageView setImage:kImage(@"home_age_girl_icon") forState:UIControlStateSelected];
+//        _sexImageView.titleLabel.font = [UIFont systemFontOfSize:10 weight:UIFontWeightMedium];
+//        [_sexImageView setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
+//        _sexImageView.imageEdgeInsets = UIEdgeInsetsMake(0, 0, 0, 0);
+//        _sexImageView.layer.cornerRadius = 14/2;
+//        _sexImageView.layer.masksToBounds = YES;
+//    }
+//    return _sexImageView;
+//}

 - (NetImageView *)experImageView {
    if (!_experImageView) {
@@ -194,6 +226,15 @@
    return _charmImageView;
 }

+- (NetImageView *)VIPImageView {
+    if (!_VIPImageView) {
+        NetImageConfig * config = [[NetImageConfig alloc]init];
+      
+        _VIPImageView = [[NetImageView alloc] initWithConfig:config];
+    }
+    return _VIPImageView;
+}
+
 - (UILabel *)signLabel{
    if (!_signLabel) {
        _signLabel = [[UILabel alloc] init];
--- a/YuMi/Modules/YMNewHome/View/CustomView/XPNewHomeHeadView.m
+++ b/YuMi/Modules/YMNewHome/View/CustomView/XPNewHomeHeadView.m
@@ -56,6 +56,7 @@
        self.type == HomeBannerInfoSkipType_Web_Custom ||
        self.type == HomeBannerInfoSkipType_Web_WeekStar) {
        self.imageView.hidden = YES;
+        self.svgaImageView.hidden = NO;
        if (self.videoItem) {
            [self playSVGAWith:self.videoItem];
        } else {
@@ -69,11 +70,13 @@
                }
            } failureBlock:^(NSError * _Nullable error) {
                @kStrongify(self);
+                self.svgaImageView.hidden = YES;
                self.imageView.hidden = NO;
                self.imageView.imageUrl = imageURLString;
            }];
        }
    } else {
+        self.svgaImageView.hidden = YES;
        self.imageView.hidden = NO;
        self.imageView.imageUrl = imageURLString;
    }
@@ -166,7 +169,7 @@
 }

 - (void)cycleScrollView:(SDCycleScrollView *)cycleScrollView didSelectItemAtIndex:(NSInteger)index {
-    HomeBannerInfoModel * bannerInfo = [self.bannerList xpSafeObjectAtIndex:index];
+    HomeBannerInfoModel *bannerInfo = [self.bannerList xpSafeObjectAtIndex:index];
    if(bannerInfo != nil && self.delegate && [self.delegate respondsToSelector:@selector(selectBannerListWithModel:)]){
        [self.delegate selectBannerListWithModel:bannerInfo];
    }