This commit is contained in:
DDIsFriend
2023-08-29 17:10:59 +08:00
parent b6ef0cfb06
commit 00b875d351
55 changed files with 8375 additions and 7831 deletions

BIN
.DS_Store vendored

Binary file not shown.

View File

@@ -46,8 +46,8 @@
filePath = "OrderScheduling/Login/ViewController/LoginController.swift" filePath = "OrderScheduling/Login/ViewController/LoginController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "238" startingLineNumber = "240"
endingLineNumber = "238" endingLineNumber = "240"
landmarkName = "textView(_:shouldInteractWith:in:interaction:)" landmarkName = "textView(_:shouldInteractWith:in:interaction:)"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@@ -62,8 +62,8 @@
filePath = "OrderScheduling/Login/ViewController/LoginController.swift" filePath = "OrderScheduling/Login/ViewController/LoginController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "242" startingLineNumber = "244"
endingLineNumber = "242" endingLineNumber = "244"
landmarkName = "textView(_:shouldInteractWith:in:interaction:)" landmarkName = "textView(_:shouldInteractWith:in:interaction:)"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@@ -507,22 +507,6 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "633"
endingLineNumber = "633"
landmarkName = "tableView(_:cellForRowAt:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "3C85B6CD-B7F7-4BB0-8E26-472D0D4D68D3"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "634" startingLineNumber = "634"
endingLineNumber = "634" endingLineNumber = "634"
landmarkName = "tableView(_:cellForRowAt:)" landmarkName = "tableView(_:cellForRowAt:)"
@@ -555,8 +539,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "780" startingLineNumber = "784"
endingLineNumber = "780" endingLineNumber = "784"
landmarkName = "collectionView(_:cellForItemAt:)" landmarkName = "collectionView(_:cellForItemAt:)"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@@ -571,8 +555,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "781" startingLineNumber = "785"
endingLineNumber = "781" endingLineNumber = "785"
landmarkName = "collectionView(_:cellForItemAt:)" landmarkName = "collectionView(_:cellForItemAt:)"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@@ -1098,8 +1082,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescuePhotoController.swift" filePath = "OrderScheduling/Rescue/ViewController/RescuePhotoController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "129" startingLineNumber = "130"
endingLineNumber = "129" endingLineNumber = "130"
landmarkName = "viewDidLoad()" landmarkName = "viewDidLoad()"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@@ -1130,8 +1114,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescuePhotoController.swift" filePath = "OrderScheduling/Rescue/ViewController/RescuePhotoController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "118" startingLineNumber = "119"
endingLineNumber = "118" endingLineNumber = "119"
landmarkName = "viewDidLoad()" landmarkName = "viewDidLoad()"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@@ -1226,8 +1210,8 @@
filePath = "OrderScheduling/Common/WebView/WebViewTool.swift" filePath = "OrderScheduling/Common/WebView/WebViewTool.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "54" startingLineNumber = "55"
endingLineNumber = "54" endingLineNumber = "55"
landmarkName = "init()" landmarkName = "init()"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@@ -1322,8 +1306,8 @@
filePath = "OrderScheduling/Common/WebView/WebViewController.swift" filePath = "OrderScheduling/Common/WebView/WebViewController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "107" startingLineNumber = "108"
endingLineNumber = "107" endingLineNumber = "108"
landmarkName = "userContentController(_:didReceive:)" landmarkName = "userContentController(_:didReceive:)"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@@ -1338,8 +1322,8 @@
filePath = "OrderScheduling/Common/WebView/WebViewController.swift" filePath = "OrderScheduling/Common/WebView/WebViewController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "111" startingLineNumber = "119"
endingLineNumber = "111" endingLineNumber = "119"
landmarkName = "userContentController(_:didReceive:)" landmarkName = "userContentController(_:didReceive:)"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@@ -1481,8 +1465,8 @@
filePath = "OrderScheduling/Main/AppDelegate.swift" filePath = "OrderScheduling/Main/AppDelegate.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "129" startingLineNumber = "133"
endingLineNumber = "129" endingLineNumber = "133"
landmarkName = "jpushNotificationAuthorization(_:withInfo:)" landmarkName = "jpushNotificationAuthorization(_:withInfo:)"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@@ -1497,8 +1481,8 @@
filePath = "OrderScheduling/Main/AppDelegate.swift" filePath = "OrderScheduling/Main/AppDelegate.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "116" startingLineNumber = "120"
endingLineNumber = "116" endingLineNumber = "120"
landmarkName = "jpushNotificationCenter(_:didReceive:withCompletionHandler:)" landmarkName = "jpushNotificationCenter(_:didReceive:withCompletionHandler:)"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@@ -1593,8 +1577,8 @@
filePath = "OrderScheduling/Login/ViewController/LoginController.swift" filePath = "OrderScheduling/Login/ViewController/LoginController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "172" startingLineNumber = "174"
endingLineNumber = "172" endingLineNumber = "174"
landmarkName = "addActions()" landmarkName = "addActions()"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@@ -1689,10 +1673,10 @@
filePath = "OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift" filePath = "OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "226" startingLineNumber = "227"
endingLineNumber = "226" endingLineNumber = "227"
landmarkName = "preferredStatusBarStyle" landmarkName = "reloadData()"
landmarkType = "24"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
</BreakpointProxy> </BreakpointProxy>
<BreakpointProxy <BreakpointProxy
@@ -1769,8 +1753,8 @@
filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringListController.swift" filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringListController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "124" startingLineNumber = "125"
endingLineNumber = "124" endingLineNumber = "125"
landmarkName = "viewDidLoad()" landmarkName = "viewDidLoad()"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@@ -1785,8 +1769,8 @@
filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringListController.swift" filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringListController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "125" startingLineNumber = "126"
endingLineNumber = "125" endingLineNumber = "126"
landmarkName = "viewDidLoad()" landmarkName = "viewDidLoad()"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@@ -1801,8 +1785,8 @@
filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringListController.swift" filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringListController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "112" startingLineNumber = "113"
endingLineNumber = "112" endingLineNumber = "113"
landmarkName = "viewDidLoad()" landmarkName = "viewDidLoad()"
landmarkType = "7"> landmarkType = "7">
<Locations> <Locations>
@@ -1849,8 +1833,8 @@
filePath = "OrderScheduling/Common/WebView/WebViewController.swift" filePath = "OrderScheduling/Common/WebView/WebViewController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "116" startingLineNumber = "124"
endingLineNumber = "116" endingLineNumber = "124"
landmarkName = "webView(_:didFinish:)" landmarkName = "webView(_:didFinish:)"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@@ -1865,8 +1849,8 @@
filePath = "OrderScheduling/Common/WebView/WebViewController.swift" filePath = "OrderScheduling/Common/WebView/WebViewController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "123" startingLineNumber = "131"
endingLineNumber = "123" endingLineNumber = "131"
landmarkName = "webView(_:didFail:withError:)" landmarkName = "webView(_:didFail:withError:)"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@@ -1881,8 +1865,8 @@
filePath = "OrderScheduling/Common/WebView/WebViewController.swift" filePath = "OrderScheduling/Common/WebView/WebViewController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "131" startingLineNumber = "139"
endingLineNumber = "131" endingLineNumber = "139"
landmarkName = "webView(_:didFailProvisionalNavigation:withError:)" landmarkName = "webView(_:didFailProvisionalNavigation:withError:)"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@@ -1897,8 +1881,8 @@
filePath = "OrderScheduling/Common/WebView/WebViewController.swift" filePath = "OrderScheduling/Common/WebView/WebViewController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "130" startingLineNumber = "138"
endingLineNumber = "130" endingLineNumber = "138"
landmarkName = "webView(_:didFailProvisionalNavigation:withError:)" landmarkName = "webView(_:didFailProvisionalNavigation:withError:)"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@@ -2138,54 +2122,6 @@
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
</BreakpointProxy> </BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "6F7DAE80-611A-4615-A0C6-C4BF6DAAEDFE"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "OrderScheduling/Main/AppDelegate.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "108"
endingLineNumber = "108"
landmarkName = "jpushNotificationCenter(_:willPresent:withCompletionHandler:)"
landmarkType = "7">
<Locations>
<Location
uuid = "6F7DAE80-611A-4615-A0C6-C4BF6DAAEDFE - 80f31cf5eda31929"
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 = "115"
endingLineNumber = "115"
offsetFromSymbolStart = "1054">
</Location>
<Location
uuid = "6F7DAE80-611A-4615-A0C6-C4BF6DAAEDFE - 80f31cf5eda31929"
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 = "115"
endingLineNumber = "115"
offsetFromSymbolStart = "760">
</Location>
</Locations>
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy <BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint"> BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent <BreakpointContent
@@ -2196,8 +2132,8 @@
filePath = "OrderScheduling/Main/AppDelegate.swift" filePath = "OrderScheduling/Main/AppDelegate.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "121" startingLineNumber = "125"
endingLineNumber = "121" endingLineNumber = "125"
landmarkName = "jpushNotificationCenter(_:didReceive:withCompletionHandler:)" landmarkName = "jpushNotificationCenter(_:didReceive:withCompletionHandler:)"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@@ -2281,54 +2217,6 @@
</Locations> </Locations>
</BreakpointContent> </BreakpointContent>
</BreakpointProxy> </BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "8CA7DEF3-5FE4-4FBB-9096-8677AF495A36"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "OrderScheduling/Main/AppDelegate.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "106"
endingLineNumber = "106"
landmarkName = "jpushNotificationCenter(_:willPresent:withCompletionHandler:)"
landmarkType = "7">
<Locations>
<Location
uuid = "8CA7DEF3-5FE4-4FBB-9096-8677AF495A36 - 80f31cf5eda316ca"
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 = "114"
endingLineNumber = "114"
offsetFromSymbolStart = "580">
</Location>
<Location
uuid = "8CA7DEF3-5FE4-4FBB-9096-8677AF495A36 - 80f31cf5eda31929"
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 = "115"
endingLineNumber = "115"
offsetFromSymbolStart = "684">
</Location>
</Locations>
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy <BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint"> BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent <BreakpointContent
@@ -2499,8 +2387,8 @@
filePath = "OrderScheduling/Main/AppDelegate.swift" filePath = "OrderScheduling/Main/AppDelegate.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "119" startingLineNumber = "123"
endingLineNumber = "119" endingLineNumber = "123"
landmarkName = "jpushNotificationCenter(_:didReceive:withCompletionHandler:)" landmarkName = "jpushNotificationCenter(_:didReceive:withCompletionHandler:)"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@@ -2883,8 +2771,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "777" startingLineNumber = "781"
endingLineNumber = "777" endingLineNumber = "781"
landmarkName = "collectionView(_:cellForItemAt:)" landmarkName = "collectionView(_:cellForItemAt:)"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@@ -2899,8 +2787,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "775" startingLineNumber = "779"
endingLineNumber = "775" endingLineNumber = "779"
landmarkName = "collectionView(_:cellForItemAt:)" landmarkName = "collectionView(_:cellForItemAt:)"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@@ -2915,8 +2803,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "776" startingLineNumber = "780"
endingLineNumber = "776" endingLineNumber = "780"
landmarkName = "collectionView(_:cellForItemAt:)" landmarkName = "collectionView(_:cellForItemAt:)"
landmarkType = "7"> landmarkType = "7">
<Locations> <Locations>
@@ -3011,11 +2899,372 @@
filePath = "../../PodRepository/DDCategoryKit_Private/DDCategoryKit_Private/Classes/UIImage+DDCategory/UIImage+DDCategory.m" filePath = "../../PodRepository/DDCategoryKit_Private/DDCategoryKit_Private/Classes/UIImage+DDCategory/UIImage+DDCategory.m"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "51" startingLineNumber = "49"
endingLineNumber = "51" endingLineNumber = "49"
landmarkName = "-dd_compressWithQulitySize:" landmarkName = "-dd_compressWithQulitySize:"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
</BreakpointProxy> </BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "5C9E5421-153E-4A4A-9ABD-B29EB3F0B869"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringListController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "110"
endingLineNumber = "110"
landmarkName = "viewDidLoad()"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "3FEFBA8A-365F-4B01-9378-568C33CD47C2"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "555"
endingLineNumber = "555"
landmarkName = "viewDidAppear(_:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "2BD300DA-F1F1-4EFF-8F4D-07D2708EB780"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "511"
endingLineNumber = "511"
landmarkName = "viewDidLoad()"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "5B255FEA-20A3-49CB-96F1-D588C15FCCC4"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "OrderScheduling/Rescue/ViewController/RescuePhotoController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "98"
endingLineNumber = "98"
landmarkName = "init(environmentPics:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "B342F1B6-F183-454E-BAD6-5844C94C2F27"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "797"
endingLineNumber = "797"
landmarkName = "collectionView(_:didSelectItemAt:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "247E30A4-6789-4F0D-9A9C-9C3732C6A944"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "OrderScheduling/Common/WebView/WebViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "110"
endingLineNumber = "110"
landmarkName = "userContentController(_:didReceive:)"
landmarkType = "7">
<Locations>
<Location
uuid = "247E30A4-6789-4F0D-9A9C-9C3732C6A944 - eaec1614761dc7d9"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "OrderScheduling.WebViewController.userContentController(_: __C.WKUserContentController, didReceive: __C.WKScriptMessage) -&gt; ()"
moduleName = "OrderScheduling"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/zd/Desktop/%E4%B8%AD%E9%81%93%E6%95%91%E6%8F%B4/OrderScheduling/OrderScheduling/Common/WebView/WebViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "109"
endingLineNumber = "109"
offsetFromSymbolStart = "200">
</Location>
<Location
uuid = "247E30A4-6789-4F0D-9A9C-9C3732C6A944 - eaec1614761dc7d9"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "OrderScheduling.WebViewController.userContentController(_: __C.WKUserContentController, didReceive: __C.WKScriptMessage) -&gt; ()"
moduleName = "OrderScheduling"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/zd/Desktop/%E4%B8%AD%E9%81%93%E6%95%91%E6%8F%B4/OrderScheduling/OrderScheduling/Common/WebView/WebViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "109"
endingLineNumber = "109"
offsetFromSymbolStart = "299">
</Location>
<Location
uuid = "247E30A4-6789-4F0D-9A9C-9C3732C6A944 - eaec1614761dc7f8"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "OrderScheduling.WebViewController.userContentController(_: __C.WKUserContentController, didReceive: __C.WKScriptMessage) -&gt; ()"
moduleName = "OrderScheduling"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/zd/Desktop/%E4%B8%AD%E9%81%93%E6%95%91%E6%8F%B4/OrderScheduling/OrderScheduling/Common/WebView/WebViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "110"
endingLineNumber = "110"
offsetFromSymbolStart = "636">
</Location>
<Location
uuid = "247E30A4-6789-4F0D-9A9C-9C3732C6A944 - eaec1614761dc7f8"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "OrderScheduling.WebViewController.userContentController(_: __C.WKUserContentController, didReceive: __C.WKScriptMessage) -&gt; ()"
moduleName = "OrderScheduling"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/zd/Desktop/%E4%B8%AD%E9%81%93%E6%95%91%E6%8F%B4/OrderScheduling/OrderScheduling/Common/WebView/WebViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "110"
endingLineNumber = "110"
offsetFromSymbolStart = "643">
</Location>
</Locations>
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "C788233F-60B4-4FAD-8146-B61792267A7A"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "OrderSchedulingNotificationService/NotificationService.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "35"
endingLineNumber = "35"
landmarkName = "didReceive(_:withContentHandler:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "AE73D0A1-4B76-48CE-B9B1-7F631C9CBC4D"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "OrderSchedulingNotificationService/NotificationService.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "43"
endingLineNumber = "43"
landmarkName = "didReceive(_:withContentHandler:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "FAF5DAA8-6E3B-4351-B429-232730CA6298"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "OrderScheduling/Main/AppDelegate.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "108"
endingLineNumber = "108"
landmarkName = "jpushNotificationCenter(_:willPresent:withCompletionHandler:)"
landmarkType = "7">
<Locations>
<Location
uuid = "FAF5DAA8-6E3B-4351-B429-232730CA6298 - 80f31cf5eda31600"
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 = "108"
endingLineNumber = "108"
offsetFromSymbolStart = "948">
</Location>
<Location
uuid = "FAF5DAA8-6E3B-4351-B429-232730CA6298 - 80f31cf5eda31600"
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 = "108"
endingLineNumber = "108"
offsetFromSymbolStart = "1476">
</Location>
</Locations>
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "C5528410-7019-46FD-A2E1-26E773AF7568"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "OrderScheduling/Common/WebView/WebViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "115"
endingLineNumber = "115"
landmarkName = "userContentController(_:didReceive:)"
landmarkType = "7">
<Locations>
<Location
uuid = "C5528410-7019-46FD-A2E1-26E773AF7568 - eaec1614761dc693"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "OrderScheduling.WebViewController.userContentController(_: __C.WKUserContentController, didReceive: __C.WKScriptMessage) -&gt; ()"
moduleName = "OrderScheduling"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/zd/Desktop/%E4%B8%AD%E9%81%93%E6%95%91%E6%8F%B4/OrderScheduling/OrderScheduling/Common/WebView/WebViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "115"
endingLineNumber = "115"
offsetFromSymbolStart = "1992">
</Location>
<Location
uuid = "C5528410-7019-46FD-A2E1-26E773AF7568 - eaec1614761dc693"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "OrderScheduling.WebViewController.userContentController(_: __C.WKUserContentController, didReceive: __C.WKScriptMessage) -&gt; ()"
moduleName = "OrderScheduling"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/zd/Desktop/%E4%B8%AD%E9%81%93%E6%95%91%E6%8F%B4/OrderScheduling/OrderScheduling/Common/WebView/WebViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "115"
endingLineNumber = "115"
offsetFromSymbolStart = "1996">
</Location>
<Location
uuid = "C5528410-7019-46FD-A2E1-26E773AF7568 - eaec1614761dc693"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "OrderScheduling.WebViewController.userContentController(_: __C.WKUserContentController, didReceive: __C.WKScriptMessage) -&gt; ()"
moduleName = "OrderScheduling"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/zd/Desktop/%E4%B8%AD%E9%81%93%E6%95%91%E6%8F%B4/OrderScheduling/OrderScheduling/Common/WebView/WebViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "115"
endingLineNumber = "115"
offsetFromSymbolStart = "2056">
</Location>
<Location
uuid = "C5528410-7019-46FD-A2E1-26E773AF7568 - eaec1614761dc693"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "OrderScheduling.WebViewController.userContentController(_: __C.WKUserContentController, didReceive: __C.WKScriptMessage) -&gt; ()"
moduleName = "OrderScheduling"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/zd/Desktop/%E4%B8%AD%E9%81%93%E6%95%91%E6%8F%B4/OrderScheduling/OrderScheduling/Common/WebView/WebViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "115"
endingLineNumber = "115"
offsetFromSymbolStart = "2144">
</Location>
<Location
uuid = "C5528410-7019-46FD-A2E1-26E773AF7568 - eaec1614761dc693"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "OrderScheduling.WebViewController.userContentController(_: __C.WKUserContentController, didReceive: __C.WKScriptMessage) -&gt; ()"
moduleName = "OrderScheduling"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/zd/Desktop/%E4%B8%AD%E9%81%93%E6%95%91%E6%8F%B4/OrderScheduling/OrderScheduling/Common/WebView/WebViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "115"
endingLineNumber = "115"
offsetFromSymbolStart = "2024">
</Location>
<Location
uuid = "C5528410-7019-46FD-A2E1-26E773AF7568 - eaec1614761dc693"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "OrderScheduling.WebViewController.userContentController(_: __C.WKUserContentController, didReceive: __C.WKScriptMessage) -&gt; ()"
moduleName = "OrderScheduling"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/zd/Desktop/%E4%B8%AD%E9%81%93%E6%95%91%E6%8F%B4/OrderScheduling/OrderScheduling/Common/WebView/WebViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "115"
endingLineNumber = "115"
offsetFromSymbolStart = "2084">
</Location>
<Location
uuid = "C5528410-7019-46FD-A2E1-26E773AF7568 - eaec1614761dc693"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "OrderScheduling.WebViewController.userContentController(_: __C.WKUserContentController, didReceive: __C.WKScriptMessage) -&gt; ()"
moduleName = "OrderScheduling"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/zd/Desktop/%E4%B8%AD%E9%81%93%E6%95%91%E6%8F%B4/OrderScheduling/OrderScheduling/Common/WebView/WebViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "115"
endingLineNumber = "115"
offsetFromSymbolStart = "2172">
</Location>
</Locations>
</BreakpointContent>
</BreakpointProxy>
</Breakpoints> </Breakpoints>
</Bucket> </Bucket>

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 216 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 230 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 466 B

