diff --git a/.DS_Store b/.DS_Store index 3f1f899..1a8f517 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/OrderScheduling.xcodeproj/project.pbxproj b/OrderScheduling.xcodeproj/project.pbxproj index f08def8..ec3500c 100644 --- a/OrderScheduling.xcodeproj/project.pbxproj +++ b/OrderScheduling.xcodeproj/project.pbxproj @@ -50,6 +50,7 @@ 794FBB1F2A92F7C300D57BB8 /* WebViewTool.swift in Sources */ = {isa = PBXBuildFile; fileRef = 794FBB1E2A92F7C300D57BB8 /* WebViewTool.swift */; }; 794FBB212A934E0A00D57BB8 /* AppUpdateView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 794FBB202A934E0A00D57BB8 /* AppUpdateView.swift */; }; 794FBB232A93519800D57BB8 /* AppUpdateTool.swift in Sources */ = {isa = PBXBuildFile; fileRef = 794FBB222A93519800D57BB8 /* AppUpdateTool.swift */; }; + 795B949B2BECDB56008F3205 /* NewTraining.swift in Sources */ = {isa = PBXBuildFile; fileRef = 795B949A2BECDB56008F3205 /* NewTraining.swift */; }; 795FF3E02AA991E70058454C /* appointmentOrder.wav in Resources */ = {isa = PBXBuildFile; fileRef = 795FF3DF2AA991E70058454C /* appointmentOrder.wav */; }; 79B966382AB0651C00308A8D /* VehicleLogoutView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79B966372AB0651C00308A8D /* VehicleLogoutView.swift */; }; 79CB07CC2AA8465A00154B61 /* UserPermission.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79CB07CB2AA8465A00154B61 /* UserPermission.swift */; }; @@ -159,6 +160,7 @@ 794FBB1E2A92F7C300D57BB8 /* WebViewTool.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebViewTool.swift; sourceTree = ""; }; 794FBB202A934E0A00D57BB8 /* AppUpdateView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppUpdateView.swift; sourceTree = ""; }; 794FBB222A93519800D57BB8 /* AppUpdateTool.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppUpdateTool.swift; sourceTree = ""; }; + 795B949A2BECDB56008F3205 /* NewTraining.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewTraining.swift; sourceTree = ""; }; 795FF3DF2AA991E70058454C /* appointmentOrder.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = appointmentOrder.wav; sourceTree = ""; }; 79B966372AB0651C00308A8D /* VehicleLogoutView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VehicleLogoutView.swift; sourceTree = ""; }; 79CB07CB2AA8465A00154B61 /* UserPermission.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserPermission.swift; sourceTree = ""; }; @@ -542,6 +544,14 @@ path = View; sourceTree = ""; }; + 795B94992BECDB3E008F3205 /* NewTraining */ = { + isa = PBXGroup; + children = ( + 795B949A2BECDB56008F3205 /* NewTraining.swift */, + ); + path = NewTraining; + sourceTree = ""; + }; 79CECC0C2A89BCFE00B95D8B /* MessageCenter */ = { isa = PBXGroup; children = ( @@ -728,6 +738,7 @@ children = ( 79DD0DA62A946B2500768FE7 /* OrderSchedulingDebug.entitlements */, 79DD0DA52A945D9E00768FE7 /* OrderSchedulingRelease.entitlements */, + 795B94992BECDB3E008F3205 /* NewTraining */, 794FBB0E2A8F044F00D57BB8 /* Mine */, 794FBB072A8F03D200D57BB8 /* History */, 79CECC1C2A8A2A1600B95D8B /* VehicleMonitoring */, @@ -1023,6 +1034,7 @@ 794FBB142A8F045F00D57BB8 /* MineController.swift in Sources */, 791887432A7CCCCD007EA0C1 /* SceneDelegate.swift in Sources */, 791887C12A839784007EA0C1 /* RefuseOrderEntryView.swift in Sources */, + 795B949B2BECDB56008F3205 /* NewTraining.swift in Sources */, 7918877E2A7CE5AD007EA0C1 /* NotificationStrings.swift in Sources */, 79E4342A2AA5833F00AEB16C /* CustomPicker.swift in Sources */, 79CECC1B2A89F83800B95D8B /* AdditionalPhotoController.swift in Sources */, @@ -1158,7 +1170,7 @@ CODE_SIGN_IDENTITY = "iPhone Distribution"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: SINO ASSISTANCE INDUSTRIAL CO., LTD. (X9WF5T89LV)"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 4; + CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = X9WF5T89LV; FRAMEWORK_SEARCH_PATHS = ( @@ -1187,7 +1199,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 4.0.3; + MARKETING_VERSION = 4.0.4; PRODUCT_BUNDLE_IDENTIFIER = com.sino.supplier; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -1373,7 +1385,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 4; + CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = X9WF5T89LV; @@ -1404,7 +1416,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 4.0.3; + MARKETING_VERSION = 4.0.4; PRODUCT_BUNDLE_IDENTIFIER = com.sino.supplier; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -1432,7 +1444,7 @@ CODE_SIGN_ENTITLEMENTS = OrderScheduling/OrderSchedulingRelease.entitlements; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: SINO ASSISTANCE INDUSTRIAL CO., LTD. (X9WF5T89LV)"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 4; + CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = X9WF5T89LV; FRAMEWORK_SEARCH_PATHS = ( @@ -1461,7 +1473,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 4.0.3; + MARKETING_VERSION = 4.0.4; PRODUCT_BUNDLE_IDENTIFIER = com.sino.supplier; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; diff --git a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate index 38e8ced..c914a0b 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 30056db..0aa5ba9 100644 --- a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -222,8 +222,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1050" - endingLineNumber = "1050" + startingLineNumber = "1051" + endingLineNumber = "1051" landmarkName = "collectionView(_:cellForItemAt:)" landmarkType = "7"> @@ -462,8 +462,8 @@ filePath = "OrderScheduling/Common/WebView/WebViewTool.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "57" - endingLineNumber = "57" + startingLineNumber = "58" + endingLineNumber = "58" landmarkName = "init()" landmarkType = "7"> @@ -814,8 +814,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "266" - endingLineNumber = "266" + startingLineNumber = "267" + endingLineNumber = "267" landmarkName = "entry(model:remarkId:)" landmarkType = "7"> @@ -1326,8 +1326,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1061" - endingLineNumber = "1061" + startingLineNumber = "1062" + endingLineNumber = "1062" landmarkName = "collectionView(_:didSelectItemAt:)" landmarkType = "7"> @@ -1374,8 +1374,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "341" - endingLineNumber = "341" + startingLineNumber = "342" + endingLineNumber = "342" landmarkName = "addActions()" landmarkType = "7"> @@ -1390,8 +1390,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "330" - endingLineNumber = "330" + startingLineNumber = "331" + endingLineNumber = "331" landmarkName = "addActions()" landmarkType = "7"> @@ -1406,8 +1406,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "332" - endingLineNumber = "332" + startingLineNumber = "333" + endingLineNumber = "333" landmarkName = "addActions()" landmarkType = "7"> @@ -2254,8 +2254,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "997" - endingLineNumber = "997" + startingLineNumber = "998" + endingLineNumber = "998" landmarkName = "tableView(_:cellForRowAt:)" landmarkType = "7"> @@ -2270,8 +2270,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1002" - endingLineNumber = "1002" + startingLineNumber = "1003" + endingLineNumber = "1003" landmarkName = "tableView(_:cellForRowAt:)" landmarkType = "7"> @@ -2574,8 +2574,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "230" - endingLineNumber = "230" + startingLineNumber = "231" + endingLineNumber = "231" landmarkName = "addActions()" landmarkType = "7"> @@ -2622,8 +2622,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "375" - endingLineNumber = "375" + startingLineNumber = "376" + endingLineNumber = "376" landmarkName = "addActions()" landmarkType = "7"> @@ -2638,8 +2638,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "385" - endingLineNumber = "385" + startingLineNumber = "386" + endingLineNumber = "386" landmarkName = "addActions()" landmarkType = "7"> @@ -2654,8 +2654,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "309" - endingLineNumber = "309" + startingLineNumber = "310" + endingLineNumber = "310" landmarkName = "addActions()" landmarkType = "7"> @@ -2910,8 +2910,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "2030" - endingLineNumber = "2030" + startingLineNumber = "2031" + endingLineNumber = "2031" landmarkName = "init(style:reuseIdentifier:)" landmarkType = "7"> @@ -2926,8 +2926,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "2037" - endingLineNumber = "2037" + startingLineNumber = "2038" + endingLineNumber = "2038" landmarkName = "init(style:reuseIdentifier:)" landmarkType = "7"> @@ -2942,8 +2942,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "676" - endingLineNumber = "676" + startingLineNumber = "677" + endingLineNumber = "677" landmarkName = "tableView(_:cellForRowAt:)" landmarkType = "7"> @@ -2974,8 +2974,8 @@ filePath = "OrderScheduling/Common/WebView/WebViewTool.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "60" - endingLineNumber = "60" + startingLineNumber = "61" + endingLineNumber = "61" landmarkName = "init()" landmarkType = "7"> @@ -3022,8 +3022,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "989" - endingLineNumber = "989" + startingLineNumber = "990" + endingLineNumber = "990" landmarkName = "tableView(_:cellForRowAt:)" landmarkType = "7"> @@ -3854,8 +3854,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "361" - endingLineNumber = "361" + startingLineNumber = "362" + endingLineNumber = "362" landmarkName = "addActions()" landmarkType = "7"> @@ -3870,8 +3870,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1105" - endingLineNumber = "1105" + startingLineNumber = "1106" + endingLineNumber = "1106" landmarkName = "addSubviews()" landmarkType = "7"> @@ -3886,8 +3886,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1134" - endingLineNumber = "1134" + startingLineNumber = "1135" + endingLineNumber = "1135" landmarkName = "addSubviews()" landmarkType = "7"> @@ -3902,8 +3902,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1187" - endingLineNumber = "1187" + startingLineNumber = "1188" + endingLineNumber = "1188" landmarkName = "viewDidLoad()" landmarkType = "7"> @@ -3918,8 +3918,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1227" - endingLineNumber = "1227" + startingLineNumber = "1228" + endingLineNumber = "1228" landmarkName = "viewDidLoad()" landmarkType = "7"> @@ -3934,8 +3934,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1265" - endingLineNumber = "1265" + startingLineNumber = "1266" + endingLineNumber = "1266" landmarkName = "viewDidLoad()" landmarkType = "7"> @@ -3966,8 +3966,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1248" - endingLineNumber = "1248" + startingLineNumber = "1249" + endingLineNumber = "1249" landmarkName = "RescuePendingDispatchController" landmarkType = "3"> @@ -3998,8 +3998,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "491" - endingLineNumber = "491" + startingLineNumber = "492" + endingLineNumber = "492" landmarkName = "listContainerView(_:initListFor:)" landmarkType = "7"> @@ -4014,8 +4014,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "488" - endingLineNumber = "488" + startingLineNumber = "489" + endingLineNumber = "489" landmarkName = "listContainerView(_:initListFor:)" landmarkType = "7"> @@ -4030,8 +4030,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "477" - endingLineNumber = "477" + startingLineNumber = "478" + endingLineNumber = "478" landmarkName = "listContainerView(_:initListFor:)" landmarkType = "7"> @@ -4564,5 +4564,69 @@ landmarkType = "7"> + + + + + + + + + + + + + + + + diff --git a/OrderScheduling/.DS_Store b/OrderScheduling/.DS_Store index e22457d..11fc25c 100644 Binary files a/OrderScheduling/.DS_Store and b/OrderScheduling/.DS_Store differ diff --git a/OrderScheduling/Common/WebView/WebViewTool.swift b/OrderScheduling/Common/WebView/WebViewTool.swift index ae6238f..cdd8d3c 100644 --- a/OrderScheduling/Common/WebView/WebViewTool.swift +++ b/OrderScheduling/Common/WebView/WebViewTool.swift @@ -34,6 +34,7 @@ open class WebViewTool : NSObject { case trainDocment = "培训文档" case docmentDetail = "详情" case docmentList = "文档资料" + case newTrainingList = "新人培训" } public override init() { @@ -119,6 +120,10 @@ open class WebViewTool : NSObject { case .docmentList: vc = WebViewController(showNavBar:false, title: WebViewNameEnum.docmentList.rawValue, url: "\((h5Models?.docmentList)!)?token=\((USER.token)!)"+(appending ?? "")) break + + case .newTrainingList: + vc = WebViewController(showNavBar:false, title: WebViewNameEnum.newTrainingList.rawValue, url: "\((h5Models?.newTrainingList)!)?token=\((USER.token)!)"+(appending ?? "")) + break } if let vc { diff --git a/OrderScheduling/HttpRequestCenter/ApiList.swift b/OrderScheduling/HttpRequestCenter/ApiList.swift index 57292c6..1ab4ec4 100644 --- a/OrderScheduling/HttpRequestCenter/ApiList.swift +++ b/OrderScheduling/HttpRequestCenter/ApiList.swift @@ -59,4 +59,6 @@ open class ApiList { public let userOperationPermissions = "/supplierAppV2/dispatchApp/user/userOperationPermissions" public let vehicleLogout = "/supplierAppV2/dispatchApp/order/vehicleLogout" + + public let jumpNewTrain = "/supplierAppV2/dispatchApp/user/jumpNewTrain" } diff --git a/OrderScheduling/HttpRequestCenter/RequestList.swift b/OrderScheduling/HttpRequestCenter/RequestList.swift index b8beef3..e333d2c 100644 --- a/OrderScheduling/HttpRequestCenter/RequestList.swift +++ b/OrderScheduling/HttpRequestCenter/RequestList.swift @@ -124,4 +124,8 @@ open class RequestList { func vehicleLogout(parameters:P) -> Single?> { return DDAF.post(urlString: HOST+API.vehicleLogout,parameters: parameters,encoding: JSONParameterEncoder.default,headers: [tokenHeader()],responseType: ResponseModel.self) } + + func jumpNewTrain() -> Single?> { + return DDAF.post(urlString: HOST+API.jumpNewTrain,encoding: JSONParameterEncoder.default,headers: [tokenHeader()],responseType: ResponseModel.self) + } } diff --git a/OrderScheduling/HttpResponseModel/ResponseModel.swift b/OrderScheduling/HttpResponseModel/ResponseModel.swift index e4e1b6a..0ed6d23 100644 --- a/OrderScheduling/HttpResponseModel/ResponseModel.swift +++ b/OrderScheduling/HttpResponseModel/ResponseModel.swift @@ -282,6 +282,7 @@ public class DispatchAppH5UrlDataModel : Decodable { var workOrderDetail : String var trainDocment : String var docmentList : String + var newTrainingList : String } public class VersionCheckDataModel : Decodable { diff --git a/OrderScheduling/NewTraining/NewTraining.swift b/OrderScheduling/NewTraining/NewTraining.swift new file mode 100644 index 0000000..c44afbd --- /dev/null +++ b/OrderScheduling/NewTraining/NewTraining.swift @@ -0,0 +1,38 @@ +// +// NewTraining.swift +// OrderScheduling +// +// Created by 中道 on 2024/5/9. +// + +import Foundation +import RxSwift +import RxRelay + +class NewTraining : NSObject { + static let `default` = NewTraining() + + var newTrainingRelay = ReplayRelay.create(bufferSize: 1) + + var disposeBag = DisposeBag() + + override init() { + super.init() + + newTrainingRelay + .flatMapLatest({ _ in + return RQ.jumpNewTrain() + }) + .observe(on: MainScheduler.instance) + .subscribe(onNext: { response in + if response?.success == true { + if response?.data == true { + WEBTOOL.open(name: .newTrainingList, appending: nil) + } + }else{ + UIApplication.shared.dd_keyWindow.rootViewController?.view.dd_makeToast(response?.msg) + } + }) + .disposed(by: disposeBag) + } +} diff --git a/OrderScheduling/Rescue/ViewController/RescueController.swift b/OrderScheduling/Rescue/ViewController/RescueController.swift index e48df27..87c0d18 100644 --- a/OrderScheduling/Rescue/ViewController/RescueController.swift +++ b/OrderScheduling/Rescue/ViewController/RescueController.swift @@ -221,6 +221,7 @@ 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) diff --git a/fastlane/report.xml b/fastlane/report.xml index d32e89b..e4dd3c6 100644 --- a/fastlane/report.xml +++ b/fastlane/report.xml @@ -5,12 +5,17 @@ - + - + + + + + +