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-10-08 11:32:31 +08:00
parent 766ce05afa
commit b40a7095bd
5 changed files with 38 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
xplan-ios/Assets.xcassets/Room/BackMusic/room_music_player_enter.imageset/room_music_player_enter@2x.png vendored
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
xplan-ios/Assets.xcassets/Room/BackMusic/room_music_player_enter.imageset/room_music_player_enter@3x.png vendored
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

3
xplan-ios/Main/Room/View/BaseUIContainerView/XPRoomAnchorRankEnterView.m
View File

@@ -52,8 +52,7 @@
- (void)initSubViewConstraints { - (void)initSubViewConstraints {
[self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.right.mas_equalTo(11); make.top.bottom.left.right.mas_equalTo(0);
make.top.bottom.left.mas_equalTo(0);
}]; }];
[self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerY.mas_equalTo(self); make.centerY.mas_equalTo(self);

58
xplan-ios/Main/Room/View/BaseUIContainerView/XPRoomFunctionContainerView.m
View File

@@ -237,7 +237,7 @@
- (void)initSubViewConstraints { - (void)initSubViewConstraints {
[self.contributeEnterView mas_makeConstraints:^(MASConstraintMaker *make) { [self.contributeEnterView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(0); make.right.mas_equalTo(0);
make.top.mas_equalTo(kNavigationHeight+4); make.top.mas_equalTo(kNavigationHeight+4);
make.width.mas_equalTo(116); make.width.mas_equalTo(116);
make.height.mas_equalTo(22); make.height.mas_equalTo(22);
@@ -931,18 +931,27 @@
CGFloat topOffY = self.delegate.getRoomInfo.type == RoomType_Anchor || self.delegate.getRoomInfo.isPermitRoom == PermitRoomType_Licnese ? (kNavigationHeight+ 4 + 22 + 18) : (kNavigationHeight+ 4); CGFloat topOffY = self.delegate.getRoomInfo.type == RoomType_Anchor || self.delegate.getRoomInfo.isPermitRoom == PermitRoomType_Licnese ? (kNavigationHeight+ 4 + 22 + 18) : (kNavigationHeight+ 4);
if (self.delegate.getRoomInfo.roomModeType == RoomModeType_Open_Blind) {//相亲厅播放音乐 if (self.delegate.getRoomInfo.roomModeType == RoomModeType_Open_Blind) {//相亲厅播放音乐
[self.musicEnterButton mas_makeConstraints:^(MASConstraintMaker *make) { [self.musicEnterButton mas_makeConstraints:^(MASConstraintMaker *make) {
make.right.mas_equalTo(self.hourRankEntranceView.mas_left).offset(-8); make.left.mas_equalTo(16);
make.centerY.mas_equalTo(self.contributeEnterView); make.centerY.mas_equalTo(self.contributeEnterView);
make.width.mas_equalTo(79); make.width.mas_equalTo(22);
make.height.mas_equalTo(22); make.height.mas_equalTo(22);
}]; }];
} else { } else {
[self.musicEnterButton mas_makeConstraints:^(MASConstraintMaker *make) { if (self.hourRankEntranceView.superview) {
make.right.mas_equalTo(0).offset(8); [self.musicEnterButton mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.mas_equalTo(topOffY); make.left.mas_equalTo(self.hourRankEntranceView.mas_right).mas_offset(4);
make.width.mas_equalTo(79); make.centerY.mas_equalTo(self.contributeEnterView);
make.height.mas_equalTo(22); make.width.mas_equalTo(22);
}]; make.height.mas_equalTo(22);
}];
} else {
[self.musicEnterButton mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(16);
make.centerY.mas_equalTo(self.contributeEnterView);
make.width.mas_equalTo(22);
make.height.mas_equalTo(22);
}];
}
} }
} }
} else { } else {
@@ -1476,7 +1485,7 @@
if (!self.hourRankEntranceView.superview) { if (!self.hourRankEntranceView.superview) {
[self insertSubview:self.hourRankEntranceView atIndex:0]; [self insertSubview:self.hourRankEntranceView atIndex:0];
[self.hourRankEntranceView mas_makeConstraints:^(MASConstraintMaker *make) { [self.hourRankEntranceView mas_makeConstraints:^(MASConstraintMaker *make) {
make.right.mas_equalTo(0); make.left.mas_equalTo(15);
make.centerY.mas_equalTo(self.contributeEnterView); make.centerY.mas_equalTo(self.contributeEnterView);
make.width.mas_equalTo(69); make.width.mas_equalTo(69);
make.height.mas_equalTo(22); make.height.mas_equalTo(22);
@@ -1573,18 +1582,27 @@
CGFloat topOffY = (self.delegate.getRoomInfo.type == RoomType_Anchor || self.delegate.getRoomInfo.isPermitRoom == PermitRoomType_Licnese) ? (kNavigationHeight+ 4 + 22 + 18) : (kNavigationHeight+ 4); CGFloat topOffY = (self.delegate.getRoomInfo.type == RoomType_Anchor || self.delegate.getRoomInfo.isPermitRoom == PermitRoomType_Licnese) ? (kNavigationHeight+ 4 + 22 + 18) : (kNavigationHeight+ 4);
if (self.delegate.getRoomInfo.roomModeType == RoomModeType_Open_Blind) {//相亲厅播放音乐 if (self.delegate.getRoomInfo.roomModeType == RoomModeType_Open_Blind) {//相亲厅播放音乐
[self.musicEnterButton mas_makeConstraints:^(MASConstraintMaker *make) { [self.musicEnterButton mas_makeConstraints:^(MASConstraintMaker *make) {
make.right.mas_equalTo(self.hourRankEntranceView.mas_left).offset(-8); make.left.mas_equalTo(16);
make.centerY.mas_equalTo(self.contributeEnterView); make.centerY.mas_equalTo(self.contributeEnterView);
make.width.mas_equalTo(79); make.width.mas_equalTo(22);
make.height.mas_equalTo(22); make.height.mas_equalTo(22);
}]; }];
} else { } else {
[self.musicEnterButton mas_makeConstraints:^(MASConstraintMaker *make) { if (self.hourRankEntranceView.superview) {
make.right.mas_equalTo(0).offset(8); [self.musicEnterButton mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.mas_equalTo(topOffY); make.left.mas_equalTo(self.hourRankEntranceView.mas_right).mas_offset(4);
make.width.mas_equalTo(79); make.centerY.mas_equalTo(self.contributeEnterView);
make.height.mas_equalTo(22); make.width.mas_equalTo(22);
}]; make.height.mas_equalTo(22);
}];
} else {
[self.musicEnterButton mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(16);
make.centerY.mas_equalTo(self.contributeEnterView);
make.width.mas_equalTo(22);
make.height.mas_equalTo(22);
}];
}
} }
} }
} }
@@ -1740,13 +1758,9 @@
- (UIButton *)musicEnterButton { - (UIButton *)musicEnterButton {
if (!_musicEnterButton) { if (!_musicEnterButton) {
_musicEnterButton = [UIButton buttonWithType:UIButtonTypeCustom]; _musicEnterButton = [UIButton buttonWithType:UIButtonTypeCustom];
[_musicEnterButton setTitle:@"播放音乐" forState:UIControlStateNormal];
[_musicEnterButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
_musicEnterButton.titleLabel.font = [UIFont systemFontOfSize:10];
[_musicEnterButton setImage:[UIImage imageNamed:@"room_music_player_enter"] forState:UIControlStateNormal]; [_musicEnterButton setImage:[UIImage imageNamed:@"room_music_player_enter"] forState:UIControlStateNormal];
_musicEnterButton.layer.masksToBounds = YES; _musicEnterButton.layer.masksToBounds = YES;
_musicEnterButton.layer.cornerRadius = 11; _musicEnterButton.layer.cornerRadius = 11;
_musicEnterButton.imageEdgeInsets = UIEdgeInsetsMake(0, -15, 0, 0);
_musicEnterButton.backgroundColor = UIColorRGBAlpha(0xffffff, 0.2); _musicEnterButton.backgroundColor = UIColorRGBAlpha(0xffffff, 0.2);
[_musicEnterButton addTarget:self action:@selector(musicEnterButtonAction:) forControlEvents:UIControlEventTouchUpInside]; [_musicEnterButton addTarget:self action:@selector(musicEnterButtonAction:) forControlEvents:UIControlEventTouchUpInside];
CAKeyframeAnimation *lAni = [CAKeyframeAnimation animationWithKeyPath:@"transform.rotation.z"]; CAKeyframeAnimation *lAni = [CAKeyframeAnimation animationWithKeyPath:@"transform.rotation.z"];

3
xplan-ios/Main/Room/View/BaseUIContainerView/XPRoomRankEntranceView.m
View File

@@ -58,8 +58,7 @@
- (void)initSubViewConstraints { - (void)initSubViewConstraints {
[self.bgView mas_makeConstraints:^(MASConstraintMaker *make) { [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(-11); make.top.bottom.right.left.mas_equalTo(0);
make.top.bottom.right.mas_equalTo(0);
}]; }];
[self.rankContentView mas_makeConstraints:^(MASConstraintMaker *make) { [self.rankContentView mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerY.mas_equalTo(self); make.centerY.mas_equalTo(self);