diff --git a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate index 8a4ebf8..97f7e07 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 52cf8a4..3bc4e2c 100644 --- a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -46,8 +46,8 @@ filePath = "OrderScheduling/Login/ViewController/LoginController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "219" - endingLineNumber = "219" + startingLineNumber = "221" + endingLineNumber = "221" landmarkName = "textView(_:shouldInteractWith:in:interaction:)" landmarkType = "7"> @@ -62,8 +62,8 @@ filePath = "OrderScheduling/Login/ViewController/LoginController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "223" - endingLineNumber = "223" + startingLineNumber = "225" + endingLineNumber = "225" landmarkName = "textView(_:shouldInteractWith:in:interaction:)" landmarkType = "7"> @@ -159,8 +159,8 @@ endingColumnNumber = "9223372036854775807" startingLineNumber = "159" endingLineNumber = "159" - landmarkName = "Initial" - landmarkType = "21"> + landmarkName = "networkErrorHandler(response:)" + landmarkType = "7"> + landmarkName = "Initial" + landmarkType = "21"> @@ -554,8 +554,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "374" - endingLineNumber = "374" + startingLineNumber = "379" + endingLineNumber = "379" landmarkName = "dd_mapView(_:viewFor:)" landmarkType = "7"> @@ -570,8 +570,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "352" - endingLineNumber = "352" + startingLineNumber = "357" + endingLineNumber = "357" landmarkName = "dd_mapView(_:viewFor:)" landmarkType = "7"> @@ -586,8 +586,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "354" - endingLineNumber = "354" + startingLineNumber = "359" + endingLineNumber = "359" landmarkName = "dd_mapView(_:viewFor:)" landmarkType = "7"> @@ -602,8 +602,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "380" - endingLineNumber = "380" + startingLineNumber = "385" + endingLineNumber = "385" landmarkName = "dd_mapView(_:viewFor:)" landmarkType = "7"> @@ -618,42 +618,10 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "379" - endingLineNumber = "379" + startingLineNumber = "384" + endingLineNumber = "384" landmarkName = "dd_mapView(_:viewFor:)" landmarkType = "7"> - - - - - - @@ -874,8 +842,8 @@ filePath = "OrderScheduling/Common/View/AppUpdateTool.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "41" - endingLineNumber = "41" + startingLineNumber = "42" + endingLineNumber = "42" landmarkName = "init()" landmarkType = "7"> @@ -890,8 +858,8 @@ filePath = "OrderScheduling/Common/View/AppUpdateTool.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "111" - endingLineNumber = "111" + startingLineNumber = "113" + endingLineNumber = "113" landmarkName = "shouldPresentEntry()" landmarkType = "7"> @@ -906,8 +874,8 @@ filePath = "OrderScheduling/Common/View/AppUpdateTool.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "113" - endingLineNumber = "113" + startingLineNumber = "115" + endingLineNumber = "115" landmarkName = "shouldPresentEntry()" landmarkType = "7"> @@ -938,8 +906,8 @@ filePath = "OrderScheduling/Common/View/AppUpdateTool.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "104" - endingLineNumber = "104" + startingLineNumber = "106" + endingLineNumber = "106" landmarkName = "canUpdate(localVersion:onlineVersion:)" landmarkType = "7"> @@ -986,8 +954,8 @@ filePath = "OrderScheduling/Login/ViewController/LoginController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "177" - endingLineNumber = "177" + startingLineNumber = "178" + endingLineNumber = "178" landmarkName = "addActions()" landmarkType = "7"> @@ -1189,8 +1157,8 @@ filePath = "OrderScheduling/Login/ViewController/LoginController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "181" - endingLineNumber = "181" + startingLineNumber = "182" + endingLineNumber = "182" landmarkName = "addActions()" landmarkType = "7"> @@ -1205,8 +1173,8 @@ filePath = "OrderScheduling/Login/ViewController/LoginController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "185" - endingLineNumber = "185" + startingLineNumber = "186" + endingLineNumber = "186" landmarkName = "addActions()" landmarkType = "7"> @@ -1221,8 +1189,8 @@ filePath = "OrderScheduling/Login/ViewController/LoginController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "188" - endingLineNumber = "188" + startingLineNumber = "190" + endingLineNumber = "190" landmarkName = "addActions()" landmarkType = "7"> @@ -1237,8 +1205,8 @@ filePath = "OrderScheduling/Login/ViewController/LoginController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "201" - endingLineNumber = "201" + startingLineNumber = "203" + endingLineNumber = "203" landmarkName = "addActions()" landmarkType = "7"> @@ -1253,8 +1221,8 @@ filePath = "OrderScheduling/Login/ViewController/LoginController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "189" - endingLineNumber = "189" + startingLineNumber = "191" + endingLineNumber = "191" landmarkName = "addActions()" landmarkType = "7"> @@ -1317,8 +1285,8 @@ filePath = "OrderScheduling/Login/ViewController/LoginController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "190" - endingLineNumber = "190" + startingLineNumber = "192" + endingLineNumber = "192" landmarkName = "addActions()" landmarkType = "7"> @@ -1333,8 +1301,8 @@ filePath = "OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "282" - endingLineNumber = "282" + startingLineNumber = "285" + endingLineNumber = "285" landmarkName = "reloadData()" landmarkType = "7"> @@ -1349,8 +1317,8 @@ filePath = "OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "54" - endingLineNumber = "54" + startingLineNumber = "56" + endingLineNumber = "56" landmarkName = "addActions()" landmarkType = "7"> @@ -1397,8 +1365,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "242" - endingLineNumber = "242" + startingLineNumber = "247" + endingLineNumber = "247" landmarkName = "entry(model:remarkId:)" landmarkType = "7"> @@ -1999,8 +1967,8 @@ endingColumnNumber = "9223372036854775807" startingLineNumber = "151" endingLineNumber = "151" - landmarkName = "unknown" - landmarkType = "0"> + landmarkName = "Initial" + landmarkType = "3"> @@ -2109,8 +2077,8 @@ filePath = "OrderScheduling/Common/View/AppUpdateTool.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "117" - endingLineNumber = "117" + startingLineNumber = "119" + endingLineNumber = "119" landmarkName = "openAppStore(by:)" landmarkType = "7"> @@ -2125,8 +2093,8 @@ filePath = "OrderScheduling/Common/View/AppUpdateTool.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "78" - endingLineNumber = "78" + startingLineNumber = "80" + endingLineNumber = "80" landmarkName = "init()" landmarkType = "7"> @@ -2173,8 +2141,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "646" - endingLineNumber = "646" + startingLineNumber = "651" + endingLineNumber = "651" landmarkName = "viewDidAppear(_:)" landmarkType = "7"> @@ -2189,8 +2157,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "599" - endingLineNumber = "599" + startingLineNumber = "604" + endingLineNumber = "604" landmarkName = "viewDidLoad()" landmarkType = "7"> @@ -2221,8 +2189,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1032" - endingLineNumber = "1032" + startingLineNumber = "1037" + endingLineNumber = "1037" landmarkName = "collectionView(_:didSelectItemAt:)" landmarkType = "7"> @@ -2269,8 +2237,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "317" - endingLineNumber = "317" + startingLineNumber = "322" + endingLineNumber = "322" landmarkName = "addActions()" landmarkType = "7"> @@ -2285,8 +2253,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "306" - endingLineNumber = "306" + startingLineNumber = "311" + endingLineNumber = "311" landmarkName = "addActions()" landmarkType = "7"> @@ -2301,8 +2269,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "308" - endingLineNumber = "308" + startingLineNumber = "313" + endingLineNumber = "313" landmarkName = "addActions()" landmarkType = "7"> @@ -2460,8 +2428,8 @@ filePath = "OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "121" - endingLineNumber = "121" + startingLineNumber = "124" + endingLineNumber = "124" landmarkName = "addActions()" landmarkType = "7"> @@ -2476,8 +2444,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "75" - endingLineNumber = "75" + startingLineNumber = "78" + endingLineNumber = "78" landmarkName = "addActions()" landmarkType = "7"> @@ -2492,8 +2460,8 @@ filePath = "OrderScheduling/History/ViewController/HistoryController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "71" - endingLineNumber = "71" + startingLineNumber = "74" + endingLineNumber = "74" landmarkName = "addActions()" landmarkType = "7"> @@ -2508,8 +2476,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "231" - endingLineNumber = "231" + startingLineNumber = "236" + endingLineNumber = "236" landmarkName = "addAction()" landmarkType = "7"> @@ -2556,8 +2524,8 @@ filePath = "OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "281" - endingLineNumber = "281" + startingLineNumber = "284" + endingLineNumber = "284" landmarkName = "reloadData()" landmarkType = "7"> @@ -2572,8 +2540,8 @@ filePath = "OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "280" - endingLineNumber = "280" + startingLineNumber = "283" + endingLineNumber = "283" landmarkName = "reloadData()" landmarkType = "7"> @@ -2588,8 +2556,8 @@ filePath = "OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "228" - endingLineNumber = "228" + startingLineNumber = "231" + endingLineNumber = "231" landmarkName = "viewDidLoad()" landmarkType = "7"> @@ -2604,8 +2572,8 @@ filePath = "OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "222" - endingLineNumber = "222" + startingLineNumber = "225" + endingLineNumber = "225" landmarkName = "viewDidLoad()" landmarkType = "7"> @@ -2620,8 +2588,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "400" - endingLineNumber = "400" + startingLineNumber = "405" + endingLineNumber = "405" landmarkName = "dd_mapView(_:viewFor:)" landmarkType = "7"> @@ -2668,8 +2636,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "243" - endingLineNumber = "243" + startingLineNumber = "248" + endingLineNumber = "248" landmarkName = "dd_mapView(_:viewFor:)" landmarkType = "7"> @@ -2716,8 +2684,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "569" - endingLineNumber = "569" + startingLineNumber = "574" + endingLineNumber = "574" landmarkName = "reloadData(index:)" landmarkType = "7"> @@ -2732,8 +2700,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "567" - endingLineNumber = "567" + startingLineNumber = "572" + endingLineNumber = "572" landmarkName = "reloadData(index:)" landmarkType = "7"> @@ -2748,8 +2716,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "570" - endingLineNumber = "570" + startingLineNumber = "575" + endingLineNumber = "575" landmarkName = "reloadData(index:)" landmarkType = "7"> @@ -3115,8 +3083,8 @@ filePath = "OrderScheduling/Common/View/MessageCount.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "50" - endingLineNumber = "50" + startingLineNumber = "51" + endingLineNumber = "51" landmarkName = "init()" landmarkType = "7"> @@ -3163,8 +3131,8 @@ filePath = "OrderScheduling/Common/View/MessageCount.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "60" - endingLineNumber = "60" + startingLineNumber = "61" + endingLineNumber = "61" landmarkName = "newestMessage()" landmarkType = "7"> @@ -3179,8 +3147,8 @@ filePath = "OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "206" - endingLineNumber = "206" + startingLineNumber = "209" + endingLineNumber = "209" landmarkName = "init(nibName:bundle:)" landmarkType = "7"> @@ -3611,8 +3579,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "921" - endingLineNumber = "921" + startingLineNumber = "926" + endingLineNumber = "926" landmarkName = "tableView(_:cellForRowAt:)" landmarkType = "7"> @@ -3659,8 +3627,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "935" - endingLineNumber = "935" + startingLineNumber = "940" + endingLineNumber = "940" landmarkName = "tableView(_:cellForRowAt:)" landmarkType = "7"> @@ -3707,8 +3675,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "940" - endingLineNumber = "940" + startingLineNumber = "945" + endingLineNumber = "945" landmarkName = "tableView(_:cellForRowAt:)" landmarkType = "7"> @@ -3995,8 +3963,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "416" - endingLineNumber = "416" + startingLineNumber = "421" + endingLineNumber = "421" landmarkName = "dd_mapView(_:didAnnotationViewTapped:)" landmarkType = "7"> @@ -4011,8 +3979,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "129" - endingLineNumber = "129" + startingLineNumber = "131" + endingLineNumber = "131" landmarkName = "addAction()" landmarkType = "7"> @@ -4075,8 +4043,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "199" - endingLineNumber = "199" + startingLineNumber = "204" + endingLineNumber = "204" landmarkName = "addActions()" landmarkType = "7"> @@ -4091,8 +4059,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "206" - endingLineNumber = "206" + startingLineNumber = "211" + endingLineNumber = "211" landmarkName = "addActions()" landmarkType = "7"> @@ -4107,8 +4075,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "87" - endingLineNumber = "87" + startingLineNumber = "90" + endingLineNumber = "90" landmarkName = "addActions()" landmarkType = "7"> @@ -4123,8 +4091,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "86" - endingLineNumber = "86" + startingLineNumber = "89" + endingLineNumber = "89" landmarkName = "addActions()" landmarkType = "7"> @@ -4139,8 +4107,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "344" - endingLineNumber = "344" + startingLineNumber = "349" + endingLineNumber = "349" landmarkName = "addActions()" landmarkType = "7"> @@ -4155,8 +4123,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "354" - endingLineNumber = "354" + startingLineNumber = "359" + endingLineNumber = "359" landmarkName = "addActions()" landmarkType = "7"> @@ -4171,8 +4139,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "285" - endingLineNumber = "285" + startingLineNumber = "290" + endingLineNumber = "290" landmarkName = "addActions()" landmarkType = "7"> @@ -4187,8 +4155,8 @@ filePath = "OrderScheduling/History/ViewController/HistoryController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "120" - endingLineNumber = "120" + startingLineNumber = "123" + endingLineNumber = "123" landmarkName = "addActions()" landmarkType = "7"> @@ -4455,8 +4423,8 @@ filePath = "OrderScheduling/Login/ViewController/LoginController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "172" - endingLineNumber = "172" + startingLineNumber = "173" + endingLineNumber = "173" landmarkName = "addActions()" landmarkType = "7"> @@ -4471,8 +4439,8 @@ filePath = "OrderScheduling/Login/ViewController/LoginController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "173" - endingLineNumber = "173" + startingLineNumber = "174" + endingLineNumber = "174" landmarkName = "addActions()" landmarkType = "7"> @@ -4519,8 +4487,8 @@ filePath = "OrderScheduling/Login/ViewController/LoginController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "174" - endingLineNumber = "174" + startingLineNumber = "175" + endingLineNumber = "175" landmarkName = "addActions()" landmarkType = "7"> @@ -4679,8 +4647,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1963" - endingLineNumber = "1963" + startingLineNumber = "1968" + endingLineNumber = "1968" landmarkName = "init(style:reuseIdentifier:)" landmarkType = "7"> @@ -4727,8 +4695,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1970" - endingLineNumber = "1970" + startingLineNumber = "1975" + endingLineNumber = "1975" landmarkName = "init(style:reuseIdentifier:)" landmarkType = "7"> @@ -4775,8 +4743,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "630" - endingLineNumber = "630" + startingLineNumber = "635" + endingLineNumber = "635" landmarkName = "tableView(_:cellForRowAt:)" landmarkType = "7"> @@ -4791,8 +4759,8 @@ filePath = "OrderScheduling/Login/ViewController/LoginController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "217" - endingLineNumber = "217" + startingLineNumber = "219" + endingLineNumber = "219" landmarkName = "textView(_:shouldInteractWith:in:interaction:)" landmarkType = "7"> @@ -4813,5 +4781,37 @@ landmarkType = "7"> + + + + + + + + diff --git a/OrderScheduling/Common/View/AppUpdateTool.swift b/OrderScheduling/Common/View/AppUpdateTool.swift index f159c16..f3d374b 100644 --- a/OrderScheduling/Common/View/AppUpdateTool.swift +++ b/OrderScheduling/Common/View/AppUpdateTool.swift @@ -37,12 +37,14 @@ open class AppUpdateTool : NSObject { super.init() appUpdateView.updateButton.rx.tap + .observe(on: MainScheduler.instance) .subscribe(onNext: {[weak self] _ in self?.openAppStore(by: UIApplication.shared.dd_keyWindow.rootViewController) }) .disposed(by: disposeBag) appUpdateView.ignoreButton.rx.tap + .observe(on: MainScheduler.instance) .subscribe(onNext: {[weak self] _ in ENTRY.dismiss(name: appUpdateEntry) {[weak self] in self?.setIgnoreFlag(ignoreFlag: true) diff --git a/OrderScheduling/Common/View/MessageCount.swift b/OrderScheduling/Common/View/MessageCount.swift index 7b6373f..9ad7ed8 100644 --- a/OrderScheduling/Common/View/MessageCount.swift +++ b/OrderScheduling/Common/View/MessageCount.swift @@ -46,6 +46,7 @@ open class MessageCount : NSObject { .flatMapLatest { (_,_) in return RQ.orderList(parameters: OrderListParameters(pageNum: 1, queryType: .TO_AUDIT_FAILED)) } + .observe(on: MainScheduler.instance) .subscribe(onNext: {[weak self] response in if response?.success == true,let total = response?.total { self?.reviewFailedCountRelay.accept(total) diff --git a/OrderScheduling/Common/View/NotificationAuthTool.swift b/OrderScheduling/Common/View/NotificationAuthTool.swift index b140094..5efa651 100644 --- a/OrderScheduling/Common/View/NotificationAuthTool.swift +++ b/OrderScheduling/Common/View/NotificationAuthTool.swift @@ -26,6 +26,7 @@ open class NotificationAuthTool : NSObject { notificationAuthView.contentLabel.text = "当前应用未开启通知，建议开启" requestNotiAuthRelay + .observe(on: MainScheduler.instance) .subscribe(onNext: {[weak self] _ in if let notificationAuthView = self?.notificationAuthView { ENTRY.showNotificationAuthEntry(view: notificationAuthView,name: notificationAuthViewEntry) @@ -34,18 +35,21 @@ open class NotificationAuthTool : NSObject { .disposed(by: disposeBag) cancelNotiAuthRelay + .observe(on: MainScheduler.instance) .subscribe(onNext: { _ in ENTRY.dismiss(name: notificationAuthViewEntry) }) .disposed(by: disposeBag) notificationAuthView.sureButton.rx.tap + .observe(on: MainScheduler.instance) .subscribe(onNext: {[weak self] _ in self?.openSetting() }) .disposed(by: disposeBag) notificationAuthView.cancelButton.rx.tap + .observe(on: MainScheduler.instance) .subscribe(onNext: { _ in ENTRY.dismiss(name: notificationAuthViewEntry) }) diff --git a/OrderScheduling/History/ViewController/HistoryController.swift b/OrderScheduling/History/ViewController/HistoryController.swift index 7135979..63fb9f4 100644 --- a/OrderScheduling/History/ViewController/HistoryController.swift +++ b/OrderScheduling/History/ViewController/HistoryController.swift @@ -18,6 +18,7 @@ import MJRefresh extension HistoryController { func addActions() { MCOUNT.messageCountRelay + .observe(on: MainScheduler.instance) .subscribe(onNext: {[weak self] count in if count > 0 { self?.messageView.countLabel.isHidden = false @@ -35,6 +36,7 @@ extension HistoryController { .disposed(by: disposeBag) MCOUNT.pendingCountRelay + .observe(on: MainScheduler.instance) .subscribe(onNext: {[weak self] count in if count > 0 { self?.pendingView.countLabel.isHidden = false @@ -52,6 +54,7 @@ extension HistoryController { .disposed(by: disposeBag) messageTapGes.rx.event + .observe(on: MainScheduler.instance) .subscribe(onNext: {[weak self] _ in MESSAGETOOL.openMessageCenter(by: self?.navigationController) }) diff --git a/OrderScheduling/Login/ViewController/LoginController.swift b/OrderScheduling/Login/ViewController/LoginController.swift index dfbd1ef..2d54d9e 100644 --- a/OrderScheduling/Login/ViewController/LoginController.swift +++ b/OrderScheduling/Login/ViewController/LoginController.swift @@ -152,6 +152,7 @@ extension LoginController { .do(onNext: {[weak self] _ in self?.view.dd_showHUD() }) + .observe(on: MainScheduler.instance) .map({[weak self] _ in let username = self?.loginView.phoneView.textfield.text ?? "" let clientType = "rescueApp" @@ -183,6 +184,7 @@ extension LoginController { .do(onNext: {[weak self] _ in self?.view.dd_hideHUD() }) + .observe(on: MainScheduler.instance) .subscribe(onNext: {[weak self] responseModel in if responseModel?.success == true { if let token = responseModel?.data?.accessToken.tokenValue { diff --git a/OrderScheduling/Rescue/View/AcceptOrderTool.swift b/OrderScheduling/Rescue/View/AcceptOrderTool.swift index 0d36d13..b965d9c 100644 --- a/OrderScheduling/Rescue/View/AcceptOrderTool.swift +++ b/OrderScheduling/Rescue/View/AcceptOrderTool.swift @@ -21,20 +21,25 @@ open class AcceptOrderTool : NSObject { acceptOrderView.contentLabel.text = TOOL.getOrderString(userInfo: userInfo) acceptOrderView.readButton.setTitle("查看", for: .normal) acceptOrderView.readButton.rx.tap + .observe(on: MainScheduler.instance) .subscribe(onNext: { ENTRY.dismiss(name: acceptOrderViewEntry) { - // 停止声音播放 - TOOL.stopVoice() - // 来到首页的救援中-待接单 - 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) + DispatchQueue.main.async { + // 停止声音播放 + TOOL.stopVoice() + // 来到首页的救援中-待接单 + 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) + }) + .disposed(by: disposeBag) + ENTRY.showAcceptOrderEntry(view: acceptOrderView,name: acceptOrderViewEntry) } } diff --git a/OrderScheduling/Rescue/View/PushNotiCommonTool.swift b/OrderScheduling/Rescue/View/PushNotiCommonTool.swift index 49caacf..47046f3 100644 --- a/OrderScheduling/Rescue/View/PushNotiCommonTool.swift +++ b/OrderScheduling/Rescue/View/PushNotiCommonTool.swift @@ -33,20 +33,25 @@ open class PushNotiCommonTool : NSObject { } commonView.cancelButton.rx.tap + .observe(on: MainScheduler.instance) .subscribe(onNext: { ENTRY.dismiss(name: pushNotiCommonViewEntry) { // 停止声音播放 TOOL.stopVoice() } - }).disposed(by: disposeBag) + }) + .disposed(by: disposeBag) commonView.sureButton.rx.tap + .observe(on: MainScheduler.instance) .subscribe(onNext: { ENTRY.dismiss(name: pushNotiCommonViewEntry) { // 停止声音播放 TOOL.stopVoice() } - }).disposed(by: disposeBag) + }) + .disposed(by: disposeBag) + ENTRY.showPushNotiCommonEntry(view: commonView,name: pushNotiCommonViewEntry) } } diff --git a/OrderScheduling/Rescue/View/RefuseOrderEntryView.swift b/OrderScheduling/Rescue/View/RefuseOrderEntryView.swift index ed6a061..9afbc6c 100644 --- a/OrderScheduling/Rescue/View/RefuseOrderEntryView.swift +++ b/OrderScheduling/Rescue/View/RefuseOrderEntryView.swift @@ -18,6 +18,7 @@ extension RefuseOrderEntryView : UITextViewDelegate{ cannotDispatchTextViewView.isHidden = true timeView.selectButton.rx.tap + .observe(on: MainScheduler.instance) .subscribe(onNext: {[weak self] _ in self?.timeView.selectButton.isSelected = true self?.timeTextFieldView.isHidden = false @@ -29,16 +30,20 @@ extension RefuseOrderEntryView : UITextViewDelegate{ .disposed(by: disposeBag) timeTextFieldView.actionButton.rx.tap + .observe(on: MainScheduler.instance) .subscribe(onNext: {[weak self] _ in CP.showItems(items: ["60到90","90到120","120以上"],selectedItem: self?.timeTextFieldView.textFiled.text) {[weak self] result in if let result { - self?.timeTextFieldView.textFiled.text = result.value + DispatchQueue.main.async { + self?.timeTextFieldView.textFiled.text = result.value + } } } }) .disposed(by: disposeBag) distanceView.selectButton.rx.tap + .observe(on: MainScheduler.instance) .subscribe(onNext: {[weak self] _ in self?.distanceView.selectButton.isSelected = true self?.distanceTextFieldView.isHidden = false @@ -50,6 +55,7 @@ extension RefuseOrderEntryView : UITextViewDelegate{ .disposed(by: disposeBag) cannotDispatchView.selectButton.rx.tap + .observe(on: MainScheduler.instance) .subscribe(onNext: {[weak self] _ in self?.cannotDispatchView.selectButton.isSelected = true self?.cannotDispatchTextViewView.isHidden = false diff --git a/OrderScheduling/Rescue/ViewController/RescueController.swift b/OrderScheduling/Rescue/ViewController/RescueController.swift index 5a62293..ff15ada 100644 --- a/OrderScheduling/Rescue/ViewController/RescueController.swift +++ b/OrderScheduling/Rescue/ViewController/RescueController.swift @@ -22,6 +22,7 @@ import DDUtilsSwiftKit_Private extension RescueController { func addActions() { MCOUNT.messageCountRelay + .observe(on: MainScheduler.instance) .subscribe(onNext: {[weak self] count in if count > 0 { self?.messageView.countLabel.isHidden = false @@ -39,6 +40,7 @@ extension RescueController { .disposed(by: disposeBag) MCOUNT.pendingCountRelay + .observe(on: MainScheduler.instance) .subscribe(onNext: {[weak self] count in if count > 0 { self?.pendingView.countLabel.isHidden = false @@ -56,6 +58,7 @@ extension RescueController { .disposed(by: disposeBag) messageTapGes.rx.event + .observe(on: MainScheduler.instance) .subscribe(onNext: {[weak self] _ in MESSAGETOOL.openMessageCenter(by: self?.navigationController) }) @@ -134,12 +137,14 @@ extension RescuePendingOrderController { .disposed(by: disposeBag) refuseOrderConfirmView.cancelButton.rx.tap + .observe(on: MainScheduler.instance) .subscribe(onNext: { _ in ENTRY.dismiss(name: refuseOrderConfirmEntry) }) .disposed(by: disposeBag) refuseOrderConfirmView.sureButton.rx.tap + .observe(on: MainScheduler.instance) .subscribe(onNext: {[weak self] _ in ENTRY.dismiss(name: refuseOrderConfirmEntry) {[weak self] in if let model = self?.refuseOrderModel { diff --git a/OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift b/OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift index 458f673..af5a604 100644 --- a/OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift +++ b/OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift @@ -18,6 +18,7 @@ import ESTabBarController_swift extension ReviewFailedController { func addActions() { MCOUNT.messageCountRelay + .observe(on: MainScheduler.instance) .subscribe(onNext: {[weak self] count in if count > 0 { self?.messageView.countLabel.isHidden = false @@ -35,6 +36,7 @@ extension ReviewFailedController { .disposed(by: disposeBag) MCOUNT.pendingCountRelay + .observe(on: MainScheduler.instance) .subscribe(onNext: {[weak self] count in if count > 0 { self?.pendingView.countLabel.isHidden = false @@ -103,6 +105,7 @@ extension ReviewFailedController { .disposed(by: disposeBag) messageTapGes.rx.event + .observe(on: MainScheduler.instance) .subscribe(onNext: {[weak self] _ in MESSAGETOOL.openMessageCenter(by: self?.navigationController) }) diff --git a/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift b/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift index c69c2ba..c802d88 100644 --- a/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift +++ b/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift @@ -27,6 +27,7 @@ fileprivate let vehicleMonitoringPointAnnotationNameAtLeastH = auto(30) extension VehicleMonitoringController { func addAction() { MCOUNT.messageCountRelay + .observe(on: MainScheduler.instance) .subscribe(onNext: {[weak self] count in if count > 0 { self?.messageView.countLabel.isHidden = false @@ -44,6 +45,7 @@ extension VehicleMonitoringController { .disposed(by: disposeBag) MCOUNT.pendingCountRelay + .observe(on: MainScheduler.instance) .subscribe(onNext: {[weak self] count in if count > 0 { self?.pendingView.countLabel.isHidden = false @@ -153,6 +155,7 @@ extension VehicleMonitoringController { .disposed(by: disposeBag) messageTapGes.rx.event + .observe(on: MainScheduler.instance) .subscribe(onNext: {[weak self] _ in MESSAGETOOL.openMessageCenter(by: self?.navigationController) }) @@ -188,6 +191,7 @@ extension VehicleMonitoringController { .disposed(by: disposeBag) showVehicleEntryRelay + .observe(on: MainScheduler.instance) .subscribe(onNext: {[weak self] model in if let vehicleName = model?.vehicleName,let driverName = model?.driverName { self?.vehicleLogoutView.titleLabel.text = vehicleName+"/"+driverName @@ -215,6 +219,7 @@ extension VehicleMonitoringController { .do(onNext: {[weak self] _ in self?.view.dd_hideHUD() }) + .observe(on: MainScheduler.instance) .subscribe(onNext: {[weak self] response in if response?.success == true { self?.reloadRelay.accept(nil)