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

app年龄，星座，寻爱飘屏优化

Browse Source
This commit is contained in:
liyuhua
2023-09-20 17:34:12 +08:00
parent ccc29db030
commit 2435a11e85
75 changed files with 1367 additions and 663 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
YuMi/Modules/YMNewHome/View/Cell/XPNewHomePartyCollectionViewCell.m
View File

@@ -121,7 +121,7 @@
make.width.mas_equalTo(kGetScaleWidth(23));
make.height.mas_equalTo(kGetScaleWidth(22));
make.trailing.mas_equalTo(-kGetScaleWidth(12));
make.bottom.equalTo(self.bgImageView.mas_top).mas_offset(-kGetScaleWidth(30));
make.bottom.equalTo(self.bgImageView.mas_bottom).mas_offset(-kGetScaleWidth(30));
}];
}
- (void)setRoomInfo:(HomePlayRoomModel *)roomInfo{

18
YuMi/Modules/YMNewHome/View/Cell/XPNewHomePartyTableViewCell.m
View File

@@ -188,7 +188,7 @@
_tagView.itemWidthist = _roomInfo.labelsWidthList;
_tagView.itemList = [NSMutableArray arrayWithArray:_roomInfo.labels];
[_birthdayView setTitle:[self getAge] forState:UIControlStateNormal];
[_birthdayView setTitle:[NSString getAgeWithBirth:_roomInfo.birth] forState:UIControlStateNormal];
_birthdayView.backgroundColor = _roomInfo.gender == GenderType_Male ? UIColorFromRGB(0x6BB3FF) :UIColorFromRGB(0xFF80CC);
_gameBgView.hidden = YES;
_gameIconView.hidden = YES;
@@ -222,21 +222,7 @@
}
}
-(NSString *)getAge{
NSDateComponents *components1 = [[NSCalendar currentCalendar] components:NSCalendarUnitDay | NSCalendarUnitMonth | NSCalendarUnitYear fromDate:[NSDate dateWithTimeIntervalSince1970:_roomInfo.birth/1000]];
NSInteger brithDateYear = [components1 year];
NSInteger brithDateDay = [components1 day];
NSInteger brithDateMonth = [components1 month];
// 获取系统当前 年月日
NSDateComponents *components2 = [[NSCalendar currentCalendar] components:NSCalendarUnitDay | NSCalendarUnitMonth | NSCalendarUnitYear fromDate:[NSDate date]]; NSInteger currentDateYear = [components2 year];
NSInteger currentDateDay = [components2 day]; NSInteger currentDateMonth = [components2 month]; // 计算年龄
NSInteger iAge = currentDateYear - brithDateYear - 1;
if ((currentDateMonth > brithDateMonth) || (currentDateMonth == brithDateMonth && currentDateDay >= brithDateDay)) {
iAge++;
}
return @(iAge).stringValue;
}
///声音卡时，svga是否播放动画
-(void)setPlaySoundStatus:(BOOL)isPlay{
_audioView.isPlay = isPlay;

3
YuMi/Modules/YMNewHome/View/Search/Model/HomeSearchResultModel.h
View File

@@ -10,12 +10,15 @@
NS_ASSUME_NONNULL_BEGIN
@interface HomeSearchResultModel : NSObject
///头像
@property (nonatomic,copy) NSString *avatar;
///在线人数
@property (nonatomic,assign) NSInteger onlineNum;
///房主的uid
@property (nonatomic,copy) NSString *uid;
///生日
@property(nonatomic,assign) long birth;
///标题
@property (nonatomic,copy) NSString *title;
///用户的昵称

26
YuMi/Modules/YMNewHome/View/Search/View/Cell/XPSearchListTableViewCell.m
View File

@@ -25,7 +25,7 @@
///昵称
@property (nonatomic,strong) UILabel *nickLabel;
///性别
@property (nonatomic,strong) UIImageView *sexImageView;
@property (nonatomic,strong) UIButton *sexImageView;
///显示id
@property (nonatomic,strong) UILabel *idLabel;
///分割线
@@ -53,7 +53,8 @@
self.avatarImageView.imageUrl = resultModel.avatar;
self.nickLabel.text = type == SearchType_Room ? resultModel.title : resultModel.nick;
self.idLabel.text = [NSString stringWithFormat:YMLocalizedString(@"XPMineUserInfoTableViewCell3"),AppName, resultModel.erbanNo];
self.sexImageView.image = resultModel.gender == GenderType_Female ? [UIImage imageNamed:@"common_female"] : [UIImage imageNamed:@"common_male"];
[self.sexImageView setTitle:[NSString getAgeWithBirth:resultModel.birth] forState:UIControlStateNormal];
self.sexImageView.backgroundColor = resultModel.gender == GenderType_Male ? UIColorFromRGB(0x6BB3FF) :UIColorFromRGB(0xFF80CC);
if (type == SearchType_Users) {
self.numberLabel.text = YMLocalizedString(@"XPSearchListTableViewCell1");
self.numberView.hidden = resultModel.roomUid.length <= 0;
@@ -73,7 +74,9 @@
self.avatarImageView.imageUrl = resultModel.avatar;
self.nickLabel.text = resultModel.title ;
self.idLabel.text = [NSString stringWithFormat:YMLocalizedString(@"XPMineUserInfoTableViewCell3"),AppName, resultModel.erbanNo];
self.sexImageView.image = resultModel.gender == GenderType_Female ? [UIImage imageNamed:@"common_female"] : [UIImage imageNamed:@"common_male"];
[self.sexImageView setTitle:[NSString getAgeWithBirth:resultModel.birth] forState:UIControlStateNormal];
self.sexImageView.backgroundColor = resultModel.gender == GenderType_Male ? UIColorFromRGB(0x6BB3FF) :UIColorFromRGB(0xFF80CC);
if (resultModel.onlineNum > 100) {
self.numberLabel.text = [NSString stringWithFormat:@"%ld", resultModel.onlineNum];
} else {
@@ -112,6 +115,11 @@
make.bottom.mas_equalTo(self.avatarImageView.mas_centerY).offset(-1.5);
}];
[self.sexImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.width.mas_equalTo(28);
make.height.mas_equalTo(14);
}];
[self.idLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(self.nameStackView);
make.top.mas_equalTo(self.avatarImageView.mas_centerY).offset(1.5);
@@ -178,10 +186,16 @@
return _nickLabel;
}
- (UIImageView *)sexImageView {
- (UIButton *)sexImageView {
if (!_sexImageView) {
_sexImageView = [[UIImageView alloc] init];
_sexImageView.userInteractionEnabled = YES;
_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, 2, 0, 0);
_sexImageView.layer.cornerRadius = 14/2;
_sexImageView.layer.masksToBounds = YES;
}
return _sexImageView;
}