提交

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,12 +242,28 @@ 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";
-//        
+//
-//        
+//
 //    } failBlock:^(NSError * _Nonnull error, NSString * _Nonnull msg) {
 //        showToast(msg);
 //        [[QXGlobal shareGlobal] quitRoomWithRoomId:self.roomId];
@@ -884,7 +907,7 @@ QXRoomUserInfoViewDelegate
     self.sendGiftView.roomId = self.roomId;
     [self.sendGiftView showInView:self.view];
 //    [[QXGlobal shareGlobal] showView:self.sendGiftView controller:self popType:(PopViewTypeBottomToUpActionSheet) tapDismiss:YES finishBlock:^{
-//        
+//
 //    }];
 }
 ///修改房间类型
@@ -985,7 +1008,7 @@ QXRoomUserInfoViewDelegate
 #pragma mark - pk 相关
 -(void)recievePKInviteWithSendRoomId:(NSString *)SendRoomId AcceptRoomId:(NSString *)AcceptRoomId PkId:(NSString *)PkId message:(nonnull NSString *)message{
     if (self.seatContentView.myPitNumber == 9) {
-        /// 找主持  主持弹窗    发起者不会收到   
+        /// 找主持  主持弹窗    发起者不会收到
         MJWeakSelf
         QXAlertView *al = [[QXAlertView alloc] initWithFrame:CGRectMake(0, 0, ScaleWidth(300), ScaleWidth(175))];
         al.type = QXAlertViewTypeAgreeSong;
@@ -999,7 +1022,7 @@ QXRoomUserInfoViewDelegate
         };
         al.cancelBlock = ^{
 //            [QXMineNetwork roomPkAgreeWithPk_id:PkId type:@"2" successBlock:^(NSDictionary * _Nonnull dict) {
-//                
+//
 //            } failBlock:^(NSError * _Nonnull error, NSString * _Nonnull msg) {
 //                showToast(msg);
 //            }];
@@ -1143,34 +1166,34 @@ QXRoomUserInfoViewDelegate
 //                                           ScaleWidth(429));
 //            CGRect initialFrame = CGRectOffset(finalFrame, 0, finalFrame.size.height);
 //            vc.view.frame = initialFrame;
-//            
+//
 //            // 添加圆角
 //            vc.view.layer.cornerRadius = 10;
 //            vc.view.layer.maskedCorners = kCALayerMinXMinYCorner | kCALayerMaxXMinYCorner;
 //            vc.view.clipsToBounds = YES;
-//            
+//
 //            // 添加阴影
 //            vc.view.layer.shadowColor = [UIColor blackColor].CGColor;
 //            vc.view.layer.shadowOffset = CGSizeMake(0, -5);
 //            vc.view.layer.shadowOpacity = 0.3;
 //            vc.view.layer.shadowRadius = 10;
-//            
+//
 //            // 添加为子视图控制器
 //            [self addChildViewController:vc];
 //            [self.view addSubview:vc.view];
 //            [vc didMoveToParentViewController:self];
-//            
+//
 //            // 创建半透明背景
 //            UIView *dimmingView = [[UIView alloc] initWithFrame:self.view.bounds];
 //            dimmingView.backgroundColor = [UIColor colorWithWhite:0 alpha:0.5];
 //            dimmingView.alpha = 0;
 //            dimmingView.tag = 212;
 //            [self.view insertSubview:dimmingView belowSubview:vc.view];
-//            
+//
 //            // 添加点击手势
 //            UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(dismissHalfScreenView)];
 //            [dimmingView addGestureRecognizer:tap];
-//            
+//
 //            // 执行动画
 //            [UIView animateWithDuration:0.3 animations:^{
 //                vc.view.frame = finalFrame;
@@ -1326,7 +1349,7 @@ QXRoomUserInfoViewDelegate
             self.sendGiftView.roomId = self.roomId;
             [self.sendGiftView showInView:self.view];
 //            [[QXGlobal shareGlobal] showView:self.sendGiftView controller:self popType:(PopViewTypeBottomToUpActionSheet) tapDismiss:YES finishBlock:^{
-//                
+//
 //            }];
         }
             
@@ -1547,7 +1570,7 @@ QXRoomUserInfoViewDelegate
             self.sendGiftView.roomId = self.userInfoView.roomId;
             [self.sendGiftView showInView:self.view];
 //            [[QXGlobal shareGlobal] showView:self.sendGiftView controller:self popType:(PopViewTypeBottomToUpActionSheet) tapDismiss:YES finishBlock:^{
-//                
+//
 //            }];
         }
             break;
@@ -1570,7 +1593,7 @@ QXRoomUserInfoViewDelegate
     self.sendGiftView.roomId = self.roomId;
     [self.sendGiftView showInView:self.view];
 //    [[QXGlobal shareGlobal] showView:self.sendGiftView controller:self popType:(PopViewTypeBottomToUpActionSheet) tapDismiss:YES finishBlock:^{
-//        
+//
 //    }];
 }
 #pragma - mark 麦位操作

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 iconWidth = UserIconWidth;
-    CGFloat iconHeight = 16;
+    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 iconWidth = UserIconWidth;
-    CGFloat iconHeight = 16;
+    CGFloat iconHeight = UserIconHeight;
     CGFloat margin = 6;
     for (int i = 0; i < 3; i++) {
         UIImageView *iconImageView = [[UIImageView alloc] init];

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 iconWidth = UserIconWidth;
-    CGFloat iconHeight = 16;
+    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) {

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)id<QXRoomSeatDelegate>delegate;
 @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;

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;
@@ -165,8 +163,8 @@
     }];
     self.compereView.delegate = self;
 //
