提交

QXLive.xcodeproj/project.pbxproj

@@ -787,7 +787,7 @@
 					"$(inherited)",
 					"$(SDKROOT)/usr/lib/swift",
 				);
-				MARKETING_VERSION = 1.0.8;
+				MARKETING_VERSION = 1.0.9;
 				PRODUCT_BUNDLE_IDENTIFIER = com.xscm.midi;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -853,7 +853,7 @@
 					"$(inherited)",
 					"$(SDKROOT)/usr/lib/swift",
 				);
-				MARKETING_VERSION = 1.0.8;
+				MARKETING_VERSION = 1.0.9;
 				PRODUCT_BUNDLE_IDENTIFIER = com.xscm.midi;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

QXLive.xcodeproj/xcshareddata/xcschemes/QXLive.xcscheme

@@ -74,6 +74,13 @@
             ReferencedContainer = "container:QXLive.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
+      <EnvironmentVariables>
+         <EnvironmentVariable
+            key = "DYLD_PRINT_LIBRARIES"
+            value = "YES"
+            isEnabled = "YES">
+         </EnvironmentVariable>
+      </EnvironmentVariables>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

QXLive.xcodeproj/xcshareddata/xcschemes/QXLiveDev.xcscheme

@@ -50,6 +50,13 @@
             ReferencedContainer = "container:QXLive.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
+      <EnvironmentVariables>
+         <EnvironmentVariable
+            key = "DYLD_PRINT_LIBRARIES"
+            value = "YES"
+            isEnabled = "YES">
+         </EnvironmentVariable>
+      </EnvironmentVariables>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

