diff --git a/YuMi/Modules/YMNewHome/View/XPHomePartyViewController.m b/YuMi/Modules/YMNewHome/View/XPHomePartyViewController.m index 5c532361..eafd7768 100644 --- a/YuMi/Modules/YMNewHome/View/XPHomePartyViewController.m +++ b/YuMi/Modules/YMNewHome/View/XPHomePartyViewController.m @@ -274,10 +274,12 @@ [self.datasource addObjectsFromArray:list]; } - if (!self.bannerInfoList) { - self.loadBannerInfo(); - } - [self sortDataSource]; + self.displayDatasource = self.datasource; + +// if (!self.bannerInfoList) { +// self.loadBannerInfo(); +// } +// [self sortDataSource]; [self.collectionView reloadData]; [[NSNotificationCenter defaultCenter]postNotificationName:@"khomeVCRefreshComplete" object:nil]; diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/GiftComboManager.h b/YuMi/Modules/YMRoom/View/SendGiftView/GiftComboManager.h index 163bff30..2886aae5 100644 --- a/YuMi/Modules/YMRoom/View/SendGiftView/GiftComboManager.h +++ b/YuMi/Modules/YMRoom/View/SendGiftView/GiftComboManager.h @@ -17,6 +17,7 @@ typedef enum : NSUInteger { ComboAction_RemovePanel, ComboAction_Error, ComboAction_Combo_Count_Update, + ComboAction_Update_After_Send_Success } ComboActionType; typedef enum : NSUInteger { @@ -30,6 +31,8 @@ NS_ASSUME_NONNULL_BEGIN @interface GiftComboManager : NSObject +@property (nonatomic, strong) GiftReceiveInfoModel *sendGiftReceiveInfo; + // 单例方法 + (instancetype)sharedManager; @@ -61,7 +64,7 @@ NS_ASSUME_NONNULL_BEGIN - (NSString *)loadErrorMessage; - (void)receiveGiftInfoForDisplayComboFlags:(GiftReceiveInfoModel *)receiveInfo - container:(UIView *)container; + container:(UIView *)container; @end diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/GiftComboManager.m b/YuMi/Modules/YMRoom/View/SendGiftView/GiftComboManager.m index 4d9fb637..917c6716 100644 --- a/YuMi/Modules/YMRoom/View/SendGiftView/GiftComboManager.m +++ b/YuMi/Modules/YMRoom/View/SendGiftView/GiftComboManager.m @@ -460,7 +460,9 @@ GiftReceiveInfoModel *receive = [GiftReceiveInfoModel modelWithJSON:data.data]; receive.sourceType = [[dic objectForKey:@"giftSource"] integerValue]; receive.roomSendGiftType = [[dic objectForKey:@"giftType"] integerValue]; - [self handleSendGiftSuccess:data]; + NSArray *array = [allUIDs componentsSeparatedByString:@","]; + receive.receiveGiftNumberUser = array.count; + [self handleSendGiftSuccess:receive sourceData:data]; } else { self.errorMessage = msg; self.actionCallback(ComboAction_RemovePanel); @@ -478,15 +480,16 @@ uid:[AccountInfoStorage instance].getUid]; } -- (void)handleSendGiftSuccess:(BaseModel *)response { +- (void)handleSendGiftSuccess:(GiftReceiveInfoModel *)receive + sourceData:(BaseModel *)response { if (self.actionCallback) { self.actionCallback(ComboAction_Combo_Count_Update); } - GiftReceiveInfoModel *receive = [GiftReceiveInfoModel modelWithJSON:response.data]; - if (!receive) { - return; + self.sendGiftReceiveInfo = receive; + if (self.actionCallback) { + self.actionCallback(ComboAction_Update_After_Send_Success); } NSDictionary *tempDic = response.data; diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/Model/GiftReceiveInfoModel.h b/YuMi/Modules/YMRoom/View/SendGiftView/Model/GiftReceiveInfoModel.h index f2192a62..23b32c71 100644 --- a/YuMi/Modules/YMRoom/View/SendGiftView/Model/GiftReceiveInfoModel.h +++ b/YuMi/Modules/YMRoom/View/SendGiftView/Model/GiftReceiveInfoModel.h @@ -133,6 +133,8 @@ NS_ASSUME_NONNULL_BEGIN @property (nonatomic, assign) NSInteger comboCount; +@property (nonatomic, assign) NSInteger receiveGiftNumberUser; + - (NSInteger)receiveUserCount; @end diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPSendGiftView.m b/YuMi/Modules/YMRoom/View/SendGiftView/View/XPSendGiftView.m index e0be5901..74ba18fa 100644 --- a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPSendGiftView.m +++ b/YuMi/Modules/YMRoom/View/SendGiftView/View/XPSendGiftView.m @@ -185,6 +185,17 @@ UIKIT_EXTERN NSString * kShowFirstRechargeView; case ComboAction_Error: { [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: break; }