diff --git a/xplan-ios/Assets.xcassets/Room/BackMusic/room_music_player_enter.imageset/room_music_player_enter@2x.png b/xplan-ios/Assets.xcassets/Room/BackMusic/room_music_player_enter.imageset/room_music_player_enter@2x.png index 4ed76184..af5b4cd4 100644 Binary files a/xplan-ios/Assets.xcassets/Room/BackMusic/room_music_player_enter.imageset/room_music_player_enter@2x.png and b/xplan-ios/Assets.xcassets/Room/BackMusic/room_music_player_enter.imageset/room_music_player_enter@2x.png differ diff --git a/xplan-ios/Assets.xcassets/Room/BackMusic/room_music_player_enter.imageset/room_music_player_enter@3x.png b/xplan-ios/Assets.xcassets/Room/BackMusic/room_music_player_enter.imageset/room_music_player_enter@3x.png index 1b5f0e98..a82a6806 100644 Binary files a/xplan-ios/Assets.xcassets/Room/BackMusic/room_music_player_enter.imageset/room_music_player_enter@3x.png and b/xplan-ios/Assets.xcassets/Room/BackMusic/room_music_player_enter.imageset/room_music_player_enter@3x.png differ diff --git a/xplan-ios/Main/Room/View/BaseUIContainerView/XPRoomAnchorRankEnterView.m b/xplan-ios/Main/Room/View/BaseUIContainerView/XPRoomAnchorRankEnterView.m index cd6b860d..ead30169 100644 --- a/xplan-ios/Main/Room/View/BaseUIContainerView/XPRoomAnchorRankEnterView.m +++ b/xplan-ios/Main/Room/View/BaseUIContainerView/XPRoomAnchorRankEnterView.m @@ -52,8 +52,7 @@ - (void)initSubViewConstraints { [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(11); - make.top.bottom.left.mas_equalTo(0); + make.top.bottom.left.right.mas_equalTo(0); }]; [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self); diff --git a/xplan-ios/Main/Room/View/BaseUIContainerView/XPRoomFunctionContainerView.m b/xplan-ios/Main/Room/View/BaseUIContainerView/XPRoomFunctionContainerView.m index 5c5037c4..56ca91db 100644 --- a/xplan-ios/Main/Room/View/BaseUIContainerView/XPRoomFunctionContainerView.m +++ b/xplan-ios/Main/Room/View/BaseUIContainerView/XPRoomFunctionContainerView.m @@ -237,7 +237,7 @@ - (void)initSubViewConstraints { [self.contributeEnterView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(0); + make.right.mas_equalTo(0); make.top.mas_equalTo(kNavigationHeight+4); make.width.mas_equalTo(116); 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); if (self.delegate.getRoomInfo.roomModeType == RoomModeType_Open_Blind) {//相亲厅播放音乐 [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.width.mas_equalTo(79); + make.width.mas_equalTo(22); make.height.mas_equalTo(22); }]; } else { - [self.musicEnterButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(0).offset(8); - make.top.mas_equalTo(topOffY); - make.width.mas_equalTo(79); - make.height.mas_equalTo(22); - }]; + if (self.hourRankEntranceView.superview) { + [self.musicEnterButton mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.mas_equalTo(self.hourRankEntranceView.mas_right).mas_offset(4); + make.centerY.mas_equalTo(self.contributeEnterView); + 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 { @@ -1476,7 +1485,7 @@ if (!self.hourRankEntranceView.superview) { [self insertSubview:self.hourRankEntranceView atIndex:0]; [self.hourRankEntranceView mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(0); + make.left.mas_equalTo(15); make.centerY.mas_equalTo(self.contributeEnterView); make.width.mas_equalTo(69); 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); if (self.delegate.getRoomInfo.roomModeType == RoomModeType_Open_Blind) {//相亲厅播放音乐 [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.width.mas_equalTo(79); + make.width.mas_equalTo(22); make.height.mas_equalTo(22); }]; } else { - [self.musicEnterButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(0).offset(8); - make.top.mas_equalTo(topOffY); - make.width.mas_equalTo(79); - make.height.mas_equalTo(22); - }]; + if (self.hourRankEntranceView.superview) { + [self.musicEnterButton mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.mas_equalTo(self.hourRankEntranceView.mas_right).mas_offset(4); + make.centerY.mas_equalTo(self.contributeEnterView); + 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 { if (!_musicEnterButton) { _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.layer.masksToBounds = YES; _musicEnterButton.layer.cornerRadius = 11; - _musicEnterButton.imageEdgeInsets = UIEdgeInsetsMake(0, -15, 0, 0); _musicEnterButton.backgroundColor = UIColorRGBAlpha(0xffffff, 0.2); [_musicEnterButton addTarget:self action:@selector(musicEnterButtonAction:) forControlEvents:UIControlEventTouchUpInside]; CAKeyframeAnimation *lAni = [CAKeyframeAnimation animationWithKeyPath:@"transform.rotation.z"]; diff --git a/xplan-ios/Main/Room/View/BaseUIContainerView/XPRoomRankEntranceView.m b/xplan-ios/Main/Room/View/BaseUIContainerView/XPRoomRankEntranceView.m index 6922b849..dd7b410d 100644 --- a/xplan-ios/Main/Room/View/BaseUIContainerView/XPRoomRankEntranceView.m +++ b/xplan-ios/Main/Room/View/BaseUIContainerView/XPRoomRankEntranceView.m @@ -58,8 +58,7 @@ - (void)initSubViewConstraints { [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(-11); - make.top.bottom.right.mas_equalTo(0); + make.top.bottom.right.left.mas_equalTo(0); }]; [self.rankContentView mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self);