dezhong/OrderScheduling
18
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
DDIsFriend
2023-08-30 11:10:38 +08:00
parent dfcdee023c
commit b846be8803
17 changed files with 644 additions and 392 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
.DS_Store vendored
View File

Binary file not shown.

4
OrderScheduling.xcodeproj/project.pbxproj
View File

@@ -63,6 +63,7 @@
79FB76102A9C6CAF00DB00A4 /* newJuheOrderAudio.wav in Resources */ = {isa = PBXBuildFile; fileRef = 79FB760E2A9C6CAF00DB00A4 /* newJuheOrderAudio.wav */; }; 79FB76102A9C6CAF00DB00A4 /* newJuheOrderAudio.wav in Resources */ = {isa = PBXBuildFile; fileRef = 79FB760E2A9C6CAF00DB00A4 /* newJuheOrderAudio.wav */; };
79FB76132A9C6CC100DB00A4 /* newOrderAudio.wav in Resources */ = {isa = PBXBuildFile; fileRef = 79FB76122A9C6CC100DB00A4 /* newOrderAudio.wav */; }; 79FB76132A9C6CC100DB00A4 /* newOrderAudio.wav in Resources */ = {isa = PBXBuildFile; fileRef = 79FB76122A9C6CC100DB00A4 /* newOrderAudio.wav */; };
79FB76152A9DEE7400DB00A4 /* RefuseOrderConfirmView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79FB76142A9DEE7400DB00A4 /* RefuseOrderConfirmView.swift */; }; 79FB76152A9DEE7400DB00A4 /* RefuseOrderConfirmView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79FB76142A9DEE7400DB00A4 /* RefuseOrderConfirmView.swift */; };
79FB76172A9DFC9600DB00A4 /* NotificationSetUpController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79FB76162A9DFC9600DB00A4 /* NotificationSetUpController.swift */; };
A64E95F00B82DC28C2B9306E /* libPods-OrderScheduling.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 98784A61C325B3D6C408016C /* libPods-OrderScheduling.a */; }; A64E95F00B82DC28C2B9306E /* libPods-OrderScheduling.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 98784A61C325B3D6C408016C /* libPods-OrderScheduling.a */; };
/* End PBXBuildFile section */ /* End PBXBuildFile section */
@@ -171,6 +172,7 @@
79FB760E2A9C6CAF00DB00A4 /* newJuheOrderAudio.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = newJuheOrderAudio.wav; sourceTree = "<group>"; }; 79FB760E2A9C6CAF00DB00A4 /* newJuheOrderAudio.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = newJuheOrderAudio.wav; sourceTree = "<group>"; };
79FB76122A9C6CC100DB00A4 /* newOrderAudio.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = newOrderAudio.wav; sourceTree = "<group>"; }; 79FB76122A9C6CC100DB00A4 /* newOrderAudio.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = newOrderAudio.wav; sourceTree = "<group>"; };
79FB76142A9DEE7400DB00A4 /* RefuseOrderConfirmView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RefuseOrderConfirmView.swift; sourceTree = "<group>"; }; 79FB76142A9DEE7400DB00A4 /* RefuseOrderConfirmView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RefuseOrderConfirmView.swift; sourceTree = "<group>"; };
79FB76162A9DFC9600DB00A4 /* NotificationSetUpController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationSetUpController.swift; sourceTree = "<group>"; };
9758FDE3BEDA5A983CAE2DED /* Pods-OrderSchedulingNotificationService.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OrderSchedulingNotificationService.debug.xcconfig"; path = "Target Support Files/Pods-OrderSchedulingNotificationService/Pods-OrderSchedulingNotificationService.debug.xcconfig"; sourceTree = "<group>"; }; 9758FDE3BEDA5A983CAE2DED /* Pods-OrderSchedulingNotificationService.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OrderSchedulingNotificationService.debug.xcconfig"; path = "Target Support Files/Pods-OrderSchedulingNotificationService/Pods-OrderSchedulingNotificationService.debug.xcconfig"; sourceTree = "<group>"; };
98784A61C325B3D6C408016C /* libPods-OrderScheduling.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-OrderScheduling.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 98784A61C325B3D6C408016C /* libPods-OrderScheduling.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-OrderScheduling.a"; sourceTree = BUILT_PRODUCTS_DIR; };
BD034FA1DD7C17CCBA6B0E5D /* Pods-OrderScheduling.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OrderScheduling.release.xcconfig"; path = "Target Support Files/Pods-OrderScheduling/Pods-OrderScheduling.release.xcconfig"; sourceTree = "<group>"; }; BD034FA1DD7C17CCBA6B0E5D /* Pods-OrderScheduling.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OrderScheduling.release.xcconfig"; path = "Target Support Files/Pods-OrderScheduling/Pods-OrderScheduling.release.xcconfig"; sourceTree = "<group>"; };
@@ -451,6 +453,7 @@
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
794FBB132A8F045F00D57BB8 /* MineController.swift */, 794FBB132A8F045F00D57BB8 /* MineController.swift */,
79FB76162A9DFC9600DB00A4 /* NotificationSetUpController.swift */,
); );
path = ViewController; path = ViewController;
sourceTree = "<group>"; sourceTree = "<group>";
@@ -902,6 +905,7 @@
7918878F2A809E37007EA0C1 /* TimerStrings.swift in Sources */, 7918878F2A809E37007EA0C1 /* TimerStrings.swift in Sources */,
7918878B2A7CE9E0007EA0C1 /* main.swift in Sources */, 7918878B2A7CE9E0007EA0C1 /* main.swift in Sources */,
791887A02A80CA10007EA0C1 /* RequestList.swift in Sources */, 791887A02A80CA10007EA0C1 /* RequestList.swift in Sources */,
79FB76172A9DFC9600DB00A4 /* NotificationSetUpController.swift in Sources */,
79CECC262A8C749B00B95D8B /* VehicleMonitorVideoController.swift in Sources */, 79CECC262A8C749B00B95D8B /* VehicleMonitorVideoController.swift in Sources */,
79DD0DA82A9480D000768FE7 /* NotificationAuthView.swift in Sources */, 79DD0DA82A9480D000768FE7 /* NotificationAuthView.swift in Sources */,
794FBB212A934E0A00D57BB8 /* AppUpdateView.swift in Sources */, 794FBB212A934E0A00D57BB8 /* AppUpdateView.swift in Sources */,

BIN
OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate generated
View File

Binary file not shown.

725
OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
View File

