Merge branch 'feature/私讯+座驾体系' of http://git.yabolive.net:88/pidan/FuSiLive into feature/私讯+座驾体系

DevelopmentPods/FUSFoundation/FUSFoundation/Assets/LocalizationString/Fusi_Chinese.strings

@@ -2812,3 +2812,17 @@
 
 "请滑动拼图到正确位置" = "請滑動拼圖到正確位置";
 
+"无" = "無";
+
+"预设档位" = "預設檔位";
+
+"廋脸" = "廋臉";
+
+"清晰" = "清晰";
+
+"亮眼" = "亮眼";
+
+"嘴型" = "嘴型";
+
+"白牙" = "白牙";
+

DevelopmentPods/FUSFoundation/FUSFoundation/Assets/LocalizationString/Fusi_Chinese_Traditional.strings

@@ -2812,3 +2812,17 @@
 
 "请滑动拼图到正确位置" = "請滑動拼圖到正確位置";
 
+"无" = "無";
+
+"预设档位" = "預設檔位";
+
+"廋脸" = "廋臉";
+
+"清晰" = "清晰";
+
+"亮眼" = "亮眼";
+
+"嘴型" = "嘴型";
+
+"白牙" = "白牙";
+

DevelopmentPods/FUSFoundation/FUSFoundation/Assets/LocalizationString/Fusi_English.strings

@@ -2812,3 +2812,15 @@
 
 "请滑动拼图到正确位置" = "Slide picture to the right position.";
 
+"预设档位" = "Preset";
+
+"廋脸" = "Slim";
+
+"清晰" = "Clear";
+
+"亮眼" = "Bright eyes";
+
+"嘴型" = "Mouth";
+
+"白牙" = "Teeth";
+

DevelopmentPods/FUSFoundation/FUSFoundation/Assets/LocalizationString/Fusi_Japanese.strings

@@ -2790,3 +2790,15 @@
 
 "请滑动拼图到正确位置" = "画像を正しい位置にスライドさせてください。";
 
+"预设档位" = "プリセット";
+
+"廋脸" = "薄い";
+
+"清晰" = "クリア";
+
+"亮眼" = "明るい目";
+
+"嘴型" = "口";
+
+"白牙" = "歯";
+

DevelopmentPods/FUSFoundation/FUSFoundation/Assets/LocalizationString/Fusi_Thai.strings

@@ -2784,3 +2784,15 @@
 
 "请滑动拼图到正确位置" = "เลื่อนรูปไปทางขวา";
 
+"预设档位" = "ที่ตั้งไว้ล่วงหน้า";
+
+"廋脸" = "บาง";
+
+"清晰" = "ชัดเจน";
+
+"亮眼" = "ตาสว่าง";
+
+"嘴型" = "ปาก";
+
+"白牙" = "ฟัน";
+

DevelopmentPods/FUSFoundation/FUSFoundation/Assets/LocalizationString/Fusi_vietnamese.strings

@@ -2790,3 +2790,15 @@
 
 "请滑动拼图到正确位置" = "Trượt ảnh vào đúng vị trí.";
 
+"预设档位" = "cài sẵn";
+
+"廋脸" = "Gầy";
+
+"清晰" = "Thông thoáng";
+
+"亮眼" = "Đôi mắt sáng";
+
+"嘴型" = "Miệng";
+
+"白牙" = "Răng";
+

DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Tools/Localization/FUSLocalizationHelper.m

