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-07-21 14:07:04 +08:00
parent e59ece7222
commit bea4ee9c6c
42 changed files with 821 additions and 581 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
YuMi/Modules/YMTabbar/View/TabbarViewController.m
View File

@@ -121,6 +121,8 @@ UIKIT_EXTERN NSString *kTabShowAnchorCardKey;
@property (nonatomic,assign) BOOL isReload;
///房间外的飘屏
@property(nonatomic,strong) PIFullScreenBannerAnimation *roomAnimation;
@property(nonatomic,strong) NSMutableArray *cacheList;
@end
@implementation TabbarViewController
@@ -262,78 +264,48 @@ UIKIT_EXTERN NSString *kTabShowAnchorCardKey;
}
///
-(void)requestGiftList{
NSString * uid = [AccountInfoStorage instance].getUid;
if(uid.length == 0)return;
[self dealWithDefaultSvga];
///保存时间，一天只请求一次
NSString *time = [NSDate getNowTimeTimestamp];
NSString *curTime = [NSDate timestampSwitchTime:[time integerValue] andFormatter:@"yyyy-MM-dd"];
NSDictionary *timeDic = [[NSUserDefaults standardUserDefaults]valueForKey:@"kRequestGiftList"];
if(timeDic == nil){
[timeDic setValue:@(YES) forKey:curTime];
[[NSUserDefaults standardUserDefaults]setValue:timeDic forKey:@"kRequestGiftList"];
NSMutableDictionary *curDic = [[NSMutableDictionary alloc]initWithDictionary:timeDic];
[curDic setValue:@(YES) forKey:curTime];
[[NSUserDefaults standardUserDefaults]setValue:curDic forKey:@"kRequestGiftList"];
[[NSUserDefaults standardUserDefaults]synchronize];
}else{
if(timeDic[curTime]!= nil)return;
NSMutableDictionary *curDic = [[NSMutableDictionary alloc]initWithDictionary:timeDic];
[curDic removeAllObjects];
[curDic setValue:@(YES) forKey:curTime];
[[NSUserDefaults standardUserDefaults]setValue:curDic forKey:@"kRequestGiftList"];
[[NSUserDefaults standardUserDefaults]synchronize];
}
///请求普通礼物
[Api requestNormalGiftList:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) {
[Api requestCacheGiftList:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) {
if(code == 200){
NSArray *luckyBagGift = [GiftInfoModel modelsWithArray:data.data[@"luckyBagGift"]]; // 福袋礼物
NSArray *vipGift = [GiftInfoModel modelsWithArray:data.data[@"vipGift"]]; // 贵族礼物
NSArray *luckyPoolGift = [GiftInfoModel modelsWithArray:data.data[@"luckyPoolGift"]];// 福袋奖池礼物
NSArray *normalGift = [GiftInfoModel modelsWithArray:data.data[@"normalGift"]]; // 普通面板礼物
NSArray *weekStarGift = [GiftInfoModel modelsWithArray:data.data[@"weekStarGift"]]; // 周星礼物
NSArray *anchorGift = [GiftInfoModel modelsWithArray:data.data[@"singlePopularGift"]]; // 个播礼物
NSMutableArray *giftList = [[NSMutableArray alloc]initWithArray:luckyBagGift];
[giftList addObjectsFromArray:vipGift];
[giftList addObjectsFromArray:luckyPoolGift];
[giftList addObjectsFromArray:normalGift];
[giftList addObjectsFromArray:weekStarGift];
[giftList addObjectsFromArray:anchorGift];
NSMutableArray *vggUrlList = [NSMutableArray array];
NSMutableArray *viewUrlList = [NSMutableArray array];
NSArray *giftList = [GiftInfoModel modelsWithArray:data.data];
for (GiftInfoModel *giftModel in giftList) {
if(giftModel.vggUrl.length > 0){
[vggUrlList addObject:giftModel.vggUrl];
[self dealWithGiftListWithUrl:giftModel.vggUrl fileName:giftModel.vggUrl isSvga:YES];
}else if(giftModel.viewUrl.length > 0){
[viewUrlList addObject:giftModel.viewUrl];
[self dealWithGiftListWithUrl:giftModel.viewUrl fileName:giftModel.viewUrl isSvga:NO];
}
}
[self requestBagGiftListWithVggUrlList:vggUrlList viewUrlList:viewUrlList];
}
} roomUid:uid];
}];
}
-(void)requestBagGiftListWithVggUrlList:(NSMutableArray *)list viewUrlList:(NSMutableArray *)viewUrlList{
///请求背包礼物
NSString * uid = [AccountInfoStorage instance].getUid;
NSString * ticket = [AccountInfoStorage instance].getTicket;
[Api requestPackGiftList:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) {
if(code == 200){
NSArray * info = [GiftInfoModel modelsWithArray:data.data];
for (GiftInfoModel *giftModel in info) {
if(giftModel.vggUrl.length > 0 && ![list containsObject:giftModel.vggUrl]){
[self dealWithGiftListWithUrl:giftModel.vggUrl fileName:giftModel.vggUrl isSvga:YES];
}else if(giftModel.viewUrl.length > 0 && ![viewUrlList containsObject:giftModel.viewUrl]){
[self dealWithGiftListWithUrl:giftModel.viewUrl fileName:giftModel.viewUrl isSvga:NO];
}
}
}
} uid:uid ticket:ticket];
}
-(void)dealWithDefaultSvga{
for (NSString *url in self.cacheList) {
[self dealWithGiftListWithUrl:url fileName:url isSvga:YES];
}
}
-(void)dealWithGiftListWithUrl:(NSString *)url fileName:(NSString *)fileName isSvga:(BOOL)isSvga {
NSString *baseFileName = isSvga ? @"/GiftSvga":@"/GiftMp4";
NSString *filePaths = [[[NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) objectAtIndex:0] stringByAppendingPathComponent:baseFileName] stringByAppendingPathComponent:fileName];
@@ -1013,4 +985,10 @@ UIKIT_EXTERN NSString *kTabShowAnchorCardKey;
}
return _roomAnimation;
}
- (NSMutableArray *)cacheList{
if(!_cacheList){
_cacheList = [[NSMutableArray alloc]initWithArray:@[@"https://image.hfighting.com/candyTree_light.svga",@"https://image.hfighting.com/candyTree_open.svga",@"https://image.hfighting.com/candyTree_transform.svga"]];
}
return _cacheList;
}
@end