Skip to content

pidan / FuSiLive

Go to a project
Commit fb862b47 by ludi
Options

修复一些小问题

parent 089510b7
Inline Side-by-side
Showing with 52 additions and 8 deletions
DevelopmentPods/FUSCommon/FUSCommon/FUSRouter/Routers/UserRouter/FUSUserRouterProtocol.h
...@@ -299,6 +299,10 @@ NS_ASSUME_NONNULL_BEGIN ...@@ -299,6 +299,10 @@ NS_ASSUME_NONNULL_BEGIN
bindagenttime:(NSString *)bindagenttime bindagenttime:(NSString *)bindagenttime
getResultDate:(NSString *)getResultDate; getResultDate:(NSString *)getResultDate;
/// 跳转到邀请有奖
/// @param segmentTypeStr 跳转默认显示的页面
-(void)fus_pushToInviteRewardWithSegmentTypeStr:(NSString *)segmentTypeStr;
@end @end
NS_ASSUME_NONNULL_END NS_ASSUME_NONNULL_END
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/LocalizationString/Fusi_Chinese.strings
...@@ -3028,3 +3028,5 @@ ...@@ -3028,3 +3028,5 @@
"使者邀请" = "使者邀请"; "使者邀请" = "使者邀请";
"质量评级" = "质量评级";
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/LocalizationString/Fusi_Chinese_Traditional.strings
...@@ -3028,3 +3028,5 @@ ...@@ -3028,3 +3028,5 @@
"使者邀请" = "使者邀請"; "使者邀请" = "使者邀請";
"质量评级" = "質量評級";
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/LocalizationString/Fusi_English.strings
...@@ -3028,3 +3028,5 @@ ...@@ -3028,3 +3028,5 @@
"使者邀请" = "Emissary invitation"; "使者邀请" = "Emissary invitation";
"质量评级" = "Quality Rating";
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/LocalizationString/Fusi_Japanese.strings
...@@ -3006,3 +3006,5 @@ ...@@ -3006,3 +3006,5 @@
"使者邀请" = "使者招待"; "使者邀请" = "使者招待";
"质量评级" = "品質評価";
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/LocalizationString/Fusi_Thai.strings
...@@ -3000,3 +3000,5 @@ ...@@ -3000,3 +3000,5 @@
"使者邀请" = "คำเชิญทูต"; "使者邀请" = "คำเชิญทูต";
"质量评级" = "คะแนนคุณภาพ";
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/LocalizationString/Fusi_vietnamese.strings
...@@ -3006,3 +3006,5 @@ ...@@ -3006,3 +3006,5 @@
"使者邀请" = "Lời mời của sứ giả"; "使者邀请" = "Lời mời của sứ giả";
"质量评级" = "Xếp hạng chất lượng";
FuSiLive.xcodeproj/project.pbxproj
...@@ -484,7 +484,7 @@ ...@@ -484,7 +484,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 = 2025040123; CURRENT_PROJECT_VERSION = 2025040140;
DEFINES_MODULE = YES; DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = 6GG26BHUMC; DEVELOPMENT_TEAM = 6GG26BHUMC;
ENABLE_ON_DEMAND_RESOURCES = NO; ENABLE_ON_DEMAND_RESOURCES = NO;
...@@ -752,7 +752,7 @@ ...@@ -752,7 +752,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 = 2025040123; CURRENT_PROJECT_VERSION = 2025040140;
DEFINES_MODULE = YES; DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = 6GG26BHUMC; DEVELOPMENT_TEAM = 6GG26BHUMC;
ENABLE_ON_DEMAND_RESOURCES = NO; ENABLE_ON_DEMAND_RESOURCES = NO;
......
FuSiLive/Info.plist
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
</dict> </dict>
</array> </array>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>2025040123</string> <string>2025040140</string>
<key>FacebookAdvertiserIDCollectionEnabled</key> <key>FacebookAdvertiserIDCollectionEnabled</key>
<true/> <true/>
<key>FacebookAppID</key> <key>FacebookAppID</key>
......
Modules/FUSChatCenterModule/FUSChatCenterModule.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<key>FUSChatCenterModule.xcscheme_^#shared#^_</key> <key>FUSChatCenterModule.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>78</integer> <integer>74</integer>
</dict> </dict>
</dict> </dict>
</dict> </dict>
......
Modules/FUSChatCenterModule/FUSChatCenterModule/Features/ZhaiXin/Official/Controller/FUSOfficialViewController.m
...@@ -606,6 +606,19 @@ ...@@ -606,6 +606,19 @@
} }
} }
break; break;
case 21:{
//跳转到珍爱团
}
break;
case 22:{
// 跳转到编辑资料
}
break;
case 23:{
// 跳转使者邀请奖励页面
[[FUSRouter userRouter] fus_pushToInviteRewardWithSegmentTypeStr:msgModel.clickdata];
}
break;
default: default:
break; break;
} }
......
Modules/FUSShowRoomModule/FUSShowRoomModule.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<key>FUSShowRoomModule.xcscheme_^#shared#^_</key> <key>FUSShowRoomModule.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>75</integer> <integer>73</integer>
</dict> </dict>
</dict> </dict>
</dict> </dict>
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FUSVideoEndView/FUSVideoEndScoreQualityAlertView.swift
...@@ -156,7 +156,7 @@ import RxSwift ...@@ -156,7 +156,7 @@ import RxSwift
func fus_reloadData(){ func fus_reloadData(){
self.qualityGradeLabel.attributedText = .sj.makeText({ make in self.qualityGradeLabel.attributedText = .sj.makeText({ make in
make.append(.fus_versionLocalString("質量評級") + "：").textColor(.fus_textColorRich()) make.append(.fus_localString("质量评级") + "：").textColor(.fus_textColorRich())
make.append(self.dataModel.resultLevelName).textColor(self.dataModel.fus_getLevelColor()).font(.fus_themeMediumFont(20)) make.append(self.dataModel.resultLevelName).textColor(self.dataModel.fus_getLevelColor()).font(.fus_themeMediumFont(20))
make.font(.fus_themeFont(15)) make.font(.fus_themeFont(15))
}) })
......
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>74</integer> <integer>78</integer>
</dict> </dict>
<key>FUSUserCenterModuleBundle.xcscheme_^#shared#^_</key> <key>FUSUserCenterModuleBundle.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>73</integer> <integer>75</integer>
</dict> </dict>
</dict> </dict>
</dict> </dict>
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/InviteReward/FUSInviteRewardController.swift
...@@ -86,6 +86,13 @@ public class FUSInviteRewardController: FUSBaseViewController { ...@@ -86,6 +86,13 @@ public class FUSInviteRewardController: FUSBaseViewController {
} }
} }
@objc static public func fus_pushToInviteReward(segmentTypeStr: String) {
let vc = FUSInviteRewardController()
vc.hidesBottomBarWhenPushed = true
vc.preloadType = FUSInviteRewardController.FUSInviteRewardViewType.fus_getType(segmentTypeStr)
UINavigationController.fus_top()?.navigationController?.pushViewController(vc, animated: true)
}
var preloadType: FUSInviteRewardViewType = .invite var preloadType: FUSInviteRewardViewType = .invite
/// 更多的菜单 /// 更多的菜单
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/Setting/Controller/FUSSettingViewController.m
...@@ -331,6 +331,10 @@ ...@@ -331,6 +331,10 @@
[self.versionLabel sizeToFit]; [self.versionLabel sizeToFit];
[self.logoutFooterView addSubview:self.versionLabel]; [self.logoutFooterView addSubview:self.versionLabel];
if ([FUSConfig sharedInstanced].devConfigs.devLevel == FUSDevlopLevelTest || [FUSConfig sharedInstanced].devConfigs.devLevel == FUSDevlopLevelDeveloper) {
self.versionLabel.text = [NSString stringWithFormat:@"v%@(%@)",[[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleShortVersionString"], [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleVersion"]];
}
[self.versionLabel mas_makeConstraints:^(MASConstraintMaker *make) { [self.versionLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerX.equalTo(self.logoutBtn); make.centerX.equalTo(self.logoutBtn);
make.top.equalTo(self.iconImageView.mas_bottom).offset(2); make.top.equalTo(self.iconImageView.mas_bottom).offset(2);
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Router/FUSUserCenterRouter.m
...@@ -948,4 +948,8 @@ ...@@ -948,4 +948,8 @@
[[NSNotificationCenter defaultCenter] postNotificationName:FUSUserNotificationKeys.fus_BOUND_AGENT_RESULT object:nil]; [[NSNotificationCenter defaultCenter] postNotificationName:FUSUserNotificationKeys.fus_BOUND_AGENT_RESULT object:nil];
} }
- (void)fus_pushToInviteRewardWithSegmentTypeStr:(NSString *)segmentTypeStr{
[FUSInviteRewardController fus_pushToInviteRewardWithSegmentTypeStr:segmentTypeStr];
}
@end @end
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