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 34510ac7..4ed76184 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 9462fe9a..1b5f0e98 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/BackMusic/View/SubViews/XPRoomBackMusicPlayerView.m b/xplan-ios/Main/Room/View/BackMusic/View/SubViews/XPRoomBackMusicPlayerView.m index b92e4b40..c8836bb3 100644 --- a/xplan-ios/Main/Room/View/BackMusic/View/SubViews/XPRoomBackMusicPlayerView.m +++ b/xplan-ios/Main/Room/View/BackMusic/View/SubViews/XPRoomBackMusicPlayerView.m @@ -396,6 +396,9 @@ UIKIT_EXTERN NSString * kRoomBackMusicPlayMusicOrderKey; _playOrderButton = [UIButton buttonWithType:UIButtonTypeCustom]; [_playOrderButton setImage:[UIImage imageNamed:@"room_music_small_player_order"] forState:UIControlStateNormal]; [_playOrderButton setImage:[UIImage imageNamed:@"room_music_small_player_single"] forState:UIControlStateSelected]; + NSUserDefaults * defaults = [NSUserDefaults standardUserDefaults]; + NSInteger type = [defaults integerForKey:kRoomBackMusicPlayMusicOrderKey]; + _playOrderButton.selected = type == 1; [_playOrderButton addTarget:self action:@selector(playOrderButtonAction:) forControlEvents:UIControlEventTouchUpInside]; } return _playOrderButton; diff --git a/xplan-ios/Main/Room/View/BaseUIContainerView/XPRoomFunctionContainerView.m b/xplan-ios/Main/Room/View/BaseUIContainerView/XPRoomFunctionContainerView.m index abe26af4..27508f4b 100644 --- a/xplan-ios/Main/Room/View/BaseUIContainerView/XPRoomFunctionContainerView.m +++ b/xplan-ios/Main/Room/View/BaseUIContainerView/XPRoomFunctionContainerView.m @@ -704,9 +704,10 @@ if (currentUserModel) { if (!self.musicEnterButton.superview) { [self addSubview:self.musicEnterButton]; + CGFloat topOffY = self.delegate.getRoomInfo.type == RoomType_Anchor ? (kNavigationHeight+ 4 + 22 + 18) : (kNavigationHeight+ 4); [self.musicEnterButton mas_makeConstraints:^(MASConstraintMaker *make) { make.right.mas_equalTo(0).offset(8); - make.top.mas_equalTo(kNavigationHeight+4); + make.top.mas_equalTo(topOffY); make.width.mas_equalTo(79); make.height.mas_equalTo(22); }]; @@ -1331,9 +1332,10 @@ if (currentUserModel) { if (!self.musicEnterButton.superview) { [self addSubview:self.musicEnterButton]; + CGFloat topOffY = self.delegate.getRoomInfo.type == RoomType_Anchor ? (kNavigationHeight+ 4 + 22 + 18) : (kNavigationHeight+ 4); [self.musicEnterButton mas_makeConstraints:^(MASConstraintMaker *make) { make.right.mas_equalTo(0).offset(8); - make.top.mas_equalTo(kNavigationHeight+4); + make.top.mas_equalTo(topOffY); make.width.mas_equalTo(79); make.height.mas_equalTo(22); }];