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
2024-06-06 17:10:28 +08:00
committed by eggmanQQQ
parent 6f25161511
commit e24f54ad50
14 changed files with 72 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
YuMi/Assets.xcassets/Login/ms_mine_purse_arrow.imageset/Contents.json vendored Normal file
View File

@@ -0,0 +1,22 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "ms_mine_purse_arrow@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "ms_mine_purse_arrow@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

BIN
YuMi/Assets.xcassets/Login/ms_mine_purse_arrow.imageset/ms_mine_purse_arrow@2x.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 155 B

BIN
YuMi/Assets.xcassets/Login/ms_mine_purse_arrow.imageset/ms_mine_purse_arrow@3x.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 177 B

13
YuMi/Modules/YMMine/View/IncomeRecord/XPExchangeDiamondsView.m
View File

@@ -229,19 +229,10 @@
_model = model;
if(self.type == IncomeRecord_Gold){
_titleNumView.text = [NSString stringWithFormat:YMLocalizedString(@"XPExchangeDiamondsItemView0"),@(_model.diamonds)];
NSString *diamondNum = [NSString stringWithFormat:@"%ld",_model.minDiamonds];;
NSMutableAttributedString *attStr = [[NSMutableAttributedString alloc]initWithString:diamondNum attributes:@{NSFontAttributeName:kFontBold(15),NSForegroundColorAttributeName:[UIColor colorWithWhite:1 alpha:0.6]}];
_numberView.attributedPlaceholder = attStr;
UIImage *image = [UIImage imageNamed:@"ms_exchange_coin_icon"];
[_iconView setImage:image forState:UIControlStateNormal];
}else{
NSString *goldNum = [NSString stringWithFormat:@"%.0f",ceilf(_model.minDiamonds / _model.rate)];
NSMutableAttributedString *attStr = [[NSMutableAttributedString alloc]initWithString:goldNum attributes:@{NSFontAttributeName:kFontBold(15),NSForegroundColorAttributeName:[UIColor colorWithWhite:1 alpha:0.6]}];
_numberView.attributedPlaceholder = attStr;
_titleNumView.text = [NSString stringWithFormat:YMLocalizedString(@"XPExchangeDiamondsItemView1"),_model.golds];
UIImage *image = [UIImage imageNamed:@"exchange_new_diamonds_icon"];
[_iconView setImage:image forState:UIControlStateNormal];
@@ -323,7 +314,7 @@
_numberView = [[XPTextField alloc]initWithFrame:CGRectZero];
_numberView.keyboardType = UIKeyboardTypeNumberPad;
_numberView.isValidation = YES;
NSMutableAttributedString *attStr = [[NSMutableAttributedString alloc]initWithString:@"0" attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:16 weight:UIFontWeightMedium],NSForegroundColorAttributeName:[UIColor colorWithWhite:1 alpha:0.6]}];
NSMutableAttributedString *attStr = [[NSMutableAttributedString alloc]initWithString:YMLocalizedString(@"XPExchangeDiamondsView6") attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:16 weight:UIFontWeightMedium],NSForegroundColorAttributeName:[UIColor colorWithWhite:1 alpha:0.6]}];
_numberView.attributedPlaceholder = attStr;
_numberView.font = kFontMedium(15);
_numberView.textColor = [UIColor whiteColor];

2
YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordView.m
View File

@@ -149,7 +149,7 @@
_titleView = [[UILabel alloc] init];
_titleView.font = kFontBold(15);
_titleView.textColor = self.type == IncomeRecord_Gold ? UIColorFromRGB(0x9F4805) : UIColorFromRGB(0xffffff);
_titleView.text = self.type == IncomeRecord_Gold ? YMLocalizedString(@"XPIncomeRecordView4"):YMLocalizedString(@"XPIncomeRecordView5");
_titleView.text = self.type == IncomeRecord_Gold ? YMLocalizedString(@"XPDressUpShopViewController7"):YMLocalizedString(@"XPExchangeDiamondsItemView2");
}
return _titleView;
}

37
YuMi/Modules/YMMine/View/SubViews/XPMineAccountView.m
View File

