moliparty/peko-ios
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug修复

Browse Source
This commit is contained in:
liyuhua
2023-10-27 18:28:50 +08:00
parent 9506379d10
commit a2083617d9
6 changed files with 56 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
YuMi/Modules/YMRoom/View/ActivityContainerView/XPRoomActivityContainerView.m
View File

@@ -100,35 +100,18 @@ UIKIT_EXTERN NSString *kShowFirstRechargeView;
-(void)openRedPacketResult:(NSNotification *)not{
XPRedPacketResultModel *resultModel = not.object;
self.redPacketView.redPacketModel.result = [resultModel mj_JSONObject];
// [Api getRedPacket:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) {
// self.redPacketView.userInteractionEnabled = YES;
// if(code == 200){
// XPRedPacketModel *redModel = [XPRedPacketModel modelWithJSON:data.data];
// redModel.timestamp = data.timestamp;
// redModel.sendUserNick = data.data[@"nick"];
// redModel.sendUserAvatar = data.data[@"avatar"];
// redModel.redEnvelopePosition = data.data[@"position"];
// [self.redPacketList replaceObjectAtIndex:[self.redPacketList indexOfObject:self.redPacketView.redPacketModel] withObject:redModel];
// self.redPacketView.redPacketModel = redModel;
// if(redModel.state == 2 || redModel.state == 6){
// [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPRoomActivityContainerView3")];
// self.redPacketView.hidden = YES;
// return;
// }
// if(self.openRedPacketHandle){
// self.openRedPacketHandle(self.redPacketView.redPacketModel);
// }
// }
// } redEnvelopeId:self.redPacketView.redPacketModel.redEnvelopeId];
//
// [self.redPacketList removeObject:self.self.redPacketView.redPacketModel];
// if(self.redPacketList.count == 0){
// self.redPacketView.hidden = YES;
// return;
// }
// self.redPacketView.redPacketModel = self.redPacketList.firstObject;
// self.redPacketView.hidden = NO;
// self.redPacketView.pi_redNum = @(self.redPacketList.count).stringValue;
if(resultModel.redEnvelopeVO.pickNum.integerValue == resultModel.redEnvelopeVO.totalNum.integerValue){
[self.redPacketList removeObject:self.self.redPacketView.redPacketModel];
if(self.redPacketList.count == 0){
self.redPacketView.hidden = YES;
return;
}
self.redPacketView.redPacketModel = self.redPacketList.firstObject;
self.redPacketView.hidden = NO;
self.redPacketView.pi_redNum = @(self.redPacketList.count).stringValue;
}
}
- (void)initSubViewConstraints {
[self.stackView mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -523,17 +506,23 @@ UIKIT_EXTERN NSString *kShowFirstRechargeView;
}
return;
}
[self.redPacketList replaceObjectAtIndex:[self.redPacketList indexOfObject:self.redPacketView.redPacketModel] withObject:redModel];
NSInteger count = 0;
for (XPRedPacketModel *obj in self.redPacketList) {
if(obj.state != 3 || obj.state != 4){
count = count + 1;
XPRedPacketResultModel *resultModel = [XPRedPacketResultModel modelWithDictionary:redModel.result];
if(redModel.state == 3 || redModel.state == 4){
if(resultModel.redEnvelopeVO.pickNum.integerValue == resultModel.redEnvelopeVO.totalNum.integerValue){
[self.redPacketList removeObject:self.self.redPacketView.redPacketModel];
if(self.redPacketList.count == 0){
self.redPacketView.hidden = YES;
[XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPRoomActivityContainerView3")];
return;
}
self.redPacketView.redPacketModel = self.redPacketList.firstObject;
self.redPacketView.hidden = NO;
self.redPacketView.pi_redNum = @(self.redPacketList.count).stringValue;
}
}
self.redPacketView.pi_redNum = @(count).stringValue;
return;
}
[self.redPacketList replaceObjectAtIndex:[self.redPacketList indexOfObject:self.redPacketView.redPacketModel] withObject:redModel];
self.redPacketView.redPacketModel = redModel;
if(self.openRedPacketHandle){
self.openRedPacketHandle(self.redPacketView.redPacketModel);
}