Skip to content

pidan / FuSiLive

Go to a project
Commit c8a0aca0 by pierce
Options

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

parents 2ade0e60 de7b59b0
Inline Side-by-side
Showing with 58 additions and 15 deletions
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/LocalizationString/Fusi_Chinese.strings
...@@ -2616,3 +2616,7 @@ ...@@ -2616,3 +2616,7 @@
"不安全" = "不安全"; "不安全" = "不安全";
"APP通知设置" = "APP通知設置";
"APP语言设置" = "APP語言設置";
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/LocalizationString/Fusi_Chinese_Traditional.strings
...@@ -2616,3 +2616,7 @@ ...@@ -2616,3 +2616,7 @@
"不安全" = "不安全"; "不安全" = "不安全";
"APP通知设置" = "APP通知設置";
"APP语言设置" = "APP語言設置";
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/LocalizationString/Fusi_English.strings
...@@ -2616,3 +2616,7 @@ ...@@ -2616,3 +2616,7 @@
"不安全" = "Unsafe"; "不安全" = "Unsafe";
"APP通知设置" = "APP notification settings";
"APP语言设置" = "APP language setting";
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/LocalizationString/Fusi_Japanese.strings
...@@ -2594,3 +2594,7 @@ ...@@ -2594,3 +2594,7 @@
"不安全" = "安全ではない"; "不安全" = "安全ではない";
"APP通知设置" = "APP通知設定";
"APP语言设置" = "アプリの言語設定";
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/LocalizationString/Fusi_Thai.strings
...@@ -2588,3 +2588,7 @@ ...@@ -2588,3 +2588,7 @@
"不安全" = "ไม่ปลอดภัย"; "不安全" = "ไม่ปลอดภัย";
"APP通知设置" = "การตั้งค่าการแจ้งเตือนของแอป";
"APP语言设置" = "การตั้งค่าภาษาของแอป";
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/LocalizationString/Fusi_vietnamese.strings
...@@ -2594,3 +2594,7 @@ ...@@ -2594,3 +2594,7 @@
"不安全" = "Không an toàn"; "不安全" = "Không an toàn";
"APP通知设置" = "Cài đặt thông báo APP";
"APP语言设置" = "Cài đặt ngôn ngữ ứng dụng";
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>73</integer> <integer>72</integer>
</dict> </dict>
<key>FUSChatCenterModule.xcscheme_^#shared#^_</key> <key>FUSChatCenterModule.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>77</integer> <integer>75</integer>
</dict> </dict>
</dict> </dict>
</dict> </dict>
......
Modules/FUSChatCenterModule/FUSChatCenterModule/Features/HomeMessagePage/FUSMessageView.m
...@@ -149,11 +149,8 @@ ...@@ -149,11 +149,8 @@
notificationRemindTextLabel.font = [UIFont fus_themeFont:14]; notificationRemindTextLabel.font = [UIFont fus_themeFont:14];
notificationRemindTextLabel.textColor = [UIColor fus_textColorRich]; notificationRemindTextLabel.textColor = [UIColor fus_textColorRich];
notificationRemindTextLabel.text = [NSString fus_localString:@"开启通知，随时接收好友私信"]; notificationRemindTextLabel.text = [NSString fus_localString:@"开启通知，随时接收好友私信"];
notificationRemindTextLabel.numberOfLines = 0;
[self.notificationRemindView addSubview:notificationRemindTextLabel]; [self.notificationRemindView addSubview:notificationRemindTextLabel];
[notificationRemindTextLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(bellImgView.mas_right).offset(10);
make.centerY.offset(0);
}];
UIButton *notificationRemindCloseBtn = [UIButton buttonWithType:UIButtonTypeCustom]; UIButton *notificationRemindCloseBtn = [UIButton buttonWithType:UIButtonTypeCustom];
[notificationRemindCloseBtn setImage:[FUSChatCenterBunble imageNamed:@"fus_common_close_black_icon"] forState:UIControlStateNormal]; [notificationRemindCloseBtn setImage:[FUSChatCenterBunble imageNamed:@"fus_common_close_black_icon"] forState:UIControlStateNormal];
...@@ -163,10 +160,11 @@ ...@@ -163,10 +160,11 @@
make.width.offset(35); make.width.offset(35);
}]; }];
NSString *notificationOpenBtnTitle = [NSString stringWithFormat:@" %@ ",[NSString fus_localString:@"开启"]];
UIButton *notificationOpenBtn = [UIButton buttonWithType:UIButtonTypeCustom]; UIButton *notificationOpenBtn = [UIButton buttonWithType:UIButtonTypeCustom];
notificationOpenBtn.titleLabel.font = [UIFont fus_themeFont:13]; notificationOpenBtn.titleLabel.font = [UIFont fus_themeFont:13];
[notificationOpenBtn setTitleColor:[UIColor colorWithHex:@"#22222B"] forState:UIControlStateNormal]; [notificationOpenBtn setTitleColor:[UIColor colorWithHex:@"#22222B"] forState:UIControlStateNormal];
[notificationOpenBtn setTitle:[NSString stringWithFormat:@" %@ ",[NSString fus_localString:@"开启"]] forState:UIControlStateNormal]; [notificationOpenBtn setTitle:notificationOpenBtnTitle forState:UIControlStateNormal];
notificationOpenBtn.backgroundColor = [UIColor fus_diamondBlue]; notificationOpenBtn.backgroundColor = [UIColor fus_diamondBlue];
notificationOpenBtn.layer.cornerRadius = 25 / 2.0f; notificationOpenBtn.layer.cornerRadius = 25 / 2.0f;
[self.notificationRemindView addSubview:notificationOpenBtn]; [self.notificationRemindView addSubview:notificationOpenBtn];
...@@ -174,6 +172,12 @@ ...@@ -174,6 +172,12 @@
make.right.equalTo(notificationRemindCloseBtn.mas_left); make.right.equalTo(notificationRemindCloseBtn.mas_left);
make.height.offset(25); make.height.offset(25);
make.centerY.offset(0); make.centerY.offset(0);
make.width.offset([notificationOpenBtnTitle sizeWithFont:[UIFont fus_themeFont:13] maxWidth:MAXFLOAT].width);
}];
[notificationRemindTextLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(bellImgView.mas_right).offset(10);
make.centerY.offset(0);
make.right.equalTo(notificationOpenBtn.mas_left).offset(-4);
}]; }];
// 功能面板 // 功能面板
......
Modules/FUSChatCenterModule/FUSChatCenterModule/Features/InstantMessaging/View/ToolViews/VideoChat/VideoCredit/FUSZoneVideoCreditHeaderView.m
...@@ -72,7 +72,7 @@ CGFloat const kZoneVideoCreditHeaderViewHeight = 112; ...@@ -72,7 +72,7 @@ CGFloat const kZoneVideoCreditHeaderViewHeight = 112;
[_circleView startDrawCircleProcessView]; [_circleView startDrawCircleProcessView];
[_circleView animateToProgress:0.0]; [_circleView animateToProgress:0.0];
_videoCreditDetailsLabel.text = [NSString fus_localString:@"约会信用"]; _videoCreditDetailsLabel.text = [NSString fus_localString:@"私房信用"];
_connectRateLabel.text = [NSString fus_localString:@"接通率"]; _connectRateLabel.text = [NSString fus_localString:@"接通率"];
self.fiveGrayStartImageView.image = [FUSChatCenterBunble imageNamed:@"zone_five_star"]; self.fiveGrayStartImageView.image = [FUSChatCenterBunble imageNamed:@"zone_five_star"];
......
Modules/FUSChatCenterModule/FUSChatCenterModule/Features/InstantMessaging/View/ToolViews/VideoChat/VideoCredit/FUSZoneVideoCreditTableViewCell.m
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
- (void)awakeFromNib { - (void)awakeFromNib {
[super awakeFromNib]; [super awakeFromNib];
// Initialization code // Initialization code
self.nameLabel.textColor = [UIColor fus_textColorRich];
} }
- (void)setModel:(FUSVideoCreditRecordListModel *)model { - (void)setModel:(FUSVideoCreditRecordListModel *)model {
......
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>76</integer>
</dict> </dict>
<key>FUSShowRoomModule.xcscheme_^#shared#^_</key> <key>FUSShowRoomModule.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>74</integer> <integer>77</integer>
</dict> </dict>
</dict> </dict>
</dict> </dict>
......
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>72</integer> <integer>73</integer>
</dict> </dict>
<key>FUSUserCenterModuleBundle.xcscheme_^#shared#^_</key> <key>FUSUserCenterModuleBundle.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>76</integer> <integer>74</integer>
</dict> </dict>
</dict> </dict>
</dict> </dict>
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/CompleteUserInfo/View/FUSCompleteUserInfoNameView.swift
...@@ -13,6 +13,7 @@ class FUSCompleteUserInfoNameView: FUSBaseView { ...@@ -13,6 +13,7 @@ class FUSCompleteUserInfoNameView: FUSBaseView {
/// 输入框完成输入回调 /// 输入框完成输入回调
var textFieldEndEditHandler:((String) -> Void)? var textFieldEndEditHandler:((String) -> Void)?
let messageLabel = UILabel()
let settingNickNameTextLabel = UILabel() let settingNickNameTextLabel = UILabel()
let editNameCardBtn = UIButton(type: .custom) let editNameCardBtn = UIButton(type: .custom)
let nickNameTextField = FUSTextField() let nickNameTextField = FUSTextField()
...@@ -21,18 +22,31 @@ class FUSCompleteUserInfoNameView: FUSBaseView { ...@@ -21,18 +22,31 @@ class FUSCompleteUserInfoNameView: FUSBaseView {
super.makeUI() super.makeUI()
self.backgroundColor = .fus_appBG() self.backgroundColor = .fus_appBG()
messageLabel.font = .fus_themeFont(14)
messageLabel.textColor = .fus_textColorLight2()
// messageLabel.text = .localString("您只需花30秒完成一下信息的补充，即可获得FIREFLY新星认定，并获得相关专属的推荐。根据历史经验，您个人信息越真实，获得的关注者会越多。")
messageLabel.text = .fus_localString("您只需花30秒完成一下个人资料的补充，即可解锁私房价格的设定。")
messageLabel.numberOfLines = 0;
self.addSubview(messageLabel)
messageLabel.snp.makeConstraints { make in
make.top.equalToSuperview().offset(14)
make.left.right.equalToSuperview().inset(26)
}
settingNickNameTextLabel.font = .fus_themeFont(17) settingNickNameTextLabel.font = .fus_themeFont(17)
settingNickNameTextLabel.textColor = .fus_textColorRich() settingNickNameTextLabel.textColor = .fus_textColorRich()
settingNickNameTextLabel.text = .fus_localString("设定暱称") settingNickNameTextLabel.text = .fus_localString("设定暱称")
self.addSubview(settingNickNameTextLabel) self.addSubview(settingNickNameTextLabel)
settingNickNameTextLabel.snp.makeConstraints { make in settingNickNameTextLabel.snp.makeConstraints { make in
make.left.right.equalToSuperview().inset(26) make.left.right.equalToSuperview().inset(26)
make.top.equalTo(20) make.top.equalTo(messageLabel.snp.bottom).offset(12)
} }
self.editNameCardBtn.titleLabel?.numberOfLines = 0;
self.addSubview(editNameCardBtn) self.addSubview(editNameCardBtn)
editNameCardBtn.snp.makeConstraints { make in editNameCardBtn.snp.makeConstraints { make in
make.left.equalTo(26) // make.left.equalTo(26)
make.left.right.equalToSuperview().inset(26)
make.top.equalTo(settingNickNameTextLabel.snp.bottom).offset(10) make.top.equalTo(settingNickNameTextLabel.snp.bottom).offset(10)
} }
editNameCardBtn.setAttributedTitle(.sj.makeText({ make in editNameCardBtn.setAttributedTitle(.sj.makeText({ make in
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/Setting/Controller/FUSSettingViewController.m
...@@ -164,7 +164,7 @@ ...@@ -164,7 +164,7 @@
[weakSelf.navigationController pushViewController:zhaixinChatSetting animated:YES]; [weakSelf.navigationController pushViewController:zhaixinChatSetting animated:YES];
}; };
_languageItem = [FUSCustomSettingItem fus_itemWithTitle:[NSString fus_localString:@"APP切换语言"] type:CustomSettingItemTypeShowTextAndArrow]; _languageItem = [FUSCustomSettingItem fus_itemWithTitle:[NSString fus_localString:@"APP语言设置"] type:CustomSettingItemTypeShowTextAndArrow];
_languageItem.rightShowText = [FUSLocalizationHelper fus_currentLanguageName]; _languageItem.rightShowText = [FUSLocalizationHelper fus_currentLanguageName];
_languageItem.rightShowTextFont = [UIFont fus_themeFont:14]; _languageItem.rightShowTextFont = [UIFont fus_themeFont:14];
......
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