dezhong/OrderScheduling
18
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

取消新人培训页的侧滑

Browse Source
This commit is contained in:
ddisfriend
2024-05-14 16:27:05 +08:00
parent 53f85956d4
commit a8675195fc
7 changed files with 138 additions and 106 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.

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

@@ -222,8 +222,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "1051"
endingLineNumber = "1051"
startingLineNumber = "1056"
endingLineNumber = "1056"
landmarkName = "collectionView(_:cellForItemAt:)"
landmarkType = "7">
</BreakpointContent>
@@ -558,8 +558,8 @@
filePath = "OrderScheduling/Common/WebView/WebViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "110"
endingLineNumber = "110"
startingLineNumber = "120"
endingLineNumber = "120"
landmarkName = "userContentController(_:didReceive:)"
landmarkType = "7">
</BreakpointContent>
@@ -574,8 +574,8 @@
filePath = "OrderScheduling/Common/WebView/WebViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "133"
endingLineNumber = "133"
startingLineNumber = "143"
endingLineNumber = "143"
landmarkName = "userContentController(_:didReceive:)"
landmarkType = "7">
</BreakpointContent>
@@ -814,8 +814,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "267"
endingLineNumber = "267"
startingLineNumber = "272"
endingLineNumber = "272"
landmarkName = "entry(model:remarkId:)"
landmarkType = "7">
</BreakpointContent>
@@ -862,8 +862,8 @@
filePath = "OrderScheduling/Common/WebView/WebViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "138"
endingLineNumber = "138"
startingLineNumber = "148"
endingLineNumber = "148"
landmarkName = "webView(_:didFinish:)"
landmarkType = "7">
</BreakpointContent>
@@ -878,8 +878,8 @@
filePath = "OrderScheduling/Common/WebView/WebViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "145"
endingLineNumber = "145"
startingLineNumber = "155"
endingLineNumber = "155"
landmarkName = "webView(_:didFail:withError:)"
landmarkType = "7">
</BreakpointContent>
@@ -894,8 +894,8 @@
filePath = "OrderScheduling/Common/WebView/WebViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "153"
endingLineNumber = "153"
startingLineNumber = "163"
endingLineNumber = "163"
landmarkName = "webView(_:didFailProvisionalNavigation:withError:)"
landmarkType = "7">
</BreakpointContent>
@@ -910,8 +910,8 @@
filePath = "OrderScheduling/Common/WebView/WebViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "152"
endingLineNumber = "152"
startingLineNumber = "162"
endingLineNumber = "162"
landmarkName = "webView(_:didFailProvisionalNavigation:withError:)"
landmarkType = "7">
</BreakpointContent>
@@ -1326,8 +1326,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "1062"
endingLineNumber = "1062"
startingLineNumber = "1067"
endingLineNumber = "1067"
landmarkName = "collectionView(_:didSelectItemAt:)"
landmarkType = "7">
</BreakpointContent>
@@ -1342,8 +1342,8 @@
filePath = "OrderScheduling/Common/WebView/WebViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "112"
endingLineNumber = "112"
startingLineNumber = "122"
endingLineNumber = "122"
landmarkName = "userContentController(_:didReceive:)"
landmarkType = "7">
</BreakpointContent>
@@ -1358,8 +1358,8 @@
filePath = "OrderScheduling/Common/WebView/WebViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "117"
endingLineNumber = "117"
startingLineNumber = "127"
endingLineNumber = "127"
landmarkName = "userContentController(_:didReceive:)"
landmarkType = "7">
</BreakpointContent>
@@ -1374,8 +1374,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "342"
endingLineNumber = "342"
startingLineNumber = "347"
endingLineNumber = "347"
landmarkName = "addActions()"
landmarkType = "7">
</BreakpointContent>
@@ -1390,8 +1390,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "331"
endingLineNumber = "331"
startingLineNumber = "336"
endingLineNumber = "336"
landmarkName = "addActions()"
landmarkType = "7">
</BreakpointContent>
@@ -1406,8 +1406,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "333"
endingLineNumber = "333"
startingLineNumber = "338"
endingLineNumber = "338"
landmarkName = "addActions()"
landmarkType = "7">
</BreakpointContent>
@@ -1502,8 +1502,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "90"
endingLineNumber = "90"
startingLineNumber = "96"
endingLineNumber = "96"
landmarkName = "addActions()"
landmarkType = "7">
</BreakpointContent>
@@ -2254,8 +2254,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "998"
endingLineNumber = "998"
startingLineNumber = "1003"
endingLineNumber = "1003"
landmarkName = "tableView(_:cellForRowAt:)"
landmarkType = "7">
</BreakpointContent>
@@ -2270,8 +2270,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "1003"
endingLineNumber = "1003"
startingLineNumber = "1008"
endingLineNumber = "1008"
landmarkName = "tableView(_:cellForRowAt:)"
landmarkType = "7">
</BreakpointContent>
@@ -2462,8 +2462,8 @@
filePath = "OrderScheduling/Common/WebView/WebViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "139"
endingLineNumber = "139"
startingLineNumber = "149"
endingLineNumber = "149"
landmarkName = "webView(_:didFinish:)"
landmarkType = "7">
</BreakpointContent>
@@ -2478,8 +2478,8 @@
filePath = "OrderScheduling/Common/WebView/WebViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "118"
endingLineNumber = "118"
startingLineNumber = "128"
endingLineNumber = "128"
landmarkName = "userContentController(_:didReceive:)"
landmarkType = "7">
</BreakpointContent>
@@ -2558,8 +2558,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "223"
endingLineNumber = "223"
startingLineNumber = "229"
endingLineNumber = "229"
landmarkName = "addActions()"
landmarkType = "7">
</BreakpointContent>
@@ -2574,8 +2574,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "231"
endingLineNumber = "231"
startingLineNumber = "236"
endingLineNumber = "236"
landmarkName = "addActions()"
landmarkType = "7">
</BreakpointContent>
@@ -2590,8 +2590,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "102"
endingLineNumber = "102"
startingLineNumber = "108"
endingLineNumber = "108"
landmarkName = "addActions()"
landmarkType = "7">
</BreakpointContent>
@@ -2606,8 +2606,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "101"
endingLineNumber = "101"
startingLineNumber = "107"
endingLineNumber = "107"
landmarkName = "addActions()"
landmarkType = "7">
</BreakpointContent>
@@ -2622,8 +2622,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "376"
endingLineNumber = "376"
startingLineNumber = "381"
endingLineNumber = "381"
landmarkName = "addActions()"
landmarkType = "7">
</BreakpointContent>
@@ -2638,8 +2638,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "386"
endingLineNumber = "386"
startingLineNumber = "391"
endingLineNumber = "391"
landmarkName = "addActions()"
landmarkType = "7">
</BreakpointContent>
@@ -2654,8 +2654,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "310"
endingLineNumber = "310"
startingLineNumber = "315"
endingLineNumber = "315"
landmarkName = "addActions()"
landmarkType = "7">
</BreakpointContent>
@@ -2686,8 +2686,8 @@
filePath = "OrderScheduling/Common/WebView/WebViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "122"
endingLineNumber = "122"
startingLineNumber = "132"
endingLineNumber = "132"
landmarkName = "userContentController(_:didReceive:)"
landmarkType = "7">
</BreakpointContent>
@@ -2702,8 +2702,8 @@
filePath = "OrderScheduling/Common/WebView/WebViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "129"
endingLineNumber = "129"
startingLineNumber = "139"
endingLineNumber = "139"
landmarkName = "userContentController(_:didReceive:)"
landmarkType = "7">
</BreakpointContent>
@@ -2718,8 +2718,8 @@
filePath = "OrderScheduling/Common/WebView/WebViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "123"
endingLineNumber = "123"
startingLineNumber = "133"
endingLineNumber = "133"
landmarkName = "userContentController(_:didReceive:)"
landmarkType = "7">
</BreakpointContent>
@@ -2734,8 +2734,8 @@
filePath = "OrderScheduling/Common/WebView/WebViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "126"
endingLineNumber = "126"
startingLineNumber = "136"
endingLineNumber = "136"
landmarkName = "userContentController(_:didReceive:)"
landmarkType = "7">
</BreakpointContent>
@@ -2750,8 +2750,8 @@
filePath = "OrderScheduling/Common/WebView/WebViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "124"
endingLineNumber = "124"
startingLineNumber = "134"
endingLineNumber = "134"
landmarkName = "userContentController(_:didReceive:)"
landmarkType = "7">
</BreakpointContent>
@@ -2766,8 +2766,8 @@
filePath = "OrderScheduling/Common/WebView/WebViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "127"
endingLineNumber = "127"
startingLineNumber = "137"
endingLineNumber = "137"
landmarkName = "userContentController(_:didReceive:)"
landmarkType = "7">
</BreakpointContent>
@@ -2910,8 +2910,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "2031"
endingLineNumber = "2031"
startingLineNumber = "2036"
endingLineNumber = "2036"
landmarkName = "init(style:reuseIdentifier:)"
landmarkType = "7">
</BreakpointContent>
@@ -2926,8 +2926,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "2038"
endingLineNumber = "2038"
startingLineNumber = "2043"
endingLineNumber = "2043"
landmarkName = "init(style:reuseIdentifier:)"
landmarkType = "7">
</BreakpointContent>
@@ -2942,8 +2942,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "677"
endingLineNumber = "677"
startingLineNumber = "682"
endingLineNumber = "682"
landmarkName = "tableView(_:cellForRowAt:)"
landmarkType = "7">
</BreakpointContent>
@@ -3022,8 +3022,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "990"
endingLineNumber = "990"
startingLineNumber = "995"
endingLineNumber = "995"
landmarkName = "tableView(_:cellForRowAt:)"
landmarkType = "7">
</BreakpointContent>
@@ -3854,8 +3854,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "362"
endingLineNumber = "362"
startingLineNumber = "367"
endingLineNumber = "367"
landmarkName = "addActions()"
landmarkType = "7">
</BreakpointContent>
@@ -3870,8 +3870,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "1106"
endingLineNumber = "1106"
startingLineNumber = "1111"
endingLineNumber = "1111"
landmarkName = "addSubviews()"
landmarkType = "7">
</BreakpointContent>
@@ -3886,8 +3886,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "1135"
endingLineNumber = "1135"
startingLineNumber = "1140"
endingLineNumber = "1140"
landmarkName = "addSubviews()"
landmarkType = "7">
</BreakpointContent>
@@ -3902,8 +3902,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "1188"
endingLineNumber = "1188"
startingLineNumber = "1193"
endingLineNumber = "1193"
landmarkName = "viewDidLoad()"
landmarkType = "7">
</BreakpointContent>
@@ -3918,8 +3918,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "1228"
endingLineNumber = "1228"
startingLineNumber = "1233"
endingLineNumber = "1233"
landmarkName = "viewDidLoad()"
landmarkType = "7">
</BreakpointContent>
@@ -3934,8 +3934,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "1266"
endingLineNumber = "1266"
startingLineNumber = "1271"
endingLineNumber = "1271"
landmarkName = "viewDidLoad()"
landmarkType = "7">
</BreakpointContent>
@@ -3966,8 +3966,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "1249"
endingLineNumber = "1249"
startingLineNumber = "1254"
endingLineNumber = "1254"
landmarkName = "RescuePendingDispatchController"
landmarkType = "3">
</BreakpointContent>
@@ -3998,8 +3998,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "492"
endingLineNumber = "492"
startingLineNumber = "497"
endingLineNumber = "497"
landmarkName = "listContainerView(_:initListFor:)"
landmarkType = "7">
</BreakpointContent>
@@ -4014,8 +4014,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "489"
endingLineNumber = "489"
startingLineNumber = "494"
endingLineNumber = "494"
landmarkName = "listContainerView(_:initListFor:)"
landmarkType = "7">
</BreakpointContent>
@@ -4030,8 +4030,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "478"
endingLineNumber = "478"
startingLineNumber = "483"
endingLineNumber = "483"
landmarkName = "listContainerView(_:initListFor:)"
landmarkType = "7">
</BreakpointContent>
@@ -4574,8 +4574,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "224"
endingLineNumber = "224"
startingLineNumber = "230"
endingLineNumber = "230"
landmarkName = "addActions()"
landmarkType = "7">
</BreakpointContent>
@@ -4590,8 +4590,8 @@
filePath = "OrderScheduling/NewTraining/NewTraining.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "35"
endingLineNumber = "35"
startingLineNumber = "36"
endingLineNumber = "36"
landmarkName = "init()"
landmarkType = "7">
</BreakpointContent>
@@ -4606,8 +4606,8 @@
filePath = "OrderScheduling/NewTraining/NewTraining.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "24"
endingLineNumber = "24"
startingLineNumber = "25"
endingLineNumber = "25"
landmarkName = "init()"
landmarkType = "7">
</BreakpointContent>
@@ -4622,11 +4622,27 @@
filePath = "OrderScheduling/NewTraining/NewTraining.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "28"
endingLineNumber = "28"
startingLineNumber = "29"
endingLineNumber = "29"
landmarkName = "init()"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "BAAFB4A2-006E-4378-A87E-3C20CB4A635A"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "OrderScheduling/Common/WebView/WebViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "100"
endingLineNumber = "100"
landmarkName = "viewWillAppear(_:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
</Breakpoints>
</Bucket>