QXLive.xcworkspace/xcuserdata/qixing.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -208,68 +208,6 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "95816189-2F62-46D5-8996-37DB842006D9"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "QXLive/Base/QXGlobal.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "238"
-            endingLineNumber = "238"
-            landmarkName = "-joinRoomWithRoomId:isRejoin:navagationController:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "5BF5F01C-DE88-4830-9FC7-B13A8F8D8F06"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "QXLive/HomePage(&#x58f0;&#x64ad;)/Controlller/QXHomeViewController.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "298"
-            endingLineNumber = "298"
-            landmarkName = "-popFirstRechargeView"
-            landmarkType = "7">
-            <Locations>
-               <Location
-                  uuid = "5BF5F01C-DE88-4830-9FC7-B13A8F8D8F06 - 71eef07c41d64efd"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "__44-[QXHomeViewController popFirstRechargeView]_block_invoke_3"
-                  moduleName = "QXLiveDev.debug.dylib"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/qixing/Desktop/%E9%A1%B9%E7%9B%AE/%E7%A7%98%E5%9C%B0/midi_ios/QXLive/HomePage(%E5%A3%B0%E6%92%AD)/Controlller/QXHomeViewController.m"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "298"
-                  endingLineNumber = "298">
-               </Location>
-               <Location
-                  uuid = "5BF5F01C-DE88-4830-9FC7-B13A8F8D8F06 - 71eef07cc1d64edf"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "__44-[QXHomeViewController popFirstRechargeView]_block_invoke_4"
-                  moduleName = "QXLiveDev.debug.dylib"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/qixing/Desktop/%E9%A1%B9%E7%9B%AE/%E7%A7%98%E5%9C%B0/midi_ios/QXLive/HomePage(%E5%A3%B0%E6%92%AD)/Controlller/QXHomeViewController.m"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "299"
-                  endingLineNumber = "299">
-               </Location>
-            </Locations>
-         </BreakpointContent>
-      </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
@@ -280,40 +218,10 @@
             filePath = "QXLive/HomePage(&#x58f0;&#x64ad;)/Controlller/QXHomeViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "265"
+            startingLineNumber = "268"
-            endingLineNumber = "265"
+            endingLineNumber = "268"
             landmarkName = "-popNiceGiftView"
             landmarkType = "7">
-            <Locations>
-               <Location
-                  uuid = "1FB8A90B-0933-4146-A9F1-F32431D2942C - 8acade40333993db"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "__39-[QXHomeViewController popNiceGiftView]_block_invoke_3"
-                  moduleName = "QXLiveDev.debug.dylib"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/qixing/Desktop/%E9%A1%B9%E7%9B%AE/%E7%A7%98%E5%9C%B0/midi_ios/QXLive/HomePage(%E5%A3%B0%E6%92%AD)/Controlller/QXHomeViewController.m"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "265"
-                  endingLineNumber = "265">
-               </Location>
-               <Location
-                  uuid = "1FB8A90B-0933-4146-A9F1-F32431D2942C - 8acade403f3993fd"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "__39-[QXHomeViewController popNiceGiftView]_block_invoke_4"
-                  moduleName = "QXLiveDev.debug.dylib"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/qixing/Desktop/%E9%A1%B9%E7%9B%AE/%E7%A7%98%E5%9C%B0/midi_ios/QXLive/HomePage(%E5%A3%B0%E6%92%AD)/Controlller/QXHomeViewController.m"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "266"
-                  endingLineNumber = "266">
-               </Location>
-            </Locations>
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -348,22 +256,6 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "DA284C6C-4417-4FFD-871F-4A59CA6815DC"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "QXLive/HomePage(&#x58f0;&#x64ad;)/Controlller/&#x623f;&#x95f4;/QXRoomViewController.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1980"
-            endingLineNumber = "1980"
-            landmarkName = "-redbagListView"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
@@ -383,48 +275,16 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            uuid = "2A513923-59DB-438C-81B3-BD7923707E58"
+            uuid = "9043E93D-2910-4D2C-B503-E82326BA842B"
             shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-            filePath = "QXLive/HomePage(&#x58f0;&#x64ad;)/View/&#x623f;&#x95f4;/&#x7ea2;&#x5305;/QXRedBagDrawView.m"
+            filePath = "QXLive/&#x6d3b;&#x52a8;/&#x5de1;&#x4e50;&#x4f1a;/QXMeetActivityView.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "422"
+            startingLineNumber = "852"
-            endingLineNumber = "422"
+            endingLineNumber = "852"
-            landmarkName = "-getDrawTypeWithRedpacktModel:"
+            landmarkName = "-setModel:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "34A425ED-76FC-4472-A395-4DCB55F65DC5"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "QXLive/HomePage(&#x58f0;&#x64ad;)/View/&#x623f;&#x95f4;/&#x7ea2;&#x5305;/QXRedBagDrawView.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "302"
-            endingLineNumber = "302"
-            landmarkName = "-setType:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "30ACBD08-103B-42D6-8392-7F9E56851DC4"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "QXLive/HomePage(&#x58f0;&#x64ad;)/Controlller/&#x623f;&#x95f4;/QXRoomViewController+Activity.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "19"
-            endingLineNumber = "19"
-            landmarkName = "-updateProgress:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>

QXLive/Dynamic(语圈)/View/QXDynamicTopicCell.m

@@ -10,6 +10,7 @@
 
 @implementation QXDynamicTopicCell
 -(void)setModel:(QXTopicModel *)model{
+    _model = model;
     [self.topicImageView sd_setImageWithURL:[NSURL URLWithString:model.pic] placeholderImage:nil];
     self.titleLabel.text = model.title;
     self.countLabel.text = [NSString localizedStringWithFormat:QXText(@"%@条动态"),[NSString qx_showHotCountNum:model.count.longLongValue]];

QXLive/HomePage(声播)/Controlller/QXHomeViewController.h

@@ -10,6 +10,7 @@
 NS_ASSUME_NONNULL_BEGIN
 
 @interface QXHomeViewController : QXBaseViewController
+-(void)popFirstRechargeView;
 -(void)giftScrollViewShowWithModel:(QXGiftScrollModel*)model;
 -(void)giftScrollViewShowWithModelList:(NSArray<QXGiftScrollModel*>*)list;
 @end

QXLive/HomePage(声播)/Controlller/QXHomeViewController.m

@@ -52,6 +52,8 @@
 @property (nonatomic,strong)QXAppstoreHomeView *appStoreView;
 @property (nonatomic,strong)SDCycleScrollView *rechargePermissionView;
 @property (nonatomic,strong)NSMutableArray *rechargePermissionArray;
+
+@property (nonatomic,strong)QXRechargePermissionModel *permissionModel;
 @end
 
 @implementation QXHomeViewController
@@ -185,6 +187,7 @@
     @weakify(self)
     [QXHomePageNetwork getRechargePermissionSuccessBlock:^(QXRechargePermissionModel * _Nonnull model) {
         @strongify(self)
+        self.permissionModel = model;
         [self.rechargePermissionArray removeAllObjects];
         NSMutableArray *imgs = [NSMutableArray array];
         if (model.day_drop_permission.intValue == 1) {
@@ -286,6 +289,9 @@
     }];
 }
 -(void)popFirstRechargeView{
+    if (self.permissionModel.first_charge_permission.intValue != 1) {
+        return;
+    }
     MJWeakSelf
     QXFirstRechargeView *view = [[QXFirstRechargeView alloc] init];
     view.closeActionBlock = ^{

QXLive/HomePage(声播)/Controlller/房间/QXRedBagRecordViewController.m

@@ -140,13 +140,13 @@
         NSString *coinStr = @"";
         if (weakSelf.model.redpacket_info.coin_type.intValue == 1) {
             weakSelf.bottomLabel.text = @"已存入金币";
-            coinStr = [NSString stringWithFormat:@"%@%@",model.my_record.amount,@"金币"];
+            coinStr = [NSString stringWithFormat:@"%@%@",model.my_record.amount?model.my_record.amount:@"0",@"金币"];
         }else{
             weakSelf.bottomLabel.text = @"已存入钻石";
-            coinStr = [NSString stringWithFormat:@"%@%@",model.my_record.amount,@"钻石"];
+            coinStr = [NSString stringWithFormat:@"%@%@",model.my_record.amount?model.my_record.amount:@"0",@"钻石"];
         }
         NSMutableAttributedString *attr = [[NSMutableAttributedString alloc] initWithString:coinStr];
-        [attr yy_setFont:[UIFont boldSystemFontOfSize:46] range:[coinStr rangeOfString:[NSString stringWithFormat:@"%@",model.my_record.amount]]];
+        [attr yy_setFont:[UIFont boldSystemFontOfSize:46] range:[coinStr rangeOfString:[NSString stringWithFormat:@"%@",model.my_record.amount?model.my_record.amount:@"0"]]];
         weakSelf.moneyLabel.attributedText = attr;
         weakSelf.countLabel.text = [NSString stringWithFormat:@"已领取%ld/%@",model.redpacket_info.total_count.integerValue-model.redpacket_info.left_count.integerValue,model.redpacket_info.total_count];
         [weakSelf.tableView reloadData];

QXLive/HomePage(声播)/Controlller/房间/QXRoomViewController+RedPacket.m

@@ -12,6 +12,14 @@
     self.redBagTagView.hidden = NO;
     [[QXRedPacketManager sharedManager] addRedPacket:model];
 }
+-(void)redPacketDidFinished:(NSString *)redpacket_id{
+    [[QXRedPacketManager sharedManager] removeRedPacket:redpacket_id];
+    NSArray *arr = [QXRedPacketManager sharedManager].allRedPackets;
+    if (self.redbagListView) {
+        self.redbagListView.dataArray = arr;
+    }
+    self.redBagTagView.count = [NSString stringWithFormat:@"%ld",arr.count];
+}
 -(void)initRedpacketManager{
     [QXRedPacketManager sharedManager].delegate = self;
     [[QXRedPacketManager sharedManager] startCheckTimer];
@@ -69,11 +77,15 @@
                 // 有收藏房间条件
                 if (self.roomModel.user_info.is_collect.intValue == 1) {
                     /// 需要满足收藏再倒计时
+                    if (redPacket == self.redbagDrawView.redpacketModel) {
                         self.redbagDrawView.needTime = time;
                     }
+                }
             }else{
+                if (redPacket == self.redbagDrawView.redpacketModel) {
                     self.redbagDrawView.needTime = time;
                 }
+            }
         }else{
             if (self.redbagDrawView.isFromToComment) {
                 // 普通红包
@@ -81,14 +93,18 @@
                     // 有收藏房间条件
                     if (self.roomModel.user_info.is_collect.intValue == 1) {
                         /// 需要满足收藏再倒计时
+                        if (redPacket == self.redbagDrawView.redpacketModel) {
                             self.redbagDrawView.needTime = time;
                         }
+                    }
                 }else{
+                    if (redPacket == self.redbagDrawView.redpacketModel) {
                         self.redbagDrawView.needTime = time;
                     }
                 }
             }
         }
+    }
     
     /// 红包列表的倒计时
     if (self.redbagListView.dataArray.count > 0) {

QXLive/HomePage(声播)/Model/QXRoomHourRankModel.h

@@ -23,5 +23,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic,strong)NSString *total_price;
 @property (nonatomic,strong)NSString *label_icon;
 @property (nonatomic,assign)NSInteger xlh_status;
+/// 1有红包，=0 没有红包
+@property (nonatomic,assign)NSInteger redpacket_status;
 @end
 NS_ASSUME_NONNULL_END

QXLive/HomePage(声播)/View/房间/QXAllRoomHourRankView.h

@@ -32,6 +32,9 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic,strong)UILabel *statusLabel;
 
 
+@property (nonatomic,strong)UIImageView *redpacketImageView;
+
+
 @property (nonatomic,assign)NSInteger rankNumber;
 @property (nonatomic,strong)QXRoomHourRankSubModel *model;
 @end

QXLive/HomePage(声播)/View/房间/QXAllRoomHourRankView.m

@@ -246,7 +246,18 @@
         make.width.height.mas_equalTo(12);
     }];
     
