yinmeng/yinmeng-ios
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

坑位高度调整，光圈、头饰比例调整

Browse Source
This commit is contained in:
chenguilong
2022-05-12 21:48:17 +08:00
parent a38ca04da9
commit fbf7d54515
8 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
xplan-ios/Main/Room/View/StageView/DatingStageView.m
View File

@@ -27,11 +27,11 @@
#define ownerTopMargin 35
// 房主头像宽 58 + 光圈 5
#define ownerWidth (58 + 5) * kScreenScale
// 昵称高 12，距离头像间距 6
#define ownerHeight (ownerWidth + 6 + 12)
// 昵称高 12，距离头像间距 10
#define ownerHeight (ownerWidth + 10 + 12)
// 下面 8 个坑位宽50 + 光圈 5
#define mcWidth (50 + 5) * kScreenScale
#define mcHeight (mcWidth + 6 + 12 + 5+16)
#define mcHeight (mcWidth + 10 + 12 + 5+16)
// 左右 padding 12
#define paddingH 12 * kScreenScale
// 房主与下面的坑位间隔 33

10
xplan-ios/Main/Room/View/StageView/LittleGameScrollStageView.m
View File

@@ -17,11 +17,11 @@
UIKIT_EXTERN NSString * const kRoomRoomLittleGameMiniStageNotificationKey;
// 下面 8 个坑位宽55 + 光圈 5
#define mcWidth (45 + 5) * kScreenScale
#define mcHeight (mcWidth + 10 + 12 + 5+16)
// 左右 padding 12
#define paddingH 12 * kScreenScale
// 下面 9 个坑位宽40 + 光圈 5
#define mcWidth (40 + 5) * kScreenScale
#define mcHeight (mcWidth + 6 + 12 + 5+16)
// 左右 padding 16
#define paddingH 16 * kScreenScale
#define marginV1 4
@interface LittleGameScrollStageView ()

6
xplan-ios/Main/Room/View/StageView/LittleGameStageView.m
View File

@@ -18,10 +18,10 @@
UIKIT_EXTERN NSString * const kRoomRoomLittleGameMiniStageNotificationKey;
// 下面 8 个坑位宽55 + 光圈 5
#define mcWidth (45 + 5) * kScreenScale
#define mcHeight (mcWidth + 10 + 12 + 5+16)
#define mcWidth (40 + 5) * kScreenScale
#define mcHeight (mcWidth + 6 + 12 + 5+16)
// 左右 padding 12
#define paddingH 12 * kScreenScale
#define paddingH 16 * kScreenScale
#define marginV1 4
@interface LittleGameStageView ()

4
xplan-ios/Main/Room/View/StageView/MicroView/LittleGame/LittleGameMicroView.m
View File

@@ -70,6 +70,10 @@
self.nickLabel.hidden = NO;
self.postionLabel.hidden = NO;
}
[self.stackView mas_updateConstraints:^(MASConstraintMaker *make) {
make.top.mas_equalTo(self.avatarImageView.mas_bottom).offset(6);
}];
}
- (void)configUser:(UserInfoModel *)userInfo {

4
xplan-ios/Main/Room/View/StageView/MicroView/MicroView.m
View File

@@ -123,7 +123,7 @@
[self.headWearImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.center.mas_equalTo(self.avatarImageView);
make.width.mas_equalTo(self.avatarImageView.mas_width).multipliedBy(1.2);
make.width.mas_equalTo(self.avatarImageView.mas_width).multipliedBy(1.31);
make.height.mas_equalTo(self.headWearImageView.mas_width);
}];
@@ -142,7 +142,7 @@
[self.stackView mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerX.mas_equalTo(self);
make.top.mas_equalTo(self.avatarImageView.mas_bottom).offset(6);
make.top.mas_equalTo(self.avatarImageView.mas_bottom).offset(10);
}];
[self.postionLabel mas_makeConstraints:^(MASConstraintMaker *make) {

2
xplan-ios/Main/Room/View/StageView/MicroView/MicroWaveView.m
View File

@@ -73,7 +73,7 @@
animation2.beginTime = CACurrentMediaTime();
animation2.duration = animtionDura;
animation2.fromValue = [NSValue valueWithCGSize:CGSizeMake(1.f, 1.f)];
animation2.toValue = [NSValue valueWithCGSize:CGSizeMake(1.3f, 1.3f)];
animation2.toValue = [NSValue valueWithCGSize:CGSizeMake(1.4f, 1.4f)];
POPBasicAnimation *animation3 = [POPBasicAnimation animationWithPropertyNamed:kPOPLayerOpacity];
animation3.duration = 0.6 * animtionDura;

6
xplan-ios/Main/Room/View/StageView/SocialStageView.m
View File

@@ -15,11 +15,11 @@
#define ownerTopMargin 35
// 房主头像宽 58 + 光圈 5
#define ownerWidth (58 + 5)
// 昵称高12，距离头像间距 6
#define ownerHeight (ownerWidth + 6 + 12)
// 昵称高12，距离头像间距 10
#define ownerHeight (ownerWidth + 10 + 12)
// 下面 8 个坑位宽55 + 光圈 5
#define mcWidth (55 + 5)
#define mcHeight (mcWidth + 6 + 12 + 5+16)
#define mcHeight (mcWidth + 10 + 12 + 5+16)
// 左右 padding 20
#define paddingH 20
// 房主与下面的坑位间隔 33

4
xplan-ios/Main/Room/View/UserCard/View/XPUserCardViewController.m
View File

@@ -247,12 +247,12 @@
[self.headWearImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.center.mas_equalTo(self.avatarImageView);
make.width.mas_equalTo(self.avatarImageView.mas_width).multipliedBy(1.2);
make.width.mas_equalTo(self.avatarImageView.mas_width).multipliedBy(1.31);
make.height.mas_equalTo(self.headWearImageView.mas_width);
}];
[self.nobleIconImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(self.avatarImageView.mas_right).offset(5);
make.left.mas_equalTo(self.headWearImageView.mas_right).offset(5);
make.top.mas_equalTo(self.avatarImageView);
make.height.mas_equalTo(20);
make.width.mas_equalTo(0);