update

OrderScheduling.xcodeproj/project.pbxproj

@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		2AA95CD2BA7A94CC2237B3B8 /* libPods-OrderSchedulingNotificationService.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C3211D21873B481A21262ED /* libPods-OrderSchedulingNotificationService.a */; };
 		791887422A7CCCCD007EA0C1 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 791887402A7CCCCD007EA0C1 /* AppDelegate.swift */; };
 		791887432A7CCCCD007EA0C1 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 791887412A7CCCCD007EA0C1 /* SceneDelegate.swift */; };
 		791887452A7CD05B007EA0C1 /* MainTabBarController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 791887442A7CD05B007EA0C1 /* MainTabBarController.swift */; };
@@ -55,10 +56,44 @@
 		79DD0DBB2A971EB300768FE7 /* ZDViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79DD0DBA2A971EB300768FE7 /* ZDViewController.swift */; };
 		79EAD8142A7B86610036E093 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 79EAD8132A7B86610036E093 /* Assets.xcassets */; };
 		79EAD8172A7B86610036E093 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 79EAD8152A7B86610036E093 /* LaunchScreen.storyboard */; };
+		79FB75EC2A988EC000DB00A4 /* MessageCenterTool.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79FB75EB2A988EC000DB00A4 /* MessageCenterTool.swift */; };
+		79FB75EE2A9898EB00DB00A4 /* AcceptOrderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79FB75ED2A9898EB00DB00A4 /* AcceptOrderView.swift */; };
+		79FB75F02A98A26C00DB00A4 /* AcceptOrderTool.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79FB75EF2A98A26C00DB00A4 /* AcceptOrderTool.swift */; };
+		79FB75F82A9C3BEE00DB00A4 /* NotificationService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79FB75F72A9C3BEE00DB00A4 /* NotificationService.swift */; };
+		79FB75FC2A9C3BEE00DB00A4 /* OrderSchedulingNotificationService.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = 79FB75F52A9C3BEE00DB00A4 /* OrderSchedulingNotificationService.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
+		79FB76102A9C6CAF00DB00A4 /* newJuheOrderAudio.wav in Resources */ = {isa = PBXBuildFile; fileRef = 79FB760E2A9C6CAF00DB00A4 /* newJuheOrderAudio.wav */; };
+		79FB76132A9C6CC100DB00A4 /* newOrderAudio.wav in Resources */ = {isa = PBXBuildFile; fileRef = 79FB76122A9C6CC100DB00A4 /* newOrderAudio.wav */; };
 		A64E95F00B82DC28C2B9306E /* libPods-OrderScheduling.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 98784A61C325B3D6C408016C /* libPods-OrderScheduling.a */; };
 /* End PBXBuildFile section */
 
+/* Begin PBXContainerItemProxy section */
+		79FB75FA2A9C3BEE00DB00A4 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 79EAD7FF2A7B86600036E093 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 79FB75F42A9C3BEE00DB00A4;
+			remoteInfo = OrderSchedulingNotificationService;
+		};
+/* End PBXContainerItemProxy section */
+
+/* Begin PBXCopyFilesBuildPhase section */
+		79FB76002A9C3BEE00DB00A4 /* Embed Foundation Extensions */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 13;
+			files = (
+				79FB75FC2A9C3BEE00DB00A4 /* OrderSchedulingNotificationService.appex in Embed Foundation Extensions */,
+			);
+			name = "Embed Foundation Extensions";
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXCopyFilesBuildPhase section */
+
 /* Begin PBXFileReference section */
+		09A2779565B8D8C9A3C1A302 /* Pods-OrderScheduling.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OrderScheduling.debug.xcconfig"; path = "Target Support Files/Pods-OrderScheduling/Pods-OrderScheduling.debug.xcconfig"; sourceTree = "<group>"; };
+		0F3D6463BE04DB3A3BC4B265 /* 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>"; };
+		5C3211D21873B481A21262ED /* libPods-OrderSchedulingNotificationService.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-OrderSchedulingNotificationService.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		791887402A7CCCCD007EA0C1 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		791887412A7CCCCD007EA0C1 /* SceneDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
 		791887442A7CD05B007EA0C1 /* MainTabBarController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainTabBarController.swift; sourceTree = "<group>"; };
@@ -92,7 +127,6 @@
 		794FBB1E2A92F7C300D57BB8 /* WebViewTool.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebViewTool.swift; sourceTree = "<group>"; };
 		794FBB202A934E0A00D57BB8 /* AppUpdateView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppUpdateView.swift; sourceTree = "<group>"; };
 		794FBB222A93519800D57BB8 /* AppUpdateTool.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppUpdateTool.swift; sourceTree = "<group>"; };
-		79C638864A659A427FCD5391 /* Pods-OrderScheduling.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OrderScheduling.debug.xcconfig"; path = "Target Support Files/Pods-OrderScheduling/Pods-OrderScheduling.debug.xcconfig"; sourceTree = "<group>"; };
 		79CECC112A89BD1A00B95D8B /* MessageCenterController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageCenterController.swift; sourceTree = "<group>"; };
 		79CECC182A89EE6A00B95D8B /* ReviewFailedController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReviewFailedController.swift; sourceTree = "<group>"; };
 		79CECC1A2A89F83800B95D8B /* AdditionalPhotoController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdditionalPhotoController.swift; sourceTree = "<group>"; };
@@ -128,8 +162,19 @@
 		79EAD8132A7B86610036E093 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		79EAD8162A7B86610036E093 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		79EAD8182A7B86610036E093 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		79FB75EB2A988EC000DB00A4 /* MessageCenterTool.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageCenterTool.swift; sourceTree = "<group>"; };
+		79FB75ED2A9898EB00DB00A4 /* AcceptOrderView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AcceptOrderView.swift; sourceTree = "<group>"; };
+		79FB75EF2A98A26C00DB00A4 /* AcceptOrderTool.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AcceptOrderTool.swift; sourceTree = "<group>"; };
+		79FB75F52A9C3BEE00DB00A4 /* OrderSchedulingNotificationService.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = OrderSchedulingNotificationService.appex; sourceTree = BUILT_PRODUCTS_DIR; };
+		79FB75F72A9C3BEE00DB00A4 /* NotificationService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationService.swift; sourceTree = "<group>"; };
+		79FB75F92A9C3BEE00DB00A4 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		79FB76012A9C3D9B00DB00A4 /* OrderSchedulingNotificationService-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "OrderSchedulingNotificationService-Bridging-Header.h"; sourceTree = "<group>"; };
+		79FB76052A9C606100DB00A4 /* OrderSchedulingNotificationService.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = OrderSchedulingNotificationService.entitlements; 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>"; };
 		98784A61C325B3D6C408016C /* libPods-OrderScheduling.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-OrderScheduling.a"; sourceTree = BUILT_PRODUCTS_DIR; };
-		A877C0F84742D4A7077DC8CF /* 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>"; };
+		A6F7A8FEBD23498BABF3BD58 /* Pods-OrderSchedulingNotificationService.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OrderSchedulingNotificationService.release.xcconfig"; path = "Target Support Files/Pods-OrderSchedulingNotificationService/Pods-OrderSchedulingNotificationService.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>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -141,6 +186,14 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		79FB75F22A9C3BEE00DB00A4 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				2AA95CD2BA7A94CC2237B3B8 /* libPods-OrderSchedulingNotificationService.a in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
@@ -179,6 +232,8 @@
 			isa = PBXGroup;
 			children = (
 				791887C02A839784007EA0C1 /* RefuseOrderEntryView.swift */,
+				79FB75ED2A9898EB00DB00A4 /* AcceptOrderView.swift */,
+				79FB75EF2A98A26C00DB00A4 /* AcceptOrderTool.swift */,
 			);
 			path = View;
 			sourceTree = "<group>";
@@ -449,6 +504,7 @@
 			isa = PBXGroup;
 			children = (
 				79CECC112A89BD1A00B95D8B /* MessageCenterController.swift */,
+				79FB75EB2A988EC000DB00A4 /* MessageCenterTool.swift */,
 			);
 			path = ViewController;
 			sourceTree = "<group>";
@@ -548,6 +604,8 @@
 			isa = PBXGroup;
 			children = (
 				79DD0DAC2A94A0EE00768FE7 /* LaunchImage.png */,
+				79FB760E2A9C6CAF00DB00A4 /* newJuheOrderAudio.wav */,
+				79FB76122A9C6CC100DB00A4 /* newOrderAudio.wav */,
 			);
 			path = Source;
 			sourceTree = "<group>";
@@ -572,6 +630,7 @@
 			isa = PBXGroup;
 			children = (
 				79EAD8092A7B86600036E093 /* OrderScheduling */,
+				79FB75F62A9C3BEE00DB00A4 /* OrderSchedulingNotificationService */,
 				79EAD8082A7B86600036E093 /* Products */,
 				8AE7BC9A61FB797B2DAF5A9C /* Pods */,
 				A0E8B82459C825FF917782D5 /* Frameworks */,
@@ -582,6 +641,7 @@
 			isa = PBXGroup;
 			children = (
 				79EAD8072A7B86600036E093 /* OrderScheduling.app */,
+				79FB75F52A9C3BEE00DB00A4 /* OrderSchedulingNotificationService.appex */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -613,11 +673,24 @@
 			path = OrderScheduling;
 			sourceTree = "<group>";
 		};
+		79FB75F62A9C3BEE00DB00A4 /* OrderSchedulingNotificationService */ = {
+			isa = PBXGroup;
+			children = (
+				79FB76052A9C606100DB00A4 /* OrderSchedulingNotificationService.entitlements */,
+				79FB75F72A9C3BEE00DB00A4 /* NotificationService.swift */,
+				79FB75F92A9C3BEE00DB00A4 /* Info.plist */,
+				79FB76012A9C3D9B00DB00A4 /* OrderSchedulingNotificationService-Bridging-Header.h */,
+			);
+			path = OrderSchedulingNotificationService;
+			sourceTree = "<group>";
+		};
 		8AE7BC9A61FB797B2DAF5A9C /* Pods */ = {
 			isa = PBXGroup;
 			children = (
-				79C638864A659A427FCD5391 /* Pods-OrderScheduling.debug.xcconfig */,
+				09A2779565B8D8C9A3C1A302 /* Pods-OrderScheduling.debug.xcconfig */,
-				A877C0F84742D4A7077DC8CF /* Pods-OrderScheduling.release.xcconfig */,
+				BD034FA1DD7C17CCBA6B0E5D /* Pods-OrderScheduling.release.xcconfig */,
+				0F3D6463BE04DB3A3BC4B265 /* Pods-OrderSchedulingNotificationService.debug.xcconfig */,
+				A6F7A8FEBD23498BABF3BD58 /* Pods-OrderSchedulingNotificationService.release.xcconfig */,
 			);
 			path = Pods;
 			sourceTree = "<group>";
@@ -641,6 +714,7 @@
 				79CECC9F2A8E03CF00B95D8B /* AVFoundation.framework */,
 				79CECC9D2A8E03C200B95D8B /* MediaPlayer.framework */,
 				98784A61C325B3D6C408016C /* libPods-OrderScheduling.a */,
+				5C3211D21873B481A21262ED /* libPods-OrderSchedulingNotificationService.a */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -657,16 +731,36 @@
 				79EAD8042A7B86600036E093 /* Frameworks */,
 				79EAD8052A7B86600036E093 /* Resources */,
 				341364273A38F3D379A18C5D /* [CP] Copy Pods Resources */,
+				79FB76002A9C3BEE00DB00A4 /* Embed Foundation Extensions */,
 			);
 			buildRules = (
 			);
 			dependencies = (
+				79FB75FB2A9C3BEE00DB00A4 /* PBXTargetDependency */,
 			);
 			name = OrderScheduling;
 			productName = OrderScheduling;
 			productReference = 79EAD8072A7B86600036E093 /* OrderScheduling.app */;
 			productType = "com.apple.product-type.application";
 		};
+		79FB75F42A9C3BEE00DB00A4 /* OrderSchedulingNotificationService */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 79FB75FD2A9C3BEE00DB00A4 /* Build configuration list for PBXNativeTarget "OrderSchedulingNotificationService" */;
+			buildPhases = (
+				DFA879CCBC9CAB845D24416A /* [CP] Check Pods Manifest.lock */,
+				79FB75F12A9C3BEE00DB00A4 /* Sources */,
+				79FB75F22A9C3BEE00DB00A4 /* Frameworks */,
+				79FB75F32A9C3BEE00DB00A4 /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = OrderSchedulingNotificationService;
+			productName = OrderSchedulingNotificationService;
+			productReference = 79FB75F52A9C3BEE00DB00A4 /* OrderSchedulingNotificationService.appex */;
+			productType = "com.apple.product-type.app-extension";
+		};
 /* End PBXNativeTarget section */
 
 /* Begin PBXProject section */
@@ -681,6 +775,10 @@
 						CreatedOnToolsVersion = 14.3.1;
 						LastSwiftMigration = 1430;
 					};
+					79FB75F42A9C3BEE00DB00A4 = {
+						CreatedOnToolsVersion = 14.3.1;
+						LastSwiftMigration = 1430;
+					};
 				};
 			};
 			buildConfigurationList = 79EAD8022A7B86600036E093 /* Build configuration list for PBXProject "OrderScheduling" */;
@@ -697,6 +795,7 @@
 			projectRoot = "";
 			targets = (
 				79EAD8062A7B86600036E093 /* OrderScheduling */,
+				79FB75F42A9C3BEE00DB00A4 /* OrderSchedulingNotificationService */,
 			);
 		};
 /* End PBXProject section */
@@ -706,12 +805,21 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				79FB76102A9C6CAF00DB00A4 /* newJuheOrderAudio.wav in Resources */,
 				79EAD8172A7B86610036E093 /* LaunchScreen.storyboard in Resources */,
 				79EAD8142A7B86610036E093 /* Assets.xcassets in Resources */,
