update

OrderScheduling.xcodeproj/project.pbxproj

@@ -51,6 +51,7 @@
 		79DD0DAA2A9481BC00768FE7 /* NotificationAuthTool.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79DD0DA92A9481BC00768FE7 /* NotificationAuthTool.swift */; };
 		79DD0DAD2A94A0EE00768FE7 /* LaunchImage.png in Resources */ = {isa = PBXBuildFile; fileRef = 79DD0DAC2A94A0EE00768FE7 /* LaunchImage.png */; };
 		79DD0DB12A94B3DB00768FE7 /* EmptyView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79DD0DB02A94B3DB00768FE7 /* EmptyView.swift */; };
+		79DD0DB42A95F00B00768FE7 /* Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79DD0DB32A95F00B00768FE7 /* Extension.swift */; };
 		79EAD8142A7B86610036E093 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 79EAD8132A7B86610036E093 /* Assets.xcassets */; };
 		79EAD8172A7B86610036E093 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 79EAD8152A7B86610036E093 /* LaunchScreen.storyboard */; };
 		A64E95F00B82DC28C2B9306E /* libPods-OrderScheduling.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 98784A61C325B3D6C408016C /* libPods-OrderScheduling.a */; };
@@ -120,6 +121,7 @@
 		79DD0DA92A9481BC00768FE7 /* NotificationAuthTool.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationAuthTool.swift; sourceTree = "<group>"; };
 		79DD0DAC2A94A0EE00768FE7 /* LaunchImage.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = LaunchImage.png; sourceTree = "<group>"; };
 		79DD0DB02A94B3DB00768FE7 /* EmptyView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmptyView.swift; sourceTree = "<group>"; };
+		79DD0DB32A95F00B00768FE7 /* Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Extension.swift; sourceTree = "<group>"; };
 		79EAD8072A7B86600036E093 /* OrderScheduling.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = OrderScheduling.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		79EAD8132A7B86610036E093 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		79EAD8162A7B86610036E093 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
@@ -290,6 +292,7 @@
 		791887AB2A80F930007EA0C1 /* Global */ = {
 			isa = PBXGroup;
 			children = (
+				79DD0DB22A95F00000768FE7 /* Extension */,
 				791887C22A84BFCD007EA0C1 /* Tool */,
 				791887AC2A80F930007EA0C1 /* User */,
 			);
@@ -546,6 +549,14 @@
 			path = Source;
 			sourceTree = "<group>";
 		};
