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

20.20.29 / 1.0.15

Browse Source
This commit is contained in:
eggmanQQQ
2024-07-22 21:09:29 +08:00
parent 59db4366a6
commit 3f5f8344df
8 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
YuMi.xcodeproj/project.pbxproj
View File

@@ -12933,7 +12933,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 20.20.28;
MARKETING_VERSION = 20.20.29;
PRODUCT_BUNDLE_IDENTIFIER = com.peko.enterprise.ios;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -12975,7 +12975,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 20.20.28;
MARKETING_VERSION = 20.20.29;
PRODUCT_BUNDLE_IDENTIFIER = com.peko.enterprise.ios;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";

2
YuMi/Global/YUMIMacroUitls.h
View File

@@ -49,7 +49,7 @@ isPhoneXSeries = [[UIApplication sharedApplication] delegate].window.safeAreaIns
///内置版本号
#define PI_App_Version @"1.0.14"
#define PI_App_Version @"1.0.15"
///渠道
#define PI_App_Source @"appstore"
#define PI_Test_Flight @"TestFlight"

8
YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoHeaderView.m
View File

@@ -889,6 +889,8 @@ return view;\
_beautifulImageView.userInteractionEnabled = YES;
_beautifulImageView.hidden = YES;
// _beautifulImageView.image = [UIImage getLanguageImage:@"user_info_id_beatiful_mark"];
UITapGestureRecognizer *longPress = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(copyNameAction)];
[_beautifulImageView addGestureRecognizer:longPress];
}
return _beautifulImageView;
}
@@ -900,6 +902,8 @@ return view;\
_idLabel.textColor = UIColorFromRGB(0x191919);
_idLabel.userInteractionEnabled = YES;
_idLabel.clipsToBounds = NO;
UITapGestureRecognizer *longPress = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(copyNameAction)];
[_idLabel addGestureRecognizer:longPress];
}
return _idLabel;
}
@@ -909,6 +913,8 @@ return view;\
_idIconImageView = [[UIImageView alloc] init];
_idIconImageView.userInteractionEnabled = YES;
_idIconImageView.image = [UIImage getLanguageImage:@"user_info_id_mark"];
UITapGestureRecognizer *longPress = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(copyNameAction)];
[_idIconImageView addGestureRecognizer:longPress];
}
return _idIconImageView;
}
@@ -918,6 +924,8 @@ return view;\
_copyIdImageView = [[UIImageView alloc] init];
_copyIdImageView.userInteractionEnabled = YES;
_copyIdImageView.image = [UIImage getLanguageImage:@"user_card_copy_id1"];
UITapGestureRecognizer *longPress = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(copyNameAction)];
[_copyIdImageView addGestureRecognizer:longPress];
}
return _copyIdImageView;
}

4
YuMi/Modules/YMRoom/View/AnimationView/XPRoomAnimationView.m
View File

@@ -1212,17 +1212,17 @@
#pragma mark - VIP升级
- (void)receiveNobleLevelUp:(AttachmentModel *)attachment {
@kWeakify(self);
[[NetImageView new]loadImageWithUrl:attachment.data[@"avatar"] completion:^(UIImage * _Nonnull image, NSURL * _Nonnull url) {
@kStrongify(self);
PIBaseAnimationViewModel *nobleModel = [PIBaseAnimationViewModel new];
nobleModel.data = attachment.data;
nobleModel.type = GiftBannerType_Nobleman;
if (self.animationListB.count == 0 && self.isPlayOfB == NO) {
[self createNobleLevelUpBannerAnimation:nobleModel];
}
[self.animationListB addObject:nobleModel];
}];
}
- (void)createNobleLevelUpBannerAnimation:(PIBaseAnimationViewModel *)model {

6
YuMi/Modules/YMRoom/View/SendGiftView/Presenter/XPGiftPresenter.m
View File

@@ -57,9 +57,12 @@
if (arrary.count > 0) {
[[self getView] getNormalGiftListSuccess:arrary];
}
@kWeakify(self);
[Api requestNormalGiftList:[self createHttpCompletion:^(BaseModel * _Nonnull data) {
@kStrongify(self);
[[self getView] getNormalGiftListSuccess:[[XPGiftStorage shareStorage] cacheWith:data.data inRoom:roomUid]];
}fail:^(NSInteger code, NSString * _Nullable msg) {
@kStrongify(self);
[[self getView] getNormalGiftListFail:msg];
}] roomUid:roomUid];
}
@@ -69,10 +72,13 @@
- (void)getPackGiftList {
NSString * uid = [AccountInfoStorage instance].getUid;
NSString * ticket = [AccountInfoStorage instance].getTicket;
@kWeakify(self);
[Api requestPackGiftList:[self createHttpCompletion:^(BaseModel * _Nonnull data) {
@kStrongify(self);
NSArray * info = [GiftInfoModel modelsWithArray:data.data];
[[self getView] getPacketGiftListSuccess:info];
}fail:^(NSInteger code, NSString * _Nullable msg) {
@kStrongify(self);
[[self getView] getPacketGiftListFail:msg];
}] uid:uid ticket:ticket];
}

2
YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftItemCollectionViewCell.m
View File

@@ -160,7 +160,9 @@
_giftInfo = giftInfo;
if (_giftInfo) {
self.giftImageView.image = nil;
@kWeakify(self);
[self.giftImageView loadImageWithUrl:_giftInfo.giftUrl completion:^(UIImage * _Nonnull image, NSURL * _Nonnull url) {
@kStrongify(self);
self.giftImageView.image = image;
}];
self.giftNameLabel.text = _giftInfo.giftName.length > 0 ? _giftInfo.giftName : @"";

7
YuMi/Modules/YMRoom/View/SendGiftView/View/PIGiftInfoSegmentedView.m
View File

@@ -241,18 +241,17 @@
}else if(obj.giftType == GiftType_Anchor){
[anchorArray addObject:obj];
}
}];
if (self.usingplaceType == SendGiftType_User) {
_giftList = [[NSMutableArray alloc]initWithArray:@[normaleArray,weekStarArray,nobleArray]];
}else{
_giftList = [[NSMutableArray alloc]initWithArray:@[normaleArray,luckyArray,weekStarArray,nobleArray,anchorArray]];
}
@kWeakify(self);
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
@kStrongify(self);
[self.pi_containerView reloadData];
});
});
}
-(void)setPackOriginArray:(NSArray *)packOriginArray{

1
YuMi/Modules/YMTabbar/View/PIFullScreenBannerAnimation.m
View File

@@ -685,7 +685,6 @@
}
[self.animationListB addObject:nobleModel];
}];
}
- (void)createNobleLevelUpBannerAnimation:(PIBaseAnimationViewModel *)model {