@@ -65,6 +65,12 @@ static NSString *const FUSArbicLangArea = @"1001";
 - (instancetype)init {
     self = [super init];
     if (self) {
+        [self fus_reloadLanguageList];
+    }
+    return self;
+}
+
+-(void)fus_reloadLanguageList{
     self.languageList = @[@{@"name":[NSString fus_localString:@"跟随系统设定语言"],@"key":FUSI_LANGUAGE_SYSTEM},
                           @{@"name":@"繁體中文",@"key":FUSI_LANGUAGE_CHINESE_TRAD},
                           @{@"name":@"English",@"key":FUSI_LANGUAGE_ENGLISH},
@@ -72,8 +78,6 @@ static NSString *const FUSArbicLangArea = @"1001";
                           @{@"name":@"ไทย",@"key":FUSI_LANGUAGE_THAI},\
                           @{@"name":@"Tiếng Việt",@"key":FUSI_LANGUAGE_VIETNAMESE},
     ];
-    }
-    return self;
 }
 
 /**
@@ -109,6 +113,7 @@ static NSString *const FUSArbicLangArea = @"1001";
     }
     [[NSUserDefaults standardUserDefaults] setObject:language forKey:LANGUAGE_CORE_KEY];
     [[NSUserDefaults standardUserDefaults] synchronize];
+    [[FUSLocalizationHelper sharedInstance] fus_reloadLanguageList];
 }
 
 + (NSString *)fus_systemLanguage {

Modules/FUSChatCenterModule/FUSChatCenterModule.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,12 +7,12 @@
 		<key>FUSChatCenterBundle.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>76</integer>
+			<integer>78</integer>
 		</dict>
 		<key>FUSChatCenterModule.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>78</integer>
+			<integer>72</integer>
 		</dict>
 	</dict>
 </dict>

Modules/FUSShowRoomModule/FUSShowRoomModule.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,12 +7,12 @@
 		<key>FUSShowRoomBundle.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>75</integer>
+			<integer>77</integer>
 		</dict>
 		<key>FUSShowRoomModule.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>72</integer>
+			<integer>74</integer>
 		</dict>
 	</dict>
 </dict>

Modules/FUSShowRoomModule/FUSShowRoomModule/Features/HomePage/View/Main/View/Other/FUSBaoFangBroadcastView.m

@@ -69,11 +69,11 @@
         self.bgImageView.layer.shadowOpacity = 0.3;
         self.bgImageView.layer.shadowRadius = 8;
         
-        self.iconImageView = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, 15, 15)];
+        self.iconImageView = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, 17, 14)];
         self.iconImageView.image = [FUSShowRoomCenterBunble imageNamed:@"baofang_broadcast_trumpet_icon"];
         [self addSubview:self.iconImageView];
         
-        self.iconImageView.x = 20;
+        self.iconImageView.x = 19;
         self.iconImageView.centerY = self.height / 2.0f;
         
         self.labelContentView = [[UIView alloc] initWithFrame:CGRectMake(self.iconImageView.right + 6, 0, self.width - self.iconImageView.right - 6 - 20, self.height)];

Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/Push/LiveStartView/FUSLiveStartBeautySetItemView.swift

@@ -101,7 +101,7 @@ class FUSLiveStartBeautySetItemView: UIView {
         }else{
             
             let imageName = itemType.iconImageName
-            nameLabel.text = .fus_localString(itemType.name)
+            nameLabel.text = itemType.name
             
             if itemType == .close {
                 //关闭

Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/Push/LiveStartView/FUSLiveStartBeautySetView.swift

@@ -104,37 +104,37 @@ import Bifrost
         public var name: String {
             switch self {
             case .none:
-                return "无"
+                return .fus_localString("无")
             case .close:
-                return "关闭"
+                return .fus_localString("关闭")
             case .preset:
-                return "预设档位"
+                return .fus_localString("预设档位")
             case .whiten:
-                return "美白"
+                return .fus_localString("美白")
             case .soften:
-                return "磨皮"
+                return .fus_localString("磨皮")
             case .bigEye:
-                return "大眼"
+                return .fus_localString("大眼")
             case .thinFace:
-                return "廋脸"
+                return .fus_localString("廋脸")
             case .sharp:
-                return "锐化"
+                return .fus_localString("锐化")
             case .chin:
-                return "下巴"
+                return .fus_localString("下巴")
             case .forehead:
-                return "额头"
+                return .fus_localString("额头")
             case .nose:
-                return "瘦鼻"
+                return .fus_localString("瘦鼻")
             case .clear:
-                return "清晰"
+                return .fus_localString("清晰")
             case .brightenEyes:
-                return "亮眼"
+                return .fus_localString("亮眼")
             case .zoomMouth:
-                return "嘴型"
+                return .fus_localString("嘴型")
             case .whitenTeeth:
-                return "白牙"
+                return .fus_localString("白牙")
             case .narrowFace:
-                return "窄脸"
+                return .fus_localString("窄脸")
             }
         }
         

Modules/FUSUserCenterModule/FUSUserCenterModule.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -12,7 +12,7 @@
 		<key>FUSUserCenterModuleBundle.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>74</integer>
+			<integer>76</integer>
 		</dict>
 	</dict>
 </dict>

Modules/FUSUserCenterModule/FUSUserCenterModule/Features/HomeMyPage/FUSMyView.m

@@ -208,7 +208,7 @@ typedef NS_ENUM(NSInteger, FUSMySettingItemType){
                 case FUSMySettingItemTypeGiveAwayDiamond:
                     itemModel.rightShowTextColor = [UIColor fus_diamondBlue];
                     itemModel.rightShowImage = [FUSUserCenterBunble imageNamed:@"fus_my_setting_item_jew_icon"];
-                    itemModel.rightShowImageFrame = CGRectMake(0, 0, 22, 22);
+                    itemModel.rightShowImageFrame = CGRectMake(0, 0, 20, 20);
                     break;
                 case FUSMySettingItemTypeBackpack:
                     itemModel.rightShowText = [NSString fus_localString:@"道具、座驾等"];

Modules/FUSUserCenterModule/FUSUserCenterModule/Features/Setting/View/FUSChatSettingOneToOneHeaderView.m

@@ -212,10 +212,16 @@
     self.incomeDescLabel.attributedText = [NSAttributedString sj_UIKitText:^(id<SJUIKitTextMakerProtocol>  _Nonnull make) {
         if (self.selectedPriceModel.price.integerValue > 0) {
             make.append([NSString fus_localString:@"接听私房的语音或视讯通话，每分钟将获得"]);
+            if (self.selectedPriceModel.income.currency == 3) {
+                make.append(@" ");
+            }
             make.appendImage(^(id<SJUTImageAttachment>  _Nonnull make) {
                 make.image = [self.selectedPriceModel.income fus_getCurrencyIcon];
                 make.alignment = SJUTVerticalAlignmentCenter;
             });
+            if (self.selectedPriceModel.income.currency == 3) {
+                make.append(@" ");
+            }
             make.append([NSString stringWithFormat:@"%ld",self.selectedPriceModel.income.total]).textColor([self.selectedPriceModel.income fus_getCurrencyTextColor]);
         }else {
             make.append([NSString fus_localString:@"接听私房的语音或视讯通话，不获得宝石"]);
@@ -351,6 +357,7 @@
 //                make.bounds = CGRectMake(0, 0, 18, 18);
                 make.alignment = SJUTVerticalAlignmentCenter;
             });
+            make.append(@" ");
             make.append(price.price).textColor([UIColor fus_themeColor]);
             make.append([NSString stringWithFormat:@"/%@",[NSString fus_localString:@"分钟"]]).textColor([UIColor fus_textColorRich]);
             make.font([UIFont fus_themeFont:15]).alignment(NSTextAlignmentCenter);

Pods/Pods.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -392,7 +392,7 @@
 		<key>SSZipArchive.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>77</integer>
+			<integer>75</integer>
 		</dict>
 		<key>SnapKit-SnapKit_Privacy.xcscheme</key>
 		<dict>