Compare commits

...

5 Commits

Author SHA1 Message Date
liyuhua
e4de2f78a1 修复福袋有时礼物值无法更新问题 2023-09-04 10:50:03 +08:00
liyuhua
f4f413c374 商店包版本修改 此commit置顶 10.13.1 2023-09-04 10:31:13 +08:00
liyuhua
367851d971 修复bug 2023-09-01 15:57:08 +08:00
liyuhua
7ebc65dfa0 公会长跳转收益到h5 2023-09-01 15:13:17 +08:00
liyuhua
9182cdedcf 修复测试环境无法连网问题bug 2023-09-01 14:58:15 +08:00
5 changed files with 19 additions and 13 deletions

View File

@@ -11190,7 +11190,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 10.13; MARKETING_VERSION = 10.13.1;
PRODUCT_BUNDLE_IDENTIFIER = com.peko.enterprise.ios; PRODUCT_BUNDLE_IDENTIFIER = com.peko.enterprise.ios;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = ""; PROVISIONING_PROFILE_SPECIFIER = "";
@@ -11223,7 +11223,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 10.13; MARKETING_VERSION = 10.13.1;
PRODUCT_BUNDLE_IDENTIFIER = com.peko.enterprise.ios; PRODUCT_BUNDLE_IDENTIFIER = com.peko.enterprise.ios;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = ""; PROVISIONING_PROFILE_SPECIFIER = "";

View File

@@ -5,6 +5,8 @@
// Created by YUMI on 2021/9/10. // Created by YUMI on 2021/9/10.
// //
///一些宏 ///一些宏
#import "NSBundle+Localizable.h"
#ifndef YUMIMacroUitls_h #ifndef YUMIMacroUitls_h
#define YUMIMacroUitls_h #define YUMIMacroUitls_h
@@ -49,7 +51,7 @@ isPhoneXSeries = [[UIApplication sharedApplication] delegate].window.safeAreaIns
#ifdef DEBUG #ifdef DEBUG
#define API_HOST_URL [NSString stringWithFormat:@"%@%@",@"https://beta.api",@".pekolive.com"] #define API_HOST_URL [NSString stringWithFormat:@"%@%@",@"http://beta.api",@".pekolive.com"]
#else #else
@@ -58,7 +60,7 @@ isPhoneXSeries = [[UIApplication sharedApplication] delegate].window.safeAreaIns
#endif #endif
#define API_Image_URL @"https://image.hfighting.com" #define API_Image_URL @"https://image.hfighting.com"
#import "NSBundle+Localizable.h"
#define YMLocalizedString(key) \ #define YMLocalizedString(key) \
[NSBundle ymLocalizedStringForKey:(key)] [NSBundle ymLocalizedStringForKey:(key)]
#endif /* YUMIMacroUitls_h */ #endif /* YUMIMacroUitls_h */

View File

@@ -137,16 +137,16 @@
default: default:
{ {
NSString * myUid = [AccountInfoStorage instance].getUid; // NSString * myUid = [AccountInfoStorage instance].getUid;
if(![self.clanInfo.clan.elderUid isEqualToString:myUid]){ // if(![self.clanInfo.clan.elderUid isEqualToString:myUid]){
XPWebViewController * webVC =[[XPWebViewController alloc] init]; XPWebViewController * webVC =[[XPWebViewController alloc] init];
webVC.url = URLWithType(kGoldEarningsRecord); webVC.url = URLWithType(kGoldEarningsRecord);
[self.navigationController pushViewController:webVC animated:YES]; [self.navigationController pushViewController:webVC animated:YES];
return; // return;
//
} // }
XPIncomeRecordGoldDetailsVC *goldDetailVC = [XPIncomeRecordGoldDetailsVC new]; // XPIncomeRecordGoldDetailsVC *goldDetailVC = [XPIncomeRecordGoldDetailsVC new];
[self.navigationController pushViewController:goldDetailVC animated:YES]; // [self.navigationController pushViewController:goldDetailVC animated:YES];
break; break;
} }
} }

View File

@@ -141,7 +141,7 @@
self.descLabel.text = [NSString stringWithFormat:YMLocalizedString(@"XPNobleCenterEntranceView0"), value]; self.descLabel.text = [NSString stringWithFormat:YMLocalizedString(@"XPNobleCenterEntranceView0"), value];
self.descLabel.textColor = UIColorFromRGB(0x5E4D98); self.descLabel.textColor = UIColorFromRGB(0x5E4D98);
self.nextLevelLabel.text = nextLevelName; self.nextLevelLabel.text = nextLevelName;
self.descLabel.hidden = nobleInfo.currLevel >= 9;
CGFloat margin = self.backProgressView.frame.size.width * (nobleInfo.currScore * 1.0 / (nextScore > 0 ? nextScore : 1)); CGFloat margin = self.backProgressView.frame.size.width * (nobleInfo.currScore * 1.0 / (nextScore > 0 ? nextScore : 1));
[self.currentProgressView mas_updateConstraints:^(MASConstraintMaker *make) { [self.currentProgressView mas_updateConstraints:^(MASConstraintMaker *make) {
make.trailing.mas_equalTo(self.backProgressView.mas_leading).mas_offset(margin); make.trailing.mas_equalTo(self.backProgressView.mas_leading).mas_offset(margin);

View File

@@ -647,7 +647,11 @@ UIKIT_EXTERN NSString * kShowFirstRechargeView;
} else { } else {
[self.presenter getUserWallInfo]; [self.presenter getUserWallInfo];
} }
[self sendCustomMessage:receiveInfo oringinDic:originDic]; dispatch_time_t delayTime = dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC));
dispatch_after(delayTime, dispatch_get_main_queue(), ^{
[self sendCustomMessage:receiveInfo oringinDic:originDic];
});
/// ///
[self sendGraffitiGiftMessage]; [self sendGraffitiGiftMessage];
if (self.segmentType == GiftSegmentType_Graffiti) { if (self.segmentType == GiftSegmentType_Graffiti) {