Skip to content

pidan / FuSiLive

Go to a project
Commit c2c4ff6c 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:
  整理了翻译，等待翻译
  修复外部打开网页上报的问题。添加我的页面一个扫描

# Conflicts:
#	Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/Push/LiveStartView/FUSLiveStartSetPrivacyView.swift
parents c14927b7 f90563b0
Inline Side-by-side
Showing with 285 additions and 99 deletions
.gitignore
......@@ -5,3 +5,5 @@ Modules/FUSChatCenterModule/FUSChatCenterModule.xcodeproj/xcuserdata/fusi.xcuser
Modules/FUSShowRoomModule/FUSShowRoomModule.xcodeproj/xcuserdata/fusi.xcuserdatad/xcschemes/xcschememanagement.plist
Modules/FUSUserCenterModule/FUSUserCenterModule.xcodeproj/xcuserdata/fusi.xcuserdatad/xcschemes/xcschememanagement.plist
Pods/Pods.xcodeproj/xcuserdata/fusi.xcuserdatad/xcschemes/xcschememanagement.plist
Pods/Pods.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/FUSBDAlphaPlayer-BDAlphaPlayer.xcscheme
Pods/Pods.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/FUSBDAlphaPlayer.xcscheme
DevelopmentPods/FUSCommon/FUSCommon/Classes/Common/Other/FUSDataStatisticsManager.m
......@@ -121,11 +121,12 @@
/// App行为日志-外部调起
+ (void)fus_behaviorExternalCallLogWithReqType:(NSInteger)reqType reqEventType:(NSInteger)reqEventType reqJson:(NSString *)reqJson{
[FUSCommonHttpRequest fus_behaviorExternalCallLogWithReqType:reqType reqEventType:reqEventType reqJson:reqJson];
[FUSCommonHttpRequest fus_behaviorExternalCallLogWithReqType:reqType reqEventType:reqEventType reqJson:(reqJson ?: @"").description];
}
/// App行为日志-加入直播间
+ (void)fus_behaviorJoinRoomLogWithReqType:(NSInteger)reqType reqEventType:(NSInteger)reqEventType extraInfo:(NSString *)extraInfo extraJson:(NSString *)extraJson roomId:(NSString *)roomId{
[FUSCommonHttpRequest fus_behaviorJoinRoomLogWithReqType:reqType reqEventType:reqEventType extraInfo:extraInfo extraJson:extraJson roomId:roomId];
[FUSCommonHttpRequest fus_behaviorJoinRoomLogWithReqType:reqType reqEventType:reqEventType extraInfo:(extraInfo ?: @"").description extraJson:(extraJson ?: @"").description roomId:roomId];
}
#pragma --mark 登录计时
......
DevelopmentPods/FUSCommon/FUSCommon/Classes/Common/Other/FUSSocialShareManager.m
......@@ -132,7 +132,7 @@
}
else {
NSURL *shareURL = [NSURL URLWithString:@"instagram://library?LocalIdentifier=latest"];
[[UIApplication sharedApplication] openURL:shareURL];
[[UIApplication sharedApplication] openURL:shareURL options:@{} completionHandler:nil];
}
}
......
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/LocalizationString/Fusi_Chinese_Traditional.strings
"告诉朋友前往应用商店搜寻“FusiYa”" = "告訴朋友前往應用商店搜尋“FusiYa”";
"告诉朋友前往自己手机熟悉的应用商店,并搜寻“FusiYa” 关键词" = "告訴朋友前往自己手機熟悉的應用商店,並搜尋“FusiYa” 關鍵詞";
"很遗憾，您的年龄未满足FusiYa的注册条件。但是还是非常感谢对我们的关注!" = "很遺憾，您的年龄未滿足FusiYa的註冊條件。但是還是非常感謝對我們的關注!";
......@@ -2028,8 +2025,6 @@
"樱花" = "櫻花";
"嗨，我刚加入FusiYa，希望和你成为朋友。" = "嗨，我剛加入FusiYa，希望和你成為朋友";
"连麦成功" = "連麥成功";
"请输入赠送数量" = "請輸入贈送數量";
......@@ -2786,8 +2781,6 @@
"上一月" = "上一月";
"FusiYa" = "FusiYa";
"更高的清晰度对手机性能、网络性能要求更高。请确保手机散热良好，网络连接通畅。" = "更高的清晰度對手機性能、網絡性能要求更高。請確保手機散熱良好，網絡連接通暢。";
"日期:" = "日期:";
......@@ -3042,3 +3035,98 @@
"今天" = "今天";
"您已切换至关注主播再次点击可恢复全部" = "您已切換至關注主播再次點擊可恢復全部";
"您已切换至全部主播再次点击可恢复关注" = "您已切換至全部主播再次點擊可恢復關注";
"私享屋-密码：" = "私享屋-密碼：";
"仅公开屋可进行PK" = "僅公開屋可進行PK";
"无法分享私享屋" = "無法分享私享屋";
"公开屋" = "公開屋";
"私享屋" = "私享屋";
"玩家正确输入密码后可进入屋内" = "玩家正確輸入密碼後可進入屋內";
"房间已切换到私享屋模式，仅追踪直播超过24小时的粉丝可进入房间，直播时长不计入直播奖励活动" = "房間已切換到私享屋模式，僅追蹤直播超過24小時的粉絲可進入房間，直播時長不計入直播獎勵活動";
"设置私享屋密码" = "設置私享屋密碼";
"输入密码，打开窗帘" = "輸入密碼，打開窗簾";
"私信问密码" = "私信問密碼";
"打开" = "打開";
"密码设置错误" = "密碼設置錯誤";
"密码错误，请重新输入" = "密碼錯誤，請重新輸入";
"我在私享屋直播" = "我在私享屋直播";
"需要输入密码进入直播屋" = "需要輸入密碼進入直播屋";
"密码：" = "密碼：";
"选择您要使用的社交媒体，发送社交媒体邀请给超过%@天未登入的老玩家" = "選擇您要使用的社交媒體，發送社交媒體邀請給超過%@天未登入的老玩家";
"拷贝您的专属邀请链接，发送链接给超过%@天未登入的老玩家，访问网页可下载。" = "拷貝您的專屬邀請鏈接，發送鏈接給超過%@天未登入的老玩家，訪問網頁可下載。";
"保存您的邀请QRCode图片，超过%@天未登入的老玩家通过扫描QRCode可以下载" = "保存您的邀請QRCode圖片，超過%@天未登入的老玩家通過掃描QRCode可以下載";
"告诉超过%@天未登入的老玩家前往自己手机熟悉的应用商店，并搜寻%@关键词" = "告訴超過%@天未登入的老玩家前往自己手機熟悉的應用商店，並搜尋%@關鍵詞";
"定制宣传图邀请" = "定製宣傳圖邀請";
"我的邀请码QRCode" = "我的邀請碼QRCode";
"发送我的专属QRcode给好友完成使者绑定" = "發送我的專屬QRcode給好友完成使者綁定";
"召回任务" = "召回任務";
"选择召回方式" = "選擇召回方式";
"召回流失族人" = "召回流失族人";
"%@天以上未登入%@的玩家，将会自动断开使者关系" = "%@天以上未登入%@的玩家，將會自動斷開使者關係";
"流失族人" = "流失族人";
"族人关系" = "族人關係";
"召唤老玩家回归" = "召喚老玩家回歸";
"今日使者奖励" = "今日使者獎勵";
"领取奖励" = "領取獎勵";
"全部领取" = "全部領取";
"明日可领取" = "明日可領取";
"流失族人%@" = "流失族人%@";
"最近30天内活跃的族人" = "最近30天內活躍的族人";
"我的邀请码" = "我的邀請碼";
"保存QRCode到您的相册，将此图片发送给您要邀请的好友扫描即可完成绑定您为使者和成功注册在部分国家和地区，只有完成使者绑定对方才能注册成功" = "保存QRCode到您的相冊，將此圖片發送給您要邀請的好友掃描即可完成綁定您為使者和成功註冊在部分國家和地區，只有完成使者綁定對方才能註冊成功";
"官网：%@" = "官網：%@";
"欢迎回归" = "歡迎回歸";
"许久未见，恭迎回归。回归7日内完成储值可以获得回归大礼包奖励。" = "許久未見，恭迎回歸。回歸7日內完成儲值可以獲得回歸大禮包獎勵。";
"回归大礼包" = "回歸大禮包";
"榜单" = "榜單";
"召回" = "召回";
"使者奖励领取" = "使者獎勵領取";
"请联系您的邀请人获得邀请QRCode" = "請聯繫您的邀請人獲得邀請QRCode";
FuSiLive.xcodeproj/project.pbxproj
......@@ -415,10 +415,14 @@
inputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-FuSiLive/Pods-FuSiLive-frameworks-${CONFIGURATION}-input-files.xcfilelist",
);
inputPaths = (
);
name = "[CP] Embed Pods Frameworks";
outputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-FuSiLive/Pods-FuSiLive-frameworks-${CONFIGURATION}-output-files.xcfilelist",
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-FuSiLive/Pods-FuSiLive-frameworks.sh\"\n";
......@@ -432,10 +436,14 @@
inputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-FuSiLive/Pods-FuSiLive-resources-${CONFIGURATION}-input-files.xcfilelist",
);
inputPaths = (
);
name = "[CP] Copy Pods Resources";
outputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-FuSiLive/Pods-FuSiLive-resources-${CONFIGURATION}-output-files.xcfilelist",
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-FuSiLive/Pods-FuSiLive-resources.sh\"\n";
......@@ -664,7 +672,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = FuSiLive/FuSiLive.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 202506260002;
CURRENT_PROJECT_VERSION = 202506260011;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = 6GG26BHUMC;
ENABLE_ON_DEMAND_RESOURCES = NO;
......@@ -932,7 +940,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = FuSiLive/FuSiLive.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 202506260002;
CURRENT_PROJECT_VERSION = 202506260011;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = 6GG26BHUMC;
ENABLE_ON_DEMAND_RESOURCES = NO;
......
FuSiLive.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist
......@@ -12,7 +12,7 @@
<key>NotificationService.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>87</integer>
<integer>84</integer>
</dict>
</dict>
</dict>
......
FuSiLive/AppDelegate.m
......@@ -152,11 +152,11 @@ typedef NS_ENUM(NSInteger, FFOutsideJumpAPPType) {
- (BOOL)application:(UIApplication *)app continueUserActivity:(nonnull NSUserActivity *)userActivity restorationHandler:(nonnull void (^)(NSArray<id<UIUserActivityRestoring>> * _Nullable))restorationHandler {
if ([userActivity.activityType isEqualToString:NSUserActivityTypeBrowsingWeb]) {
if (userActivity.webpageURL) {
[self fus_handlerUrlOpenAppActionWithURL:userActivity.webpageURL];
}
}
// if ([userActivity.activityType isEqualToString:NSUserActivityTypeBrowsingWeb]) {
// if (userActivity.webpageURL) {
// [self fus_handlerUrlOpenAppActionWithURL:userActivity.webpageURL];
// }
// }
//其他代码
if (userActivity.activityType == NSUserActivityTypeBrowsingWeb) {
......@@ -194,7 +194,8 @@ typedef NS_ENUM(NSInteger, FFOutsideJumpAPPType) {
[FUSDataStatisticsManager fus_behaviorExternalCallLogWithReqType:4 reqEventType:1 reqJson:@""];
}
[self fus_handlerUrlOpenAppActionWithURL:url];
// [self fus_handlerUrlOpenAppActionWithURL:url];
[[FUSHandleEventHelper shared] fus_oc_fus_handlerUrlOpenAppActionWithUrl:url];
return YES;
}
......
FuSiLive/Info.plist
......@@ -97,6 +97,8 @@
<false/>
<key>LSApplicationQueriesSchemes</key>
<array>
<string>instagram</string>
<string>threads</string>
<string>whatsApp</string>
<string>line</string>
<string>weixin</string>
......
Modules/FUSChatCenterModule/FUSChatCenterModule.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist
......@@ -7,12 +7,12 @@
<key>FUSChatCenterBundle.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>84</integer>
<integer>83</integer>
</dict>
<key>FUSChatCenterModule.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>83</integer>
<integer>88</integer>
</dict>
</dict>
</dict>
......
Modules/FUSChatCenterModule/FUSChatCenterModule/Features/InstantMessaging/Other/FUSIMChatService.m
......@@ -2524,8 +2524,8 @@
liveTitle = [NSString fus_localString:@"我的直播開始啦"];
liveContent = [NSString fus_localString:@"房間已開好，快來一起玩耍吧"];
} else {
liveTitle = [NSString fus_versionLocalString:@"我在私享屋直播"];
liveContent = [NSString fus_versionLocalString:@"需要输入密码进入直播屋"];
liveTitle = [NSString fus_localString:@"我在私享屋直播"];
liveContent = [NSString fus_localString:@"需要输入密码进入直播屋"];
}
[self fus_sendLiveRoomShareWithRoomId:roomModel.roomId
pullFlowUrl:roomModel.publishUrl
......
Modules/FUSChatCenterModule/FUSChatCenterModule/Features/InstantMessaging/View/Cell/CellContentView/FUSIMChatLiveRoomCellView.m
......@@ -132,7 +132,7 @@
_tipsLabel.y = self.height - _tipsLabel.height - 8;
} else {
_tipsLabel.text = @"";
NSString *passwordDesc = [NSString fus_versionLocalString:@"密码："];
NSString *passwordDesc = [NSString fus_localString:@"密码："];
NSString *passwordStr = [NSString stringWithFormat:@"%@%@",passwordDesc,frameModel.msgModel.liveRoomPassword];
NSMutableAttributedString *attr = [[NSMutableAttributedString alloc] initWithString:passwordStr attributes:@{NSForegroundColorAttributeName:messageBgColor, NSFontAttributeName:tips_font}];
NSRange range = [passwordStr rangeOfString:frameModel.msgModel.liveRoomPassword];
......
Modules/FUSShowRoomModule/FUSShowRoomModule.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist
......@@ -7,12 +7,12 @@
<key>FUSShowRoomBundle.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>89</integer>
<integer>87</integer>
</dict>
<key>FUSShowRoomModule.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>86</integer>
<integer>89</integer>
</dict>
</dict>
</dict>
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/HomePage/View/FUSHomeView.m
......@@ -403,10 +403,10 @@
} else if (type == FUSHomeViewAnchorListTypeFollow && isLastSelected == NO) {
//上一次是普通，然后点了追踪
[FUSDialogView fus_showDialog:[NSString fus_versionLocalString:@"您已切换至关注主播再次点击可恢复全部"]];
[FUSDialogView fus_showDialog:[NSString fus_localString:@"您已切换至关注主播再次点击可恢复全部"]];
} else if (type == FUSHomeViewAnchorListTypeNormal && isLastSelected == YES) {
//上一次是追踪，然后点了普通
[FUSDialogView fus_showDialog:[NSString fus_versionLocalString:@"您已切换至全部主播再次点击可恢复关注"]];
[FUSDialogView fus_showDialog:[NSString fus_localString:@"您已切换至全部主播再次点击可恢复关注"]];
}
}
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/ChatInputView/FUSLiveBottomToolSubView.m
......@@ -241,7 +241,7 @@
if (type == FUSLiveBottomToolTypePK) {
if (FUSLiveHelper.shareInstance.roomScopeType == FUSLiveRoomScopeTypePassword) {
[FUSDialogView fus_showDialog:[NSString fus_versionLocalString:@"仅公开屋可进行PK"]];
[FUSDialogView fus_showDialog:[NSString fus_localString:@"仅公开屋可进行PK"]];
return;
}
......@@ -317,7 +317,7 @@
{
if (FUSLiveHelper.shareInstance.liveType != FUSLiveTypeAnchor
&& FUSLiveHelper.shareInstance.roomScopeType == FUSLiveRoomScopeTypePassword) {
[FUSDialogView fus_showDialog:[NSString fus_versionLocalString:@"无法分享私享屋"]];
[FUSDialogView fus_showDialog:[NSString fus_localString:@"无法分享私享屋"]];
return;
}
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/ChatInputView/FUSShareView/View/FUSShareToolSheetView.swift
......@@ -109,7 +109,7 @@ var isShowShareToolSheetView = true
shareTitleLabel.textColor = .fus_textColorRich()
shareTitleLabel.textAlignment = .center
passwordDescLabel.text = String.fus_versionLocalString("私享屋-密码：")
passwordDescLabel.text = String.fus_localString("私享屋-密码：")
passwordDescLabel.font = .fus_themeFont(12)
passwordDescLabel.textColor = .fus_textColorRich()
passwordDescLabel.isHidden = true
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/Push/LiveStartView/FUSLiveStartContentPrivacyView.swift
......@@ -42,10 +42,10 @@ import FUSCommon
switch type{
case .open:
self.privacyImageView.image = FUSShowRoomCenterBunble.imageNamed("live_start_openScope_img")
self.privacyLabel.text = .fus_versionLocalString("公开屋")
self.privacyLabel.text = .fus_localString("公开屋")
case .password:
self.privacyImageView.image = FUSShowRoomCenterBunble.imageNamed("live_start_passwordScope_img")
self.privacyLabel.text = .fus_versionLocalString("私享屋")
self.privacyLabel.text = .fus_localString("私享屋")
// case .intimacy:
//
// self.privacyImageView.image = FUSShowRoomCenterBunble.imageNamed("live_start_intimacyScope_img")
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/Push/LiveStartView/FUSLiveStartSetPasswordView.swift
......@@ -107,7 +107,7 @@ import RxSwift
}
if isAudience == false {
titleLabel.text = .fus_versionLocalString("设置私享屋密码")
titleLabel.text = .fus_localString("设置私享屋密码")
self.submitBtn.setTitle(.fus_localString("确定"), for: .normal)
let tipLabel = UILabel()
tipLabel.font = .fus_themeFont(13)
......@@ -119,13 +119,13 @@ import RxSwift
make.centerX.equalToSuperview()
}
} else {
titleLabel.text = .fus_versionLocalString("输入密码，打开窗帘")
self.submitBtn.setTitle(.fus_versionLocalString("打开"), for: .normal)
titleLabel.text = .fus_localString("输入密码，打开窗帘")
self.submitBtn.setTitle(.fus_localString("打开"), for: .normal)
let chatBtn = UIButton(type: .custom)
// 设置带下划线的文字
let attributedTitle = NSAttributedString(
string: .fus_versionLocalString("私信问密码"),
string: .fus_localString("私信问密码"),
attributes: [
.foregroundColor: UIColor.fus_theme() ?? .black,
.underlineStyle: NSUnderlineStyle.single.rawValue,
......@@ -163,7 +163,7 @@ import RxSwift
let newPassword = self.passwordView.fus_getText()
if newPassword.count < 4 {
FUSDialogView.fus_showDialog(.fus_versionLocalString("密码设置错误"))
FUSDialogView.fus_showDialog(.fus_localString("密码设置错误"))
} else {
if self.isAudience {
......@@ -177,7 +177,7 @@ import RxSwift
self.clickWithSucceedHandler?(true, newPassword)
self.fus_dismissWithAnimation()
} failure: { dict, msg, code in
FUSDialogView.fus_showDialog(.fus_versionLocalString("密码错误，请重新输入"))
FUSDialogView.fus_showDialog(.fus_localString("密码错误，请重新输入"))
self.passwordView.fus_clear()
}
} else {
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/Push/LiveStartView/FUSLiveStartSetPrivacyView.swift
......@@ -256,7 +256,7 @@ import FUSCommon
FUSDialogView.fus_showDialog(.fus_localString("房间已切换到全公开模式，所有人可进入房间"))
case .password:
//TODO: 文案:added by pidan
FUSDialogView.fus_showDialog(.fus_versionLocalString("房间已切换到私享屋模式，仅追踪直播超过24小时的粉丝可进入房间，直播时长不计入直播奖励活动"))
FUSDialogView.fus_showDialog(.fus_localString("房间已切换到私享屋模式，仅追踪直播超过24小时的粉丝可进入房间，直播时长不计入直播奖励活动"))
// case .intimacy:
// FUSDialogView.fus_showDialog(.fus_localString("房间已切换到亲密圈模式，仅亲密好友的用户可进入房间，直播时长不计入直播奖励活动"))
@unknown default:
......
Modules/FUSUserCenterModule/FUSUserCenterModule.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist
......@@ -7,12 +7,12 @@
<key>FUSUserCenterModule.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>85</integer>
<integer>86</integer>
</dict>
<key>FUSUserCenterModuleBundle.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>88</integer>
<integer>85</integer>
</dict>
</dict>
</dict>
......
Modules/FUSUserCenterModule/FUSUserCenterModule/FUSUserCenterModuleBundle.bundle/FUSUserCenterAssets.xcassets/MyUserZone/zone_pop_tip_bg.imageset/Contents.json
......@@ -7,11 +7,39 @@
{
"filename" : "zone_pop_tip_bg@2x.png",
"idiom" : "universal",
"resizing" : {
"cap-insets" : {
"bottom" : 36,
"left" : 40,
"right" : 94,
"top" : 50
},
"center" : {
"height" : 1,
"mode" : "stretch",
"width" : 1
},
"mode" : "9-part"
},
"scale" : "2x"
},
{
"filename" : "zone_pop_tip_bg@3x.png",
"idiom" : "universal",
"resizing" : {
"cap-insets" : {
"bottom" : 55,
"left" : 120,
"right" : 82,
"top" : 75
},
"center" : {
"height" : 1,
"mode" : "stretch",
"width" : 1
},
"mode" : "9-part"
},
"scale" : "3x"
}
],
......
Modules/FUSUserCenterModule/FUSUserCenterModule/FUSUserCenterModuleBundle.bundle/FUSUserCenterAssets.xcassets/inviteReward/inviteReward_navi_scan_icon.imageset/Contents.json 0 → 100644
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "inviteReward_navi_scan_icon@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "inviteReward_navi_scan_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/BindAgentVC/FUSBindAgentViewController.swift
......@@ -287,7 +287,7 @@ import FUSCommon
self?.qrcodeTipDescribeLabel.isHidden = false
return .init(string: "")
}else {
return .init(string: .fus_versionLocalString("请联系您的邀请人获得邀请QRCode"))
return .init(string: .fus_localString("请联系您的邀请人获得邀请QRCode"))
}
}
self?.qrcodeTipDescribeLabel.isHidden = true
......@@ -519,7 +519,7 @@ import FUSCommon
// 有错误信息
if let errorMsg = errorMsg,
errorMsg.count > 0{
FUSAlertView.showAlert(withTitle: .fus_versionLocalString("绑定使者"), message: errorMsg, cancelButtonTitle: .fus_localString("确认"), otherButtonTitles: nil) {[weak self] _ in
FUSAlertView.showAlert(withTitle: .fus_localString("绑定使者"), message: errorMsg, cancelButtonTitle: .fus_localString("确认"), otherButtonTitles: nil) {[weak self] _ in
completed(false)
// 如果哪天gcp说，注册的时候，扫使者码出来了，然后点确认，注册失败了，就得返回注册页面，那么就在这里，把ff_startCamera换成pop
self?.fus_startCamera()
......@@ -533,7 +533,7 @@ import FUSCommon
} failure: { msg, code in
completed(false)
FUSLoadingView.fus_dismissProgressView()
FUSAlertView.showAlert(withTitle: .fus_versionLocalString("绑定使者"), message: msg, cancelButtonTitle: .fus_localString("确认"), otherButtonTitles: nil) {[weak self] _ in
FUSAlertView.showAlert(withTitle: .fus_localString("绑定使者"), message: msg, cancelButtonTitle: .fus_localString("确认"), otherButtonTitles: nil) {[weak self] _ in
// self?.ff_startCamera()
self?.pop()
}
......@@ -555,7 +555,7 @@ import FUSCommon
} failure: { msg, code in
completed(false)
FUSLoadingView.fus_dismissProgressView()
FUSAlertView.showAlert(withTitle: .fus_versionLocalString("绑定使者"), message: msg, cancelButtonTitle: .fus_localString("确认"), otherButtonTitles: nil) {[weak self] _ in
FUSAlertView.showAlert(withTitle: .fus_localString("绑定使者"), message: msg, cancelButtonTitle: .fus_localString("确认"), otherButtonTitles: nil) {[weak self] _ in
self?.fus_startCamera()
completed(false)
}
......@@ -575,7 +575,7 @@ import FUSCommon
completed?(false)
// 有错误信息
FUSAlertView.showAlert(withTitle: .fus_versionLocalString("绑定使者"), message: msg, cancelButtonTitle: .fus_localString("确认"), otherButtonTitles: nil) {[weak self] _ in
FUSAlertView.showAlert(withTitle: .fus_localString("绑定使者"), message: msg, cancelButtonTitle: .fus_localString("确认"), otherButtonTitles: nil) {[weak self] _ in
self?.fus_startCamera()
}
}
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/BindAgentVC/FUSRegisteredBindAgentInfoAlertView.swift
......@@ -53,7 +53,7 @@ class FUSRegisteredBindAgentInfoAlertView: FUSBaseView {
titleLabel.font = .fus_themeBoldFont(20)
titleLabel.textColor = .fus_textColorRich()
titleLabel.text = .fus_versionLocalString("绑定使者")
titleLabel.text = .fus_localString("绑定使者")
contentView.addSubview(titleLabel)
titleLabel.snp.makeConstraints { make in
make.centerX.equalToSuperview()
......@@ -62,7 +62,7 @@ class FUSRegisteredBindAgentInfoAlertView: FUSBaseView {
subTitleLabel.font = .fus_themeFont(14)
subTitleLabel.textColor = .fus_textColorRich()
subTitleLabel.text = .fus_versionLocalString("绑定使者：")
subTitleLabel.text = .fus_localString("绑定使者：")
contentView.addSubview(subTitleLabel)
subTitleLabel.snp.makeConstraints { make in
make.centerX.equalToSuperview()
......@@ -100,7 +100,7 @@ class FUSRegisteredBindAgentInfoAlertView: FUSBaseView {
okBtn.style = .blue
okBtn.titleLabel?.font = .fus_themeMediumFont(15)
okBtn.setTitle(.fus_versionLocalString("确认"), for: .normal)
okBtn.setTitle(.fus_localString("确认"), for: .normal)
contentView.addSubview(okBtn)
okBtn.snp.makeConstraints { make in
make.centerX.equalToSuperview()
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/HomeMyPage/FUSMyView.m
......@@ -47,6 +47,7 @@ typedef NS_ENUM(NSInteger, FUSMySettingItemType){
@property (nonatomic, strong) UIView *naviView;
@property (nonatomic, strong) UIButton *publishBtn;
@property (nonatomic, strong) UIButton *scanBtn;
@property (nonatomic, strong) FUSMyHeaderView *headerView;
// 存储填写邀请码的信息，这里需要频繁改动
......@@ -88,7 +89,18 @@ typedef NS_ENUM(NSInteger, FUSMySettingItemType){
- (void)fus_viewWillShow{
[super fus_viewWillShow];
[self fus_updateMyZoneDataSourceWithType:ReadServerBegin];
self.zoneCanSendNewsFeedTipView = [FUSZoneCanSendNewsFeedTipView fus_showZoneCanSendNewsFeedTipViewIfNeededOnSuperView:self];
NSInteger buttonIndex = 0;
if ([FUSCacheDataShare shareStore].settingInitDataModel.showQrCodeEntrance == 1) {
buttonIndex += 1;
self.scanBtn.hidden = NO;
[self.publishBtn mas_remakeConstraints:^(MASConstraintMaker *make) {
make.top.bottom.offset(0);
make.right.offset(-10 - 30 - 8);
make.width.equalTo(self.publishBtn.mas_height);
}];
}
self.zoneCanSendNewsFeedTipView = [FUSZoneCanSendNewsFeedTipView fus_showZoneCanSendNewsFeedTipViewIfNeededOnSuperView:self buttonIndex:buttonIndex];
}
- (void)fus_viewDidDisappear{
......@@ -118,6 +130,17 @@ typedef NS_ENUM(NSInteger, FUSMySettingItemType){
self.naviView = [[UIView alloc] initWithFrame:CGRectMake(0, UIView.fus_SafeTop, UIView.fus_screenW, UIView.fus_NavgationBarHeight)];
[self addSubview:self.naviView];
self.scanBtn = [UIButton buttonWithType:UIButtonTypeCustom];
[self.scanBtn setImage:[FUSUserCenterBunble imageNamed:@"inviteReward_navi_scan_icon"] forState:UIControlStateNormal];
[self.naviView addSubview:self.scanBtn];
[self.scanBtn mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.bottom.offset(0);
make.right.offset(-8);
make.width.equalTo(self.scanBtn.mas_height);
}];
[self.scanBtn addTarget:self action:@selector(scanBtnDidClicked:) forControlEvents:UIControlEventTouchUpInside];
self.scanBtn.hidden = YES;
if ([[[NSUserDefaults standardUserDefaults] objectForKey:FUSUserUDKeys.fus_DYNAMIC_SEND_SHOW_SWITCH] boolValue]) {
self.publishBtn = [UIButton buttonWithType:UIButtonTypeCustom];
[self.publishBtn setImage:[FUSUserCenterBunble imageNamed:@"fus_my_setting_navi_publish_icon"] forState:UIControlStateNormal];
......@@ -647,6 +670,14 @@ typedef NS_ENUM(NSInteger, FUSMySettingItemType){
}
}
-(void)scanBtnDidClicked:(UIButton *)btn{
[[FUSRouter userRouter] fus_showBindAgentPageWithNeedShowSkipBtn:NO success:^{
[[FUSRouter userRouter] fus_showBindAgentSuccessPopViewWithSuccess:^{
}];
}];
}
#pragma mark getter and setter
- (NSMutableArray *)allGroups{
if (!_allGroups) {
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/InviteReward/Cell/FUSInviteEmissaryRewardDrawCell.swift
......@@ -76,8 +76,8 @@ class FUSInviteEmissaryRewardDrawCell: UITableViewCell {
make.centerY.equalToSuperview()
}
let drawText = String.fus_versionLocalString("领取")
let drawedText = String.fus_versionLocalString("已领取")
let drawText = String.fus_localString("领取")
let drawedText = String.fus_localString("已领取")
let drawTextSize = drawText.size(for: .fus_themeMediumFont(13), maxWidth: 1000, maxHeight: 20)
let drawedTextSize = drawedText.size(for: .fus_themeMediumFont(13), maxWidth: 1000, maxHeight: 20)
let drawTextMaxWidth = max(drawTextSize.width, drawedTextSize.width)
......@@ -106,7 +106,7 @@ class FUSInviteEmissaryRewardDrawCell: UITableViewCell {
notArrivedDateTipsLabel.font = .fus_themeMediumFont(13)
notArrivedDateTipsLabel.textColor = .fus_textColorLight()
notArrivedDateTipsLabel.text = .fus_versionLocalString("明日可領取")
notArrivedDateTipsLabel.text = .fus_localString("明日可领取")
bgView.addSubview(notArrivedDateTipsLabel)
notArrivedDateTipsLabel.snp.makeConstraints { make in
make.right.equalTo(-16)
......@@ -141,7 +141,7 @@ class FUSInviteEmissaryRewardDrawCell: UITableViewCell {
make.font(.fus_themeFont(13)).alignment(.center)
})
descLabel.text = Date.getTimeStringWith(timeStamp: "\(model.statdate)", dateFormat: "yyyy/MM/dd") + " " + .fus_versionLocalString("使者奖励")
descLabel.text = Date.getTimeStringWith(timeStamp: "\(model.statdate)", dateFormat: "yyyy/MM/dd") + " " + .fus_localString("使者奖励")
if model.status == -1 {
self.notArrivedDateTipsLabel.isHidden = false
......@@ -167,22 +167,22 @@ class FUSInviteEmissaryRewardDrawCell: UITableViewCell {
var unitString: String = ""
if day > 0 {
dateString = .init(format: "%zd", day)
unitString = .fus_versionLocalString("天")
unitString = .fus_localString("天")
}
else if hour > 0 {
dateString = .init(format: "%zd", hour)
unitString = .fus_versionLocalString("小时")
unitString = .fus_localString("小时")
}
else {
dateString = .init(format: "%zd", min)
unitString = .fus_versionLocalString("分钟")
unitString = .fus_localString("分钟")
}
expiretimeLabel.attributedText = .sj.makeText({ make in
make.append(dateString).textColor(.init(hex:"#E94F4C"))
make.append(" ")
make.append(unitString)
make.append(String.init(format: .fus_versionLocalString("%@后过期"), ""))
make.append(String.init(format: .fus_localString("%@后过期"), ""))
make.font(.fus_themeFont(11)).textColor(.init(hex: "#808080"))
})
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/InviteReward/Cell/FUSInviteEmissaryRewardDrawHeader.swift
......@@ -58,7 +58,7 @@ class FUSInviteEmissaryRewardDrawHeader: UITableViewHeaderFooterView {
titleLabel.font = .fus_themeMediumFont(18)
titleLabel.textColor = .fus_textColorRich()
titleLabel.text = .fus_versionLocalString("奖励领取")
titleLabel.text = .fus_localString("奖励领取")
bgView.addSubview(titleLabel)
titleLabel.snp.makeConstraints { make in
make.left.equalTo(dotView.snp.right).offset(8)
......@@ -67,7 +67,7 @@ class FUSInviteEmissaryRewardDrawHeader: UITableViewHeaderFooterView {
drawBtn.setTitleColor(.fus_diamondBlue(), for: .normal)
drawBtn.titleLabel?.font = .fus_themeMediumFont(13)
drawBtn.setTitle(" " + .fus_versionLocalString("全部领取") + " ", for: .normal)
drawBtn.setTitle(" " + .fus_localString("全部领取") + " ", for: .normal)
bgView.addSubview(drawBtn)
drawBtn.snp.makeConstraints { make in
make.right.equalToSuperview()
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/InviteReward/Cell/FUSInviteFunctionStepOneContentView.swift
......@@ -469,15 +469,15 @@ extension FUSInviteRewardInviteFunctionCell.FUSInviteRewardInviteFunctionType{
let recallDay: String = "\(FUSSwiftCacheDataShare.share.settingConfigModel.value?.inviteDataRecallShowDay ?? 90)"
switch self{
case .media:
return .init(format: .fus_versionLocalString("选择您要使用的社交媒体，发送社交媒体邀请给超过%@天未登入的老玩家"), recallDay)
return .init(format: .fus_localString("选择您要使用的社交媒体，发送社交媒体邀请给超过%@天未登入的老玩家"), recallDay)
case .web:
return .init(format: .fus_versionLocalString("拷贝您的专属邀请链接，发送链接给超过%@天未登入的老玩家，访问网页可下载。"), recallDay)
return .init(format: .fus_localString("拷贝您的专属邀请链接，发送链接给超过%@天未登入的老玩家，访问网页可下载。"), recallDay)
case .QRCode:
return .init(format: .fus_versionLocalString("保存您的邀请QRCode图片，超过%@天未登入的老玩家通过扫描QRCode可以下载"), recallDay)
return .init(format: .fus_localString("保存您的邀请QRCode图片，超过%@天未登入的老玩家通过扫描QRCode可以下载"), recallDay)
case .appStore:
return .init(format: .fus_versionLocalString("告诉超过%@天未登入的老玩家前往自己手机熟悉的应用商店，并搜寻“FusiYa”关键词"), recallDay)
return .init(format: .fus_localString("告诉超过%@天未登入的老玩家前往自己手机熟悉的应用商店，并搜寻%@关键词"), recallDay, "“FusiYa”")
case .inviteCode:
return .fus_versionLocalString("部分地区新玩家注册的时候需要填写邀请码才可以完成注册流程")
return .fus_localString("部分地区新玩家注册的时候需要填写邀请码才可以完成注册流程")
default:
return ""
}
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/InviteReward/Cell/FUSInviteRewardInviteFunctionCell.swift
......@@ -41,11 +41,11 @@ class FUSInviteRewardInviteFunctionCell: UITableViewCell {
case .web:
return .fus_localString("网页链接邀请")
case .QRCode:
return .fus_versionLocalString("定制宣传图邀请")
return .fus_localString("定制宣传图邀请")
case .appStore:
return .fus_localString("应用商店邀请")
case .myEmissaryCode:
return .fus_versionLocalString("我的邀请码QRCode")
return .fus_localString("我的邀请码QRCode")
default:
return ""
}
......@@ -62,7 +62,7 @@ class FUSInviteRewardInviteFunctionCell: UITableViewCell {
case .appStore:
return .fus_localString("告诉朋友前往应用商店搜寻“FusiYa”")
case .myEmissaryCode:
return .fus_versionLocalString("发送我的专属QRcode给好友完成使者绑定")
return .fus_localString("发送我的专属QRcode给好友完成使者绑定")
default:
return ""
}
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/InviteReward/Cell/FUSInviteRewardInviteFunctionHeader.swift
......@@ -104,11 +104,11 @@ class FUSInviteRewardInviteFunctionHeader: FUSBaseView {
case .emissaryRecall:
descLabel.isHidden = true
emissaryLineImageView.isHidden = false
titleLabel.text = .fus_versionLocalString("召回任务")
titleLabel.text = .fus_localString("召回任务")
case .recallFunction:
descLabel.isHidden = true
emissaryLineImageView.isHidden = true
titleLabel.text = .fus_versionLocalString("选择召回方式")
titleLabel.text = .fus_localString("选择召回方式")
}
let titleSize = titleLabel.text?.size(for: .fus_themeMediumFont(18), maxWidth: Double(MAXFLOAT), maxHeight: 30)
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/InviteReward/Cell/FUSInviteRewardInvitePlanCell.swift
......@@ -302,10 +302,10 @@ extension FUSInviteRewardInviteView.FUSInviteRewardInviteViewType{
func fus_getPlanTitle() -> NSAttributedString {
return .sj.makeText({ make in
if self == .invite {
make.append(.fus_versionLocalString("邀请新玩家加入")).textColor(.fus_textColorRich())
make.append(.fus_localString("邀请新玩家加入")).textColor(.fus_textColorRich())
}
else {
make.append(.fus_versionLocalString("召唤老玩家回归")).textColor(.fus_textColorRich())
make.append(.fus_localString("召唤老玩家回归")).textColor(.fus_textColorRich())
}
make.append(" ")
make.append("FusiYa").textColor(.fus_diamondBlue())
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/InviteReward/Cell/FUSInviteRewardInviteRecallClansmanCell.swift
......@@ -16,9 +16,9 @@ class FUSInviteRewardInviteRecallClansmanCell: UITableViewCell {
func fus_getTitle() -> String{
switch self{
case .churnClansman:
return.fus_versionLocalString("流失族人")
return.fus_localString("流失族人")
case .clansmanRelationship:
return .fus_versionLocalString("族人关系")
return .fus_localString("族人关系")
}
}
}
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/InviteReward/Cell/FUSInviteRewardInviteRecallClansmanHeader.swift
......@@ -15,14 +15,14 @@ class FUSInviteRewardInviteRecallClansmanHeader: FUSBaseView {
func fus_getTitle() -> String {
switch self {
case .recallClansman:
return .fus_versionLocalString("召回流失族人")
return .fus_localString("召回流失族人")
}
}
func fus_getDesc() -> String {
switch self {
case .recallClansman:
return .init(format: .fus_versionLocalString("%@天以上未登入FIREFLY的玩家，将会自动断开使者关系"), "\(FUSSwiftCacheDataShare.share.settingConfigModel.value?.inviteDataRecallShowDay ?? 90)")
return .init(format: .fus_localString("%@天以上未登入%@的玩家，将会自动断开使者关系"), "\(FUSSwiftCacheDataShare.share.settingConfigModel.value?.inviteDataRecallShowDay ?? 90)", "FusiYa")
}
}
}
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/InviteReward/Cell/FUSInviteRewardMyClansmanLoadMoreCell.swift
......@@ -75,7 +75,7 @@ class FUSInviteRewardMyClansmanLoadMoreCell: UITableViewCell {
titleLabel.font = .fus_themeFont(11)
titleLabel.textColor = .init(hexString: "#8C8C8C")
titleLabel.text = .fus_versionLocalString("加载更多")
titleLabel.text = .fus_localString("加载更多")
centerView.addSubview(titleLabel)
titleLabel.snp.makeConstraints { make in
make.right.equalToSuperview()
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/InviteReward/Cell/FUSInviteRewardMyEmissaryRewardCell.swift
......@@ -55,7 +55,7 @@ class FUSInviteRewardMyEmissaryRewardCell: UITableViewCell {
titleLabel.font = .fus_themeFont(14)
titleLabel.textColor = .fus_textColorDeep()
titleLabel.text = .fus_versionLocalString("今日使者奖励")
titleLabel.text = .fus_localString("今日使者奖励")
bgImageView.addSubview(titleLabel)
titleLabel.snp.makeConstraints { make in
make.left.equalTo(16)
......@@ -80,7 +80,7 @@ class FUSInviteRewardMyEmissaryRewardCell: UITableViewCell {
drawBtn.style = .blue
drawBtn.titleLabel?.font = .fus_themeMediumFont(14)
drawBtn.setTitle(" " + .fus_versionLocalString("领取奖励") + " ", for: .normal)
drawBtn.setTitle(" " + .fus_localString("领取奖励") + " ", for: .normal)
bgImageView.addSubview(drawBtn)
drawBtn.snp.makeConstraints { make in
make.centerX.equalToSuperview()
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/InviteReward/FUSInviteEmissaryRewardController.swift
......@@ -16,7 +16,7 @@ class FUSInviteEmissaryRewardController: FUSBaseViewController {
super.viewDidLoad()
self.view.backgroundColor = .white
self.title = .fus_versionLocalString("使者奖励领取")
self.title = .fus_localString("使者奖励领取")
self.showBackBtn = true
makeUI()
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/InviteReward/FUSInviteRewardController.swift
......@@ -34,11 +34,11 @@ public class FUSInviteRewardController: FUSBaseViewController {
case .task:
return .fus_localString("任务")
case .board:
return .fus_versionLocalString("榜单")
return .fus_localString("榜单")
case .my:
return .fus_localString("我的")
case .recall:
return .fus_versionLocalString("召回")
return .fus_localString("召回")
}
}
......@@ -203,7 +203,7 @@ public class FUSInviteRewardController: FUSBaseViewController {
}).disposed(by: disposeBag)
let scanBtn = UIButton(type: .custom)
scanBtn.setImage(FUSInviteRewardMoreMenuType.bindEmissary.fus_getIconImage(), for: .normal)
scanBtn.setImage(FUSUserCenterBunble.imageNamed("inviteReward_navi_scan_icon"), for: .normal)
scanBtn.rx.tap.subscribe(onNext: {
FUSRouter.userRouter().fus_showBindAgentPage(withNeedShowSkipBtn: false) {
FUSRouter.userRouter().fus_showBindAgentSuccessPopView {
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/InviteReward/View/FUSInviteRecallWellcomeAlertView.swift
......@@ -54,7 +54,7 @@ import UIKit
titleLabel.font = .fus_themeBoldFont(20)
titleLabel.textColor = .fus_textColorDeep()
titleLabel.text = .fus_versionLocalString("欢迎回归")
titleLabel.text = .fus_localString("欢迎回归")
contentView.addSubview(titleLabel)
titleLabel.snp.makeConstraints { make in
make.top.equalTo(24)
......@@ -64,7 +64,7 @@ import UIKit
descLabel.font = .fus_themeFont(14)
descLabel.textColor = .fus_textColorMedium()
descLabel.numberOfLines = 0
descLabel.text = .fus_versionLocalString("许久未见，恭迎回归。回归7日内完成储值可以获得回归大礼包奖励。")
descLabel.text = .fus_localString("许久未见，恭迎回归。回归7日内完成储值可以获得回归大礼包奖励。")
contentView.addSubview(descLabel)
descLabel.snp.makeConstraints { make in
make.top.equalTo(titleLabel.snp.bottom).offset(10)
......@@ -87,7 +87,7 @@ import UIKit
recallLabel.font = .fus_themeMediumFont(15)
recallLabel.textColor = .white
recallLabel.backgroundColor = .init(hexString: "#C1C0C0")
recallLabel.text = " " + .fus_versionLocalString("回归大礼包") + " "
recallLabel.text = " " + .fus_localString("回归大礼包") + " "
recallLabel.layer.cornerRadius = 14
recallLabel.layer.masksToBounds = true
contentView.addSubview(recallLabel)
......@@ -99,7 +99,7 @@ import UIKit
okBtn.style = .blue
okBtn.titleLabel?.font = .fus_themeMediumFont(15)
okBtn.setTitle(.fus_versionLocalString("确认"), for: .normal)
okBtn.setTitle(.fus_localString("确认"), for: .normal)
contentView.addSubview(okBtn)
okBtn.snp.makeConstraints { make in
make.top.equalTo(recallBgImageView.snp.bottom).offset(2)
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/InviteReward/View/FUSInviteRewardMyView.swift
......@@ -368,9 +368,9 @@ extension FUSInviteRewardMyView.FUSInviteRewardMySectionType {
func fus_getClansmanHeaderTitle() -> String {
switch self{
case .dauClansman:
return .fus_versionLocalString("活跃族人%@")
return .fus_localString("活跃族人%@")
case .recallClansman:
return .fus_versionLocalString("流失族人%@")
return .fus_localString("流失族人%@")
default:
return ""
}
......@@ -379,9 +379,9 @@ extension FUSInviteRewardMyView.FUSInviteRewardMySectionType {
func ff_getClansmanHeaderSubTitle() -> String {
switch self{
case .dauClansman:
return .fus_versionLocalString("最近30天内活跃的族人")
return .fus_localString("最近30天内活跃的族人")
case .recallClansman:
return .init(format: .fus_versionLocalString("%@天以上未登入FIREFLY的玩家，将会自动断开使者关系"), "\(FUSSwiftCacheDataShare.share.settingConfigModel.value?.inviteDataRecallShowDay ?? 90)")
return .init(format: .fus_localString("%@天以上未登入%@的玩家，将会自动断开使者关系"), "\(FUSSwiftCacheDataShare.share.settingConfigModel.value?.inviteDataRecallShowDay ?? 90)", "FusiYa")
default:
return ""
}
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/InviteReward/View/FUSMyEmissaryQRCodeView.swift
......@@ -29,7 +29,7 @@ class FUSMyEmissaryQRCodeView: FUSBaseView {
titleLabel.font = .fus_themeMediumFont(22)
titleLabel.textColor = .fus_textColorRich()
// titleLabel.text = .fus_localString("我的使者码")
titleLabel.text = .fus_versionLocalString("我的邀请码")
titleLabel.text = .fus_localString("我的邀请码")
self.addSubview(titleLabel)
titleLabel.snp.makeConstraints { make in
make.centerX.equalToSuperview()
......@@ -41,7 +41,7 @@ class FUSMyEmissaryQRCodeView: FUSBaseView {
descLabel.textColor = .fus_textColorMedium()
descLabel.numberOfLines = 0
// descLabel.text = .fus_localString("在APP—「我的」—「邀请有奖」—「右上角菜单」 -「绑定使者」扫描QRCode绑定您为使者")
descLabel.text = .fus_versionLocalString("保存QRCode到您的相册，将此图片发送给您要邀请的好友扫描即可完成绑定您为使者和成功注册在部分国家和地区，只有完成使者绑定对方才能注册成功")
descLabel.text = .fus_localString("保存QRCode到您的相册，将此图片发送给您要邀请的好友扫描即可完成绑定您为使者和成功注册在部分国家和地区，只有完成使者绑定对方才能注册成功")
self.addSubview(descLabel)
descLabel.snp.makeConstraints { make in
make.left.right.equalToSuperview().inset(35)
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/InviteReward/View/FUSMyInviteQRCodeDownloadView.swift
......@@ -36,7 +36,7 @@ class FUSMyInviteQRCodeDownloadView: FUSBaseView {
titleLabel.font = .fus_themeMediumFont(22)
titleLabel.textColor = .fus_textColorRich()
// titleLabel.text = .fus_localString("我的使者码")
titleLabel.text = .fus_versionLocalString("我的邀请码")
titleLabel.text = .fus_localString("我的邀请码")
self.addSubview(titleLabel)
titleLabel.snp.makeConstraints { make in
make.centerX.equalToSuperview()
......@@ -95,7 +95,7 @@ class FUSMyInviteQRCodeDownloadView: FUSBaseView {
qrCodeLabel.font = .fus_themeFont(15)
qrCodeLabel.textColor = .fus_textColorLight2()
qrCodeLabel.text = .init(format: .fus_versionLocalString("官网：%@"), "fusiclub.com")
qrCodeLabel.text = .init(format: .fus_localString("官网：%@"), "fusiclub.com")
self.addSubview(qrCodeLabel)
qrCodeLabel.snp.makeConstraints { make in
make.top.equalTo(qrCodeView.snp.bottom).offset(10)
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/Zone/View/FireFlyView/View/FUSZoneCanSendNewsFeedTipView.h
......@@ -13,7 +13,7 @@ NS_ASSUME_NONNULL_BEGIN
@interface FUSZoneCanSendNewsFeedTipView : UIView
// 判断是否弹出提示，如果需要，则直接弹出
+ (FUSZoneCanSendNewsFeedTipView *)fus_showZoneCanSendNewsFeedTipViewIfNeededOnSuperView:(UIView *)superView;
+ (FUSZoneCanSendNewsFeedTipView *)fus_showZoneCanSendNewsFeedTipViewIfNeededOnSuperView:(UIView *)superView buttonIndex:(NSInteger)index;
@end
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/Zone/View/FireFlyView/View/FUSZoneCanSendNewsFeedTipView.m
......@@ -18,16 +18,19 @@
@property (strong, nonatomic) IBOutlet UILabel *tipLabel;
@property (strong, nonatomic) IBOutlet UIImageView *tipBGImageView;
@property (nonatomic, assign) NSInteger buttonIndex;
@end
@implementation FUSZoneCanSendNewsFeedTipView
+ (FUSZoneCanSendNewsFeedTipView *)fus_showZoneCanSendNewsFeedTipViewIfNeededOnSuperView:(UIView *)superView {
+ (FUSZoneCanSendNewsFeedTipView *)fus_showZoneCanSendNewsFeedTipViewIfNeededOnSuperView:(UIView *)superView buttonIndex:(NSInteger)index{
BOOL hasShown = [[[NSUserDefaults standardUserDefaults] objectForKey:kFUSZoneCanSendNewsFeedTipViewHasShownUDK] boolValue];
if (!hasShown && !FUSConfig.sharedInstanced.devConfigs.appStatus) {
FUSZoneCanSendNewsFeedTipView *tipView = [[FUSZoneCanSendNewsFeedTipView alloc] initWithFrame:UIView.fus_screenFrame];
tipView.buttonIndex = index;
[superView addSubview:tipView];
[[NSUserDefaults standardUserDefaults] setObject:@(YES) forKey:kFUSZoneCanSendNewsFeedTipViewHasShownUDK];
return tipView;
......@@ -69,7 +72,7 @@
[self.customConstraints addObjectsFromArray:
[NSLayoutConstraint constraintsWithVisualFormat:
@"H:|[view]|" options:0 metrics:nil views:views]];
[NSString stringWithFormat:@"H:|[view]-%ld-|",13 + _buttonIndex*30] options:0 metrics:nil views:views]];
[self.customConstraints addObjectsFromArray:
[NSLayoutConstraint constraintsWithVisualFormat:
@"V:|[view]|" options:0 metrics:nil views:views]];
......
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