diff --git a/.DS_Store b/.DS_Store index 79d6d91..260587c 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate index 2128494..34998cb 100644 Binary files a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate and b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist index 688ec25..a9c82f6 100644 --- a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -317,8 +317,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "458" - endingLineNumber = "458" + startingLineNumber = "469" + endingLineNumber = "469" landmarkName = "tableView(_:cellForRowAt:)" landmarkType = "7"> @@ -333,8 +333,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "459" - endingLineNumber = "459" + startingLineNumber = "470" + endingLineNumber = "470" landmarkName = "tableView(_:cellForRowAt:)" landmarkType = "7"> @@ -507,8 +507,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "540" - endingLineNumber = "540" + startingLineNumber = "551" + endingLineNumber = "551" landmarkName = "tableView(_:cellForRowAt:)" landmarkType = "7"> @@ -523,8 +523,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "541" - endingLineNumber = "541" + startingLineNumber = "552" + endingLineNumber = "552" landmarkName = "tableView(_:cellForRowAt:)" landmarkType = "7"> @@ -555,8 +555,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "661" - endingLineNumber = "661" + startingLineNumber = "672" + endingLineNumber = "672" landmarkName = "collectionView(_:cellForItemAt:)" landmarkType = "7"> @@ -571,8 +571,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "662" - endingLineNumber = "662" + startingLineNumber = "673" + endingLineNumber = "673" landmarkName = "collectionView(_:cellForItemAt:)" landmarkType = "7"> diff --git a/OrderScheduling/HttpRequestCenter/ApiList.swift b/OrderScheduling/HttpRequestCenter/ApiList.swift index f0813c2..24f6f78 100644 --- a/OrderScheduling/HttpRequestCenter/ApiList.swift +++ b/OrderScheduling/HttpRequestCenter/ApiList.swift @@ -41,4 +41,6 @@ open class ApiList { public let logout = "/supplierAppV2/dispatchApp/user/logout" public let generalInfo = "/supplierAppV2/dispatchApp/user/generalInfo" + + public let dispatchAppH5Urls = "/supplierAppV2/open/dispatchAppH5Urls" } diff --git a/OrderScheduling/HttpRequestCenter/RequestList.swift b/OrderScheduling/HttpRequestCenter/RequestList.swift index f7e4a66..f2cfdcf 100644 --- a/OrderScheduling/HttpRequestCenter/RequestList.swift +++ b/OrderScheduling/HttpRequestCenter/RequestList.swift @@ -79,4 +79,8 @@ open class RequestList { func generalInfo() -> Single?> { return DDAF.post(urlString: HOST+API.generalInfo,encoding: URLEncodedFormParameterEncoder.default,headers: [tokenHeader()],responseType: ResponseModel.self) } + + func dispatchAppH5Urls() -> Single?> { + return DDAF.post(urlString: HOST+API.dispatchAppH5Urls,encoding: URLEncodedFormParameterEncoder.default,headers: [tokenHeader()],responseType: ResponseModel.self) + } } diff --git a/OrderScheduling/HttpResponseModel/ResponseModel.swift b/OrderScheduling/HttpResponseModel/ResponseModel.swift index 5e04b29..4c896a2 100644 --- a/OrderScheduling/HttpResponseModel/ResponseModel.swift +++ b/OrderScheduling/HttpResponseModel/ResponseModel.swift @@ -214,3 +214,17 @@ public class GeneralInfoDataModel : Decodable { var vehicleCount : Int var driverCount : Int } + +public class DispatchAppH5Urls : Decodable { + var data : DataModel? + class DataModel : Decodable { + var todoList : String + var workOrderReconciliation : String + var vehicleManage : String + var driverManage : String + var invoicingNotify : String + var reporting : String + var supplySettlement : String + var workOrderDetail : String + } +} diff --git a/OrderScheduling/Rescue/ViewController/RescueController.swift b/OrderScheduling/Rescue/ViewController/RescueController.swift index d4d23d5..febab65 100644 --- a/OrderScheduling/Rescue/ViewController/RescueController.swift +++ b/OrderScheduling/Rescue/ViewController/RescueController.swift @@ -67,6 +67,17 @@ extension RescueController { }) .disposed(by: disposeBag) + + h5Relay + .flatMapLatest { _ in + return RQ.dispatchAppH5Urls() + } + .subscribe(onNext: { response in + + }) + .disposed(by: disposeBag) + + h5Relay.accept(nil) } } @@ -682,6 +693,7 @@ class RescueController : DDViewController { private let pendingTapGes = UITapGestureRecognizer() private let pendingView = MessageView() private let disposeBag = DisposeBag() + private let h5Relay = ReplayRelay.create(bufferSize: 1) override func viewDidLoad() { super.viewDidLoad()