diff --git a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate
index 336f44f..f726965 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 48af7a7..72f88e4 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 = "1081"
- endingLineNumber = "1081"
+ startingLineNumber = "1082"
+ endingLineNumber = "1082"
landmarkName = "collectionView(_:cellForItemAt:)"
landmarkType = "7">
@@ -814,8 +814,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "297"
- endingLineNumber = "297"
+ startingLineNumber = "298"
+ endingLineNumber = "298"
landmarkName = "entry(model:remarkId:)"
landmarkType = "7">
@@ -1294,8 +1294,8 @@
filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "770"
- endingLineNumber = "770"
+ startingLineNumber = "771"
+ endingLineNumber = "771"
landmarkName = "viewDidLoad()"
landmarkType = "7">
@@ -1326,8 +1326,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "1092"
- endingLineNumber = "1092"
+ startingLineNumber = "1093"
+ endingLineNumber = "1093"
landmarkName = "collectionView(_:didSelectItemAt:)"
landmarkType = "7">
@@ -1358,8 +1358,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "372"
- endingLineNumber = "372"
+ startingLineNumber = "373"
+ endingLineNumber = "373"
landmarkName = "addActions()"
landmarkType = "7">
@@ -1374,8 +1374,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "361"
- endingLineNumber = "361"
+ startingLineNumber = "362"
+ endingLineNumber = "362"
landmarkName = "addActions()"
landmarkType = "7">
@@ -1390,8 +1390,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "363"
- endingLineNumber = "363"
+ startingLineNumber = "364"
+ endingLineNumber = "364"
landmarkName = "addActions()"
landmarkType = "7">
@@ -1470,8 +1470,8 @@
filePath = "OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "145"
- endingLineNumber = "145"
+ startingLineNumber = "146"
+ endingLineNumber = "146"
landmarkName = "addActions()"
landmarkType = "7">
@@ -1486,8 +1486,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "121"
- endingLineNumber = "121"
+ startingLineNumber = "122"
+ endingLineNumber = "122"
landmarkName = "addActions()"
landmarkType = "7">
@@ -1502,8 +1502,8 @@
filePath = "OrderScheduling/History/ViewController/HistoryController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "85"
- endingLineNumber = "85"
+ startingLineNumber = "86"
+ endingLineNumber = "86"
landmarkName = "addActions()"
landmarkType = "7">
@@ -1518,8 +1518,8 @@
filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "235"
- endingLineNumber = "235"
+ startingLineNumber = "236"
+ endingLineNumber = "236"
landmarkName = "addAction()"
landmarkType = "7">
@@ -1566,8 +1566,8 @@
filePath = "OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "314"
- endingLineNumber = "314"
+ startingLineNumber = "315"
+ endingLineNumber = "315"
landmarkName = "reloadData()"
landmarkType = "7">
@@ -1582,8 +1582,8 @@
filePath = "OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "313"
- endingLineNumber = "313"
+ startingLineNumber = "314"
+ endingLineNumber = "314"
landmarkName = "reloadData()"
landmarkType = "7">
@@ -1598,8 +1598,8 @@
filePath = "OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "257"
- endingLineNumber = "257"
+ startingLineNumber = "258"
+ endingLineNumber = "258"
landmarkName = "viewDidLoad()"
landmarkType = "7">
@@ -1614,8 +1614,8 @@
filePath = "OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "251"
- endingLineNumber = "251"
+ startingLineNumber = "252"
+ endingLineNumber = "252"
landmarkName = "viewDidLoad()"
landmarkType = "7">
@@ -1630,8 +1630,8 @@
filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "271"
- endingLineNumber = "271"
+ startingLineNumber = "272"
+ endingLineNumber = "272"
landmarkName = "dd_mapView(_:viewFor:)"
landmarkType = "7">
@@ -1646,8 +1646,8 @@
filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "247"
- endingLineNumber = "247"
+ startingLineNumber = "248"
+ endingLineNumber = "248"
landmarkName = "dd_mapView(_:viewFor:)"
landmarkType = "7">
@@ -1662,8 +1662,8 @@
filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "459"
- endingLineNumber = "459"
+ startingLineNumber = "460"
+ endingLineNumber = "460"
landmarkName = "reloadData(index:)"
landmarkType = "7">
@@ -1678,8 +1678,8 @@
filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "456"
- endingLineNumber = "456"
+ startingLineNumber = "457"
+ endingLineNumber = "457"
landmarkName = "reloadData(index:)"
landmarkType = "7">
@@ -1694,8 +1694,8 @@
filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "460"
- endingLineNumber = "460"
+ startingLineNumber = "461"
+ endingLineNumber = "461"
landmarkName = "reloadData(index:)"
landmarkType = "7">
@@ -1822,8 +1822,8 @@
filePath = "OrderScheduling/Main/SceneDelegate.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "50"
- endingLineNumber = "50"
+ startingLineNumber = "56"
+ endingLineNumber = "56"
landmarkName = "sceneWillResignActive(_:)"
landmarkType = "7">
@@ -1838,8 +1838,8 @@
filePath = "OrderScheduling/Main/SceneDelegate.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "60"
- endingLineNumber = "60"
+ startingLineNumber = "66"
+ endingLineNumber = "66"
landmarkName = "sceneWillEnterForeground(_:)"
landmarkType = "7">
@@ -1902,8 +1902,8 @@
filePath = "OrderScheduling/Main/SceneDelegate.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "69"
- endingLineNumber = "69"
+ startingLineNumber = "75"
+ endingLineNumber = "75"
landmarkName = "sceneDidEnterBackground(_:)"
landmarkType = "7">
@@ -1934,8 +1934,8 @@
filePath = "OrderScheduling/Main/SceneDelegate.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "62"
- endingLineNumber = "62"
+ startingLineNumber = "68"
+ endingLineNumber = "68"
landmarkName = "sceneWillEnterForeground(_:)"
landmarkType = "7">
@@ -1982,8 +1982,8 @@
filePath = "OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "235"
- endingLineNumber = "235"
+ startingLineNumber = "236"
+ endingLineNumber = "236"
landmarkName = "init(nibName:bundle:)"
landmarkType = "7">
@@ -2238,8 +2238,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "1028"
- endingLineNumber = "1028"
+ startingLineNumber = "1029"
+ endingLineNumber = "1029"
landmarkName = "tableView(_:cellForRowAt:)"
landmarkType = "7">
@@ -2254,8 +2254,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "1033"
- endingLineNumber = "1033"
+ startingLineNumber = "1034"
+ endingLineNumber = "1034"
landmarkName = "tableView(_:cellForRowAt:)"
landmarkType = "7">
@@ -2478,8 +2478,8 @@
filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "287"
- endingLineNumber = "287"
+ startingLineNumber = "288"
+ endingLineNumber = "288"
landmarkName = "dd_mapView(_:didAnnotationViewTapped:)"
landmarkType = "7">
@@ -2542,8 +2542,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "254"
- endingLineNumber = "254"
+ startingLineNumber = "255"
+ endingLineNumber = "255"
landmarkName = "addActions()"
landmarkType = "7">
@@ -2558,8 +2558,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "261"
- endingLineNumber = "261"
+ startingLineNumber = "262"
+ endingLineNumber = "262"
landmarkName = "addActions()"
landmarkType = "7">
@@ -2574,28 +2574,28 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
+ startingLineNumber = "134"
+ endingLineNumber = "134"
+ landmarkName = "addActions()"
+ landmarkType = "7">
+
+
+
+
-
-
-
-
@@ -2622,8 +2622,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "416"
- endingLineNumber = "416"
+ startingLineNumber = "417"
+ endingLineNumber = "417"
landmarkName = "addActions()"
landmarkType = "7">
@@ -2638,8 +2638,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "340"
- endingLineNumber = "340"
+ startingLineNumber = "341"
+ endingLineNumber = "341"
landmarkName = "addActions()"
landmarkType = "7">
@@ -2654,8 +2654,8 @@
filePath = "OrderScheduling/History/ViewController/HistoryController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "134"
- endingLineNumber = "134"
+ startingLineNumber = "135"
+ endingLineNumber = "135"
landmarkName = "addActions()"
landmarkType = "7">
@@ -2894,8 +2894,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "2062"
- endingLineNumber = "2062"
+ startingLineNumber = "2063"
+ endingLineNumber = "2063"
landmarkName = "init(style:reuseIdentifier:)"
landmarkType = "7">
@@ -2910,8 +2910,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "2069"
- endingLineNumber = "2069"
+ startingLineNumber = "2070"
+ endingLineNumber = "2070"
landmarkName = "init(style:reuseIdentifier:)"
landmarkType = "7">
@@ -2926,8 +2926,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "707"
- endingLineNumber = "707"
+ startingLineNumber = "708"
+ endingLineNumber = "708"
landmarkName = "tableView(_:cellForRowAt:)"
landmarkType = "7">
@@ -3006,8 +3006,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "1020"
- endingLineNumber = "1020"
+ startingLineNumber = "1021"
+ endingLineNumber = "1021"
landmarkName = "tableView(_:cellForRowAt:)"
landmarkType = "7">
@@ -3102,8 +3102,8 @@
filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "817"
- endingLineNumber = "817"
+ startingLineNumber = "818"
+ endingLineNumber = "818"
landmarkName = "addSubviews()"
landmarkType = "7">
@@ -3118,8 +3118,8 @@
filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "340"
- endingLineNumber = "340"
+ startingLineNumber = "341"
+ endingLineNumber = "341"
landmarkName = "listContainerView(_:initListFor:)"
landmarkType = "7">
@@ -3134,8 +3134,8 @@
filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "521"
- endingLineNumber = "521"
+ startingLineNumber = "522"
+ endingLineNumber = "522"
landmarkName = "selectVehicle(selectState:vehicleModel:currentTableViewVehicleModels:selectIndex:mapView:)"
landmarkType = "7">
@@ -3150,8 +3150,8 @@
filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "391"
- endingLineNumber = "391"
+ startingLineNumber = "392"
+ endingLineNumber = "392"
landmarkName = "listContainerView(_:initListFor:)"
landmarkType = "7">
@@ -3166,8 +3166,8 @@
filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "368"
- endingLineNumber = "368"
+ startingLineNumber = "369"
+ endingLineNumber = "369"
landmarkName = "listContainerView(_:initListFor:)"
landmarkType = "7">
@@ -3182,8 +3182,8 @@
filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "397"
- endingLineNumber = "397"
+ startingLineNumber = "398"
+ endingLineNumber = "398"
landmarkName = "categoryView(_:didSelectedItemAt:)"
landmarkType = "7">
@@ -3198,8 +3198,8 @@
filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "405"
- endingLineNumber = "405"
+ startingLineNumber = "406"
+ endingLineNumber = "406"
landmarkName = "categoryView(_:didSelectedItemAt:)"
landmarkType = "7">
@@ -3214,8 +3214,8 @@
filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "882"
- endingLineNumber = "882"
+ startingLineNumber = "883"
+ endingLineNumber = "883"
landmarkName = "viewSafeAreaInsetsDidChange()"
landmarkType = "7">
@@ -3294,8 +3294,8 @@
filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "1276"
- endingLineNumber = "1276"
+ startingLineNumber = "1277"
+ endingLineNumber = "1277"
landmarkName = "init(taskModels:)"
landmarkType = "7">
@@ -3310,8 +3310,8 @@
filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "1288"
- endingLineNumber = "1288"
+ startingLineNumber = "1289"
+ endingLineNumber = "1289"
landmarkName = "init(taskModels:)"
landmarkType = "7">
@@ -3326,8 +3326,8 @@
filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "1290"
- endingLineNumber = "1290"
+ startingLineNumber = "1291"
+ endingLineNumber = "1291"
landmarkName = "init(taskModels:)"
landmarkType = "7">
@@ -3374,8 +3374,8 @@
filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "1117"
- endingLineNumber = "1117"
+ startingLineNumber = "1118"
+ endingLineNumber = "1118"
landmarkName = "listContainerView(_:initListFor:)"
landmarkType = "7">
@@ -3390,8 +3390,8 @@
filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "1424"
- endingLineNumber = "1424"
+ startingLineNumber = "1425"
+ endingLineNumber = "1425"
landmarkName = "updateData(taskModel:)"
landmarkType = "7">
@@ -3422,8 +3422,8 @@
filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "1279"
- endingLineNumber = "1279"
+ startingLineNumber = "1280"
+ endingLineNumber = "1280"
landmarkName = "init(taskModels:)"
landmarkType = "7">
@@ -3438,44 +3438,44 @@
filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
+ startingLineNumber = "1293"
+ endingLineNumber = "1293"
+ landmarkName = "init(taskModels:)"
+ landmarkType = "7">
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
@@ -3502,8 +3502,8 @@
filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "642"
- endingLineNumber = "642"
+ startingLineNumber = "643"
+ endingLineNumber = "643"
landmarkName = "showListDetail(vehicleModel:)"
landmarkType = "7">
@@ -3550,8 +3550,8 @@
filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "862"
- endingLineNumber = "862"
+ startingLineNumber = "863"
+ endingLineNumber = "863"
landmarkName = "viewSafeAreaInsetsDidChange()"
landmarkType = "7">
@@ -3566,8 +3566,8 @@
filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "868"
- endingLineNumber = "868"
+ startingLineNumber = "869"
+ endingLineNumber = "869"
landmarkName = "viewSafeAreaInsetsDidChange()"
landmarkType = "7">
@@ -3582,8 +3582,8 @@
filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "874"
- endingLineNumber = "874"
+ startingLineNumber = "875"
+ endingLineNumber = "875"
landmarkName = "viewSafeAreaInsetsDidChange()"
landmarkType = "7">
@@ -3662,8 +3662,8 @@
filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "1430"
- endingLineNumber = "1430"
+ startingLineNumber = "1431"
+ endingLineNumber = "1431"
landmarkName = "listView()"
landmarkType = "7">
@@ -3694,8 +3694,8 @@
filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "370"
- endingLineNumber = "370"
+ startingLineNumber = "371"
+ endingLineNumber = "371"
landmarkName = "listContainerView(_:initListFor:)"
landmarkType = "7">
@@ -3710,8 +3710,8 @@
filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "387"
- endingLineNumber = "387"
+ startingLineNumber = "388"
+ endingLineNumber = "388"
landmarkName = "listContainerView(_:initListFor:)"
landmarkType = "7">
@@ -3742,8 +3742,8 @@
filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "896"
- endingLineNumber = "896"
+ startingLineNumber = "897"
+ endingLineNumber = "897"
landmarkName = "viewDidAppear(_:)"
landmarkType = "7">
@@ -3838,8 +3838,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "392"
- endingLineNumber = "392"
+ startingLineNumber = "393"
+ endingLineNumber = "393"
landmarkName = "addActions()"
landmarkType = "7">
@@ -3854,8 +3854,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "1137"
- endingLineNumber = "1137"
+ startingLineNumber = "1138"
+ endingLineNumber = "1138"
landmarkName = "addSubviews()"
landmarkType = "7">
@@ -3870,8 +3870,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "1166"
- endingLineNumber = "1166"
+ startingLineNumber = "1167"
+ endingLineNumber = "1167"
landmarkName = "addSubviews()"
landmarkType = "7">
@@ -3886,8 +3886,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "1219"
- endingLineNumber = "1219"
+ startingLineNumber = "1220"
+ endingLineNumber = "1220"
landmarkName = "viewDidLoad()"
landmarkType = "7">
@@ -3902,8 +3902,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "1259"
- endingLineNumber = "1259"
+ startingLineNumber = "1260"
+ endingLineNumber = "1260"
landmarkName = "viewDidLoad()"
landmarkType = "7">
@@ -3918,8 +3918,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "1297"
- endingLineNumber = "1297"
+ startingLineNumber = "1298"
+ endingLineNumber = "1298"
landmarkName = "viewDidLoad()"
landmarkType = "7">
@@ -3934,8 +3934,8 @@
filePath = "OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "149"
- endingLineNumber = "149"
+ startingLineNumber = "150"
+ endingLineNumber = "150"
landmarkName = "addActions()"
landmarkType = "7">
@@ -3950,10 +3950,10 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "1280"
- endingLineNumber = "1280"
- landmarkName = "RescuePendingDispatchController"
- landmarkType = "3">
+ startingLineNumber = "1281"
+ endingLineNumber = "1281"
+ landmarkName = "unknown"
+ landmarkType = "0">
@@ -3982,8 +3982,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "522"
- endingLineNumber = "522"
+ startingLineNumber = "523"
+ endingLineNumber = "523"
landmarkName = "listContainerView(_:initListFor:)"
landmarkType = "7">
@@ -3998,8 +3998,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "519"
- endingLineNumber = "519"
+ startingLineNumber = "520"
+ endingLineNumber = "520"
landmarkName = "listContainerView(_:initListFor:)"
landmarkType = "7">
@@ -4014,8 +4014,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "508"
- endingLineNumber = "508"
+ startingLineNumber = "509"
+ endingLineNumber = "509"
landmarkName = "listContainerView(_:initListFor:)"
landmarkType = "7">
@@ -4030,8 +4030,8 @@
filePath = "OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "305"
- endingLineNumber = "305"
+ startingLineNumber = "306"
+ endingLineNumber = "306"
landmarkName = "viewSafeAreaInsetsDidChange()"
landmarkType = "7">
@@ -4350,8 +4350,8 @@
filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "634"
- endingLineNumber = "634"
+ startingLineNumber = "635"
+ endingLineNumber = "635"
landmarkName = "annotationViewStateConfig(annotationView:vehicleModel:shouldShowSmallAnnotation:)"
landmarkType = "7">
@@ -4366,8 +4366,8 @@
filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "556"
- endingLineNumber = "556"
+ startingLineNumber = "557"
+ endingLineNumber = "557"
landmarkName = "annotationViewStateConfig(annotationView:vehicleModel:shouldShowSmallAnnotation:)"
landmarkType = "7">
@@ -4558,8 +4558,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "255"
- endingLineNumber = "255"
+ startingLineNumber = "256"
+ endingLineNumber = "256"
landmarkName = "addActions()"
landmarkType = "7">
@@ -4574,8 +4574,8 @@
filePath = "OrderScheduling/NewTraining/NewTraining.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "36"
- endingLineNumber = "36"
+ startingLineNumber = "42"
+ endingLineNumber = "42"
landmarkName = "init()"
landmarkType = "7">
@@ -4686,8 +4686,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "122"
- endingLineNumber = "122"
+ startingLineNumber = "123"
+ endingLineNumber = "123"
landmarkName = "addActions()"
landmarkType = "7">
@@ -4702,8 +4702,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "123"
- endingLineNumber = "123"
+ startingLineNumber = "124"
+ endingLineNumber = "124"
landmarkName = "addActions()"
landmarkType = "7">
@@ -4724,5 +4724,53 @@
landmarkType = "7">
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/OrderScheduling/Common/WebView/WebViewController.swift b/OrderScheduling/Common/WebView/WebViewController.swift
index d139a24..8154ba7 100644
--- a/OrderScheduling/Common/WebView/WebViewController.swift
+++ b/OrderScheduling/Common/WebView/WebViewController.swift
@@ -16,7 +16,7 @@ class WebViewController : ZDViewController {
lazy var webView = WKWebView.init()
lazy var statusBarBackgroundView = DDView.init()
var showNavBar : Bool
- var vcTitle : String?
+ public var vcTitle : String?
var url : String?
var screenEdgePanGestureRecognizerEnable : Bool
public var disappearHandler: (() -> Void)?
diff --git a/OrderScheduling/History/ViewController/HistoryController.swift b/OrderScheduling/History/ViewController/HistoryController.swift
index f3ae924..7c37ad0 100644
--- a/OrderScheduling/History/ViewController/HistoryController.swift
+++ b/OrderScheduling/History/ViewController/HistoryController.swift
@@ -82,6 +82,7 @@ extension HistoryController {
preRefreshRelay
.observe(on: MainScheduler.instance)
.subscribe(onNext: {[weak self] _ in
+ NewTraining.default.newTrainingRelay.accept(nil)
MCOUNT.newestMessage()
self?.categoryView.reloadData()
})
diff --git a/OrderScheduling/Main/SceneDelegate.swift b/OrderScheduling/Main/SceneDelegate.swift
index 77c536e..8a4f248 100644
--- a/OrderScheduling/Main/SceneDelegate.swift
+++ b/OrderScheduling/Main/SceneDelegate.swift
@@ -41,6 +41,12 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
TOOL.playAlertWith(userInfo: userInfo)
}
}
+
+ // 登录时需要处理培训问题
+ if USER.isLogin == true, appIsAlive == true {
+ NewTraining.default.newTrainingRelay.accept(nil)
+ }
+
// 说明app时活的，用来判断进入后台之后返回前台时的问题
appIsAlive = true
}
diff --git a/OrderScheduling/Mine/ViewController/MineController.swift b/OrderScheduling/Mine/ViewController/MineController.swift
index 5b13643..51ceac0 100644
--- a/OrderScheduling/Mine/ViewController/MineController.swift
+++ b/OrderScheduling/Mine/ViewController/MineController.swift
@@ -208,6 +208,7 @@ open class MineController : ZDViewController {
open override func reloadData() {
super.reloadData()
+ NewTraining.default.newTrainingRelay.accept(nil)
preRefreshRelay.accept(nil)
}
}
diff --git a/OrderScheduling/NewTraining/NewTraining.swift b/OrderScheduling/NewTraining/NewTraining.swift
index 5f7afce..322caed 100644
--- a/OrderScheduling/NewTraining/NewTraining.swift
+++ b/OrderScheduling/NewTraining/NewTraining.swift
@@ -28,7 +28,13 @@ class NewTraining : NSObject {
.subscribe(onNext: { response in
if response?.success == true {
if response?.data == true {
- WEBTOOL.open(name: .newTrainingList, appending: nil)
+ let tabBarController = UIApplication.shared.dd_keyWindow.rootViewController as? UITabBarController
+ let navController = tabBarController?.selectedViewController as? UINavigationController
+ let vc = navController?.topViewController
+ if vc?.isKind(of: WebViewController.self) == true, (vc as? WebViewController)?.vcTitle == WebViewTool.WebViewNameEnum.newTrainingList.rawValue {
+ }else{
+ WEBTOOL.open(name: .newTrainingList, appending: nil)
+ }
}
}else{
UIApplication.shared.dd_keyWindow.rootViewController?.view.dd_makeToast(response?.msg)
diff --git a/OrderScheduling/Rescue/ViewController/RescueController.swift b/OrderScheduling/Rescue/ViewController/RescueController.swift
index 091498d..6211440 100644
--- a/OrderScheduling/Rescue/ViewController/RescueController.swift
+++ b/OrderScheduling/Rescue/ViewController/RescueController.swift
@@ -118,6 +118,7 @@ extension RescueController {
preRefreshRelay
.observe(on: MainScheduler.instance)
.subscribe(onNext: {[weak self] _ in
+ NewTraining.default.newTrainingRelay.accept(nil)
MCOUNT.newestMessage()
self?.categoryView.reloadData()
})
diff --git a/OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift b/OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift
index 4e5f8b1..bce7bbe 100644
--- a/OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift
+++ b/OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift
@@ -142,6 +142,7 @@ extension ReviewFailedController {
preRefreshRelay
.observe(on: MainScheduler.instance)
.subscribe(onNext: {[weak self] _ in
+ NewTraining.default.newTrainingRelay.accept(nil)
MCOUNT.newestMessage()
self?.reviewFailedView.tableView.mj_header?.beginRefreshing()
/// 点击tabbar item重置
diff --git a/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift b/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift
index 71bdaaa..e1e814a 100644
--- a/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift
+++ b/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift
@@ -232,6 +232,7 @@ extension VehicleMonitoringController {
preRefreshRelay
.observe(on: MainScheduler.instance)
.subscribe(onNext: {[weak self] _ in
+ NewTraining.default.newTrainingRelay.accept(nil)
MCOUNT.newestMessage()
self?.reloadRelay.accept(nil)
})
diff --git a/fastlane/report.xml b/fastlane/report.xml
index aa23fc5..9af65f1 100644
--- a/fastlane/report.xml
+++ b/fastlane/report.xml
@@ -5,17 +5,17 @@
-
+
-
+
-
+