From e24f54ad5075b20dc6710187c68047917a49f5f7 Mon Sep 17 00:00:00 2001
From: liyuhua <15626451870@163.com>
Date: Thu, 6 Jun 2024 17:10:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Contents.json                             |  22 +++++++++++
 .../ms_mine_purse_arrow@2x.png                | Bin 0 -> 155 bytes
 .../ms_mine_purse_arrow@3x.png                | Bin 0 -> 177 bytes
 .../IncomeRecord/XPExchangeDiamondsView.m     |  13 +-----
 .../View/IncomeRecord/XPIncomeRecordView.m    |   2 +-
 .../YMMine/View/SubViews/XPMineAccountView.m  |  37 ++++++++++++------
 .../LittleGame/Model/LittleGameInfoModel.h    |   1 +
 .../MenuContainerView/MSRoomMenuGameCell.m    |   2 +-
 .../StageView/LittleGameScrollStageView.m     |   2 +-
 .../YMRoom/View/XPRoomViewController.m        |   2 +-
 YuMi/ar.lproj/Localizable.strings             |   6 ++-
 YuMi/en.lproj/Localizable.strings             |   6 ++-
 YuMi/zh-Hans.lproj/Localizable.strings        |   6 ++-
 YuMi/zh-Hant.lproj/Localizable.strings        |   5 ++-
 14 files changed, 72 insertions(+), 32 deletions(-)
 create mode 100644 YuMi/Assets.xcassets/Login/ms_mine_purse_arrow.imageset/Contents.json
 create mode 100644 YuMi/Assets.xcassets/Login/ms_mine_purse_arrow.imageset/ms_mine_purse_arrow@2x.png
 create mode 100644 YuMi/Assets.xcassets/Login/ms_mine_purse_arrow.imageset/ms_mine_purse_arrow@3x.png

diff --git a/YuMi/Assets.xcassets/Login/ms_mine_purse_arrow.imageset/Contents.json b/YuMi/Assets.xcassets/Login/ms_mine_purse_arrow.imageset/Contents.json
new file mode 100644
index 00000000..995bf324
--- /dev/null
+++ b/YuMi/Assets.xcassets/Login/ms_mine_purse_arrow.imageset/Contents.json
@@ -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
+  }
+}
diff --git a/YuMi/Assets.xcassets/Login/ms_mine_purse_arrow.imageset/ms_mine_purse_arrow@2x.png b/YuMi/Assets.xcassets/Login/ms_mine_purse_arrow.imageset/ms_mine_purse_arrow@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..dba9692e65585099422546254ee02e45852a38a9
GIT binary patch
literal 155
zcmeAS@N?(olHy`uVBq!ia0vp^Y(UJ#!VDx+6^wu+gIs`5h%1m@vh&c=U56HLJ+NfQ
zK_FVZ<G_-wK=RPWqemYVH>dzraFqo41vAW56r3^DR#%cuB)eB0D5~V?;uyklJ=r5I
xA;BOsA>n}tlaYjIgNp@6^9={X4Kg0Q49;B4p;MaPvIA8!c)I$ztaD0e0szXUFKhq+

literal 0
HcmV?d00001