View File

@@ -9,6 +9,10 @@ import Foundation
import DDControlsKit_Private import DDControlsKit_Private
open class ZDViewController : DDViewController { open class ZDViewController : DDViewController {
open override func viewDidLoad() {
super.viewDidLoad()
}
open func reloadData() { open func reloadData() {
} }
} }

View File

@@ -12,7 +12,7 @@ import DDLogKit_Private
import DDToastKit_Private import DDToastKit_Private
import DDControlsKit_Private import DDControlsKit_Private
class WebViewController : DDViewController { class WebViewController : ZDViewController {
lazy var webView = WKWebView.init() lazy var webView = WKWebView.init()
lazy var statusBarBackgroundView = DDView.init() lazy var statusBarBackgroundView = DDView.init()
var showNavBar : Bool var showNavBar : Bool
@@ -56,8 +56,9 @@ class WebViewController : DDViewController {
view.addSubview(statusBarBackgroundView) view.addSubview(statusBarBackgroundView)
}else{ }else{
title = vcTitle title = vcTitle
dd_navigationBarBackgroundColor = .hex("354683") dd_navigationBarBackgroundColor = .hex("2C395F")
dd_navigationBarTitleTextAttributes = [.foregroundColor : UIColor.white(alpha: 0.7),.font:UIFont.mediumFont(17)] dd_navigationBarTitleTextAttributes = [.foregroundColor : UIColor.white(alpha: 0.7),.font:UIFont.mediumFont(17)]
dd_navigationBarBarButtonItemAttributes = [.foregroundColor : UIColor.white]
} }
view.dd_showHUD() view.dd_showHUD()
@@ -66,18 +67,18 @@ class WebViewController : DDViewController {
override func viewWillLayoutSubviews() { override func viewWillLayoutSubviews() {
super.viewWillLayoutSubviews() super.viewWillLayoutSubviews()
if showNavBar == false { if showNavBar == false {
statusBarBackgroundView.snp.makeConstraints { make in statusBarBackgroundView.snp.remakeConstraints { make in
make.top.left.right.equalToSuperview() make.top.left.right.equalToSuperview()
make.height.equalTo(view.safeAreaInsets.top) make.height.equalTo(view.safeAreaInsets.top)
} }
webView.snp.makeConstraints { make in webView.snp.remakeConstraints { make in
make.left.right.equalToSuperview() make.left.right.equalToSuperview()
make.top.equalTo(view.safeAreaInsets.top) make.top.equalTo(statusBarBackgroundView.snp.bottom)
make.bottom.equalTo(-view.safeAreaInsets.bottom) make.bottom.equalTo(-view.safeAreaInsets.bottom)
} }
}else{ }else{
webView.snp.makeConstraints { make in webView.snp.remakeConstraints { make in
make.left.right.equalToSuperview() make.left.right.equalToSuperview()
make.top.equalTo(CGRectGetHeight(navigationController?.navigationBar.frame ?? .zero) + CGRectGetHeight(UIApplication.shared.dd_statusBarFrame)) make.top.equalTo(CGRectGetHeight(navigationController?.navigationBar.frame ?? .zero) + CGRectGetHeight(UIApplication.shared.dd_statusBarFrame))
make.bottom.equalTo(-view.safeAreaInsets.bottom) make.bottom.equalTo(-view.safeAreaInsets.bottom)
@@ -104,9 +105,16 @@ class WebViewController : DDViewController {
extension WebViewController : WKScriptMessageHandler { extension WebViewController : WKScriptMessageHandler {
func userContentController(_ userContentController: WKUserContentController, didReceive message: WKScriptMessage) { func userContentController(_ userContentController: WKUserContentController, didReceive message: WKScriptMessage) {
let dict = message.body as? [String:String] let dict = message.body as? [String:Any]
if dict?["action"] == "goBack" { let action = dict?["action"] as? String
if action == "goBack" {
navigationController?.popViewController(animated: true) navigationController?.popViewController(animated: true)
}else if action == "goTraining" {
let params = dict?["params"] as? [String:Int]
let id = params?["id"] as? Int
if let supplierId = USER.supplierId,let userId = USER.userId, let id {
WEBTOOL.open(name: .trainDocmentDetail, appending: "&supplierId=\(supplierId)&userId=\(userId)&id=\(id)")
}
} }
} }
} }

View File

@@ -22,7 +22,7 @@ open class WebViewTool : NSObject {
enum WebViewNameEnum : String { enum WebViewNameEnum : String {
case todoList = "待办事项" case todoList = "待办事项"
case workOrderReconciliation = "工单" case workOrderReconciliation = "工单"
case vehicleManage = "车辆管理" case vehicleManage = "车辆管理"
case driverManage = "司机管理" case driverManage = "司机管理"
case invoicingNotify = "开票通知" case invoicingNotify = "开票通知"
@@ -30,6 +30,7 @@ open class WebViewTool : NSObject {
case supplySettlement = "补结算单" case supplySettlement = "补结算单"
case workOrderDetail = "工单详情" case workOrderDetail = "工单详情"
case trainDocment = "培训文档" case trainDocment = "培训文档"
case trainDocmentDetail = "文档详情"
case docmentList = "文档资料" case docmentList = "文档资料"
} }
@@ -77,10 +78,10 @@ open class WebViewTool : NSObject {
} }
break break
case .workOrderReconciliation: case .workOrderReconciliation:
vc = WebViewController(showNavBar:false, title: WebViewNameEnum.workOrderReconciliation.rawValue, url: "\((h5Models?.workOrderReconciliation)!)?token=\((USER.token)!)") vc = WebViewController(showNavBar:false, title: WebViewNameEnum.workOrderReconciliation.rawValue, url: "http://192.168.14.126:8080/dev/h5/supplier/dispatch/workOrderReconciliation?token=\((USER.token)!)")
break break
case .vehicleManage: case .vehicleManage:
vc = WebViewController(showNavBar:false, title: WebViewNameEnum.vehicleManage.rawValue, url: "\((h5Models?.vehicleManage)!)?token=\((USER.token)!)") vc = WebViewController(showNavBar:false, title: WebViewNameEnum.vehicleManage.rawValue, url: "http://192.168.14.126:8080/dev/h5/supplier/dispatch/vehicleManage?token=\((USER.token)!)")
break break
case .driverManage: case .driverManage:
vc = WebViewController(showNavBar:false, title: WebViewNameEnum.driverManage.rawValue, url: "\((h5Models?.driverManage)!)?token=\((USER.token)!)") vc = WebViewController(showNavBar:false, title: WebViewNameEnum.driverManage.rawValue, url: "\((h5Models?.driverManage)!)?token=\((USER.token)!)")
@@ -100,6 +101,9 @@ open class WebViewTool : NSObject {
case .trainDocment: case .trainDocment:
vc = WebViewController(showNavBar:false, title: WebViewNameEnum.trainDocment.rawValue, url: "\((h5Models?.trainDocment)!)?token=\((USER.token)!)"+(appending ?? "")) vc = WebViewController(showNavBar:false, title: WebViewNameEnum.trainDocment.rawValue, url: "\((h5Models?.trainDocment)!)?token=\((USER.token)!)"+(appending ?? ""))
break break
case .trainDocmentDetail:
vc = WebViewController(showNavBar:true, title: WebViewNameEnum.trainDocment.rawValue, url: "https://crm1.sino-assist.com/res/training/training.html?source=supplierApp"+(appending ?? ""))
break
case .docmentList: case .docmentList:
vc = WebViewController(showNavBar:false, title: WebViewNameEnum.docmentList.rawValue, url: "\((h5Models?.docmentList)!)?token=\((USER.token)!)"+(appending ?? "")) vc = WebViewController(showNavBar:false, title: WebViewNameEnum.docmentList.rawValue, url: "\((h5Models?.docmentList)!)?token=\((USER.token)!)"+(appending ?? ""))
break break

View File

@@ -19,6 +19,7 @@ open class UserData {
return false return false
} }
//
public var token : String? { public var token : String? {
return UserDefaults.standard.object(forKey: token_key) as? String return UserDefaults.standard.object(forKey: token_key) as? String
} }
@@ -27,14 +28,7 @@ open class UserData {
UserDefaults.standard.set(token, forKey: token_key) 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? { public var supplierName : String? {
return UserDefaults.standard.object(forKey: supplierName_key) as? String return UserDefaults.standard.object(forKey: supplierName_key) as? String
} }
@@ -43,6 +37,7 @@ open class UserData {
UserDefaults.standard.set(supplierName, forKey: supplierName_key) UserDefaults.standard.set(supplierName, forKey: supplierName_key)
} }
//
public var phone : String? { public var phone : String? {
return UserDefaults.standard.object(forKey: phone_key) as? String return UserDefaults.standard.object(forKey: phone_key) as? String
} }
@@ -51,6 +46,16 @@ open class UserData {
UserDefaults.standard.set(phone, forKey: phone_key) UserDefaults.standard.set(phone, forKey: phone_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 supplierType : Int? { public var supplierType : Int? {
return UserDefaults.standard.object(forKey: supplierType_key) as? Int return UserDefaults.standard.object(forKey: supplierType_key) as? Int
} }
@@ -59,12 +64,33 @@ open class UserData {
UserDefaults.standard.set(supplierType, forKey: supplierType_key) UserDefaults.standard.set(supplierType, forKey: supplierType_key)
} }
//
public var supplierId : Int? {
return UserDefaults.standard.object(forKey: supplierId_key) as? Int
}
func setSupplierId(supplierId:Int?) {
UserDefaults.standard.set(supplierId, forKey: supplierId_key)
}
//
public var userId : Int? {
return UserDefaults.standard.object(forKey: userId_key) as? Int
}
func setUserId(userId:Int?) {
UserDefaults.standard.set(userId, forKey: userId_key)
}
public var deviceToken : String? public var deviceToken : String?
public var regId : String? public var regId : String?
func clear() { func clear() {
setToken(token: nil) setToken(token: nil)
setRefreshToken(token: nil)
setSupplierType(supplierType: nil) setSupplierType(supplierType: nil)
setUserId(userId: nil)
setSupplierId(supplierId: nil)
} }
} }

View File

@@ -262,6 +262,7 @@ open class HistoryController : ZDViewController {
super.viewDidLoad() super.viewDidLoad()
dd_navigationBarBackgroundColor = .hex("354683") dd_navigationBarBackgroundColor = .hex("354683")
dd_navigationBarTitleTextAttributes = [.foregroundColor : UIColor.white(alpha: 0.7),.font:UIFont.mediumFont(auto(15))] dd_navigationBarTitleTextAttributes = [.foregroundColor : UIColor.white(alpha: 0.7),.font:UIFont.mediumFont(auto(15))]
dd_navigationBarBarButtonItemAttributes = [.foregroundColor : UIColor.white]
dd_navigationItemTitle = "历史工单" dd_navigationItemTitle = "历史工单"
navigationItem.leftBarButtonItems = nil navigationItem.leftBarButtonItems = nil
addSubviews() addSubviews()
@@ -319,7 +320,7 @@ open class HistoryController : ZDViewController {
} }
} }
class HistoryItemController : DDViewController { class HistoryItemController : ZDViewController {
private let disposeBag = DisposeBag() private let disposeBag = DisposeBag()
private let historyItemView = HistoryItemView() private let historyItemView = HistoryItemView()
private var resultArr : [OrderListDataModel] = [] private var resultArr : [OrderListDataModel] = []
@@ -342,6 +343,7 @@ class HistoryItemController : DDViewController {
super.viewDidLoad() super.viewDidLoad()
dd_navigationBarBackgroundColor = .hex("354683") dd_navigationBarBackgroundColor = .hex("354683")
dd_navigationBarTitleTextAttributes = [.foregroundColor : UIColor.white(alpha: 0.7),.font:UIFont.mediumFont(17)] dd_navigationBarTitleTextAttributes = [.foregroundColor : UIColor.white(alpha: 0.7),.font:UIFont.mediumFont(17)]
dd_navigationBarBarButtonItemAttributes = [.foregroundColor : UIColor.white]
addSubviews() addSubviews()
addActions() addActions()
} }

View File

@@ -289,7 +289,7 @@ public class MessageReminderListDataModel : Decodable {
var title : String var title : String
var titleContent : String var titleContent : String
var titleColor : String var titleColor : String
var content : String var content : String?
var imgPath : String? var imgPath : String?
var createTime : String var createTime : String
var hasRead : HasRead var hasRead : HasRead

View File

@@ -16,7 +16,7 @@ import DDAutoUIKit_Private
import DDControlsKit_Private import DDControlsKit_Private
import CocoaDebug import CocoaDebug
class LoginController : DDViewController { class LoginController : ZDViewController {
private let disposeBag = DisposeBag() private let disposeBag = DisposeBag()
private let loginView = LoginView.init() private let loginView = LoginView.init()
private let agreeSub = ReplaySubject<Bool>.create(bufferSize: 1) private let agreeSub = ReplaySubject<Bool>.create(bufferSize: 1)
@@ -166,6 +166,8 @@ extension LoginController {
USER.setSupplierType(supplierType: responseModel?.data?.additionalParameters.user_info?.supplierType) USER.setSupplierType(supplierType: responseModel?.data?.additionalParameters.user_info?.supplierType)
USER.setPhone(phone: self?.loginView.phoneView.textfield.text) USER.setPhone(phone: self?.loginView.phoneView.textfield.text)
USER.setSupplierName(supplierName: self?.loginView.serviceProviderView.textfield.text) USER.setSupplierName(supplierName: self?.loginView.serviceProviderView.textfield.text)
USER.setUserId(userId: responseModel?.data?.additionalParameters.user_info?.userId)
USER.setSupplierId(supplierId: responseModel?.data?.additionalParameters.user_info?.supplierId)
} }
NotificationCenter.default.post(name: NSNotification.Name(rawValue: Notification_loginSuccessToRescueController), object: nil) NotificationCenter.default.post(name: NSNotification.Name(rawValue: Notification_loginSuccessToRescueController), object: nil)
}else{ }else{

View File

@@ -103,8 +103,12 @@ extension AppDelegate : JPUSHRegisterDelegate {
let userInfo = notification.request.content.userInfo let userInfo = notification.request.content.userInfo
if notification.request.trigger?.isKind(of: UNPushNotificationTrigger.self) == true { if notification.request.trigger?.isKind(of: UNPushNotificationTrigger.self) == true {
JPUSHService.handleRemoteNotification(userInfo) JPUSHService.handleRemoteNotification(userInfo)
let userDefault = UserDefaults.init(suiteName: "group.com.sino.supplier")
if let userInfo = userDefault?.object(forKey: "bestAttemptContentUserInfo") as? [AnyHashable:Any] {
ACCEPTORDERTOOL.open(userInfo: userInfo) ACCEPTORDERTOOL.open(userInfo: userInfo)
TOOL.playVoiceWith(userInfo: userInfo) TOOL.playVoiceWith(userInfo: userInfo)
userDefault?.setValue(nil, forKey: "bestAttemptContentUserInfo")
}
print("ios10 前台") print("ios10 前台")
} }
completionHandler(0) completionHandler(0)

View File

@@ -158,7 +158,7 @@ extension MessageCenterController : UITableViewDelegate,UITableViewDataSource {
} }
} }
open class MessageCenterController : DDViewController { open class MessageCenterController : ZDViewController {
private let messageCenterView = MessageCenterView() private let messageCenterView = MessageCenterView()
private var emptyView = EmptyView() private var emptyView = EmptyView()
private var pageNum : Int = 1 private var pageNum : Int = 1
@@ -179,6 +179,7 @@ open class MessageCenterController : DDViewController {
dd_navigationItemTitle = "消息提醒" dd_navigationItemTitle = "消息提醒"
dd_navigationBarBackgroundColor = .hex("354683") dd_navigationBarBackgroundColor = .hex("354683")
dd_navigationBarTitleTextAttributes = [.foregroundColor : UIColor.white(alpha: 0.7),.font:UIFont.mediumFont(17)] dd_navigationBarTitleTextAttributes = [.foregroundColor : UIColor.white(alpha: 0.7),.font:UIFont.mediumFont(17)]
dd_navigationBarBarButtonItemAttributes = [.foregroundColor : UIColor.white]
addSubviews() addSubviews()
addActions() addActions()

View File

@@ -107,7 +107,9 @@ extension MineController {
mineView.peixunwendangGes.rx.event mineView.peixunwendangGes.rx.event
.observe(on: MainScheduler.instance) .observe(on: MainScheduler.instance)
.subscribe(onNext: { _ in .subscribe(onNext: { _ in
WEBTOOL.open(name: .trainDocment, appending: nil) if let supplierId = USER.supplierId,let userId = USER.userId {
WEBTOOL.open(name: .trainDocment, appending: "&supplierId=\(supplierId)&userId=\(userId)")
}
}) })
.disposed(by: disposeBag) .disposed(by: disposeBag)
@@ -144,6 +146,7 @@ open class MineController : ZDViewController {
super.viewDidLoad() super.viewDidLoad()
dd_navigationBarBackgroundColor = .hex("354683") dd_navigationBarBackgroundColor = .hex("354683")
dd_navigationBarTitleTextAttributes = [.foregroundColor : UIColor.white(alpha: 0.7),.font:UIFont.mediumFont(auto(15))] dd_navigationBarTitleTextAttributes = [.foregroundColor : UIColor.white(alpha: 0.7),.font:UIFont.mediumFont(auto(15))]
dd_navigationBarBarButtonItemAttributes = [.foregroundColor : UIColor.white]
dd_navigationItemTitle = "我的" dd_navigationItemTitle = "我的"
dd_navigationBarShadowColor = .hex("354683") dd_navigationBarShadowColor = .hex("354683")
navigationItem.leftBarButtonItems = nil navigationItem.leftBarButtonItems = nil

View File

@@ -311,7 +311,7 @@ extension DispatchOrderController : DDMAMapViewDelegate {
} }
} }
open class DispatchOrderController : DDViewController { open class DispatchOrderController : ZDViewController {
private let disposeBag = DisposeBag() private let disposeBag = DisposeBag()
private let dispatchOrderView = DispatchOrderView() private let dispatchOrderView = DispatchOrderView()
private let bottomView = DDView() private let bottomView = DDView()

View File

@@ -615,6 +615,7 @@ extension RescuePendingDispatchController : UITableViewDelegate,UITableViewDataS
}) })
} }
cell?.photoCollectionView.tag = indexPath.row
cell?.photoCollectionView.delegate = self cell?.photoCollectionView.delegate = self
cell?.photoCollectionView.dataSource = self cell?.photoCollectionView.dataSource = self
cell?.photoCollectionView.register(RescuePendingDispatchPhotoCell.self, forCellWithReuseIdentifier: "cell") cell?.photoCollectionView.register(RescuePendingDispatchPhotoCell.self, forCellWithReuseIdentifier: "cell")
@@ -630,7 +631,6 @@ extension RescuePendingDispatchController : UITableViewDelegate,UITableViewDataS
make.height.equalTo(auto(50)) make.height.equalTo(auto(50))
}) })
if let environmentPics { if let environmentPics {
self.environmentPics = environmentPics
cell?.photoCollectionView.reloadData() cell?.photoCollectionView.reloadData()
} }
}else{ }else{
@@ -763,11 +763,15 @@ extension RescueIsIngController : UITableViewDelegate,UITableViewDataSource {
// MARK: UICollectionViewDelegate, UICollectionViewDataSource // MARK: UICollectionViewDelegate, UICollectionViewDataSource
extension RescuePendingDispatchController : UICollectionViewDelegate, UICollectionViewDataSource { extension RescuePendingDispatchController : UICollectionViewDelegate, UICollectionViewDataSource {
func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int { func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
let model = resultArr[collectionView.tag]
let environmentPics = model.environmentPic?.components(separatedBy: ",") ?? []
return environmentPics.count > 4 ? 4 : environmentPics.count return environmentPics.count > 4 ? 4 : environmentPics.count
} }
func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell { func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "cell", for: indexPath) as? RescuePendingDispatchPhotoCell let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "cell", for: indexPath) as? RescuePendingDispatchPhotoCell
let model = resultArr[collectionView.tag]
let environmentPics = model.environmentPic?.components(separatedBy: ",") ?? []
let imageUrlStr = environmentPics[indexPath.item] let imageUrlStr = environmentPics[indexPath.item]
cell!.imageView.image = nil cell!.imageView.image = nil
if imageUrlStr.contains(".mp4?") == true { if imageUrlStr.contains(".mp4?") == true {
@@ -787,6 +791,8 @@ extension RescuePendingDispatchController : UICollectionViewDelegate, UICollecti
} }
func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) { func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
let model = resultArr[collectionView.tag]
let environmentPics = model.environmentPic?.components(separatedBy: ",") ?? []
let vc = RescuePhotoController(environmentPics: environmentPics) let vc = RescuePhotoController(environmentPics: environmentPics)
navigationController?.pushViewController(vc, animated: true) navigationController?.pushViewController(vc, animated: true)
} }
@@ -813,6 +819,7 @@ class RescueController : ZDViewController {
super.viewDidLoad() super.viewDidLoad()
dd_navigationBarBackgroundColor = .hex("354683") dd_navigationBarBackgroundColor = .hex("354683")
dd_navigationBarTitleTextAttributes = [.foregroundColor : UIColor.white(alpha: 0.7),.font:UIFont.mediumFont(auto(15))] dd_navigationBarTitleTextAttributes = [.foregroundColor : UIColor.white(alpha: 0.7),.font:UIFont.mediumFont(auto(15))]
dd_navigationBarBarButtonItemAttributes = [.foregroundColor : UIColor.white]
dd_navigationItemTitle = "救援工单" dd_navigationItemTitle = "救援工单"
navigationItem.leftBarButtonItems = nil navigationItem.leftBarButtonItems = nil
addSubviews() addSubviews()
@@ -872,7 +879,7 @@ class RescueController : ZDViewController {
} }
// MARK: // MARK:
class RescuePendingOrderController : DDViewController { class RescuePendingOrderController : ZDViewController {
private let disposeBag = DisposeBag() private let disposeBag = DisposeBag()
public let pendingOrderView = RescuePendingOrderView() public let pendingOrderView = RescuePendingOrderView()
private var resultArr : [OrderListDataModel] = [] private var resultArr : [OrderListDataModel] = []
@@ -887,6 +894,7 @@ class RescuePendingOrderController : DDViewController {
super.viewDidLoad() super.viewDidLoad()
dd_navigationBarBackgroundColor = .hex("354683") dd_navigationBarBackgroundColor = .hex("354683")
dd_navigationBarTitleTextAttributes = [.foregroundColor : UIColor.white(alpha: 0.7),.font:UIFont.mediumFont(17)] dd_navigationBarTitleTextAttributes = [.foregroundColor : UIColor.white(alpha: 0.7),.font:UIFont.mediumFont(17)]
dd_navigationBarBarButtonItemAttributes = [.foregroundColor : UIColor.white]
addSubviews() addSubviews()
addActions() addActions()
} }
@@ -911,11 +919,10 @@ class RescuePendingOrderController : DDViewController {
} }
// MARK: // MARK:
class RescuePendingDispatchController : DDViewController { class RescuePendingDispatchController : ZDViewController {
private let disposeBag = DisposeBag() private let disposeBag = DisposeBag()
public let pendingDispatchView = RescuePendingDispatchView() public let pendingDispatchView = RescuePendingDispatchView()
private var resultArr : [OrderListDataModel] = [] private var resultArr : [OrderListDataModel] = []
private var environmentPics : [String] = []
private var refreshRelay = ReplayRelay<Int>.create(bufferSize: 1) private var refreshRelay = ReplayRelay<Int>.create(bufferSize: 1)
private var pageNum : Int = 1 private var pageNum : Int = 1
private var emptyView = EmptyView() private var emptyView = EmptyView()
@@ -924,6 +931,7 @@ class RescuePendingDispatchController : DDViewController {
super.viewDidLoad() super.viewDidLoad()
dd_navigationBarBackgroundColor = .hex("354683") dd_navigationBarBackgroundColor = .hex("354683")
dd_navigationBarTitleTextAttributes = [.foregroundColor : UIColor.white(alpha: 0.7),.font:UIFont.mediumFont(17)] dd_navigationBarTitleTextAttributes = [.foregroundColor : UIColor.white(alpha: 0.7),.font:UIFont.mediumFont(17)]
dd_navigationBarBarButtonItemAttributes = [.foregroundColor : UIColor.white]
addSubviews() addSubviews()
addActions() addActions()
} }
@@ -948,7 +956,7 @@ class RescuePendingDispatchController : DDViewController {
} }
// MARK: // MARK:
class RescueIsIngController : DDViewController { class RescueIsIngController : ZDViewController {
private let disposeBag = DisposeBag() private let disposeBag = DisposeBag()
public let pendingIsIngView = RescueIsIngView() public let pendingIsIngView = RescueIsIngView()
private var resultArr : [OrderListDataModel] = [] private var resultArr : [OrderListDataModel] = []
@@ -960,6 +968,7 @@ class RescueIsIngController : DDViewController {
super.viewDidLoad() super.viewDidLoad()
dd_navigationBarBackgroundColor = .hex("354683") dd_navigationBarBackgroundColor = .hex("354683")
dd_navigationBarTitleTextAttributes = [.foregroundColor : UIColor.white(alpha: 0.7),.font:UIFont.mediumFont(17)] dd_navigationBarTitleTextAttributes = [.foregroundColor : UIColor.white(alpha: 0.7),.font:UIFont.mediumFont(17)]
dd_navigationBarBarButtonItemAttributes = [.foregroundColor : UIColor.white]
addSubviews() addSubviews()
addActions() addActions()
} }

View File

@@ -75,7 +75,7 @@ extension RescuePhotoController : UICollectionViewDelegate,UICollectionViewDataS
} }
} }
open class RescuePhotoController : DDViewController { open class RescuePhotoController : ZDViewController {
private let rescuePhotoView = RescuePhotoView() private let rescuePhotoView = RescuePhotoView()
private var environmentPics : [RescuePhotoModel] = [] private var environmentPics : [RescuePhotoModel] = []
private var preciousModel : RescuePhotoModel? private var preciousModel : RescuePhotoModel?
@@ -108,6 +108,7 @@ open class RescuePhotoController : DDViewController {
dd_navigationItemTitle = "现场照片" dd_navigationItemTitle = "现场照片"
dd_navigationBarBackgroundColor = .hex("000000") dd_navigationBarBackgroundColor = .hex("000000")
dd_navigationBarTitleTextAttributes = [.foregroundColor : UIColor.white(alpha: 0.7),.font:UIFont.mediumFont(auto(15))] dd_navigationBarTitleTextAttributes = [.foregroundColor : UIColor.white(alpha: 0.7),.font:UIFont.mediumFont(auto(15))]
dd_navigationBarBarButtonItemAttributes = [.foregroundColor : UIColor.white]
view.backgroundColor = .hex("000000") view.backgroundColor = .hex("000000")
view.addSubview(rescuePhotoView) view.addSubview(rescuePhotoView)
@@ -150,6 +151,7 @@ class RescuePhotoView : DDView {
collectionView = DDCollectionView(frame: CGRectZero, collectionViewLayout: flowLayout) collectionView = DDCollectionView(frame: CGRectZero, collectionViewLayout: flowLayout)
super.init(frame: frame) super.init(frame: frame)
largeImageView.contentMode = .scaleAspectFit
addSubview(largeImageView) addSubview(largeImageView)
addSubview(collectionView) addSubview(collectionView)

View File

@@ -137,7 +137,7 @@ extension AdditionalPhotoController : UICollectionViewDelegate, UICollectionView
} }
open class AdditionalPhotoController : DDViewController { open class AdditionalPhotoController : ZDViewController {
private let additionalPhotoView = AdditionalPhotoView() private let additionalPhotoView = AdditionalPhotoView()
private let disposeBag = DisposeBag() private let disposeBag = DisposeBag()
private let refreshRelay = ReplayRelay<Any?>.create(bufferSize: 1) private let refreshRelay = ReplayRelay<Any?>.create(bufferSize: 1)
@@ -162,6 +162,7 @@ open class AdditionalPhotoController : DDViewController {
dd_navigationItemTitle = "工单照片" dd_navigationItemTitle = "工单照片"
dd_navigationBarBackgroundColor = .hex("354683") dd_navigationBarBackgroundColor = .hex("354683")
dd_navigationBarTitleTextAttributes = [.foregroundColor : UIColor.white(alpha: 0.7),.font:UIFont.mediumFont(17)] dd_navigationBarTitleTextAttributes = [.foregroundColor : UIColor.white(alpha: 0.7),.font:UIFont.mediumFont(17)]
dd_navigationBarBarButtonItemAttributes = [.foregroundColor : UIColor.white]
addSubviews() addSubviews()
addActions() addActions()

View File

@@ -175,6 +175,7 @@ open class ReviewFailedController : ZDViewController {
dd_navigationItemTitle = "审核失败" dd_navigationItemTitle = "审核失败"
dd_navigationBarBackgroundColor = .hex("354683") dd_navigationBarBackgroundColor = .hex("354683")
dd_navigationBarTitleTextAttributes = [.foregroundColor : UIColor.white(alpha: 0.7),.font:UIFont.mediumFont(17)] dd_navigationBarTitleTextAttributes = [.foregroundColor : UIColor.white(alpha: 0.7),.font:UIFont.mediumFont(17)]
dd_navigationBarBarButtonItemAttributes = [.foregroundColor : UIColor.white]
navigationItem.leftBarButtonItems = nil navigationItem.leftBarButtonItems = nil
addSubviews() addSubviews()

View File

@@ -17,6 +17,10 @@ public let supplierName_key = "supplierName_key"
public let supplierType_key = "supplierType_key" public let supplierType_key = "supplierType_key"
public let supplierId_key = "supplierId_key"
public let userId_key = "userId_key"
public let appUpdateIgnore_key = "appUpdateIgnore_key" public let appUpdateIgnore_key = "appUpdateIgnore_key"
public let deviceToken_key = "deviceToken_key" public let deviceToken_key = "deviceToken_key"

View File

@@ -66,7 +66,7 @@ extension VehicleMonitorVideoController : JXCategoryViewDelegate {
} }
} }
open class VehicleMonitorVideoController : DDViewController { open class VehicleMonitorVideoController : ZDViewController {
private let vehicleId : Int? private let vehicleId : Int?
private let deviceCode : String? private let deviceCode : String?
private let vehicleMonitorVideoView : VehicleMonitorVideoView private let vehicleMonitorVideoView : VehicleMonitorVideoView
@@ -90,6 +90,7 @@ open class VehicleMonitorVideoController : DDViewController {
dd_navigationItemTitle = "视频监控" dd_navigationItemTitle = "视频监控"
dd_navigationBarBackgroundColor = .hex("354683") dd_navigationBarBackgroundColor = .hex("354683")
dd_navigationBarTitleTextAttributes = [.foregroundColor : UIColor.white(alpha: 0.7),.font:UIFont.mediumFont(17)] dd_navigationBarTitleTextAttributes = [.foregroundColor : UIColor.white(alpha: 0.7),.font:UIFont.mediumFont(17)]
dd_navigationBarBarButtonItemAttributes = [.foregroundColor : UIColor.white]
dd_backBarButtonItem?.tintColor = .hex("000000") dd_backBarButtonItem?.tintColor = .hex("000000")
vehicleMonitorVideoView.categoryView.delegate = self vehicleMonitorVideoView.categoryView.delegate = self
@@ -102,6 +103,8 @@ open class VehicleMonitorVideoController : DDViewController {
let videoDetailVc = VehicleMonitoringVideoDetailController(assetURL: nil) let videoDetailVc = VehicleMonitoringVideoDetailController(assetURL: nil)
videoDetailVc.dd_navigationBarBackgroundColor = .white videoDetailVc.dd_navigationBarBackgroundColor = .white
videoDetailVc.dd_navigationBarTitleTextAttributes = [.foregroundColor : UIColor.hex("000000"),.font:UIFont.mediumFont(17)] videoDetailVc.dd_navigationBarTitleTextAttributes = [.foregroundColor : UIColor.hex("000000"),.font:UIFont.mediumFont(17)]
videoDetailVc.dd_navigationBarBarButtonItemAttributes = [.foregroundColor : UIColor.hex("000000")]
addChild(videoDetailVc) addChild(videoDetailVc)
vehicleMonitorVideoView.addSubview(videoDetailVc.view) vehicleMonitorVideoView.addSubview(videoDetailVc.view)
videoDetailVc.view.snp.makeConstraints { make in videoDetailVc.view.snp.makeConstraints { make in

View File

@@ -511,6 +511,7 @@ open class VehicleMonitoringController : ZDViewController {
dd_navigationItemTitle = "车辆监控" dd_navigationItemTitle = "车辆监控"
dd_navigationBarBackgroundColor = .hex("354683") dd_navigationBarBackgroundColor = .hex("354683")
dd_navigationBarTitleTextAttributes = [.foregroundColor : UIColor.white(alpha: 0.7),.font:UIFont.mediumFont(17)] dd_navigationBarTitleTextAttributes = [.foregroundColor : UIColor.white(alpha: 0.7),.font:UIFont.mediumFont(17)]
dd_navigationBarBarButtonItemAttributes = [.foregroundColor : UIColor.white]
navigationItem.leftBarButtonItems = nil navigationItem.leftBarButtonItems = nil
addSubviews() addSubviews()

View File

@@ -82,7 +82,7 @@ extension VehicleMonitoringListController : UITableViewDelegate,UITableViewDataS
} }
} }
open class VehicleMonitoringListController : DDViewController { open class VehicleMonitoringListController : ZDViewController {
public let vehicleMonitoringListView = VehicleMonitoringListView() public let vehicleMonitoringListView = VehicleMonitoringListView()
public var models : [VehicleMonitorListDataModel.ItemModel] = [] public var models : [VehicleMonitorListDataModel.ItemModel] = []
public var selectCellBlock: ((VehicleMonitorListDataModel.ItemModel) -> Void)? public var selectCellBlock: ((VehicleMonitorListDataModel.ItemModel) -> Void)?
@@ -108,6 +108,7 @@ open class VehicleMonitoringListController : DDViewController {
dd_navigationBarBackgroundColor = .hex("354683") dd_navigationBarBackgroundColor = .hex("354683")
dd_navigationBarTitleTextAttributes = [.foregroundColor : UIColor.white(alpha: 0.7),.font:UIFont.mediumFont(17)] dd_navigationBarTitleTextAttributes = [.foregroundColor : UIColor.white(alpha: 0.7),.font:UIFont.mediumFont(17)]
dd_navigationBarBarButtonItemAttributes = [.foregroundColor : UIColor.white]
view.addSubview(vehicleMonitoringListView) view.addSubview(vehicleMonitoringListView)
vehicleMonitoringListView.snp.makeConstraints { make in vehicleMonitoringListView.snp.makeConstraints { make in

View File

@@ -12,7 +12,7 @@ import DDAutoUIKit_Private
import SnapKit import SnapKit
import DDZFPlayerKit_Private import DDZFPlayerKit_Private
open class VehicleMonitoringVideoDetailController : DDViewController { open class VehicleMonitoringVideoDetailController : ZDViewController {
private let player : ZFPlayerController private let player : ZFPlayerController
private let controlView : ZFPlayerControlView private let controlView : ZFPlayerControlView
private let containerView : DDImageView private let containerView : DDImageView
@@ -77,6 +77,7 @@ open class VehicleMonitoringVideoDetailController : DDViewController {
super.viewDidLoad() super.viewDidLoad()
dd_navigationBarBackgroundColor = .hex("354683") dd_navigationBarBackgroundColor = .hex("354683")
dd_navigationBarTitleTextAttributes = [.foregroundColor : UIColor.white(alpha: 0.7),.font:UIFont.mediumFont(17)] dd_navigationBarTitleTextAttributes = [.foregroundColor : UIColor.white(alpha: 0.7),.font:UIFont.mediumFont(17)]
dd_navigationBarBarButtonItemAttributes = [.foregroundColor : UIColor.white]
} }
open override func viewWillAppear(_ animated: Bool) { open override func viewWillAppear(_ animated: Bool) {

View File

@@ -25,7 +25,7 @@ target 'OrderScheduling' do
pod 'DDNetworkingOfAlamofireKit_Private' pod 'DDNetworkingOfAlamofireKit_Private'
pod 'DDProgressHUDKit_Private' pod 'DDProgressHUDKit_Private'
pod 'JXCategoryView' pod 'JXCategoryView'
pod 'DDControlsKit_Private' pod 'DDControlsKit_Private',:path => '/Users/zd/Desktop/PodRepository/DDControlsKit_Private'
pod 'SwiftEntryKit' pod 'SwiftEntryKit'
pod 'MJRefresh' pod 'MJRefresh'
pod 'DDWebImageKit_Private' pod 'DDWebImageKit_Private'

View File

@@ -306,7 +306,7 @@ DEPENDENCIES:
- DDBasicControlsKit_Private - DDBasicControlsKit_Private
- DDCategoryKit_Private (from `/Users/zd/Desktop/PodRepository/DDCategoryKit_Private`) - DDCategoryKit_Private (from `/Users/zd/Desktop/PodRepository/DDCategoryKit_Private`)
- DDColorKit_Private - DDColorKit_Private
- DDControlsKit_Private - DDControlsKit_Private (from `/Users/zd/Desktop/PodRepository/DDControlsKit_Private`)
- DDFontKit_Private - DDFontKit_Private
- DDMAMapKit_Private - DDMAMapKit_Private
- DDNetworkingOfAlamofireKit_Private - DDNetworkingOfAlamofireKit_Private
@@ -334,7 +334,6 @@ SPEC REPOS:
- DDAutoUIKit_Private - DDAutoUIKit_Private
- DDBasicControlsKit_Private - DDBasicControlsKit_Private
- DDColorKit_Private - DDColorKit_Private
- DDControlsKit_Private
- DDFontKit_Private - DDFontKit_Private
- DDLogKit_Private - DDLogKit_Private
- DDMAMapKit_Private - DDMAMapKit_Private
@@ -371,6 +370,8 @@ SPEC REPOS:
EXTERNAL SOURCES: EXTERNAL SOURCES:
DDCategoryKit_Private: DDCategoryKit_Private:
:path: "/Users/zd/Desktop/PodRepository/DDCategoryKit_Private" :path: "/Users/zd/Desktop/PodRepository/DDCategoryKit_Private"
DDControlsKit_Private:
:path: "/Users/zd/Desktop/PodRepository/DDControlsKit_Private"
SPEC CHECKSUMS: SPEC CHECKSUMS:
Alamofire: 0123a34370cb170936ae79a8df46cc62b2edeb88 Alamofire: 0123a34370cb170936ae79a8df46cc62b2edeb88
@@ -384,7 +385,7 @@ SPEC CHECKSUMS:
DDBasicControlsKit_Private: 04e64a24551a24e76555835fc14002415db80f94 DDBasicControlsKit_Private: 04e64a24551a24e76555835fc14002415db80f94
DDCategoryKit_Private: 03994d39831cb9b49670ae9544e33ff408276051 DDCategoryKit_Private: 03994d39831cb9b49670ae9544e33ff408276051
DDColorKit_Private: 77fddb62410a2d5e6fb003083d233c0d7ea0a08f DDColorKit_Private: 77fddb62410a2d5e6fb003083d233c0d7ea0a08f
DDControlsKit_Private: f304e041bb171c6cfacaf0fc55c967fd395cf645 DDControlsKit_Private: d121dabf9283ed8c411eb30c8f8632db2a7443da
DDFontKit_Private: 7b8f4ebf0f60622874036202734d8460dc7b3806 DDFontKit_Private: 7b8f4ebf0f60622874036202734d8460dc7b3806
DDLogKit_Private: 1ed442cc7be004bd05f27bfda9b525e113df54e0 DDLogKit_Private: 1ed442cc7be004bd05f27bfda9b525e113df54e0
DDMAMapKit_Private: fda2942ba7a3b7da4d440e59a89db9fd6708d842 DDMAMapKit_Private: fda2942ba7a3b7da4d440e59a89db9fd6708d842
@@ -410,6 +411,6 @@ SPEC CHECKSUMS:
ZFPlayer: 5cf39e8d9f0c2394a014b0db4767b5b5a6bffe13 ZFPlayer: 5cf39e8d9f0c2394a014b0db4767b5b5a6bffe13
ZLPhotoBrowser: 0563c2bfc7b247b65d023d646012f46cba94101b ZLPhotoBrowser: 0563c2bfc7b247b65d023d646012f46cba94101b
PODFILE CHECKSUM: 6ad862884fe5a397b1d016373784ead787507fcf PODFILE CHECKSUM: 2c450a773b0b1200134ae26511b9293c7e211058
COCOAPODS: 1.11.3 COCOAPODS: 1.11.3

View File

@@ -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": [
]
}
}
]
}

9
Pods/Manifest.lock generated
View File

@@ -306,7 +306,7 @@ DEPENDENCIES:
- DDBasicControlsKit_Private - DDBasicControlsKit_Private
- DDCategoryKit_Private (from `/Users/zd/Desktop/PodRepository/DDCategoryKit_Private`) - DDCategoryKit_Private (from `/Users/zd/Desktop/PodRepository/DDCategoryKit_Private`)
- DDColorKit_Private - DDColorKit_Private
- DDControlsKit_Private - DDControlsKit_Private (from `/Users/zd/Desktop/PodRepository/DDControlsKit_Private`)
- DDFontKit_Private - DDFontKit_Private
- DDMAMapKit_Private - DDMAMapKit_Private
- DDNetworkingOfAlamofireKit_Private - DDNetworkingOfAlamofireKit_Private
@@ -334,7 +334,6 @@ SPEC REPOS:
- DDAutoUIKit_Private - DDAutoUIKit_Private
- DDBasicControlsKit_Private - DDBasicControlsKit_Private
- DDColorKit_Private - DDColorKit_Private
- DDControlsKit_Private
- DDFontKit_Private - DDFontKit_Private
- DDLogKit_Private - DDLogKit_Private
- DDMAMapKit_Private - DDMAMapKit_Private
@@ -371,6 +370,8 @@ SPEC REPOS:
EXTERNAL SOURCES: EXTERNAL SOURCES:
DDCategoryKit_Private: DDCategoryKit_Private:
:path: "/Users/zd/Desktop/PodRepository/DDCategoryKit_Private" :path: "/Users/zd/Desktop/PodRepository/DDCategoryKit_Private"
DDControlsKit_Private:
:path: "/Users/zd/Desktop/PodRepository/DDControlsKit_Private"
SPEC CHECKSUMS: SPEC CHECKSUMS:
Alamofire: 0123a34370cb170936ae79a8df46cc62b2edeb88 Alamofire: 0123a34370cb170936ae79a8df46cc62b2edeb88
@@ -384,7 +385,7 @@ SPEC CHECKSUMS:
DDBasicControlsKit_Private: 04e64a24551a24e76555835fc14002415db80f94 DDBasicControlsKit_Private: 04e64a24551a24e76555835fc14002415db80f94
DDCategoryKit_Private: 03994d39831cb9b49670ae9544e33ff408276051 DDCategoryKit_Private: 03994d39831cb9b49670ae9544e33ff408276051
DDColorKit_Private: 77fddb62410a2d5e6fb003083d233c0d7ea0a08f DDColorKit_Private: 77fddb62410a2d5e6fb003083d233c0d7ea0a08f
DDControlsKit_Private: f304e041bb171c6cfacaf0fc55c967fd395cf645 DDControlsKit_Private: d121dabf9283ed8c411eb30c8f8632db2a7443da
DDFontKit_Private: 7b8f4ebf0f60622874036202734d8460dc7b3806 DDFontKit_Private: 7b8f4ebf0f60622874036202734d8460dc7b3806
DDLogKit_Private: 1ed442cc7be004bd05f27bfda9b525e113df54e0 DDLogKit_Private: 1ed442cc7be004bd05f27bfda9b525e113df54e0
DDMAMapKit_Private: fda2942ba7a3b7da4d440e59a89db9fd6708d842 DDMAMapKit_Private: fda2942ba7a3b7da4d440e59a89db9fd6708d842
@@ -410,6 +411,6 @@ SPEC CHECKSUMS:
ZFPlayer: 5cf39e8d9f0c2394a014b0db4767b5b5a6bffe13 ZFPlayer: 5cf39e8d9f0c2394a014b0db4767b5b5a6bffe13
ZLPhotoBrowser: 0563c2bfc7b247b65d023d646012f46cba94101b ZLPhotoBrowser: 0563c2bfc7b247b65d023d646012f46cba94101b
PODFILE CHECKSUM: 6ad862884fe5a397b1d016373784ead787507fcf PODFILE CHECKSUM: 2c450a773b0b1200134ae26511b9293c7e211058
COCOAPODS: 1.11.3 COCOAPODS: 1.11.3

File diff suppressed because it is too large Load Diff

View File

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

View File

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