+    self.redpacketImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"redbag_tag_icon"]];
+    [self.contentView addSubview:self.redpacketImageView];
+    [self.redpacketImageView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.right.right.mas_equalTo(-5);
+        make.centerY.equalTo(self.contentView);
+        make.width.mas_equalTo(60);
+        make.height.mas_equalTo(60);
+    }];
+    
+    
     self.activityBgView = [[UIView alloc] init];
+    self.activityBgView.hidden = YES;
     [self.contentView addSubview:self.activityBgView];
     [self.activityBgView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.right.right.mas_equalTo(-5);
@@ -353,17 +364,22 @@
     self.nameLabel.text = model.room_name;
     [self.labelImageView sd_setImageWithURL:[NSURL URLWithString:model.label_icon]];
     self.hotLabel.text = [NSString qx_showHotCountNum:model.total_price.longLongValue];
-    if (model.xlh_status == 0) {
+    if (model.redpacket_status > 0) {
-        self.activityBgView.hidden = YES;
+        self.redpacketImageView.hidden = NO;
-    }else if (model.xlh_status == 2){
-        self.activityBgView.hidden = NO;
-        self.activityStatusBgImageView.image = [UIImage imageNamed:@"activity_status_will"];
-        self.statusLabel.text = @"即将开始";
     }else{
-        self.activityBgView.hidden = NO;
+        self.redpacketImageView.hidden = YES;
-        self.activityStatusBgImageView.image = [UIImage imageNamed:@"activity_status_ing"];
-        self.statusLabel.text = @"进行中";
     }
+//    if (model.xlh_status == 0) {
+//        self.activityBgView.hidden = YES;
+//    }else if (model.xlh_status == 2){
+//        self.activityBgView.hidden = NO;
+//        self.activityStatusBgImageView.image = [UIImage imageNamed:@"activity_status_will"];
+//        self.statusLabel.text = @"即将开始";
+//    }else{
+//        self.activityBgView.hidden = NO;
+//        self.activityStatusBgImageView.image = [UIImage imageNamed:@"activity_status_ing"];
+//        self.statusLabel.text = @"进行中";
+//    }
 }
 @end
 

QXLive/HomePage(声播)/View/房间/QXRoomBottomView.m

@@ -350,7 +350,7 @@
 }
 -(void)inputMessageWithName:(NSString *)message redpacketModel:(QXRedPacketModel*)redpacketModel{
     self.redpacketModel = redpacketModel;
-    self.commentView.textField.text = [NSString stringWithFormat:@"%@",message];
+    self.commentView.textField.text = [NSString stringWithFormat:@"#口令红包 %@",message];
     [self.vc.view addSubview:self.commentView];
     [self.commentView.textField becomeFirstResponder];
 }
