Skip to content

G
galaxy-iOS
Commit 04a7055a authored by pete谢兆麟's avatar pete谢兆麟
Browse files
Options

服务中心逻辑

parent 61c116fb
Hide whitespace changes
Inline Side-by-side
Showing with 73 additions and 71 deletions
galaxy/galaxy/AppDelegate.swift
View file @ 04a7055a
......@@ -128,7 +128,7 @@ extension AppDelegate {
let homeVC = YHHomePageViewController()
tabBarController.delegate = homeVC
let v0 = YHNavigationController(rootVC:homeVC)
let v1 = YHNavigationController(rootVC:YHServiceViewController())
let v1 = YHNavigationController(rootVC:YHServiceCenterMainViewController())
let v2 = YHNavigationController(rootVC:YHMsgViewController())
let v3 = YHNavigationController(rootVC:YHMyViewController())
......
galaxy/galaxy/Classes/Base/C/YHTabBarViewController.swift
View file @ 04a7055a
......@@ -44,3 +44,4 @@ extension YHTabBarViewController {
}
}
galaxy/galaxy/Classes/Modules/Home(首页)/C/YHHomePageViewController.swift
View file @ 04a7055a
......@@ -199,4 +199,20 @@ extension YHHomePageViewController : UITabBarControllerDelegate {
self.tapTimestamp = timestamp
}
}
func tabBarController(_ tabBarController: UITabBarController, shouldSelect viewController: UIViewController) -> Bool {
let index = tabBarController.viewControllers?.firstIndex(of: viewController)
if index == 1 {
if YHLoginManager.shared.isLogin() {
return true
} else {
let vc = UINavigationController(rootVC: YHPhoneLoginViewController())
vc.modalPresentationStyle = .custom
UIViewController.current?.navigationController?.present(vc, animated: true)
return false
}
}
return true
}
}
galaxy/galaxy/Classes/Modules/Home(首页)/C/YHStartPageViewController.swift
View file @ 04a7055a
......@@ -101,7 +101,7 @@ private extension YHStartPageViewController {
let homeVC = YHHomePageViewController()
tabBarController.delegate = homeVC
let v0 = YHNavigationController(rootVC:homeVC)
let v1 = YHNavigationController(rootVC:YHServiceViewController())
let v1 = YHNavigationController(rootVC:YHServiceCenterMainViewController())
let v2 = YHNavigationController(rootVC:YHMsgViewController())
let v3 = YHNavigationController(rootVC:YHMyViewController())
......
galaxy/galaxy/Classes/Modules/Home(首页)/V/YHHkLifeAndIdItemView.swift
View file @ 04a7055a
......@@ -121,29 +121,35 @@ private extension YHHkLifeAndIdItemView {
@objc func tapView(gestureRecognizer:UITapGestureRecognizer) {
if itemType == .hkID {
//香港身份
if let vc = UIApplication.shared.keyWindow?.rootViewController as? YHTabBarViewController {
vc.selectedIndex = 1
DispatchQueue.main.asyncAfter(deadline: .now() + 0.25) {
if let vcs = vc.viewControllers,vcs.count > 1 {
if let nvc = vcs[1] as? YHNavigationController,let vvc = nvc.topViewController as? YHServiceViewController {
vvc.jumpToItemIndex(itemIndex: 0)
}
}
}
}
let vc = YHServiceViewController()
vc.jumpToItemIndex(itemIndex: 0)
UIViewController.current?.navigationController?.pushViewController(vc)
// if let vc = UIApplication.shared.keyWindow?.rootViewController as? YHTabBarViewController {
// vc.selectedIndex = 1
// DispatchQueue.main.asyncAfter(deadline: .now() + 0.25) {
// if let vcs = vc.viewControllers,vcs.count > 1 {
// if let nvc = vcs[1] as? YHNavigationController,let vvc = nvc.topViewController as? YHServiceViewController {
// vvc.jumpToItemIndex(itemIndex: 0)
// }
// }
// }
// }
} else if itemType == .hklife {
//香港生活
if let vc = UIApplication.shared.keyWindow?.rootViewController as? YHTabBarViewController {
vc.selectedIndex = 1
DispatchQueue.main.asyncAfter(deadline: .now() + 0.25) {
if let vcs = vc.viewControllers,vcs.count > 1 {
if let nvc = vcs[1] as? YHNavigationController,let vvc = nvc.topViewController as? YHServiceViewController {
vvc.jumpToItemIndex(itemIndex: 1)
}
}
}
}
let vc = YHServiceViewController()
vc.jumpToItemIndex(itemIndex: 1)
UIViewController.current?.navigationController?.pushViewController(vc)
// if let vc = UIApplication.shared.keyWindow?.rootViewController as? YHTabBarViewController {
// vc.selectedIndex = 1
// DispatchQueue.main.asyncAfter(deadline: .now() + 0.25) {
// if let vcs = vc.viewControllers,vcs.count > 1 {
// if let nvc = vcs[1] as? YHNavigationController,let vvc = nvc.topViewController as? YHServiceViewController {
// vvc.jumpToItemIndex(itemIndex: 1)
// }
// }
// }
// }
} else {
printLog("errorr:未处理")
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHServiceCenterMainViewController.swift
View file @ 04a7055a
......@@ -85,6 +85,7 @@ extension YHServiceCenterMainViewController {
}
func setupUI() {
title = "服务中心"
gk_navTitle = "服务中心"
gk_navBarAlpha = 1.0
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHServiceListViewController.swift
View file @ 04a7055a
......@@ -11,21 +11,16 @@ import JXSegmentedView
class YHServiceListViewController: YHBaseViewController {
private let serviceCenterMainReqVM : YHServiceCenterMainViewModel = YHServiceCenterMainViewModel()
let homeViewModel: YHHomePageViewModel = YHHomePageViewModel()
var orderListView: YHOrderListView!
var normalView: YHServerNoOrderView!
var classId: Int = 0
override func viewDidLoad() {
super.viewDidLoad()
setupUI()
handleRightUI()
}
override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)
handleRightUI()
loadData()
}
}
......@@ -59,37 +54,12 @@ extension YHServiceListViewController {
}
}
}
if YHLoginManager.shared.isLogin() == false {
self.handleRightUI()
return
}
serviceCenterMainReqVM.getContactList { success, error in
if success == true {
} else {
YHHUD.flash(message: error?.errorMsg ?? "请求出错")
}
self.handleRightUI()
}
}
func setupUI() {
gk_navBarAlpha = 0
gk_navigationBar.isHidden = true
orderListView = {
let view = YHOrderListView()
return view
}()
view.addSubview(orderListView)
orderListView.snp.makeConstraints { make in
make.top.left.right.equalToSuperview()
make.bottom.equalToSuperview().offset(-k_Height_TabBar)
}
normalView = {
let view = YHServerNoOrderView()
view.sectionBlock = {[weak self] model in
......@@ -119,30 +89,12 @@ extension YHServiceListViewController {
view.addSubview(normalView)
normalView.snp.makeConstraints { make in
make.top.left.right.equalToSuperview()
make.bottom.equalToSuperview().offset(-k_Height_TabBar)
make.bottom.equalToSuperview()
}
}
}
extension YHServiceListViewController {
private func handleRightUI() {
if YHLoginManager.shared.isLogin() == false {
normalView.isHidden = false
orderListView.isHidden = true
} else {
if serviceCenterMainReqVM.arrContactList.isEmpty {
normalView.isHidden = false
orderListView.isHidden = true
} else {
normalView.isHidden = true
orderListView.isHidden = false
orderListView.dataSource = serviceCenterMainReqVM.arrContactList
}
}
}
}
extension YHServiceListViewController: JXSegmentedListContainerViewListDelegate {
func listView() -> UIView {
return view
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHServiceViewController.swift
View file @ 04a7055a
......@@ -40,12 +40,30 @@ class YHServiceViewController: YHBaseViewController {
return dataSource
}()
lazy var navBar: UIView = {
let bar = UIView()
let backBtn = UIButton()
backBtn.setImage(UIImage(named: "back_icon"), for: .normal)
backBtn.addTarget(self, action: #selector(didBackBtnClicked), for: .touchUpInside)
backBtn.YH_clickEdgeInsets = UIEdgeInsets(top: 20, left: 20, bottom: 20, right: 20)
bar.addSubview(backBtn)
backBtn.snp.makeConstraints { make in
make.width.height.equalTo(21)
make.centerY.equalToSuperview()
make.left.equalToSuperview().offset(16)
}
return bar
}()
//分类title 所对应的VC
lazy var listContainerView: JXSegmentedListContainerView! = {
return JXSegmentedListContainerView(dataSource: self, type: .scrollView)
}()
@objc func didBackBtnClicked() {
self.navigationController?.popViewController(animated: true)
}
override func viewDidLoad() {
super.viewDidLoad()
gk_navBarAlpha = 0
......@@ -82,6 +100,14 @@ class YHServiceViewController: YHBaseViewController {
indicator.indicatorColor = .blue
segmentedView.indicators = [indicator]
segmentedView.backgroundColor = UIColor(red: 0.95, green: 0.95, blue: 0.95, alpha: 1)
view.addSubview(navBar)
navBar.snp.makeConstraints { make in
make.left.equalToSuperview()
make.top.equalToSuperview().offset(k_Height_statusBar())
make.height.equalTo(k_Height_NavContentBar)
make.width.equalTo(47)
}
}
override func viewWillAppear(_ animated: Bool) {
......
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