-//    
+//
-//    
+//
     self.intimacyBtn = [[UIButton alloc] init];
     [self.intimacyBtn setTitle:@"亲密拍" forState:(UIControlStateNormal)];
     [self.intimacyBtn setTitleColor:RGB16(0xffffff) forState:(UIControlStateNormal)];
@@ -182,7 +180,7 @@
         make.centerX.equalTo(self.bgView).offset(-(ScaleWidth(70)/2+5));
         make.top.mas_equalTo(32);
     }];
-//    
+//
     self.realLoveBtn = [[UIButton alloc] init];
     [self.realLoveBtn setTitle:@"真爱拍" forState:(UIControlStateNormal)];
     [self.realLoveBtn addTarget:self action:@selector(typeAction:) forControlEvents:(UIControlEventTouchUpInside)];
@@ -197,7 +195,7 @@
         make.left.equalTo(self.intimacyBtn.mas_right).offset(5);
         make.top.mas_equalTo(32);
     }];
-//    
+//
     self.helpBtn = [[UIButton alloc] init];
     [self.helpBtn setImage:[UIImage imageNamed:@"room_auction_help"] forState:(UIControlStateNormal)];
     [self.bgView addSubview:self.helpBtn];
@@ -288,7 +286,7 @@
         make.left.mas_equalTo(26);
         make.right.mas_equalTo(-26);
     }];
-//    
+//
     self.relationView = [[QXRoomAuctionPriceView alloc] init];
     self.relationView.imageView.image = [UIImage imageNamed:@"room_auction_relationship"];
     self.relationView.titleLabel.text = @"关系";
@@ -321,7 +319,7 @@
         make.height.mas_equalTo(ScaleWidth(36)+18);
         make.bottom.equalTo(self.auctionBtn.mas_top).offset(-8);
     }];
-//    
+//
     
 //
     
@@ -348,7 +346,7 @@
         make.top.equalTo(self.auctionBgView);
         make.height.mas_equalTo(47);
     }];
-//    
+//
     self.secondSeatView = [[QXRoomAuctionSeatView alloc] init];
     self.secondSeatView.bgImageView.image = [UIImage imageNamed:@"room_auction_second_bg"];
     self.secondSeatView.rankView.image = [UIImage imageNamed:@"room_auction_second"];
@@ -428,7 +426,7 @@
         make.top.equalTo(self.forthSeatView);
         make.bottom.equalTo(self.bgView);
     }];
-////    
+////
     self.sixthSeatView = [[QXRoomSeatContentView alloc] init];
     [self.bgView addSubview:self.sixthSeatView];
 //    self.sixthSeatView.isAutionSeat = YES;

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;

QXLive/Mine(音域)/View/QXMainHeaderView.m

@@ -154,7 +154,7 @@
 //    [self.leftBtn setBackgroundImage:[UIImage imageNamed:@"start_live"] forState:(UIControlStateNormal)];
 //    [self.leftBtn addTarget:self action:@selector(leftAction) forControlEvents:(UIControlEventTouchUpInside)];
 //    [self addSubview:self.leftBtn];
-//    
+//
 //    self.rightBtn = [[UIButton alloc] initWithFrame:CGRectMake(self.leftBtn.right+7.5, self.userHeaderView.bottom+54, self.leftBtn.width, 67)];
 //    [self.rightBtn setBackgroundImage:[UIImage imageNamed:@"become_anchor"] forState:(UIControlStateNormal)];
 //    [self.rightBtn addTarget:self action:@selector(rightAction) forControlEvents:(UIControlEventTouchUpInside)];
@@ -210,7 +210,7 @@
     }
     for (int i = 0;i<userModel.icon.count;i++) {
         NSString*icon = userModel.icon[i];
-        UIImageView *imageView = [[UIImageView alloc] initWithFrame:CGRectMake(self.nameLabel.left+i*ScaleWidth(42), self.idLabel.bottom+5, ScaleWidth(42), ScaleWidth(16))];
+        UIImageView *imageView = [[UIImageView alloc] initWithFrame:CGRectMake(self.nameLabel.left+i*UserIconWidth, self.idLabel.bottom+5, UserIconWidth, UserIconHeight)];
         [imageView sd_setImageWithURL:[NSURL URLWithString:icon]];
         [self addSubview:imageView];
         [self.iconArray addObject:imageView];

QXLive/Mine(音域)/View/个人主页/QXUserHomeHeaderView.m

@@ -104,7 +104,7 @@
     }];
     
     UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc] init];
-    layout.itemSize = CGSizeMake(42, 16);
+    layout.itemSize = CGSizeMake(UserIconWidth, UserIconHeight);
     layout.minimumLineSpacing = 7;
     layout.scrollDirection = UICollectionViewScrollDirectionHorizontal;
     self.collectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout];

QXLive/Mine(音域)/View/设置/QXBlackListCell.m

@@ -274,8 +274,8 @@
 - (void)awakeFromNib {
     [super awakeFromNib];
     // Initialization code
-    CGFloat iconWidth = 38;
+    CGFloat iconWidth = UserIconWidth;
-    CGFloat iconHeight = 16;
+    CGFloat iconHeight = UserIconHeight;
     CGFloat margin = 6;
     for (int i = 0; i < 3; i++) {
         UIImageView *iconImageView = [[UIImageView alloc] init];

QXLive/Other/QXDefine.h

@@ -13,6 +13,10 @@
 //#define StatusHeight kSafeAreaTop + 20
 ///导航高度 + safe高
 #define NavContentHeight (kSafeAreaTop + NavHeight)
+///称号高
+#define UserIconHeight 17
+/// 称号宽
+#define UserIconWidth 74
 ///导航高
 #define NavHeight 44
 ///工具栏高度