dezhong/OrderScheduling
18
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
DDIsFriend
2023-09-01 16:29:39 +08:00
parent 24ca30ea90
commit 75afabaa65
6 changed files with 359 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
OrderScheduling/Rescue/ViewController/RescueController.swift
View File

@@ -66,13 +66,37 @@ extension RescueController {
})
.disposed(by: disposeBag)
if USER.isLogin == true {
RQ.token(parameters: TokenParameters(refresh_token: USER.refreshToken!))
.subscribe(onSuccess: { _ in
})
.disposed(by: disposeBag)
}
// 刷新token,全屏都不许动
Observable.just(1)
.observe(on: MainScheduler.instance)
.do(onNext: { _ in
UIApplication.shared.dd_keyWindow.dd_showHUD()
})
.flatMapLatest { _ in
return RQ.token(parameters: TokenParameters(refresh_token: USER.refreshToken!))
}
.observe(on: MainScheduler.instance)
.do(onNext: { _ in
UIApplication.shared.dd_keyWindow.dd_hideHUD()
})
.subscribe(onNext: {[weak self] response in
if response?.success == true {
USER.setToken(token: response?.data?.accessToken.tokenValue)
USER.setRefreshToken(token: response?.data?.refreshToken.tokenValue)
}
// 内容
if let view = self?.view,let categoryContainerView = self?.categoryContainerView, let categoryView = self?.categoryView {
print(view.safeAreaInsets.bottom)
view.addSubview(categoryContainerView)
categoryView.listContainer = categoryContainerView
categoryContainerView.snp.remakeConstraints({ make in
make.top.equalTo(categoryView.snp.bottom)
make.left.right.equalToSuperview()
make.bottom.equalTo(-view.safeAreaInsets.bottom)
})
}
})
.disposed(by: disposeBag)
// 点击tabBar 需要刷下下列
preRefreshRelay
@@ -83,6 +107,17 @@ extension RescueController {
})
.disposed(by: disposeBag)
}
override func viewSafeAreaInsetsDidChange() {
super.viewSafeAreaInsetsDidChange()
if categoryContainerView?.superview != nil {
categoryContainerView?.snp.remakeConstraints({ make in
make.top.equalTo(categoryView.snp.bottom)
make.left.right.equalToSuperview()
make.bottom.equalTo(-view.safeAreaInsets.bottom)
})
}
}
}
extension RescuePendingOrderController {
@@ -870,15 +905,6 @@ class RescueController : ZDViewController {
indicator.indicatorWidth = auto(18)
categoryView.indicators = [indicator]
// 内容
view.addSubview(categoryContainerView!)
categoryView.listContainer = categoryContainerView
categoryContainerView?.snp.makeConstraints({ make in
make.top.equalTo(categoryView.snp.bottom)
make.left.right.equalToSuperview()
make.bottom.equalTo(-(view.safeAreaInsets.bottom+CGRectGetHeight(tabBarController?.tabBar.frame ?? CGRectZero)))
})
messageView.titleLabel.text = "消息"
messageView.addGestureRecognizer(messageTapGes)
navigationItem.leftBarButtonItem = UIBarButtonItem(customView: messageView)