+				79FB76132A9C6CC100DB00A4 /* newOrderAudio.wav in Resources */,
 				79DD0DAD2A94A0EE00768FE7 /* LaunchImage.png in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		79FB75F32A9C3BEE00DB00A4 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
@@ -754,6 +862,28 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
+		DFA879CCBC9CAB845D24416A /* [CP] Check Pods Manifest.lock */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-OrderSchedulingNotificationService-checkManifestLockResult.txt",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			showEnvVarsInLog = 0;
+		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
@@ -778,6 +908,7 @@
 				794FBB212A934E0A00D57BB8 /* AppUpdateView.swift in Sources */,
 				79DD0DB42A95F00B00768FE7 /* Extension.swift in Sources */,
 				791887802A7CE6F1007EA0C1 /* UserDefaultStrings.swift in Sources */,
+				79FB75EC2A988EC000DB00A4 /* MessageCenterTool.swift in Sources */,
 				79DD0DB12A94B3DB00768FE7 /* EmptyView.swift in Sources */,
 				79DD0DAA2A9481BC00768FE7 /* NotificationAuthTool.swift in Sources */,
 				794FBB1C2A8F4DE900D57BB8 /* MessageView.swift in Sources */,
@@ -802,15 +933,33 @@
 				794FBB1F2A92F7C300D57BB8 /* WebViewTool.swift in Sources */,
 				791887822A7CE71D007EA0C1 /* AppKeyStrings.swift in Sources */,
 				79CECC282A8CADEA00B95D8B /* VehicleMonitoringVideoDetailController.swift in Sources */,
+				79FB75F02A98A26C00DB00A4 /* AcceptOrderTool.swift in Sources */,
 				791887A12A80CA10007EA0C1 /* ApiList.swift in Sources */,
 				791887AE2A80F943007EA0C1 /* UserData.swift in Sources */,
+				79FB75EE2A9898EB00DB00A4 /* AcceptOrderView.swift in Sources */,
 				791887BA2A82495D007EA0C1 /* EnvironmentStrings.swift in Sources */,
 				791887A62A80D50C007EA0C1 /* ParametersList.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		79FB75F12A9C3BEE00DB00A4 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				79FB75F82A9C3BEE00DB00A4 /* NotificationService.swift in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 /* End PBXSourcesBuildPhase section */
 
+/* Begin PBXTargetDependency section */
+		79FB75FB2A9C3BEE00DB00A4 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 79FB75F42A9C3BEE00DB00A4 /* OrderSchedulingNotificationService */;
+			targetProxy = 79FB75FA2A9C3BEE00DB00A4 /* PBXContainerItemProxy */;
+		};
+/* End PBXTargetDependency section */
+
 /* Begin PBXVariantGroup section */
 		79EAD8152A7B86610036E093 /* LaunchScreen.storyboard */ = {
 			isa = PBXVariantGroup;
@@ -825,7 +974,9 @@
 /* Begin XCBuildConfiguration section */
 		79EAD8192A7B86610036E093 /* Debug */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = 09A2779565B8D8C9A3C1A302 /* Pods-OrderScheduling.debug.xcconfig */;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
@@ -885,7 +1036,9 @@
 		};
 		79EAD81A2A7B86610036E093 /* Release */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = BD034FA1DD7C17CCBA6B0E5D /* Pods-OrderScheduling.release.xcconfig */;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
@@ -939,8 +1092,9 @@
 		};
 		79EAD81C2A7B86610036E093 /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 79C638864A659A427FCD5391 /* Pods-OrderScheduling.debug.xcconfig */;
+			baseConfigurationReference = 09A2779565B8D8C9A3C1A302 /* Pods-OrderScheduling.debug.xcconfig */;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CLANG_ENABLE_MODULES = YES;
@@ -987,8 +1141,9 @@
 		};
 		79EAD81D2A7B86610036E093 /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = A877C0F84742D4A7077DC8CF /* Pods-OrderScheduling.release.xcconfig */;
+			baseConfigurationReference = BD034FA1DD7C17CCBA6B0E5D /* Pods-OrderScheduling.release.xcconfig */;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CLANG_ENABLE_MODULES = YES;
@@ -1029,6 +1184,68 @@
 			};
 			name = Release;
 		};
+		79FB75FE2A9C3BEE00DB00A4 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 0F3D6463BE04DB3A3BC4B265 /* Pods-OrderSchedulingNotificationService.debug.xcconfig */;
+			buildSettings = {
+				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_ENTITLEMENTS = OrderSchedulingNotificationService/OrderSchedulingNotificationService.entitlements;
+				CODE_SIGN_IDENTITY = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 1;
+				DEVELOPMENT_TEAM = X9WF5T89LV;
+				GENERATE_INFOPLIST_FILE = YES;
+				INFOPLIST_FILE = OrderSchedulingNotificationService/Info.plist;
+				INFOPLIST_KEY_CFBundleDisplayName = OrderSchedulingNotificationService;
+				INFOPLIST_KEY_NSHumanReadableCopyright = "";
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@executable_path/../../Frameworks",
+				);
+				MARKETING_VERSION = 1.0;
+				PRODUCT_BUNDLE_IDENTIFIER = com.sino.supplier.OrderSchedulingNotificationService;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SKIP_INSTALL = YES;
+				SWIFT_EMIT_LOC_STRINGS = YES;
+				SWIFT_OBJC_BRIDGING_HEADER = "OrderSchedulingNotificationService/OrderSchedulingNotificationService-Bridging-Header.h";
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+			};
+			name = Debug;
+		};
+		79FB75FF2A9C3BEE00DB00A4 /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = A6F7A8FEBD23498BABF3BD58 /* Pods-OrderSchedulingNotificationService.release.xcconfig */;
+			buildSettings = {
+				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_ENTITLEMENTS = OrderSchedulingNotificationService/OrderSchedulingNotificationService.entitlements;
+				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 1;
+				DEVELOPMENT_TEAM = X9WF5T89LV;
+				GENERATE_INFOPLIST_FILE = YES;
+				INFOPLIST_FILE = OrderSchedulingNotificationService/Info.plist;
+				INFOPLIST_KEY_CFBundleDisplayName = OrderSchedulingNotificationService;
+				INFOPLIST_KEY_NSHumanReadableCopyright = "";
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@executable_path/../../Frameworks",
+				);
+				MARKETING_VERSION = 1.0;
+				PRODUCT_BUNDLE_IDENTIFIER = com.sino.supplier.OrderSchedulingNotificationService;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SKIP_INSTALL = YES;
+				SWIFT_EMIT_LOC_STRINGS = YES;
+				SWIFT_OBJC_BRIDGING_HEADER = "OrderSchedulingNotificationService/OrderSchedulingNotificationService-Bridging-Header.h";
+				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+			};
+			name = Release;
+		};
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
@@ -1050,6 +1267,15 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
+		79FB75FD2A9C3BEE00DB00A4 /* Build configuration list for PBXNativeTarget "OrderSchedulingNotificationService" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				79FB75FE2A9C3BEE00DB00A4 /* Debug */,
+				79FB75FF2A9C3BEE00DB00A4 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
 /* End XCConfigurationList section */
 	};
 	rootObject = 79EAD7FF2A7B86600036E093 /* Project object */;

OrderScheduling.xcodeproj/xcuserdata/zd.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,7 +7,12 @@
 		<key>OrderScheduling.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>33</integer>
+			<integer>0</integer>
+		</dict>
+		<key>OrderSchedulingNotificationService.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>40</integer>
 		</dict>
 	</dict>
 	<key>SuppressBuildableAutocreation</key>

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

@@ -253,8 +253,8 @@
             filePath = "OrderScheduling/Main/Initial.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "101"
+            startingLineNumber = "92"
-            endingLineNumber = "101"
+            endingLineNumber = "92"
             landmarkName = "networkErrorHandler(response:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -269,8 +269,8 @@
             filePath = "OrderScheduling/Main/Initial.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "102"
+            startingLineNumber = "93"
-            endingLineNumber = "102"
+            endingLineNumber = "93"
             landmarkName = "networkErrorHandler(response:)"
             landmarkType = "7">
             <Locations>
@@ -317,8 +317,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "550"
+            startingLineNumber = "549"
-            endingLineNumber = "550"
+            endingLineNumber = "549"
             landmarkName = "tableView(_:cellForRowAt:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -333,8 +333,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "551"
+            startingLineNumber = "550"
-            endingLineNumber = "551"
+            endingLineNumber = "550"
             landmarkName = "tableView(_:cellForRowAt:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -507,8 +507,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "632"
+            startingLineNumber = "631"
-            endingLineNumber = "632"
+            endingLineNumber = "631"
             landmarkName = "tableView(_:cellForRowAt:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -523,8 +523,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "633"
+            startingLineNumber = "632"
-            endingLineNumber = "633"
+            endingLineNumber = "632"
             landmarkName = "tableView(_:cellForRowAt:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -555,8 +555,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "777"
+            startingLineNumber = "776"
-            endingLineNumber = "777"
+            endingLineNumber = "776"
             landmarkName = "collectionView(_:cellForItemAt:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -571,8 +571,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "778"
+            startingLineNumber = "777"
-            endingLineNumber = "778"
+            endingLineNumber = "777"
             landmarkName = "collectionView(_:cellForItemAt:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -730,8 +730,8 @@
             filePath = "OrderScheduling/Main/Initial.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "118"
+            startingLineNumber = "109"
-            endingLineNumber = "118"
+            endingLineNumber = "109"
             landmarkName = "errorCodeHandler(response:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -746,8 +746,8 @@
             filePath = "OrderScheduling/Main/Initial.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "121"
+            startingLineNumber = "112"
-            endingLineNumber = "121"
+            endingLineNumber = "112"
             landmarkName = "errorCodeHandler(response:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -762,8 +762,8 @@
             filePath = "OrderScheduling/Main/Initial.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "129"
+            startingLineNumber = "120"
-            endingLineNumber = "129"
+            endingLineNumber = "120"
             landmarkName = "errorCodeHandler(response:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -778,60 +778,60 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "320"
-            endingLineNumber = "320"
-            landmarkName = "dd_mapView(_:viewFor:)"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "BCCAE3D0-9342-4A8F-A786-B14F8A01EAF3"
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "298"
-            endingLineNumber = "298"
-            landmarkName = "dd_mapView(_:viewFor:)"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "B74288B1-E6B1-4BF4-BBCD-D86BE9208FF0"
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "300"
-            endingLineNumber = "300"
-            landmarkName = "dd_mapView(_:viewFor:)"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "9750D698-F3AA-4114-B549-5BFE2C83D0F8"
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
             startingLineNumber = "326"
             endingLineNumber = "326"
             landmarkName = "dd_mapView(_:viewFor:)"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "BCCAE3D0-9342-4A8F-A786-B14F8A01EAF3"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "304"
+            endingLineNumber = "304"
+            landmarkName = "dd_mapView(_:viewFor:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "B74288B1-E6B1-4BF4-BBCD-D86BE9208FF0"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "306"
+            endingLineNumber = "306"
+            landmarkName = "dd_mapView(_:viewFor:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "9750D698-F3AA-4114-B549-5BFE2C83D0F8"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "332"
+            endingLineNumber = "332"
+            landmarkName = "dd_mapView(_:viewFor:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
@@ -842,8 +842,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "325"
+            startingLineNumber = "331"
-            endingLineNumber = "325"
+            endingLineNumber = "331"
             landmarkName = "dd_mapView(_:viewFor:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -1178,8 +1178,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "66"
+            startingLineNumber = "65"
-            endingLineNumber = "66"
+            endingLineNumber = "65"
             landmarkName = "addActions()"
             landmarkType = "7">
             <Locations>
@@ -1322,8 +1322,8 @@
             filePath = "OrderScheduling/Common/WebView/WebViewController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "93"
+            startingLineNumber = "101"
-            endingLineNumber = "93"
+            endingLineNumber = "101"
             landmarkName = "userContentController(_:didReceive:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -1338,8 +1338,8 @@
             filePath = "OrderScheduling/Common/WebView/WebViewController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "97"
+            startingLineNumber = "105"
-            endingLineNumber = "97"
+            endingLineNumber = "105"
             landmarkName = "userContentController(_:didReceive:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -1354,8 +1354,8 @@
             filePath = "OrderScheduling/Main/AppDelegate.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "62"
+            startingLineNumber = "56"
-            endingLineNumber = "62"
+            endingLineNumber = "56"
             landmarkName = "application(_:didRegisterForRemoteNotificationsWithDeviceToken:)"
             landmarkType = "7">
             <Locations>
@@ -1418,8 +1418,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "188"
+            startingLineNumber = "194"
-            endingLineNumber = "188"
+            endingLineNumber = "194"
             landmarkName = "addAction()"
             landmarkType = "7">
          </BreakpointContent>
@@ -1434,8 +1434,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "189"
+            startingLineNumber = "195"
-            endingLineNumber = "189"
+            endingLineNumber = "195"
             landmarkName = "addAction()"
             landmarkType = "7">
          </BreakpointContent>
@@ -1443,65 +1443,20 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            uuid = "D7A2EF3A-2FB8-49BE-8A7C-A93AB3BCF461"
+            uuid = "0AB5E12D-53CA-429C-8322-7C8342D48DEC"
             shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "OrderScheduling/Main/AppDelegate.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "112"
+            startingLineNumber = "104"
-            endingLineNumber = "112"
+            endingLineNumber = "104"
             landmarkName = "jpushNotificationCenter(_:willPresent:withCompletionHandler:)"
             landmarkType = "7">
             <Locations>
                <Location
