Compare commits
1 Commits
2.7.34
...
hotfix/hot
Author | SHA1 | Date | |
---|---|---|---|
![]() |
7a3314751d |
@@ -274,10 +274,12 @@
|
|||||||
[self.datasource addObjectsFromArray:list];
|
[self.datasource addObjectsFromArray:list];
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!self.bannerInfoList) {
|
self.displayDatasource = self.datasource;
|
||||||
self.loadBannerInfo();
|
|
||||||
}
|
// if (!self.bannerInfoList) {
|
||||||
[self sortDataSource];
|
// self.loadBannerInfo();
|
||||||
|
// }
|
||||||
|
// [self sortDataSource];
|
||||||
|
|
||||||
[self.collectionView reloadData];
|
[self.collectionView reloadData];
|
||||||
[[NSNotificationCenter defaultCenter]postNotificationName:@"khomeVCRefreshComplete" object:nil];
|
[[NSNotificationCenter defaultCenter]postNotificationName:@"khomeVCRefreshComplete" object:nil];
|
||||||
|
@@ -17,6 +17,7 @@ typedef enum : NSUInteger {
|
|||||||
ComboAction_RemovePanel,
|
ComboAction_RemovePanel,
|
||||||
ComboAction_Error,
|
ComboAction_Error,
|
||||||
ComboAction_Combo_Count_Update,
|
ComboAction_Combo_Count_Update,
|
||||||
|
ComboAction_Update_After_Send_Success
|
||||||
} ComboActionType;
|
} ComboActionType;
|
||||||
|
|
||||||
typedef enum : NSUInteger {
|
typedef enum : NSUInteger {
|
||||||
@@ -30,6 +31,8 @@ NS_ASSUME_NONNULL_BEGIN
|
|||||||
|
|
||||||
@interface GiftComboManager : NSObject
|
@interface GiftComboManager : NSObject
|
||||||
|
|
||||||
|
@property (nonatomic, strong) GiftReceiveInfoModel *sendGiftReceiveInfo;
|
||||||
|
|
||||||
// 单例方法
|
// 单例方法
|
||||||
+ (instancetype)sharedManager;
|
+ (instancetype)sharedManager;
|
||||||
|
|
||||||
@@ -61,7 +64,7 @@ NS_ASSUME_NONNULL_BEGIN
|
|||||||
- (NSString *)loadErrorMessage;
|
- (NSString *)loadErrorMessage;
|
||||||
|
|
||||||
- (void)receiveGiftInfoForDisplayComboFlags:(GiftReceiveInfoModel *)receiveInfo
|
- (void)receiveGiftInfoForDisplayComboFlags:(GiftReceiveInfoModel *)receiveInfo
|
||||||
container:(UIView *)container;
|
container:(UIView *)container;
|
||||||
|
|
||||||
@end
|
@end
|
||||||
|
|
||||||
|
@@ -460,7 +460,9 @@
|
|||||||
GiftReceiveInfoModel *receive = [GiftReceiveInfoModel modelWithJSON:data.data];
|
GiftReceiveInfoModel *receive = [GiftReceiveInfoModel modelWithJSON:data.data];
|
||||||
receive.sourceType = [[dic objectForKey:@"giftSource"] integerValue];
|
receive.sourceType = [[dic objectForKey:@"giftSource"] integerValue];
|
||||||
receive.roomSendGiftType = [[dic objectForKey:@"giftType"] integerValue];
|
receive.roomSendGiftType = [[dic objectForKey:@"giftType"] integerValue];
|
||||||
[self handleSendGiftSuccess:data];
|
NSArray *array = [allUIDs componentsSeparatedByString:@","];
|
||||||
|
receive.receiveGiftNumberUser = array.count;
|
||||||
|
[self handleSendGiftSuccess:receive sourceData:data];
|
||||||
} else {
|
} else {
|
||||||
self.errorMessage = msg;
|
self.errorMessage = msg;
|
||||||
self.actionCallback(ComboAction_RemovePanel);
|
self.actionCallback(ComboAction_RemovePanel);
|
||||||
@@ -478,15 +480,16 @@
|
|||||||
uid:[AccountInfoStorage instance].getUid];
|
uid:[AccountInfoStorage instance].getUid];
|
||||||
}
|
}
|
||||||
|
|
||||||
- (void)handleSendGiftSuccess:(BaseModel *)response {
|
- (void)handleSendGiftSuccess:(GiftReceiveInfoModel *)receive
|
||||||
|
sourceData:(BaseModel *)response {
|
||||||
|
|
||||||
if (self.actionCallback) {
|
if (self.actionCallback) {
|
||||||
self.actionCallback(ComboAction_Combo_Count_Update);
|
self.actionCallback(ComboAction_Combo_Count_Update);
|
||||||
}
|
}
|
||||||
|
|
||||||
GiftReceiveInfoModel *receive = [GiftReceiveInfoModel modelWithJSON:response.data];
|
self.sendGiftReceiveInfo = receive;
|
||||||
if (!receive) {
|
if (self.actionCallback) {
|
||||||
return;
|
self.actionCallback(ComboAction_Update_After_Send_Success);
|
||||||
}
|
}
|
||||||
|
|
||||||
NSDictionary *tempDic = response.data;
|
NSDictionary *tempDic = response.data;
|
||||||
|
@@ -133,6 +133,8 @@ NS_ASSUME_NONNULL_BEGIN
|
|||||||
|
|
||||||
@property (nonatomic, assign) NSInteger comboCount;
|
@property (nonatomic, assign) NSInteger comboCount;
|
||||||
|
|
||||||
|
@property (nonatomic, assign) NSInteger receiveGiftNumberUser;
|
||||||
|
|
||||||
- (NSInteger)receiveUserCount;
|
- (NSInteger)receiveUserCount;
|
||||||
|
|
||||||
@end
|
@end
|
||||||
|
@@ -185,6 +185,17 @@ UIKIT_EXTERN NSString * kShowFirstRechargeView;
|
|||||||
case ComboAction_Error: {
|
case ComboAction_Error: {
|
||||||
[self showErrorToast:[[GiftComboManager sharedManager] loadErrorMessage]];
|
[self showErrorToast:[[GiftComboManager sharedManager] loadErrorMessage]];
|
||||||
}
|
}
|
||||||
|
break;
|
||||||
|
case ComboAction_Update_After_Send_Success: {
|
||||||
|
GiftReceiveInfoModel *receiveInfo = [GiftComboManager sharedManager].sendGiftReceiveInfo;
|
||||||
|
if (receiveInfo.sourceType == GiftSourceType_Pack) {
|
||||||
|
///更新个数
|
||||||
|
[self.giftInfoView updatePackSource:receiveInfo numberUser:receiveInfo.receiveGiftNumberUser];
|
||||||
|
} else {
|
||||||
|
self.giftBarView.walletInfoModel = receiveInfo.userPurse;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user