From 8c821be74012d086d8a49449660078ab19f2e68d Mon Sep 17 00:00:00 2001 From: 左丞 Date: Thu, 25 May 2017 15:34:20 +0800 Subject: [PATCH] no message --- YouerLiveVideo/YouerLiveVideo/controllers/User/Setting/ChangePassWordViewController.swift | 42 ++++++++++++++++++++++-------------------- YouerLiveVideo/YouerLiveVideo/controllers/User/UserCenter/Login.storyboard | 15 +++++++-------- YouerLiveVideo/YouerLiveVideo/controllers/User/UserCenter/NewLoginViewController.swift | 25 ++++++++++++++++--------- YouerLiveVideo/YouerLiveVideo/controllers/User/UserCenter/RegisterViewController.swift | 27 +++++++++++++++++++++++++++ YouerLiveVideo/YouerLiveVideo/controllers/User/UserViewController.swift | 2 +- 5 files changed, 73 insertions(+), 38 deletions(-) diff --git a/YouerLiveVideo/YouerLiveVideo/controllers/User/Setting/ChangePassWordViewController.swift b/YouerLiveVideo/YouerLiveVideo/controllers/User/Setting/ChangePassWordViewController.swift index 66368cb..ef7c550 100644 --- a/YouerLiveVideo/YouerLiveVideo/controllers/User/Setting/ChangePassWordViewController.swift +++ b/YouerLiveVideo/YouerLiveVideo/controllers/User/Setting/ChangePassWordViewController.swift @@ -111,24 +111,7 @@ class ChangePassWordViewController: UIViewController { @IBAction func sendUserCodeBtnClick(_ sender: UIButton) { self.view.endEditing(true) - var num = 0 - if #available(iOS 10.0, *) { - self.timer = Timer.scheduledTimer(withTimeInterval: 1, repeats: true, block: { (timers) in - if num == 60{ - sender.titleLabel?.text = "获取验证码" - sender.isUserInteractionEnabled = true - sender.backgroundColor = UIColorFromRGB(0x007aff) - self.timer.invalidate() - return - } - sender.setTitle("重新获取(\(60-num))", for: .normal) - sender.isUserInteractionEnabled = false - sender.backgroundColor = UIColor.lightGray - num += 1 - }) - } else { - // Fallback on earlier versions - } + timer = Timer.scheduledTimer(timeInterval: 1, target: self, selector: #selector(ChangePassWordViewController.timerFire), userInfo: sender, repeats: true) var phone = "" if user.isOnline(){ phone = user.phone() @@ -178,9 +161,28 @@ class ChangePassWordViewController: UIViewController { } } + var num:Int = 0 + func timerFire(){ + let btn = timer.userInfo as! UIButton + if num == 60{ + btn.setTitle("重新获取(\(60-num))", for: .normal) + btn.isUserInteractionEnabled = true + btn.backgroundColor = UIColorFromRGB(0x007aff) + self.timer.invalidate() + return + } + btn.setTitle("重新获取(\(60-num))", for: .normal) + btn.isUserInteractionEnabled = false + btn.backgroundColor = UIColor.lightGray + num += 1 + + } + override func viewWillDisappear(_ animated: Bool) { - timer.invalidate() - timer = nil + if timer != nil{ + timer.invalidate() + timer = nil + } } // MARK: - 销毁通知 deinit { diff --git a/YouerLiveVideo/YouerLiveVideo/controllers/User/UserCenter/Login.storyboard b/YouerLiveVideo/YouerLiveVideo/controllers/User/UserCenter/Login.storyboard index 4956e0a..12c5487 100644 --- a/YouerLiveVideo/YouerLiveVideo/controllers/User/UserCenter/Login.storyboard +++ b/YouerLiveVideo/YouerLiveVideo/controllers/User/UserCenter/Login.storyboard @@ -1,5 +1,5 @@ - - + + @@ -584,13 +584,12 @@ - diff --git a/YouerLiveVideo/YouerLiveVideo/controllers/User/UserCenter/NewLoginViewController.swift b/YouerLiveVideo/YouerLiveVideo/controllers/User/UserCenter/NewLoginViewController.swift index 938f54d..36f8b29 100644 --- a/YouerLiveVideo/YouerLiveVideo/controllers/User/UserCenter/NewLoginViewController.swift +++ b/YouerLiveVideo/YouerLiveVideo/controllers/User/UserCenter/NewLoginViewController.swift @@ -39,7 +39,8 @@ class NewLoginViewController: UIViewController,UITextFieldDelegate { super.didReceiveMemoryWarning() // Dispose of any resources that can be recreated. } - @IBAction func onLoginClicked(sender: AnyObject) { + + @IBAction func onLoginClicked(_ sender: UIButton) { self.view.endEditing(true) let account=fieldAccount.text let pw=fieldPassword.text @@ -49,8 +50,8 @@ class NewLoginViewController: UIViewController,UITextFieldDelegate { return } login(phone: account!, pw:pw!) + } - func login(phone:String, pw:String){ if phone.isMobilePhoneNumber() { SVProgressHUD.show(withStatus: "登录...") @@ -107,19 +108,25 @@ class NewLoginViewController: UIViewController,UITextFieldDelegate { } } func back(){ - self.navigationController!.popViewController(animated: true) + self.navigationController!.dismiss(animated: true, completion: nil) } - - @IBAction func activatiAction(sender: UIButton) { + func textFieldShouldReturn(_ textField: UITextField) -> Bool { + textField.resignFirstResponder() + return true + } + + @IBAction func activatiAction(_ sender: UIButton) { let vc = Story.instantiateViewControllerWithIdentifier("ChangePassWordViewControllerVC", storyName: "User") as! ChangePassWordViewController - self.navigationController?.pushViewController(vc, animated: true) + self.present(vc.wrapWithNavigationController(), animated: true, completion: nil) } - @IBAction func returnAction(sender: UIButton) { + + @IBAction func returnAction(_ sender: UIButton) { let vc = UIStoryboard(name: "Login", bundle: nil).instantiateViewController(withIdentifier: "RegisterViewControllerVC") as! RegisterViewController - self.navigationController!.pushViewController(vc, animated: true) + self.present(vc.wrapWithNavigationController(), animated: true, completion: nil) + } - + func keyboardWillShow(){ constraintContentOffset.constant=144 UIView.animate(withDuration: 2, animations: { () -> Void in diff --git a/YouerLiveVideo/YouerLiveVideo/controllers/User/UserCenter/RegisterViewController.swift b/YouerLiveVideo/YouerLiveVideo/controllers/User/UserCenter/RegisterViewController.swift index e9f5c0c..3ecccb8 100644 --- a/YouerLiveVideo/YouerLiveVideo/controllers/User/UserCenter/RegisterViewController.swift +++ b/YouerLiveVideo/YouerLiveVideo/controllers/User/UserCenter/RegisterViewController.swift @@ -22,6 +22,7 @@ class RegisterViewController: UIViewController,UIAlertViewDelegate,UIImagePicker @IBOutlet weak var sendPhotoImage: UIImageView! var iconImage: UIImage? var name: String="" + var timer :Timer! override func viewDidLoad() { super.viewDidLoad() self.configTheme() @@ -39,6 +40,14 @@ class RegisterViewController: UIViewController,UIAlertViewDelegate,UIImagePicker return true } + override func viewWillDisappear(_ animated: Bool) { + super.viewWillDisappear(animated) + if timer != nil{ + timer.invalidate() + timer = nil + } + } + @IBAction func sendVerificationCodeClickAction(_ sender: AnyObject) {//发验证码 self.view.endEditing(true) if nikeNameTextFiled.text!.characters.count<11{ @@ -47,6 +56,8 @@ class RegisterViewController: UIViewController,UIAlertViewDelegate,UIImagePicker if (phoneNumber.text?.isMobilePhoneNumber())! { SVProgressHUD.show(withStatus: "获取验证码...") SVProgressHUD.setDefaultMaskType(.black) + timer = Timer.scheduledTimer(timeInterval: 1, target: self, selector: #selector(RegisterViewController.timerFire), userInfo: sender, repeats: true) + AppDelegate.instance().httpServer.getChangePhoneCaptcha(mobile: phoneNumber.text!, completionHandler: { (str, error) in SVProgressHUD.dismiss() if error==nil { @@ -114,6 +125,22 @@ class RegisterViewController: UIViewController,UIAlertViewDelegate,UIImagePicker } } + var num:Int = 0 + func timerFire(){ + let btn = timer.userInfo as! UIButton + if num == 60{ + btn.setTitle("重新获取(\(60-num))", for: .normal) + btn.isUserInteractionEnabled = true + btn.backgroundColor = UIColorFromRGB(0x007aff) + self.timer.invalidate() + return + } + btn.setTitle("重新获取(\(60-num))", for: .normal) + btn.isUserInteractionEnabled = false + btn.backgroundColor = UIColor.lightGray + num += 1 + + } @IBAction func loginBtnClickAction(_ sender: AnyObject) { self.navigationController!.dismiss(animated: true, completion: nil) diff --git a/YouerLiveVideo/YouerLiveVideo/controllers/User/UserViewController.swift b/YouerLiveVideo/YouerLiveVideo/controllers/User/UserViewController.swift index 5db8cd1..674279f 100644 --- a/YouerLiveVideo/YouerLiveVideo/controllers/User/UserViewController.swift +++ b/YouerLiveVideo/YouerLiveVideo/controllers/User/UserViewController.swift @@ -108,7 +108,7 @@ extension UserViewController:UITableViewDelegate,UITableViewDataSource{ } func numberOfSections(in tableView: UITableView) -> Int { - if user.roletype() == 3 || user.roletype() == 4 || user.roletype() == 5{ + if user.roletype() == 3 || user.roletype() == 4 || user.roletype() == 5 || user.roletype() == 0 { return 1 } return sectionList.count -- libgit2 0.21.0