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

4
OrderScheduling/ReviewFailed/ViewController/AdditionalPhotoController.swift
View File

@@ -17,7 +17,7 @@ extension AdditionalPhotoController{
func addActions() {
refreshRelay
.flatMapLatest {[weak self] _ in
return RQ.orderPhotoList(prameters: OrderPhotoList(userOrderId: (self?.userOrderId)!, orderCode: (self?.orderCode)!, taskOrderId: (self?.taskOrderId)!))
return RQ.orderPhotoList(prameters: OrderPhotoListParameters(userOrderId: (self?.userOrderId)!, orderCode: (self?.orderCode)!, taskOrderId: (self?.taskOrderId)!))
}
.observe(on: MainScheduler.instance)
.subscribe(onNext: {[weak self] response in
@@ -44,7 +44,7 @@ extension AdditionalPhotoController{
uploadImageRelay
.flatMapLatest {[weak self] itemModel in
return RQ.supplementOrderPhoto(prameters: SupplementOrderPhoto(userOrderId: (self?.userOrderId)!, orderCode: (self?.orderCode)!, taskOrderId: (self?.taskOrderId)!, taskStatus: (itemModel.taskStatus)!, tag: itemModel.tag, file: (itemModel.uploadImage)!)) { multipartFormData in
return RQ.supplementOrderPhoto(prameters: SupplementOrderPhotoParameters(userOrderId: (self?.userOrderId)!, orderCode: (self?.orderCode)!, taskOrderId: (self?.taskOrderId)!, taskStatus: (itemModel.taskStatus)!, tag: itemModel.tag, file: (itemModel.uploadImage)!)) { multipartFormData in
multipartFormData.append((itemModel.uploadImage)!, withName: "file",fileName: "\(String(Date.init().timeIntervalSince1970*1000))",mimeType: "text/plain")
if let data = itemModel.tag.data(using: .utf8) {
multipartFormData.append(data, withName: "tag")

65
OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift
View File

@@ -50,14 +50,12 @@ extension ReviewFailedController {
})
.disposed(by: disposeBag)
NotificationCenter.default.post(name: NSNotification.Name(rawValue: Notification_reloadRescusControolerToDoMessageCount), object: nil)
messageCenterView.tableView.mj_header = MJRefreshNormalHeader(refreshingBlock: {[weak self] in
reviewFailedView.tableView.mj_header = MJRefreshNormalHeader(refreshingBlock: {[weak self] in
self?.pageNum = 1
self?.refreshRelay.accept(self?.pageNum ?? 1)
})
messageCenterView.tableView.mj_footer = MJRefreshBackNormalFooter(refreshingBlock: {[weak self] in
reviewFailedView.tableView.mj_footer = MJRefreshBackNormalFooter(refreshingBlock: {[weak self] in
self?.pageNum+=1
self?.refreshRelay.accept(self?.pageNum ?? 1)
})
@@ -70,35 +68,52 @@ extension ReviewFailedController {
.subscribe(onNext: {[weak self] (response, pageNum) in
if response?.success == true {
if pageNum == 1 {
if response?.data?.isEmpty == false {
self?.resultArr.removeAll()
self?.messageCenterView.tableView.mj_footer?.resetNoMoreData()
}
self?.messageCenterView.tableView.mj_header?.endRefreshing()
self?.resultArr.removeAll()
self?.reviewFailedView.tableView.mj_footer?.resetNoMoreData()
self?.reviewFailedView.tableView.mj_header?.endRefreshing()
}else{
if response?.data?.isEmpty == false {
self?.messageCenterView.tableView.mj_footer?.endRefreshing()
self?.reviewFailedView.tableView.mj_footer?.endRefreshing()
}else{
self?.messageCenterView.tableView.mj_footer?.endRefreshingWithNoMoreData()
self?.reviewFailedView.tableView.mj_footer?.endRefreshingWithNoMoreData()
}
}
if let array = response?.data {
self?.resultArr.append(contentsOf: array)
self?.messageCenterView.tableView.reloadData()
}
if self?.resultArr.isEmpty == false {
self?.emptyView.isHidden = true
}else{
self?.emptyView.isHidden = false
}
self?.reviewFailedView.tableView.reloadData()
}else{
if pageNum == 1 {
self?.messageCenterView.tableView.mj_header?.endRefreshing()
self?.reviewFailedView.tableView.mj_header?.endRefreshing()
}else{
self?.messageCenterView.tableView.mj_footer?.endRefreshing()
self?.reviewFailedView.tableView.mj_footer?.endRefreshing()
}
self?.view.dd_makeToast(response?.msg)
}
})
.disposed(by: disposeBag)
messageCenterView.tableView.mj_header?.beginRefreshing()
reviewFailedView.tableView.mj_header?.beginRefreshing()
pendingTapGes.rx.event
.observe(on: MainScheduler.instance)
.subscribe(onNext: { _ in
WEBTOOL.open(name: .todoList,appending: nil)
})
.disposed(by: disposeBag)
}
public override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)
NotificationCenter.default.post(name: NSNotification.Name(rawValue: Notification_reloadRescusControolerToDoMessageCount), object: nil)
}
}
@@ -136,7 +151,7 @@ extension ReviewFailedController : UITableViewDelegate,UITableViewDataSource {
}
open class ReviewFailedController : DDViewController {
private let messageCenterView = ReviewFailedView()
private let reviewFailedView = ReviewFailedView()
private var pageNum : Int = 1
private var refreshRelay = ReplayRelay<Int>.create(bufferSize: 1)
private let disposeBag = DisposeBag()
@@ -145,7 +160,8 @@ open class ReviewFailedController : DDViewController {
private let messageView = MessageView()
private let pendingTapGes = UITapGestureRecognizer()
private let pendingView = MessageView()
private var emptyView = EmptyView()
open override func viewDidLoad() {
super.viewDidLoad()
dd_navigationItemTitle = "审核失败"
@@ -159,14 +175,21 @@ open class ReviewFailedController : DDViewController {
func addSubviews() {
view.backgroundColor = .hex("F4F5F7")
view.addSubview(messageCenterView)
messageCenterView.snp.makeConstraints { make in
view.addSubview(reviewFailedView)
reviewFailedView.snp.makeConstraints { make in
make.top.left.right.equalToSuperview()
make.bottom.equalTo(-view.safeAreaInsets.bottom)
}
messageCenterView.tableView.delegate = self
messageCenterView.tableView.dataSource = self
reviewFailedView.tableView.addSubview(emptyView)
emptyView.snp.makeConstraints { make in
make.centerX.centerY.equalToSuperview()
make.width.equalTo(auto(303))
make.height.equalTo(auto(94))
}
reviewFailedView.tableView.delegate = self
reviewFailedView.tableView.dataSource = self
messageView.titleLabel.text = "消息"
messageView.addGestureRecognizer(messageTapGes)