Skip to content

pidan / FuSiLive

Go to a project
Commit 6524d21c by ludi
Options

完成注册前绑定邀请人的准备

parent 0fe6d701
Expand all
Inline Side-by-side
Showing with 364 additions and 8 deletions
DevelopmentPods/FUSCommon/FUSCommon/Classes/Common/Models/FUSAccountAgentcodeVerifyModel.h 0 → 100644
//
// FUSAccountAgentcodeVerifyModel.h
// FUSCommon
//
// Created by aaa on 2025/6/20.
//
#import <FUSFoundation/FUSFoundation.h>
NS_ASSUME_NONNULL_BEGIN
@interface FUSAccountAgentcodeVerifyInfoModel : FUSBaseModel
/// 使者ID
@property (nonatomic, copy) NSString *uid;
/// 使者昵称
@property (nonatomic, copy) NSString *nickname;
/// 使者头像
@property (nonatomic, copy) NSString *face;
/// 使者富豪等级
@property (nonatomic, assign) NSInteger level;
/// 是否VIP(0:否/1:是)
@property (nonatomic, assign) BOOL vip;
@end
@interface FUSAccountAgentcodeVerifyModel : FUSBaseModel
/// 使者信息（code=1返回）
@property (nonatomic, strong) FUSAccountAgentcodeVerifyInfoModel *info;
/// 来源（未找到，不返回）
@property (nonatomic, copy) NSString *origin;
@end
NS_ASSUME_NONNULL_END
DevelopmentPods/FUSCommon/FUSCommon/Classes/Common/Models/FUSAccountAgentcodeVerifyModel.m 0 → 100644
//
// FUSAccountAgentcodeVerifyModel.m
// FUSCommon
//
// Created by aaa on 2025/6/20.
//
#import "FUSAccountAgentcodeVerifyModel.h"
@implementation FUSAccountAgentcodeVerifyInfoModel
@end
@implementation FUSAccountAgentcodeVerifyModel
@end
DevelopmentPods/FUSCommon/FUSCommon/Classes/Foundation/DataShare/FUSCacheDataShare.h
...@@ -125,6 +125,11 @@ ...@@ -125,6 +125,11 @@
@property (nonatomic,strong) NSString *agentCode; @property (nonatomic,strong) NSString *agentCode;
@property (nonatomic,strong) NSString *bindType; @property (nonatomic,strong) NSString *bindType;
/// 自动绑定，来源
@property (nonatomic, copy) NSString *origin;
/// 来源类型 1：指纹 2：扫码
@property (nonatomic, copy) NSString *originType;
/// 获取用户数据交易提醒 /// 获取用户数据交易提醒
@property (nonatomic, strong) FUSUserTradeRemindModel *userTradeRemindModel; @property (nonatomic, strong) FUSUserTradeRemindModel *userTradeRemindModel;
......
DevelopmentPods/FUSCommon/FUSCommon/Classes/Foundation/DataShare/FUSSwiftCacheDataShare.swift
...@@ -130,6 +130,8 @@ import RxSwift ...@@ -130,6 +130,8 @@ import RxSwift
/// 用户是否在注册之后绑定了使者码 /// 用户是否在注册之后绑定了使者码
public var bindAgentCodeSuccessData: [AnyHashable: Any]? public var bindAgentCodeSuccessData: [AnyHashable: Any]?
/// 注册的时候绑定成功的标志性：1=绑定成功，0=绑定失败
public var registeredBindsuccess: Int = 0
// - base // - base
public override init() { public override init() {
...@@ -234,6 +236,7 @@ import RxSwift ...@@ -234,6 +236,7 @@ import RxSwift
self.isLogin.accept(false) self.isLogin.accept(false)
self.settingConfigModel.accept(nil) self.settingConfigModel.accept(nil)
self.bindAgentCodeSuccessData = nil self.bindAgentCodeSuccessData = nil
self.registeredBindsuccess = 0
} }
/// 请求背包头部 /// 请求背包头部
func fus_requestBackpackTypeList(from: ReadCacheFromType){ func fus_requestBackpackTypeList(from: ReadCacheFromType){
......
DevelopmentPods/FUSCommon/FUSCommon/FUSRouter/Routers/UserRouter/FUSUserRouterProtocol.h
...@@ -17,6 +17,8 @@ ...@@ -17,6 +17,8 @@
#import "FUSMainSearchModel.h" #import "FUSMainSearchModel.h"
#import "FUSUserRiskLevelModel.h" #import "FUSUserRiskLevelModel.h"
#import "FUSAccountAgentcodeVerifyModel.h"
#define FUSUserModule BFModule(FUSUserRouterProtocol) #define FUSUserModule BFModule(FUSUserRouterProtocol)
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
...@@ -292,6 +294,13 @@ NS_ASSUME_NONNULL_BEGIN ...@@ -292,6 +294,13 @@ NS_ASSUME_NONNULL_BEGIN
-(void)fus_showBindAgentPageWithNeedShowSkipBtn:(BOOL)needShowSkipBtn -(void)fus_showBindAgentPageWithNeedShowSkipBtn:(BOOL)needShowSkipBtn
success:(void(^)(void))success; success:(void(^)(void))success;
/// 注册的时候，绑定使者页面
/// @param registerVerifyHandle 注册验证是否成功回调
/// @param skipHandle 跳过回调
-(void)fus_showRegisterBindAgentPageWithRegisterVerify:(void(^)(FUSAccountAgentcodeVerifyModel *verifyModel,void(^errorHandle)(NSString *msg, NSInteger code)))registerVerifyHandle
skip:(void(^)(void(^dismissHandle)(void)))skipHandle
back:(void(^)(void))backHandle;
/// 显示绑定成功页面 /// 显示绑定成功页面
/// @param success 1 /// @param success 1
-(void)fus_showBindAgentSuccessPopViewWithSuccess:(void(^)(void))success; -(void)fus_showBindAgentSuccessPopViewWithSuccess:(void(^)(void))success;
......
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>80</integer> <integer>83</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>84</integer> <integer>79</integer>
</dict> </dict>
<key>FUSShowRoomModule.xcscheme_^#shared#^_</key> <key>FUSShowRoomModule.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>79</integer> <integer>81</integer>
</dict> </dict>
</dict> </dict>
</dict> </dict>
......
Modules/FUSUserCenterModule/FUSUserCenterModule.xcodeproj/project.pbxproj
...@@ -105,6 +105,7 @@ ...@@ -105,6 +105,7 @@
00B778652D12DB89003D7F56 /* FUSBackpackMotorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00B778642D12DB89003D7F56 /* FUSBackpackMotorView.swift */; }; 00B778652D12DB89003D7F56 /* FUSBackpackMotorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00B778642D12DB89003D7F56 /* FUSBackpackMotorView.swift */; };
00B778672D12DC21003D7F56 /* FUSBackpackMotorCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00B778662D12DC21003D7F56 /* FUSBackpackMotorCell.swift */; }; 00B778672D12DC21003D7F56 /* FUSBackpackMotorCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00B778662D12DC21003D7F56 /* FUSBackpackMotorCell.swift */; };
00BD441C2D1E98650099A96F /* FUSVerifyVersionController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00BD441B2D1E98650099A96F /* FUSVerifyVersionController.swift */; }; 00BD441C2D1E98650099A96F /* FUSVerifyVersionController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00BD441B2D1E98650099A96F /* FUSVerifyVersionController.swift */; };
00E501EE2E050FEF00579DB0 /* FUSRegisteredBindAgentInfoAlertView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00E501ED2E050FEF00579DB0 /* FUSRegisteredBindAgentInfoAlertView.swift */; };
9E8D0BED6061C8C88FBF8686 /* Pods_FUSUserCenterModule.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BED3EAC4EA2F921CB5B2FEE8 /* Pods_FUSUserCenterModule.framework */; }; 9E8D0BED6061C8C88FBF8686 /* Pods_FUSUserCenterModule.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BED3EAC4EA2F921CB5B2FEE8 /* Pods_FUSUserCenterModule.framework */; };
BE189A2D2C7323FE0008418B /* FSRDynamicImModel.h in Headers */ = {isa = PBXBuildFile; fileRef = BE1899A72C7323FE0008418B /* FSRDynamicImModel.h */; }; BE189A2D2C7323FE0008418B /* FSRDynamicImModel.h in Headers */ = {isa = PBXBuildFile; fileRef = BE1899A72C7323FE0008418B /* FSRDynamicImModel.h */; };
BE189A2E2C7323FE0008418B /* FSRDynamicImModel.m in Sources */ = {isa = PBXBuildFile; fileRef = BE1899A82C7323FE0008418B /* FSRDynamicImModel.m */; }; BE189A2E2C7323FE0008418B /* FSRDynamicImModel.m in Sources */ = {isa = PBXBuildFile; fileRef = BE1899A82C7323FE0008418B /* FSRDynamicImModel.m */; };
...@@ -1043,6 +1044,7 @@ ...@@ -1043,6 +1044,7 @@
00B778642D12DB89003D7F56 /* FUSBackpackMotorView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FUSBackpackMotorView.swift; sourceTree = "<group>"; }; 00B778642D12DB89003D7F56 /* FUSBackpackMotorView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FUSBackpackMotorView.swift; sourceTree = "<group>"; };
00B778662D12DC21003D7F56 /* FUSBackpackMotorCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FUSBackpackMotorCell.swift; sourceTree = "<group>"; }; 00B778662D12DC21003D7F56 /* FUSBackpackMotorCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FUSBackpackMotorCell.swift; sourceTree = "<group>"; };
00BD441B2D1E98650099A96F /* FUSVerifyVersionController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FUSVerifyVersionController.swift; sourceTree = "<group>"; }; 00BD441B2D1E98650099A96F /* FUSVerifyVersionController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FUSVerifyVersionController.swift; sourceTree = "<group>"; };
00E501ED2E050FEF00579DB0 /* FUSRegisteredBindAgentInfoAlertView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FUSRegisteredBindAgentInfoAlertView.swift; sourceTree = "<group>"; };
29DC17A1A1D4B29CA3BB6003 /* Pods-FUSUserCenterModule.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FUSUserCenterModule.debug.xcconfig"; path = "Target Support Files/Pods-FUSUserCenterModule/Pods-FUSUserCenterModule.debug.xcconfig"; sourceTree = "<group>"; }; 29DC17A1A1D4B29CA3BB6003 /* Pods-FUSUserCenterModule.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FUSUserCenterModule.debug.xcconfig"; path = "Target Support Files/Pods-FUSUserCenterModule/Pods-FUSUserCenterModule.debug.xcconfig"; sourceTree = "<group>"; };
BE1899A72C7323FE0008418B /* FSRDynamicImModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FSRDynamicImModel.h; sourceTree = "<group>"; }; BE1899A72C7323FE0008418B /* FSRDynamicImModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FSRDynamicImModel.h; sourceTree = "<group>"; };
BE1899A82C7323FE0008418B /* FSRDynamicImModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FSRDynamicImModel.m; sourceTree = "<group>"; }; BE1899A82C7323FE0008418B /* FSRDynamicImModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FSRDynamicImModel.m; sourceTree = "<group>"; };
...@@ -2058,6 +2060,7 @@ ...@@ -2058,6 +2060,7 @@
00B45E1C2D93A86D00FF138F /* FUSBindAgentInputCodeViewController.swift */, 00B45E1C2D93A86D00FF138F /* FUSBindAgentInputCodeViewController.swift */,
00B45E1D2D93A86D00FF138F /* FUSBindAgentSuccessPopView.swift */, 00B45E1D2D93A86D00FF138F /* FUSBindAgentSuccessPopView.swift */,
00B45E1E2D93A86D00FF138F /* FUSBindAgentViewController.swift */, 00B45E1E2D93A86D00FF138F /* FUSBindAgentViewController.swift */,
00E501ED2E050FEF00579DB0 /* FUSRegisteredBindAgentInfoAlertView.swift */,
); );
path = BindAgentVC; path = BindAgentVC;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -4472,10 +4475,14 @@ ...@@ -4472,10 +4475,14 @@
inputFileListPaths = ( inputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-FUSUserCenterModule/Pods-FUSUserCenterModule-resources-${CONFIGURATION}-input-files.xcfilelist", "${PODS_ROOT}/Target Support Files/Pods-FUSUserCenterModule/Pods-FUSUserCenterModule-resources-${CONFIGURATION}-input-files.xcfilelist",
); );
inputPaths = (
);
name = "[CP] Copy Pods Resources"; name = "[CP] Copy Pods Resources";
outputFileListPaths = ( outputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-FUSUserCenterModule/Pods-FUSUserCenterModule-resources-${CONFIGURATION}-output-files.xcfilelist", "${PODS_ROOT}/Target Support Files/Pods-FUSUserCenterModule/Pods-FUSUserCenterModule-resources-${CONFIGURATION}-output-files.xcfilelist",
); );
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh; shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-FUSUserCenterModule/Pods-FUSUserCenterModule-resources.sh\"\n"; shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-FUSUserCenterModule/Pods-FUSUserCenterModule-resources.sh\"\n";
...@@ -4701,6 +4708,7 @@ ...@@ -4701,6 +4708,7 @@
BE78CB6C2C538D7E00F38855 /* FUSMyZoneCellManager.m in Sources */, BE78CB6C2C538D7E00F38855 /* FUSMyZoneCellManager.m in Sources */,
0089FBB52D34FA1E00485E49 /* FUSCaptchaViewModel.swift in Sources */, 0089FBB52D34FA1E00485E49 /* FUSCaptchaViewModel.swift in Sources */,
BE78CC9E2C538D8000F38855 /* FUSNewsFeedReplyInputView.m in Sources */, BE78CC9E2C538D8000F38855 /* FUSNewsFeedReplyInputView.m in Sources */,
00E501EE2E050FEF00579DB0 /* FUSRegisteredBindAgentInfoAlertView.swift in Sources */,
BE78CCB72C538D8000F38855 /* FUSSearchViewController.swift in Sources */, BE78CCB72C538D8000F38855 /* FUSSearchViewController.swift in Sources */,
BE78CC392C538D7F00F38855 /* FUSNewsFeedDetailViewController.m in Sources */, BE78CC392C538D7F00F38855 /* FUSNewsFeedDetailViewController.m in Sources */,
0089FBB92D34FA4200485E49 /* FUSCaptchaModel.m in Sources */, 0089FBB92D34FA4200485E49 /* FUSCaptchaModel.m in Sources */,
......
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>82</integer> <integer>84</integer>
</dict> </dict>
<key>FUSUserCenterModuleBundle.xcscheme_^#shared#^_</key> <key>FUSUserCenterModuleBundle.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>81</integer> <integer>80</integer>
</dict> </dict>
</dict> </dict>
</dict> </dict>
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/BindAgentVC/FUSAutoBindHelper.swift
...@@ -57,9 +57,12 @@ private let FUSAutoBindHelperFirstCallUDKey = "FUSAutoBindHelperFirstCallUDKey" ...@@ -57,9 +57,12 @@ private let FUSAutoBindHelperFirstCallUDKey = "FUSAutoBindHelperFirstCallUDKey"
// 自动绑定回调 // 自动绑定回调
if cid == FUSJsWebCidType.typeAutoBind.rawValue { if cid == FUSJsWebCidType.typeAutoBind.rawValue {
FUSLog.info("----autoBind:\(dataDict?.description ?? "")")
let cid = (dataDict?["channelId"] as? String) ?? "" let cid = (dataDict?["channelId"] as? String) ?? ""
let agentCode = (dataDict?["agentUid"] as? String) ?? "" let agentCode = (dataDict?["agentUid"] as? String) ?? ""
let bindType = (dataDict?["bindType"] as? String) ?? "" let bindType = (dataDict?["bindType"] as? String) ?? ""
let origin = (dataDict?["origin"] as? String) ?? ""
// let fingerprintId = (dataDict?["fingerprintId"] as? String) ?? "" // let fingerprintId = (dataDict?["fingerprintId"] as? String) ?? ""
if isValidString(cid) { if isValidString(cid) {
...@@ -73,6 +76,19 @@ private let FUSAutoBindHelperFirstCallUDKey = "FUSAutoBindHelperFirstCallUDKey" ...@@ -73,6 +76,19 @@ private let FUSAutoBindHelperFirstCallUDKey = "FUSAutoBindHelperFirstCallUDKey"
if isValidString(bindType) { if isValidString(bindType) {
FUSCacheDataShare.shareStore().bindType = bindType FUSCacheDataShare.shareStore().bindType = bindType
} }
if isValidString(origin) {
FUSCacheDataShare.shareStore().origin = origin
FUSCacheDataShare.shareStore().originType = "1"
// 上传来源
FUSLoginHttpHelper.fus_dataAppinfoStat(withOrigin: origin) {
} failure: { msg, code in
}
}
finishHandler?() finishHandler?()
self.FUS_cleanAutoBindHelper() self.FUS_cleanAutoBindHelper()
} }
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/BindAgentVC/FUSRegisteredBindAgentInfoAlertView.swift 0 → 100644
//
// FUSRegisteredBindAgentInfoAlertView.swift
// FUSUserCenterModule
//
// Created by aaa on 2025/6/20.
//
import UIKit
import FUSCommon
class FUSRegisteredBindAgentInfoAlertView: FUSBaseView {
public static func fus_show(_ model: FUSAccountAgentcodeVerifyModel, didClosePopViewHandler: (()->Void)?){
let popView = FUSRegisteredBindAgentInfoAlertView(frame: UIView.fus_screenFrame())
popView.model = model
popView.comfirmHandle = didClosePopViewHandler
popView.alpha = 0
UIWindow.fus_keyWindow?.addSubview(popView)
UIView.animate(withDuration: 0.3) {
popView.alpha = 1
}
}
public var model: FUSAccountAgentcodeVerifyModel?{
didSet{
self.fus_reloadUI()
}
}
public var comfirmHandle: (() -> Void)?
let contentView = UIImageView()
let titleLabel = UILabel()
let subTitleLabel = UILabel()
let avatorView = FUSRichIconView(frame: CGRectMake(0, 0, 64, 64))
let titleCenterView = UIView()
let richImageView = UIImageView(frame: .init(x: 0, y: 0, width: 37, height: 14))
let nicknameLabel = UILabel()
let okBtn = FUSStyleButton(type: .custom)
override func makeUI() {
super.makeUI()
self.backgroundColor = .fus_alertViewBackground()
contentView.isUserInteractionEnabled = true
self.addSubview(contentView)
contentView.snp.makeConstraints { make in
make.center.equalToSuperview()
make.width.equalTo(300)
}
titleLabel.font = .fus_themeBoldFont(20)
titleLabel.textColor = .fus_textColorRich()
titleLabel.text = .fus_versionLocalString("绑定使者")
contentView.addSubview(titleLabel)
titleLabel.snp.makeConstraints { make in
make.centerX.equalToSuperview()
make.top.equalTo(26)
}
subTitleLabel.font = .fus_themeFont(14)
subTitleLabel.textColor = .fus_textColorRich()
subTitleLabel.text = .fus_versionLocalString("绑定使者：")
contentView.addSubview(subTitleLabel)
subTitleLabel.snp.makeConstraints { make in
make.centerX.equalToSuperview()
make.top.equalTo(titleLabel.snp.bottom).offset(14)
}
contentView.addSubview(avatorView)
avatorView.snp.makeConstraints { make in
make.top.equalTo(subTitleLabel.snp.bottom).offset(14)
make.centerX.equalToSuperview()
make.size.equalTo(CGSizeMake(64, 64))
}
contentView.addSubview(titleCenterView)
titleCenterView.snp.makeConstraints { make in
make.centerX.equalToSuperview()
make.top.equalTo(avatorView.snp.bottom).offset(14)
}
richImageView.contentMode = .scaleAspectFit
contentView.addSubview(richImageView)
richImageView.snp.makeConstraints { make in
make.left.equalTo(titleCenterView.snp.left)
make.top.equalTo(titleCenterView.snp.top)
make.size.equalTo(CGSizeMake(37, 14))
}
nicknameLabel.font = .fus_themeFont(15)
contentView.addSubview(nicknameLabel)
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)
}
okBtn.style = .blue
okBtn.titleLabel?.font = .fus_themeMediumFont(15)
okBtn.setTitle(.fus_versionLocalString("确认"), for: .normal)
contentView.addSubview(okBtn)
okBtn.snp.makeConstraints { make in
make.centerX.equalToSuperview()
make.top.equalTo(richImageView.snp.bottom).offset(24)
make.size.equalTo(CGSizeMake(214, 42))
make.bottom.equalTo(-28)
}
}
override func bindViewModel() {
super.bindViewModel()
okBtn.rx.tap.subscribe(onNext: {[weak self] _ in
self?.comfirmHandle?()
self?.fus_dismissWithAnimation()
})
.disposed(by: disposeBag)
}
func fus_reloadUI(){
guard let model = model else { return }
self.nicknameLabel.textColor = .fus_textColorRich()
if model.info.vip == true,
let levelModel = FUSSwiftCacheDataShare.share.fus_levelModel(level: model.info.level) {
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 {
richImageView.isHidden = true
titleCenterView.snp.remakeConstraints { make in
make.centerX.equalToSuperview().offset((-37 - 6)/2.0)
make.top.equalTo(avatorView.snp.bottom).offset(14)
}
}
avatorView.fus_setupIcon(withFacePath: model.info.face, level: model.info.level)
nicknameLabel.text = model.info.nickname
}
func fus_dismissWithAnimation(){
UIView.animate(withDuration: 0.25) {
self.alpha = 0
} completion: { _ in
self.removeFromSuperview()
}
}
}
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/Login/Controller/FUSMessageRegisterViewController.m
...@@ -606,6 +606,8 @@ ...@@ -606,6 +606,8 @@
[FUSHttpHelper postRequestBinaryWithUrl:FUSUserCenterURLs.fus_URL_USER_INFO params:param success:^(NSDictionary *dataDict, int code) [FUSHttpHelper postRequestBinaryWithUrl:FUSUserCenterURLs.fus_URL_USER_INFO params:param success:^(NSDictionary *dataDict, int code)
{ {
// 注册成功，直接返回注册成功信息，并且跳到主页
[FUSSwiftCacheDataShare share].registeredBindsuccess = [regDataDict[@"bindsuccess"] integerValue];
// 获取字典中的用户信息 // 获取字典中的用户信息
NSDictionary *userInfo = [dataDict objectForKey:@"user"]; NSDictionary *userInfo = [dataDict objectForKey:@"user"];
FUSUserInfosModel *userInfoModel = [FUSUserInfosModel fus_modelWithDict:userInfo]; FUSUserInfosModel *userInfoModel = [FUSUserInfosModel fus_modelWithDict:userInfo];
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/Login/Controller/FUSStartPageViewController.m
...@@ -837,6 +837,9 @@ ...@@ -837,6 +837,9 @@
// [weakSelf fus_doLoginReady]; // [weakSelf fus_doLoginReady];
// }; // };
// 注册成功，直接返回注册成功信息，并且跳到主页
[FUSSwiftCacheDataShare share].registeredBindsuccess = [dataDict[@"bindsuccess"] integerValue];
BOOL inBindAgent = [dataDict[@"inBindAgent"] boolValue]; BOOL inBindAgent = [dataDict[@"inBindAgent"] boolValue];
BOOL showBind = FUSConfig.sharedInstanced.devConfigs.appStatus == NO && inBindAgent; BOOL showBind = FUSConfig.sharedInstanced.devConfigs.appStatus == NO && inBindAgent;
if (showBind) { if (showBind) {
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/Login/Other/FUSLoginHttpHelper.h
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
#import "FUSUpdateModel.h" #import "FUSUpdateModel.h"
#import "FUSCaptchaModel.h" #import "FUSCaptchaModel.h"
#import <FUSCommon/FUSAccountAgentcodeVerifyModel.h>
typedef NS_ENUM(NSInteger, Platform) { typedef NS_ENUM(NSInteger, Platform) {
PlatformQQ = 1, PlatformQQ = 1,
...@@ -408,6 +409,22 @@ typedef NS_ENUM(NSInteger, Platform) { ...@@ -408,6 +409,22 @@ typedef NS_ENUM(NSInteger, Platform) {
success:(void(^)(void))success success:(void(^)(void))success
failure:(void(^)(NSString *msg,int code))failure; failure:(void(^)(NSString *msg,int code))failure;
/// 验证二维码使者数据
/// @param qrCode 二维码内容
/// @param success 1
/// @param failure 0
+(void)fus_accountAgentcodeVerifyWithQRCode:(NSString *)qrCode
success:(void(^)(FUSAccountAgentcodeVerifyModel *model))success
failure:(void(^)(NSString *msg,int code))failure;
/// 接收App上传的数据
/// @param origin 来源
/// @param success 1
/// @param failure 0
+(void)fus_dataAppinfoStatWithOrigin:(NSString *)origin
success:(void(^)(void))success
failure:(void(^)(NSString *msg,int code))failure;
/// 打开app只调用一次，进入后台再进入前台不需要调用 /// 打开app只调用一次，进入后台再进入前台不需要调用
+ (void)fus_requestSettingInitData; + (void)fus_requestSettingInitData;
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/Login/Other/FUSLoginHttpHelper.m
...@@ -324,7 +324,9 @@ ...@@ -324,7 +324,9 @@
parm[@"qrCode"] = qrCode; parm[@"qrCode"] = qrCode;
} }
[FUSHttpHelper postRequestBinaryWithUrl:FUSUserCenterURLs.fus_URL_userAgendDataBind params:parm success:^(NSDictionary * _Nullable dataDict, int code) { [FUSHttpHelper postRequestBinaryWithUrl:FUSUserCenterURLs.fus_URL_userAgendDataBind params:parm success:^(NSDictionary * _Nullable dataDict, int code) {
if (success) success(dataDict[@"successData"]); // if (success) success(dataDict[@"successData"]);
// 这里因为跟萤火虫不同，先用第一个，萤火虫的架构是多个礼物领取
if (success) success([dataDict[@"successDataList"] firstObject]);
} failure:^(NSDictionary * _Nullable dataDict, int code) { } failure:^(NSDictionary * _Nullable dataDict, int code) {
if (failure) failure(FAILURE_MESSAGE, code); if (failure) failure(FAILURE_MESSAGE, code);
}]; }];
...@@ -1106,6 +1108,28 @@ ...@@ -1106,6 +1108,28 @@
} }
}]; }];
} }
/// 验证二维码使者数据
+ (void)fus_accountAgentcodeVerifyWithQRCode:(NSString *)qrCode success:(void (^)(FUSAccountAgentcodeVerifyModel *))success failure:(void (^)(NSString *, int))failure{
NSDictionary *parm = @{@"qrCode": qrCode};
[FUSHttpHelper postRequestBinaryWithUrl:FUSUserCenterURLs.fus_URL_accountAgentcodeVerify params:parm success:^(NSDictionary * _Nullable dataDict, int code) {
success([FUSAccountAgentcodeVerifyModel fus_modelWithDict:dataDict]);
} failure:^(NSDictionary * _Nullable dataDict, int code) {
if (failure) {
failure(FAILURE_MESSAGE,code);
}
}];
}
/// 接收App上传的数据
+ (void)fus_dataAppinfoStatWithOrigin:(NSString *)origin success:(void (^)(void))success failure:(void (^)(NSString *, int))failure{
NSDictionary *parm = @{@"origin": origin};
[FUSHttpHelper postRequestBinaryWithUrl:FUSUserCenterURLs.fus_URL_dataAppinfoStat params:parm success:^(NSDictionary * _Nullable dataDict, int code) {
success();
} failure:^(NSDictionary * _Nullable dataDict, int code) {
if (failure) {
failure(FAILURE_MESSAGE,code);
}
}];
}
/// 打开app只调用一次，进入后台再进入前台不需要调用 /// 打开app只调用一次，进入后台再进入前台不需要调用
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/Zone/Other/FUSZoneHttpRequest.h
...@@ -417,4 +417,10 @@ typedef NS_ENUM(NSInteger, FUSZoneHttpUploadImageType) ...@@ -417,4 +417,10 @@ typedef NS_ENUM(NSInteger, FUSZoneHttpUploadImageType)
success:(void (^)(NSDictionary *dataDict))success success:(void (^)(NSDictionary *dataDict))success
failure:(void (^)(NSString *msg, int code))failure; failure:(void (^)(NSString *msg, int code))failure;
/// 获取成功绑定使者奖励数据
/// @param success 1
/// @param failure 0
+(void)fus_userAgentBindsuccessGetWithSuccess:(void (^)(NSArray *dataList))success
failure:(void (^)(NSString *msg, int code))failure;
@end @end
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/Zone/Other/FUSZoneHttpRequest.m
...@@ -1156,4 +1156,14 @@ ...@@ -1156,4 +1156,14 @@
}]; }];
} }
+ (void)fus_userAgentBindsuccessGetWithSuccess:(void (^)(NSArray *))success failure:(void (^)(NSString *, int))failure{
[FUSHttpHelper postRequestBinaryWithUrl:FUSUserCenterURLs.fus_URL_userAgentBindsuccessGet params:nil success:^(NSDictionary * _Nullable dataDict, int code) {
success(dataDict[@"successDataList"]);
} failure:^(NSDictionary * _Nullable dataDict, int code) {
if (failure) {
failure(FAILURE_MESSAGE, code);
}
}];
}
@end @end
Modules/FUSUserCenterModule/FUSUserCenterModule/Others/FUSUserCenterURLs.h
...@@ -437,6 +437,15 @@ NS_ASSUME_NONNULL_BEGIN ...@@ -437,6 +437,15 @@ NS_ASSUME_NONNULL_BEGIN
/// 使者邀请-获取推广二维码URL /// 使者邀请-获取推广二维码URL
+(NSString *)fus_URL_inviteDataQrcodeGet; +(NSString *)fus_URL_inviteDataQrcodeGet;
/// 验证二维码使者数据
+(NSString *)fus_URL_accountAgentcodeVerify;
/// 获取成功绑定使者奖励数据
+(NSString *)fus_URL_userAgentBindsuccessGet;
/// 接收App上传的数据
+(NSString *)fus_URL_dataAppinfoStat;
@end @end
NS_ASSUME_NONNULL_END NS_ASSUME_NONNULL_END
Modules/FUSUserCenterModule/FUSUserCenterModule/Others/FUSUserCenterURLs.m
...@@ -704,6 +704,18 @@ ...@@ -704,6 +704,18 @@
+(NSString *)fus_URL_inviteDataMyselfDauGetList{ +(NSString *)fus_URL_inviteDataMyselfDauGetList{
return [FUSConfig.sharedInstanced.pathConfigs apiUrl:@"/inviteData/myself/dau/getList"]; return [FUSConfig.sharedInstanced.pathConfigs apiUrl:@"/inviteData/myself/dau/getList"];
} }
/// 验证二维码使者数据
+ (NSString *)fus_URL_accountAgentcodeVerify{
return [FUSConfig.sharedInstanced.pathConfigs apiUrl:@"/account/agentcode/verify"];
}
/// 获取成功绑定使者奖励数据
+ (NSString *)fus_URL_userAgentBindsuccessGet{
return [FUSConfig.sharedInstanced.pathConfigs apiUrl:@"/user/agent/bindsuccess/get"];
}
/// 接收App上传的数据
+ (NSString *)fus_URL_dataAppinfoStat{
return [FUSConfig.sharedInstanced.pathConfigs apiUrl:@"/data/appinfo/stat"];
}
/// 使者邀请-获取推广二维码URL /// 使者邀请-获取推广二维码URL
+(NSString *)fus_URL_inviteDataQrcodeGet{ +(NSString *)fus_URL_inviteDataQrcodeGet{
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Router/FUSUserCenterRouter.m
...@@ -936,12 +936,35 @@ ...@@ -936,12 +936,35 @@
[UINavigationController.fus_topViewController.navigationController pushViewController:vc animated:YES]; [UINavigationController.fus_topViewController.navigationController pushViewController:vc animated:YES];
} }
- (void)fus_showRegisterBindAgentPageWithRegisterVerify:(void (^)(FUSAccountAgentcodeVerifyModel * _Nonnull, void (^ _Nonnull)(NSString * _Nonnull, NSInteger)))registerVerifyHandle skip:(void (^)(void (^ _Nonnull)(void)))skipHandle back:(void (^)(void))backHandle{
FUSBindAgentViewController *vc = [[FUSBindAgentViewController alloc] init];
vc.type = FUSBindAgentViewControllerTypeRegister;
vc.registerVerifyHandle = registerVerifyHandle;
vc.registerSkipHandle = skipHandle;
vc.onClickBackHandle = backHandle;
[UINavigationController.fus_topViewController.navigationController pushViewController:vc animated:YES];
}
- (void)fus_showBindAgentSuccessPopViewWithSuccess:(void (^)(void))success{ - (void)fus_showBindAgentSuccessPopViewWithSuccess:(void (^)(void))success{
NSDictionary *bindAgentCodeSuccessData = FUSSwiftCacheDataShare.share.bindAgentCodeSuccessData; NSDictionary *bindAgentCodeSuccessData = FUSSwiftCacheDataShare.share.bindAgentCodeSuccessData;
if (![NSDictionary isNull:bindAgentCodeSuccessData]) { if (![NSDictionary isNull:bindAgentCodeSuccessData]) {
[FUSBindAgentSuccessPopView fus_showWithAlertData:bindAgentCodeSuccessData didClosePopViewHandler:success]; [FUSBindAgentSuccessPopView fus_showWithAlertData:bindAgentCodeSuccessData didClosePopViewHandler:success];
}else { }else {
success(); if ([FUSSwiftCacheDataShare share].registeredBindsuccess == 1) {
[FUSZoneHttpRequest fus_userAgentBindsuccessGetWithSuccess:^(NSArray *dataList) {
if ([dataList count] > 0) {
// 现在只做第一个，跟ff不同
[FUSSwiftCacheDataShare share].bindAgentCodeSuccessData = [dataList firstObject];
[FUSBindAgentSuccessPopView fus_showWithAlertData:[FUSSwiftCacheDataShare share].bindAgentCodeSuccessData didClosePopViewHandler:success];
}else {
success();
}
} failure:^(NSString *msg, int code) {
success();
}];
}else {
success();
}
} }
} }
......
Pods/Pods.xcodeproj/project.pbxproj
This source diff could not be displayed because it is too large. You can view the blob instead.
Pods/Target Support Files/FUSCommon/FUSCommon-umbrella.h
...@@ -53,6 +53,7 @@ ...@@ -53,6 +53,7 @@
#import "FUSLiveWholeDewAwardView.h" #import "FUSLiveWholeDewAwardView.h"
#import "FUSRollerNumberView.h" #import "FUSRollerNumberView.h"
#import "FUSMainViewControllerHelper.h" #import "FUSMainViewControllerHelper.h"
#import "FUSAccountAgentcodeVerifyModel.h"
#import "FUSBackpackGetTimeNoticeModel.h" #import "FUSBackpackGetTimeNoticeModel.h"
#import "FUSBackpackGiftModel.h" #import "FUSBackpackGiftModel.h"
#import "FUSBackpackMotorModel.h" #import "FUSBackpackMotorModel.h"
......
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