12
OrderScheduling/Common/WebView/WebViewController.swift
View File

@@ -18,12 +18,14 @@ class WebViewController : ZDViewController {
var showNavBar : Bool
var vcTitle : String
var url : String?
var screenEdgePanGestureRecognizerEnable : Bool
public var disappearHandler: (() -> Void)?
public init(showNavBar:Bool = true,title:String,url:String) {
public init(showNavBar:Bool = true,title:String,url:String,screenEdgePanGestureRecognizerEnable:Bool = true) {
self.showNavBar = showNavBar
self.vcTitle = title
self.url = url
self.screenEdgePanGestureRecognizerEnable = screenEdgePanGestureRecognizerEnable
super.init(nibName: nil, bundle: nil)
}
@@ -93,6 +95,10 @@ class WebViewController : ZDViewController {
if showNavBar == false {
navigationController?.navigationBar.isHidden = true
}
if screenEdgePanGestureRecognizerEnable == false {
let nav = navigationController as? DDNavigationController
nav?.screenEdgePanGestureRecognizerEnable(false)
}
webView.configuration.userContentController.add(self, name: "nativeObject")
}
@@ -101,6 +107,10 @@ class WebViewController : ZDViewController {
if showNavBar == false {
navigationController?.navigationBar.isHidden = false
}
if screenEdgePanGestureRecognizerEnable == false {
let nav = navigationController as? DDNavigationController
nav?.screenEdgePanGestureRecognizerEnable(true)
}
webView.configuration.userContentController.removeScriptMessageHandler(forName: "nativeObject")
}
}

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

@@ -122,7 +122,7 @@ open class WebViewTool : NSObject {
break
case .newTrainingList:
vc = WebViewController(showNavBar:false, title: WebViewNameEnum.newTrainingList.rawValue, url: "\((h5Models?.newTrainingList)!)?token=\((USER.token)!)"+(appending ?? ""))
vc = WebViewController(showNavBar:false, title: WebViewNameEnum.newTrainingList.rawValue, url: "\((h5Models?.newTrainingList)!)?token=\((USER.token)!)"+(appending ?? ""),screenEdgePanGestureRecognizerEnable: false)
break
}

1
OrderScheduling/NewTraining/NewTraining.swift
View File

@@ -20,6 +20,7 @@ class NewTraining : NSObject {
super.init()
newTrainingRelay
.throttle(RxTimeInterval.seconds(5), scheduler: MainScheduler.instance)
.flatMapLatest({ _ in
return RQ.jumpNewTrain()
})

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

@@ -83,6 +83,12 @@ extension RescueController {
})
.disposed(by: disposeBag)
USER.refreshTokenSub
.subscribe(onNext: { _ in
NewTraining.default.newTrainingRelay.accept(nil)
})
.disposed(by: disposeBag)
// 点击tabBar 需要刷下下列
preRefreshRelay
.observe(on: MainScheduler.instance)
@@ -221,7 +227,6 @@ extension RescuePendingOrderController {
.observe(on: MainScheduler.instance)
.subscribe(onNext: {[weak self] _ in
self?.pendingOrderView.tableView.mj_header?.beginRefreshing()
NewTraining.default.newTrainingRelay.accept(nil)
})
.disposed(by: disposeBag)

6
fastlane/report.xml
View File

@@ -5,17 +5,17 @@
<testcase classname="fastlane.lanes" name="0: default_platform" time="0.00016">
<testcase classname="fastlane.lanes" name="0: default_platform" time="0.000188">
</testcase>
<testcase classname="fastlane.lanes" name="1: gym" time="98.840884">
<testcase classname="fastlane.lanes" name="1: gym" time="86.681786">
</testcase>
<testcase classname="fastlane.lanes" name="2: pgyer" time="12.226502">
<testcase classname="fastlane.lanes" name="2: pgyer" time="13.452337">
</testcase>