-                  uuid = "D7A2EF3A-2FB8-49BE-8A7C-A93AB3BCF461 - 80f31cf5eda31718"
+                  uuid = "0AB5E12D-53CA-429C-8322-7C8342D48DEC - 80f31cf5eda31684"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "OrderScheduling.AppDelegate.jpushNotificationCenter(_: __C.UNUserNotificationCenter, willPresent: __C.UNNotification, withCompletionHandler: (Swift.Int) -&gt; ()) -&gt; ()"
-                  moduleName = "OrderScheduling"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/zd/Desktop/%E4%B8%AD%E9%81%93%E6%95%91%E6%8F%B4/OrderScheduling/OrderScheduling/Main/AppDelegate.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "100"
-                  endingLineNumber = "100"
-                  offsetFromSymbolStart = "612">
-               </Location>
-               <Location
-                  uuid = "D7A2EF3A-2FB8-49BE-8A7C-A93AB3BCF461 - 80f31cf5eda31684"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "OrderScheduling.AppDelegate.jpushNotificationCenter(_: __C.UNUserNotificationCenter, willPresent: __C.UNNotification, withCompletionHandler: (Swift.Int) -&gt; ()) -&gt; ()"
-                  moduleName = "OrderScheduling"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/zd/Desktop/%E4%B8%AD%E9%81%93%E6%95%91%E6%8F%B4/OrderScheduling/OrderScheduling/Main/AppDelegate.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "112"
-                  endingLineNumber = "112"
-                  offsetFromSymbolStart = "624">
-               </Location>
-               <Location
-                  uuid = "D7A2EF3A-2FB8-49BE-8A7C-A93AB3BCF461 - 80f31cf5eda31684"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "OrderScheduling.AppDelegate.jpushNotificationCenter(_: __C.UNUserNotificationCenter, willPresent: __C.UNNotification, withCompletionHandler: (Swift.Int) -&gt; ()) -&gt; ()"
-                  moduleName = "OrderScheduling"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/zd/Desktop/%E4%B8%AD%E9%81%93%E6%95%91%E6%8F%B4/OrderScheduling/OrderScheduling/Main/AppDelegate.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "112"
-                  endingLineNumber = "112"
-                  offsetFromSymbolStart = "716">
-               </Location>
-               <Location
-                  uuid = "D7A2EF3A-2FB8-49BE-8A7C-A93AB3BCF461 - 80f31cf5eda31684"
                   shouldBeEnabled = "Yes"
                   ignoreCount = "0"
                   continueAfterRunningActions = "No"
@@ -1515,26 +1470,8 @@
                   endingLineNumber = "112"
                   offsetFromSymbolStart = "790">
                </Location>
-            </Locations>
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "0AB5E12D-53CA-429C-8322-7C8342D48DEC"
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "OrderScheduling/Main/AppDelegate.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "110"
-            endingLineNumber = "110"
-            landmarkName = "jpushNotificationCenter(_:willPresent:withCompletionHandler:)"
-            landmarkType = "7">
-            <Locations>
                <Location
-                  uuid = "0AB5E12D-53CA-429C-8322-7C8342D48DEC - 80f31cf5eda314da"
+                  uuid = "0AB5E12D-53CA-429C-8322-7C8342D48DEC - 80f31cf5eda31684"
                   shouldBeEnabled = "Yes"
                   ignoreCount = "0"
                   continueAfterRunningActions = "No"
@@ -1544,12 +1481,12 @@
                   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 = "98"
+                  startingLineNumber = "112"
-                  endingLineNumber = "98"
+                  endingLineNumber = "112"
-                  offsetFromSymbolStart = "276">
+                  offsetFromSymbolStart = "252">
                </Location>
                <Location
-                  uuid = "0AB5E12D-53CA-429C-8322-7C8342D48DEC - 80f31cf5eda31646"
+                  uuid = "0AB5E12D-53CA-429C-8322-7C8342D48DEC - 80f31cf5eda31684"
                   shouldBeEnabled = "Yes"
                   ignoreCount = "0"
                   continueAfterRunningActions = "No"
@@ -1559,9 +1496,9 @@
                   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 = "110"
+                  startingLineNumber = "112"
-                  endingLineNumber = "110"
+                  endingLineNumber = "112"
-                  offsetFromSymbolStart = "268">
+                  offsetFromSymbolStart = "108">
                </Location>
             </Locations>
          </BreakpointContent>
@@ -1576,8 +1513,8 @@
             filePath = "OrderScheduling/Main/AppDelegate.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "132"
+            startingLineNumber = "129"
-            endingLineNumber = "132"
+            endingLineNumber = "129"
             landmarkName = "jpushNotificationAuthorization(_:withInfo:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -1592,42 +1529,10 @@
             filePath = "OrderScheduling/Main/AppDelegate.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "120"
+            startingLineNumber = "116"
-            endingLineNumber = "120"
+            endingLineNumber = "116"
             landmarkName = "jpushNotificationCenter(_:didReceive:withCompletionHandler:)"
             landmarkType = "7">
-            <Locations>
-               <Location
-                  uuid = "CFCD4B6D-6F9B-4A1C-97F9-7EADFA549A6F - c4594238c72aeac5"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "OrderScheduling.AppDelegate.jpushNotificationCenter(_: __C.UNUserNotificationCenter, didReceive: __C.UNNotificationResponse, withCompletionHandler: () -&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 = "120"
-                  endingLineNumber = "120"
-                  offsetFromSymbolStart = "382">
-               </Location>
-               <Location
-                  uuid = "CFCD4B6D-6F9B-4A1C-97F9-7EADFA549A6F - c4594238c72aeac5"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "OrderScheduling.AppDelegate.jpushNotificationCenter(_: __C.UNUserNotificationCenter, didReceive: __C.UNNotificationResponse, withCompletionHandler: () -&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 = "120"
-                  endingLineNumber = "120"
-                  offsetFromSymbolStart = "296">
-               </Location>
-            </Locations>
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -1784,24 +1689,8 @@
             filePath = "OrderScheduling/Main/Initial.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "82"
+            startingLineNumber = "78"
-            endingLineNumber = "82"
+            endingLineNumber = "78"
-            landmarkName = "changeRootViewController(window:)"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "E2B811D9-AA2D-4A16-89A0-C86D2B00E566"
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "OrderScheduling/Main/Initial.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "77"
-            endingLineNumber = "77"
             landmarkName = "changeRootViewController(window:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -1832,8 +1721,8 @@
             filePath = "OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "220"
+            startingLineNumber = "226"
-            endingLineNumber = "220"
+            endingLineNumber = "226"
             landmarkName = "reloadData()"
             landmarkType = "7">
          </BreakpointContent>
@@ -1896,8 +1785,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "222"
+            startingLineNumber = "221"
-            endingLineNumber = "222"
+            endingLineNumber = "221"
             landmarkName = "entry(model:remarkId:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -1992,8 +1881,8 @@
             filePath = "OrderScheduling/Common/WebView/WebViewController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "102"
+            startingLineNumber = "110"
-            endingLineNumber = "102"
+            endingLineNumber = "110"
             landmarkName = "webView(_:didFinish:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -2008,8 +1897,8 @@
             filePath = "OrderScheduling/Common/WebView/WebViewController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "109"
+            startingLineNumber = "117"
-            endingLineNumber = "109"
+            endingLineNumber = "117"
             landmarkName = "webView(_:didFail:withError:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -2024,8 +1913,8 @@
             filePath = "OrderScheduling/Common/WebView/WebViewController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "117"
+            startingLineNumber = "125"
-            endingLineNumber = "117"
+            endingLineNumber = "125"
             landmarkName = "webView(_:didFailProvisionalNavigation:withError:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -2040,8 +1929,8 @@
             filePath = "OrderScheduling/Common/WebView/WebViewController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "116"
+            startingLineNumber = "124"
-            endingLineNumber = "116"
+            endingLineNumber = "124"
             landmarkName = "webView(_:didFailProvisionalNavigation:withError:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -2233,5 +2122,420 @@
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "F4D86BCD-908A-4E9C-9C37-4D75A7235424"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "OrderScheduling/MessageCenter/ViewController/MessageCenterController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "85"
+            endingLineNumber = "85"
+            landmarkName = "addActions()"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "F0976E9E-ADFC-4B33-8882-687CFA683911"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "OrderScheduling/Main/AppDelegate.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "45"
+            endingLineNumber = "45"
+            landmarkName = "applicationDidBecomeActive(_:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "968CDC1F-2334-4CAC-89E8-B86BBB24D647"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "OrderScheduling/Main/SceneDelegate.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "38"
+            endingLineNumber = "38"
+            landmarkName = "sceneDidBecomeActive(_:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "6F7DAE80-611A-4615-A0C6-C4BF6DAAEDFE"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "OrderScheduling/Main/AppDelegate.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "108"
+            endingLineNumber = "108"
+            landmarkName = "jpushNotificationCenter(_:willPresent:withCompletionHandler:)"
+            landmarkType = "7">
+            <Locations>
+               <Location
+                  uuid = "6F7DAE80-611A-4615-A0C6-C4BF6DAAEDFE - 80f31cf5eda31929"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "OrderScheduling.AppDelegate.jpushNotificationCenter(_: __C.UNUserNotificationCenter, willPresent: __C.UNNotification, withCompletionHandler: (Swift.Int) -&gt; ()) -&gt; ()"
+                  moduleName = "OrderScheduling"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/zd/Desktop/%E4%B8%AD%E9%81%93%E6%95%91%E6%8F%B4/OrderScheduling/OrderScheduling/Main/AppDelegate.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "115"
+                  endingLineNumber = "115"
+                  offsetFromSymbolStart = "1054">
+               </Location>
+               <Location
+                  uuid = "6F7DAE80-611A-4615-A0C6-C4BF6DAAEDFE - 80f31cf5eda31929"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "OrderScheduling.AppDelegate.jpushNotificationCenter(_: __C.UNUserNotificationCenter, willPresent: __C.UNNotification, withCompletionHandler: (Swift.Int) -&gt; ()) -&gt; ()"
+                  moduleName = "OrderScheduling"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/zd/Desktop/%E4%B8%AD%E9%81%93%E6%95%91%E6%8F%B4/OrderScheduling/OrderScheduling/Main/AppDelegate.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "115"
+                  endingLineNumber = "115"
+                  offsetFromSymbolStart = "760">
+               </Location>
+            </Locations>
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "73E9728D-5F62-41DF-B821-5BD9F0DD17B8"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "OrderScheduling/Main/AppDelegate.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "121"
+            endingLineNumber = "121"
+            landmarkName = "jpushNotificationCenter(_:didReceive:withCompletionHandler:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "5F076F28-B096-4BE0-871C-AE78362E69FA"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "OrderScheduling/Main/AppDelegate.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "65"
+            endingLineNumber = "65"
+            landmarkName = "application(_:didReceiveRemoteNotification:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "0A527513-4E3C-4FA1-827B-40C875FF4F7A"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "OrderScheduling/Main/AppDelegate.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "105"
+            endingLineNumber = "105"
+            landmarkName = "jpushNotificationCenter(_:willPresent:withCompletionHandler:)"
+            landmarkType = "7">
+            <Locations>
+               <Location
+                  uuid = "0A527513-4E3C-4FA1-827B-40C875FF4F7A - 80f31cf5eda316ca"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "OrderScheduling.AppDelegate.jpushNotificationCenter(_: __C.UNUserNotificationCenter, willPresent: __C.UNNotification, withCompletionHandler: (Swift.Int) -&gt; ()) -&gt; ()"
+                  moduleName = "OrderScheduling"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/zd/Desktop/%E4%B8%AD%E9%81%93%E6%95%91%E6%8F%B4/OrderScheduling/OrderScheduling/Main/AppDelegate.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "114"
+                  endingLineNumber = "114"
+                  offsetFromSymbolStart = "684">
+               </Location>
+               <Location
+                  uuid = "0A527513-4E3C-4FA1-827B-40C875FF4F7A - 80f31cf5eda316eb"
+                  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 = "113"
+                  endingLineNumber = "113"
+                  offsetFromSymbolStart = "252">
+               </Location>
+               <Location
+                  uuid = "0A527513-4E3C-4FA1-827B-40C875FF4F7A - 80f31cf5eda316eb"
+                  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 = "113"
+                  endingLineNumber = "113"
+                  offsetFromSymbolStart = "580">
+               </Location>
+            </Locations>
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "8CA7DEF3-5FE4-4FBB-9096-8677AF495A36"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "OrderScheduling/Main/AppDelegate.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "106"
+            endingLineNumber = "106"
+            landmarkName = "jpushNotificationCenter(_:willPresent:withCompletionHandler:)"
+            landmarkType = "7">
+            <Locations>
+               <Location
+                  uuid = "8CA7DEF3-5FE4-4FBB-9096-8677AF495A36 - 80f31cf5eda316ca"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "OrderScheduling.AppDelegate.jpushNotificationCenter(_: __C.UNUserNotificationCenter, willPresent: __C.UNNotification, withCompletionHandler: (Swift.Int) -&gt; ()) -&gt; ()"
+                  moduleName = "OrderScheduling"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/zd/Desktop/%E4%B8%AD%E9%81%93%E6%95%91%E6%8F%B4/OrderScheduling/OrderScheduling/Main/AppDelegate.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "114"
+                  endingLineNumber = "114"
+                  offsetFromSymbolStart = "580">
+               </Location>
+               <Location
+                  uuid = "8CA7DEF3-5FE4-4FBB-9096-8677AF495A36 - 80f31cf5eda31929"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "OrderScheduling.AppDelegate.jpushNotificationCenter(_: __C.UNUserNotificationCenter, willPresent: __C.UNNotification, withCompletionHandler: (Swift.Int) -&gt; ()) -&gt; ()"
+                  moduleName = "OrderScheduling"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/zd/Desktop/%E4%B8%AD%E9%81%93%E6%95%91%E6%8F%B4/OrderScheduling/OrderScheduling/Main/AppDelegate.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "115"
+                  endingLineNumber = "115"
+                  offsetFromSymbolStart = "684">
+               </Location>
+            </Locations>
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "55527AD7-E91F-4DFC-8E17-B99BA9D3C81F"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "OrderScheduling/Main/AppDelegate.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "70"
+            endingLineNumber = "70"
+            landmarkName = "application(_:didReceiveRemoteNotification:fetchCompletionHandler:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "40EB4C8E-8D98-4ED2-8339-B9C24247064D"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "OrderScheduling/Main/Initial.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "68"
+            endingLineNumber = "68"
+            landmarkName = "initRootViewController()"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "0F21F031-8BA6-41DE-9955-C104880564B8"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "OrderScheduling/Main/Initial.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "70"
+            endingLineNumber = "70"
+            landmarkName = "initRootViewController()"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "84D8A0D2-4575-4070-BCC8-EA2E1343CEBB"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "OrderSchedulingNotificationService/NotificationService.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "20"
+            endingLineNumber = "20"
+            landmarkName = "didReceive(_:withContentHandler:)"
+            landmarkType = "7">
+            <Locations>
+               <Location
+                  uuid = "84D8A0D2-4575-4070-BCC8-EA2E1343CEBB - 70dd8776de7de256"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "OrderSchedulingNotificationService.NotificationService.didReceive(_: __C.UNNotificationRequest, withContentHandler: (__C.UNNotificationContent) -&gt; ()) -&gt; ()"
+                  moduleName = "OrderSchedulingNotificationService"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/zd/Desktop/%E4%B8%AD%E9%81%93%E6%95%91%E6%8F%B4/OrderScheduling/OrderSchedulingNotificationService/NotificationService.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "20"
+                  endingLineNumber = "20"
+                  offsetFromSymbolStart = "332">
+               </Location>
+               <Location
+                  uuid = "84D8A0D2-4575-4070-BCC8-EA2E1343CEBB - 70dd8776de7de256"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "OrderSchedulingNotificationService.NotificationService.didReceive(_: __C.UNNotificationRequest, withContentHandler: (__C.UNNotificationContent) -&gt; ()) -&gt; ()"
+                  moduleName = "OrderSchedulingNotificationService"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/zd/Desktop/%E4%B8%AD%E9%81%93%E6%95%91%E6%8F%B4/OrderScheduling/OrderSchedulingNotificationService/NotificationService.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "20"
+                  endingLineNumber = "20"
+                  offsetFromSymbolStart = "384">
+               </Location>
+            </Locations>
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "EB7B9410-732C-4F41-8ABF-0B54E7157986"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "OrderSchedulingNotificationService/NotificationService.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "29"
+            endingLineNumber = "29"
+            landmarkName = "didReceive(_:withContentHandler:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "6D63747B-A31A-48C9-AE60-995C4AFBAFDC"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "OrderSchedulingNotificationService/NotificationService.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "31"
+            endingLineNumber = "31"
+            landmarkName = "didReceive(_:withContentHandler:)"
+            landmarkType = "7">
+            <Locations>
+               <Location
+                  uuid = "6D63747B-A31A-48C9-AE60-995C4AFBAFDC - 70dd8776de7de32b"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "OrderSchedulingNotificationService.NotificationService.didReceive(_: __C.UNNotificationRequest, withContentHandler: (__C.UNNotificationContent) -&gt; ()) -&gt; ()"
+                  moduleName = "OrderSchedulingNotificationService"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/zd/Desktop/%E4%B8%AD%E9%81%93%E6%95%91%E6%8F%B4/OrderScheduling/OrderSchedulingNotificationService/NotificationService.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "31"
+                  endingLineNumber = "31"
+                  offsetFromSymbolStart = "2100">
+               </Location>
+               <Location
+                  uuid = "6D63747B-A31A-48C9-AE60-995C4AFBAFDC - 70dd8776de7de3ca"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "OrderSchedulingNotificationService.NotificationService.didReceive(_: __C.UNNotificationRequest, withContentHandler: (__C.UNNotificationContent) -&gt; ()) -&gt; ()"
+                  moduleName = "OrderSchedulingNotificationService"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/zd/Desktop/%E4%B8%AD%E9%81%93%E6%95%91%E6%8F%B4/OrderScheduling/OrderSchedulingNotificationService/NotificationService.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "32"
+                  endingLineNumber = "32"
+                  offsetFromSymbolStart = "2096">
+               </Location>
+            </Locations>
+         </BreakpointContent>
+      </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 = "119"
+            endingLineNumber = "119"
+            landmarkName = "jpushNotificationCenter(_:didReceive:withCompletionHandler:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

