Commit 6a99646d authored by David黄金龙's avatar David黄金龙

1、修改版本号

2、处理 可能连续登录的问题
parent 83b5b369
...@@ -3110,7 +3110,7 @@ ...@@ -3110,7 +3110,7 @@
CODE_SIGN_ENTITLEMENTS = galaxy/galaxyTestEnv.entitlements; CODE_SIGN_ENTITLEMENTS = galaxy/galaxyTestEnv.entitlements;
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 5; CURRENT_PROJECT_VERSION = 6;
DEVELOPMENT_TEAM = RXHYW88XR7; DEVELOPMENT_TEAM = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO; ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
...@@ -3313,7 +3313,7 @@ ...@@ -3313,7 +3313,7 @@
CODE_SIGN_ENTITLEMENTS = galaxy/galaxyDebug.entitlements; CODE_SIGN_ENTITLEMENTS = galaxy/galaxyDebug.entitlements;
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 5; CURRENT_PROJECT_VERSION = 6;
DEVELOPMENT_TEAM = RXHYW88XR7; DEVELOPMENT_TEAM = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO; ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
...@@ -3358,7 +3358,7 @@ ...@@ -3358,7 +3358,7 @@
CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements; CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 5; CURRENT_PROJECT_VERSION = 6;
DEVELOPMENT_TEAM = RXHYW88XR7; DEVELOPMENT_TEAM = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO; ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
......
...@@ -12,7 +12,7 @@ import AVFoundation ...@@ -12,7 +12,7 @@ import AVFoundation
class YHCodeSueecssWithVideoBkgViewController: YHBaseViewController { class YHCodeSueecssWithVideoBkgViewController: YHBaseViewController {
var time = 60 var time = 60
var bgImageView: UIImageView! var bgImageView: UIImageView!
...@@ -25,6 +25,8 @@ class YHCodeSueecssWithVideoBkgViewController: YHBaseViewController { ...@@ -25,6 +25,8 @@ class YHCodeSueecssWithVideoBkgViewController: YHBaseViewController {
var phoneNumber: String? var phoneNumber: String?
var viewModel: YHLoginViewModel? var viewModel: YHLoginViewModel?
private var isRequestFlag : Bool = false
override func viewDidLoad() { override func viewDidLoad() {
super.viewDidLoad() super.viewDidLoad()
setView() setView()
...@@ -50,6 +52,11 @@ class YHCodeSueecssWithVideoBkgViewController: YHBaseViewController { ...@@ -50,6 +52,11 @@ class YHCodeSueecssWithVideoBkgViewController: YHBaseViewController {
override var preferredStatusBarStyle: UIStatusBarStyle { override var preferredStatusBarStyle: UIStatusBarStyle {
return .lightContent return .lightContent
} }
override func viewDidDisappear(_ animated: Bool) {
super.viewDidDisappear(animated)
isRequestFlag = false
}
} }
...@@ -89,9 +96,18 @@ extension YHCodeSueecssWithVideoBkgViewController { ...@@ -89,9 +96,18 @@ extension YHCodeSueecssWithVideoBkgViewController {
} }
func requetLogin(phone: String, code: String) { func requetLogin(phone: String, code: String) {
if isRequestFlag {
#if DEBUG
YHHUD.flash(message: "请求已发送")
#endif
return
}
isRequestFlag = true
YHHUD.show(.progress(message: "登录中...")) YHHUD.show(.progress(message: "登录中..."))
self.viewModel?.login(phone : phone, code: code, callBackBlock: {[weak self] success,error in self.viewModel?.login(phone : phone, code: code, callBackBlock: {[weak self] success,error in
YHHUD.hide() YHHUD.hide()
self?.isRequestFlag = false
guard let self = self else { return } guard let self = self else { return }
if success == false { if success == false {
...@@ -155,17 +171,17 @@ extension YHCodeSueecssWithVideoBkgViewController { ...@@ -155,17 +171,17 @@ extension YHCodeSueecssWithVideoBkgViewController {
self.navigationController?.popViewController() self.navigationController?.popViewController()
} }
func setupFrontUI() { func setupFrontUI() {
// bgImageView = { // bgImageView = {
// let imageView = UIImageView() // let imageView = UIImageView()
// imageView.image = UIImage(named: "login_phone_bg_image") // imageView.image = UIImage(named: "login_phone_bg_image")
// imageView.isUserInteractionEnabled = true // imageView.isUserInteractionEnabled = true
// return imageView // return imageView
// }() // }()
// view.addSubview(bgImageView) // view.addSubview(bgImageView)
// bgImageView.snp.makeConstraints { make in // bgImageView.snp.makeConstraints { make in
// make.left.right.top.equalTo(view) // make.left.right.top.equalTo(view)
// make.height.equalTo(300) // make.height.equalTo(300)
// } // }
view.addSubview(frontHoldView) view.addSubview(frontHoldView)
frontHoldView.snp.makeConstraints { make in frontHoldView.snp.makeConstraints { make in
...@@ -174,7 +190,7 @@ extension YHCodeSueecssWithVideoBkgViewController { ...@@ -174,7 +190,7 @@ extension YHCodeSueecssWithVideoBkgViewController {
closeButton = { closeButton = {
let button = UIButton(type: .custom) let button = UIButton(type: .custom)
// button.setImage(UIImage(named: "login_back"), for: .normal) // button.setImage(UIImage(named: "login_back"), for: .normal)
button.setImage(UIImage(named: "back_icon_for_code_input"), for: .normal) button.setImage(UIImage(named: "back_icon_for_code_input"), for: .normal)
button.addTarget(self, action: #selector(close), for: .touchUpInside) button.addTarget(self, action: #selector(close), for: .touchUpInside)
return button return button
...@@ -258,8 +274,8 @@ extension YHCodeSueecssWithVideoBkgViewController { ...@@ -258,8 +274,8 @@ extension YHCodeSueecssWithVideoBkgViewController {
button.layer.cornerRadius = 24 button.layer.cornerRadius = 24
button.backgroundColor = UIColor.init(hex: 0xffffff,transparency: 0.4) button.backgroundColor = UIColor.init(hex: 0xffffff,transparency: 0.4)
button.clipsToBounds = true button.clipsToBounds = true
// button.layer.borderWidth = 1 // button.layer.borderWidth = 1
// button.layer.borderColor = UIColor(hex: 0xebeef4).cgColor // button.layer.borderColor = UIColor(hex: 0xebeef4).cgColor
return button return button
}() }()
frontHoldView.addSubview(getCodeLabel) frontHoldView.addSubview(getCodeLabel)
...@@ -281,8 +297,8 @@ extension YHCodeSueecssWithVideoBkgViewController { ...@@ -281,8 +297,8 @@ extension YHCodeSueecssWithVideoBkgViewController {
button.layer.cornerRadius = 24 button.layer.cornerRadius = 24
button.clipsToBounds = true button.clipsToBounds = true
button.backgroundColor = UIColor(hex: 0xffffff, alpha: 1.0) button.backgroundColor = UIColor(hex: 0xffffff, alpha: 1.0)
// button.layer.borderWidth = 1 // button.layer.borderWidth = 1
// button.layer.borderColor = UIColor(hex: 0xebeef4).cgColor // button.layer.borderColor = UIColor(hex: 0xebeef4).cgColor
return button return button
}() }()
frontHoldView.addSubview(getCodeButton) frontHoldView.addSubview(getCodeButton)
......
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 to comment