修正审核问题,适配后端修改
This commit is contained in:
@@ -13569,7 +13569,7 @@
|
||||
"$(inherited)",
|
||||
"@executable_path/Frameworks",
|
||||
);
|
||||
MARKETING_VERSION = 20.20.56;
|
||||
MARKETING_VERSION = 20.20.59;
|
||||
OTHER_LDFLAGS = (
|
||||
"$(inherited)",
|
||||
"-ObjC",
|
||||
@@ -13902,7 +13902,7 @@
|
||||
"$(inherited)",
|
||||
"@executable_path/Frameworks",
|
||||
);
|
||||
MARKETING_VERSION = 20.20.56;
|
||||
MARKETING_VERSION = 20.20.59;
|
||||
OTHER_LDFLAGS = (
|
||||
"$(inherited)",
|
||||
"-ObjC",
|
||||
|
@@ -58,6 +58,7 @@ typedef NS_ENUM(NSUInteger, URLType) {
|
||||
kAccountlogoutAgrURL,
|
||||
///账号注销
|
||||
kAccountlogoutURL,
|
||||
kAccountlogoutConfirmURL,
|
||||
///主播粉丝团-铭牌申请
|
||||
kAnchorFansOpenURL,
|
||||
///主播粉丝团-粉丝列表
|
||||
|
@@ -27,7 +27,8 @@ NSString * const URLWithType(URLType type) {
|
||||
@(KBoomRule) : @"modules/rule/boom.html?partitionId=",///收益记录,
|
||||
@(KRoomLevelRule) : @"modules/roomLevel/index.html",///房间等级,
|
||||
@(KLuckyPackageRule) : @"modules/luckyBagRules/index.html",///红包礼物,
|
||||
@(kCaptchaSwitchPath) : @"modules/humanMachineVerification/index.html"
|
||||
@(kCaptchaSwitchPath) : @"modules/humanMachineVerification/index.html",
|
||||
@(kAccountlogoutConfirmURL) : @"modules/logout/confirm.html"
|
||||
};
|
||||
NSString * newUrl = [newDic objectForKey:@(type)];
|
||||
if(newUrl != nil){
|
||||
|
@@ -46,7 +46,7 @@ isPhoneXSeries = [[UIApplication sharedApplication] delegate].window.safeAreaIns
|
||||
#define kFontHeavy(font) [UIFont systemFontOfSize:kGetScaleWidth(font) weight:UIFontWeightHeavy]
|
||||
|
||||
///内置版本号
|
||||
#define PI_App_Version @"1.0.26"
|
||||
#define PI_App_Version @"1.0.27"
|
||||
///渠道
|
||||
#define PI_App_Source @"appstore"
|
||||
#define PI_Test_Flight @"TestFlight"
|
||||
|
@@ -274,32 +274,59 @@ static NSString *const kAreaCodePrefix = @"+";
|
||||
}
|
||||
|
||||
#pragma mark - UITextFieldDelegate
|
||||
- (BOOL)textField:(UITextField *)textField shouldChangeCharactersInRange:(NSRange)range replacementString:(NSString *)string {
|
||||
NSString *updatedText = [textField.text stringByReplacingCharactersInRange:range withString:string];
|
||||
- (void)textFieldDidChange:(UITextField *)textField {
|
||||
// NSLog(@"%@", textField.text);
|
||||
switch (self.inputType) {
|
||||
case LoginInputType_id:
|
||||
case LoginInputType_email:
|
||||
case LoginInputType_phoneNum:
|
||||
if (_handleFirstInputContentUpdate) {
|
||||
self.handleFirstInputContentUpdate(updatedText);
|
||||
if (self.handleFirstInputContentUpdate) {
|
||||
self.handleFirstInputContentUpdate(textField.text);
|
||||
}
|
||||
break;
|
||||
case LoginInputType_password:
|
||||
case LoginInputType_verificationCode:
|
||||
if (_handleSecondInputContentUpdate) {
|
||||
self.handleSecondInputContentUpdate(updatedText);
|
||||
if (self.handleSecondInputContentUpdate) {
|
||||
self.handleSecondInputContentUpdate(textField.text);
|
||||
}
|
||||
break;
|
||||
case LoginInputType_confirmPassword:
|
||||
if (_handleThirdInputContentUpdate) {
|
||||
self.handleThirdInputContentUpdate(updatedText);
|
||||
if (self.handleThirdInputContentUpdate) {
|
||||
self.handleThirdInputContentUpdate(textField.text);
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
return YES;
|
||||
}
|
||||
//- (BOOL)textField:(UITextField *)textField shouldChangeCharactersInRange:(NSRange)range replacementString:(NSString *)string {
|
||||
// dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.25 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
|
||||
// NSString *updatedText = [textField.text stringByReplacingCharactersInRange:range withString:string];
|
||||
// switch (self.inputType) {
|
||||
// case LoginInputType_id:
|
||||
// case LoginInputType_email:
|
||||
// case LoginInputType_phoneNum:
|
||||
// if (self.handleFirstInputContentUpdate) {
|
||||
// self.handleFirstInputContentUpdate(updatedText);
|
||||
// }
|
||||
// break;
|
||||
// case LoginInputType_password:
|
||||
// case LoginInputType_verificationCode:
|
||||
// if (self.handleSecondInputContentUpdate) {
|
||||
// self.handleSecondInputContentUpdate(updatedText);
|
||||
// }
|
||||
// break;
|
||||
// case LoginInputType_confirmPassword:
|
||||
// if (self.handleThirdInputContentUpdate) {
|
||||
// self.handleThirdInputContentUpdate(updatedText);
|
||||
// }
|
||||
// break;
|
||||
// default:
|
||||
// break;
|
||||
// }
|
||||
// });
|
||||
// return YES;
|
||||
//}
|
||||
|
||||
#pragma mark -
|
||||
- (UITextField *)inputTextField {
|
||||
@@ -307,7 +334,8 @@ static NSString *const kAreaCodePrefix = @"+";
|
||||
_inputTextField = [[UITextField alloc] init];
|
||||
_inputTextField.font = kFontMedium(14);
|
||||
_inputTextField.textColor = UIColorFromRGB(0x313131);
|
||||
_inputTextField.delegate = self;
|
||||
// _inputTextField.delegate = self;
|
||||
[_inputTextField addTarget:self action:@selector(textFieldDidChange:) forControlEvents:UIControlEventEditingChanged];
|
||||
}
|
||||
return _inputTextField;
|
||||
}
|
||||
|
@@ -176,7 +176,6 @@
|
||||
/// @param deviceInfo uuid
|
||||
/// @param clientIp ip地址
|
||||
+ (void)requestIAPRecharge:(HttpRequestHelperCompletion)completion chargeProdId:(NSString *)chargeProdId uid:(NSString *)uid ticket:(NSString *)ticket deviceInfo:(NSString *)deviceInfo clientIp:(NSString *)clientIp {
|
||||
|
||||
[self makeRequest:@"storeKitV2/placeOrder" method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__,chargeProdId, uid, ticket, deviceInfo, clientIp, nil];
|
||||
}
|
||||
|
||||
|
@@ -132,10 +132,15 @@
|
||||
vipItem.subTitle = @"";
|
||||
vipItem.type = XPMineSettingItemType_VIP;
|
||||
|
||||
XPMineSettingItemModel * deleteItem = [[XPMineSettingItemModel alloc] init];
|
||||
deleteItem.title = YMLocalizedString(@"XPMineSettingPresent25");
|
||||
deleteItem.subTitle = @"";
|
||||
deleteItem.type = XPMineSettingItemType_Delete_Account;
|
||||
|
||||
NSArray * oneSection = @[emailItem, phoneItem, loginItem, payItem];
|
||||
NSArray * twoSection = @[vipItem, notificaItem, languageItem];
|
||||
NSArray * threeSection = @[shieldItem, blackListItem];
|
||||
NSArray * fourthSection = @[privacyItem, helperItem, clearMemoryItem, updateItem, aboutusItem];
|
||||
NSArray * fourthSection = @[privacyItem, helperItem, clearMemoryItem, updateItem, deleteItem, aboutusItem];
|
||||
|
||||
self.datasouce = @[oneSection, twoSection, threeSection, fourthSection];
|
||||
}
|
||||
|
@@ -266,7 +266,7 @@
|
||||
}
|
||||
break;
|
||||
case XPMineSettingItemType_Delete_Account: {
|
||||
[self pushWebViewWIthUrl:URLWithType(kAccountlogoutURL)];
|
||||
[self pushWebViewWIthUrl:URLWithType(kAccountlogoutConfirmURL)];
|
||||
}
|
||||
break;
|
||||
case XPMineSettingItemType_Shield_management:
|
||||
|
@@ -252,7 +252,6 @@ exitCurrentRoom:(void(^)(void))exit {
|
||||
} else {
|
||||
make.width.height.mas_equalTo(29);
|
||||
}
|
||||
|
||||
}];
|
||||
|
||||
UILabel *titleLabel_1 = [UILabel labelInitWithText:YMLocalizedString(@"Combo_0") font:kFontSemibold(14) textColor:[UIColor whiteColor]];
|
||||
@@ -271,7 +270,7 @@ exitCurrentRoom:(void(^)(void))exit {
|
||||
UILabel *titleLabel_2 = [UILabel labelInitWithText:YMLocalizedString(@"Combo_4") font:kFontSemibold(14) textColor:[UIColor whiteColor]];
|
||||
[self addSubview:titleLabel_2];
|
||||
[titleLabel_2 mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||
make.bottom.mas_equalTo(self.avatarImageView.mas_bottom).offset(3);
|
||||
make.bottom.mas_equalTo(self.avatarImageView.mas_bottom);
|
||||
make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(5);
|
||||
}];
|
||||
|
||||
|
@@ -682,8 +682,10 @@ XPRoomGraffitiGiftAnimationViewDelegate
|
||||
if (flagModel.roomId != roomInfo.roomId || flagModel.uid != [AccountInfoStorage instance].getUid.integerValue) {
|
||||
return;
|
||||
}
|
||||
// 数据同步到 combo
|
||||
[[NSNotificationCenter defaultCenter] postNotificationName:@"receiveLuckGiftWinning" object:[NSString stringByRemovingRedundantZeros:@(flagModel.receiverProfit).stringValue]];
|
||||
if ([flagModel.receiverUidList containsObject:@([AccountInfoStorage instance].getUid.integerValue)]) {
|
||||
// 数据同步到 combo
|
||||
[[NSNotificationCenter defaultCenter] postNotificationName:@"receiveLuckGiftWinning" object:[NSString stringByRemovingRedundantZeros:@(flagModel.receiverProfit).stringValue]];
|
||||
}
|
||||
|
||||
if (!self.hostDelegate.getRoomInfo.hasAnimationEffect) {
|
||||
return;
|
||||
@@ -696,7 +698,7 @@ XPRoomGraffitiGiftAnimationViewDelegate
|
||||
[self loadBroveSVGAVideoItem:level.integerValue];
|
||||
}
|
||||
if (coins) {
|
||||
// [[NSNotificationCenter defaultCenter] postNotificationName:@"receiveLuckGiftWinning" object:[NSString stringByRemovingRedundantZeros:coins.stringValue]];
|
||||
[[NSNotificationCenter defaultCenter] postNotificationName:@"receiveLuckGiftWinning" object:[NSString stringByRemovingRedundantZeros:coins.stringValue]];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@@ -729,6 +729,7 @@ NSString * const kRoomShowTopicKey = @"kRoomShowTopicKey";
|
||||
@(CustomMessageType_Super_Gift):
|
||||
[NSSet setWithObjects:
|
||||
@(Custom_Message_Sub_Super_Gift),
|
||||
@(Custom_Message_Sub_Super_Gift_Room_Message),
|
||||
nil],
|
||||
};
|
||||
}
|
||||
|
@@ -470,24 +470,7 @@
|
||||
self.actionCallback(ComboAction_Error);
|
||||
}
|
||||
[self forceRemove];
|
||||
|
||||
NSMutableDictionary *logDic = [dic mutableCopy];
|
||||
[logDic setObject:@(self.combo) forKey:@"combo_count"];
|
||||
[logDic setObject:[NSThread callStackSymbols] forKey:@"call stack symbols"];
|
||||
BLYLog(BuglyLogLevelWarn, @"%@", [logDic toJSONString]);
|
||||
[Bugly reportError:[NSError errorWithDomain:[NSString stringWithFormat:@"combo 发送礼物异常-%@",
|
||||
@(code)]
|
||||
code:[AccountInfoStorage instance].getUid.integerValue
|
||||
userInfo:logDic]];
|
||||
}
|
||||
// TODO: 聚合到 skill card manager
|
||||
// [Bugly reportExceptionWithCategory:263059
|
||||
// name:[NSString stringWithFormat:@"combo 发送礼物异常-%@",
|
||||
// @(code)]
|
||||
// reason:msg
|
||||
// callStack:[NSThread callStackSymbols]
|
||||
// extraInfo:logDic
|
||||
// terminateApp:NO];
|
||||
}
|
||||
targetUids:allUIDs
|
||||
giftNum:self.giftNumPerTimes
|
||||
|
@@ -125,30 +125,6 @@
|
||||
}fail:^(NSInteger code, NSString * _Nullable msg) {
|
||||
@kStrongify(self);
|
||||
[[self getView] sendGiftFailWithCode:code msg:msg];
|
||||
|
||||
NSMutableDictionary *logDic = [@{
|
||||
@"targetUids":targetUids,
|
||||
@"giftNum":giftNum,
|
||||
@"sendType":@(sendType),
|
||||
@"giftSource":@(giftSource),
|
||||
@"giftId":giftId,
|
||||
@"roomSendType":@(roomSendType),
|
||||
@"roomUid":roomUid,
|
||||
@"msg":msg,
|
||||
@"call stack symbols":[NSThread callStackSymbols]
|
||||
} mutableCopy];
|
||||
BLYLog(BuglyLogLevelWarn, @"%@", [logDic toJSONString]);
|
||||
[Bugly reportError:[NSError errorWithDomain:[NSString stringWithFormat:@"面版 发送礼物异常-%@",
|
||||
@(code)]
|
||||
code:[AccountInfoStorage instance].getUid.integerValue
|
||||
userInfo:logDic]];
|
||||
// [Bugly reportExceptionWithCategory:263059
|
||||
// name:[NSString stringWithFormat:@"combo 发送礼物异常-%@",
|
||||
// @(code)]
|
||||
// reason:msg
|
||||
// callStack:[NSThread callStackSymbols]
|
||||
// extraInfo:logDic
|
||||
// terminateApp:NO];
|
||||
}] targetUids:targetUids giftNum:giftNum sendType:giftSendTypeStr giftId:giftId giftSource:giftSourceStr giftType:giftTypeStr roomUid:roomUid msg:msg uid:uid];
|
||||
}
|
||||
|
||||
|
@@ -13,7 +13,7 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
@interface GiftComboView : UIView
|
||||
- (void)setupCurrentGold:(double)gold;
|
||||
- (void)updateCurrentGold:(double)gold giftPrice:(double)price isFromWinning:(BOOL)isFromWinning isBravo:(BOOL)isBrove;
|
||||
- (void)updateCurrentGold:(double)gold giftPrice:(double)price isFromWinning:(BOOL)isFromWinning isUpdateTotal:(BOOL)isBrove;
|
||||
- (void)updateCount;
|
||||
- (void)stopTimer;
|
||||
- (void)endCombo;
|
||||
|
@@ -108,7 +108,7 @@
|
||||
|
||||
- (void)handleStringNotification:(NSString *)coin {
|
||||
if (![NSString isEmpty:coin]) {
|
||||
[self updateCurrentGold:coin.doubleValue giftPrice:0 isFromWinning:YES isBravo:YES];
|
||||
[self updateCurrentGold:coin.doubleValue giftPrice:0 isFromWinning:YES isUpdateTotal:NO];
|
||||
}
|
||||
}
|
||||
|
||||
@@ -116,7 +116,7 @@
|
||||
double coin = [[dic objectForKey:@"CurrentGold"] doubleValue];
|
||||
double price = [[dic objectForKey:@"Price"] doubleValue];
|
||||
BOOL isFromWinning = [[dic objectForKey:@"isFromWinning"] boolValue];
|
||||
[self updateCurrentGold:coin giftPrice:price isFromWinning:isFromWinning isBravo:YES];
|
||||
[self updateCurrentGold:coin giftPrice:price isFromWinning:isFromWinning isUpdateTotal:YES];
|
||||
}
|
||||
|
||||
- (void)updateCount {
|
||||
@@ -247,7 +247,6 @@
|
||||
|
||||
#pragma mark -
|
||||
- (void)setupCurrentGold:(double)gold {
|
||||
|
||||
self.comboGoldNum = gold;
|
||||
self.comboGoldLabel.text = @(gold).stringValue;
|
||||
}
|
||||
@@ -275,13 +274,11 @@
|
||||
}
|
||||
}
|
||||
|
||||
- (void)updateCurrentGold:(double)gold giftPrice:(double)price isFromWinning:(BOOL)isFromWinning isBravo:(BOOL)isBrove {
|
||||
- (void)updateCurrentGold:(double)gold giftPrice:(double)price isFromWinning:(BOOL)isFromWinning isUpdateTotal:(BOOL)isUpdateTotal {
|
||||
NSString *goldString = isFromWinning ? [NSString stringWithFormat:@"+ %@", @(gold)] : @(-price).stringValue;
|
||||
if (isFromWinning) {
|
||||
// if (!isBrove) {
|
||||
double updateGold = self.comboGoldNum + gold;
|
||||
[self setupCurrentGold:updateGold];
|
||||
// }
|
||||
double updateGold = isUpdateTotal ? self.comboGoldNum + gold : self.comboGoldNum;
|
||||
[self setupCurrentGold:updateGold];
|
||||
} else {
|
||||
// double updateGold = self.comboGoldNum + gold;
|
||||
[self setupCurrentGold:gold];
|
||||
|
@@ -71,7 +71,7 @@ UIKIT_EXTERN NSString * kShowFirstRechargeView;
|
||||
|
||||
@property (nonatomic, strong) PIGiftBravoGiftBroadcastView *bravoGiftView;
|
||||
///超级礼物
|
||||
@property(nonatomic,strong) PIGiftSuperGiftBroadcastView *superGiftView;
|
||||
//@property(nonatomic,strong) PIGiftSuperGiftBroadcastView *superGiftView;
|
||||
///礼物类型(普通/互动)
|
||||
@property (nonatomic, strong) XPGiftHeadTypeView *headTypeView;
|
||||
///送礼物的人
|
||||
@@ -157,15 +157,18 @@ UIKIT_EXTERN NSString * kShowFirstRechargeView;
|
||||
switch (type) {
|
||||
case ComboAction_ShowPanel: {
|
||||
self.contentView.hidden = YES;
|
||||
if (self->_superGiftView) {
|
||||
self.superGiftView.hidden = YES;
|
||||
}
|
||||
// if (self->_superGiftView) {
|
||||
// self.superGiftView.hidden = YES;
|
||||
// }
|
||||
if (self->_constellationBanner) {
|
||||
self.constellationBanner.hidden = YES;
|
||||
}
|
||||
if (self->_luckyBroadcastView) {
|
||||
self.luckyBroadcastView.hidden = YES;
|
||||
}
|
||||
if (self->_bravoGiftView) {
|
||||
self.bravoGiftView.hidden = YES;
|
||||
}
|
||||
[self.view addSubview:self.comboView];
|
||||
[self.comboView mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||
make.edges.mas_equalTo(self.view);
|
||||
@@ -174,16 +177,18 @@ UIKIT_EXTERN NSString * kShowFirstRechargeView;
|
||||
break;
|
||||
case ComboAction_RemovePanel:{
|
||||
self.contentView.hidden = NO;
|
||||
if (self->_superGiftView) {
|
||||
self.superGiftView.hidden = NO;
|
||||
}
|
||||
// if (self->_superGiftView) {
|
||||
// self.superGiftView.hidden = NO;
|
||||
// }
|
||||
if (self->_constellationBanner) {
|
||||
self.constellationBanner.hidden = NO;
|
||||
}
|
||||
if (self->_luckyBroadcastView) {
|
||||
self.luckyBroadcastView.hidden = NO;
|
||||
}
|
||||
|
||||
if (self->_bravoGiftView) {
|
||||
self.bravoGiftView.hidden = NO;
|
||||
}
|
||||
[self.presenter getUserWalletInfo];
|
||||
|
||||
[self.comboView stopTimer];
|
||||
@@ -474,9 +479,9 @@ UIKIT_EXTERN NSString * kShowFirstRechargeView;
|
||||
//构造会话
|
||||
NIMSession *session = [NIMSession session:sessionID type:sessionType];
|
||||
[[NIMSDK sharedSDK].chatManager sendMessage:message toSession:session completion:^(NSError * _Nullable error) {
|
||||
// if (error) {
|
||||
// NSLog(@"%@",error);
|
||||
// }
|
||||
if (error) {
|
||||
NSLog(@"%@",error);
|
||||
}
|
||||
}];
|
||||
}
|
||||
|
||||
@@ -748,7 +753,7 @@ UIKIT_EXTERN NSString * kShowFirstRechargeView;
|
||||
///点击了礼物
|
||||
- (void)xPGiftHeadTypeViewDidClickGift:(XPGiftHeadTypeView *)view {
|
||||
[self.luckyBroadcastView removeFromSuperview];
|
||||
[self.superGiftView removeFromSuperview];
|
||||
// [self.superGiftView removeFromSuperview];
|
||||
[self.bravoGiftView removeFromSuperview];
|
||||
// [self.giftInfoView giftHeadTypeHadChange:1];
|
||||
if (!self.graffitiView.hidden) {//清空涂鸦礼物
|
||||
@@ -763,7 +768,7 @@ UIKIT_EXTERN NSString * kShowFirstRechargeView;
|
||||
///点击了互动
|
||||
- (void)xPGiftHeadTypeViewDidClickInteraction:(XPGiftHeadTypeView *)view {
|
||||
[self.luckyBroadcastView removeFromSuperview];
|
||||
[self.superGiftView removeFromSuperview];
|
||||
// [self.superGiftView removeFromSuperview];
|
||||
[self.bravoGiftView removeFromSuperview];
|
||||
// [self.giftInfoView giftHeadTypeHadChange:2];
|
||||
}
|
||||
@@ -775,7 +780,7 @@ UIKIT_EXTERN NSString * kShowFirstRechargeView;
|
||||
self.giftBarView.userInfo = [self.delegate getUserInfo];
|
||||
self.giftBarView.type = type;
|
||||
self.giftBarView.drawGiftCount = 10;
|
||||
[self.superGiftView removeFromSuperview];
|
||||
// [self.superGiftView removeFromSuperview];
|
||||
[self.luckyBroadcastView removeFromSuperview];
|
||||
[self.bravoGiftView removeFromSuperview];
|
||||
[self.constellationBanner removeFromSuperview];
|
||||
@@ -804,15 +809,15 @@ UIKIT_EXTERN NSString * kShowFirstRechargeView;
|
||||
}
|
||||
break;
|
||||
case GiftSegmentType_SuperLucky: {
|
||||
if (!self.superGiftView.superview) {
|
||||
self.superGiftView.giftModel = self.giftInfoView.lastSelectGift;
|
||||
[self.view addSubview:self.superGiftView];
|
||||
[self.superGiftView mas_remakeConstraints:^(MASConstraintMaker *make) {
|
||||
make.bottom.mas_equalTo(self.contentView.mas_top);
|
||||
make.leading.trailing.mas_equalTo(0);
|
||||
make.height.mas_equalTo(kGetScaleWidth(90));
|
||||
}];
|
||||
}
|
||||
// if (!self.superGiftView.superview) {
|
||||
// self.superGiftView.giftModel = self.giftInfoView.lastSelectGift;
|
||||
// [self.view addSubview:self.superGiftView];
|
||||
// [self.superGiftView mas_remakeConstraints:^(MASConstraintMaker *make) {
|
||||
// make.bottom.mas_equalTo(self.contentView.mas_top);
|
||||
// make.leading.trailing.mas_equalTo(0);
|
||||
// make.height.mas_equalTo(kGetScaleWidth(90));
|
||||
// }];
|
||||
// }
|
||||
}
|
||||
break;
|
||||
case GiftSegmentType_WeekStar: {
|
||||
@@ -846,7 +851,7 @@ UIKIT_EXTERN NSString * kShowFirstRechargeView;
|
||||
switch (type) {
|
||||
case GiftSegmentType_Bravo:
|
||||
[self.constellationBanner removeFromSuperview];
|
||||
[self.superGiftView removeFromSuperview];
|
||||
// [self.superGiftView removeFromSuperview];
|
||||
[self.luckyBroadcastView removeFromSuperview];
|
||||
if (!self.bravoGiftView.superview) {
|
||||
[self.view addSubview:self.bravoGiftView];
|
||||
@@ -860,7 +865,7 @@ UIKIT_EXTERN NSString * kShowFirstRechargeView;
|
||||
case GiftSegmentType_Lucky:{
|
||||
[self.bravoGiftView removeFromSuperview];
|
||||
[self.constellationBanner removeFromSuperview];
|
||||
[self.superGiftView removeFromSuperview];
|
||||
// [self.superGiftView removeFromSuperview];
|
||||
if (!self.luckyBroadcastView.superview) {
|
||||
[self.view addSubview:self.luckyBroadcastView];
|
||||
[self.luckyBroadcastView mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||
@@ -875,15 +880,15 @@ UIKIT_EXTERN NSString * kShowFirstRechargeView;
|
||||
[self.bravoGiftView removeFromSuperview];
|
||||
[self.constellationBanner removeFromSuperview];
|
||||
[self.luckyBroadcastView removeFromSuperview];
|
||||
self.superGiftView.giftModel = info;
|
||||
if (!self.superGiftView.superview) {
|
||||
[self.view addSubview:self.superGiftView];
|
||||
[self.superGiftView mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||
make.bottom.mas_equalTo(self.contentView.mas_top);
|
||||
make.leading.trailing.mas_equalTo(0);
|
||||
make.height.mas_equalTo(kGetScaleWidth(90));
|
||||
}];
|
||||
}
|
||||
// self.superGiftView.giftModel = info;
|
||||
// if (!self.superGiftView.superview) {
|
||||
// [self.view addSubview:self.superGiftView];
|
||||
// [self.superGiftView mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||
// make.bottom.mas_equalTo(self.contentView.mas_top);
|
||||
// make.leading.trailing.mas_equalTo(0);
|
||||
// make.height.mas_equalTo(kGetScaleWidth(90));
|
||||
// }];
|
||||
// }
|
||||
}
|
||||
break;
|
||||
case GiftSegmentType_Graffiti: {
|
||||
@@ -1236,13 +1241,13 @@ UIKIT_EXTERN NSString * kShowFirstRechargeView;
|
||||
}
|
||||
return _effectView;
|
||||
}
|
||||
- (PIGiftSuperGiftBroadcastView *)superGiftView{
|
||||
if(!_superGiftView){
|
||||
_superGiftView = [[PIGiftSuperGiftBroadcastView alloc]initWithFrame:CGRectZero];
|
||||
_superGiftView.delegate = self;
|
||||
}
|
||||
return _superGiftView;
|
||||
}
|
||||
//- (PIGiftSuperGiftBroadcastView *)superGiftView{
|
||||
// if(!_superGiftView){
|
||||
// _superGiftView = [[PIGiftSuperGiftBroadcastView alloc]initWithFrame:CGRectZero];
|
||||
// _superGiftView.delegate = self;
|
||||
// }
|
||||
// return _superGiftView;
|
||||
//}
|
||||
|
||||
- (PIGiftBravoGiftBroadcastView *)bravoGiftView {
|
||||
if (!_bravoGiftView) {
|
||||
|
@@ -13,6 +13,7 @@
|
||||
#import "YUMIMacroUitls.h"
|
||||
#import "MSParamsDecode.h"
|
||||
#import "NSData+GZIP.h"
|
||||
#import <Bugly/Bugly.h>
|
||||
|
||||
@implementation HttpRequestHelper
|
||||
|
||||
@@ -23,7 +24,7 @@
|
||||
dispatch_once(&onceToken, ^{
|
||||
NSURLSessionConfiguration *configuration = [NSURLSessionConfiguration defaultSessionConfiguration];
|
||||
configuration.HTTPShouldUsePipelining = YES; // 启用 HTTP/2 pipelining
|
||||
configuration.HTTPMaximumConnectionsPerHost = 5; // 提升并发
|
||||
configuration.HTTPMaximumConnectionsPerHost = 15; // 提升并发
|
||||
|
||||
manager = [[AFHTTPSessionManager alloc] initWithBaseURL:[NSURL URLWithString:[HttpRequestHelper getHostUrl]]
|
||||
sessionConfiguration:configuration];
|
||||
@@ -364,6 +365,20 @@ constructingBodyWithBlock:^(id<AFMultipartFormData> _Nonnull formData) {
|
||||
if (completion) {
|
||||
completion(nil, resCode, message);
|
||||
}
|
||||
if (resCode>499 && resCode <600) {
|
||||
dispatch_async(dispatch_get_global_queue(0, 0), ^{
|
||||
NSMutableDictionary *logDic = [params mutableCopy];
|
||||
[logDic setObject:[NSThread callStackSymbols] forKey:@"call stack symbols"];
|
||||
[logDic setObject:message forKey:@"error message"];
|
||||
[logDic setObject:@(method) forKey:@"http method"];
|
||||
BLYLog(BuglyLogLevelWarn, @"%@", [logDic toJSONString]);
|
||||
[Bugly reportError:[NSError errorWithDomain:[NSString stringWithFormat:@"UID: %@,API: %@ 异常",
|
||||
[AccountInfoStorage instance].getUid,
|
||||
path]
|
||||
code:resCode
|
||||
userInfo:logDic]];
|
||||
});
|
||||
}
|
||||
}];
|
||||
}
|
||||
|
||||
|
@@ -127,7 +127,7 @@
|
||||
"LoginBindPhoneViewController2" = "ربط رقم الجوال";
|
||||
|
||||
"MvpViewController0" = "وقت تسجيل الخروج: %@";
|
||||
"MvpViewController1" = "%@\n\nيرجى الاتصال بخدمة العملاء (WeChat: kefu01) للاستفسارات.";
|
||||
"MvpViewController1" = "%@\n\nيرجى الاتصال بخدمة العملاء (WeChat: mxyz2050) للاستفسارات.";
|
||||
"MvpViewController2" = "تم تسجيل الخروج من هذا الحساب";
|
||||
"MvpViewController3" = "من أجل خلق بيئة عمل
|
||||
|
||||
@@ -835,7 +835,7 @@
|
||||
"XPMineSettingPresent21" = "ربط رقم الهاتف";
|
||||
"XPMineSettingPresent23" = "تعيين كلمة المرور";
|
||||
"XPMineSettingPresent24" = "مسح ذاكرة التخزين المؤقت";
|
||||
"XPMineSettingPresent25" = "تسجيل الخروج";
|
||||
"XPMineSettingPresent25" = "تسجيل الخروج من الحساب";
|
||||
"XPMineSettingPresent26" = "تعديل";
|
||||
"XPMineSettingPresent27" = "إدارة الحظر";
|
||||
|
||||
@@ -2942,7 +2942,7 @@ ineHeadView12" = "الحمل";
|
||||
"LoginBindPhoneViewController2" = "ربط رقم الهاتف المحمول";
|
||||
|
||||
"MvpViewController0" = "وقت الإلغاء: %@";
|
||||
"MvpViewController1" = "%@\n\nيرجى الاتصال بخدمة العملاء (WeChat: kefu01) للحصول على استفسارات";
|
||||
"MvpViewController1" = "%@\n\nيرجى الاتصال بخدمة العملاء (WeChat: mxyz2050) للحصول على استفسارات";
|
||||
"MvpViewController2" = "تم إلغاء تسجيل الحساب";
|
||||
"MvpViewController3" = "من أجل خلق بيئة إنترنت آمنة أكثر\nحماية ممتلكاتك وممتلكات الآخرين\nيرجى تقديم التحقق الهوية أولا";
|
||||
|
||||
|
@@ -544,7 +544,7 @@
|
||||
"XPMineSettingPresent21" = "Bind Phone Number";
|
||||
"XPMineSettingPresent23" = "Set Password";
|
||||
"XPMineSettingPresent24" = "Clear Cache";
|
||||
"XPMineSettingPresent25" = "Logout";
|
||||
"XPMineSettingPresent25" = "Cancel Account";
|
||||
"XPMineSettingPresent26" = "Modify";
|
||||
"XPMineSettingPresent27" = "Block Management";
|
||||
"XPMineSettingPresent28" = "Language";
|
||||
@@ -2549,7 +2549,7 @@
|
||||
"LoginBindPhoneViewController2" = "Bind Mobile Number";
|
||||
|
||||
"MvpViewController0" = "Logoff time: %@";
|
||||
"MvpViewController1" = "%@\n\nPlease contact customer service (WeChat: kefu01) for inquiries.";
|
||||
"MvpViewController1" = "%@\n\nPlease contact customer service (WeChat: mxyz2050) for inquiries.";
|
||||
"MvpViewController2" = "This account has been logged off";
|
||||
"MvpViewController3" = "In order to create a safer online environment\nand protect the property safety of you and others,\nplease complete real-name authentication first";
|
||||
|
||||
@@ -3949,7 +3949,7 @@
|
||||
"20.20.56_text_13" = "The other invites you to change the relationship to %@";
|
||||
"20.20.56_text_14" = "Your relationship has been changed to %@";
|
||||
"20.20.56_text_15" = "Income Tips";
|
||||
"20.20.56_text_16" = "Receive Bravo, you will get 2% of the coin income./nThe coins will be directly distributed to your coin wallet./nNote: This income is not included in diamond turnover.";
|
||||
"20.20.56_text_16" = "Receive Bravo, you will get 2% of the coin income./nThe coins will be directly distributed to your coin wallet./nNote: This income is not included in diamond income.";
|
||||
"20.20.56_text_17" = "Income";
|
||||
"20.20.56_text_18" = "Accepted";
|
||||
"20.20.56_text_19" = "Rejected";
|
||||
|
@@ -2224,7 +2224,7 @@
|
||||
"LoginBindPhoneViewController2" = "Telefon numarasını bağla";
|
||||
|
||||
"MvpViewController0" = "Oturumu kapatma zamanı: %@";
|
||||
"MvpViewController1" = "%@\n\nMüşteri hizmetleriyle iletişime geçin (WeChat: kefu01) danışın";
|
||||
"MvpViewController1" = "%@\n\nMüşteri hizmetleriyle iletişime geçin (WeChat: mxyz2050) danışın";
|
||||
"MvpViewController2" = "Bu hesap kapatıldı";
|
||||
"MvpViewController3" = "Daha güvenli bir ağ ortamı oluşturmak ve sizin ve diğerlerinin mülk güvenliğini korumak için\nlütfen önce kimlik doğrulaması yapın";
|
||||
|
||||
|
@@ -2264,7 +2264,7 @@
|
||||
"LoginBindPhoneViewController2" = "綁定手機號";
|
||||
|
||||
"MvpViewController0" = "註銷時間: %@";
|
||||
"MvpViewController1" = "%@\n\n請聯繫客服(微信:kefu01)咨詢哦";
|
||||
"MvpViewController1" = "%@\n\n請聯繫客服(微信:mxyz2050)咨詢哦";
|
||||
"MvpViewController2" = "該賬號已註銷";
|
||||
"MvpViewController3" = "為了營造更安全的網絡環境\n保護您和他人的財產安全\n請先進行實名認證";
|
||||
|
||||
|
Reference in New Issue
Block a user