+		79DD0DB22A95F00000768FE7 /* Extension */ = {
+			isa = PBXGroup;
+			children = (
+				79DD0DB32A95F00B00768FE7 /* Extension.swift */,
+			);
+			path = Extension;
+			sourceTree = "<group>";
+		};
 		79EAD7FE2A7B86600036E093 = {
 			isa = PBXGroup;
 			children = (
@@ -754,6 +765,7 @@
 				79CECC262A8C749B00B95D8B /* VehicleMonitorVideoController.swift in Sources */,
 				79DD0DA82A9480D000768FE7 /* NotificationAuthView.swift in Sources */,
 				794FBB212A934E0A00D57BB8 /* AppUpdateView.swift in Sources */,
+				79DD0DB42A95F00B00768FE7 /* Extension.swift in Sources */,
 				791887802A7CE6F1007EA0C1 /* UserDefaultStrings.swift in Sources */,
 				79DD0DB12A94B3DB00768FE7 /* EmptyView.swift in Sources */,
 				79DD0DAA2A9481BC00768FE7 /* NotificationAuthTool.swift in Sources */,

OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -16,7 +16,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "16"
             endingLineNumber = "16"
-            landmarkName = "auto(_:)"
+            landmarkName = "getScale(size:)"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -32,8 +32,8 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "10"
             endingLineNumber = "10"
-            landmarkName = "getScale(size:)"
+            landmarkName = "AutoUI"
-            landmarkType = "7">
+            landmarkType = "3">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -46,8 +46,8 @@
             filePath = "OrderScheduling/Login/ViewController/LoginController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "229"
+            startingLineNumber = "238"
-            endingLineNumber = "229"
+            endingLineNumber = "238"
             landmarkName = "textView(_:shouldInteractWith:in:interaction:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -62,8 +62,8 @@
             filePath = "OrderScheduling/Login/ViewController/LoginController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "233"
+            startingLineNumber = "242"
-            endingLineNumber = "233"
+            endingLineNumber = "242"
             landmarkName = "textView(_:shouldInteractWith:in:interaction:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -78,8 +78,8 @@
             filePath = "OrderScheduling/Login/ViewController/LoginController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "117"
+            startingLineNumber = "121"
-            endingLineNumber = "117"
+            endingLineNumber = "121"
             landmarkName = "addActions()"
             landmarkType = "7">
             <Locations>
@@ -141,8 +141,8 @@
             filePath = "OrderScheduling/Login/ViewController/LoginController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "103"
+            startingLineNumber = "107"
-            endingLineNumber = "103"
+            endingLineNumber = "107"
             landmarkName = "addActions()"
             landmarkType = "7">
          </BreakpointContent>
@@ -157,54 +157,6 @@
             filePath = "OrderScheduling/Login/ViewController/LoginController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "75"
-            endingLineNumber = "75"
-            landmarkName = "addActions()"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "980964A8-1322-424C-AE3E-DF8C27A30C9C"
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "OrderScheduling/Login/ViewController/LoginController.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "83"
-            endingLineNumber = "83"
-            landmarkName = "addActions()"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "19508AAD-AD4C-4BDF-81DE-F47DC21CD07D"
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "OrderScheduling/Login/ViewController/LoginController.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "90"
-            endingLineNumber = "90"
-            landmarkName = "addActions()"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "75997BB3-3A8A-471B-AEBA-33634F502589"
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "OrderScheduling/Login/ViewController/LoginController.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
             startingLineNumber = "79"
             endingLineNumber = "79"
             landmarkName = "addActions()"
@@ -214,7 +166,23 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            uuid = "45AB1C2E-7406-4B5A-B0A1-13606A76B374"
+            uuid = "980964A8-1322-424C-AE3E-DF8C27A30C9C"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "OrderScheduling/Login/ViewController/LoginController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "87"
+            endingLineNumber = "87"
+            landmarkName = "addActions()"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "19508AAD-AD4C-4BDF-81DE-F47DC21CD07D"
             shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
@@ -227,6 +195,38 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "75997BB3-3A8A-471B-AEBA-33634F502589"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "OrderScheduling/Login/ViewController/LoginController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "83"
+            endingLineNumber = "83"
+            landmarkName = "addActions()"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "45AB1C2E-7406-4B5A-B0A1-13606A76B374"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "OrderScheduling/Login/ViewController/LoginController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "98"
+            endingLineNumber = "98"
+            landmarkName = "addActions()"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
@@ -317,8 +317,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "481"
+            startingLineNumber = "534"
-            endingLineNumber = "481"
+            endingLineNumber = "534"
             landmarkName = "tableView(_:cellForRowAt:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -333,8 +333,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "482"
+            startingLineNumber = "535"
-            endingLineNumber = "482"
+            endingLineNumber = "535"
             landmarkName = "tableView(_:cellForRowAt:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -507,8 +507,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "563"
+            startingLineNumber = "616"
-            endingLineNumber = "563"
+            endingLineNumber = "616"
             landmarkName = "tableView(_:cellForRowAt:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -523,8 +523,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "564"
+            startingLineNumber = "617"
-            endingLineNumber = "564"
+            endingLineNumber = "617"
             landmarkName = "tableView(_:cellForRowAt:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -555,8 +555,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "701"
+            startingLineNumber = "761"
-            endingLineNumber = "701"
+            endingLineNumber = "761"
             landmarkName = "collectionView(_:cellForItemAt:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -571,8 +571,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "702"
+            startingLineNumber = "762"
-            endingLineNumber = "702"
+            endingLineNumber = "762"
             landmarkName = "collectionView(_:cellForItemAt:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -714,8 +714,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringListController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "130"
+            startingLineNumber = "131"
-            endingLineNumber = "130"
+            endingLineNumber = "131"
             landmarkName = "reloadCell(models:isPaiban:isAlarm:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -794,8 +794,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "313"
+            startingLineNumber = "320"
-            endingLineNumber = "313"
+            endingLineNumber = "320"
             landmarkName = "dd_mapView(_:viewFor:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -810,8 +810,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "291"
+            startingLineNumber = "298"
-            endingLineNumber = "291"
+            endingLineNumber = "298"
             landmarkName = "dd_mapView(_:viewFor:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -826,8 +826,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "293"
+            startingLineNumber = "300"
-            endingLineNumber = "293"
+            endingLineNumber = "300"
             landmarkName = "dd_mapView(_:viewFor:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -842,8 +842,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "439"
+            startingLineNumber = "446"
-            endingLineNumber = "439"
+            endingLineNumber = "446"
             landmarkName = "categoryView(_:didScrollSelectedItemAt:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -858,8 +858,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "319"
+            startingLineNumber = "326"
-            endingLineNumber = "319"
+            endingLineNumber = "326"
             landmarkName = "dd_mapView(_:viewFor:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -874,8 +874,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "318"
+            startingLineNumber = "325"
-            endingLineNumber = "318"
+            endingLineNumber = "325"
             landmarkName = "dd_mapView(_:viewFor:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -1434,8 +1434,8 @@
             filePath = "OrderScheduling/Login/ViewController/LoginController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "147"
+            startingLineNumber = "151"
-            endingLineNumber = "147"
+            endingLineNumber = "151"
             landmarkName = "addActions()"
             landmarkType = "7">
          </BreakpointContent>
@@ -1450,8 +1450,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "353"
+            startingLineNumber = "360"
-            endingLineNumber = "353"
+            endingLineNumber = "360"
             landmarkName = "listContainerView(_:initListFor:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -1466,8 +1466,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "177"
+            startingLineNumber = "188"
-            endingLineNumber = "177"
+            endingLineNumber = "188"
             landmarkName = "addAction()"
             landmarkType = "7">
          </BreakpointContent>
@@ -1482,139 +1482,12 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "178"
+            startingLineNumber = "189"
-            endingLineNumber = "178"
+            endingLineNumber = "189"
             landmarkName = "addAction()"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "E2DCBA6D-6204-4F85-8ABF-A79302F049A2"
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "OrderScheduling/Main/MainTabBarController.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "68"
-            endingLineNumber = "68"
-            landmarkName = "tabBar(_:didSelect:)"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "D1708B2A-C5B4-4B40-9ECC-D648808E0F32"
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "OrderScheduling/Main/MainTabBarController.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "60"
-            endingLineNumber = "60"
-            landmarkName = "tabBar(_:didSelect:)"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "06C1367A-8041-4B21-981D-DAE1DB8A3EEE"
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "OrderScheduling/Main/MainTabBarController.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "62"
-            endingLineNumber = "62"
-            landmarkName = "tabBar(_:didSelect:)"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "36C549E3-0690-4ECF-9C0C-6D59D605762D"
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "OrderScheduling/Main/MainTabBarController.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "50"
-            endingLineNumber = "50"
-            landmarkName = "tabBarController(_:didSelect:)"
-            landmarkType = "7">
-            <Locations>
-               <Location
-                  uuid = "36C549E3-0690-4ECF-9C0C-6D59D605762D - 240e3735f5c08bf7"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "OrderScheduling.MainTabBarController.tabBarController(_: __C.UITabBarController, didSelect: __C.UIViewController) -&gt; ()"
-                  moduleName = "OrderScheduling"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/zd/Desktop/%E4%B8%AD%E9%81%93%E6%95%91%E6%8F%B4/OrderScheduling/OrderScheduling/Main/MainTabBarController.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "49"
-                  endingLineNumber = "49"
-                  offsetFromSymbolStart = "524">
-               </Location>
-               <Location
-                  uuid = "36C549E3-0690-4ECF-9C0C-6D59D605762D - 240e3735f5c08bf7"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "OrderScheduling.MainTabBarController.tabBarController(_: __C.UITabBarController, didSelect: __C.UIViewController) -&gt; ()"
-                  moduleName = "OrderScheduling"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/zd/Desktop/%E4%B8%AD%E9%81%93%E6%95%91%E6%8F%B4/OrderScheduling/OrderScheduling/Main/MainTabBarController.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "49"
-                  endingLineNumber = "49"
-                  offsetFromSymbolStart = "664">
-               </Location>
-               <Location
-                  uuid = "36C549E3-0690-4ECF-9C0C-6D59D605762D - 240e3735f5c08b14"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "OrderScheduling.MainTabBarController.tabBarController(_: __C.UITabBarController, didSelect: __C.UIViewController) -&gt; ()"
-                  moduleName = "OrderScheduling"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/zd/Desktop/%E4%B8%AD%E9%81%93%E6%95%91%E6%8F%B4/OrderScheduling/OrderScheduling/Main/MainTabBarController.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "50"
-                  endingLineNumber = "50"
-                  offsetFromSymbolStart = "164">
-               </Location>
-            </Locations>
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "C81B7742-6AA9-45D7-A23A-CE72DDE13F26"
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "OrderScheduling/Main/MainTabBarController.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "52"
-            endingLineNumber = "52"
-            landmarkName = "tabBarController(_:didSelect:)"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
@@ -1625,8 +1498,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringListController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "127"
+            startingLineNumber = "128"
-            endingLineNumber = "127"
+            endingLineNumber = "128"
             landmarkName = "reloadCell(models:isPaiban:isAlarm:)"
             landmarkType = "7">
             <Locations>
@@ -1673,8 +1546,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringListController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "125"
+            startingLineNumber = "126"
-            endingLineNumber = "125"
+            endingLineNumber = "126"
             landmarkName = "reloadCell(models:isPaiban:isAlarm:)"
             landmarkType = "7">
             <Locations>
@@ -1721,8 +1594,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringListController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "117"
+            startingLineNumber = "118"
-            endingLineNumber = "117"
+            endingLineNumber = "118"
             landmarkName = "reloadCell(models:isPaiban:isAlarm:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -1787,6 +1660,21 @@
                   endingLineNumber = "112"
                   offsetFromSymbolStart = "716">
                </Location>
+               <Location
+                  uuid = "D7A2EF3A-2FB8-49BE-8A7C-A93AB3BCF461 - 80f31cf5eda31684"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "OrderScheduling.AppDelegate.jpushNotificationCenter(_: __C.UNUserNotificationCenter, willPresent: __C.UNNotification, withCompletionHandler: (Swift.Int) -&gt; ()) -&gt; ()"
+                  moduleName = "OrderScheduling"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/zd/Desktop/%E4%B8%AD%E9%81%93%E6%95%91%E6%8F%B4/OrderScheduling/OrderScheduling/Main/AppDelegate.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "112"
+                  endingLineNumber = "112"
+                  offsetFromSymbolStart = "790">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -1870,5 +1758,277 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "E30F88BD-3F6D-494F-8E00-0E26AADB105E"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Pods/DDAutoUIKit_Private/DDAutoUIKit_Private/Classes/AutoUI.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "5"
+            endingLineNumber = "5"
+            landmarkName = "auto(_:)"
+            landmarkType = "9">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "3E930414-83B9-4A78-9531-6AA06CDEC076"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Pods/DDAutoUIKit_Private/DDAutoUIKit_Private/Classes/AutoUI.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "20"
+            endingLineNumber = "20"
+            landmarkName = "auto(_:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "AF3B3322-4332-4D58-98EA-029E1878CC9E"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "OrderScheduling/Login/ViewController/LoginController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "155"
+            endingLineNumber = "155"
+            landmarkName = "addActions()"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "C774B751-A409-4A20-884D-B3E3CC9D769E"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "OrderScheduling/Login/ViewController/LoginController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "159"
+            endingLineNumber = "159"
+            landmarkName = "addActions()"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "05E20D1A-7CFB-4F70-B43A-F2CF1E03C482"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "OrderScheduling/Login/ViewController/LoginController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "162"
+            endingLineNumber = "162"
+            landmarkName = "addActions()"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "3C17ACA4-CA64-4561-97F6-B82CFCC8886D"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "OrderScheduling/Login/ViewController/LoginController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "172"
+            endingLineNumber = "172"
+            landmarkName = "addActions()"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "1973FC6A-320C-4AE6-A19A-1A1BFAF26125"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "OrderScheduling/Login/ViewController/LoginController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "163"
+            endingLineNumber = "163"
+            landmarkName = "addActions()"
+            landmarkType = "7">
+            <Locations>
+               <Location
+                  uuid = "1973FC6A-320C-4AE6-A19A-1A1BFAF26125 - d543bebf3fc4a55d"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "closure #15 (Swift.Optional&lt;OrderScheduling.ResponseModel&lt;OrderScheduling.LoginDataModel&gt;&gt;) -&gt; () in OrderScheduling.LoginController.addActions() -&gt; ()"
+                  moduleName = "OrderScheduling"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/zd/Desktop/%E4%B8%AD%E9%81%93%E6%95%91%E6%8F%B4/OrderScheduling/OrderScheduling/Login/ViewController/LoginController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "161"
+                  endingLineNumber = "161"
+                  offsetFromSymbolStart = "306">
+               </Location>
+               <Location
+                  uuid = "1973FC6A-320C-4AE6-A19A-1A1BFAF26125 - d543bebf3fc4a55d"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "closure #15 (Swift.Optional&lt;OrderScheduling.ResponseModel&lt;OrderScheduling.LoginDataModel&gt;&gt;) -&gt; () in OrderScheduling.LoginController.addActions() -&gt; ()"
+                  moduleName = "OrderScheduling"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/zd/Desktop/%E4%B8%AD%E9%81%93%E6%95%91%E6%8F%B4/OrderScheduling/OrderScheduling/Login/ViewController/LoginController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "161"
+                  endingLineNumber = "161"
+                  offsetFromSymbolStart = "604">
+               </Location>
+            </Locations>
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "090FABE1-2B28-41C8-8F41-EEB2FBFFC088"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "OrderScheduling/Main/Initial.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "77"
+            endingLineNumber = "77"
+            landmarkName = "changeRootViewController(window:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "E2B811D9-AA2D-4A16-89A0-C86D2B00E566"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "OrderScheduling/Main/Initial.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "72"
+            endingLineNumber = "72"
+            landmarkName = "changeRootViewController(window:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "8783FFFD-91F0-4B65-B754-FAF5917496C7"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "OrderScheduling/Login/ViewController/LoginController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "164"
+            endingLineNumber = "164"
+            landmarkName = "addActions()"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "F1FBFA4A-886F-406C-88FB-38CB0C978156"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "220"
+            endingLineNumber = "220"
+            landmarkName = "reloadData()"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "38CBA3A0-FD1B-4708-99F1-82F67AC60AC3"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "53"
+            endingLineNumber = "53"
+            landmarkName = "addActions()"
+            landmarkType = "7">
+            <Locations>
+               <Location
+                  uuid = "38CBA3A0-FD1B-4708-99F1-82F67AC60AC3 - c49f6959d505b6de"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "OrderScheduling.ReviewFailedController.addActions() -&gt; ()"
+                  moduleName = "OrderScheduling"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/zd/Desktop/%E4%B8%AD%E9%81%93%E6%95%91%E6%8F%B4/OrderScheduling/OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "53"
+                  endingLineNumber = "53"
+                  offsetFromSymbolStart = "999">
+               </Location>
+               <Location
+                  uuid = "38CBA3A0-FD1B-4708-99F1-82F67AC60AC3 - abc7eb58593472a0"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "closure #3 () -&gt; () in OrderScheduling.ReviewFailedController.addActions() -&gt; ()"
+                  moduleName = "OrderScheduling"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/zd/Desktop/%E4%B8%AD%E9%81%93%E6%95%91%E6%8F%B4/OrderScheduling/OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "53"
+                  endingLineNumber = "53"
+                  offsetFromSymbolStart = "43">
+               </Location>
+            </Locations>
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "38DE4024-8840-4CB3-8272-C9FF5B51EED3"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "214"
+            endingLineNumber = "214"
+            landmarkName = "entry(model:remarkId:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

OrderScheduling/Assets.xcassets/Mine/placeholder_gender_man.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "placeholder_gender_man.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "placeholder_gender_man@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "placeholder_gender_man@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

OrderScheduling/Assets.xcassets/Mine/placeholder_gender_woman.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "placeholder_gender_woman.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "placeholder_gender_woman@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "placeholder_gender_woman@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

OrderScheduling/Assets.xcassets/Rescue/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

OrderScheduling/Assets.xcassets/Rescue/rescue_orderDispatch_call.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "rescue_orderDispatch_call.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "rescue_orderDispatch_call@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "rescue_orderDispatch_call@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

OrderScheduling/Assets.xcassets/Rescue/rescue_orderPending_refuse.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "rescue_orderPending_refuse.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "rescue_orderPending_refuse@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "rescue_orderPending_refuse@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

OrderScheduling/Global/Extension/Extension.swift

@@ -0,0 +1,8 @@
+//
+//  Extension.swift
+//  OrderScheduling
+//
+//  Created by 中道 on 2023/8/23.
+//
+
+import Foundation

OrderScheduling/Global/User/UserData.swift

@@ -12,6 +12,13 @@ public let USER = UserData.default
 open class UserData {
     public static let `default` = UserData()
     
+    public var isLogin : Bool {
+        if token?.isEmpty == false {
+            return true
+        }
+        return false
+    }
+    
     public var token : String? {
         return UserDefaults.standard.object(forKey: token_key) as? String
     }
@@ -20,6 +27,30 @@ open class UserData {
         UserDefaults.standard.set(token, forKey: token_key)
     }
     
+    public var refreshToken : String? {
+        return UserDefaults.standard.object(forKey: refresh_token_key) as? String
+    }
+    
+    public func setRefreshToken(token: String?) {
+        UserDefaults.standard.set(token, forKey: refresh_token_key)
+    }
+    
+    public var supplierName : String? {
+        return UserDefaults.standard.object(forKey: supplierName_key) as? String
+    }
+    
+    func setSupplierName(supplierName:String?) {
+        UserDefaults.standard.set(supplierName, forKey: supplierName_key)
+    }
+    
+    public var phone : String? {
+        return UserDefaults.standard.object(forKey: phone_key) as? String
+    }
+    
+    func setPhone(phone:String?) {
+        UserDefaults.standard.set(phone, forKey: phone_key)
+    }
+    
     public var supplierType : Int? {
         return UserDefaults.standard.object(forKey: supplierType_key) as? Int
     }
@@ -35,6 +66,5 @@ open class UserData {
     func clear() {
         setToken(token: nil)
         setSupplierType(supplierType: nil)
-
     }
 }

OrderScheduling/History/ViewController/HistoryController.swift

@@ -57,11 +57,15 @@ extension HistoryController {
                 WEBTOOL.open(name: .todoList,appending: nil)
             })
             .disposed(by: disposeBag)
-    }
         
-   public override func viewWillAppear(_ animated: Bool) {
+        // 点击tabBar 需要刷下下列
-        super.viewWillAppear(animated)
+        preRefreshRelay
+            .observe(on: MainScheduler.instance)
+            .subscribe(onNext: {[weak self] _ in
                 NotificationCenter.default.post(name: NSNotification.Name(rawValue: Notification_reloadRescusControolerToDoMessageCount), object: nil)
+                self?.categoryView.reloadData()
+            })
+            .disposed(by: disposeBag)
     }
 }
 
