diff --git a/QXLive.xcworkspace/xcuserdata/qixing.xcuserdatad/UserInterfaceState.xcuserstate b/QXLive.xcworkspace/xcuserdata/qixing.xcuserdatad/UserInterfaceState.xcuserstate index e82e3ec..ecc9d91 100644 Binary files a/QXLive.xcworkspace/xcuserdata/qixing.xcuserdatad/UserInterfaceState.xcuserstate and b/QXLive.xcworkspace/xcuserdata/qixing.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/QXLive/Base/QXGlobal.m b/QXLive/Base/QXGlobal.m index 68f0850..05aa153 100644 --- a/QXLive/Base/QXGlobal.m +++ b/QXLive/Base/QXGlobal.m @@ -199,7 +199,6 @@ navagationController = (QXBaseNavigationController*)KEYWINDOW.rootViewController; // navagationController.interactivePopGestureRecognizer.enabled = NO; if (_miniView) { - [[QXGiftPlayerManager shareManager] startPlay]; [_miniView removeFromSuperview]; _miniView = nil; } @@ -332,7 +331,6 @@ self.miniView.roomId = self.roomId; self.miniView.roomCoverImage = roomCover; [self.miniView show]; - [[QXGiftPlayerManager shareManager] stopPlay]; } -(QXMiniRoomView *)miniView{ diff --git a/QXLive/HomePage(声播)/Controlller/房间/QXRoomViewController.m b/QXLive/HomePage(声播)/Controlller/房间/QXRoomViewController.m index e32b1ea..fc87655 100644 --- a/QXLive/HomePage(声播)/Controlller/房间/QXRoomViewController.m +++ b/QXLive/HomePage(声播)/Controlller/房间/QXRoomViewController.m @@ -102,6 +102,9 @@ QXRoomUserInfoViewDelegate } } [self playHWDMP4]; + dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ + [[QXGiftPlayerManager shareManager] startPlay]; + }); self.navigationController.viewControllers = marr; // self.navigationController.interactivePopGestureRecognizer.enabled = NO; } @@ -110,8 +113,12 @@ QXRoomUserInfoViewDelegate // [[QXGiftPlayerManager shareManager] stopPlay]; self.continuousView.hidden = YES; [self stopHWDMP4]; + +} +-(void)viewWillDisappear:(BOOL)animated{ + [super viewWillDisappear:animated]; + [[QXGiftPlayerManager shareManager] stopPlay]; } - -(void)initSubViews{ // [self updateBgImage:@"room_background"]; @@ -235,9 +242,25 @@ QXRoomUserInfoViewDelegate } #pragma mark - 获取房间信息 -(void)joinRoom{ + if (self.roomModel) { + [self resetSubviews]; + [self configRoomDataIsJoin:YES]; + }else{ + MJWeakSelf + [[QXRoomMessageManager shared] joinGroupWithRoomId:self.roomId]; + [QXMineNetwork joinRoomWithRoomId:self.roomId successBlock:^(QXRoomModel * _Nonnull roomModel) { + weakSelf.roomModel = roomModel; + [self resetSubviews]; + [self configRoomDataIsJoin:YES]; + } failBlock:^(NSError * _Nonnull error, NSString * _Nonnull msg) { + showToast(msg); + [[QXGlobal shareGlobal] quitRoomWithRoomId:self.roomId]; + dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ + [weakSelf.navigationController popViewControllerAnimated:YES]; + }); + }]; + } - [self resetSubviews]; - [self configRoomDataIsJoin:YES]; //// roomModel.room_info.pk_room_id = @"33"; // // diff --git a/QXLive/HomePage(声播)/View/房间/QXRoomChatListView.m b/QXLive/HomePage(声播)/View/房间/QXRoomChatListView.m index b57f60f..3edc91a 100644 --- a/QXLive/HomePage(声播)/View/房间/QXRoomChatListView.m +++ b/QXLive/HomePage(声播)/View/房间/QXRoomChatListView.m @@ -508,8 +508,8 @@ NSInteger maxMessageCount = 20; make.top.equalTo(self.nameLabel.mas_bottom).offset(2); }]; - CGFloat iconWidth = 38; - CGFloat iconHeight = 16; + CGFloat iconWidth = UserIconWidth; + CGFloat iconHeight = UserIconHeight; CGFloat margin = 6; for (int i = 0; i < 3; i++) { UIImageView *iconImageView = [[UIImageView alloc] init]; @@ -731,8 +731,8 @@ NSInteger maxMessageCount = 20; make.top.equalTo(self.nameLabel.mas_bottom).offset(2); }]; - CGFloat iconWidth = 38; - CGFloat iconHeight = 16; + CGFloat iconWidth = UserIconWidth; + CGFloat iconHeight = UserIconHeight; CGFloat margin = 6; for (int i = 0; i < 3; i++) { UIImageView *iconImageView = [[UIImageView alloc] init]; diff --git a/QXLive/HomePage(声播)/View/房间/排行榜/QXRoomRankSubView.m b/QXLive/HomePage(声播)/View/房间/排行榜/QXRoomRankSubView.m index 646d622..13d695a 100644 --- a/QXLive/HomePage(声播)/View/房间/排行榜/QXRoomRankSubView.m +++ b/QXLive/HomePage(声播)/View/房间/排行榜/QXRoomRankSubView.m @@ -308,8 +308,8 @@ self.nameLabel.text = md.nickname?md.nickname:@""; [self.iconBgView removeAllSubviews]; [self.rankBtn setTitle:[NSString stringWithFormat:@" %@",md.total?md.total:md.gift_prices] forState:(UIControlStateNormal)]; - CGFloat iconWidth = 38; - CGFloat iconHeight = 16; + CGFloat iconWidth = UserIconWidth; + CGFloat iconHeight = UserIconHeight; CGFloat margin = 6; for (int i = 0 ; i < md.icon.count; i++) { UIImageView *iconImageView = [[UIImageView alloc] init]; @@ -326,7 +326,7 @@ make.width.mas_equalTo(iconWidth); make.height.mas_equalTo(iconHeight); make.centerY.equalTo(self.iconBgView); - make.centerX.equalTo(self.iconBgView).offset(-38/2+(margin+iconWidth)*i); + make.centerX.equalTo(self.iconBgView).offset(-UserIconWidth/2+(margin+iconWidth)*i); }]; }else{ [iconImageView mas_makeConstraints:^(MASConstraintMaker *make) { diff --git a/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatTypeAuctionView.h b/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatTypeAuctionView.h index 2bb7b10..e4b4f9e 100644 --- a/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatTypeAuctionView.h +++ b/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatTypeAuctionView.h @@ -9,12 +9,14 @@ #import "QXRoomSeatContentView.h" #import "QXRoomSeatDelegate.h" #import "QXUserModel.h" +#import "QXSelectAuctionInfoView.h" NS_ASSUME_NONNULL_BEGIN @interface QXRoomSeatTypeAuctionView : UIView @property (nonatomic,weak)iddelegate; @property (nonatomic,strong)QXRoomModel *roomModel; @property (nonatomic,assign)NSInteger myPitNumber; +@property (nonatomic,strong)QXSelectAuctionInfoView *auctionInfoView; -(void)didUpDownSeatWithUser:(QXUserHomeModel *)user isUpSeat:(BOOL)isUpSeat pit_number:(NSInteger)pit_number; diff --git a/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatTypeAuctionView.m b/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatTypeAuctionView.m index 8343e45..3b1b389 100644 --- a/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatTypeAuctionView.m +++ b/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatTypeAuctionView.m @@ -8,7 +8,6 @@ #import "QXRoomSeatTypeAuctionView.h" #import "QXRoomSeatContentView.h" #import "UIButton+QX.h" -#import "QXSelectAuctionInfoView.h" #import "QXMineNetwork.h" #import "QXTimer.h" #import "QXRoomAuctionResultView.h" @@ -63,7 +62,6 @@ @property (nonatomic,strong)QXRoomSeatContentView *sixthSeatView; @property (nonatomic,strong)UIButton *moreBtn; -@property (nonatomic,strong)QXSelectAuctionInfoView *auctionInfoView; @property (nonatomic,strong)NSMutableArray *seatArray; @property (nonatomic,strong)QXTimer *timer; diff --git a/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatView.m b/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatView.m index 9ea4b3b..fc487de 100644 --- a/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatView.m +++ b/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatView.m @@ -103,6 +103,9 @@ animations:^{ self->_auctionView.transform = CGAffineTransformMakeScale(0.01, 0.01); } completion:^(BOOL finished) { + if (self->_auctionView.auctionInfoView != nil) { + [self->_auctionView.auctionInfoView hide]; + } [self->_auctionView destroyViews]; [self->_auctionView removeFromSuperview]; self->_auctionView = nil; @@ -390,6 +393,9 @@ animations:^{ self->_auctionView.transform = CGAffineTransformMakeScale(0.01, 0.01); } completion:^(BOOL finished) { + if (self->_auctionView.auctionInfoView != nil) { + [self->_auctionView.auctionInfoView hide]; + } [self->_auctionView destroyViews]; [self->_auctionView removeFromSuperview]; self->_auctionView = nil; @@ -608,6 +614,9 @@ animations:^{ self->_auctionView.transform = CGAffineTransformMakeScale(0.01, 0.01); } completion:^(BOOL finished) { + if (self->_auctionView.auctionInfoView != nil) { + [self->_auctionView.auctionInfoView hide]; + } [self->_auctionView destroyViews]; [self->_auctionView removeFromSuperview]; self->_auctionView = nil; diff --git a/QXLive/Login(登录)/View/QXLoginBottomView.m b/QXLive/Login(登录)/View/QXLoginBottomView.m index a41e8de..fcf5ec4 100644 --- a/QXLive/Login(登录)/View/QXLoginBottomView.m +++ b/QXLive/Login(登录)/View/QXLoginBottomView.m @@ -107,12 +107,12 @@ NSString *str = [NSString stringWithFormat:@"%@%@%@%@",QXText(@"我已阅读并同意"),QXText(@"《用户使用协议》"),QXText(@"和"),QXText(@"《隐私政策》")]; NSMutableAttributedString *attr = [[NSMutableAttributedString alloc] initWithString:str]; MJWeakSelf - [attr yy_setTextHighlightRange:[str rangeOfString:QXText(@"《用户使用协议》")] color:RGB16(0xFF8ACC) backgroundColor:[UIColor clearColor] tapAction:^(UIView * _Nonnull containerView, NSAttributedString * _Nonnull text, NSRange range, CGRect rect) { + [attr yy_setTextHighlightRange:[str rangeOfString:QXText(@"《用户使用协议》")] color:QXConfig.themeColor backgroundColor:[UIColor clearColor] tapAction:^(UIView * _Nonnull containerView, NSAttributedString * _Nonnull text, NSRange range, CGRect rect) { if (weakSelf.delegate && [weakSelf.delegate respondsToSelector:@selector(didClickAgreementLoginWithUrl:type:)]) { [weakSelf.delegate didClickAgreementLoginWithUrl:@"111" type:1]; } }]; - [attr yy_setTextHighlightRange:[str rangeOfString:QXText(@"《隐私政策》")] color:RGB16(0xFF8ACC) backgroundColor:[UIColor clearColor] tapAction:^(UIView * _Nonnull containerView, NSAttributedString * _Nonnull text, NSRange range, CGRect rect) { + [attr yy_setTextHighlightRange:[str rangeOfString:QXText(@"《隐私政策》")] color:QXConfig.themeColor backgroundColor:[UIColor clearColor] tapAction:^(UIView * _Nonnull containerView, NSAttributedString * _Nonnull text, NSRange range, CGRect rect) { if (weakSelf.delegate && [weakSelf.delegate respondsToSelector:@selector(didClickAgreementLoginWithUrl:type:)]) { [weakSelf.delegate didClickAgreementLoginWithUrl:@"111" type:2]; } diff --git a/QXLive/Mine(音域)/Controller/公会中心/QXGuildViewController.m b/QXLive/Mine(音域)/Controller/公会中心/QXGuildViewController.m index 2cf3cf8..e4d0c30 100644 --- a/QXLive/Mine(音域)/Controller/公会中心/QXGuildViewController.m +++ b/QXLive/Mine(音域)/Controller/公会中心/QXGuildViewController.m @@ -8,6 +8,7 @@ #import "QXGuildViewController.h" #import #import "QXUserHomePageViewController.h" +#import "QXRealNameViewController.h" static void *WKWebBrowserContext = &WKWebBrowserContext; @@ -119,6 +120,9 @@ static void *WKWebBrowserContext = &WKWebBrowserContext; return; } [[QXGlobal shareGlobal] joinRoomWithRoomId:room_id isRejoin:NO navagationController:self.navigationController]; + }else if ([dict[@"action"] isEqualToString:@"enterAuthent"]) { + QXRealNameViewController *vc = [[QXRealNameViewController alloc] init]; + [self.navigationController pushViewController:vc animated:YES]; } diff --git a/QXLive/Mine(音域)/View/QXMainHeaderView.m b/QXLive/Mine(音域)/View/QXMainHeaderView.m index 4cfaef7..7ef9aa9 100644 --- a/QXLive/Mine(音域)/View/QXMainHeaderView.m +++ b/QXLive/Mine(音域)/View/QXMainHeaderView.m @@ -210,7 +210,7 @@ } for (int i = 0;i