@@ -369,9 +369,12 @@
         [self.vc.view endEditing:YES];
         return;
     }
+    NSString*password = [NSString stringWithFormat:@"#口令红包 %@",self.redpacketModel.password];
+    if ([text isEqualToString:password]) {
         if (self.delegate && [self.delegate respondsToSelector:@selector(didSendMessage:redpacketModel:)]) {
             [self.delegate didSendMessage:text redpacketModel:self.redpacketModel];
         }
+    }
     [self.vc.view endEditing:YES];
 }
 

QXLive/HomePage(声播)/View/房间/红包/QXRedBagDrawView.m

@@ -33,6 +33,7 @@
 /// 抢红包必须在本房间内
 @property (nonatomic,strong)UILabel *bottomLabel;
 @property (nonatomic,assign)QXRedBagDrawType drawType;
+@property (nonatomic,assign)BOOL isDrawNet;
 
 @end
 @implementation QXRedBagDrawView
@@ -250,7 +251,7 @@
     self.remarkLabel.text = redpacketModel.remark;
     [self.userHeaderImageView sd_setImageWithURL:[NSURL URLWithString:redpacketModel.avatar]];
     self.userNameLabel.text = [NSString stringWithFormat:@"%@的红包",redpacketModel.nickname];
-    self.commentTitleLabel.text = [NSString stringWithFormat:@"发送评论%@",redpacketModel.password];
+    self.commentTitleLabel.text = [NSString stringWithFormat:@"发送评论：%@",redpacketModel.password];
     if (redpacketModel.type.intValue == 2) {
         self.pwdImageView.hidden = NO;
     }else{
@@ -366,9 +367,14 @@
 
 -(void)openAction{
     MJWeakSelf
+    if (self.isDrawNet) {
+        return;
+    }
+    self.isDrawNet = YES;
     [QXMineNetwork drawRedpacketWithRedpacketId:self.redpacketModel.redpacket_id successBlock:^(NSString * _Nonnull code) {
-        if (code.intValue == 1) {
+        weakSelf.isDrawNet = NO;
         weakSelf.redpacketModel.is_qiang = @"1";
+        if (code.intValue == 1) {
             QXRedBagRecordViewController *vc = [[QXRedBagRecordViewController alloc] init];
             vc.redbagId = weakSelf.redpacketModel.redpacket_id;
             [weakSelf.viewController.navigationController pushViewController:vc animated:YES];
@@ -383,6 +389,7 @@
             [weakSelf setType:QXRedBagDrawTypeFinished];
         }
     } failBlock:^(NSError * _Nonnull error, NSString * _Nonnull msg) {
+        weakSelf.isDrawNet = NO;
         showToast(msg);
     }];
 //    CABasicAnimation *rotationAnimation = [CABasicAnimation animationWithKeyPath:@"transform.rotation.z"];
@@ -414,7 +421,7 @@
 }
 -(void)recordAction{
     QXRedBagRecordViewController *vc = [[QXRedBagRecordViewController alloc] init];
-    vc.redbagId = @"";
+    vc.redbagId = self.redpacketModel.redpacket_id;
     [self.viewController.navigationController pushViewController:vc animated:YES];
     [self hide];
 }

QXLive/HomePage(声播)/View/房间/红包/QXRedBagSendView.m

@@ -71,6 +71,7 @@
 
 /// 是否为规则页面返回
 @property (nonatomic,assign)BOOL isFromRule;
+@property (nonatomic,assign)BOOL isSendNet;
 @end
 
 @implementation QXRedBagSendView
@@ -744,6 +745,10 @@
         showToast(@"红包数量不能大于红包金额");
         return;
     }
+    if (self.isSendNet) {
+        return;
+    }
+    self.isSendNet = YES;
     [QXMineNetwork createRedpacketWithType:self.redBagType
                                   password:self.pwdTextField.text
                                  coin_type:self.redBagContentType
@@ -754,9 +759,11 @@
                                    room_id:self.room_id
                                     remark:self.remarkTextField.text
                               successBlock:^(NSDictionary * _Nonnull dict) {
+        self.isSendNet = NO;
         showToast(@"发送成功");
         [self hide];
     } failBlock:^(NSError * _Nonnull error, NSString * _Nonnull msg) {
+        self.isSendNet = NO;
         showToast(msg);
     }];
 }