@@ -147,6 +151,11 @@ extension HistoryItemController : UITableViewDelegate, UITableViewDataSource {
         cell?.typeLabel.text = model.taskServiceName
         cell?.orderNumLabel.text = model.orderCode
         cell?.orderStatusLabel.text = model.taskOrderStatusString
+        if model.taskOrderStatusString == "任务完成" {
+            cell?.orderStatusLabel.textColor = .hex("09B820")
+        }else{
+            cell?.orderStatusLabel.textColor = .hex("E64C0B")
+        }
         cell?.orderDateLabel.text = model.createTime
 
         cell?.serviceLabel.text = model.vehiclePointAddress
@@ -240,6 +249,7 @@ open class HistoryController : DDViewController {
     private let messageView = MessageView()
     private let pendingTapGes = UITapGestureRecognizer()
     private let pendingView = MessageView()
+    private var preRefreshRelay = ReplayRelay<Any?>.create(bufferSize: 1)
 
    public override func viewDidLoad() {
         super.viewDidLoad()
@@ -295,6 +305,11 @@ open class HistoryController : DDViewController {
             make.width.greaterThanOrEqualTo(40)
         }
     }
+    
+    open override func reloadData() {
+        super.reloadData()
+        preRefreshRelay.accept(nil)
+    }
 }
 
 class HistoryItemController : DDViewController {
@@ -380,10 +395,10 @@ class HistoryItemCell : DDTableViewCell {
         settlementRatioLabel = DDLabel.dd_init(withText: "", font: .regularFont(auto(12)), textColor: .hex("000000"))
         additionalButton = DDButton.dd_initCustom()
         additionalButton.titleLabel?.font = .mediumFont(13)
-        additionalButton.setTitleColor(.hex("000000").alpha(0.7), for: .normal)
+        additionalButton.setTitleColor(.hex("FFFFFF"), for: .normal)
         reportButton = DDButton.dd_initCustom()
         reportButton.titleLabel?.font = .mediumFont(13)
-        reportButton.setTitleColor(.hex("FFFFFF"), for: .normal)
+        reportButton.setTitleColor(.hex("000000").alpha(0.7), for: .normal)
         disposeBag = DisposeBag()
         super.init(style: style, reuseIdentifier: reuseIdentifier)
         
@@ -397,6 +412,7 @@ class HistoryItemCell : DDTableViewCell {
         contentView.addSubview(radiusView)
         radiusView.addSubview(typeLabel)
         radiusView.addSubview(orderNumLabel)
+        orderStatusLabel.numberOfLines = 0
         radiusView.addSubview(orderStatusLabel)
         radiusView.addSubview(line)
         radiusView.addSubview(orderDateTitleLabel)
@@ -411,13 +427,13 @@ class HistoryItemCell : DDTableViewCell {
         radiusView.addSubview(settlementLabel)
         radiusView.addSubview(settlementRatioTitleLabel)
         radiusView.addSubview(settlementRatioLabel)
-        additionalButton.layer.borderColor = UIColor.hex("DDDDDD").cgColor
-        additionalButton.layer.borderWidth = 1
         additionalButton.layer.cornerRadius = auto(4)
+        additionalButton.layer.masksToBounds = true
+        additionalButton.backgroundColor = .hex("2A5094")
         radiusView.addSubview(additionalButton)
+        reportButton.layer.borderColor = UIColor.hex("DDDDDD").cgColor
+        reportButton.layer.borderWidth = 1
         reportButton.layer.cornerRadius = auto(4)
-        reportButton.layer.masksToBounds = true
-        reportButton.backgroundColor = .hex("2A5094")
         radiusView.addSubview(reportButton)
         
         radiusView.snp.makeConstraints { make in
@@ -431,14 +447,17 @@ class HistoryItemCell : DDTableViewCell {
             make.top.equalTo(auto(13))
         }
         
+        orderNumLabel.setContentCompressionResistancePriority(.defaultHigh, for: .horizontal)
         orderNumLabel.snp.makeConstraints { make in
             make.centerY.equalTo(typeLabel)
             make.left.equalTo(typeLabel.snp.right).offset(auto(10))
         }
         
+        orderStatusLabel.setContentCompressionResistancePriority(.defaultLow, for: .horizontal)
         orderStatusLabel.snp.makeConstraints { make in
             make.right.equalTo(-auto(20))
             make.centerY.equalTo(orderNumLabel)
+            make.left.equalTo(orderNumLabel.snp.right).offset(auto(5))
         }
         
         line.snp.makeConstraints { make in
@@ -507,7 +526,7 @@ class HistoryItemCell : DDTableViewCell {
 
         }
         
-        reportButton.snp.makeConstraints { make in
+        additionalButton.snp.makeConstraints { make in
             make.right.equalToSuperview().offset(-auto(10))
             make.top.equalTo(settlementRatioLabel.snp.bottom).offset(auto(10))
             make.width.equalTo(auto(80))
@@ -515,10 +534,10 @@ class HistoryItemCell : DDTableViewCell {
             make.bottom.equalToSuperview().offset(-auto(10))
         }
 
-        additionalButton.snp.makeConstraints { make in
+        reportButton.snp.makeConstraints { make in
-            make.right.equalTo(reportButton.snp.left).offset(-auto(10))
+            make.right.equalTo(additionalButton.snp.left).offset(-auto(10))
-            make.top.equalTo(reportButton)
+            make.top.equalTo(additionalButton)
-            make.width.height.equalTo(reportButton)
+            make.width.height.equalTo(additionalButton)
         }
 
     }

OrderScheduling/HttpRequestCenter/ApiList.swift

@@ -16,6 +16,8 @@ open class ApiList {
 
     public let login = "/oauth2/token?grant_type=app&scope=all"
     
+    public let token = "/oauth2/token"
+    
     public let orderList = "/supplierAppV2/dispatchApp/order/orderList"
     
     public let acceptDispatch = "/supplierAppV2/dispatchApp/order/acceptDispatch"

OrderScheduling/HttpRequestCenter/ParametersList.swift

@@ -31,6 +31,11 @@ public struct LoginParameters : Encodable {
     }
 }
 
+public struct TokenParameters : Encodable {
+    var refresh_token : String
+    var grant_type : String = "refresh_token"
+}
+
 public struct LogoutParameters : Encodable {
     var  deviceId : Int
 }

OrderScheduling/HttpRequestCenter/RequestList.swift

@@ -28,6 +28,10 @@ open class RequestList {
         return DDAF.post(urlString: HOST+API.login,parameters: parameters,headers: ["Authorization":"Basic c3VwcGxpZXItYXBwOiQyYSQxMCRXZ1pIdzVSamoxcGpIYnJucG00YlYuTWlTZ0o2aWpzYWlNeHN2OUhwZWlYR094UWtWRWVaNg=="],responseType: ResponseModel<LoginDataModel>.self)
     }
     
+    func token(parameters:Encodable) -> Single<ResponseModel<String>?> {
+        return DDAF.post(urlString: HOST+API.token,parameters: parameters,headers: ["Authorization":"Basic c3VwcGxpZXItYXBwOiQyYSQxMCRXZ1pIdzVSamoxcGpIYnJucG00YlYuTWlTZ0o2aWpzYWlNeHN2OUhwZWlYR094UWtWRWVaNg=="],responseType: ResponseModel<String>.self)
+    }
+    
     func logout(parameters:Encodable) -> Single<ResponseModel<String>?> {
         return DDAF.post(urlString: HOST+API.logout,parameters: parameters,encoding: JSONParameterEncoder.default,headers: [tokenHeader()],responseType: ResponseModel<String>.self)
     }

OrderScheduling/HttpResponseModel/ResponseModel.swift

@@ -38,6 +38,7 @@ class LoginDataModel : Decodable {
         var phone : String
         var name : String
         var supplierName : String
+        var supplierType : Int
         var supplierId : Int
         var username : String
         var userType : String
@@ -52,6 +53,7 @@ class OrderListDataModel: Decodable {
     var vehiclePointLatitude : Double
     var vehiclePointRemark : String?
     var destinationAddress : String?
+    var positionEnvironment : PositionEnvironmentModel?
     var destinationLongitude : Double?
     var destinationLatitude : Double?
     var destinationRemark : String?
@@ -59,6 +61,7 @@ class OrderListDataModel: Decodable {
     var contractName : String
     var taskServiceName : String
     var taskOrderStatusString : String?
+    var taskOrderStatus : Int?
     var orderCode : String
     var createTime : String
     var driverName : String?
@@ -78,6 +81,10 @@ class OrderListDataModel: Decodable {
         var code : SupplierSettleRatioEnum
         var label : String
     }
+    class PositionEnvironmentModel : Decodable {
+        var code : positionEnvironment
+        var label : String
+    }
     enum IsSupplierSettleEnum : Int,Decodable {
         case NO = 0
         case YES = 1
@@ -89,6 +96,17 @@ class OrderListDataModel: Decodable {
         case SERVICE_FAIL_SETTLE = 3
         case TRAIL_CAR_SETTLE = 4
     }
+    enum positionEnvironment : Int,Decodable {
+        case ground = 1
+        case elevated_road = 2
+        case expressway = 3
+        case tunnel = 4
+        case bridge = 5
+        case underground = 6
+        case high_rise_car_park = 7
+        case crane_rescue = 8
+        case wading = 9
+    }
 }
 
 enum VehicleStatusCodeEnum : Int, Decodable {

OrderScheduling/Login/ViewController/LoginController.swift

@@ -14,6 +14,7 @@ import DDTimerKit_Private
 import DDProgressHUDKit_Private
 import DDAutoUIKit_Private
 import DDControlsKit_Private
+import CocoaDebug
 
 class LoginController : DDViewController {
     private let disposeBag = DisposeBag()
@@ -39,8 +40,10 @@ extension LoginController {
         loginView.inputContentView.backgroundColor = UIColor.white
         loginView.serviceProviderView.titleLabel.text = "服务商编号"
         loginView.serviceProviderView.textfield.attributedPlaceholder = NSAttributedString(string: "请输入服务商编号",attributes: [.foregroundColor: UIColor.hex("203152").alpha(0.2),.font:UIFont.regularFont(auto(14))])
+        loginView.serviceProviderView.textfield.text = USER.supplierName
         loginView.phoneView.titleLabel.text = "用户手机号"
         loginView.phoneView.textfield.attributedPlaceholder = NSAttributedString(string: "请输入手机号",attributes: [.foregroundColor: UIColor.hex("203152").alpha(0.2),.font:UIFont.regularFont(auto(14))])
+        loginView.phoneView.textfield.text = USER.phone
         loginView.codeView.titleLabel.text = "验证码"
         loginView.codeView.textfield.attributedPlaceholder = NSAttributedString(string: "请输入验证码",attributes: [.foregroundColor: UIColor.hex("203152").alpha(0.2),.font:UIFont.regularFont(auto(14))])
         loginView.codeView.codeButton.layer.borderColor = UIColor.hex("3364B7").alpha(0.8).cgColor
@@ -48,8 +51,8 @@ extension LoginController {
         loginView.codeView.codeButton.setTitle("获取验证码", for: .normal)
         loginView.codeView.codeButton.setTitleColor(.hex("3364B7").alpha(0.8), for: .normal)
         loginView.codeView.codeButton.titleLabel?.font = .regularFont(auto(13))
-        loginView.agreeButton.setImage(UIImage(named: "login_agree_unselected"), for: .normal)
+        loginView.agreeButton.setBackgroundImage(UIImage(named: "login_agree_unselected"), for: .normal)
-        loginView.agreeButton.setImage(UIImage(named: "login_agree_selected"), for: .selected)
+        loginView.agreeButton.setBackgroundImage(UIImage(named: "login_agree_selected"), for: .selected)
         let privacyText = NSAttributedString.init(string: "已阅读并同意",attributes: [.foregroundColor:UIColor.hex("203152"),.font:UIFont.regularFont(auto(14))]).dd_mutable()
         let privacyText_appendUser = NSAttributedString.init(string: "《用户协议》",attributes: [.foregroundColor:UIColor.hex("354D93"),.font:UIFont.regularFont(auto(14))]).dd_mutable()
         privacyText_appendUser.addAttribute(.link, value: login_attach_userAgreement_key, range: NSRange(location: 0, length: privacyText_appendUser.length))
@@ -57,6 +60,7 @@ extension LoginController {
         privacyText_appendPrivacy.addAttribute(.link, value: login_attach_privacy_key, range: NSRange(location: 0, length: privacyText_appendPrivacy.length))
         loginView.agreeTextView.attributedText = privacyText.dd_append(privacyText_appendUser).dd_append(privacyText_appendPrivacy)
         loginView.agreeTextView.textContainerInset = .zero
+        loginView.agreeTextView.textContainer.lineFragmentPadding = 0
         loginView.agreeTextView.isEditable = false
         loginView.agreeTextView.delegate = self
         
@@ -154,13 +158,18 @@ extension LoginController {
             .do(onNext: {[weak self] _ in
                 self?.view.dd_hideHUD()
             })
-            .subscribe(onNext: { responseModel in
+            .subscribe(onNext: {[weak self] responseModel in
                 if responseModel?.success == true {
                     if let token = responseModel?.data?.accessToken.tokenValue {
                         USER.setToken(token: token)
+                        USER.setRefreshToken(token: responseModel?.data?.refreshToken.tokenValue)
+                        USER.setSupplierType(supplierType: responseModel?.data?.additionalParameters.user_info.supplierType)
+                        USER.setPhone(phone: self?.loginView.phoneView.textfield.text)
+                        USER.setSupplierName(supplierName: self?.loginView.serviceProviderView.textfield.text)
                     }
                     NotificationCenter.default.post(name: NSNotification.Name(rawValue: Notification_loginSuccessToRescueController), object: nil)
                 }else{
+                    print("错误")
                 }
             })
             .disposed(by: disposeBag)
@@ -268,6 +277,7 @@ class LoginView : DDView {
         inputContentView.addSubview(phoneView)
         codeView.textfield.keyboardType = .numberPad
         inputContentView.addSubview(codeView)
+        agreeButton.contentMode = .scaleAspectFill
         inputContentView.addSubview(agreeButton)
         inputContentView.addSubview(agreeTextView)
         addSubview(loginButton)
@@ -280,7 +290,7 @@ class LoginView : DDView {
         inputContentView.layer.cornerRadius = auto(10)
         inputContentView.snp.makeConstraints { make in
             make.centerX.equalToSuperview()
-            make.centerY.equalToSuperview().offset(auto(30))
+            make.top.equalTo(backgroundImageView.snp.bottom).offset(-auto(180))
             make.height.equalTo(auto(280))
             make.width.equalTo(auto(340))
         }
@@ -310,9 +320,9 @@ class LoginView : DDView {
         
         agreeTextView.snp.makeConstraints { make in
             make.centerY.equalTo(agreeButton)
-            make.left.equalTo(agreeButton.snp.right).offset(auto(10))
+            make.left.equalTo(agreeButton.snp.right).offset(auto(5))
             make.right.equalToSuperview()
-            make.height.equalTo(17)
+            make.height.equalTo(18)
         }
         
         loginButton.layer.cornerRadius = auto(25)

OrderScheduling/Main/Initial.swift

@@ -59,7 +59,7 @@ class Initial : NSObject {
     
     // MARK: <RootViewController>
     func initRootViewController(){
-        if USER.token != nil {
+        if USER.isLogin == true {
             NotificationCenter.default.post(name: NSNotification.Name(rawValue: Notification_loginSuccessToRescueController), object: nil)
         }else{
             NotificationCenter.default.post(name: NSNotification.Name(rawValue: Notification_toLoginController), object: nil)
@@ -100,7 +100,7 @@ extension Initial : DDAlamofireDelegate {
     }
     
     func errorCodeHandler<T>(response: AFDataResponse<T>) -> AFDataResponse<T> where T : Decodable {
-        if response.response?.statusCode == 401 {
+        if response.response?.statusCode == 401 && (USER.isLogin == true) {
             NotificationCenter.default.post(name: NSNotification.Name(rawValue: Notification_logoutSuccessToLoginController), object: nil)
         }
         

OrderScheduling/Main/MainTabBarController.swift

@@ -47,26 +47,7 @@ open class MainTabBarController : ESTabBarController,UITabBarControllerDelegate
 
     public func tabBarController(_ tabBarController: UITabBarController, didSelect viewController: UIViewController) {
         let nav = viewController as? UINavigationController
-        if nav?.topViewController?.isMember(of: VehicleMonitoringController.self) == true {
+        (nav?.topViewController as? DDViewController)?.reloadData()
-            let vc = nav?.topViewController as? VehicleMonitoringController
-            vc?.refreshData()
-        }
-    }
-    
-    open override func tabBar(_ tabBar: UITabBar, didSelect item: UITabBarItem) {
-        super.tabBar(tabBar, didSelect: item)
-
-        if item.title != "车辆监控" || item.title != "点击刷新" {
-            for tabBarItem in (tabBar.items ?? []) {
-                if tabBarItem.title == "点击刷新" {
-                    tabBarItem.title = "车辆监控"
-                }
-            }
-        }
-        
-        if item.title == "车辆监控" {
-            item.title = "点击刷新"
-        }
     }
 }
 

OrderScheduling/Mine/ViewController/MineController.swift

@@ -70,8 +70,6 @@ extension MineController {
                 })
                 .disposed(by: disposeBag)
                 
-        refreshRelay.accept(nil)
-        
         mineView.carInfoGes.rx.event
             .observe(on: MainScheduler.instance)
             .subscribe(onNext: { _ in
@@ -128,12 +126,20 @@ extension MineController {
                 NOTIAUTHTOOL.openSetting()
             })
             .disposed(by: disposeBag)
+        
+        preRefreshRelay
+            .observe(on: MainScheduler.instance)
+            .subscribe(onNext: {[weak self] _ in
+                self?.mineView.scrollView.mj_header?.beginRefreshing()
+            })
+            .disposed(by: disposeBag)
     }
 }
 
 open class MineController : DDViewController {
     private let mineView = MineView()
     private let disposeBag = DisposeBag()
+    private let preRefreshRelay = ReplayRelay<Any?>.create(bufferSize: 1)
     private let refreshRelay = ReplayRelay<Any?>.create(bufferSize: 1)
     
     open override func viewDidLoad() {
@@ -141,6 +147,7 @@ open class MineController : DDViewController {
         dd_navigationBarBackgroundColor = .hex("354683")
         dd_navigationBarTitleTextAttributes = [.foregroundColor : UIColor.white(alpha: 0.7),.font:UIFont.mediumFont(auto(15))]
         dd_navigationItemTitle = "我的"
+        dd_navigationBarShadowColor = .hex("354683")
         navigationItem.leftBarButtonItems = nil
         
         view.addSubview(mineView)
@@ -152,7 +159,7 @@ open class MineController : DDViewController {
         
         mineView.carInfoView.titleLabel.text = "车辆管理"
         mineView.carInfoView.imageView.image = UIImage(named: "mine_info_car")
-        mineView.driverInfoView.titleLabel.text = "师傅管理"
+        mineView.driverInfoView.titleLabel.text = "司机管理"
         mineView.driverInfoView.imageView.image = UIImage(named: "mine_info_driver")
 
         mineView.gongdanduizhang.titleLabel.text = "工单对账"
@@ -164,6 +171,11 @@ open class MineController : DDViewController {
         
         addActions()
     }
+    
+    open override func reloadData() {
+        super.reloadData()
+        preRefreshRelay.accept(nil)
+    }
 }
 
 open class MineView : DDView {
@@ -200,7 +212,7 @@ open class MineView : DDView {
         scrollView = DDScrollView()
         scrollContentView = DDView()
         topBackgroundImageView = DDImageView()
-        avatar = DDImageView()
+        avatar = DDImageView(image: UIImage(named: "placeholder_gender_man"))
         accountLabel = DDLabel.dd_init(withText: "", font: .mediumFont(auto(15)), textColor: .hex("FFFFFF").alpha(0.8))
         companyLabel = DDLabel.dd_init(withText: "", font: .mediumFont(auto(12)), textColor: .hex("FFFFFF").alpha(0.5))
         carInfoView = MineInfoView()
@@ -289,11 +301,11 @@ open class MineView : DDView {
         
         topBackgroundImageView.snp.makeConstraints { make in
             make.left.top.right.equalToSuperview()
-            make.height.equalTo(auto(130))
+            make.height.equalTo(auto(115))
         }
         
         avatar.snp.makeConstraints { make in
-            make.top.equalTo(auto(20))
+            make.top.equalTo(auto(10))
             make.left.equalTo(auto(25))
             make.width.height.equalTo(auto(54))
         }

OrderScheduling/Rescue/ViewController/RescueController.swift

@@ -66,11 +66,25 @@ extension RescueController {
                 WEBTOOL.open(name: .todoList,appending: nil)
             })
             .disposed(by: disposeBag)
+
+        if USER.isLogin == true {
+            RQ.token(parameters: TokenParameters(refresh_token: USER.refreshToken!))
+                .subscribe(onSuccess: { _ in
+                    
+                })
+                .disposed(by: disposeBag)
         }
         
-    override func viewWillAppear(_ animated: Bool) {
-        super.viewWillAppear(animated)
         NotificationCenter.default.post(name: NSNotification.Name(rawValue: Notification_reloadRescusControolerToDoMessageCount), object: nil)
+        
+        // 点击tabBar 需要刷下下列
+        preRefreshRelay
+            .observe(on: MainScheduler.instance)
+            .subscribe(onNext: {[weak self] _ in
+                NotificationCenter.default.post(name: NSNotification.Name(rawValue: Notification_reloadRescusControolerToDoMessageCount), object: nil)
+                self?.categoryView.reloadData()
+            })
+            .disposed(by: disposeBag)
     }
 }
 
@@ -153,6 +167,11 @@ extension RescuePendingOrderController {
                     self?.resultArr.removeAll { _model in
                         _model.userOrderId == model.userOrderId
                     }
+                    if self?.resultArr.isEmpty == false {
+                        self?.emptyView.isHidden = true
+                    }else{
+                        self?.emptyView.isHidden = false
+                    }
                     self?.pendingOrderView.tableView.reloadData()
                 }else{
                     self?.view.dd_makeToast(response?.msg)
@@ -183,10 +202,15 @@ extension RescuePendingOrderController {
                     self?.resultArr.removeAll { _model in
                         _model.userOrderId == model.userOrderId
                     }
+                    if self?.resultArr.isEmpty == false {
+                        self?.emptyView.isHidden = true
+                    }else{
+                        self?.emptyView.isHidden = false
+                    }
                     self?.pendingOrderView.tableView.reloadData()
                     ENTRY.dismiss(name: refuseOrderEntry)
                 }else{
-                    self?.view.dd_makeToast(response?.msg)
+                    UIApplication.shared.dd_keyWindow.dd_makeToast(response?.msg)
                 }
             })
             .disposed(by: disposeBag)
@@ -334,18 +358,34 @@ extension RescueIsIngController {
 
 // MARK: JXCategoryViewDelegate,JXCategoryListContainerViewDelegate
 extension RescueController : JXCategoryViewDelegate,JXCategoryListContainerViewDelegate {
+    func categoryView(_ categoryView: JXCategoryBaseView!, didSelectedItemAt index: Int) {
+        if index == 0 {
+            pendingTableView?.mj_header?.beginRefreshing()
+        }else if index == 1 {
+            dispatchTableView?.mj_header?.beginRefreshing()
+        }else if index == 2 {
+            isRescueTableView?.mj_header?.beginRefreshing()
+        }
+    }
+
     func number(ofListsInlistContainerView listContainerView: JXCategoryListContainerView!) -> Int {
         return categoryView.titles.count
     }
     
     func listContainerView(_ listContainerView: JXCategoryListContainerView!, initListFor index: Int) -> JXCategoryListContentViewDelegate! {
         if index == 0 {
-            return RescuePendingOrderController.init()
+            let vc = RescuePendingOrderController.init()
+            pendingTableView = vc.pendingOrderView.tableView
+            return vc
         }
         if index == 1 {
-            return RescuePendingDispatchController.init()
+            let vc = RescuePendingDispatchController.init()
+            dispatchTableView = vc.pendingDispatchView.tableView
+            return vc
         }
-        return RescueIsIngController.init()
+        let vc = RescueIsIngController.init()
+        isRescueTableView = vc.pendingIsIngView.tableView
+        return vc
     }
 }
 
@@ -425,7 +465,7 @@ extension RescuePendingOrderController : UITableViewDelegate,UITableViewDataSour
             .subscribe(onNext: {[weak self] _ in
                 self?.acceptOrderRelay.accept(model)
             })
-            .disposed(by: disposeBag)
+            .disposed(by: cell!.disposeBag)
         return cell!
     }
     
@@ -450,7 +490,6 @@ extension RescuePendingDispatchController : UITableViewDelegate,UITableViewDataS
             cell = RescuePendingDispatchCell(style: .default, reuseIdentifier: "cell")
             cell?.line.backgroundColor = .hex("E9E9EA").alpha(0.6)
             cell?.merchantTitleLabel.text = "客商:"
-            cell?.positionTitleLabel.text = "所处位置:"
             cell?.serviceTitleLabel.text = "事发地:"
             cell?.contactButton.setTitle("联系客户", for: .normal)
             cell?.dispatchButton.setTitle("指派车辆", for: .normal)
@@ -474,6 +513,20 @@ extension RescuePendingDispatchController : UITableViewDelegate,UITableViewDataS
             })
         }
         
+        if model.positionEnvironment?.label.isEmpty == false {
+            cell?.positionTitleLabel.text = "所处位置:"
+            cell?.positionLabel.text = model.positionEnvironment?.label
+            cell?.positionTitleLabel.snp.updateConstraints({ make in
+                make.top.equalTo(cell!.carTypeLabel.snp.bottom).offset(auto(8))
+            })
+        }else{
+            cell?.positionTitleLabel.text = nil
+            cell?.positionLabel.text = nil
+            cell?.positionTitleLabel.snp.updateConstraints({ make in
+                make.top.equalTo(cell!.carTypeLabel.snp.bottom).offset(auto(0))
+            })
+        }
+        
         cell?.serviceLabel.text = model.vehiclePointAddress
         
         if model.vehiclePointRemark?.isEmpty == false {
@@ -624,6 +677,7 @@ extension RescueIsIngController : UITableViewDelegate,UITableViewDataSource {
         let model = resultArr[indexPath.row]
         
         cell?.typeLabel.text = model.taskServiceName
+        cell?.orderStatusLabel.text = model.taskOrderStatusString
         cell?.orderNumLabel.text = model.orderCode
         cell?.orderDateLabel.text = model.createTime
         
@@ -652,6 +706,12 @@ extension RescueIsIngController : UITableViewDelegate,UITableViewDataSource {
             })
         }
         
+        if (model.taskOrderStatus ?? 0) >= 12001 {
+            cell?.dispatchButton.isHidden = true
+        }else{
+            cell?.dispatchButton.isHidden = false
+        }
+        
         cell?.dispatchButton.rx.tap
             .observe(on: MainScheduler.instance)
             .subscribe(onNext: {[weak self] _ in
@@ -672,7 +732,7 @@ extension RescueIsIngController : UITableViewDelegate,UITableViewDataSource {
             .subscribe(onNext: { _ in
                 WEBTOOL.open(name: .reporting,appending: "&queryType=\(OrderTypeEnum.TO_RESCUE.rawValue)&userOrderId=\(model.userOrderId)&orderCode=\(model.orderCode)")
             })
-            .disposed(by: disposeBag)
+            .disposed(by: cell!.disposeBag)
         return cell!
     }
     
@@ -724,6 +784,12 @@ class RescueController : DDViewController {
     private let disposeBag = DisposeBag()
     private let h5Relay = ReplayRelay<Any?>.create(bufferSize: 1)
     
+    private var pendingTableView : DDTableView?
+    private var dispatchTableView : DDTableView?
+    private var isRescueTableView : DDTableView?
+    
+    private var preRefreshRelay = ReplayRelay<Any?>.create(bufferSize: 1)
+    
     override func viewDidLoad() {
         super.viewDidLoad()
         dd_navigationBarBackgroundColor = .hex("354683")
@@ -738,7 +804,7 @@ class RescueController : DDViewController {
         categoryView.titles = ["待接单","待派车","救援中"]
         categoryView.titleColor = .hex("737373").alpha(0.55)
         categoryView.titleSelectedColor = .hex("3678FF")
-        categoryView.backgroundColor = .hex("F4F5F7")
+        categoryView.backgroundColor = .hex("FAFAFA")
         categoryView.delegate = self
         view.addSubview(categoryView)
         categoryView.snp.makeConstraints { make in
@@ -778,12 +844,17 @@ class RescueController : DDViewController {
             make.width.greaterThanOrEqualTo(40)
         }
     }
+    
+    override func reloadData() {
+        super.reloadData()
+        preRefreshRelay.accept(nil)
+    }
 }
 
 // MARK: 待派单
 class RescuePendingOrderController : DDViewController {
     private let disposeBag = DisposeBag()
-    private let pendingOrderView = RescuePendingOrderView()
+    public let pendingOrderView = RescuePendingOrderView()
     private var resultArr : [OrderListDataModel] = []
     private var refreshRelay = ReplayRelay<Int>.create(bufferSize: 1)
     private var pageNum : Int = 1
@@ -813,6 +884,7 @@ class RescuePendingOrderController : DDViewController {
             make.height.equalTo(auto(94))
         }
         
+        pendingOrderView.tableView.backgroundColor = .hex("FAFAFA")
         pendingOrderView.tableView.delegate = self
         pendingOrderView.tableView.dataSource = self
     }
@@ -821,7 +893,7 @@ class RescuePendingOrderController : DDViewController {
 // MARK: 待派车
 class RescuePendingDispatchController : DDViewController {
     private let disposeBag = DisposeBag()
-    private let pendingDispatchView = RescuePendingDispatchView()
+    public let pendingDispatchView = RescuePendingDispatchView()
     private var resultArr : [OrderListDataModel] = []
     private var environmentPics : [String] = []
     private var refreshRelay = ReplayRelay<Int>.create(bufferSize: 1)
@@ -849,6 +921,7 @@ class RescuePendingDispatchController : DDViewController {
             make.height.equalTo(auto(94))
         }
         
+        pendingDispatchView.tableView.backgroundColor = .hex("FAFAFA")
         pendingDispatchView.tableView.delegate = self
         pendingDispatchView.tableView.dataSource = self
     }
@@ -857,7 +930,7 @@ class RescuePendingDispatchController : DDViewController {
 // MARK: 救援中
 class RescueIsIngController : DDViewController {
     private let disposeBag = DisposeBag()
-    private let pendingIsIngView = RescueIsIngView()
+    public let pendingIsIngView = RescueIsIngView()
     private var resultArr : [OrderListDataModel] = []
     private var refreshRelay = ReplayRelay<Int>.create(bufferSize: 1)
     private var pageNum : Int = 1
@@ -884,6 +957,7 @@ class RescueIsIngController : DDViewController {
             make.height.equalTo(auto(94))
         }
         
+        pendingIsIngView.tableView.backgroundColor = .hex("FAFAFA")
         pendingIsIngView.tableView.delegate = self
         pendingIsIngView.tableView.dataSource = self
     }
@@ -970,6 +1044,7 @@ class RescuePendingOrderCell : DDTableViewCell {
         refuseButton.layer.borderColor = UIColor.hex("DDDDDD").cgColor
         refuseButton.layer.borderWidth = 1
         refuseButton.layer.cornerRadius = auto(4)
+        refuseButton.setImage(UIImage(named: "rescue_orderPending_refuse"), for: .normal)
         radiusView.addSubview(refuseButton)
         acceptButton.layer.cornerRadius = auto(4)
         acceptButton.layer.masksToBounds = true
@@ -990,7 +1065,7 @@ class RescuePendingOrderCell : DDTableViewCell {
         
         orderNumLabel.snp.makeConstraints { make in
             make.centerY.equalTo(typeLabel)
-            make.left.equalTo(typeLabel.snp.right).offset(auto(20))
+            make.left.equalTo(typeLabel.snp.right).offset(auto(10))
         }
         
         line.snp.makeConstraints { make in
@@ -1081,6 +1156,7 @@ class RescuePendingOrderCell : DDTableViewCell {
     override func layoutSubviews() {
         super.layoutSubviews()
         acceptLayer.frame = CGRectMake(0, 0, auto(80), auto(30))
+        refuseButton.dd_customize(with: .ImageLeftPaddingTitleRightWithWholeCenter, padding: 5)
     }
 
     override func prepareForReuse() {
@@ -1158,6 +1234,7 @@ class RescuePendingDispatchCell : DDTableViewCell {
         contactButton = DDButton.dd_initCustom()
         contactButton.titleLabel?.font = .mediumFont(auto(13))
         contactButton.setTitleColor(.hex("000000").alpha(0.7), for: .normal)
+        contactButton.setImage(UIImage(named: "rescue_orderDispatch_call"), for: .normal)
         dispatchButton = DDButton.dd_initCustom()
         dispatchButton.setTitleColor(.hex("FFFFFF"), for: .normal)
         dispatchButton.titleLabel?.font = .mediumFont(auto(13))
@@ -1225,7 +1302,7 @@ class RescuePendingDispatchCell : DDTableViewCell {
         
         orderNumLabel.snp.makeConstraints { make in
             make.centerY.equalTo(typeLabel)
-            make.left.equalTo(typeLabel.snp.right).offset(auto(20))
+            make.left.equalTo(typeLabel.snp.right).offset(auto(10))
         }
         
         line.snp.makeConstraints { make in
@@ -1258,12 +1335,24 @@ class RescuePendingDispatchCell : DDTableViewCell {
             make.right.equalTo(-auto(20))
         }
         
-        serviceTitleLabel.snp.makeConstraints { make in
+        positionTitleLabel.snp.makeConstraints { make in
             make.top.equalTo(carTypeLabel.snp.bottom).offset(auto(8))
             make.left.equalTo(typeLabel)
             make.width.equalTo(merchantTitleLabel)
         }
         
+        positionLabel.snp.makeConstraints { make in
+            make.top.equalTo(positionTitleLabel)
+            make.left.equalTo(positionTitleLabel.snp.right)
+            make.right.equalTo(-auto(20))
+        }
+        
+        serviceTitleLabel.snp.makeConstraints { make in
+            make.top.equalTo(positionLabel.snp.bottom).offset(auto(8))
+            make.left.equalTo(typeLabel)
+            make.width.equalTo(merchantTitleLabel)
+        }
+        
         serviceLabel.snp.makeConstraints { make in
             make.top.equalTo(serviceTitleLabel)
             make.left.equalTo(serviceTitleLabel.snp.right)
@@ -1355,6 +1444,7 @@ class RescuePendingDispatchCell : DDTableViewCell {
     override func layoutSubviews() {
         super.layoutSubviews()
         dispatchLayer.frame = CGRectMake(0, 0, auto(80), auto(30))
+        contactButton.dd_customize(with: .ImageLeftPaddingTitleRightWithWholeCenter, padding: 3)
     }
     
     override func prepareForReuse() {
@@ -1437,6 +1527,8 @@ class RescueIsIngCell : DDTableViewCell {
         contentView.addSubview(radiusView)
         radiusView.addSubview(typeLabel)
         radiusView.addSubview(orderNumLabel)
+        orderStatusLabel.numberOfLines = 0
+        orderStatusLabel.textAlignment = .right
         radiusView.addSubview(orderStatusLabel)
         radiusView.addSubview(line)
         radiusView.addSubview(orderDateLabel)
@@ -1466,15 +1558,17 @@ class RescueIsIngCell : DDTableViewCell {
             make.left.equalTo(auto(18))
             make.top.equalTo(auto(13))
         }
-        
+        orderNumLabel.setContentCompressionResistancePriority(.defaultHigh, for: .horizontal)
         orderNumLabel.snp.makeConstraints { make in
             make.centerY.equalTo(typeLabel)
-            make.left.equalTo(typeLabel.snp.right).offset(auto(20))
+            make.left.equalTo(typeLabel.snp.right).offset(auto(10))
         }
         
+        orderStatusLabel.setContentCompressionResistancePriority(.defaultLow, for: .horizontal)
         orderStatusLabel.snp.makeConstraints { make in
             make.right.equalTo(-auto(20))
             make.centerY.equalTo(orderNumLabel)
+            make.left.equalTo(orderNumLabel.snp.right).offset(auto(5))
         }
         
         line.snp.makeConstraints { make in

OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift

@@ -101,19 +101,20 @@ extension ReviewFailedController {
             })
             .disposed(by: disposeBag)
                 
-        reviewFailedView.tableView.mj_header?.beginRefreshing()
-        
         pendingTapGes.rx.event
             .observe(on: MainScheduler.instance)
             .subscribe(onNext: { _ in
                 WEBTOOL.open(name: .todoList,appending: nil)
             })
             .disposed(by: disposeBag)
-    }
         
-    public override func viewWillAppear(_ animated: Bool) {
+        preRefreshRelay
-        super.viewWillAppear(animated)
+            .observe(on: MainScheduler.instance)
+            .subscribe(onNext: {[weak self] _ in
                 NotificationCenter.default.post(name: NSNotification.Name(rawValue: Notification_reloadRescusControolerToDoMessageCount), object: nil)
+                self?.reviewFailedView.tableView.mj_header?.beginRefreshing()
+            })
+            .disposed(by: disposeBag)
     }
 }
 
@@ -133,7 +134,7 @@ extension ReviewFailedController : UITableViewDelegate,UITableViewDataSource {
             cell = ReviewFailedCell(style: .default, reuseIdentifier: "cell")
         }
         let model = resultArr[indexPath.row]
-        cell!.descLabel.text = model.auditFailReason
+        cell!.descLabel.text = "不通过原因:" + (model.auditFailReason ?? "")
         cell!.typeLabel.text = model.taskServiceName
         cell!.stateLabel.text = model.taskOrderStatusString
         cell!.orderNumLabel.text = model.orderCode
@@ -153,6 +154,7 @@ extension ReviewFailedController : UITableViewDelegate,UITableViewDataSource {
 open class ReviewFailedController : DDViewController {
     private let reviewFailedView = ReviewFailedView()
     private var pageNum : Int = 1
+    private var preRefreshRelay = ReplayRelay<Any?>.create(bufferSize: 1)
     private var refreshRelay = ReplayRelay<Int>.create(bufferSize: 1)
     private let disposeBag = DisposeBag()
     private var resultArr : [OrderListDataModel] = []
@@ -211,6 +213,11 @@ open class ReviewFailedController : DDViewController {
     open override var preferredStatusBarStyle: UIStatusBarStyle {
         return .lightContent
     }
+    
+    open override func reloadData() {
+        super.reloadData()
+        preRefreshRelay.accept(nil)
+    }
 }
 
 open class ReviewFailedView : DDView {
@@ -298,7 +305,7 @@ open class ReviewFailedCell : DDTableViewCell {
         }
         
         orderNumLabel.snp.makeConstraints { make in
-            make.left.equalTo(typeLabel.snp.right).offset(auto(20))
+            make.left.equalTo(typeLabel.snp.right).offset(auto(10))
             make.centerY.equalTo(typeLabel)
         }
         

OrderScheduling/Strings/UserDefaultStrings.swift

@@ -9,6 +9,12 @@ import Foundation
 
 public let token_key = "token_key"
 
+public let refresh_token_key = "refresh_token_key"
+
+public let phone_key = "phone_key"
+
+public let supplierName_key = "supplierName_key"
+
 public let supplierType_key = "supplierType_key"
 
 public let appUpdateIgnore_key = "appUpdateIgnore_key"

OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift

@@ -17,7 +17,7 @@ import SnapKit
 import DDTimerKit_Private
 
 fileprivate let vehicleMonitoringPannelViewHeight = auto(300)
-fileprivate let vehicleMonitoringPannelViewTopInset = auto(90)
+fileprivate let vehicleMonitoringPannelViewTopInset = auto(72)
 
 fileprivate let vehicleMonitoringPointAnnotationW = auto(120)
 fileprivate let vehicleMonitoringPointAnnotationNameLeftInset = auto(35)
@@ -161,11 +161,22 @@ extension VehicleMonitoringController {
             })
             .disposed(by: disposeBag)
         
-//        vehicleMonitoringView.refreshButton.rx.tap
+        // 点击tabBar 需要刷下下列
-//            .subscribe(onNext: {[weak self] _ in
+        preRefreshRelay
-//                self?.reloadRelay.accept(nil)
+            .observe(on: MainScheduler.instance)
-//            })
+            .subscribe(onNext: {[weak self] _ in
-//            .disposed(by: disposeBag)
+                NotificationCenter.default.post(name: NSNotification.Name(rawValue: Notification_reloadRescusControolerToDoMessageCount), object: nil)
+                self?.reloadRelay.accept(nil)
+            })
+            .disposed(by: disposeBag)
+                
+       refreshButton.rx.tap
+            .subscribe(onNext: {[weak self] _ in
+                NotificationCenter.default.post(name: NSNotification.Name(rawValue: Notification_reloadRescusControolerToDoMessageCount), object: nil)
+                self?.reloadRelay.accept(nil)
+            })
+            .disposed(by: disposeBag)
+                
 //        vehicleMonitoringView.refreshButton.sendActions(for: .touchUpInside)
 //        var duration = 0
 //        DDTimerManager.dd_share().dd_addTimer(withName: refresh_vehicle_monitoring_key, timeInterval: 1, repeatCount: 0, delay: 0) {[weak self] (manager, obj, index) in
@@ -180,10 +191,6 @@ extension VehicleMonitoringController {
 //        }
     }
     
-    public func refreshData() {
-        reloadRelay.accept(nil)
-    }
-    
     public override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         NotificationCenter.default.post(name: NSNotification.Name(rawValue: Notification_reloadRescusControolerToDoMessageCount), object: nil)
@@ -501,6 +508,8 @@ open class VehicleMonitoringController : DDViewController {
     private let messageView = MessageView()
     private let pendingTapGes = UITapGestureRecognizer()
     private let pendingView = MessageView()
+    private var preRefreshRelay = ReplayRelay<Any?>.create(bufferSize: 1)
+    public let refreshButton = DDButton.dd_initCustom()
 
     open override func viewDidLoad() {
         super.viewDidLoad()
@@ -538,15 +547,22 @@ open class VehicleMonitoringController : DDViewController {
             make.width.greaterThanOrEqualTo(40)
         }
 
-        pendingView.titleLabel.text = "待办"
+        refreshButton.setTitle("刷新", for: .normal)
-        pendingView.addGestureRecognizer(pendingTapGes)
+        refreshButton.setTitleColor(.hex("FFFFFF").alpha(0.7), for: .normal)
-        navigationItem.rightBarButtonItem = UIBarButtonItem(customView: pendingView)
+        refreshButton.titleLabel?.font = .mediumFont(auto(14))
+//        pendingView.titleLabel.text = "待办"
+//        pendingView.addGestureRecognizer(pendingTapGes)
+        navigationItem.rightBarButtonItem = UIBarButtonItem(customView: refreshButton)
         pendingView.snp.makeConstraints { make in
             make.height.equalTo(40)
             make.width.greaterThanOrEqualTo(40)
         }
     }
     
+    open override func reloadData() {
+        super.reloadData()
+        preRefreshRelay.accept(nil)
+    }
 }
 
 // MARK: UI
@@ -556,14 +572,12 @@ open class VehicleMonitoringView : DDView {
     public let coverView : DDView
     public let tapGes : UITapGestureRecognizer
     public let panGes : UIPanGestureRecognizer
-    public let refreshButton : DDButton
     public init(titles:[String]) {
         vehicleMonitoringPannelView = VehicleMonitoringPannelView(titles:titles)
         maMapView = DDMAMapView()
         coverView = DDView()
         tapGes = UITapGestureRecognizer()
         panGes = UIPanGestureRecognizer()
-        refreshButton = DDButton.dd_initCustom()
         super.init(frame: .zero)
         
         maMapView.maMapView.logoCenter = CGPoint(x: 100, y: 100)
@@ -574,11 +588,6 @@ open class VehicleMonitoringView : DDView {
         addSubview(coverView)
         vehicleMonitoringPannelView.layer.cornerRadius = auto(16)
         addSubview(vehicleMonitoringPannelView)
-        refreshButton.setTitle("手动刷新", for: .normal)
-        refreshButton.setTitleColor(.hex("000000"), for: .normal)
-        refreshButton.titleLabel?.font = .mediumFont(auto(14))
-        refreshButton.isHidden = true
-        addSubview(refreshButton)
 
         maMapView.snp.makeConstraints { make in
             make.top.left.right.equalToSuperview()
@@ -595,11 +604,6 @@ open class VehicleMonitoringView : DDView {
             make.height.equalTo(vehicleMonitoringPannelViewHeight)
         }
 
-        refreshButton.snp.makeConstraints { make in
-            make.bottom.equalTo(vehicleMonitoringPannelView.snp.top).offset(-auto(0))
-            make.right.equalTo(-auto(20))
-            make.height.equalTo(auto(30))
-        }
     }
     
     required public init?(coder: NSCoder) {
@@ -643,8 +647,9 @@ open class VehicleMonitoringPannelView : DDView {
         }
         
         tapButton.snp.makeConstraints { make in
-            make.top.equalTo(auto(7))
+            make.top.equalTo(auto(6))
-            make.height.width.equalTo(auto(23))
+            make.height.equalTo(auto(9))
+            make.width.equalTo(auto(19))
             make.centerX.equalToSuperview()
         }
         

OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringListController.swift

@@ -101,6 +101,7 @@ open class VehicleMonitoringListController : DDViewController {
             make.edges.equalToSuperview()
         }
         
+        vehicleMonitoringListView.tableView.backgroundColor = .hex("FAFAFA")
         vehicleMonitoringListView.tableView.addSubview(emptyView)
         emptyView.snp.makeConstraints { make in
             make.centerX.centerY.equalToSuperview()
@@ -203,8 +204,8 @@ open  class VehicleMonitoringListCell : DDTableViewCell {
         radiusView.addSubview(line)
         
         radiusView.snp.makeConstraints { make in
-            make.edges.equalToSuperview()
             make.height.greaterThanOrEqualTo(auto(44))
+            make.edges.equalToSuperview()
         }
         
         icon.snp.makeConstraints { make in

Podfile

@@ -17,7 +17,7 @@ target 'OrderScheduling' do
   pod 'IQKeyboardManagerSwift'
   pod 'DDMAMapKit_Private'
   pod 'SnapKit'
-  pod 'DDAutoUIKit_Private'
+  pod 'DDAutoUIKit_Private', :path=> '/Users/zd/Desktop/PodRepository/DDAutoUIKit_Private'
   pod 'RxSwift'
   pod 'RxRelay'
   pod 'RxCocoa'
@@ -26,7 +26,7 @@ target 'OrderScheduling' do
   pod 'DDNetworkingOfAlamofireKit_Private'
   pod 'DDProgressHUDKit_Private', :path=> '/Users/zd/Desktop/PodRepository/DDProgressHUDKit_Private'
   pod 'JXCategoryView'
-  pod 'DDControlsKit_Private'
+  pod 'DDControlsKit_Private', :path=> '/Users/zd/Desktop/PodRepository/DDControlsKit_Private'
   pod 'SwiftEntryKit'
   pod 'MJRefresh'
   pod 'DDWebImageKit_Private'

Podfile.lock

@@ -305,11 +305,11 @@ PODS:
 
 DEPENDENCIES:
   - CocoaDebug
-  - DDAutoUIKit_Private
+  - DDAutoUIKit_Private (from `/Users/zd/Desktop/PodRepository/DDAutoUIKit_Private`)
   - DDBasicControlsKit_Private
   - DDCategoryKit_Private
   - DDColorKit_Private
-  - DDControlsKit_Private
+  - DDControlsKit_Private (from `/Users/zd/Desktop/PodRepository/DDControlsKit_Private`)
   - DDFontKit_Private
   - DDMAMapKit_Private
   - DDNetworkingOfAlamofireKit_Private
@@ -334,11 +334,9 @@ DEPENDENCIES:
 
 SPEC REPOS:
   "git@github.com:DDIsFriend/DDSpecs.git":
-    - DDAutoUIKit_Private
     - DDBasicControlsKit_Private
     - DDCategoryKit_Private
     - DDColorKit_Private
-    - DDControlsKit_Private
     - DDFontKit_Private
     - DDLogKit_Private
     - DDMAMapKit_Private
@@ -369,6 +367,10 @@ SPEC REPOS:
     - ZLPhotoBrowser
 
 EXTERNAL SOURCES:
+  DDAutoUIKit_Private:
+    :path: "/Users/zd/Desktop/PodRepository/DDAutoUIKit_Private"
+  DDControlsKit_Private:
+    :path: "/Users/zd/Desktop/PodRepository/DDControlsKit_Private"
   DDProgressHUDKit_Private:
     :path: "/Users/zd/Desktop/PodRepository/DDProgressHUDKit_Private"
   ZFPlayer:
@@ -382,11 +384,11 @@ SPEC CHECKSUMS:
   AMapSearch-NO-IDFA: 10cbd3ad7d122045a0c1f5760f6d46ff576ca918
   AMapTrack-NO-IDFA: 7109cf1867f5d6c407c8191492b1f73101e1682e
   CocoaDebug: b38d31464b91a9775928f8667d114db07b136565
-  DDAutoUIKit_Private: 4d031662fdd86c46b1dc4b88271f2303661225fd
+  DDAutoUIKit_Private: d7affa08352048c3d36816ebcfd1eeb02b381425
   DDBasicControlsKit_Private: 04e64a24551a24e76555835fc14002415db80f94
   DDCategoryKit_Private: db12e3f6923e2309dd1894fc36c967d6bce94605
   DDColorKit_Private: 77fddb62410a2d5e6fb003083d233c0d7ea0a08f
-  DDControlsKit_Private: f304e041bb171c6cfacaf0fc55c967fd395cf645
+  DDControlsKit_Private: d121dabf9283ed8c411eb30c8f8632db2a7443da
   DDFontKit_Private: 7b8f4ebf0f60622874036202734d8460dc7b3806
   DDLogKit_Private: 1ed442cc7be004bd05f27bfda9b525e113df54e0
   DDMAMapKit_Private: 8e70d3f58cb70ce30705a2f10d696e42878ce52d
@@ -410,6 +412,6 @@ SPEC CHECKSUMS:
   ZFPlayer: ba6410f1043fc8a3b7769749f860cf237016df09
   ZLPhotoBrowser: 0563c2bfc7b247b65d023d646012f46cba94101b
 
-PODFILE CHECKSUM: bcbd7bb02cdf74bee6af46549ebabe072e53ecf7
+PODFILE CHECKSUM: 5766281205a5a16e2d8cd8bd0bdbf93f77194211
 
 COCOAPODS: 1.11.3

Pods/Local Podspecs/DDAutoUIKit_Private.podspec.json

@@ -0,0 +1,27 @@
+{
+  "name": "DDAutoUIKit_Private",
+  "version": "0.1.2",
+  "summary": "A short description of DDAutoUIKit_Private.",
+  "description": "TODO: Add long description of the pod here.",
+  "homepage": "https://github.com/DDIsFriend/DDAutoUIKit_Private",
+  "license": {
+    "type": "MIT",
+    "file": "LICENSE"
+  },
+  "authors": {
+    "DDIsFriend": "DDIsFriend@163.com"
+  },
+  "source": {
+    "git": "git@github.com:DDIsFriend/DDAutoUIKit_Private.git",
+    "tag": "0.1.2"
+  },
+  "platforms": {
+    "ios": "11.0"
+  },
+  "source_files": "DDAutoUIKit_Private/Classes/**/*",
+  "pod_target_xcconfig": {
+    "VALID_ARCHS": "x86_64 armv7 arm64",
+    "EXCLUDED_ARCHS[sdk=iphonesimulator*]": "arm64",
+    "OTHER_LINKER_FLAGS": "$(inherited)"
+  }
+}

Pods/Local Podspecs/DDControlsKit_Private.podspec.json

@@ -0,0 +1,164 @@
+{
+  "name": "DDControlsKit_Private",
+  "version": "0.1.1",
+  "summary": "A short description of DDControlsKit_Private.",
+  "description": "TODO: Add long description of the pod here.",
+  "homepage": "https://github.com/DDIsFriend/DDControlsKit_Private",
+  "license": {
+    "type": "MIT",
+    "file": "LICENSE"
+  },
+  "authors": {
+    "DDIsFriend": "DDIsFriend@163.com"
+  },
+  "source": {
+    "git": "git@github.com:DDIsFriend/DDControlsKit_Private.git",
+    "tag": "0.1.1"
+  },
+  "platforms": {
+    "ios": "11.0"
+  },
+  "source_files": "DDControlsKit_Private/Classes/**/*",
+  "pod_target_xcconfig": {
+    "VALID_ARCHS": "x86_64 armv7 arm64",
+    "EXCLUDED_ARCHS[sdk=iphonesimulator*]": "arm64",
+    "OTHER_LINKER_FLAGS": "$(inherited)"
+  },
+  "subspecs": [
+    {
+      "name": "DDButton",
+      "source_files": "DDControlsKit_Private/Classes/DDButton/*",
+      "dependencies": {
+        "DDBasicControlsKit_Private/DDBaseButton": [
+
+        ]
+      }
+    },
+    {
+      "name": "DDLabel",
+      "source_files": "DDControlsKit_Private/Classes/DDLabel/*",
+      "dependencies": {
+        "DDBasicControlsKit_Private/DDBaseLabel": [
+
+        ]
+      }
+    },
+    {
+      "name": "DDTableView",
+      "source_files": "DDControlsKit_Private/Classes/DDTableView/*",
+      "dependencies": {
+        "DDBasicControlsKit_Private/DDBaseTableView": [
+
+        ]
+      }
+    },
+    {
+      "name": "DDTableViewCell",
+      "source_files": "DDControlsKit_Private/Classes/DDTableViewCell/*",
+      "dependencies": {
+        "DDBasicControlsKit_Private/DDBaseTableViewCell": [
+
+        ]
+      }
+    },
+    {
+      "name": "DDViewController",
+      "source_files": "DDControlsKit_Private/Classes/DDViewController/*",
+      "dependencies": {
+        "DDBasicControlsKit_Private/DDBaseViewController": [
+
+        ]
+      }
+    },
+    {
+      "name": "DDView",
+      "source_files": "DDControlsKit_Private/Classes/DDView/*",
+      "dependencies": {
+        "DDBasicControlsKit_Private/DDBaseView": [
+
+        ]
+      }
+    },
+    {
+      "name": "DDImage",
+      "source_files": "DDControlsKit_Private/Classes/DDImage/*",
+      "dependencies": {
+        "DDBasicControlsKit_Private/DDBaseImage": [
+
+        ]
+      }
+    },
+    {
+      "name": "DDImageView",
+      "source_files": "DDControlsKit_Private/Classes/DDImageView/*",
+      "dependencies": {
+        "DDBasicControlsKit_Private/DDBaseImageView": [
+
+        ]
+      }
+    },
+    {
+      "name": "DDTextField",
+      "source_files": "DDControlsKit_Private/Classes/DDTextField/*",
+      "dependencies": {
+        "DDBasicControlsKit_Private/DDBaseTextField": [
+
+        ]
+      }
+    },
+    {
+      "name": "DDTextView",
+      "source_files": "DDControlsKit_Private/Classes/DDTextView/*",
+      "dependencies": {
+        "DDBasicControlsKit_Private/DDBaseTextView": [
+
+        ]
+      }
+    },
+    {
+      "name": "DDNavigationController",
+      "source_files": "DDControlsKit_Private/Classes/DDNavigationController/*",
+      "dependencies": {
+        "DDBasicControlsKit_Private/DDBaseNavigationController": [
+
+        ]
+      }
+    },
+    {
+      "name": "DDAttributedString",
+      "source_files": "DDControlsKit_Private/Classes/DDAttributedString/*",
+      "dependencies": {
+        "DDBasicControlsKit_Private/DDBaseAttributedString": [
+
+        ]
+      }
+    },
+    {
+      "name": "DDScrollView",
+      "source_files": "DDControlsKit_Private/Classes/DDScrollView/*",
+      "dependencies": {
+        "DDBasicControlsKit_Private/DDBaseScrollView": [
+
+        ]
+      }
+    },
+    {
+      "name": "DDCollectionView",
+      "source_files": "DDControlsKit_Private/Classes/DDCollectionView/*",
+      "dependencies": {
+        "DDBasicControlsKit_Private/DDBaseCollectionView": [
+
+        ]
+      }
+    },
+    {
+      "name": "DDCollectionViewCell",
+      "source_files": "DDControlsKit_Private/Classes/DDCollectionViewCell/*",
+      "dependencies": {
+        "DDBasicControlsKit_Private/DDBaseCollectionViewCell": [
+
+        ]
+      }
+    }
+  ]
+}

Pods/Manifest.lock

@@ -305,11 +305,11 @@ PODS:
 
 DEPENDENCIES:
   - CocoaDebug
-  - DDAutoUIKit_Private
+  - DDAutoUIKit_Private (from `/Users/zd/Desktop/PodRepository/DDAutoUIKit_Private`)
   - DDBasicControlsKit_Private
   - DDCategoryKit_Private
   - DDColorKit_Private
-  - DDControlsKit_Private
+  - DDControlsKit_Private (from `/Users/zd/Desktop/PodRepository/DDControlsKit_Private`)
   - DDFontKit_Private
   - DDMAMapKit_Private
   - DDNetworkingOfAlamofireKit_Private
@@ -334,11 +334,9 @@ DEPENDENCIES:
 
 SPEC REPOS:
   "git@github.com:DDIsFriend/DDSpecs.git":
-    - DDAutoUIKit_Private
     - DDBasicControlsKit_Private
     - DDCategoryKit_Private
     - DDColorKit_Private
-    - DDControlsKit_Private
     - DDFontKit_Private
     - DDLogKit_Private
     - DDMAMapKit_Private
@@ -369,6 +367,10 @@ SPEC REPOS:
     - ZLPhotoBrowser
 
 EXTERNAL SOURCES:
+  DDAutoUIKit_Private:
+    :path: "/Users/zd/Desktop/PodRepository/DDAutoUIKit_Private"
+  DDControlsKit_Private:
+    :path: "/Users/zd/Desktop/PodRepository/DDControlsKit_Private"
   DDProgressHUDKit_Private:
     :path: "/Users/zd/Desktop/PodRepository/DDProgressHUDKit_Private"
   ZFPlayer:
@@ -382,11 +384,11 @@ SPEC CHECKSUMS:
   AMapSearch-NO-IDFA: 10cbd3ad7d122045a0c1f5760f6d46ff576ca918
   AMapTrack-NO-IDFA: 7109cf1867f5d6c407c8191492b1f73101e1682e
   CocoaDebug: b38d31464b91a9775928f8667d114db07b136565
-  DDAutoUIKit_Private: 4d031662fdd86c46b1dc4b88271f2303661225fd
+  DDAutoUIKit_Private: d7affa08352048c3d36816ebcfd1eeb02b381425
   DDBasicControlsKit_Private: 04e64a24551a24e76555835fc14002415db80f94
   DDCategoryKit_Private: db12e3f6923e2309dd1894fc36c967d6bce94605
   DDColorKit_Private: 77fddb62410a2d5e6fb003083d233c0d7ea0a08f
-  DDControlsKit_Private: f304e041bb171c6cfacaf0fc55c967fd395cf645
+  DDControlsKit_Private: d121dabf9283ed8c411eb30c8f8632db2a7443da
   DDFontKit_Private: 7b8f4ebf0f60622874036202734d8460dc7b3806
   DDLogKit_Private: 1ed442cc7be004bd05f27bfda9b525e113df54e0
   DDMAMapKit_Private: 8e70d3f58cb70ce30705a2f10d696e42878ce52d
@@ -410,6 +412,6 @@ SPEC CHECKSUMS:
   ZFPlayer: ba6410f1043fc8a3b7769749f860cf237016df09
   ZLPhotoBrowser: 0563c2bfc7b247b65d023d646012f46cba94101b
 
-PODFILE CHECKSUM: bcbd7bb02cdf74bee6af46549ebabe072e53ecf7
+PODFILE CHECKSUM: 5766281205a5a16e2d8cd8bd0bdbf93f77194211
 
 COCOAPODS: 1.11.3

Pods/Target Support Files/DDAutoUIKit_Private/DDAutoUIKit_Private.debug.xcconfig

@@ -6,7 +6,7 @@ OTHER_SWIFT_FLAGS = $(inherited) -D COCOAPODS -import-underlying-module -Xcc -fm
 PODS_BUILD_DIR = ${BUILD_DIR}
 PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
 PODS_ROOT = ${SRCROOT}
-PODS_TARGET_SRCROOT = ${PODS_ROOT}/DDAutoUIKit_Private
+PODS_TARGET_SRCROOT = ${PODS_ROOT}/../../../PodRepository/DDAutoUIKit_Private
 PODS_XCFRAMEWORKS_BUILD_DIR = $(PODS_CONFIGURATION_BUILD_DIR)/XCFrameworkIntermediates
 PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}
 SKIP_INSTALL = YES

Pods/Target Support Files/DDAutoUIKit_Private/DDAutoUIKit_Private.release.xcconfig

@@ -6,7 +6,7 @@ OTHER_SWIFT_FLAGS = $(inherited) -D COCOAPODS -import-underlying-module -Xcc -fm
 PODS_BUILD_DIR = ${BUILD_DIR}
 PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
 PODS_ROOT = ${SRCROOT}
-PODS_TARGET_SRCROOT = ${PODS_ROOT}/DDAutoUIKit_Private
+PODS_TARGET_SRCROOT = ${PODS_ROOT}/../../../PodRepository/DDAutoUIKit_Private
 PODS_XCFRAMEWORKS_BUILD_DIR = $(PODS_CONFIGURATION_BUILD_DIR)/XCFrameworkIntermediates
 PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}
 SKIP_INSTALL = YES

Pods/Target Support Files/DDControlsKit_Private/DDControlsKit_Private.debug.xcconfig

@@ -8,7 +8,7 @@ OTHER_SWIFT_FLAGS = $(inherited) -D COCOAPODS -Xcc -fmodule-map-file="${PODS_CON
 PODS_BUILD_DIR = ${BUILD_DIR}
 PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
 PODS_ROOT = ${SRCROOT}
-PODS_TARGET_SRCROOT = ${PODS_ROOT}/DDControlsKit_Private
+PODS_TARGET_SRCROOT = ${PODS_ROOT}/../../../PodRepository/DDControlsKit_Private
 PODS_XCFRAMEWORKS_BUILD_DIR = $(PODS_CONFIGURATION_BUILD_DIR)/XCFrameworkIntermediates
 PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}
 SKIP_INSTALL = YES

Pods/Target Support Files/DDControlsKit_Private/DDControlsKit_Private.release.xcconfig

@@ -8,7 +8,7 @@ OTHER_SWIFT_FLAGS = $(inherited) -D COCOAPODS -Xcc -fmodule-map-file="${PODS_CON
 PODS_BUILD_DIR = ${BUILD_DIR}
 PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
 PODS_ROOT = ${SRCROOT}
-PODS_TARGET_SRCROOT = ${PODS_ROOT}/DDControlsKit_Private
+PODS_TARGET_SRCROOT = ${PODS_ROOT}/../../../PodRepository/DDControlsKit_Private
 PODS_XCFRAMEWORKS_BUILD_DIR = $(PODS_CONFIGURATION_BUILD_DIR)/XCFrameworkIntermediates
 PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}
 SKIP_INSTALL = YES