Merge branch 'youhua-dev' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into youhua-dev

* 'youhua-dev' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS:
  //  生活UI
  // 关于银河湾
  //  生活详情

galaxy/galaxy/Classes/Modules/Home(首页)/Life(生活)/C/YHLifeDetailViewController.swift

@@ -76,6 +76,7 @@ class YHLifeDetailViewController: YHBaseViewController {
     lazy var navBar: YHCustomNavigationBar = {
         let bar = YHCustomNavigationBar.navBar()
         bar.backgroundColor = .clear
+        bar.backButton.setImage(UIImage(named: "back_icon_white"), for: .normal)
         bar.backBlock = {
             [weak self] in
             guard let self = self else { return }
@@ -265,12 +266,28 @@ extension YHLifeDetailViewController: UIScrollViewDelegate {
         if scrollView == self.fakeTableView {
             return
         }
+        
+        var percent = scrollView.contentOffset.y/k_Height_NavigationtBarAndStatuBar
+        if percent < 0.0 {
+            percent = 0.0
+        } else if percent > 1.0 {
+            percent = 1.0
+        }
+        navView.backgroundColor = UIColor(hex: 0xFFFFFF, alpha: percent)
+        
+        if percent >= 0.5 {
+            navBar.backButton.setImage(UIImage(named: "back_icon"), for: .normal)
+            navBar.title = self.productModel.name
+
+        } else {
+            navBar.backButton.setImage(UIImage(named: "back_icon_white"), for: .normal)
+            navBar.title = ""
+        }
+ 
         if scrollView.contentOffset.y >= (self.headerHeight-k_Height_NavigationtBarAndStatuBar-45.0) {
-            navView.backgroundColor = .white
             topSegmentedView.isHidden = false
             topLine.isHidden = false
         } else {
-            navView.backgroundColor = .clear
             topSegmentedView.isHidden = true
             topLine.isHidden = true
         }
@@ -439,6 +456,7 @@ extension YHLifeDetailViewController {
         ossGroup.notify(queue: .main) {
             self.tableView.reloadData()
             self.fakeTableView.reloadData {
+                // 此处是为了计算准确自定义布局的contentSize
                 DispatchQueue.main.asyncAfter(deadline: .now()+0.3, execute: {
                     self.fakeTableView.setContentOffset(.zero, animated: false)
                     if self.imgItems.count > 0 {

galaxy/galaxy/Classes/Modules/Home(首页)/Life(生活)/V/YHLifeItemTableViewCell.swift

@@ -15,7 +15,7 @@ class YHLifeItemTableViewCell: UITableViewCell {
     var dataSource: YHProductModel? {
         didSet {
             guard let dataSource = dataSource else { return }
-            self.titleLabel.text = dataSource.name
+            self.titleLabel.text =  dataSource.name
             self.subTitleLabel.text = dataSource.description
             guard let url = URL(string: dataSource.image) else { return }
             self.centerImageView.kf.setImage(with: url)
@@ -60,6 +60,7 @@ class YHLifeItemTableViewCell: UITableViewCell {
             let view = UILabel()
             view.font = UIFont.PFSC_M(ofSize: 17)
             view.textColor = UIColor.mainTextColor
+            view.numberOfLines = 2
             return view
         }()
         contentView.addSubview(titleLabel)
@@ -67,7 +68,6 @@ class YHLifeItemTableViewCell: UITableViewCell {
             make.left.equalTo(144)
             make.right.equalTo(-20)
             make.top.equalTo(20)
-            make.height.equalTo(24)
         }
         
         subTitleLabel = {
@@ -81,7 +81,7 @@ class YHLifeItemTableViewCell: UITableViewCell {
         subTitleLabel.snp.makeConstraints { make in
             make.left.equalTo(144)
             make.right.equalTo(-20)
-            make.top.equalTo(52)
+            make.top.equalTo(titleLabel.snp.bottom).offset(8.0)
         }
     }
 

galaxy/galaxy/Classes/Modules/Mine（我的）/AboutYH/C/YHDetailViewController.swift

@@ -19,6 +19,29 @@ class YHDetailViewController: YHBaseViewController {
         return headView
     }()
     
+    lazy var navBar: YHCustomNavigationBar = {
+        let bar = YHCustomNavigationBar.navBar()
+        bar.backgroundColor = .clear
+        bar.backButton.setImage(UIImage(named: "back_icon_white"), for: .normal)
+        bar.backBlock = {
+            [weak self] in
+            guard let self = self else { return }
+            self.navigationController?.popViewController(animated: true)
+        }
+        return bar
+    }()
+    
+    lazy var navView:UIView = {
+        let view = UIView()
+        view.backgroundColor = .clear
+        view.addSubview(self.navBar)
+        self.navBar.snp.makeConstraints { make in
+            make.left.right.bottom.equalToSuperview()
+            make.height.equalTo(k_Height_NavContentBar)
+        }
+        return view
+    }()
+    
     override func viewDidLoad() {
         super.viewDidLoad()
         setView()
@@ -62,6 +85,7 @@ extension YHDetailViewController: UITableViewDelegate, UITableViewDataSource {
 
 extension YHDetailViewController {
     func setView() {
+        gk_navigationBar.isHidden = true
         view.backgroundColor = .white
         tableView = {
             let tableView = UITableView(frame: .zero, style: .grouped)
@@ -81,6 +105,11 @@ extension YHDetailViewController {
         tableView.snp.makeConstraints { make in
             make.top.bottom.left.right.equalToSuperview()
         }
+        view.addSubview(self.navView)
+        self.navView.snp.makeConstraints { make in
+            make.left.right.top.equalToSuperview()
+            make.height.equalTo(k_Height_NavigationtBarAndStatuBar)
+        }
     }
     
     func loadData() {
@@ -92,3 +121,25 @@ extension YHDetailViewController {
         }
     }
 }
+
+extension YHDetailViewController: UIScrollViewDelegate {
+    func scrollViewDidScroll(_ scrollView: UIScrollView) {
+        
+        var percent = scrollView.contentOffset.y/k_Height_NavigationtBarAndStatuBar
+        if percent < 0.0 {
+            percent = 0.0
+        } else if percent > 1.0 {
+            percent = 1.0
+        }
+        navView.backgroundColor = UIColor(hex: 0xFFFFFF, alpha: percent)
+        
+        if percent >= 0.5 {
+            navBar.backButton.setImage(UIImage(named: "back_icon"), for: .normal)
+            navBar.title = "关于银河湾"
+            
+        } else {
+            navBar.backButton.setImage(UIImage(named: "back_icon_white"), for: .normal)
+            navBar.title = ""
+        }
+    }
+}