Skip to content

G
galaxy-iOS
Commit 18c8e063 authored by David黄金龙's avatar David黄金龙
Browse files
Options

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

* 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS:
  // 搜索
  标题错误修改
  吴测试牛逼
parents 95994fb6 1267b7ed
Hide whitespace changes
Inline Side-by-side
Showing with 145 additions and 55 deletions
galaxy/galaxy/Classes/Modules/Home(首页)/C/YHFourKingViewController.swift
View file @ 18c8e063
...@@ -53,13 +53,15 @@ extension YHFourKingViewController { ...@@ -53,13 +53,15 @@ extension YHFourKingViewController {
for item in classify { for item in classify {
let model = item as YHHomeClassifyModel let model = item as YHHomeClassifyModel
if model.id == self.id { if model.id == self.id {
gk_navTitle = model.name if self.classId == 0 {
self.sectionView.items = model.children gk_navTitle = model.name
let classifyID = model.children.first?.id ?? 0 self.sectionView.items = model.children
self.classId = classifyID let classifyID = model.children.first?.id ?? 0
self.homeViewModel.getList(true, classifyID) {[weak self] success, error in self.classId = classifyID
guard let self = self else { return } self.homeViewModel.getList(true, classifyID) {[weak self] success, error in
self.dataSouce = self.homeViewModel.arrHomeNewsData ?? [] guard let self = self else { return }
self.dataSouce = self.homeViewModel.arrHomeNewsData ?? []
}
} }
} }
} }
......
galaxy/galaxy/Classes/Modules/Home(首页)/C/YHSearchInfomationVC.swift
View file @ 18c8e063
...@@ -47,7 +47,7 @@ class YHSearchInfomationVC: YHBaseViewController { ...@@ -47,7 +47,7 @@ class YHSearchInfomationVC: YHBaseViewController {
searchStr = "香港身份" searchStr = "香港身份"
self.searchBar.textField.text = "香港身份" self.searchBar.textField.text = "香港身份"
} }
searchText(searchStr) searchText()
if searchStr.count > 0 { if searchStr.count > 0 {
self.saveSearchHistory(searchStr) self.saveSearchHistory(searchStr)
} }
...@@ -81,6 +81,12 @@ class YHSearchInfomationVC: YHBaseViewController { ...@@ -81,6 +81,12 @@ class YHSearchInfomationVC: YHBaseViewController {
tableView.backgroundColor = .white tableView.backgroundColor = .white
tableView.backgroundView = emptyDataTipsView tableView.backgroundView = emptyDataTipsView
tableView.register(YHSearchInfoCell.self, forCellReuseIdentifier: YHSearchInfoCell.cellReuseIdentifier) tableView.register(YHSearchInfoCell.self, forCellReuseIdentifier: YHSearchInfoCell.cellReuseIdentifier)
tableView.es.addPullToRefresh {
self.loadFirstData()
}
tableView.es.addInfiniteScrolling {
self.loadMoreData()
}
return tableView return tableView
}() }()
...@@ -92,7 +98,8 @@ class YHSearchInfomationVC: YHBaseViewController { ...@@ -92,7 +98,8 @@ class YHSearchInfomationVC: YHBaseViewController {
guard let self = self else { return } guard let self = self else { return }
self.searchHistoryView.isHidden = true self.searchHistoryView.isHidden = true
self.searchBar.textField.text = text self.searchBar.textField.text = text
searchText(text) self.searchStr = text
searchText()
self.saveSearchHistory(text) self.saveSearchHistory(text)
} }
return view return view
...@@ -167,14 +174,53 @@ class YHSearchInfomationVC: YHBaseViewController { ...@@ -167,14 +174,53 @@ class YHSearchInfomationVC: YHBaseViewController {
} }
} }
func searchText(_ text:String) { func searchText() {
self.tableView.scrollToTop()
YHHUD.show(.progress(message: "搜索中...")) YHHUD.show(.progress(message: "搜索中..."))
// 去除两端的空格 viewModel.searchArticleList(self.searchStr, isFirstPage : true) {
let targetText = text.trimmingCharacters(in: .whitespaces)
self.viewModel.searchArticleList(targetText) {
[weak self] success, error in [weak self] success, error in
YHHUD.hide() YHHUD.hide()
guard let self = self else { return } guard let self = self else { return }
items.removeAll()
if let arr = self.viewModel.arrHomeNewsData {
items.append(contentsOf: arr)
}
emptyDataTipsView.isHidden = (items.count > 0)
searchHistoryView.isHidden = true
self.tableView.reloadData()
tableView.es.stopPullToRefresh()
if self.viewModel.hasMoreForHomeNews == false {
tableView.es.noticeNoMoreData()
}
}
}
func loadMoreData() {
viewModel.searchArticleList(self.searchStr, isFirstPage : false) {
[weak self] success, error in
guard let self = self else { return }
items.removeAll()
if let arr = self.viewModel.arrHomeNewsData {
items.append(contentsOf: arr)
}
emptyDataTipsView.isHidden = (items.count > 0)
searchHistoryView.isHidden = true
self.tableView.reloadData()
tableView.es.stopLoadingMore()
if self.viewModel.hasMoreForHomeNews == false {
tableView.es.noticeNoMoreData()
}
}
}
func loadFirstData() {
viewModel.searchArticleList(self.searchStr, isFirstPage : true) {
[weak self] success, error in
guard let self = self else { return }
items.removeAll() items.removeAll()
if let arr = self.viewModel.arrHomeNewsData { if let arr = self.viewModel.arrHomeNewsData {
items.append(contentsOf: arr) items.append(contentsOf: arr)
...@@ -182,6 +228,10 @@ class YHSearchInfomationVC: YHBaseViewController { ...@@ -182,6 +228,10 @@ class YHSearchInfomationVC: YHBaseViewController {
emptyDataTipsView.isHidden = (items.count > 0) emptyDataTipsView.isHidden = (items.count > 0)
searchHistoryView.isHidden = true searchHistoryView.isHidden = true
self.tableView.reloadData() self.tableView.reloadData()
tableView.es.stopPullToRefresh()
if self.viewModel.hasMoreForHomeNews == false {
tableView.es.noticeNoMoreData()
}
} }
} }
......
galaxy/galaxy/Classes/Modules/Home(首页)/VM/YHHomePageViewModel.swift
View file @ 18c8e063
...@@ -255,34 +255,61 @@ extension YHHomePageViewModel { ...@@ -255,34 +255,61 @@ extension YHHomePageViewModel {
} }
// 搜索 // 搜索
func searchArticleList(_ title: String, callBackBlock:@escaping (_ success: Bool,_ error:YHErrorModel?)->()) { func searchArticleList(_ title: String, isFirstPage:Bool, callBackBlock:@escaping (_ success: Bool,_ error:YHErrorModel?)->()) {
let params: [String : Any] = ["page": 1,
"page_size": 10, var params: [String : Any] = [:]
"title": title]
let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Common.article if isFirstPage {
let _ = YHNetRequest.getRequest(url: strUrl, params: params) { [weak self] json, code in curPageIndex = 1
guard let self = self else { return } params = ["page": curPageIndex,
//1. json字符串 转 对象 "page_size": 10,
if json.code == 200 { "title": title]
let dic = json.data } else {
guard let result = YHHomeListTotalModel.deserialize(from: dic as? Dictionary) else { params = ["page": curPageIndex + 1,
self.arrHomeNewsData = [] "page_size": 10,
callBackBlock(false,nil) "title": title]
return }
} let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Common.article
let _ = YHNetRequest.getRequest(url: strUrl, params: params) { [weak self] json, code in
for item in result.data { guard let self = self else { return }
item.calHeightParam() //1. json字符串 转 对象
} if json.code == 200 {
let dic = json.data
guard let result = YHHomeListTotalModel.deserialize(from: dic as? Dictionary) else {
self.arrHomeNewsData = []
callBackBlock(false,nil)
return
}
for item in result.data {
item.calHeightParam()
}
if isFirstPage {
self.totalCount = result.total
self.arrHomeNewsData = result.data self.arrHomeNewsData = result.data
callBackBlock(true, nil) curPageIndex = 1
} else { } else {
let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg) curPageIndex = curPageIndex + 1
callBackBlock(false, error) self.arrHomeNewsData?.append(contentsOf: result.data)
}
if let count = self.arrHomeNewsData?.count {
if count == self.totalCount {
self.hasMoreForHomeNews = false
} else {
self.hasMoreForHomeNews = true
}
} }
} failBlock: { err in callBackBlock(true, nil)
callBackBlock(false,err) } else {
self.arrHomeNewsData = []
let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)
callBackBlock(false, error)
} }
} failBlock: { err in
self.arrHomeNewsData = []
callBackBlock(false,err)
} }
}
} }
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHServerHKLifeViewController.swift
View file @ 18c8e063
...@@ -61,15 +61,14 @@ extension YHServerHKLifeViewController { ...@@ -61,15 +61,14 @@ extension YHServerHKLifeViewController {
if model.id == 2 { if model.id == 2 {
self.sectionView.items = model.children self.sectionView.items = model.children
if self.classId == 0 { if self.classId == 0 {
return let classifyID = model.children.first?.id ?? 0
} self.classId = classifyID
let classifyID = model.children.first?.id ?? 0 self.homeViewModel.getList(true, classifyID) {[weak self] success, error in
self.classId = classifyID guard let self = self else { return }
self.homeViewModel.getList(true, classifyID) {[weak self] success, error in self.dataSouce = self.homeViewModel.arrHomeNewsData ?? []
guard let self = self else { return } if self.homeViewModel.hasMoreForHomeNews == false {
self.dataSouce = self.homeViewModel.arrHomeNewsData ?? [] self.homeTableView.es.noticeNoMoreData()
if self.homeViewModel.hasMoreForHomeNews == false { }
self.homeTableView.es.noticeNoMoreData()
} }
} }
} }
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHServiceListViewController.swift
View file @ 18c8e063
...@@ -45,15 +45,14 @@ extension YHServiceListViewController { ...@@ -45,15 +45,14 @@ extension YHServiceListViewController {
if model.id == 1 { if model.id == 1 {
self.normalView.sectionView.items = model.children self.normalView.sectionView.items = model.children
if self.classId == 0 { if self.classId == 0 {
return let classifyID = model.children.first?.id ?? 0
} self.classId = classifyID
let classifyID = model.children.first?.id ?? 0 self.homeViewModel.getList(true, classifyID) {[weak self] success, error in
self.classId = classifyID guard let self = self else { return }
self.homeViewModel.getList(true, classifyID) {[weak self] success, error in self.normalView.dataSouce = self.homeViewModel.arrHomeNewsData ?? []
guard let self = self else { return } if self.homeViewModel.hasMoreForHomeNews == false {
self.normalView.dataSouce = self.homeViewModel.arrHomeNewsData ?? [] self.normalView.homeTableView.es.noticeNoMoreData()
if self.homeViewModel.hasMoreForHomeNews == false { }
self.normalView.homeTableView.es.noticeNoMoreData()
} }
} }
} }
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/YHServerNoOrderView.swift
View file @ 18c8e063
...@@ -58,6 +58,7 @@ class YHServerNoOrderView: UIView { ...@@ -58,6 +58,7 @@ class YHServerNoOrderView: UIView {
}() }()
tableHeadView = YHServerTableHeadView() tableHeadView = YHServerTableHeadView()
tableHeadView.titleLabel.text = "香港身份攻略"
tableHeadView.frame = CGRect(x: 0, y: 0, width: KScreenWidth, height: 365) tableHeadView.frame = CGRect(x: 0, y: 0, width: KScreenWidth, height: 365)
addSubview(homeTableView) addSubview(homeTableView)
homeTableView.tableHeaderView = tableHeadView homeTableView.tableHeaderView = tableHeadView
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/YHServiceTableFootView.swift
View file @ 18c8e063
...@@ -84,6 +84,18 @@ extension YHServiceTableFootView: UICollectionViewDelegate, UICollectionViewData ...@@ -84,6 +84,18 @@ extension YHServiceTableFootView: UICollectionViewDelegate, UICollectionViewData
let vc = YHHomeWebViewController() let vc = YHHomeWebViewController()
vc.url = YHConfigManager.shared.h5Url + "?id=\(model.id)" vc.url = YHConfigManager.shared.h5Url + "?id=\(model.id)"
vc.id = model.id vc.id = model.id
vc.block = {[weak self] model in
guard let self = self else { return }
let arr = self.items
for (index, targetItem) in arr.enumerated() {
guard let target = targetItem else { return }
if target.id == model.id {
target.is_like = model.is_like
target.like_count = model.like_count
self.myCollectView.reloadItems(at: [IndexPath.SubSequence(item: index, section: 0)])
}
}
}
UIViewController.current?.navigationController?.pushViewController(vc) UIViewController.current?.navigationController?.pushViewController(vc)
} else if model.type == 1 { } else if model.type == 1 {
printLog("直接播放视频") printLog("直接播放视频")
......
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