@@ -523,8 +523,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "801" startingLineNumber = "800"
endingLineNumber = "801" endingLineNumber = "800"
landmarkName = "collectionView(_:cellForItemAt:)" landmarkName = "collectionView(_:cellForItemAt:)"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@@ -539,8 +539,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "802" startingLineNumber = "801"
endingLineNumber = "802" endingLineNumber = "801"
landmarkName = "collectionView(_:cellForItemAt:)" landmarkName = "collectionView(_:cellForItemAt:)"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@@ -874,8 +874,8 @@
filePath = "OrderScheduling/Main/AppDelegate.swift" filePath = "OrderScheduling/Main/AppDelegate.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "37" startingLineNumber = "35"
endingLineNumber = "37" endingLineNumber = "35"
landmarkName = "application(_:supportedInterfaceOrientationsFor:)" landmarkName = "application(_:supportedInterfaceOrientationsFor:)"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@@ -890,8 +890,8 @@
filePath = "OrderScheduling/Main/AppDelegate.swift" filePath = "OrderScheduling/Main/AppDelegate.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "38" startingLineNumber = "36"
endingLineNumber = "38" endingLineNumber = "36"
landmarkName = "application(_:supportedInterfaceOrientationsFor:)" landmarkName = "application(_:supportedInterfaceOrientationsFor:)"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@@ -906,8 +906,8 @@
filePath = "OrderScheduling/Main/AppDelegate.swift" filePath = "OrderScheduling/Main/AppDelegate.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "40" startingLineNumber = "38"
endingLineNumber = "40" endingLineNumber = "38"
landmarkName = "application(_:supportedInterfaceOrientationsFor:)" landmarkName = "application(_:supportedInterfaceOrientationsFor:)"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@@ -1312,54 +1312,6 @@
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
</BreakpointProxy> </BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "6043A19F-FEA4-44B7-BAC8-98339955AF0A"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "OrderScheduling/Main/AppDelegate.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "56"
endingLineNumber = "56"
landmarkName = "application(_:didRegisterForRemoteNotificationsWithDeviceToken:)"
landmarkType = "7">
<Locations>
<Location
uuid = "6043A19F-FEA4-44B7-BAC8-98339955AF0A - e7c967a0298824cb"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "OrderScheduling.AppDelegate.application(_: __C.UIApplication, didRegisterForRemoteNotificationsWithDeviceToken: Foundation.Data) -&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 = "50"
endingLineNumber = "50"
offsetFromSymbolStart = "1028">
</Location>
<Location
uuid = "6043A19F-FEA4-44B7-BAC8-98339955AF0A - e7c967a0298824cb"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "OrderScheduling.AppDelegate.application(_: __C.UIApplication, didRegisterForRemoteNotificationsWithDeviceToken: Foundation.Data) -&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 = "50"
endingLineNumber = "50"
offsetFromSymbolStart = "1012">
</Location>
</Locations>
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy <BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint"> BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent <BreakpointContent
@@ -1436,6 +1388,36 @@
endingLineNumber = "112" endingLineNumber = "112"
offsetFromSymbolStart = "108"> offsetFromSymbolStart = "108">
</Location> </Location>
<Location
uuid = "0AB5E12D-53CA-429C-8322-7C8342D48DEC - 80f31cf5eda3179c"
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 = "104"
endingLineNumber = "104"
offsetFromSymbolStart = "264">
</Location>
<Location
uuid = "0AB5E12D-53CA-429C-8322-7C8342D48DEC - 80f31cf5eda3179c"
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 = "104"
endingLineNumber = "104"
offsetFromSymbolStart = "382">
</Location>
</Locations> </Locations>
</BreakpointContent> </BreakpointContent>
</BreakpointProxy> </BreakpointProxy>
@@ -1449,8 +1431,8 @@
filePath = "OrderScheduling/Main/AppDelegate.swift" filePath = "OrderScheduling/Main/AppDelegate.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "133" startingLineNumber = "127"
endingLineNumber = "133" endingLineNumber = "127"
landmarkName = "jpushNotificationAuthorization(_:withInfo:)" landmarkName = "jpushNotificationAuthorization(_:withInfo:)"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@@ -1465,8 +1447,8 @@
filePath = "OrderScheduling/Main/AppDelegate.swift" filePath = "OrderScheduling/Main/AppDelegate.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "120" startingLineNumber = "118"
endingLineNumber = "120" endingLineNumber = "118"
landmarkName = "jpushNotificationCenter(_:didReceive:withCompletionHandler:)" landmarkName = "jpushNotificationCenter(_:didReceive:withCompletionHandler:)"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@@ -2084,8 +2066,8 @@
filePath = "OrderScheduling/Main/AppDelegate.swift" filePath = "OrderScheduling/Main/AppDelegate.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "45" startingLineNumber = "43"
endingLineNumber = "45" endingLineNumber = "43"
landmarkName = "applicationDidBecomeActive(_:)" landmarkName = "applicationDidBecomeActive(_:)"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@@ -2100,8 +2082,8 @@
filePath = "OrderScheduling/Main/SceneDelegate.swift" filePath = "OrderScheduling/Main/SceneDelegate.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "38" startingLineNumber = "39"
endingLineNumber = "38" endingLineNumber = "39"
landmarkName = "sceneDidBecomeActive(_:)" landmarkName = "sceneDidBecomeActive(_:)"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@@ -2116,8 +2098,8 @@
filePath = "OrderScheduling/Main/AppDelegate.swift" filePath = "OrderScheduling/Main/AppDelegate.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "125" startingLineNumber = "120"
endingLineNumber = "125" endingLineNumber = "120"
landmarkName = "jpushNotificationCenter(_:didReceive:withCompletionHandler:)" landmarkName = "jpushNotificationCenter(_:didReceive:withCompletionHandler:)"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@@ -2198,6 +2180,36 @@
endingLineNumber = "113" endingLineNumber = "113"
offsetFromSymbolStart = "580"> offsetFromSymbolStart = "580">
</Location> </Location>
<Location
uuid = "0A527513-4E3C-4FA1-827B-40C875FF4F7A - 80f31cf5eda317e3"
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 = "105"
endingLineNumber = "105"
offsetFromSymbolStart = "744">
</Location>
<Location
uuid = "0A527513-4E3C-4FA1-827B-40C875FF4F7A - 80f31cf5eda317e3"
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 = "105"
endingLineNumber = "105"
offsetFromSymbolStart = "596">
</Location>
</Locations> </Locations>
</BreakpointContent> </BreakpointContent>
</BreakpointProxy> </BreakpointProxy>
@@ -2211,8 +2223,8 @@
filePath = "OrderScheduling/Main/AppDelegate.swift" filePath = "OrderScheduling/Main/AppDelegate.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "70" startingLineNumber = "69"
endingLineNumber = "70" endingLineNumber = "69"
landmarkName = "application(_:didReceiveRemoteNotification:fetchCompletionHandler:)" landmarkName = "application(_:didReceiveRemoteNotification:fetchCompletionHandler:)"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@@ -2361,166 +2373,6 @@
</Locations> </Locations>
</BreakpointContent> </BreakpointContent>
</BreakpointProxy> </BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "1F246989-ABD6-4185-9521-9080D5A5D5DD"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "OrderScheduling/Main/AppDelegate.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "123"
endingLineNumber = "123"
landmarkName = "jpushNotificationCenter(_:didReceive:withCompletionHandler:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "0D575373-015B-4365-A219-E973945C93D8"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "OrderScheduling/Rescue/View/AcceptOrderTool.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "29"
endingLineNumber = "29"
landmarkName = "open(userInfo:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "09F669EA-C827-40C6-B22D-2B092B81A054"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "OrderScheduling/Rescue/View/AcceptOrderTool.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "25"
endingLineNumber = "25"
landmarkName = "open(userInfo:)"
landmarkType = "7">
<Locations>
<Location
uuid = "09F669EA-C827-40C6-B22D-2B092B81A054 - 7092a57d58c6b5e0"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "closure #1 () -&gt; () in OrderScheduling.AcceptOrderTool.open(userInfo: Swift.Optional&lt;Swift.Dictionary&lt;Swift.AnyHashable, Any&gt;&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/Rescue/View/AcceptOrderTool.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "25"
endingLineNumber = "25"
offsetFromSymbolStart = "28">
</Location>
<Location
uuid = "09F669EA-C827-40C6-B22D-2B092B81A054 - 3bb9015b093c2540"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "closure #1 () -&gt; () in closure #1 () -&gt; () in OrderScheduling.AcceptOrderTool.open(userInfo: Swift.Optional&lt;Swift.Dictionary&lt;Swift.AnyHashable, Any&gt;&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/Rescue/View/AcceptOrderTool.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "26"
endingLineNumber = "26"
offsetFromSymbolStart = "20">
</Location>
</Locations>
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "39F551A1-D70A-4CC6-9E88-07D8784E7FEB"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "OrderScheduling/Rescue/View/AcceptOrderTool.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "26"
endingLineNumber = "26"
landmarkName = "open(userInfo:)"
landmarkType = "7">
<Locations>
<Location
uuid = "39F551A1-D70A-4CC6-9E88-07D8784E7FEB - 3bb9015b093c2540"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "closure #1 () -&gt; () in closure #1 () -&gt; () in OrderScheduling.AcceptOrderTool.open(userInfo: Swift.Optional&lt;Swift.Dictionary&lt;Swift.AnyHashable, Any&gt;&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/Rescue/View/AcceptOrderTool.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "26"
endingLineNumber = "26"
offsetFromSymbolStart = "20">
</Location>
<Location
uuid = "39F551A1-D70A-4CC6-9E88-07D8784E7FEB - 3bb9015b093c2540"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "closure #1 () -&gt; () in closure #1 () -&gt; () in OrderScheduling.AcceptOrderTool.open(userInfo: Swift.Optional&lt;Swift.Dictionary&lt;Swift.AnyHashable, Any&gt;&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/Rescue/View/AcceptOrderTool.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "26"
endingLineNumber = "26"
offsetFromSymbolStart = "176">
</Location>
</Locations>
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "BBF0158A-ADB5-442E-ADED-F03E6F0CEC20"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "OrderScheduling/Rescue/View/AcceptOrderTool.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "32"
endingLineNumber = "32"
landmarkName = "open(userInfo:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "E5D80E13-1F0F-4770-89B1-4D38B407EBE4"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "OrderScheduling/Rescue/View/AcceptOrderTool.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "22"
endingLineNumber = "22"
landmarkName = "open(userInfo:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy <BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint"> BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent <BreakpointContent
@@ -2681,70 +2533,6 @@
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
</BreakpointProxy> </BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "09C5A87E-B137-4FF3-97E7-7B4DBFFA977C"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "OrderScheduling/Main/SceneDelegate.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "42"
endingLineNumber = "42"
landmarkName = "sceneDidBecomeActive(_:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "15F43A4A-700B-44BF-8D21-67632F1F57B8"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "OrderScheduling/Main/SceneDelegate.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "41"
endingLineNumber = "41"
landmarkName = "sceneDidBecomeActive(_:)"
landmarkType = "7">
<Locations>
<Location
uuid = "15F43A4A-700B-44BF-8D21-67632F1F57B8 - a7950a51e299efe1"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "OrderScheduling.SceneDelegate.sceneDidBecomeActive(__C.UIScene) -&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/SceneDelegate.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "41"
endingLineNumber = "41"
offsetFromSymbolStart = "196">
</Location>
<Location
uuid = "15F43A4A-700B-44BF-8D21-67632F1F57B8 - a7950a51e299efe1"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "OrderScheduling.SceneDelegate.sceneDidBecomeActive(__C.UIScene) -&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/SceneDelegate.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "41"
endingLineNumber = "41"
offsetFromSymbolStart = "652">
</Location>
</Locations>
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy <BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint"> BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent <BreakpointContent
@@ -2755,8 +2543,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "798" startingLineNumber = "797"
endingLineNumber = "798" endingLineNumber = "797"
landmarkName = "collectionView(_:cellForItemAt:)" landmarkName = "collectionView(_:cellForItemAt:)"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@@ -2771,8 +2559,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "796" startingLineNumber = "795"
endingLineNumber = "796" endingLineNumber = "795"
landmarkName = "collectionView(_:cellForItemAt:)" landmarkName = "collectionView(_:cellForItemAt:)"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@@ -2787,8 +2575,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "797" startingLineNumber = "796"
endingLineNumber = "797" endingLineNumber = "796"
landmarkName = "collectionView(_:cellForItemAt:)" landmarkName = "collectionView(_:cellForItemAt:)"
landmarkType = "7"> landmarkType = "7">
<Locations> <Locations>
@@ -2963,8 +2751,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "814" startingLineNumber = "813"
endingLineNumber = "814" endingLineNumber = "813"
landmarkName = "collectionView(_:didSelectItemAt:)" landmarkName = "collectionView(_:didSelectItemAt:)"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@@ -3067,7 +2855,7 @@
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint"> BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent <BreakpointContent
uuid = "AE73D0A1-4B76-48CE-B9B1-7F631C9CBC4D" uuid = "AE73D0A1-4B76-48CE-B9B1-7F631C9CBC4D"
shouldBeEnabled = "Yes" shouldBeEnabled = "No"
ignoreCount = "0" ignoreCount = "0"
continueAfterRunningActions = "No" continueAfterRunningActions = "No"
filePath = "OrderSchedulingNotificationService/NotificationService.swift" filePath = "OrderSchedulingNotificationService/NotificationService.swift"
@@ -3079,54 +2867,6 @@
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
</BreakpointProxy> </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 <BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint"> BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent <BreakpointContent
@@ -3250,5 +2990,288 @@
</Locations> </Locations>
</BreakpointContent> </BreakpointContent>
</BreakpointProxy> </BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "4AF81D7C-527F-4B80-B6BB-8F8759266F4B"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "OrderScheduling/Global/Tool/Tool.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "145"
endingLineNumber = "145"
landmarkName = "dealAppExtension(completionHandler:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "A7C482B5-4E4D-4C20-807E-D7BF9E514DCC"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "OrderScheduling/Main/AppDelegate.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "107"
endingLineNumber = "107"
landmarkName = "jpushNotificationCenter(_:willPresent:withCompletionHandler:)"
landmarkType = "7">
<Locations>
<Location
uuid = "A7C482B5-4E4D-4C20-807E-D7BF9E514DCC - 7a9f60fd04ba598c"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "closure #1 (Swift.Dictionary&lt;Swift.AnyHashable, Any&gt;) -&gt; () in 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 = "107"
endingLineNumber = "107"
offsetFromSymbolStart = "28">
</Location>
<Location
uuid = "A7C482B5-4E4D-4C20-807E-D7BF9E514DCC - 80f31cf5eda31621"
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 = "107"
endingLineNumber = "107"
offsetFromSymbolStart = "929">
</Location>
<Location
uuid = "A7C482B5-4E4D-4C20-807E-D7BF9E514DCC - 80f31cf5eda31621"
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 = "107"
endingLineNumber = "107"
offsetFromSymbolStart = "1420">
</Location>
</Locations>
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "B1CE87FB-587E-47E0-A44F-029D609C17D5"
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 = "B1CE87FB-587E-47E0-A44F-029D609C17D5 - 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 = "1443">
</Location>
<Location
uuid = "B1CE87FB-587E-47E0-A44F-029D609C17D5 - 7a9f60fd04ba59ad"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "closure #1 (Swift.Dictionary&lt;Swift.AnyHashable, Any&gt;) -&gt; () in 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 = "88">
</Location>
</Locations>
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "C8C55848-36F9-4558-9CBD-573B19F5959F"
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 = "C8C55848-36F9-4558-9CBD-573B19F5959F - 80f31cf5eda317c2"
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 = "106"
endingLineNumber = "106"
offsetFromSymbolStart = "870">
</Location>
<Location
uuid = "C8C55848-36F9-4558-9CBD-573B19F5959F - 80f31cf5eda317c2"
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 = "106"
endingLineNumber = "106"
offsetFromSymbolStart = "700">
</Location>
<Location
uuid = "C8C55848-36F9-4558-9CBD-573B19F5959F - 7a9f60fd04ba598c"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "closure #1 (Swift.Dictionary&lt;Swift.AnyHashable, Any&gt;) -&gt; () in 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 = "107"
endingLineNumber = "107"
offsetFromSymbolStart = "28">
</Location>
</Locations>
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "7C91EE1E-D382-42D3-8202-C91F33E3B04D"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "OrderScheduling/Global/Tool/Tool.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "144"
endingLineNumber = "144"
landmarkName = "dealAppExtension(completionHandler:)"
landmarkType = "7">
<Locations>
<Location
uuid = "7C91EE1E-D382-42D3-8202-C91F33E3B04D - 96362fa778bf9efd"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "OrderScheduling.Tool.dealAppExtension(completionHandler: Swift.Optional&lt;(Swift.Dictionary&lt;Swift.AnyHashable, Any&gt;) -&gt; ()&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/Global/Tool/Tool.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "144"
endingLineNumber = "144"
offsetFromSymbolStart = "740">
</Location>
<Location
uuid = "7C91EE1E-D382-42D3-8202-C91F33E3B04D - 75ae0035b01e1fd6"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "OrderScheduling.Tool.playVoiceWith(userInfo: Swift.Optional&lt;Swift.Dictionary&lt;Swift.AnyHashable, Any&gt;&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/Global/Tool/Tool.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "145"
endingLineNumber = "145"
offsetFromSymbolStart = "371">
</Location>
<Location
uuid = "7C91EE1E-D382-42D3-8202-C91F33E3B04D - 75ae0035b01e1fd6"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "OrderScheduling.Tool.playVoiceWith(userInfo: Swift.Optional&lt;Swift.Dictionary&lt;Swift.AnyHashable, Any&gt;&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/Global/Tool/Tool.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "145"
endingLineNumber = "145"
offsetFromSymbolStart = "405">
</Location>
<Location
uuid = "7C91EE1E-D382-42D3-8202-C91F33E3B04D - 96362fa778bf9efd"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "OrderScheduling.Tool.dealAppExtension(completionHandler: Swift.Optional&lt;(Swift.Dictionary&lt;Swift.AnyHashable, Any&gt;) -&gt; ()&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/Global/Tool/Tool.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "144"
endingLineNumber = "144"
offsetFromSymbolStart = "676">
</Location>
<Location
uuid = "7C91EE1E-D382-42D3-8202-C91F33E3B04D - 96362fa778bf9efd"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "OrderScheduling.Tool.dealAppExtension(completionHandler: Swift.Optional&lt;(Swift.Dictionary&lt;Swift.AnyHashable, Any&gt;) -&gt; ()&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/Global/Tool/Tool.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "144"
endingLineNumber = "144"
offsetFromSymbolStart = "724">
</Location>
</Locations>
</BreakpointContent>
</BreakpointProxy>
</Breakpoints> </Breakpoints>
</Bucket> </Bucket>

