update

OrderScheduling.xcodeproj/project.pbxproj

@@ -64,6 +64,14 @@
 		79FB76132A9C6CC100DB00A4 /* newOrderAudio.wav in Resources */ = {isa = PBXBuildFile; fileRef = 79FB76122A9C6CC100DB00A4 /* newOrderAudio.wav */; };
 		79FB76152A9DEE7400DB00A4 /* RefuseOrderConfirmView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79FB76142A9DEE7400DB00A4 /* RefuseOrderConfirmView.swift */; };
 		79FB76172A9DFC9600DB00A4 /* NotificationSetUpController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79FB76162A9DFC9600DB00A4 /* NotificationSetUpController.swift */; };
+		79FB761C2A9EEC3700DB00A4 /* GroupData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79FB761B2A9EEC3700DB00A4 /* GroupData.swift */; };
+		79FB761D2A9EED4A00DB00A4 /* GroupData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79FB761B2A9EEC3700DB00A4 /* GroupData.swift */; };
+		79FB761E2A9EED5600DB00A4 /* UserDefaultStrings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7918877F2A7CE6F1007EA0C1 /* UserDefaultStrings.swift */; };
+		79FB761F2A9EEDAD00DB00A4 /* AppKeyStrings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 791887812A7CE71D007EA0C1 /* AppKeyStrings.swift */; };
+		79FB76202A9EEE3700DB00A4 /* EnvironmentStrings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 791887B92A82495D007EA0C1 /* EnvironmentStrings.swift */; };
+		79FB76222A9EEED900DB00A4 /* CommonKeyStrings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79FB76212A9EEED900DB00A4 /* CommonKeyStrings.swift */; };
+		79FB76232A9EEF8800DB00A4 /* CommonKeyStrings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79FB76212A9EEED900DB00A4 /* CommonKeyStrings.swift */; };
+		79FB76262A9F0A0000DB00A4 /* BackgroundTask.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79FB76252A9F0A0000DB00A4 /* BackgroundTask.swift */; };
 		A64E95F00B82DC28C2B9306E /* libPods-OrderScheduling.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 98784A61C325B3D6C408016C /* libPods-OrderScheduling.a */; };
 /* End PBXBuildFile section */
 
@@ -173,6 +181,9 @@
 		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>"; };
 		79FB76162A9DFC9600DB00A4 /* NotificationSetUpController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationSetUpController.swift; sourceTree = "<group>"; };
+		79FB761B2A9EEC3700DB00A4 /* GroupData.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GroupData.swift; sourceTree = "<group>"; };
+		79FB76212A9EEED900DB00A4 /* CommonKeyStrings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CommonKeyStrings.swift; sourceTree = "<group>"; };
+		79FB76252A9F0A0000DB00A4 /* BackgroundTask.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BackgroundTask.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>"; };
 		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>"; };
@@ -269,6 +280,7 @@
 				791887962A80C6CD007EA0C1 /* LocalizedStrings.swift */,
 				791887B92A82495D007EA0C1 /* EnvironmentStrings.swift */,
 				791887BE2A839716007EA0C1 /* EntryStrings.swift */,
+				79FB76212A9EEED900DB00A4 /* CommonKeyStrings.swift */,
 			);
 			path = Strings;
 			sourceTree = "<group>";