OrderScheduling/Common/WebView/WebViewController.swift

@@ -18,6 +18,7 @@ class WebViewController : DDViewController {
     var showNavBar : Bool
     var vcTitle : String
     var url : String?
+    public var disappearHandler: (() -> Void)?
 
     public init(showNavBar:Bool = true,title:String,url:String) {
         self.showNavBar = showNavBar
@@ -30,9 +31,16 @@ class WebViewController : DDViewController {
         fatalError("init(coder:) has not been implemented")
     }
     
+    deinit {
+        if disappearHandler != nil {
+            disappearHandler!()
+        }
+    }
+    
     open override func viewDidLoad() {
         super.viewDidLoad()
 
+        webView.scrollView.contentInsetAdjustmentBehavior = .never
         webView.backgroundColor = .white
         webView.navigationDelegate = self
         webView.uiDelegate = self

OrderScheduling/Common/WebView/WebViewTool.swift

@@ -28,7 +28,7 @@ open class WebViewTool : NSObject {
         case invoicingNotify = "开票通知"
         case reporting = "报备"
         case supplySettlement = "补结算单"
-        case workOrderDetail = "工单详情页"
+        case workOrderDetail = "工单详情"
     }
     
     public override init() {
@@ -70,6 +70,9 @@ open class WebViewTool : NSObject {
         switch name {
         case .todoList:
             vc = WebViewController(title: WebViewNameEnum.todoList.rawValue, url: "\((h5Models?.todoList)!)?token=\((USER.token)!)")
+            vc?.disappearHandler = {
+                NotificationCenter.default.post(name: NSNotification.Name(rawValue: Notification_reloadRescusControolerToDoMessageCount), object: nil)
+            }
             break
         case .workOrderReconciliation:
             vc = WebViewController(showNavBar:false, title: WebViewNameEnum.workOrderReconciliation.rawValue, url: "\((h5Models?.workOrderReconciliation)!)?token=\((USER.token)!)")
@@ -101,7 +104,7 @@ open class WebViewTool : NSObject {
         }
     }
 
-    func open(name:WebViewNameEnum,appending:String?) {
+    func open(name:WebViewNameEnum,appending:String?,completionHandler:(() -> Void)? = nil) {
         requestModelRelay.accept(name)
         appendingRelay.accept(appending)
     }

OrderScheduling/Entry/Entry.swift

@@ -60,7 +60,6 @@ open class Entry {
     
     func showAppUpdateEntry(view:UIView,name:String? = nil) {
         var attributes = EKAttributes()
-        attributes.positionConstraints.rotation.isEnabled = false
         attributes = .centerFloat
         attributes.name = name
         attributes.precedence = .override(priority: .high, dropEnqueuedEntries: false)
@@ -103,9 +102,50 @@ open class Entry {
         SwiftEntryKit.display(entry: view, using: attributes)
     }
     
+    func showAcceptOrderEntry(view:UIView,name:String? = nil) {
+        var attributes = EKAttributes()
+        attributes = .centerFloat
+        attributes.name = name
+        attributes.precedence = .override(priority: .high, dropEnqueuedEntries: false)
+        attributes.displayMode = .inferred
+        attributes.displayDuration = .infinity
+        attributes.screenBackground = .color(color: .clear)
+        attributes.entryBackground = .color(color: .white)
+        attributes.screenInteraction = .dismiss
+        attributes.entryInteraction = .dismiss
+        attributes.scroll = .disabled
+        attributes.entranceAnimation = .init(
+            translate: .init(
+                duration: 0.25,
+                spring: .init(damping: 1, initialVelocity: 0)
+            )
+        )
+        attributes.exitAnimation = .init(
+            translate: .init(duration: 0.25)
+        )
+        attributes.popBehavior = .animated(
+            animation: .init(
+                translate: .init(duration: 0.25)
+            )
+        )
+        attributes.shadow = .active(
+            with: .init(
+                color: .black,
+                opacity: 0.3,
+                radius: 6
+            )
+        )
+        
+        attributes.positionConstraints = .init(verticalOffset:0,size:.init(width:EKAttributes.PositionConstraints.Edge.constant(value: auto(276)),height:EKAttributes.PositionConstraints.Edge.constant(value: auto(148))))
+
+        attributes.positionConstraints.safeArea = .overridden
+        attributes.positionConstraints.rotation.isEnabled = false
+        attributes.statusBar = .light
+        SwiftEntryKit.display(entry: view, using: attributes)
+    }
+    
     func showNotificationAuthEntry(view:UIView,name:String? = nil) {
         var attributes = EKAttributes()
-        attributes.positionConstraints.rotation.isEnabled = false
         attributes = .centerFloat
         attributes.name = name
         attributes.precedence = .override(priority: .low, dropEnqueuedEntries: false)

OrderScheduling/Global/Tool/Tool.swift

@@ -71,13 +71,19 @@ open class Tool {
             let diffInterval = dateNow.timeIntervalSince1970 - date.timeIntervalSince1970
             var combineString : String
             if diffInterval >= 3600 {
-                combineString = String(Int(diffInterval / 3600))+"小时前"
+                combineString = "今天" + (dateString.components(separatedBy: " ").last ?? "")
             }else if diffInterval >= 60 {
                 combineString = String(Int(diffInterval / 60))+"分钟前"
             }else{
                 combineString = String(Int(diffInterval))+"秒前"
             }
             return combineString
+        }else{
+            let dateYesterdayArr = format.string(from: dateNow.addingTimeInterval(-3600 * 24)).components(separatedBy: " ")
+            let dateYesterdayYMD = dateYesterdayArr.first
+            if dateYMD == dateYesterdayYMD {
+                return "昨天" + (dateYesterdayArr.last ?? "")
+            }
         }
         return dateString
     }
@@ -132,4 +138,47 @@ open class Tool {
         return "未知"
     }
 
+    func playVoiceWith(userInfo:[AnyHashable:Any]?) {
+        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 = ""
+
+        if let userInfo {
+            let aps = userInfo["aps"] as? [String:Any]
+            if let aps, (aps["alert"] as? String) == "新订单" {
+                let juheVehcileName = userInfo["juheVehcileName"] as? String
+                let taskCode = userInfo["taskCode"] as? String
+                if juheVehcileName?.isEmpty == false {
+                    string = "您有一条新的聚合订单\(taskCode ?? "")"
+                }else{
+                    string = "您有一条新订单\(taskCode ?? "")"
+                }
+            }
+        }
+        
+        return string
+    }
 }

OrderScheduling/History/ViewController/HistoryController.swift

@@ -51,6 +51,12 @@ extension HistoryController {
             })
             .disposed(by: disposeBag)
 
+        messageTapGes.rx.event
+            .subscribe(onNext: {[weak self] _ in
+                MESSAGETOOL.openMessageCenter(by: self?.navigationController)
+            })
+            .disposed(by: disposeBag)
+        
         pendingTapGes.rx.event
             .observe(on: MainScheduler.instance)
             .subscribe(onNext: { _ in

OrderScheduling/HttpRequestCenter/ApiList.swift

@@ -47,4 +47,8 @@ open class ApiList {
     public let dispatchAppH5Urls = "/supplierAppV2/open/dispatchAppH5Urls"
     
     public let versionCheck = "/supplierAppV2/dispatchApp/user/versionCheck"
+    
+    public let messageReminderList = "/supplierAppV2/dispatchApp/toDoMessage/messageReminderList"
+    
+    public let readMessageReminder = "/supplierAppV2/dispatchApp/toDoMessage/readMessageReminder"
 }

OrderScheduling/HttpRequestCenter/ParametersList.swift

@@ -124,3 +124,14 @@ public struct VersionCheckParameters : Encodable {
     var version : String
     var platForm : Int = 2
 }
+
+public struct MessageReminderListParameters : Encodable {
+    var pageNum : Int
+    var pageSize : Int = 12
+    var orderBy : String = "create_time"
+    var id : Int?
+}
+
+public struct ReadMessageReminderParameters : Encodable {
+    var id : Int
+}

OrderScheduling/HttpRequestCenter/RequestList.swift

@@ -91,4 +91,12 @@ open class RequestList {
     func versionCheck(parameters:Encodable) -> Single<ResponseModel<VersionCheckDataModel>?> {
         return DDAF.post(urlString: HOST+API.versionCheck,parameters: parameters,encoding: JSONParameterEncoder.default,headers: [tokenHeader()],responseType: ResponseModel<VersionCheckDataModel>.self)
     }
+    
+    func messageReminderList(parameters:Encodable) -> Single<ResponseModel<[MessageReminderListDataModel]>?> {
+        return DDAF.post(urlString: HOST+API.messageReminderList,parameters: parameters,encoding: JSONParameterEncoder.default,headers: [tokenHeader()],responseType: ResponseModel<[MessageReminderListDataModel]>.self)
+    }
+    
+    func readMessageReminder(parameters:Encodable) -> Single<ResponseModel<String>?> {
+        return DDAF.post(urlString: HOST+API.readMessageReminder,parameters: parameters,encoding: JSONParameterEncoder.default,headers: [tokenHeader()],responseType: ResponseModel<String>.self)
+    }
 }

OrderScheduling/HttpResponseModel/ResponseModel.swift

@@ -264,3 +264,33 @@ public class VersionCheckDataModel : Decodable {
     var createTime : String?
     var description : String?
 }
+
+public class MessageReminderListDataModel : Decodable {
+    var id : Int
+    var msgType : MsgType
+    class MsgType : Decodable {
+        var code : MsgTypeEnum
+        var label : String
+    }
+    enum MsgTypeEnum : Int,Decodable {
+        case DEPARTURE_REMINDER = 1
+        case CUSTOMER_REMINDER = 2
+    }
+    var title : String
+    var titleContent : String
+    var titleColor : String
+    var content : String
+    var imgPath : String?
+    var createTime : String
+    var hasRead : HasRead
+    class HasRead : Decodable {
+        var code : HasReadEnum
+        var label : String
+    }
+    enum HasReadEnum : Int,Decodable {
+        case NO = 0
+        case YES = 1
+    }
+}
+
+

OrderScheduling/Main/AppDelegate.swift

@@ -12,6 +12,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
     public var allowOrentitaionRotation : Bool = false
     
+    public var userInfo : [AnyHashable:Any]?
+    
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         // Override point for customization after application launch.
         // 通知
@@ -28,8 +30,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         JPUSHService.setup(withOption: launchOptions, appKey: JPushKey, channel: "App Store", apsForProduction: true)
         #endif
     
-        JPUSHService.resetBadge()
-        UIApplication.shared.applicationIconBadgeNumber = 0
         return true
     }
 
@@ -41,14 +41,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     }
     
     func applicationDidBecomeActive(_ application: UIApplication) {
-//        JPUSHService.requestNotificationAuthorization({ status in
+        JPUSHService.resetBadge()
-//            print("通知授权状态\(status)")
+        UIApplication.shared.applicationIconBadgeNumber = 0
-//            if status != .statusAuthorized {
-//                NOTIAUTHTOOL.requestNotiAuthRelay.accept(nil)
-//            }else{
-//                NOTIAUTHTOOL.cancelNotiAuthRelay.accept(nil)
-//            }
-//        })
     }
     
     // 注册通知
@@ -109,6 +103,8 @@ extension AppDelegate : JPUSHRegisterDelegate {
         let userInfo = notification.request.content.userInfo
         if notification.request.trigger?.isKind(of: UNPushNotificationTrigger.self) == true {
             JPUSHService.handleRemoteNotification(userInfo)
+            ACCEPTORDERTOOL.open(userInfo: userInfo)
+            TOOL.playVoiceWith(userInfo: userInfo)
             print("ios10 前台")
         }
         completionHandler(0)
@@ -118,6 +114,7 @@ extension AppDelegate : JPUSHRegisterDelegate {
     func jpushNotificationCenter(_ center: UNUserNotificationCenter, didReceive response: UNNotificationResponse, withCompletionHandler completionHandler: (() -> Void)) {
         let userInfo = response.notification.request.content.userInfo
         if response.notification.request.trigger?.isKind(of: UNPushNotificationTrigger.self) == true {
+            self.userInfo = userInfo
             JPUSHService.resetBadge()
             UIApplication.shared.applicationIconBadgeNumber = 0
             JPUSHService.handleRemoteNotification(userInfo)

OrderScheduling/Main/Initial.swift

@@ -67,23 +67,14 @@ class Initial : NSObject {
         if USER.isLogin == true {
             NotificationCenter.default.post(name: NSNotification.Name(rawValue: Notification_loginSuccessToRescueController), object: nil)
         }else{
-            NotificationCenter.default.post(name: NSNotification.Name(rawValue: Notification_toLoginController), object: nil)
+            NotificationCenter.default.post(name: NSNotification.Name(rawValue: Notification_logoutSuccessToLoginController), object: nil)
         }
     }
     
     func changeRootViewController(window:UIWindow?) {
         
-        NotificationCenter.default.addObserver(forName: NSNotification.Name(rawValue: Notification_toLoginController), object: nil, queue: .main) { note in
-            let nav = DDNavigationController(rootViewController: LoginController.init())
-            window?.rootViewController = nav
-        }
-        
         NotificationCenter.default.addObserver(forName: NSNotification.Name(rawValue: Notification_logoutSuccessToLoginController), object: nil, queue: .main) { note in
-            let nav = DDNavigationController(rootViewController: LoginController.init())
+            USER.clear()
-            window?.rootViewController = nav
-        }
-        
-        NotificationCenter.default.addObserver(forName: NSNotification.Name(rawValue: Notification_reLoginToLoginController), object: nil, queue: .main) { note in
             let nav = DDNavigationController(rootViewController: LoginController.init())
             window?.rootViewController = nav
         }

OrderScheduling/Main/SceneDelegate.swift

@@ -10,7 +10,7 @@ import UIKit
 class SceneDelegate: UIResponder, UIWindowSceneDelegate {
 
     public var window: UIWindow?
-    public var initial : Initial = Initial.init()
+    public var initial : Initial = Initial.shareInstance
 
     func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions) {
         // Use this method to optionally configure and attach the UIWindow `window` to the provided UIWindowScene `scene`.
@@ -34,16 +34,14 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
     }
 
     func sceneDidBecomeActive(_ scene: UIScene) {
-        // Called when the scene has moved from an inactive state to an active state.
+        JPUSHService.resetBadge()
-        // Use this method to restart any tasks that were paused (or not yet started) when the scene was inactive.
+        UIApplication.shared.applicationIconBadgeNumber = 0
-//        JPUSHService.requestNotificationAuthorization({ status in
+        
-//            print("通知授权状态\(status)")
+        let delegate = UIApplication.shared.delegate as? AppDelegate
-//            if status != .statusAuthorized {
+        if delegate?.userInfo != nil {
-//                NOTIAUTHTOOL.requestNotiAuthRelay.accept(nil)
+            ACCEPTORDERTOOL.open(userInfo: delegate?.userInfo)
-//            }else{
+            delegate?.userInfo = nil
-//                NOTIAUTHTOOL.cancelNotiAuthRelay.accept(nil)
+        }
-//            }
-//        })
     }
 
     func sceneWillResignActive(_ scene: UIScene) {

OrderScheduling/MessageCenter/ViewController/MessageCenterController.swift

@@ -9,14 +9,92 @@ import Foundation
 import DDAutoUIKit_Private
 import DDControlsKit_Private
 import SnapKit
+import RxRelay
 import RxSwift
+import RxCocoa
 import MJRefresh
 
 extension MessageCenterController {
     func addActions() {
-        messageCenterView.tableView.mj_header = MJRefreshNormalHeader.init(refreshingBlock: {
+        messageCenterView.tableView.mj_header = MJRefreshNormalHeader(refreshingBlock: {[weak self] in
-            
+            self?.pageNum = 1
+            self?.refreshRelay.accept(self?.pageNum ?? 1)
         })
+        
+        messageCenterView.tableView.mj_footer = MJRefreshBackNormalFooter(refreshingBlock: {[weak self] in
+            self?.pageNum+=1
+            self?.refreshRelay.accept(self?.pageNum ?? 1)
+        })
+
+        refreshRelay
+            .flatMapLatest { pageNum in
+                return Observable.zip(RQ.messageReminderList(parameters: MessageReminderListParameters(pageNum: pageNum)).asObservable(), Observable.just(pageNum))
+            }
+            .observe(on: MainScheduler.instance)
+            .subscribe(onNext: {[weak self] (response, pageNum) in
+                if response?.success == true {
+                    if pageNum == 1 {
+                        self?.resultArr.removeAll()
+                        self?.messageCenterView.tableView.mj_footer?.resetNoMoreData()
+                        self?.messageCenterView.tableView.mj_header?.endRefreshing()
+                    }else{
+                        if response?.data?.isEmpty == false {
+                            self?.messageCenterView.tableView.mj_footer?.endRefreshing()
+                        }else{
+                            self?.messageCenterView.tableView.mj_footer?.endRefreshingWithNoMoreData()
+                        }
+                    }
+                    
+                    if let array = response?.data {
+                        self?.resultArr.append(contentsOf: array)
+                    }
+                    
+                    if self?.resultArr.isEmpty == false {
+                        self?.emptyView.isHidden = true
+                    }else{
+                        self?.emptyView.isHidden = false
+                    }
+                    
+                    self?.messageCenterView.tableView.reloadData()
+                }else{
+                    if pageNum == 1 {
+                        self?.messageCenterView.tableView.mj_header?.endRefreshing()
+                    }else{
+                        self?.messageCenterView.tableView.mj_footer?.endRefreshing()
+                    }
+                    self?.view.dd_makeToast(response?.msg)
+                }
+            })
+            .disposed(by: disposeBag)
+        
+        readRelay
+            .observe(on: MainScheduler.instance)
+            .do(onNext: {[weak self] _ in
+                self?.view.dd_showHUD()
+            })
+            .flatMapLatest { model in
+                return Observable.zip(RQ.readMessageReminder(parameters: ReadMessageReminderParameters(id: model.id)).asObservable(), Observable.just(model))
+            }
+            .observe(on: MainScheduler.instance)
+            .do(onNext: {[weak self] _ in
+                self?.view.dd_hideHUD()
+            })
+            .observe(on: MainScheduler.instance)
+            .subscribe(onNext: {[weak self] (response,model) in
+                if response?.success == true {
+                    for _model in (self?.resultArr ?? []) {
+                        if _model.id == model.id {
+                            _model.hasRead.code = .YES
+                        }
+                    }
+                    self?.messageCenterView.tableView.reloadData()
+                }else{
+                    self?.view.dd_makeToast(response?.msg)
+                }
+            })
+            .disposed(by: disposeBag)
+        
+        refreshRelay.accept(1)
     }
 }
 
@@ -27,7 +105,7 @@ extension MessageCenterController : UITableViewDelegate,UITableViewDataSource {
     }
     
     public func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        return 2
+        return resultArr.count
     }
     
     public func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
@@ -36,11 +114,46 @@ extension MessageCenterController : UITableViewDelegate,UITableViewDataSource {
             cell = MessageCenterCell(style: .default, reuseIdentifier: "cell")
         }
         
-        cell!.descLabel.text = "师傅接单已超6分钟还未发车，请尽快发车备份 2,师傅接单已超6分钟还未发车，请尽快发车备份 2"
+        let model = resultArr[indexPath.item]
-        cell!.noticeLabel.text = " 发车提醒 "
+        cell!.descLabel.text = model.content
-        cell!.noticeLabel.backgroundColor = .hex("FA8D14")
+        cell!.noticeLabel.text = " " + model.title + " "
-        cell!.orderNumLabel.text = "DDA2304142407036"
+        cell!.noticeLabel.backgroundColor = .hex(model.titleColor)
-        cell!.dateLabel.text = TOOL.getDateStringCompareWithNow(dateFormat:"yyyy/MM/dd HH:mm:ss",dateString: "2023/08/13 23:39:42")
+        cell!.orderNumLabel.text = model.titleContent
+        cell!.dateLabel.text = TOOL.getDateStringCompareWithNow(dateFormat:"yyyy-MM-dd HH:mm:ss",dateString: model.createTime)
+        if model.imgPath?.isEmpty == false {
+            cell?.descImageView.sd_setImage(with: URL(string: model.imgPath ?? ""))
+            cell?.descImageView.snp.updateConstraints({ make in
+                make.top.equalTo(cell!.descLabel.snp.bottom).offset(auto(5))
+                make.height.equalTo(auto(100))
+            })
+            cell?.readButton.snp.updateConstraints({ make in
+                make.top.equalTo(cell!.descImageView.snp.bottom).offset(auto(10))
+            })
+        }else{
+            cell?.descImageView.image = nil
+            cell?.descImageView.snp.updateConstraints({ make in
+                make.height.equalTo(0)
+                make.top.equalTo(cell!.descLabel.snp.bottom).offset(0)
+            })
+            cell?.readButton.snp.updateConstraints({ make in
+                make.top.equalTo(cell!.descImageView.snp.bottom).offset(0)
+            })
+        }
+        if model.hasRead.code == .YES {
+            cell?.readButton.isUserInteractionEnabled = false
+            cell?.readButton.setTitleColor(.hex("000000").alpha(0.4), for: .normal)
+            cell?.readButton.setTitle("已处理", for: .normal)
+        }else{
+            cell?.readButton.isUserInteractionEnabled = true
+            cell?.readButton.setTitleColor(.hex("FA8D14"), for: .normal)
+            cell?.readButton.setTitle("点击处理", for: .normal)
+        }
+        
+        cell?.readButton.rx.tap
+            .subscribe(onNext: {[weak self] _ in
+                self?.readRelay.accept(model)
+            })
+            .disposed(by: cell!.disposeBag)
         return cell!
     }
 }
@@ -48,6 +161,18 @@ extension MessageCenterController : UITableViewDelegate,UITableViewDataSource {
 open class MessageCenterController : DDViewController {
     private let messageCenterView = MessageCenterView()
     private var emptyView = EmptyView()
+    private var pageNum : Int = 1
+    private var refreshRelay = ReplayRelay<Int>.create(bufferSize: 1)
+    private var readRelay = ReplayRelay<MessageReminderListDataModel>.create(bufferSize: 1)
+    private var resultArr : [MessageReminderListDataModel] = []
+    private let disposeBag = DisposeBag()
+    public var disappearHandler: (() -> Void)?
+    
+    deinit {
+        if disappearHandler != nil {
+            disappearHandler!()
+        }
+    }
     
     open override func viewDidLoad() {
         super.viewDidLoad()
@@ -108,12 +233,18 @@ open class MessageCenterCell : DDTableViewCell {
     public let orderNumLabel : DDLabel
     public let dateLabel : DDLabel
     public let descLabel : DDLabel
+    public let descImageView : DDImageView
+    public let readButton : DDButton
+    public var disposeBag : DisposeBag
     public override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
         radiusView = DDView()
         noticeLabel = DDLabel.dd_init(withText: "", font: .mediumFont(auto(10)), textColor: .white)
         orderNumLabel = DDLabel.dd_init(withText: "", font: .mediumFont(auto(12)), textColor: .hex("000000").alpha(0.55))
         dateLabel = DDLabel.dd_init(withText: "", font: .regularFont(auto(11)), textColor: .hex("000000").alpha(0.55))
         descLabel = DDLabel.dd_init(withText: "", font: .mediumFont(auto(13)), textColor: .hex("000000").alpha(0.75))
+        descImageView = DDImageView()
+        readButton = DDButton.dd_initCustom()
+        disposeBag = DisposeBag()
         super.init(style: style, reuseIdentifier: reuseIdentifier)
         
         backgroundColor = .hex("F4F5F7")
@@ -133,6 +264,13 @@ open class MessageCenterCell : DDTableViewCell {
         radiusView.addSubview(dateLabel)
         descLabel.numberOfLines = 0
         radiusView.addSubview(descLabel)
+        descImageView.contentMode = .scaleAspectFill
+        descImageView.layer.masksToBounds = true
+        descImageView.layer.cornerRadius = auto(10)
+        radiusView.addSubview(descImageView)
+        readButton.titleLabel?.textAlignment = .right
+        readButton.titleLabel?.font = .mediumFont(auto(13))
+        radiusView.addSubview(readButton)
         
         radiusView.snp.makeConstraints { make in
             make.left.top.equalTo(auto(10))
@@ -159,11 +297,29 @@ open class MessageCenterCell : DDTableViewCell {
             make.top.equalTo(noticeLabel.snp.bottom).offset(auto(10))
             make.left.equalTo(noticeLabel)
             make.right.equalTo(dateLabel)
-            make.bottom.equalTo(-auto(15))
+        }
+        
+        descImageView.snp.makeConstraints { make in
+            make.top.equalTo(descLabel.snp.bottom).offset(auto(5))
+            make.left.equalTo(descLabel)
+            make.right.equalTo(descLabel)
+            make.height.equalTo(auto(100))
+        }
+        
+        readButton.snp.makeConstraints { make in
+            make.right.equalTo(dateLabel)
+            make.top.equalTo(descImageView.snp.bottom).offset(auto(5))
+            make.height.equalTo(auto(20))
+            make.bottom.equalTo(-auto(5))
         }
     }
     
     public required init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
+    
+    open override func prepareForReuse() {
+        super.prepareForReuse()
+        disposeBag = DisposeBag()
+    }
 }

OrderScheduling/MessageCenter/ViewController/MessageCenterTool.swift

@@ -0,0 +1,22 @@
+//
+//  MessageCenterTool.swift
+//  OrderScheduling
+//
+//  Created by 中道 on 2023/8/25.
+//
+
+import Foundation
+import DDControlsKit_Private
+
+public let MESSAGETOOL = MessageCenterTool.default
+open class MessageCenterTool : NSObject  {
+    public static let `default` = MessageCenterTool()
+    
+    func openMessageCenter(by nav:UINavigationController?) {
+        let vc = MessageCenterController()
+        vc.disappearHandler = {
+            NotificationCenter.default.post(name: NSNotification.Name(rawValue: Notification_reloadRescusControolerToDoMessageCount), object: nil)
+        }
+        nav?.pushViewController(vc, animated: true)
+    }
+}

OrderScheduling/Mine/ViewController/MineController.swift

@@ -37,7 +37,6 @@ extension MineController {
             .observe(on: MainScheduler.instance)
             .subscribe(onNext: {[weak self] response in
                 if response?.success == true {
-                    USER.clear()
                     NotificationCenter.default.post(name: NSNotification.Name(rawValue: Notification_logoutSuccessToLoginController), object: nil)
                 }else{
                     self?.view.dd_makeToast(response?.msg)
@@ -152,7 +151,7 @@ open class MineController : ZDViewController {
         
         view.addSubview(mineView)
         mineView.snp.makeConstraints { make in
-            make.top.equalTo(CGRectGetHeight(UIApplication.shared.dd_statusBarFrame) + CGRectGetHeight(navigationController?.navigationBar.frame ?? .zero))
+            make.top.equalTo(CGRectGetHeight(UIApplication.shared.dd_statusBarFrame) + CGRectGetHeight(navigationController?.navigationBar.frame ?? .zero) - 1)
             make.left.right.equalToSuperview()
             make.bottom.equalTo(-view.safeAreaInsets.bottom - CGRectGetHeight(tabBarController?.tabBar.frame ?? .zero))
         }

OrderScheduling/Rescue/View/AcceptOrderTool.swift

@@ -0,0 +1,32 @@
+//
+//  AcceptOrderTool.swift
+//  OrderScheduling
+//
+//  Created by 中道 on 2023/8/25.
+//
+
+import Foundation
+import RxSwift
+import RxCocoa
+
+public let ACCEPTORDERTOOL = AcceptOrderTool.default
+
+open class AcceptOrderTool : NSObject {
+    public static let `default` = AcceptOrderTool()
+    private let disposeBag = DisposeBag()
+    
+    func open(userInfo:[AnyHashable:Any]?) {
+        let acceptOrderView = AcceptOrderView()
+        acceptOrderView.titleLabel.text = "新订单"
+        acceptOrderView.contentLabel.text = TOOL.getOrderString(userInfo: userInfo)
+        acceptOrderView.readButton.setTitle("查看", for: .normal)
+        acceptOrderView.readButton.rx.tap
+            .subscribe(onNext: {
+                ENTRY.dismiss(name: acceptOrderViewEntry) {
+                    let tabBarVc = UIApplication.shared.dd_keyWindow.rootViewController as? MainTabBarController
+                    tabBarVc?.selectedIndex = 0
+                }
+            }).disposed(by: disposeBag)
+        ENTRY.showAcceptOrderEntry(view: acceptOrderView,name: acceptOrderViewEntry)
+    }
+}

OrderScheduling/Rescue/View/AcceptOrderView.swift

@@ -0,0 +1,129 @@
+//
+//  AcceptOrderView.swift
+//  OrderScheduling
+//
+//  Created by 中道 on 2023/8/25.
+//
+
+import Foundation
+import DDControlsKit_Private
+import SnapKit
+import DDAutoUIKit_Private
+
+open class AcceptOrderView : DDView {
+    private let radiusView : DDView
+    private let scrollView : DDScrollView
+    private let scrollContentView : DDView
+    public let titleLabel : DDLabel
+    public let contentLabel : DDLabel
+    public let horizontalLine : DDView
+    public let verticalLine : DDView
+    public let refuseButton : DDButton
+    public let acceptButton : DDButton
+    public let readButton : DDButton
+    public override init(frame: CGRect) {
+        radiusView = DDView.init()
+        scrollView = DDScrollView()
+        scrollContentView = DDView.init()
+        titleLabel = DDLabel.dd_init(withText: "", font: .mediumFont(auto(16)), textColor: .black)
+        contentLabel = DDLabel.dd_init(withText: "", font: .mediumFont(auto(14)), textColor: .hex("203053"))
+        horizontalLine = DDView()
+        verticalLine = DDView()
+        refuseButton = DDButton.dd_initCustom()
+        acceptButton = DDButton.dd_initCustom()
+        readButton = DDButton.dd_initCustom()
+        super.init(frame: frame)
+        radiusView.layer.cornerRadius = auto(10)
+        radiusView.layer.masksToBounds = true
+        addSubview(radiusView)
+        radiusView.addSubview(scrollView)
+        scrollView.addSubview(scrollContentView)
+        radiusView.addSubview(titleLabel)
+        contentLabel.numberOfLines = 0
+        contentLabel.textAlignment = .center
+        scrollContentView.addSubview(contentLabel)
+        horizontalLine.backgroundColor = .hex("979797").alpha(0.35)
+        radiusView.addSubview(horizontalLine)
+        verticalLine.backgroundColor = .hex("979797").alpha(0.35)
+        verticalLine.isHidden = true
+        radiusView.addSubview(verticalLine)
+        refuseButton.isHidden = true
+        refuseButton.titleLabel?.font = .mediumFont(auto(14))
+        refuseButton.backgroundColor = .white
+        refuseButton.setTitleColor(.black.alpha(0.3), for: .normal)
+        radiusView.addSubview(refuseButton)
+        acceptButton.titleLabel?.font = .mediumFont(auto(14))
+        acceptButton.backgroundColor = .white
+        acceptButton.setTitleColor(.black.alpha(0.3), for: .normal)
+        acceptButton.isHidden = true
+        radiusView.addSubview(acceptButton)
+        readButton.titleLabel?.font = .mediumFont(auto(14))
+        readButton.backgroundColor = .white
+        readButton.setTitleColor(.hex("1D64D2"), for: .normal)
+        radiusView.addSubview(readButton)
+        
+        radiusView.snp.makeConstraints { make in
+            make.edges.equalToSuperview()
+        }
+        
+        titleLabel.snp.makeConstraints { make in
+            make.centerX.equalToSuperview()
+            make.top.equalToSuperview().offset(auto(20))
+        }
+    
+        scrollView.snp.makeConstraints { make in
+            make.top.equalTo(titleLabel.snp.bottom).offset(auto(10))
+            make.left.right.equalToSuperview()
+            make.bottom.equalTo(horizontalLine.snp.top).offset(0)
+        }
+        
+        scrollContentView.snp.makeConstraints { make in
+            make.edges.equalToSuperview()
+            make.width.equalToSuperview()
+        }
+
+        contentLabel.snp.makeConstraints { make in
+            make.left.equalToSuperview().offset(auto(20))
+            make.top.equalToSuperview()
+            make.right.equalTo(-auto(20))
+            make.height.greaterThanOrEqualTo(auto(40))
+            make.bottom.equalTo(scrollContentView)
+        }
+        
+        horizontalLine.snp.makeConstraints { make in
+            make.bottom.equalToSuperview().offset(-auto(40))
+            make.left.right.equalToSuperview()
+            make.height.equalTo(1)
+        }
+        
+        verticalLine.snp.makeConstraints { make in
+            make.centerX.equalToSuperview()
+            make.top.equalTo(horizontalLine.snp.bottom)
+            make.bottom.equalToSuperview()
+            make.width.equalTo(1)
+        }
+        
+        refuseButton.snp.makeConstraints { make in
+            make.bottom.equalToSuperview()
+            make.left.equalToSuperview()
+            make.top.equalTo(horizontalLine.snp.bottom)
+            make.right.equalTo(verticalLine.snp.left)
+        }
+        
+        acceptButton.snp.makeConstraints { make in
+            make.bottom.equalToSuperview()
+            make.right.equalToSuperview()
+            make.top.equalTo(horizontalLine.snp.bottom)
+            make.left.equalTo(verticalLine.snp.right)
+        }
+        
+        readButton.snp.makeConstraints { make in
+            make.top.equalTo(horizontalLine.snp.bottom)
+            make.left.right.bottom.equalToSuperview()
+        }
+    }
+    
+    public required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+}

OrderScheduling/Rescue/ViewController/RescueController.swift

@@ -55,8 +55,7 @@ extension RescueController {
         
         messageTapGes.rx.event
             .subscribe(onNext: {[weak self] _ in
-                let vc = MessageCenterController()
+                MESSAGETOOL.openMessageCenter(by: self?.navigationController)
-                self?.navigationController?.pushViewController(vc, animated: true)
             })
             .disposed(by: disposeBag)
         

OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift

@@ -101,6 +101,12 @@ extension ReviewFailedController {
             })
             .disposed(by: disposeBag)
         
+        messageTapGes.rx.event
+            .subscribe(onNext: {[weak self] _ in
+                MESSAGETOOL.openMessageCenter(by: self?.navigationController)
+            })
+            .disposed(by: disposeBag)
+        
         pendingTapGes.rx.event
             .observe(on: MainScheduler.instance)
             .subscribe(onNext: { _ in

OrderScheduling/Strings/EntryStrings.swift

@@ -12,3 +12,5 @@ public let refuseOrderEntry = "refuseOrderEntry"
 public let appUpdateEntry = "appUpdateEntry"
 
 public let notificationAuthViewEntry = "notificationAuthViewEntry"
+
+public let acceptOrderViewEntry = "acceptOrderViewEntry"

OrderScheduling/Strings/NotificationStrings.swift

@@ -9,12 +9,8 @@ import Foundation
 
 public let Notification_loginSuccessToRescueController = "Notification_loginSuccessToRescueController"
 
-public let Notification_toLoginController = "Notification_toLoginController"
-
 public let Notification_logoutSuccessToLoginController = "Notification_logoutSuccessToLoginController"
 
-public let Notification_reLoginToLoginController = "Notification_reLoginToLoginController"
-
 public let Notification_dispatchOrderSuccessReloadIsRescuingController = "Notification_dispatchOrderSuccessReloadIsRescuingController"
 
 public let Notification_dispatchOrderSuccessReloadPendingDispatchController = "Notification_dispatchOrderSuccessReloadPendingDispatchController"

OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift

@@ -154,6 +154,12 @@ extension VehicleMonitoringController {
             })
             .disposed(by: disposeBag)
  
+        messageTapGes.rx.event
+            .subscribe(onNext: {[weak self] _ in
+                MESSAGETOOL.openMessageCenter(by: self?.navigationController)
+            })
+            .disposed(by: disposeBag)
+                
         pendingTapGes.rx.event
             .observe(on: MainScheduler.instance)
             .subscribe(onNext: { _ in

OrderSchedulingNotificationService/Info.plist

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
+	</dict>
+	<key>NSExtension</key>
+	<dict>
+		<key>NSExtensionPointIdentifier</key>
+		<string>com.apple.usernotifications.service</string>
+		<key>NSExtensionPrincipalClass</key>
+		<string>$(PRODUCT_MODULE_NAME).NotificationService</string>
+	</dict>
+</dict>
+</plist>

OrderSchedulingNotificationService/NotificationService.swift

@@ -0,0 +1,52 @@
+//
+//  NotificationService.swift
+//  OrderSchedulingNotificationService
+//
+//  Created by 中道 on 2023/8/28.
+//
+
+import UserNotifications
+import AVFoundation
+
+class NotificationService: UNNotificationServiceExtension {
+
+    var contentHandler: ((UNNotificationContent) -> Void)?
+    var bestAttemptContent: UNMutableNotificationContent?
+
+    override func didReceive(_ request: UNNotificationRequest, withContentHandler contentHandler: @escaping (UNNotificationContent) -> Void) {
+        self.contentHandler = contentHandler
+        bestAttemptContent = (request.content.mutableCopy() as? UNMutableNotificationContent)
+        
+        if let bestAttemptContent = bestAttemptContent {
+            // Modify the notification content here...
+//            bestAttemptContent.title = "\(bestAttemptContent.title) [modified]"
+            let userInfo = bestAttemptContent.userInfo
+            
+            let aps = userInfo["aps"] as? [String:Any]
+            if let aps, (aps["alert"] as? String) == "新订单" {
+                let juheVehcileName = userInfo["juheVehcileName"] as? String
+                if juheVehcileName?.isEmpty == false {
+                    bestAttemptContent.sound = UNNotificationSound(named: UNNotificationSoundName(rawValue: "juheNewOrderAudio.wav"))
+                }else{
+                    bestAttemptContent.sound = UNNotificationSound(named: UNNotificationSoundName(rawValue: "newOrderAudio.wav"))
+                }
+            }
+
+            JPushNotificationExtensionService.jpushSetAppkey("259b546bb2aaf5f02ffa2547")
+            JPushNotificationExtensionService.jpushReceive(request) {
+                contentHandler(request.content)
+            }
+            
+            contentHandler(bestAttemptContent)
+        }
+    }
+    
+    override func serviceExtensionTimeWillExpire() {
+        // Called just before the extension will be terminated by the system.
+        // Use this as an opportunity to deliver your "best attempt" at modified content, otherwise the original push payload will be used.
+        if let contentHandler = contentHandler, let bestAttemptContent =  bestAttemptContent {
+            contentHandler(bestAttemptContent)
+        }
+    }
+
+}

OrderSchedulingNotificationService/OrderSchedulingNotificationService-Bridging-Header.h

@@ -0,0 +1,13 @@
+//
+//  Use this file to import your target's public headers that you would like to expose to Swift.
+//
+
+// 引入 JPush 功能所需头文件
+# import "JPUSHService.h"
+# import "JGInforCollectionAuth.h"
+# import "JPushNotificationExtensionService.h"
+
+// iOS10 注册 APNs 所需头文件
+# ifdef NSFoundationVersionNumber_iOS_9_x_Max
+# import <UserNotifications/UserNotifications.h>
+# endif

OrderSchedulingNotificationService/OrderSchedulingNotificationService.entitlements

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict/>
+</plist>

Podfile

@@ -35,6 +35,7 @@ target 'OrderScheduling' do
   pod 'ZFPlayer/ControlView',:path=> '/Users/zd/Downloads/iOS相关/ZFPlayer-master'
   pod 'ZFPlayer/ijkplayer',:path=> '/Users/zd/Downloads/iOS相关/ZFPlayer-master'
   pod 'JPush'
+#  pod 'JPushExtension'
 
 #  pod 'ZFPlayer', '~> 4.0'
 #  pod 'ZFPlayer/ControlView'
@@ -63,3 +64,8 @@ target 'OrderScheduling' do
       end
   end
 end
+
+target 'OrderSchedulingNotificationService' do
+  pod 'JPush'
+  pod 'JPushExtension'
+end

Podfile.lock

@@ -279,6 +279,7 @@ PODS:
   - JCore (4.2.1)
   - JPush (5.0.1):
     - JCore (>= 2.0.0)
+  - JPushExtension (2.0.1)
   - JXCategoryView (1.6.1)
   - Kingfisher (7.9.0)
   - MJRefresh (3.7.5)
@@ -318,6 +319,7 @@ DEPENDENCIES:
   - ESTabBarController-swift
   - IQKeyboardManagerSwift
   - JPush
+  - JPushExtension
   - JXCategoryView
   - MJRefresh
   - RxCocoa
@@ -357,6 +359,7 @@ SPEC REPOS:
     - IQKeyboardManagerSwift
     - JCore
     - JPush
+    - JPushExtension
     - JXCategoryView
     - Kingfisher
     - MJRefresh
@@ -396,6 +399,7 @@ SPEC CHECKSUMS:
   IQKeyboardManagerSwift: 371b08cb39664fb56030f5345c815a4ffc74bbc0
   JCore: d994e32edb50add8a33135473acca799d882c5fa
   JPush: bf8d6011eb80c776aa40a0c4f5c25fd10335af9c
+  JPushExtension: d9058b9bd3ef3ccc8f49edea0647595055f6a3c6
   JXCategoryView: 7b1ee69ede4843c581688afe84d0f047723262f2
   Kingfisher: 59f908b6d2f403b0a3e539debb0eec05cb27002c
   MJRefresh: fdf5e979eb406a0341468932d1dfc8b7f9fce961
@@ -407,6 +411,6 @@ SPEC CHECKSUMS:
   ZFPlayer: ba6410f1043fc8a3b7769749f860cf237016df09
   ZLPhotoBrowser: 0563c2bfc7b247b65d023d646012f46cba94101b
 
-PODFILE CHECKSUM: c527bc2e79c16b3fd3c310c3c48715420cd6d615
+PODFILE CHECKSUM: b1a489d788c25d6e97cbebd727a83cb2e9715c78
 
 COCOAPODS: 1.11.3

Pods/JPushExtension/jpush-extension-ios-2.0.1.xcframework/Info.plist

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>AvailableLibraries</key>
+	<array>
+		<dict>
+			<key>HeadersPath</key>
+			<string>Headers</string>
+			<key>LibraryIdentifier</key>
+			<string>ios-arm64</string>
+			<key>LibraryPath</key>
+			<string>libJPushExtension.a</string>
+			<key>SupportedArchitectures</key>
+			<array>
+				<string>arm64</string>
+			</array>
+			<key>SupportedPlatform</key>
+			<string>ios</string>
+		</dict>
+		<dict>
+			<key>HeadersPath</key>
+			<string>Headers</string>
+			<key>LibraryIdentifier</key>
+			<string>ios-arm64_x86_64-simulator</string>
+			<key>LibraryPath</key>
+			<string>libJPushExtension.a</string>
+			<key>SupportedArchitectures</key>
+			<array>
+				<string>arm64</string>
+				<string>x86_64</string>
+			</array>
+			<key>SupportedPlatform</key>
+			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
+		</dict>
+	</array>
+	<key>CFBundlePackageType</key>
+	<string>XFWK</string>
+	<key>XCFrameworkFormatVersion</key>
+	<string>1.0</string>
+</dict>
+</plist>

Pods/JPushExtension/jpush-extension-ios-2.0.1.xcframework/ios-arm64/Headers/JPushNotificationExtensionService.h

@@ -0,0 +1,41 @@
+/*
+ *	| |    | |  \ \  / /  | |    | |   / _______|
+ *	| |____| |   \ \/ /   | |____| |  / /
+ *	| |____| |    \  /    | |____| |  | |   _____
+ * 	| |    | |    /  \    | |    | |  | |  |____ |
+ *  | |    | |   / /\ \   | |    | |  \ \______| |
+ *  | |    | |  /_/  \_\  | |    | |   \_________|
+ *
+ * Copyright (c) 2017 Shenzhen HXHG. All rights reserved.
+ */
+
+#import <Foundation/Foundation.h>
+
+#define JPUSH_EXTENSION_VERSION_NUMBER 2.0.1
+
+@class UNNotificationRequest;
+
+@interface JPushNotificationExtensionService : NSObject
+
+
+/**
+ 设置appkey（需要与main target中的appkey相同）
+ */
++ (void)jpushSetAppkey:(NSString *)appkey;
+
+/**
+ apns送达
+ @param request apns请求
+ @param completion 回调
+ */
++ (void)jpushReceiveNotificationRequest:(UNNotificationRequest *)request with:(void (^)(void))completion;
+
+/**
+ 关闭日志
+ 默认为开启
+ 建议发布时关闭以减少不必要的IO
+ */
++ (void)setLogOff;
+
+
+@end

Pods/JPushExtension/jpush-extension-ios-2.0.1.xcframework/ios-arm64_x86_64-simulator/Headers/JPushNotificationExtensionService.h

@@ -0,0 +1,41 @@
+/*
+ *	| |    | |  \ \  / /  | |    | |   / _______|
+ *	| |____| |   \ \/ /   | |____| |  / /
+ *	| |____| |    \  /    | |____| |  | |   _____
+ * 	| |    | |    /  \    | |    | |  | |  |____ |
+ *  | |    | |   / /\ \   | |    | |  \ \______| |
+ *  | |    | |  /_/  \_\  | |    | |   \_________|
+ *
+ * Copyright (c) 2017 Shenzhen HXHG. All rights reserved.
+ */
+
+#import <Foundation/Foundation.h>
+
+#define JPUSH_EXTENSION_VERSION_NUMBER 2.0.1
+
+@class UNNotificationRequest;
+
+@interface JPushNotificationExtensionService : NSObject
+
+
+/**
+ 设置appkey（需要与main target中的appkey相同）
+ */
++ (void)jpushSetAppkey:(NSString *)appkey;
+
+/**
+ apns送达
+ @param request apns请求
+ @param completion 回调
+ */
++ (void)jpushReceiveNotificationRequest:(UNNotificationRequest *)request with:(void (^)(void))completion;
+
+/**
+ 关闭日志
+ 默认为开启
+ 建议发布时关闭以减少不必要的IO
+ */
++ (void)setLogOff;
+
+
+@end

Pods/Manifest.lock

@@ -279,6 +279,7 @@ PODS:
   - JCore (4.2.1)
   - JPush (5.0.1):
     - JCore (>= 2.0.0)
+  - JPushExtension (2.0.1)
   - JXCategoryView (1.6.1)
   - Kingfisher (7.9.0)
   - MJRefresh (3.7.5)
@@ -318,6 +319,7 @@ DEPENDENCIES:
   - ESTabBarController-swift
   - IQKeyboardManagerSwift
   - JPush
+  - JPushExtension
   - JXCategoryView
   - MJRefresh
   - RxCocoa
@@ -357,6 +359,7 @@ SPEC REPOS:
     - IQKeyboardManagerSwift
     - JCore
     - JPush
+    - JPushExtension
     - JXCategoryView
     - Kingfisher
     - MJRefresh
@@ -396,6 +399,7 @@ SPEC CHECKSUMS:
   IQKeyboardManagerSwift: 371b08cb39664fb56030f5345c815a4ffc74bbc0
   JCore: d994e32edb50add8a33135473acca799d882c5fa
   JPush: bf8d6011eb80c776aa40a0c4f5c25fd10335af9c
+  JPushExtension: d9058b9bd3ef3ccc8f49edea0647595055f6a3c6
   JXCategoryView: 7b1ee69ede4843c581688afe84d0f047723262f2
   Kingfisher: 59f908b6d2f403b0a3e539debb0eec05cb27002c
   MJRefresh: fdf5e979eb406a0341468932d1dfc8b7f9fce961
@@ -407,6 +411,6 @@ SPEC CHECKSUMS:
   ZFPlayer: ba6410f1043fc8a3b7769749f860cf237016df09
   ZLPhotoBrowser: 0563c2bfc7b247b65d023d646012f46cba94101b
 
-PODFILE CHECKSUM: c527bc2e79c16b3fd3c310c3c48715420cd6d615
+PODFILE CHECKSUM: b1a489d788c25d6e97cbebd727a83cb2e9715c78
 
 COCOAPODS: 1.11.3

Pods/Pods.xcodeproj/xcuserdata/zd.xcuserdatad/xcschemes/JPushExtension.xcscheme

@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1300"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "609276B985CD7549B9F1DEE4969208FF"
+               BuildableName = "JPushExtension"
+               BlueprintName = "JPushExtension"
+               ReferencedContainer = "container:Pods.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

Pods/Pods.xcodeproj/xcuserdata/zd.xcuserdatad/xcschemes/Pods-OrderSchedulingNotificationService.xcscheme

@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1300"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "775A96192E9F3E75FE7B0644CEB05EB1"
+               BuildableName = "libPods-OrderSchedulingNotificationService.a"
+               BlueprintName = "Pods-OrderSchedulingNotificationService"
+               ReferencedContainer = "container:Pods.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

Pods/Pods.xcodeproj/xcuserdata/zd.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -8,186 +8,274 @@
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>2</integer>
 		</dict>
 		<key>AMapLocation-NO-IDFA.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>3</integer>
 		</dict>
 		<key>AMapNavi-NO-IDFA.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>4</integer>
 		</dict>
 		<key>AMapSearch-NO-IDFA.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>5</integer>
 		</dict>
 		<key>AMapTrack-NO-IDFA.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>6</integer>
 		</dict>
 		<key>Alamofire.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>1</integer>
 		</dict>
 		<key>CocoaDebug.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>7</integer>
 		</dict>
 		<key>DDAutoUIKit_Private.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>8</integer>
 		</dict>
 		<key>DDBasicControlsKit_Private-DDBaseViewController.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>10</integer>
 		</dict>
 		<key>DDBasicControlsKit_Private.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>9</integer>
 		</dict>
 		<key>DDCategoryKit_Private.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>11</integer>
 		</dict>
 		<key>DDColorKit_Private.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>12</integer>
 		</dict>
 		<key>DDControlsKit_Private.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>13</integer>
 		</dict>
 		<key>DDFontKit_Private.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>14</integer>
 		</dict>
 		<key>DDLogKit_Private.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>15</integer>
 		</dict>
 		<key>DDMAMapKit_Private-DDMAMapKit_Private.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>17</integer>
 		</dict>
 		<key>DDMAMapKit_Private.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>16</integer>
 		</dict>
 		<key>DDNetworkingOfAlamofireKit_Private.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>18</integer>
 		</dict>
 		<key>DDProgressHUDKit_Private.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>19</integer>
 		</dict>
 		<key>DDTimerKit_Private.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>20</integer>
 		</dict>
 		<key>DDToastKit_Private.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>21</integer>
 		</dict>
 		<key>DDWebImageKit_Private.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>22</integer>
 		</dict>
 		<key>ESTabBarController-swift.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>23</integer>
 		</dict>
 		<key>IQKeyboardManagerSwift.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>24</integer>
 		</dict>
 		<key>JCore.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>25</integer>
 		</dict>
 		<key>JPush.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>26</integer>
+		</dict>
+		<key>JPushExtension.xcscheme</key>
+		<dict>
+			<key>isShown</key>
+			<false/>
+			<key>orderHint</key>
+			<integer>27</integer>
 		</dict>
 		<key>JXCategoryView.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>28</integer>
 		</dict>
 		<key>Kingfisher.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>29</integer>
 		</dict>
 		<key>MJRefresh.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>30</integer>
 		</dict>
 		<key>Pods-OrderScheduling.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>31</integer>
+		</dict>
+		<key>Pods-OrderSchedulingNotificationService.xcscheme</key>
+		<dict>
+			<key>isShown</key>
+			<false/>
+			<key>orderHint</key>
+			<integer>32</integer>
 		</dict>
 		<key>RxCocoa.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>33</integer>
 		</dict>
 		<key>RxRelay.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>34</integer>
 		</dict>
 		<key>RxSwift.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>35</integer>
 		</dict>
 		<key>SnapKit.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>36</integer>
 		</dict>
 		<key>SwiftEntryKit.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>37</integer>
 		</dict>
 		<key>ZFPlayer.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>38</integer>
 		</dict>
 		<key>ZLPhotoBrowser.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>39</integer>
 		</dict>
 	</dict>
 	<key>SuppressBuildableAutocreation</key>

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

@@ -1,3 +1,4 @@
+APPLICATION_EXTENSION_API_ONLY = YES
 CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO
 CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/JCore
 FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/JCore"

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

@@ -1,3 +1,4 @@
+APPLICATION_EXTENSION_API_ONLY = YES
 CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO
 CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/JCore
 FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/JCore"

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

@@ -1,3 +1,4 @@
+APPLICATION_EXTENSION_API_ONLY = YES
 CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO
 CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/JPush
 FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/JCore" "${PODS_ROOT}/JPush"

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

@@ -1,3 +1,4 @@
+APPLICATION_EXTENSION_API_ONLY = YES
 CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO
 CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/JPush
 FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/JCore" "${PODS_ROOT}/JPush"

Pods/Target Support Files/JPushExtension/JPushExtension-xcframeworks-input-files.xcfilelist

@@ -0,0 +1,2 @@
+${PODS_ROOT}/Target Support Files/JPushExtension/JPushExtension-xcframeworks.sh
+${PODS_ROOT}/JPushExtension/jpush-extension-ios-2.0.1.xcframework

Pods/Target Support Files/JPushExtension/JPushExtension-xcframeworks-output-files.xcfilelist

@@ -0,0 +1 @@
+${PODS_XCFRAMEWORKS_BUILD_DIR}/JPushExtension/jpush-extension-ios-2.0.1.framework

Pods/Target Support Files/JPushExtension/JPushExtension-xcframeworks.sh

@@ -0,0 +1,121 @@
+#!/bin/sh
+set -e
+set -u
+set -o pipefail
+
+function on_error {
+  echo "$(realpath -mq "${0}"):$1: error: Unexpected failure"
+}
+trap 'on_error $LINENO' ERR
+
+
+# This protects against multiple targets copying the same framework dependency at the same time. The solution
+# was originally proposed here: https://lists.samba.org/archive/rsync/2008-February/020158.html
+RSYNC_PROTECT_TMP_FILES=(--filter "P .*.??????")
+
+
+variant_for_slice()
+{
+  case "$1" in
+  "jpush-extension-ios-2.0.1.xcframework/ios-arm64")
+    echo ""
+    ;;
+  "jpush-extension-ios-2.0.1.xcframework/ios-arm64_x86_64-simulator")
+    echo "simulator"
+    ;;
+  esac
+}
+
+archs_for_slice()
+{
+  case "$1" in
+  "jpush-extension-ios-2.0.1.xcframework/ios-arm64")
+    echo "arm64"
+    ;;
+  "jpush-extension-ios-2.0.1.xcframework/ios-arm64_x86_64-simulator")
+    echo "arm64 x86_64"
+    ;;
+  esac
+}
+
+copy_dir()
+{
+  local source="$1"
+  local destination="$2"
+
+  # Use filter instead of exclude so missing patterns don't throw errors.
+  echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --links --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" \"${source}*\" \"${destination}\""
+  rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --links --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" "${source}"/* "${destination}"
+}
+
+SELECT_SLICE_RETVAL=""
+
+select_slice() {
+  local xcframework_name="$1"
+  xcframework_name="${xcframework_name##*/}"
+  local paths=("${@:2}")
+  # Locate the correct slice of the .xcframework for the current architectures
+  local target_path=""
+
+  # Split archs on space so we can find a slice that has all the needed archs
+  local target_archs=$(echo $ARCHS | tr " " "\n")
+
+  local target_variant=""
+  if [[ "$PLATFORM_NAME" == *"simulator" ]]; then
+    target_variant="simulator"
+  fi
+  if [[ ! -z ${EFFECTIVE_PLATFORM_NAME+x} && "$EFFECTIVE_PLATFORM_NAME" == *"maccatalyst" ]]; then
+    target_variant="maccatalyst"
+  fi
+  for i in ${!paths[@]}; do
+    local matched_all_archs="1"
+    local slice_archs="$(archs_for_slice "${xcframework_name}/${paths[$i]}")"
+    local slice_variant="$(variant_for_slice "${xcframework_name}/${paths[$i]}")"
+    for target_arch in $target_archs; do
+      if ! [[ "${slice_variant}" == "$target_variant" ]]; then
+        matched_all_archs="0"
+        break
+      fi
+
+      if ! echo "${slice_archs}" | tr " " "\n" | grep -F -q -x "$target_arch"; then
+        matched_all_archs="0"
+        break
+      fi
+    done
+
+    if [[ "$matched_all_archs" == "1" ]]; then
+      # Found a matching slice
+      echo "Selected xcframework slice ${paths[$i]}"
+      SELECT_SLICE_RETVAL=${paths[$i]}
+      break
+    fi
+  done
+}
+
+install_xcframework() {
+  local basepath="$1"
+  local name="$2"
+  local package_type="$3"
+  local paths=("${@:4}")
+
+  # Locate the correct slice of the .xcframework for the current architectures
+  select_slice "${basepath}" "${paths[@]}"
+  local target_path="$SELECT_SLICE_RETVAL"
+  if [[ -z "$target_path" ]]; then
+    echo "warning: [CP] $(basename ${basepath}): Unable to find matching slice in '${paths[@]}' for the current build architectures ($ARCHS) and platform (${EFFECTIVE_PLATFORM_NAME-${PLATFORM_NAME}})."
+    return
+  fi
+  local source="$basepath/$target_path"
+
+  local destination="${PODS_XCFRAMEWORKS_BUILD_DIR}/${name}"
+
+  if [ ! -d "$destination" ]; then
+    mkdir -p "$destination"
+  fi
+
+  copy_dir "$source/" "$destination"
+  echo "Copied $source to $destination"
+}
+
+install_xcframework "${PODS_ROOT}/JPushExtension/jpush-extension-ios-2.0.1.xcframework" "JPushExtension" "library" "ios-arm64" "ios-arm64_x86_64-simulator"
+

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

@@ -0,0 +1,14 @@
+APPLICATION_EXTENSION_API_ONLY = YES
+CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO
+CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/JPushExtension
+FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/JPushExtension"
+GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
+HEADER_SEARCH_PATHS = $(inherited) "${PODS_XCFRAMEWORKS_BUILD_DIR}/JPushExtension/Headers"
+PODS_BUILD_DIR = ${BUILD_DIR}
+PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
+PODS_ROOT = ${SRCROOT}
+PODS_TARGET_SRCROOT = ${PODS_ROOT}/JPushExtension
+PODS_XCFRAMEWORKS_BUILD_DIR = $(PODS_CONFIGURATION_BUILD_DIR)/XCFrameworkIntermediates
+PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}
+SKIP_INSTALL = YES
+USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES = YES

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

@@ -0,0 +1,14 @@
+APPLICATION_EXTENSION_API_ONLY = YES
+CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO
+CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/JPushExtension
+FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/JPushExtension"
+GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
+HEADER_SEARCH_PATHS = $(inherited) "${PODS_XCFRAMEWORKS_BUILD_DIR}/JPushExtension/Headers"
+PODS_BUILD_DIR = ${BUILD_DIR}
+PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
+PODS_ROOT = ${SRCROOT}
+PODS_TARGET_SRCROOT = ${PODS_ROOT}/JPushExtension
+PODS_XCFRAMEWORKS_BUILD_DIR = $(PODS_CONFIGURATION_BUILD_DIR)/XCFrameworkIntermediates
+PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}
+SKIP_INSTALL = YES
+USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES = YES

Pods/Target Support Files/Pods-OrderSchedulingNotificationService/Pods-OrderSchedulingNotificationService-acknowledgements.markdown

@@ -0,0 +1,15 @@
+# Acknowledgements
+This application makes use of the following third party libraries:
+
+## JCore
+
+Copyright jpush.cn
+
+## JPush
+
+Copyright jiguang.cn
+
+## JPushExtension
+
+Copyright jiguang.cn
+Generated by CocoaPods - https://cocoapods.org

Pods/Target Support Files/Pods-OrderSchedulingNotificationService/Pods-OrderSchedulingNotificationService-acknowledgements.plist

@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>PreferenceSpecifiers</key>
+	<array>
+		<dict>
+			<key>FooterText</key>
+			<string>This application makes use of the following third party libraries:</string>
+			<key>Title</key>
+			<string>Acknowledgements</string>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+		</dict>
+		<dict>
+			<key>FooterText</key>
+			<string>Copyright jpush.cn</string>
+			<key>License</key>
+			<string>Copyright</string>
+			<key>Title</key>
+			<string>JCore</string>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+		</dict>
+		<dict>
+			<key>FooterText</key>
+			<string>Copyright jiguang.cn</string>
+			<key>License</key>
+			<string>Copyright</string>
+			<key>Title</key>
+			<string>JPush</string>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+		</dict>
+		<dict>
+			<key>FooterText</key>
+			<string>Copyright jiguang.cn</string>
+			<key>License</key>
+			<string>Copyright</string>
+			<key>Title</key>
+			<string>JPushExtension</string>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+		</dict>
+		<dict>
+			<key>FooterText</key>
+			<string>Generated by CocoaPods - https://cocoapods.org</string>
+			<key>Title</key>
+			<string></string>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+		</dict>
+	</array>
+	<key>StringsTable</key>
+	<string>Acknowledgements</string>
+	<key>Title</key>
+	<string>Acknowledgements</string>
+</dict>
+</plist>

Pods/Target Support Files/Pods-OrderSchedulingNotificationService/Pods-OrderSchedulingNotificationService-dummy.m

@@ -0,0 +1,5 @@
+#import <Foundation/Foundation.h>
+@interface PodsDummy_Pods_OrderSchedulingNotificationService : NSObject
+@end
+@implementation PodsDummy_Pods_OrderSchedulingNotificationService
+@end

Pods/Target Support Files/Pods-OrderSchedulingNotificationService/Pods-OrderSchedulingNotificationService.debug.xcconfig

@@ -0,0 +1,12 @@
+CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO
+FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/JCore" "${PODS_ROOT}/JPush" "${PODS_ROOT}/JPushExtension"
+GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
+HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/CocoaDebug" "${PODS_ROOT}/Headers/Public/DDBasicControlsKit_Private" "${PODS_ROOT}/Headers/Public/DDCategoryKit_Private" "${PODS_ROOT}/Headers/Public/DDLogKit_Private" "${PODS_ROOT}/Headers/Public/DDMAMapKit_Private" "${PODS_ROOT}/Headers/Public/DDProgressHUDKit_Private" "${PODS_ROOT}/Headers/Public/DDTimerKit_Private" "${PODS_ROOT}/Headers/Public/DDWebImageKit_Private" "${PODS_ROOT}/Headers/Public/JXCategoryView" "${PODS_ROOT}/Headers/Public/MJRefresh" "${PODS_ROOT}/Headers/Public/RxCocoa" "${PODS_ROOT}/Headers/Public/ZFPlayer" "${PODS_ROOT}/Headers/Public/ZLPhotoBrowser" "${PODS_XCFRAMEWORKS_BUILD_DIR}/JCore/Headers" "${PODS_XCFRAMEWORKS_BUILD_DIR}/JPush/Headers" "${PODS_XCFRAMEWORKS_BUILD_DIR}/JPushExtension/Headers"
+LIBRARY_SEARCH_PATHS = $(inherited) "${PODS_XCFRAMEWORKS_BUILD_DIR}/JCore" "${PODS_XCFRAMEWORKS_BUILD_DIR}/JPush" "${PODS_XCFRAMEWORKS_BUILD_DIR}/JPushExtension"
+OTHER_LDFLAGS = $(inherited) -ObjC -l"JCore" -l"JPush" -l"JPushExtension" -l"resolv" -l"z" -framework "CFNetwork" -framework "CoreFoundation" -framework "CoreGraphics" -framework "CoreTelephony" -framework "Foundation" -framework "Security" -framework "SystemConfiguration" -framework "UIKit" -framework "WebKit" -weak_framework "AppTrackingTransparency" -weak_framework "UserNotifications"
+PODS_BUILD_DIR = ${BUILD_DIR}
+PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
+PODS_PODFILE_DIR_PATH = ${SRCROOT}/.
+PODS_ROOT = ${SRCROOT}/Pods
+PODS_XCFRAMEWORKS_BUILD_DIR = $(PODS_CONFIGURATION_BUILD_DIR)/XCFrameworkIntermediates
+USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES = YES

Pods/Target Support Files/Pods-OrderSchedulingNotificationService/Pods-OrderSchedulingNotificationService.release.xcconfig

@@ -0,0 +1,12 @@
+CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO
+FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/JCore" "${PODS_ROOT}/JPush" "${PODS_ROOT}/JPushExtension"
+GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
+HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/CocoaDebug" "${PODS_ROOT}/Headers/Public/DDBasicControlsKit_Private" "${PODS_ROOT}/Headers/Public/DDCategoryKit_Private" "${PODS_ROOT}/Headers/Public/DDLogKit_Private" "${PODS_ROOT}/Headers/Public/DDMAMapKit_Private" "${PODS_ROOT}/Headers/Public/DDProgressHUDKit_Private" "${PODS_ROOT}/Headers/Public/DDTimerKit_Private" "${PODS_ROOT}/Headers/Public/DDWebImageKit_Private" "${PODS_ROOT}/Headers/Public/JXCategoryView" "${PODS_ROOT}/Headers/Public/MJRefresh" "${PODS_ROOT}/Headers/Public/RxCocoa" "${PODS_ROOT}/Headers/Public/ZFPlayer" "${PODS_ROOT}/Headers/Public/ZLPhotoBrowser" "${PODS_XCFRAMEWORKS_BUILD_DIR}/JCore/Headers" "${PODS_XCFRAMEWORKS_BUILD_DIR}/JPush/Headers" "${PODS_XCFRAMEWORKS_BUILD_DIR}/JPushExtension/Headers"
+LIBRARY_SEARCH_PATHS = $(inherited) "${PODS_XCFRAMEWORKS_BUILD_DIR}/JCore" "${PODS_XCFRAMEWORKS_BUILD_DIR}/JPush" "${PODS_XCFRAMEWORKS_BUILD_DIR}/JPushExtension"
+OTHER_LDFLAGS = $(inherited) -ObjC -l"JCore" -l"JPush" -l"JPushExtension" -l"resolv" -l"z" -framework "CFNetwork" -framework "CoreFoundation" -framework "CoreGraphics" -framework "CoreTelephony" -framework "Foundation" -framework "Security" -framework "SystemConfiguration" -framework "UIKit" -framework "WebKit" -weak_framework "AppTrackingTransparency" -weak_framework "UserNotifications"
+PODS_BUILD_DIR = ${BUILD_DIR}
+PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
+PODS_PODFILE_DIR_PATH = ${SRCROOT}/.
+PODS_ROOT = ${SRCROOT}/Pods
+PODS_XCFRAMEWORKS_BUILD_DIR = $(PODS_CONFIGURATION_BUILD_DIR)/XCFrameworkIntermediates
+USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES = YES