4
OrderScheduling/Common/WebView/WebViewTool.swift
View File

@@ -78,10 +78,10 @@ open class WebViewTool : NSObject {
} }
break break
case .workOrderReconciliation: case .workOrderReconciliation:
vc = WebViewController(showNavBar:false, title: WebViewNameEnum.workOrderReconciliation.rawValue, url: "http://192.168.14.126:8080/dev/h5/supplier/dispatch/workOrderReconciliation?token=\((USER.token)!)") vc = WebViewController(showNavBar:false, title: WebViewNameEnum.workOrderReconciliation.rawValue, url: "\((h5Models?.workOrderReconciliation)!)?token=\((USER.token)!)")
break break
case .vehicleManage: case .vehicleManage:
vc = WebViewController(showNavBar:false, title: WebViewNameEnum.vehicleManage.rawValue, url: "http://192.168.14.126:8080/dev/h5/supplier/dispatch/vehicleManage?token=\((USER.token)!)") vc = WebViewController(showNavBar:false, title: WebViewNameEnum.vehicleManage.rawValue, url: "\((h5Models?.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)!)")

23
OrderScheduling/Global/Tool/Tool.swift
View File

@@ -138,7 +138,30 @@ open class Tool {
return "未知" return "未知"
} }
func dealAppExtension(completionHandler:(([AnyHashable:Any]) -> Void)?) {
let userDefault = UserDefaults.init(suiteName: GROUPID)
let userInfo = userDefault?.object(forKey: bestAttemptContentUserInfo_key) as? [AnyHashable:Any]
if let userInfo {
if completionHandler != nil {
completionHandler!(userInfo)
}
userDefault?.setValue(nil, forKey: bestAttemptContentUserInfo_key)
}
}
func playAlertWith(userInfo:[AnyHashable:Any]?) {
if USER.newMessageAlert != true {
return
}
ACCEPTORDERTOOL.open(userInfo: userInfo)
}
func playVoiceWith(userInfo:[AnyHashable:Any]?) { func playVoiceWith(userInfo:[AnyHashable:Any]?) {
if USER.newMessageSound != true {
return
}
if let userInfo { if let userInfo {
let aps = userInfo["aps"] as? [String:Any] let aps = userInfo["aps"] as? [String:Any]

20
OrderScheduling/Global/User/UserData.swift
View File

@@ -82,6 +82,24 @@ open class UserData {
UserDefaults.standard.set(userId, forKey: userId_key) UserDefaults.standard.set(userId, forKey: userId_key)
} }
// 不需要记录
public var newMessageSound : Bool {
return (UserDefaults.standard.object(forKey: newMessageSound_key) as? Bool) ?? true
}
func setNewMessageSound(newMessageSound:Bool?) {
UserDefaults.standard.set(newMessageSound, forKey: newMessageSound_key)
}
// 不需要记录
public var newMessageAlert : Bool {
return (UserDefaults.standard.object(forKey: newMessageAlert_key) as? Bool) ?? true
}
func setNewMessageAlert(newMessageAlert:Bool?) {
UserDefaults.standard.set(newMessageAlert, forKey: newMessageAlert_key)
}
public var deviceToken : String? public var deviceToken : String?
public var regId : String? public var regId : String?
@@ -92,5 +110,7 @@ open class UserData {
setSupplierType(supplierType: nil) setSupplierType(supplierType: nil)
setUserId(userId: nil) setUserId(userId: nil)
setSupplierId(supplierId: nil) setSupplierId(supplierId: nil)
setNewMessageSound(newMessageSound: nil)
setNewMessageAlert(newMessageAlert: nil)
} }
} }