@@ -353,6 +365,8 @@
 		791887AB2A80F930007EA0C1 /* Global */ = {
 			isa = PBXGroup;
 			children = (
+				79FB76242A9F09F400DB00A4 /* BackgroundTask */,
+				79FB761A2A9EEC3700DB00A4 /* GroupData */,
 				79DD0DB22A95F00000768FE7 /* Extension */,
 				791887C22A84BFCD007EA0C1 /* Tool */,
 				791887AC2A80F930007EA0C1 /* User */,
@@ -687,6 +701,22 @@
 			path = OrderSchedulingNotificationService;
 			sourceTree = "<group>";
 		};
+		79FB761A2A9EEC3700DB00A4 /* GroupData */ = {
+			isa = PBXGroup;
+			children = (
+				79FB761B2A9EEC3700DB00A4 /* GroupData.swift */,
+			);
+			path = GroupData;
+			sourceTree = "<group>";
+		};
+		79FB76242A9F09F400DB00A4 /* BackgroundTask */ = {
+			isa = PBXGroup;
+			children = (
+				79FB76252A9F0A0000DB00A4 /* BackgroundTask.swift */,
+			);
+			path = BackgroundTask;
+			sourceTree = "<group>";
+		};
 		8AE7BC9A61FB797B2DAF5A9C /* Pods */ = {
 			isa = PBXGroup;
 			children = (
@@ -905,6 +935,7 @@
 				7918878F2A809E37007EA0C1 /* TimerStrings.swift in Sources */,
 				7918878B2A7CE9E0007EA0C1 /* main.swift in Sources */,
 				791887A02A80CA10007EA0C1 /* RequestList.swift in Sources */,
+				79FB761C2A9EEC3700DB00A4 /* GroupData.swift in Sources */,
 				79FB76172A9DFC9600DB00A4 /* NotificationSetUpController.swift in Sources */,
 				79CECC262A8C749B00B95D8B /* VehicleMonitorVideoController.swift in Sources */,
 				79DD0DA82A9480D000768FE7 /* NotificationAuthView.swift in Sources */,
@@ -913,6 +944,7 @@
 				791887802A7CE6F1007EA0C1 /* UserDefaultStrings.swift in Sources */,
 				79FB75EC2A988EC000DB00A4 /* MessageCenterTool.swift in Sources */,
 				79FB76152A9DEE7400DB00A4 /* RefuseOrderConfirmView.swift in Sources */,
+				79FB76262A9F0A0000DB00A4 /* BackgroundTask.swift in Sources */,
 				79DD0DB12A94B3DB00768FE7 /* EmptyView.swift in Sources */,
 				79DD0DAA2A9481BC00768FE7 /* NotificationAuthTool.swift in Sources */,
 				794FBB1C2A8F4DE900D57BB8 /* MessageView.swift in Sources */,
@@ -921,6 +953,7 @@
 				791887C12A839784007EA0C1 /* RefuseOrderEntryView.swift in Sources */,
 				7918877E2A7CE5AD007EA0C1 /* NotificationStrings.swift in Sources */,
 				79CECC1B2A89F83800B95D8B /* AdditionalPhotoController.swift in Sources */,
+				79FB76222A9EEED900DB00A4 /* CommonKeyStrings.swift in Sources */,
 				79DD0DBB2A971EB300768FE7 /* ZDViewController.swift in Sources */,
 				791887BF2A839716007EA0C1 /* EntryStrings.swift in Sources */,
 				794FBB192A8F4AF000D57BB8 /* MessageCount.swift in Sources */,
@@ -950,6 +983,11 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				79FB76232A9EEF8800DB00A4 /* CommonKeyStrings.swift in Sources */,
+				79FB76202A9EEE3700DB00A4 /* EnvironmentStrings.swift in Sources */,
+				79FB761F2A9EEDAD00DB00A4 /* AppKeyStrings.swift in Sources */,
+				79FB761E2A9EED5600DB00A4 /* UserDefaultStrings.swift in Sources */,
+				79FB761D2A9EED4A00DB00A4 /* GroupData.swift in Sources */,
 				79FB75F82A9C3BEE00DB00A4 /* NotificationService.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;

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

@@ -253,8 +253,8 @@
             filePath = "OrderScheduling/Main/Initial.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "92"
+            startingLineNumber = "93"
-            endingLineNumber = "92"
+            endingLineNumber = "93"
             landmarkName = "networkErrorHandler(response:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -269,8 +269,8 @@
             filePath = "OrderScheduling/Main/Initial.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "93"
+            startingLineNumber = "94"
-            endingLineNumber = "93"
+            endingLineNumber = "94"
             landmarkName = "networkErrorHandler(response:)"
             landmarkType = "7">
             <Locations>
@@ -698,8 +698,8 @@
             filePath = "OrderScheduling/Main/Initial.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "109"
+            startingLineNumber = "110"
-            endingLineNumber = "109"
+            endingLineNumber = "110"
             landmarkName = "errorCodeHandler(response:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -714,8 +714,8 @@
             filePath = "OrderScheduling/Main/Initial.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "112"
+            startingLineNumber = "113"
-            endingLineNumber = "112"
+            endingLineNumber = "113"
             landmarkName = "errorCodeHandler(response:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -730,8 +730,8 @@
             filePath = "OrderScheduling/Main/Initial.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "120"
+            startingLineNumber = "121"
-            endingLineNumber = "120"
+            endingLineNumber = "121"
             landmarkName = "errorCodeHandler(response:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -1431,8 +1431,8 @@
             filePath = "OrderScheduling/Main/AppDelegate.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "127"
+            startingLineNumber = "128"
-            endingLineNumber = "127"
+            endingLineNumber = "128"
             landmarkName = "jpushNotificationAuthorization(_:withInfo:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -1447,8 +1447,8 @@
             filePath = "OrderScheduling/Main/AppDelegate.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "118"
+            startingLineNumber = "119"
-            endingLineNumber = "118"
+            endingLineNumber = "119"
             landmarkName = "jpushNotificationCenter(_:didReceive:withCompletionHandler:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -1607,8 +1607,8 @@
             filePath = "OrderScheduling/Main/Initial.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "78"
+            startingLineNumber = "79"
-            endingLineNumber = "78"
+            endingLineNumber = "79"
             landmarkName = "changeRootViewController(window:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -2098,8 +2098,8 @@
             filePath = "OrderScheduling/Main/AppDelegate.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "120"
+            startingLineNumber = "121"
-            endingLineNumber = "120"
+            endingLineNumber = "121"
             landmarkName = "jpushNotificationCenter(_:didReceive:withCompletionHandler:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -2319,8 +2319,8 @@
             filePath = "OrderSchedulingNotificationService/NotificationService.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "29"
+            startingLineNumber = "33"
-            endingLineNumber = "29"
+            endingLineNumber = "33"
             landmarkName = "didReceive(_:withContentHandler:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -2335,8 +2335,8 @@
             filePath = "OrderSchedulingNotificationService/NotificationService.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "31"
+            startingLineNumber = "35"
-            endingLineNumber = "31"
+            endingLineNumber = "35"
             landmarkName = "didReceive(_:withContentHandler:)"
             landmarkType = "7">
             <Locations>
@@ -2447,8 +2447,8 @@
             filePath = "OrderScheduling/Main/Initial.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "83"
+            startingLineNumber = "84"
-            endingLineNumber = "83"
+            endingLineNumber = "84"
             landmarkName = "changeRootViewController(window:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -2835,22 +2835,6 @@
             </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
@@ -2861,8 +2845,8 @@
             filePath = "OrderSchedulingNotificationService/NotificationService.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "43"
+            startingLineNumber = "48"
-            endingLineNumber = "43"
+            endingLineNumber = "48"
             landmarkName = "didReceive(_:withContentHandler:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -2990,22 +2974,6 @@
             </Locations>
          </BreakpointContent>
       </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
@@ -3016,57 +2984,10 @@
             filePath = "OrderScheduling/Main/AppDelegate.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "107"
+            startingLineNumber = "108"
-            endingLineNumber = "107"
+            endingLineNumber = "108"
             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
@@ -3079,42 +3000,10 @@
             filePath = "OrderScheduling/Main/AppDelegate.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "108"
+            startingLineNumber = "109"
-            endingLineNumber = "108"
+            endingLineNumber = "109"
             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
@@ -3127,54 +3016,70 @@
             filePath = "OrderScheduling/Main/AppDelegate.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "106"
+            startingLineNumber = "107"
-            endingLineNumber = "106"
+            endingLineNumber = "107"
             landmarkName = "jpushNotificationCenter(_:willPresent:withCompletionHandler:)"
             landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "001AAA91-BE14-4D7E-AC36-BF8672C1976E"
+            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 = "C8C55848-36F9-4558-9CBD-573B19F5959F - 80f31cf5eda317c2"
+                  uuid = "001AAA91-BE14-4D7E-AC36-BF8672C1976E - a7950a51e299efe1"
                   shouldBeEnabled = "Yes"
                   ignoreCount = "0"
                   continueAfterRunningActions = "No"
-                  symbolName = "OrderScheduling.AppDelegate.jpushNotificationCenter(_: __C.UNUserNotificationCenter, willPresent: __C.UNNotification, withCompletionHandler: (Swift.Int) -&gt; ()) -&gt; ()"
+                  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/AppDelegate.swift"
+                  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 = "106"
+                  startingLineNumber = "41"
-                  endingLineNumber = "106"
+                  endingLineNumber = "41"
-                  offsetFromSymbolStart = "870">
+                  offsetFromSymbolStart = "200">
                </Location>
                <Location
-                  uuid = "C8C55848-36F9-4558-9CBD-573B19F5959F - 80f31cf5eda317c2"
+                  uuid = "001AAA91-BE14-4D7E-AC36-BF8672C1976E - a7950a51e299efe1"
                   shouldBeEnabled = "Yes"
                   ignoreCount = "0"
                   continueAfterRunningActions = "No"
-                  symbolName = "OrderScheduling.AppDelegate.jpushNotificationCenter(_: __C.UNUserNotificationCenter, willPresent: __C.UNNotification, withCompletionHandler: (Swift.Int) -&gt; ()) -&gt; ()"
+                  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/AppDelegate.swift"
+                  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 = "106"
+                  startingLineNumber = "41"
-                  endingLineNumber = "106"
+                  endingLineNumber = "41"
-                  offsetFromSymbolStart = "700">
+                  offsetFromSymbolStart = "148">
                </Location>
                <Location
-                  uuid = "C8C55848-36F9-4558-9CBD-573B19F5959F - 7a9f60fd04ba598c"
+                  uuid = "001AAA91-BE14-4D7E-AC36-BF8672C1976E - 214f71c4f991f354"
                   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; ()"
+                  symbolName = "closure #1 (Swift.Dictionary&lt;Swift.AnyHashable, Any&gt;) -&gt; () in 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/AppDelegate.swift"
+                  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 = "107"
+                  startingLineNumber = "42"
-                  endingLineNumber = "107"
+                  endingLineNumber = "42"
                   offsetFromSymbolStart = "28">
                </Location>
             </Locations>
@@ -3183,94 +3088,113 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            uuid = "7C91EE1E-D382-42D3-8202-C91F33E3B04D"
+            uuid = "07A65536-4F34-4042-B833-DE0DE4D66E50"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "OrderSchedulingNotificationService/NotificationService.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "40"
+            endingLineNumber = "40"
+            landmarkName = "didReceive(_:withContentHandler:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "CF0FADF1-41F5-44EA-BC9F-C59AADF56048"
             shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "OrderScheduling/Global/Tool/Tool.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "144"
+            startingLineNumber = "203"
-            endingLineNumber = "144"
+            endingLineNumber = "203"
-            landmarkName = "dealAppExtension(completionHandler:)"
+            landmarkName = "playVoiceWith(userInfo:)"
             landmarkType = "7">
-            <Locations>
+         </BreakpointContent>
-               <Location
+      </BreakpointProxy>
-                  uuid = "7C91EE1E-D382-42D3-8202-C91F33E3B04D - 96362fa778bf9efd"
+      <BreakpointProxy
-                  shouldBeEnabled = "Yes"
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "D611A400-E2A5-4384-973C-FBFAB1FD105F"
+            shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-                  symbolName = "OrderScheduling.Tool.dealAppExtension(completionHandler: Swift.Optional&lt;(Swift.Dictionary&lt;Swift.AnyHashable, Any&gt;) -&gt; ()&gt;) -&gt; ()"
+            filePath = "OrderScheduling/Global/Tool/Tool.swift"
-                  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"
+            startingLineNumber = "200"
-                  endingLineNumber = "144"
+            endingLineNumber = "200"
-                  offsetFromSymbolStart = "740">
+            landmarkName = "playVoiceWith(userInfo:)"
-               </Location>
+            landmarkType = "7">
-               <Location
+         </BreakpointContent>
-                  uuid = "7C91EE1E-D382-42D3-8202-C91F33E3B04D - 75ae0035b01e1fd6"
+      </BreakpointProxy>
-                  shouldBeEnabled = "Yes"
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "B6D230CC-1AFE-468E-998F-B2A8E3E45B65"
+            shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-                  symbolName = "OrderScheduling.Tool.playVoiceWith(userInfo: Swift.Optional&lt;Swift.Dictionary&lt;Swift.AnyHashable, Any&gt;&gt;) -&gt; ()"
+            filePath = "OrderScheduling/Global/Tool/Tool.swift"
-                  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"
+            startingLineNumber = "210"
-                  endingLineNumber = "145"
+            endingLineNumber = "210"
-                  offsetFromSymbolStart = "371">
+            landmarkName = "cycleVoice()"
-               </Location>
+            landmarkType = "7">
-               <Location
+         </BreakpointContent>
-                  uuid = "7C91EE1E-D382-42D3-8202-C91F33E3B04D - 75ae0035b01e1fd6"
+      </BreakpointProxy>
-                  shouldBeEnabled = "Yes"
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "185522FD-53BF-47C1-B496-5B59D91B7F4A"
+            shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-                  symbolName = "OrderScheduling.Tool.playVoiceWith(userInfo: Swift.Optional&lt;Swift.Dictionary&lt;Swift.AnyHashable, Any&gt;&gt;) -&gt; ()"
+            filePath = "OrderScheduling/Global/Tool/Tool.swift"
-                  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"
+            startingLineNumber = "212"
-                  endingLineNumber = "145"
+            endingLineNumber = "212"
-                  offsetFromSymbolStart = "405">
+            landmarkName = "cycleVoice()"
-               </Location>
+            landmarkType = "7">
-               <Location
+         </BreakpointContent>
-                  uuid = "7C91EE1E-D382-42D3-8202-C91F33E3B04D - 96362fa778bf9efd"
+      </BreakpointProxy>
-                  shouldBeEnabled = "Yes"
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "6E95C63C-08F2-4B0A-BBB6-2B4367E5F318"
+            shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-                  symbolName = "OrderScheduling.Tool.dealAppExtension(completionHandler: Swift.Optional&lt;(Swift.Dictionary&lt;Swift.AnyHashable, Any&gt;) -&gt; ()&gt;) -&gt; ()"
+            filePath = "OrderScheduling/Global/Tool/Tool.swift"
-                  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"
+            startingLineNumber = "211"
-                  endingLineNumber = "144"
+            endingLineNumber = "211"
-                  offsetFromSymbolStart = "676">
+            landmarkName = "cycleVoice()"
-               </Location>
+            landmarkType = "7">
-               <Location
+         </BreakpointContent>
-                  uuid = "7C91EE1E-D382-42D3-8202-C91F33E3B04D - 96362fa778bf9efd"
+      </BreakpointProxy>
-                  shouldBeEnabled = "Yes"
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "01A77013-6A96-4AC9-AFA8-A42A270D9384"
+            shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-                  symbolName = "OrderScheduling.Tool.dealAppExtension(completionHandler: Swift.Optional&lt;(Swift.Dictionary&lt;Swift.AnyHashable, Any&gt;) -&gt; ()&gt;) -&gt; ()"
+            filePath = "OrderScheduling/Global/Tool/Tool.swift"
-                  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"
+            startingLineNumber = "213"
-                  endingLineNumber = "144"
+            endingLineNumber = "213"
-                  offsetFromSymbolStart = "724">
+            landmarkName = "cycleVoice()"
-               </Location>
+            landmarkType = "7">
-            </Locations>
          </BreakpointContent>
       </BreakpointProxy>
    </Breakpoints>

OrderScheduling/Entry/Entry.swift

@@ -62,7 +62,7 @@ open class Entry {
         var attributes = EKAttributes()
         attributes = .centerFloat
         attributes.name = name
-        attributes.precedence = .override(priority: .normal, dropEnqueuedEntries: false)
+        attributes.precedence = .override(priority: .high, dropEnqueuedEntries: false)
         attributes.displayMode = .inferred
         attributes.displayDuration = .infinity
         attributes.screenBackground = .color(color: .clear)
@@ -155,7 +155,7 @@ open class Entry {
         attributes.displayDuration = .infinity
         attributes.screenBackground = .color(color: .clear)
         attributes.entryBackground = .color(color: .white)
-        attributes.screenInteraction = .dismiss
+        attributes.screenInteraction = .absorbTouches
         attributes.entryInteraction = .absorbTouches
         attributes.scroll = .disabled
         attributes.entranceAnimation = .init(

OrderScheduling/Global/BackgroundTask/BackgroundTask.swift

@@ -0,0 +1,28 @@
+//
+//  BackgroundTask.swift
+//  OrderScheduling
+//
+//  Created by 中道 on 2023/8/30.
+//
+
+import Foundation
+import UIKit
+
+public let BGTASK = BackgroundTask.default
+
+open class BackgroundTask {
+    public static let `default` = BackgroundTask()
+
+    public var bgTask : UIBackgroundTaskIdentifier?
+    
+    func beginTask() {
+        bgTask = UIApplication.shared.beginBackgroundTask()
+    }
+    
+    func endTask() {
+        if let bgTask {
+            UIApplication.shared.endBackgroundTask(bgTask)
+        }
+        bgTask = UIBackgroundTaskIdentifier.invalid
+    }
+}

OrderScheduling/Global/GroupData/GroupData.swift

@@ -0,0 +1,48 @@
+//
+//  GroupData.swift
+//  OrderScheduling
+//
+//  Created by 中道 on 2023/8/30.
+//
+
+import Foundation
+
+public let GROUP = GroupData.default
+
+open class GroupData {
+    public static let `default` = GroupData()
+    let groudUserDefault = UserDefaults(suiteName: GROUPID)
+    
+    // 不需要记录
+    public var bestAttemptContentUserInfo : [AnyHashable:Any]? {
+        return groudUserDefault?.object(forKey: bestAttemptContentUserInfo_key) as? [AnyHashable:Any]
+    }
+    
+    func setBestAttemptContentUserInfo(bestAttemptContentUserInfo:[AnyHashable:Any]?) {
+        groudUserDefault?.set(bestAttemptContentUserInfo, forKey: bestAttemptContentUserInfo_key)
+    }
+    
+    // 不需要记录
+    public var newMessageSound : Bool {
+        return (groudUserDefault?.object(forKey: newMessageSound_key) as? Bool) ?? true
+    }
+    
+    func setNewMessageSound(newMessageSound:Bool?) {
+        groudUserDefault?.set(newMessageSound, forKey: newMessageSound_key)
+    }
+    
+    // 不需要记录
+    public var newMessageAlert : Bool {
+        return (groudUserDefault?.object(forKey: newMessageAlert_key) as? Bool) ?? true
+    }
+    
+    func setNewMessageAlert(newMessageAlert:Bool?) {
+        groudUserDefault?.set(newMessageAlert, forKey: newMessageAlert_key)
+    }
+    
+    func clear() {
+        GROUP.setNewMessageAlert(newMessageAlert: nil)
+        GROUP.setNewMessageSound(newMessageSound: nil)
+        GROUP.setBestAttemptContentUserInfo(bestAttemptContentUserInfo: nil)
+    }
+}

OrderScheduling/Global/Tool/Tool.swift

@@ -138,54 +138,6 @@ open class Tool {
         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]?) {
-        if USER.newMessageSound != true {
-            return
-        }
-        
-        if let userInfo {
-            let aps = userInfo["aps"] as? [String:Any]
-
-            if let aps, (aps["alert"] as? String) == "新订单" {
-                let juheVehcileName = userInfo["juheVehcileName"] as? String
-                
-                var auidoUrl : URL?
-                
-                if juheVehcileName?.isEmpty == false {
-                    auidoUrl = URL(string: Bundle.main.path(forResource: "newJuheOrderAudio.wav", ofType: nil) ?? "")
-                }else{
-                    auidoUrl = URL(string: Bundle.main.path(forResource: "newOrderAudio.wav", ofType: nil) ?? "")
-                }
-                
-                if let auidoUrl {
-                    var audioSoundID:SystemSoundID = 0
-                    AudioServicesCreateSystemSoundID(auidoUrl as CFURL, &audioSoundID)
-                    AudioServicesPlaySystemSoundWithCompletion(audioSoundID) {
-                    }
-                }
-            }
-        }
-    }
-    
     func getOrderString(userInfo:[AnyHashable:Any]?) -> String{
         var string : String = ""
 
@@ -204,4 +156,74 @@ open class Tool {
         
         return string
     }
+    
+    func dealAppExtension(completionHandler:(([AnyHashable:Any]) -> Void)?) {
+        let userInfo = GROUP.bestAttemptContentUserInfo
+        if let userInfo {
+            if completionHandler != nil {
+                completionHandler!(userInfo)
+            }
+            GROUP.setBestAttemptContentUserInfo(bestAttemptContentUserInfo: nil)
+        }
+    }
+    
+    func playAlertWith(userInfo:[AnyHashable:Any]?) {
+        if GROUP.newMessageAlert != true {
+            return
+        }
+        
+        ACCEPTORDERTOOL.open(userInfo: userInfo)
+    }
+    
+    public var systemSoundID : SystemSoundID?
+    public var soundCount : Int = 0
+    public var needPlayAudio : Bool = true
+    func playVoiceWith(userInfo:[AnyHashable:Any]?) {
+        if GROUP.newMessageSound != true {
+            return
+        }
+        
+        if let userInfo {
+            let aps = userInfo[aps_key] as? [String:Any]
+            if let aps, (aps[alert_key] as? String) == "新订单" {
+                let juheVehcileName = userInfo[juheVehcileName_key] as? String
+                var auidoUrl : URL?
+                if juheVehcileName?.isEmpty == false {
+                    auidoUrl = URL(string: Bundle.main.path(forResource: juheNewOrderAudio_key, ofType: nil) ?? "")
+                }else{
+                    auidoUrl = URL(string: Bundle.main.path(forResource: newOrderAudio_key, ofType: nil) ?? "")
+                }
+                
+                if let auidoUrl {
+                    var audioSoundID:SystemSoundID = 0
+                    AudioServicesCreateSystemSoundID(auidoUrl as CFURL, &audioSoundID)
+                    systemSoundID = audioSoundID
+                    needPlayAudio = true
+                    soundCount = 0
+                    cycleVoice()
+                }
+            }
+        }
+    }
+    
+    func cycleVoice() {
+        if let systemSoundID, soundCount < 10, needPlayAudio == true {
+            AudioServicesPlaySystemSoundWithCompletion(systemSoundID) {[weak self] in
+                self?.soundCount+=1
+                DispatchQueue.global().asyncAfter(deadline: .now() + 2, execute: {[weak self] in
+                    self?.cycleVoice()
+                })
+            }
+        }else{
+            systemSoundID = nil
+        }
+    }
+    
+    func stopVoice() {
+        if let systemSoundID {
+            needPlayAudio = false
+            soundCount = 0
+            AudioServicesDisposeSystemSoundID(systemSoundID)
+        }
+    }
 }

OrderScheduling/Global/User/UserData.swift

@@ -82,24 +82,6 @@ open class UserData {
         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 regId : String?
@@ -110,7 +92,5 @@ open class UserData {
         setSupplierType(supplierType: nil)
         setUserId(userId: nil)
         setSupplierId(supplierId: nil)
-        setNewMessageSound(newMessageSound: nil)
-        setNewMessageAlert(newMessageAlert: nil)
     }
 }

OrderScheduling/Main/AppDelegate.swift

@@ -103,6 +103,7 @@ extension AppDelegate : JPUSHRegisterDelegate {
         let userInfo = notification.request.content.userInfo
         if notification.request.trigger?.isKind(of: UNPushNotificationTrigger.self) == true {
             JPUSHService.handleRemoteNotification(userInfo)
+            // 只有订单类型才会弹窗和声音
             TOOL.dealAppExtension { userInfo in
                 TOOL.playAlertWith(userInfo: userInfo)
                 TOOL.playVoiceWith(userInfo: userInfo)

OrderScheduling/Main/Initial.swift

@@ -75,6 +75,7 @@ class Initial : NSObject {
         
         NotificationCenter.default.addObserver(forName: NSNotification.Name(rawValue: Notification_logoutSuccessToLoginController), object: nil, queue: .main) { note in
             USER.clear()
+            GROUP.clear()
             let nav = DDNavigationController(rootViewController: LoginController.init())
             window?.rootViewController = nav
         }

OrderScheduling/Main/SceneDelegate.swift

@@ -37,7 +37,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
         // 后台收到通知后或者不点击通知打开app，激活时消除badge
         JPUSHService.resetBadge()
         UIApplication.shared.applicationIconBadgeNumber = 0
-        
+        // 只有订单类型才会弹窗和声音
         TOOL.dealAppExtension { userInfo in
             TOOL.playAlertWith(userInfo: userInfo)
         }

OrderScheduling/Mine/ViewController/NotificationSetUpController.swift

@@ -36,10 +36,13 @@ extension NotificationSetUpController {
 // MARK: UITableViewDelegate,UITableViewDataSource
 extension NotificationSetUpController : UITableViewDelegate,UITableViewDataSource {
     public func numberOfSections(in tableView: UITableView) -> Int {
-        return 1
+        return 2
     }
     
     public func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        if section == 0 {
+            return 1
+        }
         return resultArr.count
     }
     
@@ -48,22 +51,66 @@ extension NotificationSetUpController : UITableViewDelegate,UITableViewDataSourc
         if cell == nil {
             cell = NotificationSetUpCell(style: .default, reuseIdentifier: "cell")
         }
+        if indexPath.section == 0 {
+            cell?.arrow.isHidden = false
+            cell?.switchButton.isHidden = true
+            cell?.nameLabel.text = "前往设置"
+        }
+        
+        if indexPath.section == 1 {
             let model = resultArr[indexPath.item]
+            cell?.arrow.isHidden = true
+            cell?.switchButton.isHidden = false
             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)
+                        GROUP.setNewMessageSound(newMessageSound: isOn)
                     }else if model.type == .alert {
-                    USER.setNewMessageAlert(newMessageAlert: isOn)
+                        GROUP.setNewMessageAlert(newMessageAlert: isOn)
                     }
                 })
                 .disposed(by: disposeBag)
+        }
         
         return cell!
     }
     
+    public func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
+        let view = DDView()
+        let label = DDLabel.dd_init(withText: "", font: .mediumFont(auto(13)), textColor: .hex("000000").alpha(0.3))
+        view.addSubview(label)
+        label.snp.makeConstraints { make in
+            make.left.equalTo(auto(20))
+            make.bottom.equalToSuperview()
+        }
+        let line = DDView()
+        line.isHidden = true
+        line.backgroundColor = .hex("F1F2F5")
+        view.addSubview(line)
+        line.snp.makeConstraints { make in
+            make.left.right.equalToSuperview()
+            make.bottom.equalToSuperview()
+            make.height.equalTo(1)
+        }
+        if section == 0 {
+            label.text = "未打开应用时"
+        }else{
+            label.text = "打开应用时"
+        }
+        return view
+    }
+    
+    public func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
+        return auto(30)
+    }
+    public func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        if indexPath.section == 0 {
+            NOTIAUTHTOOL.openSetting()
+        }
+    }
+    
     public func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
         return auto(44)
     }
@@ -81,10 +128,10 @@ open class NotificationSetUpController : ZDViewController {
         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 soundModel = NotificationSetUpModel(name: "新订单提示音", type: .sound, isOn: GROUP.newMessageSound)
-        let alertModel = NotificationSetUpModel(name: "新消息弹窗", type: .alert, isOn: USER.newMessageAlert)
+//        let alertModel = NotificationSetUpModel(name: "新订单弹窗", type: .alert, isOn: GROUP.newMessageAlert)
         resultArr.append(soundModel)
-        resultArr.append(alertModel)
+//        resultArr.append(alertModel)
         
         addSubviews()
         addActions()
@@ -130,11 +177,13 @@ class NotificationSetUpCell : DDTableViewCell {
     public let radiusView : DDView
     public let nameLabel : DDLabel
     public let switchButton : UISwitch
+    public let arrow : DDImageView
     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()
+        arrow = DDImageView()
         line = DDView.init()
         super.init(style: style, reuseIdentifier: reuseIdentifier)
         
@@ -143,6 +192,8 @@ class NotificationSetUpCell : DDTableViewCell {
         contentView.addSubview(radiusView)
         radiusView.addSubview(nameLabel)
         radiusView.addSubview(switchButton)
+        arrow.image = UIImage(named: "mine_info_arrow")
+        radiusView.addSubview(arrow)
         line.backgroundColor = .hex("F1F2F5")
         radiusView.addSubview(line)
         
@@ -160,6 +211,11 @@ class NotificationSetUpCell : DDTableViewCell {
             make.centerY.equalToSuperview()
         }
         
+        arrow.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))

OrderScheduling/Rescue/View/AcceptOrderTool.swift

@@ -16,7 +16,7 @@ open class AcceptOrderTool : NSObject {
     private let disposeBag = DisposeBag()
     
     func open(userInfo:[AnyHashable:Any]?) {
-        if USER.newMessageAlert != true {
+        if GROUP.newMessageAlert != true {
             return
         }
         let acceptOrderView = AcceptOrderView()
@@ -26,6 +26,9 @@ open class AcceptOrderTool : NSObject {
         acceptOrderView.readButton.rx.tap
             .subscribe(onNext: {
                 ENTRY.dismiss(name: acceptOrderViewEntry) {
+                    // 停止声音播放
+                    TOOL.stopVoice()
+                    // 来到首页的救援中-待接单
                     let tabBarVc = UIApplication.shared.dd_keyWindow.rootViewController as? MainTabBarController
                     let currentNav = tabBarVc?.selectedViewController as? UINavigationController
                     currentNav?.popToRootViewController(animated: false)

OrderScheduling/Strings/CommonKeyStrings.swift

@@ -0,0 +1,18 @@
+//
+//  CommonKeyStrings.swift
+//  OrderScheduling
+//
+//  Created by 中道 on 2023/8/30.
+//
+
+import Foundation
+
+public let aps_key = "aps"
+
+public let alert_key = "alert"
+
+public let juheVehcileName_key = "juheVehcileName"
+
+public let juheNewOrderAudio_key = "juheNewOrderAudio.wav"
+
+public let newOrderAudio_key = "newOrderAudio.wav"

OrderSchedulingNotificationService/NotificationService.swift

@@ -22,20 +22,24 @@ class NotificationService: UNNotificationServiceExtension {
 //            bestAttemptContent.title = "\(bestAttemptContent.title) [modified]"
             let userInfo = bestAttemptContent.userInfo
              
-            let aps = userInfo["aps"] as? [String:Any]
+            // 只有订单类型才写入group，因为需要弹窗和声音
-            if let aps, (aps["alert"] as? String) == "新订单" {
+            let aps = userInfo[aps_key] as? [String:Any]
-                let juheVehcileName = userInfo["juheVehcileName"] as? String
+            if let aps, (aps[alert_key] as? String) == "新订单" {
+                var sound : UNNotificationSound?
+                
+                let juheVehcileName = userInfo[juheVehcileName_key] as? String
                 if juheVehcileName?.isEmpty == false {
-                    bestAttemptContent.sound = UNNotificationSound(named: UNNotificationSoundName(rawValue: "juheNewOrderAudio.wav"))
+                    sound = UNNotificationSound(named: UNNotificationSoundName(rawValue: juheNewOrderAudio_key))
                 }else{
-                    bestAttemptContent.sound = UNNotificationSound(named: UNNotificationSoundName(rawValue: "newOrderAudio.wav"))
+                    sound = UNNotificationSound(named: UNNotificationSoundName(rawValue: newOrderAudio_key))
-                }
                 }
                 
-            let userDefault = UserDefaults.init(suiteName: "group.com.sino.supplier")
+                bestAttemptContent.sound = sound
-            userDefault?.setValue(userInfo, forKey: "bestAttemptContentUserInfo_key")
                 
-            JPushNotificationExtensionService.jpushSetAppkey("259b546bb2aaf5f02ffa2547")
+                GROUP.setBestAttemptContentUserInfo(bestAttemptContentUserInfo: userInfo)
+            }
+            
+            JPushNotificationExtensionService.jpushSetAppkey(JPushKey)
             JPushNotificationExtensionService.jpushReceive(request) {
                 contentHandler(request.content)
             }