@@ -14,6 +14,7 @@
@property (nonatomic, strong) UIImageView *bgImageView;
@property (nonatomic, strong) UILabel *coinLabel;
@property (nonatomic, strong) UILabel *descLabel;
@property(nonatomic,strong) UIImageView *arrowView;
@end
@@ -34,6 +35,7 @@
[self addSubview:self.bgImageView];
[self addSubview:self.coinLabel];
[self addSubview:self.descLabel];
[self addSubview:self.arrowView];
}
- (void)initSubViewConstraints {
@@ -42,20 +44,26 @@
}];
[self.coinLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.mas_equalTo(13);
make.top.mas_equalTo(16);
make.leading.mas_equalTo(14);
make.trailing.mas_equalTo(0);
make.height.mas_equalTo(24);
make.height.mas_equalTo(14);
}];
[self.descLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.leading.mas_equalTo(self.coinLabel);
make.top.mas_equalTo(self.coinLabel.mas_bottom);
make.height.mas_equalTo(14);
make.top.mas_equalTo(36);
make.height.mas_equalTo(8);
}];
[self.arrowView mas_makeConstraints:^(MASConstraintMaker *make) {
make.width.mas_equalTo(5);
make.height.mas_equalTo(7);
make.leading.equalTo(self.descLabel.mas_trailing).mas_offset(2);
make.centerY.equalTo(self.descLabel);
}];
}
- (void)setDiamonds:(NSString *)diamonds {
self.coinLabel.text = diamonds;
}
#pragma mark - Getters And Setters
@@ -70,9 +78,9 @@
- (UILabel *)descLabel {
if (!_descLabel) {
_descLabel = [[UILabel alloc] init];
_descLabel.font = [UIFont systemFontOfSize:10 weight:UIFontWeightMedium];
_descLabel.textColor = UIColorRGBAlpha(0x000000, 0.3);
_descLabel.text = YMLocalizedString(@"XPMineAccountView0");
_descLabel.font = [UIFont systemFontOfSize:8 weight:UIFontWeightMedium];
_descLabel.textColor = UIColorFromRGB(0xA4B8C1);
_descLabel.text = YMLocalizedString(@"XPMineAccountView1");
}
return _descLabel;
}
@@ -81,12 +89,19 @@
- (UILabel *)coinLabel {
if (!_coinLabel) {
_coinLabel = [[UILabel alloc] init];
_coinLabel.font = [UIFont systemFontOfSize:20 weight:UIFontWeightBold];
_coinLabel.textColor = [DJDKMIMOMColor mainTextColor];
_coinLabel.text = YMLocalizedString(@"XPIncomeRecordVC1");
_coinLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightMedium];
_coinLabel.textColor = UIColorFromRGB(0x121552);
}
return _coinLabel;
}
- (UIImageView *)arrowView{
if(!_arrowView){
_arrowView = [UIImageView new];
_arrowView.image = [kImage(@"ms_mine_purse_arrow") ms_SetImageForRTL];
}
return _arrowView;
}
@end

1
YuMi/Modules/YMRoom/View/LittleGame/Model/LittleGameInfoModel.h
View File

@@ -16,6 +16,7 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic, copy) NSString *name;
///封面
@property (nonatomic, copy) NSString *pic;
@property(nonatomic,copy) NSString *pic2;
///是否选择
@property (nonatomic,assign) BOOL isSelect;
///游戏类型 ///SUD/BAISHUN

2
YuMi/Modules/YMRoom/View/MenuContainerView/MSRoomMenuGameCell.m
View File