1
OrderScheduling/HttpResponseModel/ResponseModel.swift
View File

@@ -69,6 +69,7 @@ class OrderListDataModel: Decodable {
var environmentPic : String? var environmentPic : String?
var userOrderId : Int var userOrderId : Int
var taskOrderId : Int var taskOrderId : Int
var taskFlowId : Int
var userPhone : String var userPhone : String
var auditFailReason : String? var auditFailReason : String?
var isSupplierSettle : SupplierSettleModel? var isSupplierSettle : SupplierSettleModel?

26
OrderScheduling/Main/AppDelegate.swift
View File

@@ -11,9 +11,7 @@ import CocoaDebug
class AppDelegate: UIResponder, UIApplicationDelegate { class AppDelegate: UIResponder, UIApplicationDelegate {
public var allowOrentitaionRotation : Bool = false public var allowOrentitaionRotation : Bool = false
public var userInfo : [AnyHashable:Any]?
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool { func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
// Override point for customization after application launch. // Override point for customization after application launch.
// 通知 // 通知
@@ -48,12 +46,14 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
// 注册通知 // 注册通知
func application(_ application: UIApplication, func application(_ application: UIApplication,
didRegisterForRemoteNotificationsWithDeviceToken deviceToken: Data) { didRegisterForRemoteNotificationsWithDeviceToken deviceToken: Data) {
let tokenString = deviceToken.map { String(format: "%02.2hhx", $0) }.joined()
print("deviceToken:\(tokenString)")
JPUSHService.registerDeviceToken(deviceToken) JPUSHService.registerDeviceToken(deviceToken)
let tokenString = deviceToken.map { String(format: "%02.2hhx", $0) }.joined()
USER.deviceToken = tokenString USER.deviceToken = tokenString
print("registrationID:\(JPUSHService.registrationID())")
USER.regId = JPUSHService.registrationID() USER.regId = JPUSHService.registrationID()
print("deviceToken:\(tokenString)")
print("registrationID:\(JPUSHService.registrationID())")
} }
func application(_ application: UIApplication, didFailToRegisterForRemoteNotificationsWithError error: Error) { func application(_ application: UIApplication, didFailToRegisterForRemoteNotificationsWithError error: Error) {
@@ -62,7 +62,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
func application(_ application: UIApplication, didReceiveRemoteNotification userInfo: [AnyHashable: Any]) { func application(_ application: UIApplication, didReceiveRemoteNotification userInfo: [AnyHashable: Any]) {
JPUSHService.handleRemoteNotification(userInfo) JPUSHService.handleRemoteNotification(userInfo)
print("收到通知", userInfo)
} }
func application(_ application: UIApplication, didReceiveRemoteNotification userInfo: [AnyHashable : Any], fetchCompletionHandler completionHandler: @escaping (UIBackgroundFetchResult) -> Void) { func application(_ application: UIApplication, didReceiveRemoteNotification userInfo: [AnyHashable : Any], fetchCompletionHandler completionHandler: @escaping (UIBackgroundFetchResult) -> Void) {
@@ -100,29 +99,24 @@ extension AppDelegate : JPUSHRegisterDelegate {
@available(iOS 10.0, *) @available(iOS 10.0, *)
func jpushNotificationCenter(_ center: UNUserNotificationCenter, willPresent notification: UNNotification, func jpushNotificationCenter(_ center: UNUserNotificationCenter, willPresent notification: UNNotification,
withCompletionHandler completionHandler: ((Int) -> Void)) { withCompletionHandler completionHandler: ((Int) -> Void)) {
// 前台收到通知
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") TOOL.dealAppExtension { userInfo in
if let userInfo = userDefault?.object(forKey: "bestAttemptContentUserInfo") as? [AnyHashable:Any] { TOOL.playAlertWith(userInfo: userInfo)
ACCEPTORDERTOOL.open(userInfo: userInfo)
TOOL.playVoiceWith(userInfo: userInfo) TOOL.playVoiceWith(userInfo: userInfo)
userDefault?.setValue(nil, forKey: "bestAttemptContentUserInfo")
} }
print("ios10 前台")
} }
completionHandler(0) completionHandler(0)
} }
@available(iOS 10.0, *) @available(iOS 10.0, *)
func jpushNotificationCenter(_ center: UNUserNotificationCenter, didReceive response: UNNotificationResponse, withCompletionHandler completionHandler: (() -> Void)) { func jpushNotificationCenter(_ center: UNUserNotificationCenter, didReceive response: UNNotificationResponse, withCompletionHandler completionHandler: (() -> Void)) {
// 后台收到通知
let userInfo = response.notification.request.content.userInfo let userInfo = response.notification.request.content.userInfo
if response.notification.request.trigger?.isKind(of: UNPushNotificationTrigger.self) == true { if response.notification.request.trigger?.isKind(of: UNPushNotificationTrigger.self) == true {
// self.userInfo = userInfo
JPUSHService.resetBadge()
UIApplication.shared.applicationIconBadgeNumber = 0
JPUSHService.handleRemoteNotification(userInfo) JPUSHService.handleRemoteNotification(userInfo)
print("ios10 后台")
} }
completionHandler() completionHandler()
} }

7
OrderScheduling/Main/SceneDelegate.swift
View File

@@ -34,13 +34,12 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
} }
func sceneDidBecomeActive(_ scene: UIScene) { func sceneDidBecomeActive(_ scene: UIScene) {
// 后台收到通知后或者不点击通知打开app，激活时消除badge
JPUSHService.resetBadge() JPUSHService.resetBadge()
UIApplication.shared.applicationIconBadgeNumber = 0 UIApplication.shared.applicationIconBadgeNumber = 0
let userDefault = UserDefaults.init(suiteName: "group.com.sino.supplier") TOOL.dealAppExtension { userInfo in
if let userInfo = userDefault?.object(forKey: "bestAttemptContentUserInfo") as? [AnyHashable:Any] { TOOL.playAlertWith(userInfo: userInfo)
ACCEPTORDERTOOL.open(userInfo: userInfo)
userDefault?.setValue(nil, forKey: "bestAttemptContentUserInfo")
} }
} }

6
OrderScheduling/Mine/ViewController/MineController.swift
View File

@@ -122,8 +122,10 @@ extension MineController {
mineView.tongzhitixingGes.rx.event mineView.tongzhitixingGes.rx.event
.observe(on: MainScheduler.instance) .observe(on: MainScheduler.instance)
.subscribe(onNext: { _ in .subscribe(onNext: {[weak self] _ in
NOTIAUTHTOOL.openSetting() // NOTIAUTHTOOL.openSetting()
let vc = NotificationSetUpController()
self?.navigationController?.pushViewController(vc, animated: true)
}) })
.disposed(by: disposeBag) .disposed(by: disposeBag)

174
OrderScheduling/Mine/ViewController/NotificationSetUpController.swift Normal file
View File

@@ -0,0 +1,174 @@
//
// NotificationSetUpController.swift
// OrderScheduling
//
// Created by 中道 on 2023/8/29.
//
import Foundation
import DDControlsKit_Private
import SnapKit
import DDAutoUIKit_Private
import RxSwift
import RxCocoa
class NotificationSetUpModel {
enum typeEnum : Int {
case sound = 0
case alert
}
var name : String
var type : typeEnum
var isOn : Bool
init(name: String, type:typeEnum, isOn: Bool) {
self.name = name
self.type = type
self.isOn = isOn
}
}
extension NotificationSetUpController {
func addActions() {
}
}
// MARK: UITableViewDelegate,UITableViewDataSource
extension NotificationSetUpController : UITableViewDelegate,UITableViewDataSource {
public func numberOfSections(in tableView: UITableView) -> Int {
return 1
}
public func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
return resultArr.count
}
public func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
var cell = tableView.dequeueReusableCell(withIdentifier: "cell") as? NotificationSetUpCell
if cell == nil {
cell = NotificationSetUpCell(style: .default, reuseIdentifier: "cell")
}
let model = resultArr[indexPath.item]
cell?.nameLabel.text = model.name
cell?.switchButton.isOn = model.isOn
cell?.switchButton.rx.isOn
.subscribe(onNext: { isOn in
if model.type == .sound {
USER.setNewMessageSound(newMessageSound: isOn)
}else if model.type == .alert {
USER.setNewMessageAlert(newMessageAlert: isOn)
}
})
.disposed(by: disposeBag)
return cell!
}
public func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
return auto(44)
}
}
open class NotificationSetUpController : ZDViewController {
private let notificationSetUpView = NotificationSetUpView()
private var resultArr : [NotificationSetUpModel] = []
private let disposeBag = DisposeBag()
open override func viewDidLoad() {
super.viewDidLoad()
dd_navigationItemTitle = "通知提醒"
dd_navigationBarBackgroundColor = .hex("354683")
dd_navigationBarTitleTextAttributes = [.foregroundColor : UIColor.white(alpha: 0.7),.font:UIFont.mediumFont(17)]
dd_navigationBarBarButtonItemAttributes = [.foregroundColor : UIColor.white]
let soundModel = NotificationSetUpModel(name: "新消息声音", type: .sound, isOn: USER.newMessageSound)
let alertModel = NotificationSetUpModel(name: "新消息弹窗", type: .alert, isOn: USER.newMessageAlert)
resultArr.append(soundModel)
resultArr.append(alertModel)
addSubviews()
addActions()
}
func addSubviews() {
view.backgroundColor = .hex("F4F5F7")
view.addSubview(notificationSetUpView)
notificationSetUpView.snp.makeConstraints { make in
make.top.left.right.equalToSuperview()
make.bottom.equalTo(-view.safeAreaInsets.bottom)
}
notificationSetUpView.tableView.delegate = self
notificationSetUpView.tableView.dataSource = self
}
open override var preferredStatusBarStyle: UIStatusBarStyle {
return .lightContent
}
}
open class NotificationSetUpView : DDView {
public let tableView : DDTableView
public override init(frame: CGRect) {
tableView = DDTableView(frame: CGRectZero, style: .plain)
super.init(frame: frame)
tableView.backgroundColor = .white
tableView.separatorStyle = .none
addSubview(tableView)
tableView.snp.makeConstraints { make in
make.edges.equalToSuperview()
}
}
public required init?(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
}
class NotificationSetUpCell : DDTableViewCell {
public let radiusView : DDView
public let nameLabel : DDLabel
public let switchButton : UISwitch
public let line : DDView
override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
radiusView = DDView()
nameLabel = DDLabel.dd_init(withText: "", font: .mediumFont(auto(14)), textColor: .hex("000000").alpha(0.8))
switchButton = UISwitch()
line = DDView.init()
super.init(style: style, reuseIdentifier: reuseIdentifier)
selectionStyle = .none
contentView.addSubview(radiusView)
radiusView.addSubview(nameLabel)
radiusView.addSubview(switchButton)
line.backgroundColor = .hex("F1F2F5")
radiusView.addSubview(line)
radiusView.snp.makeConstraints { make in
make.edges.equalToSuperview()
}
nameLabel.snp.makeConstraints { make in
make.left.equalTo(auto(20))
make.centerY.equalToSuperview()
}
switchButton.snp.makeConstraints { make in
make.right.equalTo(-auto(20))
make.centerY.equalToSuperview()
}
line.snp.makeConstraints { make in
make.bottom.equalToSuperview()
make.left.equalTo(auto(20))
make.right.equalTo(-auto(20))
make.height.equalTo(1)
}
}
public required init?(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
}

3
OrderScheduling/Rescue/View/AcceptOrderTool.swift
View File

@@ -16,6 +16,9 @@ open class AcceptOrderTool : NSObject {
private let disposeBag = DisposeBag() private let disposeBag = DisposeBag()
func open(userInfo:[AnyHashable:Any]?) { func open(userInfo:[AnyHashable:Any]?) {
if USER.newMessageAlert != true {
return
}
let acceptOrderView = AcceptOrderView() let acceptOrderView = AcceptOrderView()
acceptOrderView.titleLabel.text = "新订单" acceptOrderView.titleLabel.text = "新订单"
acceptOrderView.contentLabel.text = TOOL.getOrderString(userInfo: userInfo) acceptOrderView.contentLabel.text = TOOL.getOrderString(userInfo: userInfo)

31
OrderScheduling/Rescue/ViewController/RescueController.swift
View File

@@ -461,9 +461,9 @@ extension RescuePendingOrderController : UITableViewDelegate,UITableViewDataSour
}) })
} }
cell?.serviceLabel.text = model.vehiclePointAddress cell?.serviceLabel.text = model.vehiclePointAddress
if model.destinationAddress?.isEmpty == false { if model.destinationAddress?.isEmpty == false || (model.taskFlowId != 1) {
cell?.destinationTitleLabel.text = "目的地:" cell?.destinationTitleLabel.text = "目的地:"
cell?.destinationLabel.text = model.destinationAddress cell?.destinationLabel.text = model.destinationAddress ?? " "
cell?.destinationTitleLabel.snp.updateConstraints({ make in cell?.destinationTitleLabel.snp.updateConstraints({ make in
make.top.equalTo(cell!.serviceLabel.snp.bottom).offset(auto(8)) make.top.equalTo(cell!.serviceLabel.snp.bottom).offset(auto(8))
}) })
@@ -569,7 +569,7 @@ extension RescuePendingDispatchController : UITableViewDelegate,UITableViewDataS
cell?.destinationNoticeView.isHidden = false cell?.destinationNoticeView.isHidden = false
cell?.serviceNoticeLabel.text = "备注:"+(model.vehiclePointRemark ?? "") cell?.serviceNoticeLabel.text = "备注:"+(model.vehiclePointRemark ?? "")
cell?.serviceNoticeView.snp.updateConstraints({ make in cell?.serviceNoticeView.snp.updateConstraints({ make in
make.top.equalTo(cell!.serviceLabel.snp.bottom).offset(auto(2.5)) make.top.equalTo(cell!.serviceLabel.snp.bottom).offset(auto(4))
}) })
cell?.serviceNoticeLabel.snp.updateConstraints({ make in cell?.serviceNoticeLabel.snp.updateConstraints({ make in
make.top.equalTo(auto(5)) make.top.equalTo(auto(5))
@@ -586,11 +586,11 @@ extension RescuePendingDispatchController : UITableViewDelegate,UITableViewDataS
make.bottom.equalTo(0) make.bottom.equalTo(0)
}) })
} }
if model.destinationAddress?.isEmpty == false { if model.destinationAddress?.isEmpty == false || (model.taskFlowId != 1) {
cell?.destinationTitleLabel.text = "目的地:" cell?.destinationTitleLabel.text = "目的地:"
cell?.destinationLabel.text = model.destinationAddress cell?.destinationLabel.text = model.destinationAddress ?? " "
cell?.destinationTitleLabel.snp.updateConstraints({ make in cell?.destinationTitleLabel.snp.updateConstraints({ make in
make.top.equalTo(cell!.serviceNoticeView.snp.bottom).offset(auto(2.5)) make.top.equalTo(cell!.serviceNoticeView.snp.bottom).offset(auto(4))
}) })
}else{ }else{
cell?.destinationTitleLabel.text = nil cell?.destinationTitleLabel.text = nil
@@ -624,7 +624,7 @@ extension RescuePendingDispatchController : UITableViewDelegate,UITableViewDataS
cell?.reserveTitleLabel.text = "预约时间:" cell?.reserveTitleLabel.text = "预约时间:"
cell?.reserveLabel.text = model.appointTime cell?.reserveLabel.text = model.appointTime
cell?.reserveTitleLabel.snp.updateConstraints({ make in cell?.reserveTitleLabel.snp.updateConstraints({ make in
make.top.equalTo(cell!.destinationNoticeView.snp.bottom).offset(auto(2.5)) make.top.equalTo(cell!.destinationNoticeView.snp.bottom).offset(auto(4))
}) })
}else{ }else{
cell?.reserveTitleLabel.text = nil cell?.reserveTitleLabel.text = nil
@@ -640,7 +640,6 @@ extension RescuePendingDispatchController : UITableViewDelegate,UITableViewDataS
cell?.photoCollectionView.register(RescuePendingDispatchPhotoCell.self, forCellWithReuseIdentifier: "cell") cell?.photoCollectionView.register(RescuePendingDispatchPhotoCell.self, forCellWithReuseIdentifier: "cell")
if model.environmentPic?.isEmpty == false { if model.environmentPic?.isEmpty == false {
let environmentPics = model.environmentPic?.components(separatedBy: ",")
cell?.photoTitleLabel.text = "查看照片:" cell?.photoTitleLabel.text = "查看照片:"
cell?.photoView.isHidden = false cell?.photoView.isHidden = false
cell?.photoTitleLabel.snp.updateConstraints({ make in cell?.photoTitleLabel.snp.updateConstraints({ make in
@@ -707,7 +706,7 @@ extension RescueIsIngController : UITableViewDelegate,UITableViewDataSource {
cell?.serviceTitleLabel.text = "故障地:" cell?.serviceTitleLabel.text = "故障地:"
cell?.destinationTitleLabel.text = "目的地:" cell?.destinationTitleLabel.text = "目的地:"
cell?.reportButton.setTitle("报备", for: .normal) cell?.reportButton.setTitle("报备", for: .normal)
cell?.dispatchButton.setTitle("改派单", for: .normal) cell?.dispatchButton.setTitle("改派", for: .normal)
} }
let model = resultArr[indexPath.row] let model = resultArr[indexPath.row]
@@ -727,9 +726,9 @@ extension RescueIsIngController : UITableViewDelegate,UITableViewDataSource {
} }
cell?.serviceLabel.text = model.vehiclePointAddress cell?.serviceLabel.text = model.vehiclePointAddress
if model.destinationAddress?.isEmpty == false { if model.destinationAddress?.isEmpty == false || (model.taskFlowId != 1) {
cell?.destinationTitleLabel.text = "目的地:" cell?.destinationTitleLabel.text = "目的地:"
cell?.destinationLabel.text = model.destinationAddress cell?.destinationLabel.text = model.destinationAddress ?? " "
cell?.destinationTitleLabel.snp.updateConstraints({ make in cell?.destinationTitleLabel.snp.updateConstraints({ make in
make.top.equalTo(cell!.serviceLabel.snp.bottom).offset(auto(8)) make.top.equalTo(cell!.serviceLabel.snp.bottom).offset(auto(8))
}) })
@@ -1408,7 +1407,7 @@ class RescuePendingDispatchCell : DDTableViewCell {
} }
serviceNoticeView.snp.makeConstraints { make in serviceNoticeView.snp.makeConstraints { make in
make.top.equalTo(serviceLabel.snp.bottom).offset(auto(2.5)) make.top.equalTo(serviceLabel.snp.bottom).offset(auto(4))
make.left.equalTo(auto(10)) make.left.equalTo(auto(10))
make.right.equalTo(-auto(10)) make.right.equalTo(-auto(10))
} }
@@ -1419,7 +1418,7 @@ class RescuePendingDispatchCell : DDTableViewCell {
} }
destinationTitleLabel.snp.makeConstraints { make in destinationTitleLabel.snp.makeConstraints { make in
make.top.equalTo(serviceNoticeView.snp.bottom).offset(auto(2.5)) make.top.equalTo(serviceNoticeView.snp.bottom).offset(auto(4))
make.left.equalTo(typeLabel) make.left.equalTo(typeLabel)
make.width.equalTo(merchantTitleLabel) make.width.equalTo(merchantTitleLabel)
} }
@@ -1431,7 +1430,7 @@ class RescuePendingDispatchCell : DDTableViewCell {
} }
destinationNoticeView.snp.makeConstraints { make in destinationNoticeView.snp.makeConstraints { make in
make.top.equalTo(destinationLabel.snp.bottom).offset(auto(2.5)) make.top.equalTo(destinationLabel.snp.bottom).offset(auto(4))
make.left.equalTo(auto(10)) make.left.equalTo(auto(10))
make.right.equalTo(-auto(10)) make.right.equalTo(-auto(10))
} }
@@ -1442,7 +1441,7 @@ class RescuePendingDispatchCell : DDTableViewCell {
} }
reserveTitleLabel.snp.makeConstraints { make in reserveTitleLabel.snp.makeConstraints { make in
make.top.equalTo(destinationNoticeView.snp.bottom).offset(auto(2.5)) make.top.equalTo(destinationNoticeView.snp.bottom).offset(auto(4))
make.left.equalTo(typeLabel) make.left.equalTo(typeLabel)
make.width.equalTo(merchantTitleLabel) make.width.equalTo(merchantTitleLabel)
} }
@@ -1631,7 +1630,7 @@ class RescueIsIngCell : DDTableViewCell {
} }
orderStatusTitleLabel.snp.makeConstraints { make in orderStatusTitleLabel.snp.makeConstraints { make in
make.top.equalTo(driverLabel.snp.bottom).offset(auto(8)) make.top.equalTo(orderDateLabel.snp.bottom).offset(auto(8))
make.left.equalTo(typeLabel) make.left.equalTo(typeLabel)
make.width.equalTo(auto(60)) make.width.equalTo(auto(60))
} }

4
OrderScheduling/Strings/EnvironmentStrings.swift
View File

@@ -12,3 +12,7 @@ public let HOST = "https://api1.sino-assist.com"
#else #else
public let HOST = "https://api1.sino-assist.com" public let HOST = "https://api1.sino-assist.com"
#endif #endif
public let GROUPID = "group.com.sino.supplier"

6
OrderScheduling/Strings/UserDefaultStrings.swift
View File

@@ -26,3 +26,9 @@ public let appUpdateIgnore_key = "appUpdateIgnore_key"
public let deviceToken_key = "deviceToken_key" public let deviceToken_key = "deviceToken_key"
public let regId_key = "regId_key" public let regId_key = "regId_key"
public let newMessageSound_key = "newMessageSound_key"
public let newMessageAlert_key = "newMessageAlert_key"
public let bestAttemptContentUserInfo_key = "bestAttemptContentUserInfo_key"

2
OrderSchedulingNotificationService/NotificationService.swift
View File

@@ -33,7 +33,7 @@ class NotificationService: UNNotificationServiceExtension {
} }
let userDefault = UserDefaults.init(suiteName: "group.com.sino.supplier") let userDefault = UserDefaults.init(suiteName: "group.com.sino.supplier")
userDefault?.setValue(userInfo, forKey: "bestAttemptContentUserInfo") userDefault?.setValue(userInfo, forKey: "bestAttemptContentUserInfo_key")
JPushNotificationExtensionService.jpushSetAppkey("259b546bb2aaf5f02ffa2547") JPushNotificationExtensionService.jpushSetAppkey("259b546bb2aaf5f02ffa2547")
JPushNotificationExtensionService.jpushReceive(request) { JPushNotificationExtensionService.jpushReceive(request) {