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-28 15:31:14 +08:00
parent f052f1089a
commit d197a282c0
7 changed files with 54 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate generated
View File

Binary file not shown.

40
OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
View File

@@ -1226,8 +1226,8 @@
filePath = "OrderScheduling/Common/WebView/WebViewTool.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "52"
endingLineNumber = "52"
startingLineNumber = "54"
endingLineNumber = "54"
landmarkName = "init()"
landmarkType = "7">
</BreakpointContent>
@@ -2547,8 +2547,8 @@
filePath = "OrderScheduling/Rescue/View/AcceptOrderTool.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "27"
endingLineNumber = "27"
startingLineNumber = "29"
endingLineNumber = "29"
landmarkName = "open(userInfo:)"
landmarkType = "7">
</BreakpointContent>
@@ -2649,5 +2649,37 @@
</Locations>
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "BBF0158A-ADB5-442E-ADED-F03E6F0CEC20"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "OrderScheduling/Rescue/View/AcceptOrderTool.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "32"
endingLineNumber = "32"
landmarkName = "open(userInfo:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "E5D80E13-1F0F-4770-89B1-4D38B407EBE4"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "OrderScheduling/Rescue/View/AcceptOrderTool.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "22"
endingLineNumber = "22"
landmarkName = "open(userInfo:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
</Breakpoints>
</Bucket>

8
OrderScheduling/Common/WebView/WebViewTool.swift
View File

@@ -29,6 +29,8 @@ open class WebViewTool : NSObject {
case reporting = "报备"
case supplySettlement = "补结算单"
case workOrderDetail = "工单详情"
case trainDocment = "培训文档"
case docmentList = "文档资料"
}
public override init() {
@@ -95,6 +97,12 @@ open class WebViewTool : NSObject {
case .workOrderDetail:
vc = WebViewController(title: WebViewNameEnum.workOrderDetail.rawValue, url: "\((h5Models?.workOrderDetail)!)?token=\((USER.token)!)"+(appending ?? ""))
break
case .trainDocment:
vc = WebViewController(showNavBar:false, title: WebViewNameEnum.trainDocment.rawValue, url: "\((h5Models?.trainDocment)!)?token=\((USER.token)!)"+(appending ?? ""))
break
case .docmentList:
vc = WebViewController(showNavBar:false, title: WebViewNameEnum.docmentList.rawValue, url: "\((h5Models?.docmentList)!)?token=\((USER.token)!)"+(appending ?? ""))
break
}
if let vc {

2
OrderScheduling/HttpResponseModel/ResponseModel.swift
View File

@@ -242,6 +242,8 @@ public class DispatchAppH5UrlDataModel : Decodable {
var reporting : String
var supplySettlement : String
var workOrderDetail : String
var trainDocment : String
var docmentList : String
}
public class VersionCheckDataModel : Decodable {

5
OrderScheduling/Mine/ViewController/MineController.swift
View File

@@ -100,15 +100,14 @@ extension MineController {
mineView.wendangziliaoGes.rx.event
.observe(on: MainScheduler.instance)
.subscribe(onNext: { _ in
WEBTOOL.open(name: .docmentList, appending: nil)
})
.disposed(by: disposeBag)
mineView.peixunwendangGes.rx.event
.observe(on: MainScheduler.instance)
.subscribe(onNext: { _ in
WEBTOOL.open(name: .trainDocment, appending: nil)
})
.disposed(by: disposeBag)

5
OrderScheduling/Rescue/View/AcceptOrderTool.swift
View File

@@ -24,7 +24,12 @@ open class AcceptOrderTool : NSObject {
.subscribe(onNext: {
ENTRY.dismiss(name: acceptOrderViewEntry) {
let tabBarVc = UIApplication.shared.dd_keyWindow.rootViewController as? MainTabBarController
let currentNav = tabBarVc?.selectedViewController as? UINavigationController
currentNav?.popToRootViewController(animated: false)
tabBarVc?.selectedIndex = 0
let nav = tabBarVc?.children.first as? UINavigationController
let vc = nav?.children.first as? RescueController
vc?.categoryView.selectItem(at: 0)
}
}).disposed(by: disposeBag)
ENTRY.showAcceptOrderEntry(view: acceptOrderView,name: acceptOrderViewEntry)

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

@@ -790,7 +790,7 @@ extension RescuePendingDispatchController : UICollectionViewDelegate, UICollecti
// MARK: 救援中
class RescueController : ZDViewController {
private let categoryView = JXCategoryTitleView()
public let categoryView = JXCategoryTitleView()
private lazy var categoryContainerView = JXCategoryListContainerView(type: .scrollView, delegate: self)
private let messageTapGes = UITapGestureRecognizer()
private let messageView = MessageView()