Commit 9762ec05 authored by Steven杜宇's avatar Steven杜宇

// 搜索默认词

parent dfb58f61
...@@ -78,6 +78,8 @@ class YHHomePageViewController: YHBaseViewController { ...@@ -78,6 +78,8 @@ class YHHomePageViewController: YHBaseViewController {
private extension YHHomePageViewController { private extension YHHomePageViewController {
@objc func didSearchBarClicked() { @objc func didSearchBarClicked() {
let vc = YHSearchInfomationVC() let vc = YHSearchInfomationVC()
vc.searchPlaceHolder = searchView.placeHolder
printLog("placeHolder: \(searchView.placeHolder)")
self.navigationController?.pushViewController(vc) self.navigationController?.pushViewController(vc)
} }
......
...@@ -35,7 +35,8 @@ func getLatestValidSearchWord() -> String { ...@@ -35,7 +35,8 @@ func getLatestValidSearchWord() -> String {
class YHSearchInfomationVC: YHBaseViewController { class YHSearchInfomationVC: YHBaseViewController {
static let searchHistoryMaxCount = 10 static let searchHistoryMaxCount = 10
var searchStr = "" private var searchStr = ""
var searchPlaceHolder = ""
var items:[YHHomeListModel] = [] var items:[YHHomeListModel] = []
lazy var viewModel: YHHomePageViewModel = { lazy var viewModel: YHHomePageViewModel = {
...@@ -65,6 +66,7 @@ class YHSearchInfomationVC: YHBaseViewController { ...@@ -65,6 +66,7 @@ class YHSearchInfomationVC: YHBaseViewController {
lazy var searchBar: YHSearchInfoBar = { lazy var searchBar: YHSearchInfoBar = {
let bar = YHSearchInfoBar(frame: CGRect(x: 20, y: k_Height_NavigationtBarAndStatuBar+8.0, width: KScreenWidth-40, height: 36.0)) let bar = YHSearchInfoBar(frame: CGRect(x: 20, y: k_Height_NavigationtBarAndStatuBar+8.0, width: KScreenWidth-40, height: 36.0))
bar.placeHolder = self.searchPlaceHolder
bar.searchBlock = { bar.searchBlock = {
[weak self] text in [weak self] text in
guard let self = self else { return } guard let self = self else { return }
...@@ -72,8 +74,8 @@ class YHSearchInfomationVC: YHBaseViewController { ...@@ -72,8 +74,8 @@ class YHSearchInfomationVC: YHBaseViewController {
searchStr = searchStr.trimmingCharacters(in: .whitespaces) searchStr = searchStr.trimmingCharacters(in: .whitespaces)
if isEmptyString(searchStr) { if isEmptyString(searchStr) {
searchStr = "香港身份" searchStr = searchPlaceHolder
self.searchBar.textField.text = "香港身份" self.searchBar.textField.text = searchPlaceHolder
} }
searchText() searchText()
if searchStr.count > 0 { if searchStr.count > 0 {
......
...@@ -86,6 +86,8 @@ class YHServerTableHeadView: UIView { ...@@ -86,6 +86,8 @@ class YHServerTableHeadView: UIView {
@objc func didSearchBarClicked() { @objc func didSearchBarClicked() {
let vc = YHSearchInfomationVC() let vc = YHSearchInfomationVC()
vc.searchPlaceHolder = self.searchPlaceHolder
printLog("placeHolder: \(searchPlaceHolder)")
UIViewController.current?.navigationController?.pushViewController(vc) UIViewController.current?.navigationController?.pushViewController(vc)
} }
} }
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