QXLive/Manager/QXRedPacketManager.m

@@ -60,9 +60,13 @@
 }
 
 - (NSArray<QXRedPacketModel *> *)allRedPackets {
-    return [self.redPackets allValues];
+    return [self sortRedPacketsByOpenTime:[self.redPackets allValues]];
+}
+- (NSArray *)sortRedPacketsByOpenTime:(NSArray *)redPackets {
+    NSSortDescriptor *sortDescriptor = [NSSortDescriptor sortDescriptorWithKey:@"start_time" ascending:YES];
+    NSArray *sortedArray = [redPackets sortedArrayUsingDescriptors:@[sortDescriptor]];
+    return sortedArray;
 }
-
 -(QXRedPacketModel *)getRedPacket:(NSString *)packetId{
     return [self.redPackets objectForKey:packetId];
 }

QXLive/Manager/QXRoomMessageManager.h

@@ -128,6 +128,8 @@ typedef NS_ENUM(NSInteger) {
     
     /// 发红包
     QXRoomMessageTypeSendRedpacket = 1060,
+    /// 红包已被抢完
+    QXRoomMessageTypeRedpacketFinished = 1061,
 }QXRoomMessageType;
 NS_ASSUME_NONNULL_BEGIN
 @protocol QXRoomMessageManagerDelegate <NSObject>
