diff --git a/QXLive.xcodeproj/project.pbxproj b/QXLive.xcodeproj/project.pbxproj index 6a26800..ee765d2 100644 --- a/QXLive.xcodeproj/project.pbxproj +++ b/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 = ""; diff --git a/QXLive.xcodeproj/xcshareddata/xcschemes/QXLive.xcscheme b/QXLive.xcodeproj/xcshareddata/xcschemes/QXLive.xcscheme index 58ae7a9..91394b4 100644 --- a/QXLive.xcodeproj/xcshareddata/xcschemes/QXLive.xcscheme +++ b/QXLive.xcodeproj/xcshareddata/xcschemes/QXLive.xcscheme @@ -74,6 +74,13 @@ ReferencedContainer = "container:QXLive.xcodeproj"> + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/QXLive/Dynamic(语圈)/View/QXDynamicTopicCell.m b/QXLive/Dynamic(语圈)/View/QXDynamicTopicCell.m index 7fe8b1b..b6d693c 100644 --- a/QXLive/Dynamic(语圈)/View/QXDynamicTopicCell.m +++ b/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]]; diff --git a/QXLive/HomePage(声播)/Controlller/QXHomeViewController.h b/QXLive/HomePage(声播)/Controlller/QXHomeViewController.h index 241566b..66a32ff 100644 --- a/QXLive/HomePage(声播)/Controlller/QXHomeViewController.h +++ b/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*)list; @end diff --git a/QXLive/HomePage(声播)/Controlller/QXHomeViewController.m b/QXLive/HomePage(声播)/Controlller/QXHomeViewController.m index d667aba..f70dd7d 100644 --- a/QXLive/HomePage(声播)/Controlller/QXHomeViewController.m +++ b/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 = ^{ diff --git a/QXLive/HomePage(声播)/Controlller/房间/QXRedBagRecordViewController.m b/QXLive/HomePage(声播)/Controlller/房间/QXRedBagRecordViewController.m index 6af4e5b..52eafff 100644 --- a/QXLive/HomePage(声播)/Controlller/房间/QXRedBagRecordViewController.m +++ b/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]; diff --git a/QXLive/HomePage(声播)/Controlller/房间/QXRoomViewController+RedPacket.m b/QXLive/HomePage(声播)/Controlller/房间/QXRoomViewController+RedPacket.m index 015eb31..cbd4b20 100644 --- a/QXLive/HomePage(声播)/Controlller/房间/QXRoomViewController+RedPacket.m +++ b/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,10 +77,14 @@ // 有收藏房间条件 if (self.roomModel.user_info.is_collect.intValue == 1) { /// 需要满足收藏再倒计时 - self.redbagDrawView.needTime = time; + if (redPacket == self.redbagDrawView.redpacketModel) { + self.redbagDrawView.needTime = time; + } } }else{ - self.redbagDrawView.needTime = time; + if (redPacket == self.redbagDrawView.redpacketModel) { + self.redbagDrawView.needTime = time; + } } }else{ if (self.redbagDrawView.isFromToComment) { @@ -81,10 +93,14 @@ // 有收藏房间条件 if (self.roomModel.user_info.is_collect.intValue == 1) { /// 需要满足收藏再倒计时 - self.redbagDrawView.needTime = time; + if (redPacket == self.redbagDrawView.redpacketModel) { + self.redbagDrawView.needTime = time; + } } }else{ - self.redbagDrawView.needTime = time; + if (redPacket == self.redbagDrawView.redpacketModel) { + self.redbagDrawView.needTime = time; + } } } } diff --git a/QXLive/HomePage(声播)/Model/QXRoomHourRankModel.h b/QXLive/HomePage(声播)/Model/QXRoomHourRankModel.h index 72ee500..cd5a90f 100644 --- a/QXLive/HomePage(声播)/Model/QXRoomHourRankModel.h +++ b/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 diff --git a/QXLive/HomePage(声播)/View/房间/QXAllRoomHourRankView.h b/QXLive/HomePage(声播)/View/房间/QXAllRoomHourRankView.h index 86ade8f..e2fa68d 100644 --- a/QXLive/HomePage(声播)/View/房间/QXAllRoomHourRankView.h +++ b/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 diff --git a/QXLive/HomePage(声播)/View/房间/QXAllRoomHourRankView.m b/QXLive/HomePage(声播)/View/房间/QXAllRoomHourRankView.m index 02bdc2b..28800e5 100644 --- a/QXLive/HomePage(声播)/View/房间/QXAllRoomHourRankView.m +++ b/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) { - 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 = @"即将开始"; + if (model.redpacket_status > 0) { + self.redpacketImageView.hidden = NO; }else{ - self.activityBgView.hidden = NO; - self.activityStatusBgImageView.image = [UIImage imageNamed:@"activity_status_ing"]; - self.statusLabel.text = @"进行中"; + self.redpacketImageView.hidden = YES; } +// 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 diff --git a/QXLive/HomePage(声播)/View/房间/QXRoomBottomView.m b/QXLive/HomePage(声播)/View/房间/QXRoomBottomView.m index 537572c..4aa0773 100644 --- a/QXLive/HomePage(声播)/View/房间/QXRoomBottomView.m +++ b/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,8 +369,11 @@ [self.vc.view endEditing:YES]; return; } - if (self.delegate && [self.delegate respondsToSelector:@selector(didSendMessage:redpacketModel:)]) { - [self.delegate didSendMessage:text redpacketModel:self.redpacketModel]; + 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]; } diff --git a/QXLive/HomePage(声播)/View/房间/红包/QXRedBagDrawView.m b/QXLive/HomePage(声播)/View/房间/红包/QXRedBagDrawView.m index 01ff61f..dc4f970 100644 --- a/QXLive/HomePage(声播)/View/房间/红包/QXRedBagDrawView.m +++ b/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) { + weakSelf.isDrawNet = NO; + weakSelf.redpacketModel.is_qiang = @"1"; if (code.intValue == 1) { - weakSelf.redpacketModel.is_qiang = @"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]; } diff --git a/QXLive/HomePage(声播)/View/房间/红包/QXRedBagSendView.m b/QXLive/HomePage(声播)/View/房间/红包/QXRedBagSendView.m index bee09f7..0860a89 100644 --- a/QXLive/HomePage(声播)/View/房间/红包/QXRedBagSendView.m +++ b/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); }]; } diff --git a/QXLive/Manager/QXRedPacketManager.m b/QXLive/Manager/QXRedPacketManager.m index f75fbbe..773a5ed 100644 --- a/QXLive/Manager/QXRedPacketManager.m +++ b/QXLive/Manager/QXRedPacketManager.m @@ -60,9 +60,13 @@ } - (NSArray *)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]; } diff --git a/QXLive/Manager/QXRoomMessageManager.h b/QXLive/Manager/QXRoomMessageManager.h index 6d52876..a6125ef 100644 --- a/QXLive/Manager/QXRoomMessageManager.h +++ b/QXLive/Manager/QXRoomMessageManager.h @@ -128,6 +128,8 @@ typedef NS_ENUM(NSInteger) { /// 发红包 QXRoomMessageTypeSendRedpacket = 1060, + /// 红包已被抢完 + QXRoomMessageTypeRedpacketFinished = 1061, }QXRoomMessageType; NS_ASSUME_NONNULL_BEGIN @protocol QXRoomMessageManagerDelegate @@ -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; diff --git a/QXLive/Manager/QXRoomMessageManager.m b/QXLive/Manager/QXRoomMessageManager.m index e21f349..8dbf2ce 100644 --- a/QXLive/Manager/QXRoomMessageManager.m +++ b/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; } diff --git a/QXLive/Other/Assets.xcassets/home/room/a_redbag/red_bag_list_is_get_icon.imageset/Contents.json b/QXLive/Other/Assets.xcassets/home/room/a_redbag/red_bag_list_is_get_icon.imageset/Contents.json index 8ac2a68..49b7ae6 100644 --- a/QXLive/Other/Assets.xcassets/home/room/a_redbag/red_bag_list_is_get_icon.imageset/Contents.json +++ b/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" } diff --git a/QXLive/Other/Assets.xcassets/home/room/a_redbag/red_bag_list_is_get_icon.imageset/red_bag_list_is_get_icon@2x.png b/QXLive/Other/Assets.xcassets/home/room/a_redbag/red_bag_list_is_get_icon.imageset/red_bag_list_is_get_icon@2x.png deleted file mode 100644 index 130240d..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/a_redbag/red_bag_list_is_get_icon.imageset/red_bag_list_is_get_icon@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/a_redbag/red_bag_list_is_get_icon.imageset/red_bag_list_is_get_icon@3x.png b/QXLive/Other/Assets.xcassets/home/room/a_redbag/red_bag_list_is_get_icon.imageset/red_bag_list_is_get_icon@3x.png deleted file mode 100644 index 4fbd25c..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/a_redbag/red_bag_list_is_get_icon.imageset/red_bag_list_is_get_icon@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/a_redbag/red_bag_list_is_get_icon.imageset/红包2@2x.png b/QXLive/Other/Assets.xcassets/home/room/a_redbag/red_bag_list_is_get_icon.imageset/红包2@2x.png new file mode 100644 index 0000000..f92fe7f Binary files /dev/null and b/QXLive/Other/Assets.xcassets/home/room/a_redbag/red_bag_list_is_get_icon.imageset/红包2@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/home/room/a_redbag/red_bag_list_is_get_icon.imageset/红包2@3x.png b/QXLive/Other/Assets.xcassets/home/room/a_redbag/red_bag_list_is_get_icon.imageset/红包2@3x.png new file mode 100644 index 0000000..e0361d7 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/home/room/a_redbag/red_bag_list_is_get_icon.imageset/红包2@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/home/room/room_set_room_send_redbag.imageset/Contents.json b/QXLive/Other/Assets.xcassets/home/room/room_set_room_send_redbag.imageset/Contents.json index 6b64fcc..045b589 100644 --- a/QXLive/Other/Assets.xcassets/home/room/room_set_room_send_redbag.imageset/Contents.json +++ b/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" } diff --git a/QXLive/Other/Assets.xcassets/home/room/room_set_room_send_redbag.imageset/room_set_room_send_redbag@2x.png b/QXLive/Other/Assets.xcassets/home/room/room_set_room_send_redbag.imageset/room_set_room_send_redbag@2x.png deleted file mode 100644 index 5fa9a41..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/room_set_room_send_redbag.imageset/room_set_room_send_redbag@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/room_set_room_send_redbag.imageset/room_set_room_send_redbag@3x.png b/QXLive/Other/Assets.xcassets/home/room/room_set_room_send_redbag.imageset/room_set_room_send_redbag@3x.png deleted file mode 100644 index b1479fd..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/room_set_room_send_redbag.imageset/room_set_room_send_redbag@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/room_set_room_send_redbag.imageset/发红包@2x.png b/QXLive/Other/Assets.xcassets/home/room/room_set_room_send_redbag.imageset/发红包@2x.png new file mode 100644 index 0000000..a031b0b Binary files /dev/null and b/QXLive/Other/Assets.xcassets/home/room/room_set_room_send_redbag.imageset/发红包@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/home/room/room_set_room_send_redbag.imageset/发红包@3x.png b/QXLive/Other/Assets.xcassets/home/room/room_set_room_send_redbag.imageset/发红包@3x.png new file mode 100644 index 0000000..0091f99 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/home/room/room_set_room_send_redbag.imageset/发红包@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/弹窗/one_mouth_money_sel.imageset/Contents.json b/QXLive/Other/Assets.xcassets/弹窗/one_mouth_money_sel.imageset/Contents.json new file mode 100644 index 0000000..dee6384 --- /dev/null +++ b/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 + } +} diff --git a/QXLive/Other/Assets.xcassets/弹窗/one_mouth_money_sel.imageset/image 750@2x.png b/QXLive/Other/Assets.xcassets/弹窗/one_mouth_money_sel.imageset/image 750@2x.png new file mode 100644 index 0000000..dcaafea Binary files /dev/null and b/QXLive/Other/Assets.xcassets/弹窗/one_mouth_money_sel.imageset/image 750@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/弹窗/one_mouth_money_sel.imageset/image 750@3x.png b/QXLive/Other/Assets.xcassets/弹窗/one_mouth_money_sel.imageset/image 750@3x.png new file mode 100644 index 0000000..bdace26 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/弹窗/one_mouth_money_sel.imageset/image 750@3x.png differ diff --git a/QXLive/Tabbar/QXTabbarController.m b/QXLive/Tabbar/QXTabbarController.m index cdebbc1..5f84fea 100644 --- a/QXLive/Tabbar/QXTabbarController.m +++ b/QXLive/Tabbar/QXTabbarController.m @@ -100,6 +100,7 @@ [[QXGlobal shareGlobal].alertViewController hideViewFinishBlock:^{ QXLOG(@"页面关闭"); // [weakSelf popNiceGiftView]; + [weakSelf.homeVC popFirstRechargeView]; }]; }; view.gotoActionBlock = ^{ diff --git a/QXLive/Tabbar/弹窗/QXNewPeoplePopView.m b/QXLive/Tabbar/弹窗/QXNewPeoplePopView.m index 1c9cfa4..7fa2ed0 100644 --- a/QXLive/Tabbar/弹窗/QXNewPeoplePopView.m +++ b/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)]; diff --git a/QXLive/活动/巡乐会/QXMeetActivityResultView.h b/QXLive/活动/巡乐会/QXMeetActivityResultView.h index 57abd0a..505435d 100644 --- a/QXLive/活动/巡乐会/QXMeetActivityResultView.h +++ b/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 diff --git a/QXLive/活动/巡乐会/QXMeetActivityResultView.m b/QXLive/活动/巡乐会/QXMeetActivityResultView.m index a26e2d8..ca78b75 100644 --- a/QXLive/活动/巡乐会/QXMeetActivityResultView.m +++ b/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 diff --git a/QXLive/活动/巡乐会/QXMeetActivityView.m b/QXLive/活动/巡乐会/QXMeetActivityView.m index 96c0d42..21d68e6 100644 --- a/QXLive/活动/巡乐会/QXMeetActivityView.m +++ b/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{ diff --git a/QXLive/活动/巡乐会/Resource/ac_gif_box_bg@2x.png b/QXLive/活动/巡乐会/Resource/ac_gif_box_bg@2x.png new file mode 100644 index 0000000..e2f7df1 Binary files /dev/null and b/QXLive/活动/巡乐会/Resource/ac_gif_box_bg@2x.png differ diff --git a/QXLive/活动/巡乐会/Resource/ac_gif_box_bg@3x.png b/QXLive/活动/巡乐会/Resource/ac_gif_box_bg@3x.png new file mode 100644 index 0000000..34da46c Binary files /dev/null and b/QXLive/活动/巡乐会/Resource/ac_gif_box_bg@3x.png differ diff --git a/QXLive/活动/巡乐会/Resource/ac_gift_info_bg@2x.png b/QXLive/活动/巡乐会/Resource/ac_gift_info_bg@2x.png new file mode 100644 index 0000000..7528e25 Binary files /dev/null and b/QXLive/活动/巡乐会/Resource/ac_gift_info_bg@2x.png differ diff --git a/QXLive/活动/巡乐会/Resource/ac_gift_info_bg@3x.png b/QXLive/活动/巡乐会/Resource/ac_gift_info_bg@3x.png new file mode 100644 index 0000000..a0dab5d Binary files /dev/null and b/QXLive/活动/巡乐会/Resource/ac_gift_info_bg@3x.png differ