Skip to content

pidan / FuSiLive

Go to a project
Commit a8d27260 by pidan
Options

Merge branch 'feature/私享房需求' of http://git.yabolive.net:88/pidan/FuSiLive into feature/私享房需求 

* 'feature/私享房需求' of http://git.yabolive.net:88/pidan/FuSiLive:
  1.修改使者码文案变成邀请码。 2.修改绑定使者信息vip格式。 3.调整一些ui。

# Conflicts:
#	DevelopmentPods/FUSFoundation/FUSFoundation/Assets/LocalizationString/Fusi_Chinese.strings
#	DevelopmentPods/FUSFoundation/FUSFoundation/Assets/LocalizationString/Fusi_Chinese_Traditional.strings
#	DevelopmentPods/FUSFoundation/FUSFoundation/Assets/LocalizationString/Fusi_English.strings
#	DevelopmentPods/FUSFoundation/FUSFoundation/Assets/LocalizationString/Fusi_Japanese.strings
#	DevelopmentPods/FUSFoundation/FUSFoundation/Assets/LocalizationString/Fusi_Thai.strings
#	DevelopmentPods/FUSFoundation/FUSFoundation/Assets/LocalizationString/Fusi_vietnamese.strings
parents be1ae3f9 2631fab5
Expand all
Inline Side-by-side
Showing with 163 additions and 46 deletions
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/LocalizationString/Fusi_Chinese.strings
...@@ -3186,3 +3186,21 @@ ...@@ -3186,3 +3186,21 @@
"快点去关注自己喜欢的主播吧~" = "快点去追踪自己喜欢的主播吧~"; "快点去关注自己喜欢的主播吧~" = "快点去追踪自己喜欢的主播吧~";
"绑定邀请码" = "绑定邀请码";
"邀请码QRCode保存失败" = "邀请码QRCode保存失败";
"邀请码QRCode保存成功" = "邀请码QRCode保存成功";
"请输入邀请码完成绑定" = "请输入邀请码完成绑定";
"邀请码不能为空" = "邀请码不能为空";
"手动输入邀请码" = "手动输入邀请码";
"摄像头扫描邀请码QRCode绑定" = "摄像头扫描邀请码QRCode绑定";
"扫描邀请码QRCode图片完成绑定" = "扫描邀请码QRCode图片完成绑定";
"请联系您的邀请人获取邀请码" = "请联系您的邀请人获取邀请码";
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/LocalizationString/Fusi_Chinese_Traditional.strings
...@@ -3186,3 +3186,21 @@ ...@@ -3186,3 +3186,21 @@
"快点去关注自己喜欢的主播吧~" = "快點去追蹤自己喜歡的主播吧~"; "快点去关注自己喜欢的主播吧~" = "快點去追蹤自己喜歡的主播吧~";
"绑定邀请码" = "綁定邀請碼";
"邀请码QRCode保存失败" = "邀請碼QRCode保存失敗";
"邀请码QRCode保存成功" = "邀請碼QRCode保存成功";
"请输入邀请码完成绑定" = "請輸入邀請碼完成綁定";
"邀请码不能为空" = "邀請碼不能爲空";
"手动输入邀请码" = "手動輸入邀請碼";
"摄像头扫描邀请码QRCode绑定" = "攝像頭掃描邀請碼QRCode綁定";
"扫描邀请码QRCode图片完成绑定" = "掃描邀請碼QRCode圖片完成綁定";
"请联系您的邀请人获取邀请码" = "請聯繫您的邀請人獲取邀請碼";
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/LocalizationString/Fusi_English.strings
...@@ -3186,3 +3186,21 @@ ...@@ -3186,3 +3186,21 @@
"快点去关注自己喜欢的主播吧~" = "Hurry up and follow your favorite broadcasters~"; "快点去关注自己喜欢的主播吧~" = "Hurry up and follow your favorite broadcasters~";
"绑定邀请码" = "Bind invitation code";
"邀请码QRCode保存失败" = "Failed to save invitation code QRCode";
"邀请码QRCode保存成功" = "The invitation QRCode has been saved successfully";
"请输入邀请码完成绑定" = "Please enter the invitation code to complete the binding";
"邀请码不能为空" = "Invitation code cannot be empty";
"手动输入邀请码" = "Manually enter invitation code";
"摄像头扫描邀请码QRCode绑定" = "Scan the invitation QRCode with the camera to bind";
"扫描邀请码QRCode图片完成绑定" = "Scan the invitation QRCode picture to complete the binding";
"请联系您的邀请人获取邀请码" = "Please contact your inviter to obtain the invitation code";
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/LocalizationString/Fusi_Japanese.strings
...@@ -3164,3 +3164,21 @@ ...@@ -3164,3 +3164,21 @@
"快点去关注自己喜欢的主播吧~" = "急いでお気に入りの配信者をフォローしましょう〜"; "快点去关注自己喜欢的主播吧~" = "急いでお気に入りの配信者をフォローしましょう〜";
"绑定邀请码" = "招待コードをバインドする";
"邀请码QRCode保存失败" = "招待コードQRコードの保存に失敗しました";
"邀请码QRCode保存成功" = "招待コードQRコードが正常に保存されました";
"请输入邀请码完成绑定" = "バインディングを完了するには招待コードを入力してください";
"邀请码不能为空" = "招待コードは空欄にできません";
"手动输入邀请码" = "招待コードを手動で入力";
"摄像头扫描邀请码QRCode绑定" = "招待コードのQRコードをカメラでスキャンしてバインドします";
"扫描邀请码QRCode图片完成绑定" = "招待コードのQRコード画像をスキャンしてバインディングを完了します";
"请联系您的邀请人获取邀请码" = "招待コードを取得するには、招待者に連絡してください。";
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/LocalizationString/Fusi_Thai.strings
...@@ -3158,3 +3158,21 @@ ...@@ -3158,3 +3158,21 @@
"快点去关注自己喜欢的主播吧~" = "เร็วเข้าและติดตามผู้ถ่ายทอดสดคนโปรดของคุณ~"; "快点去关注自己喜欢的主播吧~" = "เร็วเข้าและติดตามผู้ถ่ายทอดสดคนโปรดของคุณ~";
"绑定邀请码" = "โค้ดเชิญผูกมัด";
"邀请码QRCode保存失败" = "ไม่สามารถบันทึกรหัสคำเชิญ QRCode ได้";
"邀请码QRCode保存成功" = "รหัสเชิญ QRCode ได้รับการบันทึกเรียบร้อยแล้ว";
"请输入邀请码完成绑定" = "กรุณากรอกรหัสคำเชิญเพื่อทำการผูกมัดให้เสร็จสมบูรณ์";
"邀请码不能为空" = "รหัสคำเชิญไม่สามารถเว้นว่างได้";
"手动输入邀请码" = "กรอกรหัสเชิญด้วยตนเอง";
"摄像头扫描邀请码QRCode绑定" = "สแกนรหัสเชิญ QRCode ด้วยกล้องเพื่อผูกมัด";
"扫描邀请码QRCode图片完成绑定" = "สแกนรหัสเชิญรูป QRCode เพื่อทำการผูกมัดให้เสร็จสมบูรณ์";
"请联系您的邀请人获取邀请码" = "กรุณาติดต่อผู้เชิญของคุณเพื่อรับรหัสเชิญ";
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/LocalizationString/Fusi_vietnamese.strings
...@@ -3163,3 +3163,21 @@ ...@@ -3163,3 +3163,21 @@
"%@的尊贵新玩家，欢迎远道而来。\n主播们在等你，希望你关注她们。" = "Kính gửi những người chơi mới của %@, chào mừng các bạn từ phương xa đến. Các đài truyền hình trực tiếp đang chờ đợi bạn và mong đợi sự theo dõi của bạn"; "%@的尊贵新玩家，欢迎远道而来。\n主播们在等你，希望你关注她们。" = "Kính gửi những người chơi mới của %@, chào mừng các bạn từ phương xa đến. Các đài truyền hình trực tiếp đang chờ đợi bạn và mong đợi sự theo dõi của bạn";
"快点去关注自己喜欢的主播吧~" = "Hãy nhanh tay theo dõi những người phát sóng yêu thích của bạn~"; "快点去关注自己喜欢的主播吧~" = "Hãy nhanh tay theo dõi những người phát sóng yêu thích của bạn~";
"绑定邀请码" = "Mã mời liên kết";
"邀请码QRCode保存失败" = "Không lưu được mã mời QRCode";
"邀请码QRCode保存成功" = "Mã mời QRCode đã được lưu thành công";
"请输入邀请码完成绑定" = "Vui lòng nhập mã mời để hoàn tất việc ràng buộc";
"邀请码不能为空" = "Mã mời không được để trống";
"手动输入邀请码" = "Nhập mã mời thủ công";
"摄像头扫描邀请码QRCode绑定" = "Quét mã mời QRCode bằng camera để liên kết";
"扫描邀请码QRCode图片完成绑定" = "Quét mã mời QRCode hình ảnh để hoàn tất việc đóng sách";
"请联系您的邀请人获取邀请码" = "Vui lòng liên hệ với người mời để lấy mã mời";
FuSiLive.xcodeproj/project.pbxproj
...@@ -672,7 +672,7 @@ ...@@ -672,7 +672,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = FuSiLive/FuSiLive.entitlements; CODE_SIGN_ENTITLEMENTS = FuSiLive/FuSiLive.entitlements;
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 202506260017; CURRENT_PROJECT_VERSION = 202506260018;
DEFINES_MODULE = YES; DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = 6GG26BHUMC; DEVELOPMENT_TEAM = 6GG26BHUMC;
ENABLE_ON_DEMAND_RESOURCES = NO; ENABLE_ON_DEMAND_RESOURCES = NO;
...@@ -940,7 +940,7 @@ ...@@ -940,7 +940,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = FuSiLive/FuSiLive.entitlements; CODE_SIGN_ENTITLEMENTS = FuSiLive/FuSiLive.entitlements;
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 202506260017; CURRENT_PROJECT_VERSION = 202506260018;
DEFINES_MODULE = YES; DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = 6GG26BHUMC; DEVELOPMENT_TEAM = 6GG26BHUMC;
ENABLE_ON_DEMAND_RESOURCES = NO; ENABLE_ON_DEMAND_RESOURCES = NO;
......
FuSiLive.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<key>NotificationService.xcscheme_^#shared#^_</key> <key>NotificationService.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>87</integer> <integer>89</integer>
</dict> </dict>
</dict> </dict>
</dict> </dict>
......
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>83</integer> <integer>82</integer>
</dict> </dict>
<key>FUSChatCenterModule.xcscheme_^#shared#^_</key> <key>FUSChatCenterModule.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>85</integer> <integer>81</integer>
</dict> </dict>
</dict> </dict>
</dict> </dict>
......
Modules/FUSChatCenterModule/FUSChatCenterModule/Features/HomeMessagePage/FUSMessageView.m
...@@ -165,7 +165,7 @@ ...@@ -165,7 +165,7 @@
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:notificationOpenBtnTitle forState:UIControlStateNormal]; [notificationOpenBtn setTitle:notificationOpenBtnTitle forState:UIControlStateNormal];
notificationOpenBtn.backgroundColor = [UIColor fus_diamondBlue]; notificationOpenBtn.backgroundColor = [UIColor fus_themeColor];
notificationOpenBtn.layer.cornerRadius = 25 / 2.0f; notificationOpenBtn.layer.cornerRadius = 25 / 2.0f;
[self.notificationRemindView addSubview:notificationOpenBtn]; [self.notificationRemindView addSubview:notificationOpenBtn];
[notificationOpenBtn mas_makeConstraints:^(MASConstraintMaker *make) { [notificationOpenBtn mas_makeConstraints:^(MASConstraintMaker *make) {
......
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>89</integer> <integer>87</integer>
</dict> </dict>
<key>FUSShowRoomModule.xcscheme_^#shared#^_</key> <key>FUSShowRoomModule.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>88</integer> <integer>83</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>86</integer> <integer>85</integer>
</dict> </dict>
<key>FUSUserCenterModuleBundle.xcscheme_^#shared#^_</key> <key>FUSUserCenterModuleBundle.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>84</integer> <integer>88</integer>
</dict> </dict>
</dict> </dict>
</dict> </dict>
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/BindAgentVC/FUSBindAgentInputCodeViewController.swift
...@@ -36,7 +36,7 @@ class FUSBindAgentInputCodeViewController: FUSBaseViewController { ...@@ -36,7 +36,7 @@ class FUSBindAgentInputCodeViewController: FUSBaseViewController {
//MARK: UI SetUp //MARK: UI SetUp
func fus_setupNav() { func fus_setupNav() {
self.title = .fus_localString("绑定使者码") self.title = .fus_localString("绑定邀请码")
// if self.needShowSkipBtn { // if self.needShowSkipBtn {
// let skipBtn = UIButton(type: .custom) // let skipBtn = UIButton(type: .custom)
// skipBtn.setTitleColor(.hexColor("#BDBDBC"), for: .normal) // skipBtn.setTitleColor(.hexColor("#BDBDBC"), for: .normal)
...@@ -70,7 +70,7 @@ class FUSBindAgentInputCodeViewController: FUSBaseViewController { ...@@ -70,7 +70,7 @@ class FUSBindAgentInputCodeViewController: FUSBaseViewController {
let descLabel = UILabel() let descLabel = UILabel()
descLabel.font = .fus_themeFont(13) descLabel.font = .fus_themeFont(13)
descLabel.text = .fus_localString("请输入使者码完成绑定") descLabel.text = .fus_localString("请输入邀请码完成绑定")
descLabel.textColor = .init(hexString: "#222222") descLabel.textColor = .init(hexString: "#222222")
descLabel.numberOfLines = 0 descLabel.numberOfLines = 0
self.view.addSubview(descLabel) self.view.addSubview(descLabel)
...@@ -105,7 +105,7 @@ class FUSBindAgentInputCodeViewController: FUSBaseViewController { ...@@ -105,7 +105,7 @@ class FUSBindAgentInputCodeViewController: FUSBaseViewController {
let codeLabel = UILabel() let codeLabel = UILabel()
codeLabel.font = .fus_themeFont(15) codeLabel.font = .fus_themeFont(15)
codeLabel.text = .fus_localString("使者码") codeLabel.text = .fus_localString("邀请码")
codeLabel.textColor = .black codeLabel.textColor = .black
inputContentView.addSubview(codeLabel) inputContentView.addSubview(codeLabel)
...@@ -119,7 +119,7 @@ class FUSBindAgentInputCodeViewController: FUSBaseViewController { ...@@ -119,7 +119,7 @@ class FUSBindAgentInputCodeViewController: FUSBaseViewController {
// self.codeInputTextField.placeholder = .fus_localString("请输入使者码") // self.codeInputTextField.placeholder = .fus_localString("请输入使者码")
self.codeInputTextField.backgroundColor = .clear self.codeInputTextField.backgroundColor = .clear
self.codeInputTextField.attributedPlaceholder = .sj.makeText({ make in self.codeInputTextField.attributedPlaceholder = .sj.makeText({ make in
make.append(.fus_localString("请输入使者码")).textColor(.fus_textColorMedium()) make.append(.fus_localString("请输入邀请码")).textColor(.fus_textColorMedium())
}) })
self.codeInputTextField.textColor = .fus_textColorRich() self.codeInputTextField.textColor = .fus_textColorRich()
self.codeInputTextField.font = .fus_themeFont(15) self.codeInputTextField.font = .fus_themeFont(15)
...@@ -138,7 +138,7 @@ class FUSBindAgentInputCodeViewController: FUSBaseViewController { ...@@ -138,7 +138,7 @@ class FUSBindAgentInputCodeViewController: FUSBaseViewController {
guard let self = self else { return } guard let self = self else { return }
if isValidString(self.codeInputTextField.text) == false { if isValidString(self.codeInputTextField.text) == false {
FUSDialogView.fus_showDialog(.fus_localString("使者码不能为空")) FUSDialogView.fus_showDialog(.fus_localString("邀请码不能为空"))
return return
} }
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/BindAgentVC/FUSBindAgentViewController.swift
...@@ -46,6 +46,7 @@ import FUSCommon ...@@ -46,6 +46,7 @@ import FUSCommon
self.fus_setupScanView() self.fus_setupScanView()
self.enterAgentCodeView.isHidden = !needShowEnterAgentCodeBtn self.enterAgentCodeView.isHidden = !needShowEnterAgentCodeBtn
self.fus_enableNavigationBack(withPop: .popViewController, withAnimated: true)
/// 这个是特殊的状态 /// 这个是特殊的状态
if type == .register{ if type == .register{
...@@ -75,7 +76,7 @@ import FUSCommon ...@@ -75,7 +76,7 @@ import FUSCommon
//MARK: UI SetUp //MARK: UI SetUp
func fus_setupNav() { func fus_setupNav() {
self.title = .fus_localString("绑定使者码") self.title = .fus_localString("绑定邀请码")
if self.needShowSkipBtn { if self.needShowSkipBtn {
self.showBackBtn = false self.showBackBtn = false
let skipBtn = UIButton(type: .custom) let skipBtn = UIButton(type: .custom)
...@@ -133,7 +134,7 @@ import FUSCommon ...@@ -133,7 +134,7 @@ import FUSCommon
} }
} }
fus_createFunctionView(image: FUSUserCenterBunble.imageNamed("bind_agent_user_input"), selectImage: FUSUserCenterBunble.imageNamed("bind_agent_user_input_select"), title: String.fus_localString("手动输入使者码"), tapAction: { [weak self] in fus_createFunctionView(image: FUSUserCenterBunble.imageNamed("bind_agent_user_input"), selectImage: FUSUserCenterBunble.imageNamed("bind_agent_user_input_select"), title: String.fus_localString("手动输入邀请码"), tapAction: { [weak self] in
guard let self = self else { return } guard let self = self else { return }
let vc = FUSBindAgentInputCodeViewController() let vc = FUSBindAgentInputCodeViewController()
vc.needShowSkipBtn = self.needShowSkipBtn vc.needShowSkipBtn = self.needShowSkipBtn
...@@ -157,7 +158,7 @@ import FUSCommon ...@@ -157,7 +158,7 @@ import FUSCommon
qrcodeTipDescribeLabel.font = .fus_themeFont(14) qrcodeTipDescribeLabel.font = .fus_themeFont(14)
qrcodeTipDescribeLabel.textColor = .fus_textColorDeep() qrcodeTipDescribeLabel.textColor = .fus_textColorDeep()
qrcodeTipDescribeLabel.text = .fus_localString("摄像头扫描使者码QRCode绑定") qrcodeTipDescribeLabel.text = .fus_localString("摄像头扫描邀请码QRCode绑定")
qrcodeTipDescribeLabel.textAlignment = .center qrcodeTipDescribeLabel.textAlignment = .center
qrcodeTipDescribeLabel.isHidden = true qrcodeTipDescribeLabel.isHidden = true
self.view.addSubview(qrcodeTipDescribeLabel) self.view.addSubview(qrcodeTipDescribeLabel)
...@@ -186,7 +187,7 @@ import FUSCommon ...@@ -186,7 +187,7 @@ import FUSCommon
describeLabel.font = .fus_themeMediumFont(16) describeLabel.font = .fus_themeMediumFont(16)
describeLabel.textColor = .fus_textColorDeep() describeLabel.textColor = .fus_textColorDeep()
describeLabel.text = .fus_localString("扫描使者码QRCode图片完成绑定") describeLabel.text = .fus_localString("扫描邀请码QRCode图片完成绑定")
describeLabel.textAlignment = .center describeLabel.textAlignment = .center
describeLabel.numberOfLines = 0 describeLabel.numberOfLines = 0
scanView.addSubview(describeLabel) scanView.addSubview(describeLabel)
...@@ -201,7 +202,7 @@ import FUSCommon ...@@ -201,7 +202,7 @@ import FUSCommon
subdescribeLabel.font = .fus_themeFont(14) subdescribeLabel.font = .fus_themeFont(14)
subdescribeLabel.textColor = .fus_textColorMedium() subdescribeLabel.textColor = .fus_textColorMedium()
subdescribeLabel.text = .fus_localString("请联系您的邀请人获取使者码") subdescribeLabel.text = .fus_localString("请联系您的邀请人获取邀请码")
subdescribeLabel.textAlignment = .center subdescribeLabel.textAlignment = .center
scanView.addSubview(subdescribeLabel) scanView.addSubview(subdescribeLabel)
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/BindAgentVC/FUSRegisteredBindAgentInfoAlertView.swift
...@@ -85,20 +85,26 @@ class FUSRegisteredBindAgentInfoAlertView: FUSBaseView { ...@@ -85,20 +85,26 @@ class FUSRegisteredBindAgentInfoAlertView: FUSBaseView {
make.top.equalTo(avatorView.snp.bottom).offset(14) make.top.equalTo(avatorView.snp.bottom).offset(14)
} }
richImageView.contentMode = .scaleAspectFit nicknameLabel.font = .fus_themeFont(15)
contentView.addSubview(richImageView) contentView.addSubview(nicknameLabel)
richImageView.snp.makeConstraints { make in nicknameLabel.snp.makeConstraints { make in
// make.left.equalTo(richImageView.snp.right).offset(6)
// make.centerY.equalTo(richImageView.snp.centerY)
// make.right.equalTo(titleCenterView.snp.right)
make.left.equalTo(titleCenterView.snp.left) make.left.equalTo(titleCenterView.snp.left)
make.top.equalTo(titleCenterView.snp.top) make.top.equalTo(titleCenterView.snp.top)
make.size.equalTo(CGSizeMake(37, 14))
} }
nicknameLabel.font = .fus_themeFont(15) richImageView.contentMode = .scaleAspectFit
contentView.addSubview(nicknameLabel) contentView.addSubview(richImageView)
nicknameLabel.snp.makeConstraints { make in richImageView.snp.makeConstraints { make in
make.left.equalTo(richImageView.snp.right).offset(6) // make.left.equalTo(titleCenterView.snp.left)
make.centerY.equalTo(richImageView.snp.centerY) // make.top.equalTo(titleCenterView.snp.top)
// make.size.equalTo(CGSizeMake(37, 14))
make.left.equalTo(nicknameLabel.snp.right).offset(6)
make.centerY.equalTo(nicknameLabel.snp.centerY)
make.right.equalTo(titleCenterView.snp.right) make.right.equalTo(titleCenterView.snp.right)
make.height.equalTo(14)
} }
okBtn.style = .blue okBtn.style = .blue
...@@ -129,21 +135,23 @@ class FUSRegisteredBindAgentInfoAlertView: FUSBaseView { ...@@ -129,21 +135,23 @@ class FUSRegisteredBindAgentInfoAlertView: FUSBaseView {
self.nicknameLabel.textColor = .fus_textColorRich() self.nicknameLabel.textColor = .fus_textColorRich()
if model.info.vip == true, if model.info.vip == true,
let levelModel = FUSSwiftCacheDataShare.share.fus_levelModel(level: model.info.level) { let levelModel = FUSSwiftCacheDataShare.share.fus_levelModel(level: model.info.level) {
nicknameLabel.textColor = .init(hexString: levelModel.color)
richImageView.setWebImageWithSubURLString(levelModel.icon)
richImageView.isHidden = false richImageView.isHidden = false
titleCenterView.snp.remakeConstraints { make in richImageView.image = .fus_image(withLevel: levelModel.level.intValue)
make.centerX.equalToSuperview()
make.top.equalTo(avatorView.snp.bottom).offset(14) // nicknameLabel.textColor = .init(hexString: levelModel.color)
} // richImageView.setWebImageWithSubURLString(levelModel.icon)
// richImageView.isHidden = false
// titleCenterView.snp.remakeConstraints { make in
// make.centerX.equalToSuperview()
// make.top.equalTo(avatorView.snp.bottom).offset(14)
// }
} }
else { else {
richImageView.isHidden = true richImageView.isHidden = true
titleCenterView.snp.remakeConstraints { make in // titleCenterView.snp.remakeConstraints { make in
make.centerX.equalToSuperview().offset((-37 - 6)/2.0) // make.centerX.equalToSuperview().offset((-37 - 6)/2.0)
make.top.equalTo(avatorView.snp.bottom).offset(14) // make.top.equalTo(avatorView.snp.bottom).offset(14)
} // }
} }
avatorView.fus_setupIcon(withFacePath: model.info.face, level: model.info.level) avatorView.fus_setupIcon(withFacePath: model.info.face, level: model.info.level)
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/HomeMyPage/FUSMyView.m
...@@ -280,7 +280,7 @@ typedef NS_ENUM(NSInteger, FUSMySettingItemType){ ...@@ -280,7 +280,7 @@ typedef NS_ENUM(NSInteger, FUSMySettingItemType){
-(NSString *)fus_getItemTitle:(FUSMySettingItemType)type{ -(NSString *)fus_getItemTitle:(FUSMySettingItemType)type{
switch (type) { switch (type) {
case FUSMySettingItemTypeImAnchor: return [NSString fus_localString:@"我是主播"]; case FUSMySettingItemTypeImAnchor: return [NSString fus_localString:@"我是主播"];
case FUSMySettingItemTypeSetIntitationCode: return [NSString fus_localString:@"绑定使者码"]; case FUSMySettingItemTypeSetIntitationCode: return [NSString fus_localString:@"绑定邀请码"];
case FUSMySettingItemTypeIntitationReward: return [NSString fus_localString:@"邀请有奖"]; case FUSMySettingItemTypeIntitationReward: return [NSString fus_localString:@"邀请有奖"];
case FUSMySettingItemTypeTaskReward: return [NSString fus_localString:@"任务奖励"]; case FUSMySettingItemTypeTaskReward: return [NSString fus_localString:@"任务奖励"];
case FUSMySettingItemTypeGiveAwayDiamond: return [NSString fus_localString:@"赠出宝石"]; case FUSMySettingItemTypeGiveAwayDiamond: return [NSString fus_localString:@"赠出宝石"];
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/InviteReward/Cell/FUSInviteRewardMyHeaderCell.swift
...@@ -19,7 +19,7 @@ class FUSInviteRewardMyHeaderCell: UITableViewCell { ...@@ -19,7 +19,7 @@ class FUSInviteRewardMyHeaderCell: UITableViewCell {
func fus_getTitleName() -> String{ func fus_getTitleName() -> String{
switch self{ switch self{
case .myEmissaryCode: case .myEmissaryCode:
return .fus_localString("我的使者码") return .fus_localString("我的邀请码")
case .emissaryReward: case .emissaryReward:
return .fus_localString("使者奖励") return .fus_localString("使者奖励")
case .myGroupMember: case .myGroupMember:
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/InviteReward/View/FUSMyEmissaryQRCodeView.swift
...@@ -177,9 +177,9 @@ class FUSMyEmissaryQRCodeView: FUSBaseView { ...@@ -177,9 +177,9 @@ class FUSMyEmissaryQRCodeView: FUSBaseView {
extension FUSMyEmissaryQRCodeView{ extension FUSMyEmissaryQRCodeView{
@objc func savedPhotosAlbum(image: UIImage?, didFinishSavingWithError error: NSError?, contextInfo: AnyObject) { @objc func savedPhotosAlbum(image: UIImage?, didFinishSavingWithError error: NSError?, contextInfo: AnyObject) {
if error != nil { if error != nil {
FUSDialogView.fus_showDialog(.fus_localString("使者码QRCode保存失败")) FUSDialogView.fus_showDialog(.fus_localString("邀请码QRCode保存失败"))
} else { } else {
FUSDialogView.fus_showDialog(.fus_localString("使者码QRCode保存成功")) FUSDialogView.fus_showDialog(.fus_localString("邀请码QRCode保存成功"))
} }
} }
} }
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/InviteReward/View/FUSMyInviteQRCodeDownloadView.swift
...@@ -156,9 +156,9 @@ class FUSMyInviteQRCodeDownloadView: FUSBaseView { ...@@ -156,9 +156,9 @@ class FUSMyInviteQRCodeDownloadView: FUSBaseView {
extension FUSMyInviteQRCodeDownloadView{ extension FUSMyInviteQRCodeDownloadView{
@objc func savedPhotosAlbum(image: UIImage?, didFinishSavingWithError error: NSError?, contextInfo: AnyObject) { @objc func savedPhotosAlbum(image: UIImage?, didFinishSavingWithError error: NSError?, contextInfo: AnyObject) {
if error != nil { if error != nil {
FUSDialogView.fus_showDialog(.fus_localString("使者码QRCode保存失败")) FUSDialogView.fus_showDialog(.fus_localString("邀请码QRCode保存失败"))
} else { } else {
FUSDialogView.fus_showDialog(.fus_localString("使者码QRCode保存成功")) FUSDialogView.fus_showDialog(.fus_localString("邀请码QRCode保存成功"))
} }
} }
} }
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