更新资源文件,替换部分图片文件名,调整图片内容,更新版本号至1.0.28。增加新的图片资源并删除不再使用的图片文件。
BIN
YuMi/Assets.xcassets/1.0.15/luck_gift_flag.imageset/1@3x (1).png
vendored
Normal file
After Width: | Height: | Size: 98 KiB |
Before Width: | Height: | Size: 87 KiB |
@@ -9,7 +9,7 @@
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"filename" : "1@3x.png",
|
||||
"filename" : "1@3x (1).png",
|
||||
"idiom" : "universal",
|
||||
"scale" : "3x"
|
||||
}
|
||||
|
Before Width: | Height: | Size: 170 KiB After Width: | Height: | Size: 199 KiB |
BIN
YuMi/Assets.xcassets/Language/ar/entrance_activities_ar.imageset/游戏@3x (1).png
vendored
Normal file
After Width: | Height: | Size: 202 KiB |
Before Width: | Height: | Size: 172 KiB |
@@ -9,7 +9,7 @@
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"filename" : "游戏@3x.png",
|
||||
"filename" : "游戏@3x (3).png",
|
||||
"idiom" : "universal",
|
||||
"scale" : "3x"
|
||||
}
|
||||
|
BIN
YuMi/Assets.xcassets/Language/en/entrance_activities_en.imageset/游戏@3x (3).png
vendored
Normal file
After Width: | Height: | Size: 200 KiB |
Before Width: | Height: | Size: 170 KiB |
BIN
YuMi/Assets.xcassets/Language/tr/entrance_activities_tr.imageset/游戏@3x (2).png
vendored
Normal file
After Width: | Height: | Size: 203 KiB |
Before Width: | Height: | Size: 173 KiB |
@@ -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.27.1"
|
||||
#define PI_App_Version @"1.0.28"
|
||||
///渠道
|
||||
#define PI_App_Source @"appstore"
|
||||
#define PI_Test_Flight @"TestFlight"
|
||||
|
@@ -160,6 +160,7 @@
|
||||
self.nameLabel.text = model.nick;
|
||||
self.idLabel.text = [NSString stringWithFormat:@"ID:%@", model.erbanNo];
|
||||
self.eventDescLabel.text = model.eventTopic;
|
||||
|
||||
self.subLabel.text = @(model.subNum).stringValue;
|
||||
self.sexImageView.image = model.gender == 1 ? kImage(@"common_male") : kImage(@"common_female");
|
||||
|
||||
@@ -379,7 +380,7 @@
|
||||
_eventDescLabel = [UILabel labelInitWithText:@""
|
||||
font:kFontMedium(14)
|
||||
textColor:[UIColor colorWithWhite:1 alpha:1]];
|
||||
_eventDescLabel.numberOfLines = 0;
|
||||
_eventDescLabel.numberOfLines = 1;
|
||||
}
|
||||
return _eventDescLabel;
|
||||
}
|
||||
|
@@ -18,8 +18,8 @@
|
||||
#import "UIImage+Utils.h"
|
||||
#import "XPIAPRechargeViewController.h"
|
||||
|
||||
#define MAX_EVENT_TITLE_LENGTH 20
|
||||
#define MAX_EVENT_CONTENT_LENGTH 100
|
||||
#define MAX_EVENT_TITLE_LENGTH 50
|
||||
#define MAX_EVENT_CONTENT_LENGTH 1000
|
||||
@interface CreateEventViewControllerV2 () <UITextViewDelegate, UITextFieldDelegate, UIImagePickerControllerDelegate, UINavigationControllerDelegate, PHPickerViewControllerDelegate, UIScrollViewDelegate, CreateEventPresenterProcotol, TZImagePickerControllerDelegate>
|
||||
|
||||
@property (nonatomic, strong) EventConfigModel *configModel;
|
||||
@@ -170,8 +170,22 @@ static const CGFloat kSectionSpacing = 20.0;
|
||||
#pragma mark - CreateEventPresenterProcotol
|
||||
- (void)loadCongfigSuccess:(EventConfigModel *)model {
|
||||
_configModel = model;
|
||||
self.uploadBannerLabel.text = [NSString stringWithFormat:YMLocalizedString(@"20.20.59_text_11"),
|
||||
@(model.goldNum)];
|
||||
NSString *moneyString = @(model.goldNum).stringValue;
|
||||
NSTextAttachment *icon = [[NSTextAttachment alloc] init];
|
||||
icon.bounds = CGRectMake(0, -8, 24, 24);
|
||||
icon.image = kImage(@"moli_money_icon");
|
||||
NSDictionary *par = @{
|
||||
NSFontAttributeName: self.uploadBannerLabel.font,
|
||||
NSForegroundColorAttributeName: self.uploadBannerLabel.textColor
|
||||
};
|
||||
NSAttributedString *firstPart = [[NSAttributedString alloc] initWithString:[NSString stringWithFormat:YMLocalizedString(@"20.20.59_text_11"),
|
||||
@(model.goldNum)]
|
||||
attributes:par];
|
||||
NSAttributedString *iconString = [NSAttributedString attributedStringWithAttachment:icon];
|
||||
NSMutableAttributedString *string = [[NSMutableAttributedString alloc] initWithAttributedString:firstPart];
|
||||
NSRange r = [string.string rangeOfString:moneyString];
|
||||
[string insertAttributedString:iconString atIndex:r.location];
|
||||
self.uploadBannerLabel.attributedText = string.copy;
|
||||
}
|
||||
|
||||
- (void)loadCongfigFailure:(NSString *)msg {
|
||||
|
@@ -81,5 +81,7 @@ typedef NS_ENUM(NSInteger, ActivityType) {
|
||||
@property (nonatomic, copy) NSString *appKey;
|
||||
@property (nonatomic, assign) NSInteger gameId;
|
||||
|
||||
@property (nonatomic, copy) NSString *urlParam;
|
||||
|
||||
@end
|
||||
NS_ASSUME_NONNULL_END
|
||||
|
@@ -308,6 +308,7 @@ exitCurrentRoom:(void(^)(void))exit {
|
||||
if (!_backgroundImageView) {
|
||||
_backgroundImageView = [[UIImageView alloc] initWithImage:[kImage(@"luck_gift_flag") ms_SetImageForRTL]];
|
||||
_backgroundImageView.contentMode = UIViewContentModeScaleAspectFit;
|
||||
_backgroundImageView.alpha = 0.9;
|
||||
}
|
||||
return _backgroundImageView;
|
||||
}
|
||||
|
@@ -23,7 +23,7 @@
|
||||
///VIP的类型
|
||||
@property (nonatomic,strong) NetImageView *nobleTypeImageView;
|
||||
///是否是VIP🔐
|
||||
@property (nonatomic,strong) UIImageView *nobleLockImageView;
|
||||
//@property (nonatomic,strong) UIImageView *nobleLockImageView;
|
||||
///覆盖的背景
|
||||
@property (nonatomic,strong) UIView * coverView;
|
||||
@end
|
||||
@@ -45,7 +45,7 @@
|
||||
[self.contentView addSubview:self.coverView];
|
||||
[self.contentView addSubview:self.nobleTypeImageView];
|
||||
[self.contentView addSubview:self.faceTitleLabel];
|
||||
[self.contentView addSubview:self.nobleLockImageView];
|
||||
// [self.contentView addSubview:self.nobleLockImageView];
|
||||
}
|
||||
|
||||
- (void)initSubViewConstraints {
|
||||
@@ -70,10 +70,10 @@
|
||||
make.top.mas_equalTo(self.faceImageView.mas_bottom).offset(4);
|
||||
}];
|
||||
|
||||
[self.nobleLockImageView mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||
make.size.mas_equalTo(CGSizeMake(11, 11));
|
||||
make.bottom.trailing.mas_equalTo(self.faceImageView);
|
||||
}];
|
||||
// [self.nobleLockImageView mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||
// make.size.mas_equalTo(CGSizeMake(11, 11));
|
||||
// make.bottom.trailing.mas_equalTo(self.faceImageView);
|
||||
// }];
|
||||
}
|
||||
#pragma mark - Getters And Setters
|
||||
- (void)setChatFace:(ChatFaceVo *)chatFace {
|
||||
@@ -91,14 +91,14 @@
|
||||
if (_faceInfo.faceVipInfo) {
|
||||
self.nobleTypeImageView.imageUrl = _faceInfo.faceVipInfo.vipIcon;
|
||||
self.nobleTypeImageView.hidden = NO;
|
||||
if (_faceInfo.faceVipInfo.vipLevel > self.vipLevel) {
|
||||
self.nobleLockImageView.hidden = NO;
|
||||
} else {
|
||||
self.nobleLockImageView.hidden = YES;
|
||||
}
|
||||
// if (_faceInfo.faceVipInfo.vipLevel > self.vipLevel) {
|
||||
// self.nobleLockImageView.hidden = NO;
|
||||
// } else {
|
||||
// self.nobleLockImageView.hidden = YES;
|
||||
// }
|
||||
} else {
|
||||
self.nobleTypeImageView.hidden = YES;
|
||||
self.nobleLockImageView.hidden = YES;
|
||||
// self.nobleLockImageView.hidden = YES;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -120,13 +120,13 @@
|
||||
return _nobleTypeImageView;
|
||||
}
|
||||
|
||||
- (UIImageView *)nobleLockImageView {
|
||||
if (!_nobleLockImageView) {
|
||||
_nobleLockImageView = [[UIImageView alloc] init];
|
||||
_nobleLockImageView.image = [UIImage imageNamed:@"room_face_nobel_lock"];
|
||||
}
|
||||
return _nobleLockImageView;
|
||||
}
|
||||
//- (UIImageView *)nobleLockImageView {
|
||||
// if (!_nobleLockImageView) {
|
||||
// _nobleLockImageView = [[UIImageView alloc] init];
|
||||
// _nobleLockImageView.image = [UIImage imageNamed:@"room_face_nobel_lock"];
|
||||
// }
|
||||
// return _nobleLockImageView;
|
||||
//}
|
||||
|
||||
- (UILabel *)faceTitleLabel {
|
||||
if (!_faceTitleLabel) {
|
||||
|
@@ -74,7 +74,7 @@
|
||||
- (void)viewDidAppear:(BOOL)animated {
|
||||
[super viewDidAppear:animated];
|
||||
[UIView animateWithDuration:0.5 animations:^{
|
||||
self.topView.backgroundColor = [UIColor colorWithWhite:0 alpha:0.2];
|
||||
self.topView.backgroundColor = [UIColor colorWithWhite:0 alpha:0.0];
|
||||
}];
|
||||
}
|
||||
|
||||
|
@@ -250,7 +250,11 @@
|
||||
#pragma mark -
|
||||
- (void)setupCurrentGold:(double)gold {
|
||||
self.comboGoldNum = gold;
|
||||
self.comboGoldLabel.text = @(gold).stringValue;
|
||||
NSString *formattedGold = [NSString stringWithFormat:@"%.2f", gold];
|
||||
if ([formattedGold hasSuffix:@".00"]) {
|
||||
formattedGold = [formattedGold substringToIndex:formattedGold.length - 3];
|
||||
}
|
||||
self.comboGoldLabel.text = formattedGold;
|
||||
}
|
||||
|
||||
- (void)addToGoldQueue:(NSString *)goldString {
|
||||
|
@@ -302,12 +302,21 @@ NSString * const kJPClose = @"newTppClose";
|
||||
if (self.gameModel.showType == ActivityShowType_Full) {
|
||||
url = [url stringByAppendingFormat:@"&safeTop=1"];
|
||||
}
|
||||
url = [url stringByAppendingFormat:@"&roomId=%ld",
|
||||
(long)self.hostDelegate.getRoomInfo.uid];
|
||||
break;
|
||||
case MSGameTypeCC:
|
||||
url = [url stringByAppendingFormat:@"&roomid=%ld",
|
||||
(long)self.hostDelegate.getRoomInfo.uid];
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
if (![NSString isEmpty:self.gameModel.gameModel.urlParam]) {
|
||||
url = [url stringByAppendingString:[NSString stringWithFormat:@"&%@", self.gameModel.gameModel.urlParam]];
|
||||
}
|
||||
|
||||
if (isMSEN()) {
|
||||
url = [url stringByAppendingFormat:@"&lang=%@", @"en-US"];
|
||||
} else if (isMSTR()) {
|
||||
@@ -319,7 +328,6 @@ NSString * const kJPClose = @"newTppClose";
|
||||
}
|
||||
url = [url stringByAppendingFormat:@"&token=%@", self.gameModel.gameModel.code];
|
||||
url = [url stringByAppendingFormat:@"&uid=%@", [AccountInfoStorage instance].getUid];
|
||||
url = [url stringByAppendingFormat:@"&roomid=%ld", (long)self.hostDelegate.getRoomInfo.uid];
|
||||
|
||||
return [NSURL URLWithString:url];
|
||||
}
|
||||
|