Skip to content

pidan / FuSiLive

Go to a project
Commit 3cafb636 by ludi
Options

修复一些bug

parent b83b878b
Inline Side-by-side
Showing with 115 additions and 27 deletions
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/LocalizationString/Fusi_Chinese.strings
...@@ -2812,3 +2812,17 @@ ...@@ -2812,3 +2812,17 @@
"请滑动拼图到正确位置" = "請滑動拼圖到正確位置"; "请滑动拼图到正确位置" = "請滑動拼圖到正確位置";
"无" = "無";
"预设档位" = "預設檔位";
"廋脸" = "廋臉";
"清晰" = "清晰";
"亮眼" = "亮眼";
"嘴型" = "嘴型";
"白牙" = "白牙";
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/LocalizationString/Fusi_Chinese_Traditional.strings
...@@ -2812,3 +2812,17 @@ ...@@ -2812,3 +2812,17 @@
"请滑动拼图到正确位置" = "請滑動拼圖到正確位置"; "请滑动拼图到正确位置" = "請滑動拼圖到正確位置";
"无" = "無";
"预设档位" = "預設檔位";
"廋脸" = "廋臉";
"清晰" = "清晰";
"亮眼" = "亮眼";
"嘴型" = "嘴型";
"白牙" = "白牙";
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/LocalizationString/Fusi_English.strings
...@@ -2812,3 +2812,15 @@ ...@@ -2812,3 +2812,15 @@
"请滑动拼图到正确位置" = "Slide picture to the right position."; "请滑动拼图到正确位置" = "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 @@ ...@@ -2790,3 +2790,15 @@
"请滑动拼图到正确位置" = "画像を正しい位置にスライドさせてください。"; "请滑动拼图到正确位置" = "画像を正しい位置にスライドさせてください。";
"预设档位" = "プリセット";
"廋脸" = "薄い";
"清晰" = "クリア";
"亮眼" = "明るい目";
"嘴型" = "口";
"白牙" = "歯";
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/LocalizationString/Fusi_Thai.strings
...@@ -2784,3 +2784,15 @@ ...@@ -2784,3 +2784,15 @@
"请滑动拼图到正确位置" = "เลื่อนรูปไปทางขวา"; "请滑动拼图到正确位置" = "เลื่อนรูปไปทางขวา";
"预设档位" = "ที่ตั้งไว้ล่วงหน้า";
"廋脸" = "บาง";
"清晰" = "ชัดเจน";
"亮眼" = "ตาสว่าง";
"嘴型" = "ปาก";
"白牙" = "ฟัน";
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/LocalizationString/Fusi_vietnamese.strings
...@@ -2790,3 +2790,15 @@ ...@@ -2790,3 +2790,15 @@
"请滑动拼图到正确位置" = "Trượt ảnh vào đúng vị trí."; "请滑动拼图到正确位置" = "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"; ...@@ -65,6 +65,12 @@ static NSString *const FUSArbicLangArea = @"1001";
- (instancetype)init { - (instancetype)init {
self = [super init]; self = [super init];
if (self) { if (self) {
[self fus_reloadLanguageList];
}
return self;
}
-(void)fus_reloadLanguageList{
self.languageList = @[@{@"name":[NSString fus_localString:@"跟随系统设定语言"],@"key":FUSI_LANGUAGE_SYSTEM}, self.languageList = @[@{@"name":[NSString fus_localString:@"跟随系统设定语言"],@"key":FUSI_LANGUAGE_SYSTEM},
@{@"name":@"繁體中文",@"key":FUSI_LANGUAGE_CHINESE_TRAD}, @{@"name":@"繁體中文",@"key":FUSI_LANGUAGE_CHINESE_TRAD},
@{@"name":@"English",@"key":FUSI_LANGUAGE_ENGLISH}, @{@"name":@"English",@"key":FUSI_LANGUAGE_ENGLISH},
...@@ -72,8 +78,6 @@ static NSString *const FUSArbicLangArea = @"1001"; ...@@ -72,8 +78,6 @@ static NSString *const FUSArbicLangArea = @"1001";
@{@"name":@"ไทย",@"key":FUSI_LANGUAGE_THAI},\ @{@"name":@"ไทย",@"key":FUSI_LANGUAGE_THAI},\
@{@"name":@"Tiếng Việt",@"key":FUSI_LANGUAGE_VIETNAMESE}, @{@"name":@"Tiếng Việt",@"key":FUSI_LANGUAGE_VIETNAMESE},
]; ];
}
return self;
} }
/** /**
...@@ -109,6 +113,7 @@ static NSString *const FUSArbicLangArea = @"1001"; ...@@ -109,6 +113,7 @@ static NSString *const FUSArbicLangArea = @"1001";
} }
[[NSUserDefaults standardUserDefaults] setObject:language forKey:LANGUAGE_CORE_KEY]; [[NSUserDefaults standardUserDefaults] setObject:language forKey:LANGUAGE_CORE_KEY];
[[NSUserDefaults standardUserDefaults] synchronize]; [[NSUserDefaults standardUserDefaults] synchronize];
[[FUSLocalizationHelper sharedInstance] fus_reloadLanguageList];
} }
+ (NSString *)fus_systemLanguage { + (NSString *)fus_systemLanguage {
......
Modules/FUSChatCenterModule/FUSChatCenterModule.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist
...@@ -7,12 +7,12 @@ ...@@ -7,12 +7,12 @@
<key>FUSChatCenterBundle.xcscheme_^#shared#^_</key> <key>FUSChatCenterBundle.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>76</integer> <integer>74</integer>
</dict> </dict>
<key>FUSChatCenterModule.xcscheme_^#shared#^_</key> <key>FUSChatCenterModule.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>78</integer> <integer>76</integer>
</dict> </dict>
</dict> </dict>
</dict> </dict>
......
Modules/FUSShowRoomModule/FUSShowRoomModule.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist
...@@ -7,12 +7,12 @@ ...@@ -7,12 +7,12 @@
<key>FUSShowRoomBundle.xcscheme_^#shared#^_</key> <key>FUSShowRoomBundle.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>75</integer> <integer>77</integer>
</dict> </dict>
<key>FUSShowRoomModule.xcscheme_^#shared#^_</key> <key>FUSShowRoomModule.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>72</integer> <integer>73</integer>
</dict> </dict>
</dict> </dict>
</dict> </dict>
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/Push/LiveStartView/FUSLiveStartBeautySetItemView.swift
...@@ -101,7 +101,7 @@ class FUSLiveStartBeautySetItemView: UIView { ...@@ -101,7 +101,7 @@ class FUSLiveStartBeautySetItemView: UIView {
}else{ }else{
let imageName = itemType.iconImageName let imageName = itemType.iconImageName
nameLabel.text = .fus_localString(itemType.name) nameLabel.text = itemType.name
if itemType == .close { if itemType == .close {
//关闭 //关闭
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/Push/LiveStartView/FUSLiveStartBeautySetView.swift
...@@ -104,37 +104,37 @@ import Bifrost ...@@ -104,37 +104,37 @@ import Bifrost
public var name: String { public var name: String {
switch self { switch self {
case .none: case .none:
return "无" return .fus_localString("无")
case .close: case .close:
return "关闭" return .fus_localString("关闭")
case .preset: case .preset:
return "预设档位" return .fus_localString("预设档位")
case .whiten: case .whiten:
return "美白" return .fus_localString("美白")
case .soften: case .soften:
return "磨皮" return .fus_localString("磨皮")
case .bigEye: case .bigEye:
return "大眼" return .fus_localString("大眼")
case .thinFace: case .thinFace:
return "廋脸" return .fus_localString("廋脸")
case .sharp: case .sharp:
return "锐化" return .fus_localString("锐化")
case .chin: case .chin:
return "下巴" return .fus_localString("下巴")
case .forehead: case .forehead:
return "额头" return .fus_localString("额头")
case .nose: case .nose:
return "瘦鼻" return .fus_localString("瘦鼻")
case .clear: case .clear:
return "清晰" return .fus_localString("清晰")
case .brightenEyes: case .brightenEyes:
return "亮眼" return .fus_localString("亮眼")
case .zoomMouth: case .zoomMouth:
return "嘴型" return .fus_localString("嘴型")
case .whitenTeeth: case .whitenTeeth:
return "白牙" return .fus_localString("白牙")
case .narrowFace: case .narrowFace:
return "窄脸" return .fus_localString("窄脸")
} }
} }
......
Modules/FUSUserCenterModule/FUSUserCenterModule.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist
...@@ -7,12 +7,12 @@ ...@@ -7,12 +7,12 @@
<key>FUSUserCenterModule.xcscheme_^#shared#^_</key> <key>FUSUserCenterModule.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>73</integer> <integer>72</integer>
</dict> </dict>
<key>FUSUserCenterModuleBundle.xcscheme_^#shared#^_</key> <key>FUSUserCenterModuleBundle.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>74</integer> <integer>75</integer>
</dict> </dict>
</dict> </dict>
</dict> </dict>
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/HomeMyPage/FUSMyView.m
...@@ -208,7 +208,7 @@ typedef NS_ENUM(NSInteger, FUSMySettingItemType){ ...@@ -208,7 +208,7 @@ typedef NS_ENUM(NSInteger, FUSMySettingItemType){
case FUSMySettingItemTypeGiveAwayDiamond: case FUSMySettingItemTypeGiveAwayDiamond:
itemModel.rightShowTextColor = [UIColor fus_diamondBlue]; itemModel.rightShowTextColor = [UIColor fus_diamondBlue];
itemModel.rightShowImage = [FUSUserCenterBunble imageNamed:@"fus_my_setting_item_jew_icon"]; 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; break;
case FUSMySettingItemTypeBackpack: case FUSMySettingItemTypeBackpack:
itemModel.rightShowText = [NSString fus_localString:@"道具、座驾等"]; itemModel.rightShowText = [NSString fus_localString:@"道具、座驾等"];
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/Setting/View/FUSChatSettingOneToOneHeaderView.m
...@@ -212,10 +212,16 @@ ...@@ -212,10 +212,16 @@
self.incomeDescLabel.attributedText = [NSAttributedString sj_UIKitText:^(id<SJUIKitTextMakerProtocol> _Nonnull make) { self.incomeDescLabel.attributedText = [NSAttributedString sj_UIKitText:^(id<SJUIKitTextMakerProtocol> _Nonnull make) {
if (self.selectedPriceModel.price.integerValue > 0) { if (self.selectedPriceModel.price.integerValue > 0) {
make.append([NSString fus_localString:@"接听私房的语音或视讯通话，每分钟将获得"]); make.append([NSString fus_localString:@"接听私房的语音或视讯通话，每分钟将获得"]);
if (self.selectedPriceModel.income.currency == 3) {
make.append(@" ");
}
make.appendImage(^(id<SJUTImageAttachment> _Nonnull make) { make.appendImage(^(id<SJUTImageAttachment> _Nonnull make) {
make.image = [self.selectedPriceModel.income fus_getCurrencyIcon]; make.image = [self.selectedPriceModel.income fus_getCurrencyIcon];
make.alignment = SJUTVerticalAlignmentCenter; 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]); make.append([NSString stringWithFormat:@"%ld",self.selectedPriceModel.income.total]).textColor([self.selectedPriceModel.income fus_getCurrencyTextColor]);
}else { }else {
make.append([NSString fus_localString:@"接听私房的语音或视讯通话，不获得宝石"]); make.append([NSString fus_localString:@"接听私房的语音或视讯通话，不获得宝石"]);
...@@ -351,6 +357,7 @@ ...@@ -351,6 +357,7 @@
// make.bounds = CGRectMake(0, 0, 18, 18); // make.bounds = CGRectMake(0, 0, 18, 18);
make.alignment = SJUTVerticalAlignmentCenter; make.alignment = SJUTVerticalAlignmentCenter;
}); });
make.append(@" ");
make.append(price.price).textColor([UIColor fus_themeColor]); make.append(price.price).textColor([UIColor fus_themeColor]);
make.append([NSString stringWithFormat:@"/%@",[NSString fus_localString:@"分钟"]]).textColor([UIColor fus_textColorRich]); make.append([NSString stringWithFormat:@"/%@",[NSString fus_localString:@"分钟"]]).textColor([UIColor fus_textColorRich]);
make.font([UIFont fus_themeFont:15]).alignment(NSTextAlignmentCenter); make.font([UIFont fus_themeFont:15]).alignment(NSTextAlignmentCenter);
......
Pods/Pods.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist
...@@ -392,7 +392,7 @@ ...@@ -392,7 +392,7 @@
<key>SSZipArchive.xcscheme_^#shared#^_</key> <key>SSZipArchive.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>77</integer> <integer>78</integer>
</dict> </dict>
<key>SnapKit-SnapKit_Privacy.xcscheme</key> <key>SnapKit-SnapKit_Privacy.xcscheme</key>
<dict> <dict>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment