首页 功能细化

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHHKIdentityCardViewController.swift

@@ -105,16 +105,16 @@ class YHHKIdentityCardViewController: YHBaseViewController {
 //        updateDefaultSearchKeyWord()
     }
     
-    func updateDefaultSearchKeyWord() {
-        var placeHolder = "香港身份"
-        if isHaveLocalSearchRecords() {
-            let latestValidSearchWord = getLatestValidSearchWord()
-            if !latestValidSearchWord.isEmpty {
-                placeHolder = latestValidSearchWord
-            }
-        }
-        tableHeadView.searchPlaceHolder = placeHolder
-    }
+//    func updateDefaultSearchKeyWord() {
+//        var placeHolder = "香港身份"
+//        if isHaveLocalSearchRecords() {
+//            let latestValidSearchWord = getLatestValidSearchWord()
+//            if !latestValidSearchWord.isEmpty {
+//                placeHolder = latestValidSearchWord
+//            }
+//        }
+////        tableHeadView.searchPlaceHolder = placeHolder
+//    }
     
     override func viewDidLayoutSubviews() {
         super.viewDidLayoutSubviews()
@@ -123,7 +123,7 @@ class YHHKIdentityCardViewController: YHBaseViewController {
     
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
-        updateDefaultSearchKeyWord()
+//        updateDefaultSearchKeyWord()
     }
 }
 
@@ -151,7 +151,7 @@ extension YHHKIdentityCardViewController {
         }
         tableHeadView = YHServerTableHeadView()
         tableHeadView.titleLabel.text = "香港身份攻略"
-        tableHeadView.frame = CGRect(x: 0, y: -365 - 48, width: KScreenWidth, height: 365)
+        tableHeadView.frame = CGRect(x: 0, y: -YHServerTableHeadView.viewH - 48, width: KScreenWidth, height: YHServerTableHeadView.viewH)
         homeTableView.tableHeaderView = tableHeadView
     }
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHHKLifeViewController.swift

@@ -106,16 +106,16 @@ class YHHKLifeViewController: YHBaseViewController {
 //        updateDefaultSearchKeyWord()
     }
     
-    func updateDefaultSearchKeyWord() {
-        var placeHolder = "香港生活"
-        if isHaveLocalSearchRecords() {
-            let latestValidSearchWord = getLatestValidSearchWord()
-            if !latestValidSearchWord.isEmpty {
-                placeHolder = latestValidSearchWord
-            }
-        }
-        tableHeadView.searchPlaceHolder = placeHolder
-    }
+//    func updateDefaultSearchKeyWord() {
+//        var placeHolder = "香港生活"
+//        if isHaveLocalSearchRecords() {
+//            let latestValidSearchWord = getLatestValidSearchWord()
+//            if !latestValidSearchWord.isEmpty {
+//                placeHolder = latestValidSearchWord
+//            }
+//        }
+////        tableHeadView.searchPlaceHolder = placeHolder
+//    }
     
     override func viewDidLayoutSubviews() {
         super.viewDidLayoutSubviews()
@@ -124,7 +124,7 @@ class YHHKLifeViewController: YHBaseViewController {
     
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
-        updateDefaultSearchKeyWord()
+//        updateDefaultSearchKeyWord()
     }
 }
 
@@ -152,7 +152,7 @@ extension YHHKLifeViewController {
         }
         tableHeadView = YHServerTableHeadView()
         tableHeadView.titleLabel.text = "香港生活攻略"
-        tableHeadView.frame = CGRect(x: 0, y: -365 - 48, width: KScreenWidth, height: 365)
+        tableHeadView.frame = CGRect(x: 0, y: -YHServerTableHeadView.viewH - 48, width: KScreenWidth, height: YHServerTableHeadView.viewH)
         homeTableView.tableHeaderView = tableHeadView
     }
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHServerHKLifeViewController.swift

@@ -58,7 +58,7 @@ class YHServerHKLifeViewController: YHBaseViewController {
                 placeHolder = latestValidSearchWord
             }
         }
-        tableHeadView.searchPlaceHolder = placeHolder
+//        tableHeadView.searchPlaceHolder = placeHolder
     }
 }
 
@@ -125,11 +125,11 @@ extension YHServerHKLifeViewController {
         
         tableHeadView = YHServerTableHeadView()
         tableHeadView.titleLabel.text = "香港身份攻略"
-        tableHeadView.frame = CGRect(x: 0, y: -365 - 48, width: KScreenWidth, height: 365)
+        tableHeadView.frame = CGRect(x: 0, y: -YHServerTableHeadView.viewH - 48, width: KScreenWidth, height: YHServerTableHeadView.viewH)
         sectionView.frame = CGRect(x: 0, y: -48, width: KScreenWidth, height: 48)
         homeCollectView.addSubview(tableHeadView)
         homeCollectView.addSubview(sectionView)
-        homeCollectView.contentInset = UIEdgeInsets(top: 365 + 48, left: 0, bottom: 0, right: 0)
+        homeCollectView.contentInset = UIEdgeInsets(top: YHServerTableHeadView.viewH + 48, left: 0, bottom: 0, right: 0)
         homeCollectView.delegate = self
         homeCollectView.dataSource = self
         

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHServiceListViewController.swift

@@ -58,7 +58,7 @@ class YHServiceListViewController: YHBaseViewController {
                 placeHolder = latestValidSearchWord
             }
         }
-        tableHeadView.searchPlaceHolder = placeHolder
+//        tableHeadView.searchPlaceHolder = placeHolder
     }
     
 }
@@ -126,11 +126,11 @@ extension YHServiceListViewController {
         
         tableHeadView = YHServerTableHeadView()
         tableHeadView.titleLabel.text = "香港身份攻略"
-        tableHeadView.frame = CGRect(x: 0, y: -365 - 48, width: KScreenWidth, height: 365)
+        tableHeadView.frame = CGRect(x: 0, y: -YHServerTableHeadView.viewH - 48, width: KScreenWidth, height: YHServerTableHeadView.viewH)
         sectionView.frame = CGRect(x: 0, y: -48, width: KScreenWidth, height: 48)
         homeCollectView.addSubview(tableHeadView)
         homeCollectView.addSubview(sectionView)
-        homeCollectView.contentInset = UIEdgeInsets(top: 365 + 48, left: 0, bottom: 0, right: 0)
+        homeCollectView.contentInset = UIEdgeInsets(top: YHServerTableHeadView.viewH + 48, left: 0, bottom: 0, right: 0)
         homeCollectView.delegate = self
         homeCollectView.dataSource = self
         

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/YHServerTableHeadView.swift

@@ -9,7 +9,10 @@
 import UIKit
 
 class YHServerTableHeadView: UIView {
-    var search: YHHomeSearchView!
+//    var search: YHHomeSearchView!
+    
+    static let viewH : CGFloat = 365.0 - 36.0
+    
     var bannarView: YHServiceBannerView!
     var titleLabel: UILabel!
 
@@ -18,11 +21,11 @@ class YHServerTableHeadView: UIView {
             updateAllViews()
         }
     }
-    var searchPlaceHolder:String = "" {
-        didSet {
-            search.placeHolder = searchPlaceHolder
-        }
-    }
+//    var searchPlaceHolder:String = "" {
+//        didSet {
+//            search.placeHolder = searchPlaceHolder
+//        }
+//    }
     override init(frame: CGRect) {
         super.init(frame: frame)
         backgroundColor = .white
@@ -34,19 +37,19 @@ class YHServerTableHeadView: UIView {
     }
     
     func setUpView() {
-        search = {
-            let view = YHHomeSearchView()
-            let tap = UITapGestureRecognizer(target: self, action: #selector(didSearchBarClicked))
-            view.addGestureRecognizer(tap)
-            return view
-        }()
-        addSubview(search)
-        search.snp.makeConstraints { make in
-            make.top.equalTo(6)
-            make.left.equalTo(20)
-            make.right.equalTo(-20)
-            make.height.equalTo(36)
-        }
+//        search = {
+//            let view = YHHomeSearchView()
+//            let tap = UITapGestureRecognizer(target: self, action: #selector(didSearchBarClicked))
+//            view.addGestureRecognizer(tap)
+//            return view
+//        }()
+//        addSubview(search)
+//        search.snp.makeConstraints { make in
+//            make.top.equalTo(6)
+//            make.left.equalTo(20)
+//            make.right.equalTo(-20)
+//            make.height.equalTo(36)
+//        }
         
         bannarView = {
             let view = YHServiceBannerView()
@@ -54,7 +57,7 @@ class YHServerTableHeadView: UIView {
         }()
         addSubview(bannarView)
         bannarView.snp.makeConstraints { make in
-            make.top.equalTo(64)
+            make.top.equalTo(6)
             make.height.equalTo(235)
             make.left.right.equalToSuperview()
         }
@@ -86,8 +89,8 @@ class YHServerTableHeadView: UIView {
     
     @objc func didSearchBarClicked() {
         let vc = YHSearchInfomationVC()
-        vc.searchPlaceHolder = self.searchPlaceHolder
-        printLog("placeHolder: \(searchPlaceHolder)")
+//        vc.searchPlaceHolder = self.searchPlaceHolder
+//        printLog("placeHolder: \(searchPlaceHolder)")
         UIViewController.current?.navigationController?.pushViewController(vc)
     }
 }