refreshToken

This commit is contained in:
DDIsFriend
2023-09-01 17:39:56 +08:00
parent 75afabaa65
commit 115f27422e
11 changed files with 124 additions and 222 deletions

View File

@@ -79,22 +79,12 @@ extension RescueController {
.do(onNext: { _ in
UIApplication.shared.dd_keyWindow.dd_hideHUD()
})
.subscribe(onNext: {[weak self] response in
.subscribe(onNext: { 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)
})
}
USER.refreshTokenSub.onNext(true)
})
.disposed(by: disposeBag)
@@ -108,16 +98,6 @@ 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 {
@@ -172,9 +152,7 @@ extension RescuePendingOrderController {
}
})
.disposed(by: disposeBag)
pendingOrderView.tableView.mj_header?.beginRefreshing()
refuseOrderConfirmView.cancelButton.rx.tap
.subscribe(onNext: { _ in
ENTRY.dismiss(name: refuseOrderConfirmEntry)
@@ -234,6 +212,13 @@ extension RescuePendingOrderController {
}
})
.disposed(by: disposeBag)
USER.refreshTokenSub
.observe(on: MainScheduler.instance)
.subscribe(onNext: {[weak self] _ in
self?.pendingOrderView.tableView.mj_header?.beginRefreshing()
})
.disposed(by: disposeBag)
}
func entry(model:OrderListDataModel,remarkId:String?) {
@@ -359,7 +344,12 @@ extension RescuePendingDispatchController {
})
.disposed(by: disposeBag)
pendingDispatchView.tableView.mj_header?.beginRefreshing()
USER.refreshTokenSub
.observe(on: MainScheduler.instance)
.subscribe(onNext: {[weak self] _ in
self?.pendingDispatchView.tableView.mj_header?.beginRefreshing()
})
.disposed(by: disposeBag)
}
}
@@ -416,7 +406,12 @@ extension RescueIsIngController {
})
.disposed(by: disposeBag)
pendingIsIngView.tableView.mj_header?.beginRefreshing()
USER.refreshTokenSub
.observe(on: MainScheduler.instance)
.subscribe(onNext: {[weak self] _ in
self?.pendingIsIngView.tableView.mj_header?.beginRefreshing()
})
.disposed(by: disposeBag)
}
}
@@ -905,6 +900,11 @@ class RescueController : ZDViewController {
indicator.indicatorWidth = auto(18)
categoryView.indicators = [indicator]
if let categoryContainerView {
view.addSubview(categoryContainerView)
categoryView.listContainer = categoryContainerView
}
messageView.titleLabel.text = "消息"
messageView.addGestureRecognizer(messageTapGes)
navigationItem.leftBarButtonItem = UIBarButtonItem(customView: messageView)
@@ -922,6 +922,15 @@ class RescueController : ZDViewController {
}
}
override func viewSafeAreaInsetsDidChange() {
super.viewSafeAreaInsetsDidChange()
categoryContainerView?.snp.makeConstraints({ make in
make.top.equalTo(categoryView.snp.bottom)
make.left.right.equalToSuperview()
make.bottom.equalTo(-view.safeAreaInsets.bottom)
})
}
override func reloadData() {
super.reloadData()
preRefreshRelay.accept(nil)