@@ -48,7 +48,7 @@
- (void)setLittleGameModel:(LittleGameInfoModel *)littleGameModel{
_littleGameModel = littleGameModel;
_gameView.image = nil;
[_gameView loadImageWithUrl:littleGameModel.pic completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) {
[_gameView loadImageWithUrl:littleGameModel.pic2 completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) {
self.gameView.image = image;
}];
_textView.text = littleGameModel.name;

2
YuMi/Modules/YMRoom/View/StageView/LittleGameScrollStageView.m
View File

@@ -100,7 +100,7 @@ UIKIT_EXTERN NSString * const kRoomRoomLittleGameMiniStageNotificationKey;
}
- (NSInteger)countOfMicroView {
return 9; //self.hostDelegate.getRoomInfo.mgMicNum ? self.hostDelegate.getRoomInfo.mgMicNum : 6;
return self.hostDelegate.getRoomInfo.mgMicNum ? self.hostDelegate.getRoomInfo.mgMicNum : 9;
}
- (UIView<MicroViewProtocol> *)microViewForIndex:(NSInteger)index {

2
YuMi/Modules/YMRoom/View/XPRoomViewController.m
View File

@@ -794,7 +794,7 @@ NSString * const kHadQuitOtherRoomKey = @"kHadQuitOtherRoomKey";//是否退出
NSString * uid = [AccountInfoStorage instance].getUid;
NSString * ticket = [AccountInfoStorage instance].getTicket;
[params setObject:ticket forKey:@"ticket"];
[params setObject:uid forKey:@"uid"];
[params setObject:@(roomInfo.uid).stringValue forKey:@"uid"];
[params setObject:[NSString stringWithFormat:@"%ld", roomInfo.uid] forKey:@"roomUid"];
if (roomInfo.title.length > 0) {
[params setObject:roomInfo.title forKey:@"title"];

6
YuMi/ar.lproj/Localizable.strings
View File

@@ -280,7 +280,7 @@
"XPIncomeRecordVC1"="المحفظة";
"XPExchangeDiamondsItemView0"="عملاتي: %.2";
"XPExchangeDiamondsItemView1"="الماس الخاص بي: %@";
@@ -3184,8 +3184,10 @@ ineHeadView12" = "الحمل";
"XPIncomeRecordGoldDetailsHeadView8" = "إجمالي ألماس الأعضاء";
"XPIncomeRecordView5" = "الألماس";
"XPExchangeDiamondsItemView1" = "ألماسي: %.2f";
"XPExchangeDiamondsItemView2" = "ألماسي";
"XPExchangeDiamondsView2" = "عدد الألماس غير كافٍ";
"XPIncomeRecordGoldDetailsVC0" = "تفاصيل الألماس";
"XPExchangeDiamondsView6"="يرجى إدخال …";
///XPNobleCenterMyNobleView.m
"XPNobleCenterMyNobleView0" = "المستوى الحالي";
"XPNobleCenterMyNobleView1" = "لقد تم الوصول إلى أعلى مستوى VIP قابل للإستخدام";
@@ -3828,3 +3830,5 @@ ineHeadView12" = "الحمل";
//MSRoomGameVC
"MSRoomGameVC0"="فشلت المطابقة";
"MSRoomGameVC1"="المحفظة";
//XPMineAccountView
"XPMineAccountView1"="أدخل بسرعة لإعادة الشحن";

6
YuMi/en.lproj/Localizable.strings
View File

@@ -2977,14 +2977,14 @@
"XPIncomeRecordVC1"="Wallet";
"XPExchangeDiamondsItemView0"="My Coins: %@";
"XPExchangeDiamondsItemView1"="My Diamonds: %.2f";
"XPExchangeDiamondsItemView2"="My Diamonds";
"XPExchangeDiamondsView0"="Exchange Coins";
"XPExchangeDiamondsView1"="Confirm Exchange";
"XPExchangeDiamondsView2"="Insufficient Diamonds";
"XPExchangeDiamondsView3"="At least %ld Coins are required for exchange";
"XPExchangeDiamondsView4"="The number of Coins for exchange cannot exceed %ld";
"XPExchangeDiamondsView5"="Exchange successful";
"XPExchangeDiamondsView6"="Please enter...";
"XPIncomeRecordCoinsDetailsView0"="No data available";
"XPIncomeRecordCoinsDetailsView1"="Total Coins flow in the current room: %@ diamonds";
@@ -3631,3 +3631,5 @@
//MSRoomGameVC
"MSRoomGameVC0"="Match failed";
"MSRoomGameVC1"="Wallet";
//XPMineAccountView
"XPMineAccountView1"="Quick access to recharge";

6
YuMi/zh-Hans.lproj/Localizable.strings
View File

@@ -2617,14 +2617,14 @@
"XPExchangeDiamondsItemView0"="我的金币：%@";
"XPExchangeDiamondsItemView1"="我的钻石：%.2f";
"XPExchangeDiamondsItemView2"="我的钻石";
"XPExchangeDiamondsView0"="兑换金币";
"XPExchangeDiamondsView1"="确定兑换";
"XPExchangeDiamondsView2"="钻石数不足";
"XPExchangeDiamondsView3"="至少需要兑换%ld金币";
"XPExchangeDiamondsView4"="兑换金币数不能超过%ld钻";
"XPExchangeDiamondsView5"="兑换成功";
"XPExchangeDiamondsView6"="請輸入...";
"XPIncomeRecordGoldDetailsView0"="暂没有数据";
"XPIncomeRecordGoldDetailsView1"="当前房间总计金币流水:%@金币";
@@ -3292,6 +3292,8 @@
"MSRoomGameHeadView4"="入场费(%@)";
//MSRoomGameVC
"MSRoomGameVC0"="匹配失败";
//XPMineAccountView
"XPMineAccountView1"="快速进入充值";

5
YuMi/zh-Hant.lproj/Localizable.strings
View File

@@ -2607,6 +2607,7 @@
"XPExchangeDiamondsItemView0"="我的金幣：%@";
"XPExchangeDiamondsItemView1"="我的鉆石：%.2f";
"XPExchangeDiamondsItemView2"="我的鉆石";
"XPExchangeDiamondsView0"="兌換金幣";
"XPExchangeDiamondsView1"="確定兌換";
@@ -2614,7 +2615,7 @@
"XPExchangeDiamondsView3"="至少需要兌換%ld金幣";
"XPExchangeDiamondsView4"="兌換金幣數不能超過%ld鉆";
"XPExchangeDiamondsView5"="兌換成功";
"XPExchangeDiamondsView6"="請輸入...";
"XPIncomeRecordGoldDetailsView0"="暫沒有數據";
"XPIncomeRecordGoldDetailsView1"="當前房間總計金幣流水:%@金幣";
@@ -3282,3 +3283,5 @@
//MSRoomGameVC
"MSRoomGameVC0"="匹配失败";
//XPMineAccountView
"XPMineAccountView1"="快速進入充值";