@@ -259,6 +261,8 @@ NS_ASSUME_NONNULL_BEGIN
 -(void)roomClearUserCharmWithUserId:(NSString*)userId;
 /// 发红包
 -(void)recievedRedPacket:(QXRedPacketModel*)model;
+/// 红包
+-(void)redPacketDidFinished:(NSString*)redpacket_id;
 
 /// 房间用户在线状态发生变化
 //-(void)roomUserOnlineStatusDidChanged:(BOOL)isOnline userId:(NSString*)userId;

QXLive/Manager/QXRoomMessageManager.m

@@ -623,6 +623,13 @@
                 }
             }
                 break;
+            case QXRoomMessageTypeRedpacketFinished:{
+                NSString *redpacket_id = [NSString stringWithFormat:@"%@",msg.Text[@"redpacket_id"]];
+                if (self.delegate && [self.delegate respondsToSelector:@selector(redPacketDidFinished:)]) {
+                    [self.delegate redPacketDidFinished:redpacket_id];
+                }
+            }
+                break;
             default:
                 break;
         }

QXLive/Other/Assets.xcassets/home/room/a_redbag/red_bag_list_is_get_icon.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "red_bag_list_is_get_icon@2x.png",
+      "filename" : "红包2@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "red_bag_list_is_get_icon@3x.png",
+      "filename" : "红包2@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

QXLive/Other/Assets.xcassets/home/room/room_set_room_send_redbag.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "room_set_room_send_redbag@2x.png",
+      "filename" : "发红包@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "room_set_room_send_redbag@3x.png",
+      "filename" : "发红包@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

QXLive/Other/Assets.xcassets/弹窗/one_mouth_money_sel.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "image 750@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "image 750@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

QXLive/Tabbar/QXTabbarController.m

@@ -100,6 +100,7 @@
         [[QXGlobal shareGlobal].alertViewController hideViewFinishBlock:^{
             QXLOG(@"页面关闭");
 //            [weakSelf popNiceGiftView];
+            [weakSelf.homeVC popFirstRechargeView];
         }];
     };
     view.gotoActionBlock = ^{

QXLive/Tabbar/弹窗/QXNewPeoplePopView.m

@@ -139,7 +139,7 @@
     self.oneMouthBtn = [[UIButton alloc] init];
     self.oneMouthBtn.hidden = YES;
     UIImage *one_mouth_norImage = [UIImage imageNamed:@"one_mouth_money"];
-    UIImage *one_mouth_selImage = [UIImage imageNamed:@"one_mouth_money"];
+    UIImage *one_mouth_selImage = [UIImage imageNamed:@"one_mouth_money_sel"];
     [self.oneMouthBtn setBackgroundImage:one_mouth_norImage forState:(UIControlStateNormal)];
     [self.oneMouthBtn setBackgroundImage:one_mouth_selImage forState:(UIControlStateSelected)];
     [self.oneMouthBtn setTitleColor:RGB16(0xffffff) forState:(UIControlStateNormal)];

QXLive/活动/巡乐会/QXMeetActivityResultView.h

@@ -19,7 +19,9 @@ NS_ASSUME_NONNULL_BEGIN
 @interface QXMeetActivityResultCell : UICollectionViewCell
 @property (nonatomic,strong)UIImageView *giftBgImageView;
 @property (nonatomic,strong)UIImageView *giftImageView;
+@property (nonatomic,strong)UIImageView *giftInfoImageView;
 @property (nonatomic,strong)UILabel *giftNameLabel;
+@property (nonatomic,strong)UIButton *giftCoin;
 @property (nonatomic,strong)QXDrawGiftModel *model;
 @end
 

QXLive/活动/巡乐会/QXMeetActivityResultView.m

@@ -37,6 +37,8 @@
         make.centerY.equalTo(self);
     }];
     
