From 9d367c563ec318d84bdaea09c87f2896b75832df Mon Sep 17 00:00:00 2001 From: 左丞 Date: Wed, 24 May 2017 08:52:06 +0800 Subject: [PATCH] no message --- YouerLiveVideo/YouerLiveVideo/Base.lproj/Main.storyboard | 7 ++++++- YouerLiveVideo/YouerLiveVideo/controllers/TVStation/TVStationViewController.swift | 3 --- YouerLiveVideo/YouerLiveVideo/controllers/User/Setting/ChangePassWordViewController.swift | 9 ++++++++- YouerLiveVideo/YouerLiveVideo/controllers/User/User.storyboard | 173 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------- YouerLiveVideo/YouerLiveVideo/controllers/User/UserViewController.swift | 15 +++++++++------ 5 files changed, 110 insertions(+), 97 deletions(-) diff --git a/YouerLiveVideo/YouerLiveVideo/Base.lproj/Main.storyboard b/YouerLiveVideo/YouerLiveVideo/Base.lproj/Main.storyboard index 5486213..fee6a3d 100644 --- a/YouerLiveVideo/YouerLiveVideo/Base.lproj/Main.storyboard +++ b/YouerLiveVideo/YouerLiveVideo/Base.lproj/Main.storyboard @@ -826,7 +826,12 @@ - + + + + + + diff --git a/YouerLiveVideo/YouerLiveVideo/controllers/TVStation/TVStationViewController.swift b/YouerLiveVideo/YouerLiveVideo/controllers/TVStation/TVStationViewController.swift index 7ad8607..4192098 100644 --- a/YouerLiveVideo/YouerLiveVideo/controllers/TVStation/TVStationViewController.swift +++ b/YouerLiveVideo/YouerLiveVideo/controllers/TVStation/TVStationViewController.swift @@ -150,9 +150,6 @@ extension TVStationViewController:UICollectionViewDelegate,UICollectionViewDeleg if collectionView.tag == 3{ let vc = Story.instantiateViewControllerWithIdentifier("ExcellentTVViewControllerVC", storyName: "TVStation") as! ExcellentTVViewController self.navigationController?.pushViewController(vc, animated: true) - }else{ - let vc = Story.instantiateViewControllerWithIdentifier("TVStationChannelViewControllerVC", storyName: "TVStation") as! TVStationChannelViewController - self.navigationController?.pushViewController(vc, animated: true) } } func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell { diff --git a/YouerLiveVideo/YouerLiveVideo/controllers/User/Setting/ChangePassWordViewController.swift b/YouerLiveVideo/YouerLiveVideo/controllers/User/Setting/ChangePassWordViewController.swift index e0c4b96..66aafb7 100644 --- a/YouerLiveVideo/YouerLiveVideo/controllers/User/Setting/ChangePassWordViewController.swift +++ b/YouerLiveVideo/YouerLiveVideo/controllers/User/Setting/ChangePassWordViewController.swift @@ -12,6 +12,7 @@ class ChangePassWordViewController: UIViewController { @IBOutlet weak var scrollView: UIScrollView! @IBOutlet weak var scrollViewHeight: NSLayoutConstraint! + @IBOutlet weak var contentSizeHeight: NSLayoutConstraint! @IBOutlet weak var passwordTextFiled: UITextField! @IBOutlet weak var agrenPasswordTextFiled: UITextField! @@ -26,11 +27,17 @@ class ChangePassWordViewController: UIViewController { override func viewDidLoad() { super.viewDidLoad() - scrollViewH = scrollViewHeight.constant + self.automaticallyAdjustsScrollViewInsets = false NotificationCenter.default.addObserver(self, selector: #selector(ChangePassWordViewController.keyboardWIllChange), name: NSNotification.Name.UIKeyboardWillChangeFrame, object: nil) // Do any additional setup after loading the view. } + + override func viewWillAppear(_ animated: Bool) { + scrollViewHeight.constant = getScreenHeight() - 70 - 64 + contentSizeHeight.constant = getScreenHeight() - 70 - 64 + scrollViewH = scrollViewHeight.constant + } override func didReceiveMemoryWarning() { super.didReceiveMemoryWarning() diff --git a/YouerLiveVideo/YouerLiveVideo/controllers/User/User.storyboard b/YouerLiveVideo/YouerLiveVideo/controllers/User/User.storyboard index 0052222..28cb7df 100644 --- a/YouerLiveVideo/YouerLiveVideo/controllers/User/User.storyboard +++ b/YouerLiveVideo/YouerLiveVideo/controllers/User/User.storyboard @@ -27,7 +27,7 @@ - + @@ -264,16 +264,44 @@ - + - + - + - + + + + + + + + + + + + + + + + + + + + + + @@ -281,18 +309,17 @@ - - - - - - - - - - - - - - - - - - + + + @@ -463,7 +465,6 @@ - diff --git a/YouerLiveVideo/YouerLiveVideo/controllers/User/UserViewController.swift b/YouerLiveVideo/YouerLiveVideo/controllers/User/UserViewController.swift index 394e751..bdd30c9 100644 --- a/YouerLiveVideo/YouerLiveVideo/controllers/User/UserViewController.swift +++ b/YouerLiveVideo/YouerLiveVideo/controllers/User/UserViewController.swift @@ -23,6 +23,7 @@ class UserViewController: UIViewController { super.viewDidLoad() self.configTheme() self.navigationItem.rightBarButtonItem = UIBarButtonItem(image: #imageLiteral(resourceName: "radio_s"), style: .plain, target: self, action: #selector(UserViewController.editBtnClick)) + self.automaticallyAdjustsScrollViewInsets = false setUserInfor() // Do any additional setup after loading the view. } @@ -60,10 +61,10 @@ class UserViewController: UIViewController { historyList.reloadData() } - override func viewWillAppear(_ animated: Bool) { - super.viewWillAppear(animated) - self.tabBarController?.tabBar.isHidden = false - } +// override func viewWillAppear(_ animated: Bool) { +// super.viewWillAppear(animated) +// self.tabBarController?.tabBar.isHidden = false +// } /* // MARK: - Navigation @@ -148,9 +149,11 @@ extension UserViewController:UITableViewDelegate,UITableViewDataSource{ return 44 } - func tableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat { - return 1 + override func viewWillAppear(_ animated: Bool) { + super.viewWillAppear(animated) + self.tabBarController?.tabBar.isHidden = false } + } -- libgit2 0.21.0