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-08-23 09:24:40 +08:00
parent 6bd037c5dd
commit 63ca919ed5
494 changed files with 35308 additions and 6623 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -53,8 +53,6 @@ extension RescueController {
})
.disposed(by: disposeBag)
NotificationCenter.default.post(name: NSNotification.Name(rawValue: Notification_reloadRescusControolerToDoMessageCount), object: nil)
messageTapGes.rx.event
.subscribe(onNext: {[weak self] _ in
let vc = MessageCenterController()
@@ -63,23 +61,17 @@ extension RescueController {
.disposed(by: disposeBag)
pendingTapGes.rx.event
.observe(on: MainScheduler.instance)
.subscribe(onNext: { _ in
WEBTOOL.open(name: .todoList,appending: nil)
})
.disposed(by: disposeBag)
h5Relay
.flatMapLatest { _ in
return RQ.dispatchAppH5Urls()
}
.subscribe(onNext: { response in
})
.disposed(by: disposeBag)
h5Relay.accept(nil)
}
override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)
NotificationCenter.default.post(name: NSNotification.Name(rawValue: Notification_reloadRescusControolerToDoMessageCount), object: nil)
}
}
extension RescuePendingOrderController {
@@ -102,10 +94,8 @@ extension RescuePendingOrderController {
.subscribe(onNext: {[weak self] (response, pageNum) in
if response?.success == true {
if pageNum == 1 {
if response?.data?.isEmpty == false {
self?.resultArr.removeAll()
self?.pendingOrderView.tableView.mj_footer?.resetNoMoreData()
}
self?.resultArr.removeAll()
self?.pendingOrderView.tableView.mj_footer?.resetNoMoreData()
self?.pendingOrderView.tableView.mj_header?.endRefreshing()
}else{
if response?.data?.isEmpty == false {
@@ -117,8 +107,15 @@ extension RescuePendingOrderController {
if let array = response?.data {
self?.resultArr.append(contentsOf: array)
self?.pendingOrderView.tableView.reloadData()
}
if self?.resultArr.isEmpty == false {
self?.emptyView.isHidden = true
}else{
self?.emptyView.isHidden = false
}
self?.pendingOrderView.tableView.reloadData()
}else{
if pageNum == 1 {
self?.pendingOrderView.tableView.mj_header?.endRefreshing()
@@ -241,10 +238,8 @@ extension RescuePendingDispatchController {
.subscribe(onNext: {[weak self] (response, pageNum) in
if response?.success == true {
if pageNum == 1 {
if response?.data?.isEmpty == false {
self?.resultArr.removeAll()
self?.pendingDispatchView.tableView.mj_footer?.resetNoMoreData()
}
self?.resultArr.removeAll()
self?.pendingDispatchView.tableView.mj_footer?.resetNoMoreData()
self?.pendingDispatchView.tableView.mj_header?.endRefreshing()
}else{
if response?.data?.isEmpty == false {
@@ -256,8 +251,15 @@ extension RescuePendingDispatchController {
if let array = response?.data {
self?.resultArr.append(contentsOf: array)
self?.pendingDispatchView.tableView.reloadData()
}
if self?.resultArr.isEmpty == false {
self?.emptyView.isHidden = true
}else{
self?.emptyView.isHidden = false
}
self?.pendingDispatchView.tableView.reloadData()
}else{
if pageNum == 1 {
self?.pendingDispatchView.tableView.mj_header?.endRefreshing()
@@ -293,10 +295,8 @@ extension RescueIsIngController {
.subscribe(onNext: {[weak self] (response, pageNum) in
if response?.success == true {
if pageNum == 1 {
if response?.data?.isEmpty == false {
self?.resultArr.removeAll()
self?.pendingIsIngView.tableView.mj_footer?.resetNoMoreData()
}
self?.resultArr.removeAll()
self?.pendingIsIngView.tableView.mj_footer?.resetNoMoreData()
self?.pendingIsIngView.tableView.mj_header?.endRefreshing()
}else{
if response?.data?.isEmpty == false {
@@ -308,8 +308,15 @@ extension RescueIsIngController {
if let array = response?.data {
self?.resultArr.append(contentsOf: array)
self?.pendingIsIngView.tableView.reloadData()
}
if self?.resultArr.isEmpty == false {
self?.emptyView.isHidden = true
}else{
self?.emptyView.isHidden = false
}
self?.pendingIsIngView.tableView.reloadData()
}else{
if pageNum == 1 {
self?.pendingIsIngView.tableView.mj_header?.endRefreshing()
@@ -421,6 +428,11 @@ extension RescuePendingOrderController : UITableViewDelegate,UITableViewDataSour
.disposed(by: disposeBag)
return cell!
}
func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
let model = resultArr[indexPath.item]
WEBTOOL.open(name: .workOrderDetail, appending: "&queryType=\(OrderTypeEnum.TO_ACCEPT_DISPATCH.rawValue)&userOrderId=\(model.userOrderId)&orderCode=\(model.orderCode)&taskOrderId=\(model.taskOrderId)")
}
}
extension RescuePendingDispatchController : UITableViewDelegate,UITableViewDataSource {
@@ -583,6 +595,11 @@ extension RescuePendingDispatchController : UITableViewDelegate,UITableViewDataS
.disposed(by: cell!.disposeBag)
return cell!
}
func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
let model = resultArr[indexPath.item]
WEBTOOL.open(name: .workOrderDetail, appending: "&queryType=\(OrderTypeEnum.TO_DISPATCH_VEHICLE.rawValue)&userOrderId=\(model.userOrderId)&orderCode=\(model.orderCode)&taskOrderId=\(model.taskOrderId)")
}
}
extension RescueIsIngController : UITableViewDelegate,UITableViewDataSource {
@@ -610,12 +627,12 @@ extension RescueIsIngController : UITableViewDelegate,UITableViewDataSource {
cell?.orderNumLabel.text = model.orderCode
cell?.orderDateLabel.text = model.createTime
if model.driverName?.isEmpty == false && model.drivePhone?.isEmpty == false {
cell?.driverLabel.text = "\(model.driverName!)/\(model.drivePhone!)"
if model.driverName?.isEmpty == false && model.driverPhone?.isEmpty == false {
cell?.driverLabel.text = "\(model.driverName!)/\(model.driverPhone!)"
}else if model.driverName?.isEmpty == false {
cell?.driverLabel.text = model.driverName!
}else if model.drivePhone?.isEmpty == false {
cell?.driverLabel.text = model.drivePhone!
}else if model.driverPhone?.isEmpty == false {
cell?.driverLabel.text = model.driverPhone!
}else{
cell?.driverLabel.text = nil
}
@@ -649,8 +666,20 @@ extension RescueIsIngController : UITableViewDelegate,UITableViewDataSource {
self?.navigationController?.pushViewController(vc, animated: true)
})
.disposed(by: cell!.disposeBag)
cell?.reportButton.rx.tap
.observe(on: MainScheduler.instance)
.subscribe(onNext: { _ in
WEBTOOL.open(name: .reporting,appending: "&queryType=\(OrderTypeEnum.TO_RESCUE.rawValue)&userOrderId=\(model.userOrderId)&orderCode=\(model.orderCode)")
})
.disposed(by: disposeBag)
return cell!
}
func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
let model = resultArr[indexPath.item]
WEBTOOL.open(name: .workOrderDetail, appending: "&queryType=\(OrderTypeEnum.TO_RESCUE.rawValue)&userOrderId=\(model.userOrderId)&orderCode=\(model.orderCode)&taskOrderId=\(model.taskOrderId)")
}
}
// MARK: UICollectionViewDelegate, UICollectionViewDataSource
@@ -761,6 +790,7 @@ class RescuePendingOrderController : DDViewController {
private var refuseRemarkIdRelay = ReplayRelay<OrderListDataModel>.create(bufferSize: 1)
private var refuseSubmitRelay = ReplayRelay<Any?>.create(bufferSize: 1)
private var acceptOrderRelay = ReplayRelay<OrderListDataModel>.create(bufferSize: 1)
private var emptyView = EmptyView()
override func viewDidLoad() {
super.viewDidLoad()
@@ -775,6 +805,13 @@ class RescuePendingOrderController : DDViewController {
pendingOrderView.snp.makeConstraints { make in
make.edges.equalToSuperview()
}
pendingOrderView.tableView.addSubview(emptyView)
emptyView.snp.makeConstraints { make in
make.centerX.centerY.equalToSuperview()
make.width.equalTo(auto(303))
make.height.equalTo(auto(94))
}
pendingOrderView.tableView.delegate = self
pendingOrderView.tableView.dataSource = self
@@ -789,7 +826,8 @@ class RescuePendingDispatchController : DDViewController {
private var environmentPics : [String] = []
private var refreshRelay = ReplayRelay<Int>.create(bufferSize: 1)
private var pageNum : Int = 1
private var emptyView = EmptyView()
override func viewDidLoad() {
super.viewDidLoad()
dd_navigationBarBackgroundColor = .hex("354683")
@@ -804,6 +842,13 @@ class RescuePendingDispatchController : DDViewController {
make.edges.equalToSuperview()
}
pendingDispatchView.tableView.addSubview(emptyView)
emptyView.snp.makeConstraints { make in
make.centerX.centerY.equalToSuperview()
make.width.equalTo(auto(303))
make.height.equalTo(auto(94))
}
pendingDispatchView.tableView.delegate = self
pendingDispatchView.tableView.dataSource = self
}
@@ -816,7 +861,8 @@ class RescueIsIngController : DDViewController {
private var resultArr : [OrderListDataModel] = []
private var refreshRelay = ReplayRelay<Int>.create(bufferSize: 1)
private var pageNum : Int = 1
private var emptyView = EmptyView()
override func viewDidLoad() {
super.viewDidLoad()
dd_navigationBarBackgroundColor = .hex("354683")
@@ -831,6 +877,13 @@ class RescueIsIngController : DDViewController {
make.edges.equalToSuperview()
}
pendingIsIngView.tableView.addSubview(emptyView)
emptyView.snp.makeConstraints { make in
make.centerX.centerY.equalToSuperview()
make.width.equalTo(auto(303))
make.height.equalTo(auto(94))
}
pendingIsIngView.tableView.delegate = self
pendingIsIngView.tableView.dataSource = self
}