+//    @2x
+    
     self.bgImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"ac_meet_draw_result_bg"]];
     [self.bgView addSubview:self.bgImageView];
     [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -93,10 +95,10 @@
 -(UICollectionView *)collectionView{
     if (!_collectionView) {
         UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc] init];
-        layout.minimumLineSpacing = 20;
+        layout.minimumLineSpacing = 15;
         layout.minimumInteritemSpacing = 20;
         layout.sectionInset = UIEdgeInsetsMake(0, 12, 0, 12);
-        layout.itemSize = CGSizeMake((331-12*2-20*2)/3,100);
+        layout.itemSize = CGSizeMake((331-12*2-20*2)/3,115);
         _collectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout];
         _collectionView.delegate = self;
         _collectionView.dataSource = self;
@@ -149,9 +151,10 @@
     _model = model;
     [self.giftImageView sd_setImageWithURL:[NSURL URLWithString:model.base_image]];
     self.giftNameLabel.text = [NSString stringWithFormat:@"%@x%@",model.gift_name,model.count];
+    [self.giftCoin setTitle:model.gift_price forState:(UIControlStateNormal)];
 }
 -(void)initSubviews{
-    self.giftBgImageView = [[UIImageView alloc] init];
+    self.giftBgImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"ac_gif_box_bg"]];
     [self.contentView addSubview:self.giftBgImageView];
     [self.giftBgImageView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.right.top.equalTo(self.contentView);
@@ -161,7 +164,16 @@
     self.giftImageView.contentMode = UIViewContentModeScaleAspectFit;
     [self.contentView addSubview:self.giftImageView];
     [self.giftImageView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.edges.equalTo(self.giftBgImageView);
+        make.width.height.mas_equalTo(50);
+        make.centerX.centerY.equalTo(self.giftBgImageView);
+    }];
+    
+    self.giftInfoImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"ac_gift_info_bg"]];
+    [self.contentView addSubview:self.giftInfoImageView];
+    [self.giftInfoImageView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.right.equalTo(self.contentView);
+        make.height.mas_equalTo(30);
+        make.bottom.equalTo(self.contentView);
     }];
     
     self.giftNameLabel = [[UILabel alloc] init];
@@ -171,9 +183,20 @@
     self.giftNameLabel.lineBreakMode = NSLineBreakByTruncatingMiddle;
     [self.contentView addSubview:self.giftNameLabel];
     [self.giftNameLabel mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.bottom.equalTo(self.contentView);
+        make.top.equalTo(self.giftBgImageView.mas_bottom);
         make.left.right.equalTo(self.contentView);
     }];
     
+    self.giftCoin = [[UIButton alloc] init];
+    [self.giftCoin setTitleColor:RGB16(0xffffff) forState:(UIControlStateNormal)];
+    self.giftCoin.titleLabel.font = [UIFont systemFontOfSize:10];
+    [self.giftCoin setImage:[UIImage imageNamed:@"sky_item_coin"] forState:(UIControlStateNormal)];
+    [self.contentView addSubview:self.giftCoin];
+    [self.giftCoin mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.top.equalTo(self.giftNameLabel.mas_bottom);
+        make.centerX.equalTo(self.contentView);
+    }];
+    
+    
 }
 @end

QXLive/活动/巡乐会/QXMeetActivityView.m

@@ -461,6 +461,7 @@
     self.model.xlh_user.avatar = model.FromUserInfo.avatar;
     self.model.locking_gift.gift_num = model.gift_num;
     self.model.xlh_end_time = model.end_time;
+    self.model.homeowner_user = model.room_user;
     [self configData];
 }
 -(void)configData{