diff --git a/YuMi/Assets.xcassets/Login/ms_mine_purse_arrow.imageset/ms_mine_purse_arrow@3x.png b/YuMi/Assets.xcassets/Login/ms_mine_purse_arrow.imageset/ms_mine_purse_arrow@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..5eb9468675baf1709932bc92c28de6de5cca4f1d
GIT binary patch
literal 177
zcmeAS@N?(olHy`uVBq!ia0vp^oIuRS!VDz&cWKWCQYryHA+A7r>5c<Sb{t%?<Iv)r
z2bS(QxODp=Ah~Sw{`vd&FWzwoD5clisQ^^RQxfDC%%Jt+=<?<Sa}ka^w-+r~SO*k0
z@N{tu;kceGkj~J!h(+M!4$(82-&iKjImfHeRjL@F<H_K+DX-<kp%5dz*4Ye(ybQU;
W9P^*dQuqqg%i!ti=d#Wzp$PyWdO&&r

literal 0
HcmV?d00001

diff --git a/YuMi/Modules/YMMine/View/IncomeRecord/XPExchangeDiamondsView.m b/YuMi/Modules/YMMine/View/IncomeRecord/XPExchangeDiamondsView.m
index d334c06a..4db1216c 100644
--- a/YuMi/Modules/YMMine/View/IncomeRecord/XPExchangeDiamondsView.m
+++ b/YuMi/Modules/YMMine/View/IncomeRecord/XPExchangeDiamondsView.m
@@ -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];
diff --git a/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordView.m b/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordView.m
index 5b7a4f30..67950e02 100644
--- a/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordView.m
+++ b/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordView.m
@@ -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;
 }
diff --git a/YuMi/Modules/YMMine/View/SubViews/XPMineAccountView.m b/YuMi/Modules/YMMine/View/SubViews/XPMineAccountView.m
index d97436ee..e8a250e6 100644
--- a/YuMi/Modules/YMMine/View/SubViews/XPMineAccountView.m
+++ b/YuMi/Modules/YMMine/View/SubViews/XPMineAccountView.m
@@ -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
diff --git a/YuMi/Modules/YMRoom/View/LittleGame/Model/LittleGameInfoModel.h b/YuMi/Modules/YMRoom/View/LittleGame/Model/LittleGameInfoModel.h
index c7783322..40d66236 100644
--- a/YuMi/Modules/YMRoom/View/LittleGame/Model/LittleGameInfoModel.h
+++ b/YuMi/Modules/YMRoom/View/LittleGame/Model/LittleGameInfoModel.h
@@ -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
diff --git a/YuMi/Modules/YMRoom/View/MenuContainerView/MSRoomMenuGameCell.m b/YuMi/Modules/YMRoom/View/MenuContainerView/MSRoomMenuGameCell.m
index e67b3422..749d7317 100644
--- a/YuMi/Modules/YMRoom/View/MenuContainerView/MSRoomMenuGameCell.m
+++ b/YuMi/Modules/YMRoom/View/MenuContainerView/MSRoomMenuGameCell.m
@@ -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;
diff --git a/YuMi/Modules/YMRoom/View/StageView/LittleGameScrollStageView.m b/YuMi/Modules/YMRoom/View/StageView/LittleGameScrollStageView.m
index 8302ab02..caff58f3 100644
--- a/YuMi/Modules/YMRoom/View/StageView/LittleGameScrollStageView.m
+++ b/YuMi/Modules/YMRoom/View/StageView/LittleGameScrollStageView.m
@@ -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 {
diff --git a/YuMi/Modules/YMRoom/View/XPRoomViewController.m b/YuMi/Modules/YMRoom/View/XPRoomViewController.m
index 990f9445..8cfa86ea 100644
--- a/YuMi/Modules/YMRoom/View/XPRoomViewController.m
+++ b/YuMi/Modules/YMRoom/View/XPRoomViewController.m
@@ -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"];
diff --git a/YuMi/ar.lproj/Localizable.strings b/YuMi/ar.lproj/Localizable.strings
index 35ba49cd..e2f62d7b 100644
--- a/YuMi/ar.lproj/Localizable.strings
+++ b/YuMi/ar.lproj/Localizable.strings
@@ -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"="أدخل بسرعة لإعادة الشحن";
diff --git a/YuMi/en.lproj/Localizable.strings b/YuMi/en.lproj/Localizable.strings
index 086874fc..70e3bfeb 100644
--- a/YuMi/en.lproj/Localizable.strings
+++ b/YuMi/en.lproj/Localizable.strings
@@ -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";
diff --git a/YuMi/zh-Hans.lproj/Localizable.strings b/YuMi/zh-Hans.lproj/Localizable.strings
index af7dff86..2a826b26 100644
--- a/YuMi/zh-Hans.lproj/Localizable.strings
+++ b/YuMi/zh-Hans.lproj/Localizable.strings
@@ -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"="快速进入充值";
 
 
 
diff --git a/YuMi/zh-Hant.lproj/Localizable.strings b/YuMi/zh-Hant.lproj/Localizable.strings
index 6f7c79bb..aed1843f 100644
--- a/YuMi/zh-Hant.lproj/Localizable.strings
+++ b/YuMi/zh-Hant.lproj/Localizable.strings
@@ -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"="快速進入充值";