提交
This commit is contained in:
@@ -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];
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user