阿拉伯语适配

YuMi/Assets.xcassets/Language/ar/room_menu_arrange_mic_ar.imageset/Contents.json

@@ -1,15 +1,16 @@
 {
   "images" : [
     {
-      "filename" : "room_menu_arrange_mic_ar.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
+      "filename" : "room_menu_arrange_mic_ar@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
+      "filename" : "room_menu_arrange_mic_ar@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

YuMi/Assets.xcassets/Language/ar/room_menu_arrange_mic_new_ar.imageset/Contents.json

@@ -1,15 +1,16 @@
 {
   "images" : [
     {
-      "filename" : "room_menu_arrange_mic_new_ar.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
+      "filename" : "room_menu_arrange_mic_new_ar@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
+      "filename" : "room_menu_arrange_mic_new_ar@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

YuMi/Assets.xcassets/Language/ar/room_pk_result_top_draw_bg_ar.imageset/Contents.json

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

YuMi/Assets.xcassets/Language/ar/room_pk_result_top_loser_bg_ar.imageset/Contents.json

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

YuMi/Assets.xcassets/Language/ar/room_pk_result_top_win_bg_ar.imageset/Contents.json

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

YuMi/Assets.xcassets/Language/en/room_menu_arrange_mic_en.imageset/Contents.json

@@ -1,15 +1,16 @@
 {
   "images" : [
     {
-      "filename" : "room_menu_arrange_mic_enpng.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
+      "filename" : "room_menu_arrange_mic_en@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
+      "filename" : "room_menu_arrange_mic_en@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

YuMi/Assets.xcassets/Language/en/room_menu_arrange_mic_new_en.imageset/Contents.json

@@ -1,15 +1,16 @@
 {
   "images" : [
     {
-      "filename" : "room_menu_arrange_mic_new_en.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
+      "filename" : "room_menu_arrange_mic_new_en@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
+      "filename" : "room_menu_arrange_mic_new_en@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

YuMi/CustomUI/InputView/InputView/QInputBarView.m

@@ -201,8 +201,15 @@ const int UIInputTextViewMaxHeight = 147;
     [textView addObserver:self forKeyPath:@"contentSize" options:NSKeyValueObservingOptionNew context:nil];
     [self addSubview:textView];
     textView.frame = CGRectMake(textViewFrameX + textViewHorizontalMargin, (UIInputBarViewMinHeight - UIInputTextViewMinHeight)/2, textViewWidth, UIInputTextViewMinHeight);
-    self.inputTextView = textView;
     
+    self.inputTextView = textView;
+    for (id view in textView.subviews) {
+        if ([view isKindOfClass:[UITextView class]]){
+            UITextView *textView = view;
+            textView.textAlignment = NSTextAlignmentLeft;
+            break;
+        }
+    }
     //记录初始化时候的textview高度
     self.previousTextViewContentHeight = [self getTextViewContentHeight];
     

YuMi/CustomUI/MSRTL/MSBaseTextField.m

@@ -4,19 +4,59 @@
 //
 //  Created by duoban on 2024/4/15.
 //
-
+#import <ReactiveObjC.h>
 #import "MSBaseTextField.h"
-
+@interface MSBaseTextField()
+@property(nonatomic,strong)UILabel *textView;
+@end
 @implementation MSBaseTextField
-
--(instancetype)init{
-   self = [super init];
+-(instancetype)initWithFrame:(CGRect)frame{
+    self = [super initWithFrame:frame];
     if(self){
-//        if(isMSRTL()){
-//            self.textAlignment = NSTextAlignmentRight;
-//        }
+        [self installUI];
+        [self installConstraints];
     }
     return self;
 }
+-(void)installUI{
 
+    [self addSubview:self.textView];
+    [self.textView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.centerY.equalTo(self);
+        make.leading.equalTo(self).inset(kGetScaleWidth(5));
+    }];
+    //使用RAC来监听字符串myString的变化
+    @kWeakify(self);
+    [RACObserve(self, text) subscribeNext:^(id  _Nullable x) {
+        @kStrongify(self)
+      
+        NSString *text = [NSString stringWithFormat:@"%@",x];
+        self.textView.hidden = text.length > 0;
+    }];
+    [self addTarget:self action:@selector(ms_textFieldDidChange:) forControlEvents:UIControlEventEditingChanged];
+}
+-(void)installConstraints{
+    
+}
+
+#pragma mark - 懒加载
+-(instancetype)init{
+   self = [super init];
+    if(self){
+        [self installUI];
+    }
+    return self;
+}
+-(void)ms_textFieldDidChange:(UITextField *)textField{
+    self.textView.hidden = textField.text.length > 0;
+}
+-(void)setAttributedPlaceholder:(NSAttributedString *)attributedPlaceholder{
+    _textView.attributedText = attributedPlaceholder;
+}
+- (UILabel *)textView{
+    if(!_textView){
+        _textView = [UILabel new];
+    }
+    return _textView;
+}
 @end

YuMi/CustomUI/MSRTL/UITextView+MSRTL.m

@@ -20,14 +20,14 @@
             Method newTextMethod = class_getInstanceMethod(self, @selector(msrtl_setTextAlignment:));
             method_exchangeImplementations(oldTextMethod, newTextMethod);  //交换成功
             
-            Method oldTextMethod1 = class_getInstanceMethod(self,@selector(setPlaceholder:));
-            Method newTextMethod1 = class_getInstanceMethod(self, @selector(msrtl_setPlaceholder:));
-            method_exchangeImplementations(oldTextMethod1, newTextMethod1);  //交换成功
-            
-            
-            Method oldMethod = class_getInstanceMethod(self,@selector(setAttributedPlaceholder:));
-            Method newMethod = class_getInstanceMethod(self, @selector(msrtl_setAttributedPlaceholder:));
-            method_exchangeImplementations(oldMethod, newMethod);  //交换成功
+//            Method oldTextMethod1 = class_getInstanceMethod(self,@selector(setPlaceholder:));
+//            Method newTextMethod1 = class_getInstanceMethod(self, @selector(msrtl_setPlaceholder:));
+//            method_exchangeImplementations(oldTextMethod1, newTextMethod1);  //交换成功
+//            
+//            
+//            Method oldMethod = class_getInstanceMethod(self,@selector(setAttributedPlaceholder:));
+//            Method newMethod = class_getInstanceMethod(self, @selector(msrtl_setAttributedPlaceholder:));
+//            method_exchangeImplementations(oldMethod, newMethod);  //交换成功
         });
     
     

YuMi/Modules/YMLogin/View/CustomView/LoginVerifCodeView.m

@@ -14,7 +14,7 @@
 
 @interface LoginVerifCodeView ()
 ///输入框的占位符
-@property (nonatomic,strong) UITextField *textField;
+@property (nonatomic,strong) MSBaseTextField *textField;
 ///显示label的数组
 @property (nonatomic,strong) NSMutableArray<UILabel *> *lableArray;
 @end
@@ -144,9 +144,9 @@
 	}
 }
 
-- (UITextField *)textField {
+- (MSBaseTextField *)textField {
 	if (!_textField) {
-		_textField = [[UITextField alloc] init];
+		_textField = [[MSBaseTextField alloc] init];
 		_textField.tintColor = [UIColor clearColor];
         _textField.textColor = [UIColor clearColor];
 		_textField.keyboardType = UIKeyboardTypeNumberPad;

YuMi/Modules/YMLogin/View/LoginBindPhoneViewController.m

@@ -27,7 +27,7 @@
 ///86 Label
 @property (nonatomic, strong) UILabel *countryLabel;
 ///手机号输入框
-@property (nonatomic, strong) UITextField *phoneTextField;
+@property (nonatomic, strong) MSBaseTextField *phoneTextField;
 ///登录按钮
 @property (nonatomic, strong) UIButton *loginBtn;
 ///返回按钮 如果点击了返回按钮的话 那就退出登录
@@ -186,9 +186,9 @@
 	return _countryLabel;
 }
 
-- (UITextField *)phoneTextField {
+- (MSBaseTextField *)phoneTextField {
 	if (!_phoneTextField) {
-		_phoneTextField = [[UITextField alloc] init];
+		_phoneTextField = [[MSBaseTextField alloc] init];
 		_phoneTextField.keyboardType = UIKeyboardTypeNumberPad;
 		_phoneTextField.backgroundColor = [UIColor clearColor];
 		_phoneTextField.textColor = [DJDKMIMOMColor mainTextColor];

YuMi/Modules/YMLogin/View/LoginFullInfoViewController.m

@@ -42,7 +42,7 @@
 ///显示昵称
 @property (nonatomic,strong) UILabel *nameLabel;
 ///输入框
-@property (nonatomic,strong) UITextField *textField;
+@property (nonatomic,strong) MSBaseTextField *textField;
 ///更新
 @property (nonatomic,strong) UIButton *refreshButton;
 ///x性别的容器
@@ -57,7 +57,7 @@
 ///邀请码的容器
 @property (nonatomic,strong) UIView *codeContainView;
 ///邀请码输入框
-@property (nonatomic,strong) UITextField *codeTextField;
+@property (nonatomic,strong) MSBaseTextField *codeTextField;
 
 
 ///第三方的用户信息
@@ -382,9 +382,9 @@
 	return _nameLabel;
 }
 
-- (UITextField *)textField {
+- (MSBaseTextField *)textField {
 	if (!_textField) {
-		_textField = [[UITextField alloc] init];
+		_textField = [[MSBaseTextField alloc] init];
 		_textField.textColor = UIColorFromRGB(0x1F1B4F);
 		_textField.font = kFontMedium(16);
         _textField.placeholder = YMLocalizedString(@"LoginFullInfoViewController3");
@@ -451,9 +451,9 @@
 	return _codeContainView;
 }
 
-- (UITextField *)codeTextField {
+- (MSBaseTextField *)codeTextField {
 	if (!_codeTextField) {
-		_codeTextField = [[UITextField alloc] init];
+		_codeTextField = [[MSBaseTextField alloc] init];
 		_codeTextField.textColor = UIColorFromRGB(0x1F1B4F);
 		_codeTextField.font = kFontMedium(14);
 		_codeTextField.borderStyle = UITextBorderStyleNone;

YuMi/Modules/YMLogin/View/LoginVerifCodeViewController.m

@@ -42,7 +42,7 @@
 ///重新获得验证码
 @property (nonatomic,strong) UIButton *retryCodeButton;
 ///输入密码
-@property (nonatomic,strong) UITextField *textField;
+@property (nonatomic,strong) MSBaseTextField *textField;
 ///登录
 @property (nonatomic,strong) UIButton *loginButton;
 ///返回按钮
@@ -312,9 +312,9 @@
 	}
 	return _topBackImgView;
 }
--(UITextField *)textField{
+-(MSBaseTextField *)textField{
 	if (!_textField){
-		_textField = [[UITextField alloc]init];
+		_textField = [[MSBaseTextField alloc]init];
 		_textField.keyboardType = UIKeyboardTypeNumberPad;
 		_textField.textColor = [DJDKMIMOMColor colorWithHexString:@"#1F1A4E"];
 		_textField.font = [UIFont systemFontOfSize:16 weight:UIFontWeightSemibold];

YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineChooseGiveDiamondView.m

@@ -30,7 +30,7 @@
 ///数量钻石图标
 @property (nonatomic,strong) UIImageView *numIcon;
 /// 钻石数量
-@property (nonatomic,strong) UITextField *diamondNumView;
+@property (nonatomic,strong) MSBaseTextField *diamondNumView;
 ///我的钻石数量
 @property (nonatomic,strong) UILabel * myDiamondNumView;
 ///我的钻石数量钻石图标
@@ -146,7 +146,7 @@
     
     [self.numIcon mas_makeConstraints:^(MASConstraintMaker *make) {
         make.leading.equalTo(self.headView);
-        make.width.height.mas_equalTo(kGetScaleWidth(24));
+        make.width.height.mas_equalTo(kGetScaleWidth(20));
         make.top.equalTo(self.typeStackView.mas_bottom).mas_offset(kGetScaleWidth(35));
        
     }];
@@ -370,14 +370,14 @@
 -(UIImageView *)numIcon{
     if (!_numIcon){
         _numIcon = [UIImageView new];
-        _numIcon.image = [UIImage imageNamed:@"mine_give_diamone_icon"];
+        _numIcon.image = [UIImage imageNamed:@"exchange_gold_icon"];
     }
     return _numIcon;
 }
 
-- (UITextField *)diamondNumView{
+- (MSBaseTextField *)diamondNumView{
     if (!_diamondNumView){
-        _diamondNumView = [UITextField new];
+        _diamondNumView = [MSBaseTextField new];
         _diamondNumView.keyboardType = UIKeyboardTypeNumberPad;
         _diamondNumView.font = [UIFont systemFontOfSize:kGetScaleWidth(30) weight:UIFontWeightMedium];
         _diamondNumView.textColor = [DJDKMIMOMColor inputTextColor];
@@ -408,7 +408,7 @@
 -(UIImageView *)myDiamondIcon{
     if (!_myDiamondIcon){
         _myDiamondIcon = [UIImageView new];
-        _myDiamondIcon.image = [UIImage imageNamed:@"mine_give_diamone_icon"];
+        _myDiamondIcon.image = [UIImage imageNamed:@"exchange_gold_icon"];
     }
     return _myDiamondIcon;
 }

YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineChooseGiveGiftView.h

@@ -15,7 +15,7 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 @interface XPMineChooseGiveGiftView : UIView
-@property (nonatomic,strong) UITextField *textField;
+@property (nonatomic,strong) MSBaseTextField *textField;
 @property (nonatomic,copy) NSString *giftCount;
 @property (nonatomic,assign) NSInteger curPage;
 @property (nonatomic,assign) NSInteger count;

YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineChooseGiveGiftView.m

@@ -231,9 +231,9 @@
 	return _numView;
 }
 
--(UITextField *)textField{
+-(MSBaseTextField *)textField{
     if (!_textField){
-        _textField = [UITextField new];
+        _textField = [MSBaseTextField new];
         _textField.keyboardType = UIKeyboardTypeNumberPad;
         _textField.font = [UIFont systemFontOfSize:kGetScaleWidth(20) weight:UIFontWeightMedium];
         _textField.textColor = [DJDKMIMOMColor inputTextColor];

YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineGiveDiamondSearchView.m

@@ -12,7 +12,7 @@
 ///背景
 @property (nonatomic,strong)UIImageView *bgView;
 ///搜索输入
-@property (nonatomic,strong) UITextField *textField;
+@property (nonatomic,strong) MSBaseTextField *textField;
 ///搜索btn
 @property (nonatomic,strong) UIButton *searchBtn;
 
@@ -77,9 +77,9 @@
     }
     return _bgView;
 }
--(UITextField *)textField{
+-(MSBaseTextField *)textField{
     if (!_textField){
-        _textField = [[UITextField alloc]initWithFrame:CGRectZero];
+        _textField = [[MSBaseTextField alloc]initWithFrame:CGRectZero];
         _textField.keyboardType = UIKeyboardTypeNumberPad;
         _textField.font = [UIFont systemFontOfSize:14 weight:UIFontWeightMedium];
         _textField.textColor = [DJDKMIMOMColor mainTextColor];

YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineGuildIncomeStatisViewController.m

@@ -136,7 +136,8 @@
 
 - (NSArray<NSString *> *)titles {
 	if (!_titles) {
-		_titles = @[YMLocalizedString(@"XPMineGuildIncomeStatisViewController1"), YMLocalizedString(@"XPMineGuildIncomeStatisViewController2"), YMLocalizedString(@"XPMineGuildIncomeStatisViewController3")];
+//		_titles = @[YMLocalizedString(@"XPMineGuildIncomeStatisViewController1"), YMLocalizedString(@"XPMineGuildIncomeStatisViewController2"), YMLocalizedString(@"XPMineGuildIncomeStatisViewController3")];
+        _titles = @[YMLocalizedString(@"XPMineGuildIncomeStatisViewController1"), YMLocalizedString(@"XPMineGuildIncomeStatisViewController2")];
 	}
 	return _titles;
 }

YuMi/Modules/YMMine/View/Guild/View/Setting/XPMineGuildSetNameViewController.m

@@ -19,7 +19,7 @@
 ///容器
 @property (nonatomic, strong) UIView  *containView;
 ///房间名
-@property (nonatomic, strong) UITextField  *nameTextField;
+@property (nonatomic, strong) MSBaseTextField  *nameTextField;
 ///描述的问题
 @property (nonatomic,strong) YYLabel *descriptionLabel;
 @end
@@ -132,9 +132,9 @@
 	return _containView;
 }
 
-- (UITextField *)nameTextField {
+- (MSBaseTextField *)nameTextField {
 	if (!_nameTextField) {
-		_nameTextField = [[UITextField alloc] init];
+		_nameTextField = [[MSBaseTextField alloc] init];
 		_nameTextField.clearButtonMode = UITextFieldViewModeAlways;
 		_nameTextField.font = [UIFont systemFontOfSize:14];
 		_nameTextField.textColor = [DJDKMIMOMColor mainTextColor];

YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildSearchNavView.m

@@ -20,7 +20,7 @@
 ///搜索logo
 @property (nonatomic,strong) UIImageView *searchImageView;
 ///输入框
-@property (nonatomic,strong) UITextField *searchTextField;
+@property (nonatomic,strong) MSBaseTextField *searchTextField;
 ///取消
 @property (nonatomic,strong) UIButton *cancleButton;
 
@@ -146,9 +146,9 @@
 	return _searchImageView;
 }
 
-- (UITextField *)searchTextField {
+- (MSBaseTextField *)searchTextField {
 	if (!_searchTextField) {
-		_searchTextField = [[UITextField alloc] init];
+		_searchTextField = [[MSBaseTextField alloc] init];
 		_searchTextField.tintColor = [DJDKMIMOMColor secondTextColor];
 		_searchTextField.textColor = [DJDKMIMOMColor mainTextColor];
 		_searchTextField.backgroundColor = [DJDKMIMOMColor appBackgroundColor];

YuMi/Modules/YMMine/View/Guild/View/SubViews/XPMineGiveDiamondSearchView.m

@@ -10,7 +10,7 @@
 ///背景
 @property (nonatomic,strong)UIImageView *bgView;
 ///搜索输入
-@property (nonatomic,strong) UITextField *textField;
+@property (nonatomic,strong) MSBaseTextField *textField;
 ///搜索btn
 @property (nonatomic,strong) UIButton *searchBtn;
 
@@ -75,9 +75,9 @@
 	}
 	return _bgView;
 }
--(UITextField *)textField{
+-(MSBaseTextField *)textField{
 	if (!_textField){
-		_textField = [[UITextField alloc]initWithFrame:CGRectZero];
+		_textField = [[MSBaseTextField alloc]initWithFrame:CGRectZero];
 		_textField.keyboardType = UIKeyboardTypeNumberPad;
 		_textField.font = [UIFont systemFontOfSize:14 weight:UIFontWeightMedium];
 		_textField.textColor = [DJDKMIMOMColor mainTextColor];

YuMi/Modules/YMMine/View/IncomeRecord/XPTextField.h

@@ -9,7 +9,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface XPTextField : UITextField
+@interface XPTextField : MSBaseTextField
 @property (nonatomic,assign) BOOL isValidation;
 @property (nonatomic,copy) NSString *regular;
 @end

YuMi/Modules/YMMine/View/IncomeRecord/XPTextField.m

@@ -21,6 +21,7 @@
 }
 
 - (BOOL)textField:(UITextField *)textField shouldChangeCharactersInRange:(NSRange)range replacementString:(NSString *)string {
+
 	if(self.isValidation == NO){
 		return YES;
 	}

YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoDesViewController.m

@@ -42,7 +42,13 @@ static NSInteger maxCount = 60;
 	[self initSubViews];
 	[self initSubViewConstraints];
 	[self initEvents];
-	
+    for (id view in self.useDescTextView.subviews) {
+        if ([view isKindOfClass:[UITextView class]]){
+            UITextView *textView = view;
+            textView.textAlignment = NSTextAlignmentLeft;
+            break;
+        }
+    }
 }
 
 - (void)touchesBegan:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event {

YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoNickViewController.m

@@ -19,7 +19,7 @@ static NSInteger maxCount = 15;
 
 @interface XPMineUserInfoNickViewController ()
 @property (nonatomic, strong) UIView  *containView;//
-@property (nonatomic, strong) UITextField  *nickTextField;//
+@property (nonatomic, strong) MSBaseTextField  *nickTextField;//
 @property (nonatomic, strong) UIButton  *completionBtn;//
 @property (nonatomic, strong) UILabel  *limitLabel;//
 @end
@@ -127,9 +127,9 @@ static NSInteger maxCount = 15;
 	return _containView;
 }
 
-- (UITextField *)nickTextField {
+- (MSBaseTextField *)nickTextField {
 	if (!_nickTextField) {
-		_nickTextField = [[UITextField alloc] init];
+		_nickTextField = [[MSBaseTextField alloc] init];
 		_nickTextField.clearButtonMode = UITextFieldViewModeAlways;
 		_nickTextField.font = [UIFont systemFontOfSize:14];
 		_nickTextField.textColor = [DJDKMIMOMColor mainTextColor];

YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleAuthorityDescView.m

@@ -22,7 +22,7 @@
 ///标题
 @property (nonatomic, strong) UILabel *titleLabel;
 ///描述
-@property (nonatomic, strong) UITextView *descView;
+@property (nonatomic, strong) SZTextView *descView;
 ///关闭按钮
 @property (nonatomic, strong) UIButton *closeButton;
 
@@ -53,7 +53,7 @@
     self.titleLabel.textColor = [DJDKMIMOMColor hightNobleLightTextColor];
     [self addSubview:self.titleLabel];
     
-    self.descView = [[UITextView alloc] init];
+    self.descView = [[SZTextView alloc] init];
     self.descView.editable = NO;
     self.descView.backgroundColor = [UIColor clearColor];
     self.descView.text = @"";
@@ -66,6 +66,14 @@
     [self.closeButton setBackgroundImage:[UIImage imageNamed:@"noble_time_close"] forState:UIControlStateNormal];
     [self addSubview:self.closeButton];
     [self.closeButton addTarget:self action:@selector(onCloseButtonClick:) forControlEvents:UIControlEventTouchUpInside];
+    
+    for (id view in self.descView.subviews) {
+        if ([view isKindOfClass:[UITextView class]]){
+            UITextView *textView = view;
+            textView.textAlignment = NSTextAlignmentLeft;
+            break;
+        }
+    }
 }
 
 - (void)initConstraints {

YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterResidueView.m

@@ -17,7 +17,7 @@
 
 @property (nonatomic, strong) UILabel *titleLabel;
 
-@property (nonatomic, strong) UITextView *descView;
+@property (nonatomic, strong) SZTextView *descView;
 
 @property (nonatomic, strong) UIButton *closeButton;
 
@@ -46,7 +46,7 @@
     self.titleLabel.textColor = [DJDKMIMOMColor hightNobleLightTextColor];
     [self addSubview:self.titleLabel];
     
-    self.descView = [[UITextView alloc] init];
+    self.descView = [[SZTextView alloc] init];
     self.descView.userInteractionEnabled = NO;
     self.descView.backgroundColor = [UIColor clearColor];
     self.descView.text = YMLocalizedString(@"XPNobleCenterResidueView1");
@@ -58,6 +58,16 @@
     [self.closeButton setBackgroundImage:[UIImage imageNamed:@"noble_time_close"] forState:UIControlStateNormal];
     [self addSubview:self.closeButton];
     [self.closeButton addTarget:self action:@selector(onCloseButtonClick:) forControlEvents:UIControlEventTouchUpInside];
+    
+    
+    for (id view in self.descView.subviews) {
+        if ([view isKindOfClass:[UITextView class]]){
+            UITextView *textView = view;
+            textView.textAlignment = NSTextAlignmentLeft;
+            break;
+        }
+    }
+    
 }
 
 - (void)onCloseButtonClick:(UIButton *)button {

YuMi/Modules/YMMine/View/Setting/XPMineFeedbackViewController.m

@@ -26,7 +26,7 @@
 ///输入反馈的内容
 @property (nonatomic, strong) SZTextView  *contentTextView;
 ///微信或者qq
-@property (nonatomic, strong) UITextField  *contactField;
+@property (nonatomic, strong) MSBaseTextField  *contactField;
 ///提交
 @property (nonatomic, strong) UIButton  *submitBtn;
 
@@ -136,9 +136,9 @@
 	return _contentTextView;
 }
 
-- (UITextField *)contactField {
+- (MSBaseTextField *)contactField {
 	if (!_contactField) {
-		_contactField = [[UITextField alloc] init];
+		_contactField = [[MSBaseTextField alloc] init];
 		NSString * placeholder = YMLocalizedString(@"XPMineFeedbackViewController4");
 		_contactField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:placeholder attributes:@{NSFontAttributeName : [UIFont systemFontOfSize:14], NSForegroundColorAttributeName : [DJDKMIMOMColor secondTextColor]}];
 		_contactField.font = [UIFont systemFontOfSize:14];

YuMi/Modules/YMMine/View/SubViews/XPMineModifPayPwdView.m

@@ -14,7 +14,7 @@
 
 @interface XPMineModifPayPwdView ()
 ///输入框
-@property (nonatomic,strong) UITextField *contentTextField;
+@property (nonatomic,strong) MSBaseTextField *contentTextField;
 ///控制显示或者隐藏
 @property (nonatomic,strong) UIButton *commandButton;
 ///背景
@@ -91,9 +91,9 @@
     return _bgView;
 }
 
-- (UITextField *)contentTextField {
+- (MSBaseTextField *)contentTextField {
     if (!_contentTextField) {
-        _contentTextField = [[UITextField alloc] init];
+        _contentTextField = [[MSBaseTextField alloc] init];
         _contentTextField.secureTextEntry = YES;
         _contentTextField.font = [UIFont systemFontOfSize:15];
         _contentTextField.textColor = [DJDKMIMOMColor inputTextColor];

YuMi/Modules/YMMine/View/SubViews/XPMinePayPwdInputView.m

@@ -15,7 +15,7 @@
 ///分割线
 @property (nonatomic, strong) UIView *lineView;
 ///输入框
-@property (nonatomic, strong) UITextField *contentTextField;
+@property (nonatomic, strong) MSBaseTextField *contentTextField;
 ///状态按钮（隐藏显示密码、获取验证码、倒计时）
 @property (nonatomic, strong) UIButton *statusButton;
 ///是否密文显示
@@ -174,9 +174,9 @@
 	return _lineView;
 }
 
-- (UITextField *)contentTextField {
+- (MSBaseTextField *)contentTextField {
 	if (!_contentTextField) {
-		_contentTextField = [[UITextField alloc] init];
+		_contentTextField = [[MSBaseTextField alloc] init];
 		_contentTextField.secureTextEntry = YES;
 		_contentTextField.font = [UIFont systemFontOfSize:13];
 		_contentTextField.textColor = [DJDKMIMOMColor mainTextColor];

YuMi/Modules/YMMine/View/SubViews/XPMineVerifIdentityView.m

@@ -17,7 +17,7 @@
 ///分割线
 @property (nonatomic, strong) UIView  *lineView;
 ///输入框
-@property (nonatomic, strong) UITextField  *contentTextField;
+@property (nonatomic, strong) MSBaseTextField  *contentTextField;
 ///发送验证码
 @property (nonatomic, strong) UIButton  *smsCodeButton;
 @end
@@ -98,9 +98,9 @@
 	return _stackView;
 }
 
-- (UITextField *)contentTextField {
+- (MSBaseTextField *)contentTextField {
 	if (!_contentTextField) {
-		_contentTextField = [[UITextField alloc] init];
+		_contentTextField = [[MSBaseTextField alloc] init];
 		_contentTextField.secureTextEntry = YES;
 		_contentTextField.font = [UIFont systemFontOfSize:13];
 		_contentTextField.textColor = [DJDKMIMOMColor mainTextColor];

YuMi/Modules/YMMonents/View/XPMonentsPublishViewController.m

@@ -106,6 +106,13 @@
 	[self.datasource addObject:self.addPicImage];
 
 	self.addTopicView.hidden = ![ClientConfig shareConfig].canOpen;
+    for (id view in self.textView.subviews) {
+        if ([view isKindOfClass:[UITextView class]]){
+            UITextView *textView = view;
+            textView.textAlignment = NSTextAlignmentLeft;
+            break;
+        }
+    }
 }
 
 - (void)initSubViewConstraints {

YuMi/Modules/YMNewHome/View/Search/View/SubView/XPHomeSearchNavView.m

@@ -6,6 +6,7 @@
 //
 
 #import "XPHomeSearchNavView.h"
+
 ///Third
 #import <Masonry/Masonry.h>
 ///Tool
@@ -21,7 +22,7 @@
 ///搜索logo
 @property (nonatomic,strong) UIImageView *searchImageView;
 ///输入框
-@property (nonatomic,strong) UITextField *searchTextField;
+@property (nonatomic,strong) MSBaseTextField *searchTextField;
 ///取消
 @property (nonatomic,strong) UIButton *cancleButton;
 
@@ -144,16 +145,16 @@
 	return _searchImageView;
 }
 
-- (UITextField *)searchTextField {
+- (MSBaseTextField *)searchTextField {
 	if (!_searchTextField) {
-		_searchTextField = [[UITextField alloc] init];
+		_searchTextField = [[MSBaseTextField alloc] init];
 		_searchTextField.layer.cornerRadius = 15;
 		_searchTextField.layer.masksToBounds = YES;
 		_searchTextField.tintColor = [DJDKMIMOMColor secondTextColor];
 		_searchTextField.textColor = [DJDKMIMOMColor mainTextColor];
 		_searchTextField.backgroundColor = [UIColor clearColor];
 		_searchTextField.font = [UIFont systemFontOfSize:13];
-		NSString *placeholder = [NSString stringWithFormat:YMLocalizedString(@"XPHomeSearchNavView0")];
+        NSString *placeholder = YMLocalizedString(@"XPHomeSearchNavView0");
 		_searchTextField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:placeholder attributes:@{NSFontAttributeName : [UIFont systemFontOfSize:13], NSForegroundColorAttributeName : [DJDKMIMOMColor secondTextColor]}];
 		_searchTextField.clearButtonMode = UITextFieldViewModeWhileEditing;
 		_searchTextField.returnKeyType = UIReturnKeySearch;

YuMi/Modules/YMNewHome/View/Search/View/XPRoomSearchRecordViewController.m

@@ -84,7 +84,10 @@ NSString * const XPConstSearchRecordStoreKey = @"XPConstSearchRecordStoreKey";
     NSArray *array = [self searchRecordList];
     [self.searchList addObjectsFromArray:array];
     self.searchContentView.hidden = array.count == 0;
-    [self.searchCollectionView reloadData];
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        [self.searchCollectionView reloadData];
+       });
+    
 }
 
 - (void)touchesBegan:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event {

YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKRuleView.m

@@ -16,7 +16,7 @@
 ///标题
 @property (nonatomic, strong) UILabel *titleLabel;
 ///显示内容
-@property (nonatomic, strong) UITextView  *ruleTextView;
+@property (nonatomic, strong) SZTextView  *ruleTextView;
 ///背景
 @property (nonatomic, strong) UIImageView *backgroundImageView;
 
@@ -28,6 +28,13 @@
 	if (self = [super initWithFrame:frame]) {
 		[self initSubViews];
 		[self initSubViewConstraints];
+        for (id view in self.ruleTextView.subviews) {
+            if ([view isKindOfClass:[UITextView class]]){
+                UITextView *textView = view;
+                textView.textAlignment = NSTextAlignmentLeft;
+                break;
+            }
+        }
 	}
 	return self;
 }
@@ -84,9 +91,9 @@
 	return _titleLabel;
 }
 
-- (UITextView *)ruleTextView {
+- (SZTextView *)ruleTextView {
 	if (!_ruleTextView) {
-		_ruleTextView = [[UITextView alloc] init];
+		_ruleTextView = [[SZTextView alloc] init];
 		_ruleTextView.textColor = UIColorFromRGB(0xffffff);
 		_ruleTextView.backgroundColor = [UIColor clearColor];
 		_ruleTextView.font = [UIFont systemFontOfSize:14 weight:UIFontWeightMedium];

YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrpssRoomPKPanelView.m

@@ -32,7 +32,7 @@
 ///规则背景
 @property (nonatomic, strong) UIImageView *ruleBgImageView;
 ///规则
-@property (nonatomic, strong) UITextView *ruleTextView;
+@property (nonatomic, strong) SZTextView *ruleTextView;
 ///显示倒计时
 @property (nonatomic, strong) UILabel *timeLabel;
 ///最大的容器
@@ -114,6 +114,13 @@
 		
 		[self initSubViews];
 		[self initSubViewConstraints];
+        for (id view in self.ruleTextView.subviews) {
+            if ([view isKindOfClass:[UITextView class]]){
+                UITextView *textView = view;
+                textView.textAlignment = NSTextAlignmentLeft;
+                break;
+            }
+        }
 	}
 	return self;
 }
@@ -678,9 +685,9 @@
 	return _ruleBgImageView;
 }
 
-- (UITextView *)ruleTextView {
+- (SZTextView *)ruleTextView {
 	if (!_ruleTextView) {
-		_ruleTextView = [[UITextView alloc] init];
+		_ruleTextView = [[SZTextView alloc] init];
 		_ruleTextView.backgroundColor = [UIColor clearColor];
 		_ruleTextView.textColor = [UIColor whiteColor];
 		_ruleTextView.font = [UIFont systemFontOfSize:12];

YuMi/Modules/YMRoom/View/AcrossRoomPK/View/XPAcrossRoomPKSelectRoomView.m

@@ -34,7 +34,7 @@
 ///搜索logo
 @property (nonatomic,strong) UIButton *searchButton;
 ///输入框
-@property (nonatomic,strong) UITextField *searchTextField;
+@property (nonatomic,strong) MSBaseTextField *searchTextField;
 ///数据源
 @property (nonatomic, strong) NSMutableArray *datasource;
 ///当前的页数
@@ -316,9 +316,9 @@
 	return _searchButton;
 }
 
-- (UITextField *)searchTextField {
+- (MSBaseTextField *)searchTextField {
 	if (!_searchTextField) {
-		_searchTextField = [[UITextField alloc] init];
+		_searchTextField = [[MSBaseTextField alloc] init];
 		_searchTextField.layer.cornerRadius = 15;
 		_searchTextField.layer.masksToBounds = YES;
 		_searchTextField.tintColor = [UIColor whiteColor];

YuMi/Modules/YMRoom/View/AcrossRoomPK/View/XPAcrossRoomPKViewController.m

@@ -51,13 +51,13 @@
 @property (nonatomic, strong) UIButton *twentyMinuteButton;
 @property (nonatomic, strong) UIButton *thirtyMinuteButton;
 ///自定义PK时间
-@property (nonatomic, strong) UITextField  *customTimeTextField;
+@property (nonatomic, strong) MSBaseTextField  *customTimeTextField;
 ///玩法的容器
 @property (nonatomic,strong) UIStackView *playStackView;
 ///PK玩法title
 @property (nonatomic, strong) UILabel *pkPlayModeLabel;
 ///PK玩法
-@property (nonatomic, strong) UITextField  *pkPlayModeTextField;
+@property (nonatomic, strong) MSBaseTextField  *pkPlayModeTextField;
 ///发起挑战按钮
 @property (nonatomic, strong) UIButton *doneButton;
 ///选择房间的内容
@@ -517,9 +517,9 @@
 	}
 	return _thirtyMinuteButton;
 }
-- (UITextField *)customTimeTextField {
+- (MSBaseTextField *)customTimeTextField {
 	if (!_customTimeTextField) {
-		_customTimeTextField = [[UITextField alloc] init];
+		_customTimeTextField = [[MSBaseTextField alloc] init];
 		_customTimeTextField.layer.cornerRadius = 15;
 		_customTimeTextField.layer.masksToBounds = YES;
 		_customTimeTextField.backgroundColor = UIColorFromRGB(0x4C4C6A);
@@ -557,9 +557,9 @@
 	return _pkPlayModeLabel;
 }
 
-- (UITextField *)pkPlayModeTextField {
+- (MSBaseTextField *)pkPlayModeTextField {
 	if (!_pkPlayModeTextField) {
-		_pkPlayModeTextField = [[UITextField alloc] init];
+		_pkPlayModeTextField = [[MSBaseTextField alloc] init];
 		_pkPlayModeTextField.layer.cornerRadius = 15;
 		_pkPlayModeTextField.layer.masksToBounds = YES;
 		_pkPlayModeTextField.backgroundColor = UIColorFromRGB(0x4C4C6A);

YuMi/Modules/YMRoom/View/ActivityContainerView/XPRoomActivityContainerView.m

@@ -557,11 +557,11 @@ UIKIT_EXTERN NSString *kShowFirstRechargeView;
     CGFloat y = self.frame.size.height + self.frame.origin.y - 124;
     choosePlayView.tag = 98021;
     [self.hostDelegate.getSuperView addSubview:choosePlayView];
-    choosePlayView.frame = CGRectMake(KScreenWidth, y, 201, 124);
+    choosePlayView.frame = isMSRTL() ? CGRectMake(-201, y, 201, 124) : CGRectMake(KScreenWidth, y, 201, 124);
  
     [UIView animateWithDuration:0.1 animations:^{
        
-        choosePlayView.frame = CGRectMake(KScreenWidth - 201, y, 201, 124);
+        choosePlayView.frame = isMSRTL() ? CGRectMake(15, y, 201, 124) : CGRectMake(KScreenWidth - 201, y, 201, 124);
     }];
 }
 -(void)clickPlayTypeWithModel:(ActivityInfoModel *)model{
@@ -606,7 +606,7 @@ UIKIT_EXTERN NSString *kShowFirstRechargeView;
     self.isShowChoosePlayView = NO;
     CGFloat y = self.frame.size.height + self.frame.origin.y - 124;
     [UIView animateWithDuration:0.1 animations:^{
-        view.frame = CGRectMake(KScreenWidth, y, 201, 124);
+        view.frame = isMSRTL() ? CGRectMake(-201, y, 201, 124) : CGRectMake(KScreenWidth, y, 201, 124);
     }completion:^(BOOL finished) {
         self.clickPlayView.hidden = NO;
         [view removeFromSuperview];

YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorPKRuleView.m

@@ -19,7 +19,7 @@
 ///背景
 @property (nonatomic, strong) UIImageView *backgroundImageView;
 ///显示内容
-@property (nonatomic, strong) UITextView *ruleTextView;
+@property (nonatomic, strong) SZTextView *ruleTextView;
 ///关闭
 @property (nonatomic, strong) UIButton *closeBtn;
 
@@ -32,6 +32,13 @@
     if (self = [super initWithFrame:frame]) {
         [self initSubViews];
         [self initSubViewConstraints];
+        for (id view in self.ruleTextView.subviews) {
+            if ([view isKindOfClass:[UITextView class]]){
+                UITextView *textView = view;
+                textView.textAlignment = NSTextAlignmentLeft;
+                break;
+            }
+        }
     }
     return self;
 }
@@ -101,9 +108,9 @@
     return _titleLabel;
 }
 
-- (UITextView *)ruleTextView {
+- (SZTextView *)ruleTextView {
     if (!_ruleTextView) {
-        _ruleTextView = [[UITextView alloc] init];
+        _ruleTextView = [[SZTextView alloc] init];
         _ruleTextView.textColor = [DJDKMIMOMColor mainTextColor];
         _ruleTextView.backgroundColor = [UIColor clearColor];
         _ruleTextView.font = [UIFont systemFontOfSize:12];

YuMi/Modules/YMRoom/View/AnchorPK/View/XPAnchorPKSelectRoomView.m

@@ -32,7 +32,7 @@
 ///搜索logo
 @property (nonatomic,strong) UIButton *searchButton;
 ///输入框
-@property (nonatomic,strong) UITextField *searchTextField;
+@property (nonatomic,strong) MSBaseTextField *searchTextField;
 ///数据源
 @property (nonatomic, strong) NSMutableArray *datasource;
 ///当前的页数
@@ -303,9 +303,9 @@
     return _searchButton;
 }
 
-- (UITextField *)searchTextField {
+- (MSBaseTextField *)searchTextField {
     if (!_searchTextField) {
-        _searchTextField = [[UITextField alloc] init];
+        _searchTextField = [[MSBaseTextField alloc] init];
         _searchTextField.layer.cornerRadius = 15;
         _searchTextField.layer.masksToBounds = YES;
         _searchTextField.tintColor = [UIColor whiteColor];

YuMi/Modules/YMRoom/View/AnchorPK/View/XPAnchorPKViewController.m

@@ -48,13 +48,13 @@
 @property (nonatomic, strong) UIButton *twentyMinuteButton;
 @property (nonatomic, strong) UIButton *thirtyMinuteButton;
 ///自定义PK时间
-@property (nonatomic, strong) UITextField  *customTimeTextField;
+@property (nonatomic, strong) MSBaseTextField  *customTimeTextField;
 ///玩法的容器
 @property (nonatomic,strong) UIStackView *playStackView;
 ///PK玩法title
 @property (nonatomic, strong) UILabel *pkPlayModeLabel;
 ///PK玩法
-@property (nonatomic, strong) UITextField  *pkPlayModeTextField;
+@property (nonatomic, strong) MSBaseTextField  *pkPlayModeTextField;
 ///发起挑战按钮
 @property (nonatomic, strong) UIButton *doneButton;
 ///选择房间的内容
@@ -494,9 +494,9 @@
     }
     return _thirtyMinuteButton;
 }
-- (UITextField *)customTimeTextField {
+- (MSBaseTextField*)customTimeTextField {
     if (!_customTimeTextField) {
-        _customTimeTextField = [[UITextField alloc] init];
+        _customTimeTextField = [[MSBaseTextField alloc] init];
         _customTimeTextField.layer.cornerRadius = 15;
         _customTimeTextField.layer.masksToBounds = YES;
         _customTimeTextField.backgroundColor = UIColorFromRGB(0x4C4C6A);
@@ -534,9 +534,9 @@
     return _pkPlayModeLabel;
 }
 
-- (UITextField *)pkPlayModeTextField {
+- (MSBaseTextField *)pkPlayModeTextField {
     if (!_pkPlayModeTextField) {
-        _pkPlayModeTextField = [[UITextField alloc] init];
+        _pkPlayModeTextField = [[MSBaseTextField alloc] init];
         _pkPlayModeTextField.layer.cornerRadius = 15;
         _pkPlayModeTextField.layer.masksToBounds = YES;
         _pkPlayModeTextField.backgroundColor = UIColorFromRGB(0x4C4C6A);

YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomDatingVipUpMicView.m

@@ -17,7 +17,7 @@
 ///背景
 @property (nonatomic,strong) UIImageView *backImageView;
 ///显示内容
-@property (nonatomic,strong) UITextView *contentView;
+@property (nonatomic,strong) SZTextView *contentView;
 ///关闭按钮
 @property (nonatomic,strong) UIButton *closeButton;
 @end
@@ -28,6 +28,13 @@
 	if (self) {
 		[self initSubViews];
 		[self initSubViewConstraints];
+        for (id view in self.contentView.subviews) {
+            if ([view isKindOfClass:[UITextView class]]){
+                UITextView *textView = view;
+                textView.textAlignment = NSTextAlignmentLeft;
+                break;
+            }
+        }
 	}
 	return self;
 }
@@ -76,9 +83,9 @@
 	return _backImageView;
 }
 
-- (UITextView *)contentView {
+- (SZTextView *)contentView {
 	if (!_contentView) {
-		_contentView = [[UITextView alloc] init];
+		_contentView = [[SZTextView alloc] init];
         _contentView.text = YMLocalizedString(@"XPRoomDatingVipUpMicView0");
 		_contentView.backgroundColor = [UIColor clearColor];
 		_contentView.textColor = UIColorFromRGB(0xFFF9BC);

YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeBuyView.m

@@ -24,7 +24,7 @@
 ///输入爱心背景
 @property(nonatomic,strong) UIView *textFieldBgView;
 ///输入爱心数量
-@property(nonatomic,strong) UITextField *textField;
+@property(nonatomic,strong) MSBaseTextField *textField;
 ///购买
 @property(nonatomic,strong) UIButton *purchaseBtn;
 ///购买的数量
@@ -275,9 +275,9 @@
     }
     return _textFieldBgView;
 }
-- (UITextField *)textField{
+- (MSBaseTextField *)textField{
     if(!_textField){
-        _textField = [[UITextField alloc]init];
+        _textField = [[MSBaseTextField alloc]init];
         NSMutableAttributedString *textAtt = [[NSMutableAttributedString alloc]initWithString:YMLocalizedString(@"XPTreasureFairyBottomView0") attributes:@{NSFontAttributeName:kFontMedium(10),NSForegroundColorAttributeName:[UIColor colorWithWhite:1 alpha:0.6]}];
         _textField.attributedPlaceholder = textAtt;
         _textField.font = kFontMedium(10);

YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeConfirmBuyNumView.m

@@ -14,7 +14,7 @@
 ///背景
 @property(nonatomic,strong) UIImageView *bgView;
 ///输入框
-@property(nonatomic,strong) UITextField *textFiled;
+@property(nonatomic,strong) MSBaseTextField *textFiled;
 
 @end
 @implementation XPCandyTreeConfirmBuyNumView
@@ -151,9 +151,9 @@
     }
     return _bgView;
 }
-- (UITextField *)textFiled {
+- (MSBaseTextField *)textFiled {
     if (!_textFiled) {
-        _textFiled = [[UITextField alloc] init];
+        _textFiled = [[MSBaseTextField alloc] init];
         _textFiled.tintColor = [UIColor whiteColor];
         _textFiled.textColor = [UIColor whiteColor];
         _textFiled.backgroundColor = [UIColor clearColor];

YuMi/Modules/YMRoom/View/FirstRecharge/View/XPFirstRechargeView.m

@@ -59,7 +59,7 @@
 ///礼包说明背景
 @property (nonatomic, strong) UIImageView *descripBgView;
 ///礼包说明
-@property (nonatomic, strong) UITextView *descripTextView;
+@property (nonatomic, strong) SZTextView *descripTextView;
 ///立即充值
 @property (nonatomic, strong) UIButton *rechargeButton;
 ///数据源
@@ -88,7 +88,13 @@
         [self initSubViewConstraints];
         [self getFirstRechargeRewardList];
         
-        
+        for (id view in self.descripTextView.subviews) {
+            if ([view isKindOfClass:[UITextView class]]){
+                UITextView *textView = view;
+                textView.textAlignment = NSTextAlignmentLeft;
+                break;
+            }
+        }
     }
     return self;
 }
@@ -625,9 +631,9 @@
     return _descripBgView;
 }
 
-- (UITextView *)descripTextView {
+- (SZTextView *)descripTextView {
     if (!_descripTextView) {
-        _descripTextView = [[UITextView alloc] init];
+        _descripTextView = [[SZTextView alloc] init];
         _descripTextView.text = YMLocalizedString(@"XPFirstRechargeViewController0");
         _descripTextView.textColor = UIColorFromRGB(0x333333);
         _descripTextView.backgroundColor = [UIColor clearColor];

YuMi/Modules/YMRoom/View/MenuContainerView/XPRoomSendTextView.m

@@ -26,7 +26,7 @@
 ///
 @property (nonatomic,strong) UIStackView *stackView;
 ///输入框
-@property (nonatomic, strong) UITextField *editTextFiled;
+@property (nonatomic, strong) MSBaseTextField *editTextFiled;
 ///发送按钮
 @property (nonatomic, strong) UIButton *sendButton;
 ///文本输入的内容
@@ -263,9 +263,9 @@
     
 }
 #pragma mark - Getters And Setters
-- (UITextField *)editTextFiled{
+- (MSBaseTextField *)editTextFiled{
     if (!_editTextFiled) {
-        _editTextFiled = [[UITextField alloc] init];
+        _editTextFiled = [[MSBaseTextField alloc] init];
     NSAttributedString * attribute = [[NSAttributedString alloc] initWithString:YMLocalizedString(@"XPRoomSendTextView0") attributes:@{NSFontAttributeName : [UIFont systemFontOfSize:15], NSForegroundColorAttributeName : [DJDKMIMOMColor secondTextColor]}];
         _editTextFiled.attributedPlaceholder = attribute;
         _editTextFiled.borderStyle = UITextBorderStyleNone;

YuMi/Modules/YMRoom/View/QuickMessageView/XPRoomQuickMessageContainView.m

@@ -142,7 +142,7 @@
     }];
 }
 
-- (void)onCloseButtonClick:(UIButton *)sender {
+- (void)onCloseButtonClick {
     [self mas_updateConstraints:^(MASConstraintMaker *make) {
         make.height.mas_equalTo(0);
     }];
@@ -161,6 +161,9 @@
 		return;
 	}
 	_titleArray = titleArray;
+    if (titleArray.count == 0){
+        [self onCloseButtonClick];
+    }
 	[self.collectionView reloadData];
 }
 
@@ -183,7 +186,7 @@
     if (!_closeButton) {
         _closeButton = [[UIButton alloc] init];
         [_closeButton setImage:[UIImage imageNamed:@"room_gift_graffiti_close"] forState:UIControlStateNormal];
-        [_closeButton addTarget:self action:@selector(onCloseButtonClick:) forControlEvents:UIControlEventTouchUpInside];
+        [_closeButton addTarget:self action:@selector(onCloseButtonClick) forControlEvents:UIControlEventTouchUpInside];
     }
     return _closeButton;
 }

YuMi/Modules/YMRoom/View/RoomHeaderView/RoomHeaderView.m

@@ -152,10 +152,10 @@
         make.centerY.mas_equalTo(self.settingButton);
         make.width.height.mas_equalTo(22);
     }];
-   
+    
     [self.collectButton mas_makeConstraints:^(MASConstraintMaker *make) {
         make.centerY.equalTo(self.settingButton);
-        make.leading.equalTo(self.lockRoomImageView.mas_trailing).offset(5);
+        make.leading.mas_equalTo(150);
         make.size.mas_equalTo(CGSizeMake(20, 20));
     }];
     

YuMi/Modules/YMRoom/View/Sailing/View/XPSailingViewController.m

@@ -69,7 +69,7 @@ NSString * const kSailingPrizeAlertKey = @"kSailingPrizeAlertKey";
 ///减
 @property (nonatomic,strong) UIButton *reduButton;
 ///输入个数
-@property (nonatomic,strong) UITextField *textField;
+@property (nonatomic,strong) MSBaseTextField *textField;
 ///探索
 @property (nonatomic,strong) UIButton *exploreButton;
 ///消耗燃油
@@ -581,9 +581,9 @@ NSString * const kSailingPrizeAlertKey = @"kSailingPrizeAlertKey";
 	return _numberView;
 }
 
-- (UITextField *)textField {
+- (MSBaseTextField *)textField {
 	if (!_textField) {
-		_textField = [[UITextField alloc] init];
+		_textField = [[MSBaseTextField alloc] init];
 		_textField.textColor = [DJDKMIMOMColor colorWithHexString:@"#64472E"];
 		_textField.backgroundColor = [DJDKMIMOMColor colorWithHexString:@"#DACBB4"];
 		_textField.font = [UIFont systemFontOfSize:15];

YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftItemCollectionViewCell.m

@@ -123,7 +123,9 @@
 		make.centerX.equalTo(self.contentView);
 		make.height.mas_equalTo(10);
 	}];
-	
+    [self.logoImageView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.width.height.mas_equalTo(10);
+    }];
 	[self.giftNumLabel mas_makeConstraints:^(MASConstraintMaker *make) {
 		make.top.equalTo(self.contentView).offset(4.5);
 		make.leading.equalTo(self.contentView).offset(6);
@@ -143,6 +145,7 @@
         make.leading.mas_equalTo(10);
         make.bottom.equalTo(self.giftImageView.mas_bottom);
     }];
+    
 }
 
 - (UIImageView *)createImageView:(NSString *)imageName {

YuMi/Modules/YMRoom/View/SendGiftView/View/PIGiftInfoSegmentedView.m

@@ -245,8 +245,10 @@
     }else{
         _giftList = [[NSMutableArray alloc]initWithArray:@[normaleArray,luckyArray,weekStarArray,nobleArray,anchorArray]];
     }
-   
-    [self.pi_containerView reloadData];
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        [self.pi_containerView reloadData];
+       });
+    
 
 }
 

YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftBarView.m

@@ -41,7 +41,7 @@
 ///自定义个数
 @property (nonatomic,strong) UIView *customCountView;
 //输入框
-@property (nonatomic, strong) UITextField *editTextFiled;
+@property (nonatomic, strong) MSBaseTextField *editTextFiled;
 //发送按钮
 @property (nonatomic, strong) UIButton *sureButton;
 ///送礼物的个数
@@ -473,9 +473,9 @@
 }
  
 
-- (UITextField *)editTextFiled {
+- (MSBaseTextField *)editTextFiled {
 	if (!_editTextFiled) {
-		_editTextFiled = [[UITextField alloc] init];
+		_editTextFiled = [[MSBaseTextField alloc] init];
 		NSAttributedString * attribute = [[NSAttributedString alloc] initWithString:YMLocalizedString(@"XPGiftBarView5") attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:17], NSForegroundColorAttributeName:[DJDKMIMOMColor secondTextColor]}];
 		_editTextFiled.attributedPlaceholder = attribute;
 		_editTextFiled.borderStyle = UITextBorderStyleNone;

YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftUsersView.m

@@ -150,7 +150,14 @@
 		self.stackView.hidden = YES;
 		self.oneStackView.hidden = NO;
 	} else {
-		[self.collectionView reloadData];
+        
+        
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+            [self.collectionView reloadData];
+           });
+        
+        
+		
 		self.oneStackView.hidden = YES;
 		self.stackView.hidden = NO;
 	}

YuMi/Modules/YMRoom/View/SendGiftView/View/XPSendGiftView.m

@@ -710,7 +710,7 @@ UIKIT_EXTERN NSString * kShowFirstRechargeView;
 
 ///普通礼物 /幸运礼物
 - (void)getNormalGiftListSuccess:(NSArray<GiftInfoModel *> *)giftList {
-    
+      
         self.giftInfoView.normalOriginArray = giftList;
    
 	

YuMi/Modules/YMRoom/View/SendRedPacket/Cell/PIInputEntireServerScrollingView.m

@@ -7,7 +7,7 @@
 
 #import "PIInputEntireServerScrollingView.h"
 @interface PIInputEntireServerScrollingView()
-@property(nonatomic,strong) UITextField *pi_textField;
+@property(nonatomic,strong) MSBaseTextField *pi_textField;
 @property(nonatomic,strong) UILabel *pi_numView;
 @end
 @implementation PIInputEntireServerScrollingView
@@ -58,9 +58,9 @@
 - (NSString *)getContent{
     return self.pi_textField.text;
 }
-- (UITextField *)pi_textField{
+- (MSBaseTextField *)pi_textField{
     if(!_pi_textField){
-        _pi_textField = [[UITextField alloc]init];
+        _pi_textField = [[MSBaseTextField alloc]init];
         _pi_textField.text = YMLocalizedString(@"PIInputEntireServerScrollingView0");
         _pi_textField.textColor = UIColorFromRGB(0x322F4D);
         _pi_textField.font = kFontRegular(16);

YuMi/Modules/YMRoom/View/SendRedPacket/Cell/PIInputRedPacketView.m

@@ -14,7 +14,7 @@
 ///标题
 @property(nonatomic,strong) UILabel *pi_titleView;
 ///数量
-@property(nonatomic,strong) UITextField *pi_textField;
+@property(nonatomic,strong) MSBaseTextField *pi_textField;
 ///分割线
 @property(nonatomic,strong) UIView *pi_lineView;
 ///单位
@@ -133,9 +133,9 @@
     }
     return _pi_titleView;
 }
-- (UITextField *)pi_textField{
+- (MSBaseTextField *)pi_textField{
     if(!_pi_textField){
-        _pi_textField = [[UITextField alloc]init];
+        _pi_textField = [[MSBaseTextField alloc]init];
         NSMutableAttributedString *placeholder = [[NSMutableAttributedString alloc]initWithString:@"0" attributes:@{NSFontAttributeName:kFontRegular(16),NSForegroundColorAttributeName:UIColorFromRGB(0xB3B3C3)}];
         _pi_textField.attributedPlaceholder = placeholder;
         _pi_textField.textColor = UIColorFromRGB(0x322F4D);

YuMi/Modules/YMRoom/View/SendRedPacket/Cell/PIInputScrollingView.m

@@ -7,7 +7,7 @@
 
 #import "PIInputScrollingView.h"
 @interface PIInputScrollingView()
-@property(nonatomic,strong) UITextField *pi_textField;
+@property(nonatomic,strong) MSBaseTextField *pi_textField;
 @end
 @implementation PIInputScrollingView
 
@@ -34,9 +34,9 @@
     return self.pi_textField.text;
 }
 #pragma mark - 懒加载
-- (UITextField *)pi_textField{
+- (MSBaseTextField *)pi_textField{
     if(!_pi_textField){
-        _pi_textField = [[UITextField alloc]init];
+        _pi_textField = [[MSBaseTextField alloc]init];
         NSMutableAttributedString *placeholder = [[NSMutableAttributedString alloc]initWithString:YMLocalizedString(@"PIInputScrollingView0") attributes:@{NSFontAttributeName:kFontRegular(16),NSForegroundColorAttributeName:UIColorFromRGB(0xB3B3C3)}];
         _pi_textField.attributedPlaceholder = placeholder;
         _pi_textField.textColor = UIColorFromRGB(0x322F4D);

YuMi/Modules/YMRoom/View/SendRedPacket/XPRoomSendRedPacketViewController.m

@@ -53,7 +53,7 @@
 ///红包数量标题
 @property (nonatomic, strong) UILabel *packetTitle;
 ///红包数量输入框
-@property (nonatomic, strong) UITextField *packetTextField;
+@property (nonatomic, strong) MSBaseTextField *packetTextField;
 ///红包数量单位
 @property (nonatomic, strong) UILabel *packetUnit;
 ///总钻石数容器
@@ -61,7 +61,7 @@
 ///钻石数量标题
 @property (nonatomic, strong) UILabel *diamondTitle;
 ///钻石数量输入框
-@property (nonatomic, strong) UITextField *diamondTextField;
+@property (nonatomic, strong) MSBaseTextField *diamondTextField;
 ///钻石数量单位
 @property (nonatomic, strong) UILabel *diamondUnit;
 ///红包数量描述
@@ -69,7 +69,7 @@
 ///输入框背景
 @property (nonatomic, strong) UIView *descContentView;
 ///广播输入框
-@property (nonatomic,strong) UITextView *wishTextView;
+@property (nonatomic,strong) SZTextView *wishTextView;
 ///祝福语palceHolder
 @property (nonatomic, strong) UILabel *wishPlaceHolderLabel;
 ///红包数量描述
@@ -112,6 +112,13 @@
     [self initSubViews];
     [self initSubViewConstraints];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(onTextViewChange:) name:UITextViewTextDidChangeNotification object:nil];
+    for (id view in self.wishTextView.subviews) {
+        if ([view isKindOfClass:[UITextView class]]){
+            UITextView *textView = view;
+            textView.textAlignment = NSTextAlignmentLeft;
+            break;
+        }
+    }
 }
 
 - (void)viewWillAppear:(BOOL)animated {
@@ -536,9 +543,9 @@
     return _packetTitle;
 }
 
-- (UITextField *)packetTextField {
+- (MSBaseTextField *)packetTextField {
     if (!_packetTextField) {
-        UITextField *label = [[UITextField alloc] init];
+        UITextField *label = [[MSBaseTextField alloc] init];
         label.keyboardType = UIKeyboardTypeNumberPad;
         label.textAlignment = NSTextAlignmentRight;
         NSMutableAttributedString *attrString = [[NSMutableAttributedString alloc]initWithString:@"1-100" attributes:@{NSForegroundColorAttributeName: UIColorRGBAlpha(0xffffff, 0.5)}];
@@ -581,9 +588,9 @@
     return _diamondTitle;
 }
 
-- (UITextField *)diamondTextField {
+- (MSBaseTextField *)diamondTextField {
     if (!_diamondTextField) {
-        UITextField *label = [[UITextField alloc] init];
+        UITextField *label = [[MSBaseTextField alloc] init];
         label.keyboardType = UIKeyboardTypeNumberPad;
         label.textAlignment = NSTextAlignmentRight;
         NSMutableAttributedString *attrString = [[NSMutableAttributedString alloc]initWithString:@"0" attributes:@{NSForegroundColorAttributeName: UIColorRGBAlpha(0xffffff, 0.5)}];
@@ -627,9 +634,9 @@
     return _descContentView;
 }
 
-- (UITextView *)wishTextView {
+- (SZTextView *)wishTextView {
     if (!_wishTextView) {
-        _wishTextView = [[UITextView alloc] init];
+        _wishTextView = [[SZTextView alloc] init];
         _wishTextView.layer.cornerRadius = 8;
         _wishTextView.layer.masksToBounds = YES;
         _wishTextView.backgroundColor = [UIColor clearColor];

YuMi/Modules/YMRoom/View/Setting/View/XPRoomSettingInputView.m

@@ -26,7 +26,7 @@
 ///显示个数
 @property (nonatomic, strong) UILabel *countLabel;
 ///输入框
-@property (nonatomic, strong) UITextField *contentTextField;
+@property (nonatomic, strong) MSBaseTextField *contentTextField;
 ///输入错误的label
 @property (nonatomic,strong) UILabel *failLabel;
 @end
@@ -226,9 +226,9 @@
 	return _countLabel;
 }
 
-- (UITextField *)contentTextField {
+- (MSBaseTextField *)contentTextField {
 	if (_contentTextField == nil) {
-		_contentTextField = [[UITextField alloc] init];
+		_contentTextField = [[MSBaseTextField alloc] init];
 		_contentTextField.delegate = self;
 		_contentTextField.layer.cornerRadius = 20;
 		_contentTextField.layer.masksToBounds = YES;

YuMi/Modules/YMRoom/View/Setting/View/XPRoomTopicAlertView.m

@@ -19,7 +19,7 @@
 ///显示标题
 @property (nonatomic,strong) UILabel *titleLabel;
 ///显示文本
-@property (nonatomic,strong) UITextView *textView;
+@property (nonatomic,strong) SZTextView *textView;
 ///关闭按钮
 @property (nonatomic,strong) UIButton *closeButton;
 
@@ -33,6 +33,13 @@
 	if (self) {
 		[self initSubViews];
 		[self initSubViewConstraints];
+        for (id view in self.textView.subviews) {
+            if ([view isKindOfClass:[UITextView class]]){
+                UITextView *textView = view;
+                textView.textAlignment = NSTextAlignmentLeft;
+                break;
+            }
+        }
 	}
 	return self;
 }
@@ -96,9 +103,9 @@
 	return _titleLabel;
 }
 
-- (UITextView *)textView {
+- (SZTextView *)textView {
 	if (!_textView) {
-		_textView = [[UITextView alloc] init];
+		_textView = [[SZTextView alloc] init];
 		_textView.textColor = [DJDKMIMOMColor mainTextColor];
 		_textView.backgroundColor = [UIColor clearColor];
 		_textView.font = [UIFont systemFontOfSize:15];

YuMi/Modules/YMRoom/View/Setting/View/XPRoomTopicViewController.m

@@ -20,11 +20,11 @@
 
 @interface XPRoomTopicViewController ()<XPRoomTopicProtocol, UITextViewDelegate>
 ///显示标题
-@property (nonatomic,strong) UITextField *textField;
+@property (nonatomic,strong) MSBaseTextField *textField;
 ///标题显示多少个
 @property (nonatomic,strong) UILabel *titleNumberLabel;
 ///显示内容
-@property (nonatomic,strong) UITextView *contentTextView;
+@property (nonatomic,strong) SZTextView *contentTextView;
 ///内容显示多少个
 @property (nonatomic,strong) UILabel *contentLabel;
 ///确认
@@ -45,6 +45,13 @@
     [super viewDidLoad];
 	[self initSubViews];
 	[self initSubViewConstraints];
+    for (id view in self.contentTextView.subviews) {
+        if ([view isKindOfClass:[UITextView class]]){
+            UITextView *textView = view;
+            textView.textAlignment = NSTextAlignmentLeft;
+            break;
+        }
+    }
 }
 
 - (void)touchesBegan:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event {
@@ -157,9 +164,9 @@
 	}
 }
 
-- (UITextField *)textField {
+- (MSBaseTextField *)textField {
 	if (!_textField) {
-		_textField = [[UITextField alloc] init];
+		_textField = [[MSBaseTextField alloc] init];
 		_textField.layer.cornerRadius = 8;
 		_textField.layer.masksToBounds = YES;
 		_textField.backgroundColor = [DJDKMIMOMColor appCellBackgroundColor];
@@ -185,9 +192,9 @@
 	return _titleNumberLabel;
 }
 
-- (UITextView *)contentTextView {
+- (SZTextView *)contentTextView {
 	if (!_contentTextView) {
-		_contentTextView = [[UITextView alloc] init];
+		_contentTextView = [[SZTextView alloc] init];
 		_contentTextView.backgroundColor = [UIColor clearColor];
 		_contentTextView.font = [UIFont systemFontOfSize:13];
 		_contentTextView.tintColor = [UIColor clearColor];

YuMi/Modules/YMRoom/View/TreasureFairy/View/View/PITreasureFairyBuyElfShardInputNumView.m

@@ -14,7 +14,7 @@
 ///背景
 @property(nonatomic,strong) UIView *bgView;
 ///输入框
-@property(nonatomic,strong) UITextField *textFiled;
+@property(nonatomic,strong) MSBaseTextField *textFiled;
 
 @end
 @implementation PITreasureFairyBuyElfShardInputNumView
@@ -130,9 +130,9 @@
     }
     return _bgView;
 }
-- (UITextField *)textFiled {
+- (MSBaseTextField *)textFiled {
     if (!_textFiled) {
-        _textFiled = [[UITextField alloc] init];
+        _textFiled = [[MSBaseTextField alloc] init];
         _textFiled.tintColor = [UIColor whiteColor];
         _textFiled.textColor = [UIColor whiteColor];
         _textFiled.backgroundColor = [UIColor clearColor];

YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyBottomView.m

@@ -27,7 +27,7 @@
 ///输入数量背景
 @property(nonatomic,strong) UIView *textBgView;
 ///输入数量
-@property(nonatomic,strong) UITextField *textField;
+@property(nonatomic,strong) MSBaseTextField *textField;
 ///购买
 @property(nonatomic,strong) UIButton *buyBtn;
 ///购买的数量
@@ -293,9 +293,9 @@
     }
     return _textBgView;
 }
-- (UITextField *)textField{
+- (MSBaseTextField *)textField{
     if(!_textField){
-        _textField = [[UITextField alloc]init];
+        _textField = [[MSBaseTextField alloc]init];
         NSMutableAttributedString *textAtt = [[NSMutableAttributedString alloc]initWithString:YMLocalizedString(@"XPTreasureFairyBottomView0") attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:9 weight:UIFontWeightRegular],NSForegroundColorAttributeName:UIColorFromRGB(0xF6F6F6)}];
         _textField.attributedPlaceholder = textAtt;
         _textField.font = [UIFont systemFontOfSize:9 weight:UIFontWeightRegular];

YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyFriendView.m

@@ -36,7 +36,7 @@
 ///搜索
 @property (nonatomic,strong) UIView *searchView;
 ///输入框
-@property (nonatomic,strong) UITextField *searchTextField;
+@property (nonatomic,strong) MSBaseTextField *searchTextField;
 ///列表
 @property (nonatomic,strong) UITableView *tableView;
 ///点击消失键盘
@@ -270,9 +270,9 @@
 	return _searchView;
 }
 
-- (UITextField *)searchTextField {
+- (MSBaseTextField *)searchTextField {
 	if (!_searchTextField) {
-		_searchTextField = [[UITextField alloc] init];
+		_searchTextField = [[MSBaseTextField alloc] init];
 		_searchTextField.layer.cornerRadius = 12;
 		_searchTextField.layer.masksToBounds = YES;
 		_searchTextField.tintColor = [DJDKMIMOMColor colorWithHexString:@"#59FDFF"];

YuMi/Modules/YMRoom/View/WishGift/View/XPWishGiftCreateItemViewController.m

@@ -35,7 +35,7 @@
 ///减
 @property (nonatomic,strong) UIButton *subtractButton;
 ///输入框
-@property (nonatomic,strong) UITextField *textField;
+@property (nonatomic,strong) MSBaseTextField *textField;
 ///添加
 @property (nonatomic,strong) UIButton *addButton;
 ///关闭按钮
@@ -464,9 +464,9 @@
 	return _numberStackView;
 }
 
-- (UITextField *)textField {
+- (MSBaseTextField *)textField {
 	if (!_textField) {
-		_textField = [[UITextField alloc] init];
+		_textField = [[MSBaseTextField alloc] init];
 		_textField.layer.cornerRadius = 4;
 		_textField.layer.masksToBounds = YES;
 		_textField.tintColor = [DJDKMIMOMColor secondTextColor];

YuMi/Structure/PrefixHeader.pch

@@ -60,4 +60,6 @@ isEnterprise = [bundleID isEqualToString:@"com.hflighting.yumi"];\
 #import "UIImage+ImageEffects.h"
 #import "UIImage+MSRTL.h"
 #import "MSBaseRTLFlowLayout.h"
+#import "MSBaseTextField.h"
+#import "SZTextView.h"
 #endif /* PrefixHeader_pch */

YuMi/ar.lproj/InfoPlist.strings

@@ -1,10 +1,4 @@
-/* 
-  InfoPlist.strings
-  xplan-ios
 
-  Created by 冯硕 on 2022/10/13.
-  
-*/
 NSCameraUsageDescription = "تحناج  \"بيكو\"  إلى موافقتك قبل أن تتمكن من الزيارة والتقاط الصور وتحميل صورك ، ثم عرضها على صفحتك الرئيسية الشخصية ليراها الآخرون";
 NSLocalNetworkUsageDescription = "سيكتشف التطبيق الأجهزة الموجودة على شبكتك ويتصل بها";
 NSMicrophoneUsageDescription = "تحتاج \"بيكو\" إلى موافقتك قبل أن تتمكن من إجراء محادثة صوتية";

YuMi/ar.lproj/Localizable.strings

@@ -2121,7 +2121,7 @@ ineHeadView12" = "الحمل";
 
 "XPGiftEmptyCollectionViewCell0" = "الحقيبة فارغة حالياً~";
 
-"XPGiftUserCollectionViewCell0" = "موضع مالك الغرفة";
+"XPGiftUserCollectionViewCell0" = "مضيف";
 
 "XPGiftTwelveStarBroadcastView0" = "الشهر الماضي كان %@ النجم الرئيسي";
 "XPGiftTwelveStarBroadcastView1" = "الشهر الماضي كان النجم الرئيسي لبرج العقرب";

YuMi/en.lproj/InfoPlist.strings

@@ -1,10 +1,4 @@
-/* 
-  InfoPlist.strings
-  xplan-ios
 
-  Created by 冯硕 on 2022/10/13.
-  
-*/
  
 NSCameraUsageDescription ="\"MoliStar\" needs your consent before you can visit, take photos and upload your pictures, and then display them on your personal homepage for others to view";
 NSLocalNetworkUsageDescription ="The app will discover and connect to devices on your network";

YuMi/en.lproj/Localizable.strings

@@ -1874,7 +1874,7 @@
 
 "XPGiftEmptyCollectionViewCell0" = "Backpack currently empty~";
 
-"XPGiftUserCollectionViewCell0" = "Room Owner";
+"XPGiftUserCollectionViewCell0" = "Host";
 
 "XPGiftTwelveStarBroadcastView0" = "Previous zodiac month %@ host";
 "XPGiftTwelveStarBroadcastView1" = "Previous zodiac month Scorpio host";

YuMi/zh-Hans.lproj/InfoPlist.strings

@@ -1,10 +1,4 @@
-/* 
-  InfoPlist.strings
-  xplan-ios
 
-  Created by 冯硕 on 2022/10/13.
-  
-*/
 NSCameraUsageDescription = "“MoliStar”需要您的同意,才可以访问进行拍照并上传您的图片，然后展示在您的个人主页上，便于他人查看";
 NSLocalNetworkUsageDescription = "此App将可发现和连接到您所用网络上的设备";
 NSLocationWhenInUseUsageDescription = "需要您的同意,才可以进行定位服务，推荐附近好友";

YuMi/zh-Hant.lproj/InfoPlist.strings

@@ -1,10 +1,4 @@
-/* 
-  InfoPlist.strings
-  xplan-ios
 
-  Created by 冯硕 on 2022/10/13.
-  
-*/
 NSCameraUsageDescription = "「MoliStar」需要您的同意,才可以訪問進行拍照並上傳您的圖片，然後展示在您的個人主頁上，便於他人查看";
 NSLocalNetworkUsageDescription = "此App將可發現和連接到您所用網絡上的設備";
 NSLocationWhenInUseUsageDescription = "需要您的同意,才可以進行定位服務，推薦附近好友";