update

2023-08-28 17:11:31 +08:00
parent d197a282c0
commit c73a6ff1d4
15 changed files with 317 additions and 57 deletions
--- a/OrderScheduling.xcodeproj/project.pbxproj
+++ b/OrderScheduling.xcodeproj/project.pbxproj
@@ -50,7 +50,6 @@
 		79CECC282A8CADEA00B95D8B /* VehicleMonitoringVideoDetailController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79CECC272A8CADEA00B95D8B /* VehicleMonitoringVideoDetailController.swift */; };
 		79DD0DA82A9480D000768FE7 /* NotificationAuthView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79DD0DA72A9480D000768FE7 /* NotificationAuthView.swift */; };
 		79DD0DAA2A9481BC00768FE7 /* NotificationAuthTool.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79DD0DA92A9481BC00768FE7 /* NotificationAuthTool.swift */; };
-		79DD0DAD2A94A0EE00768FE7 /* LaunchImage.png in Resources */ = {isa = PBXBuildFile; fileRef = 79DD0DAC2A94A0EE00768FE7 /* LaunchImage.png */; };
 		79DD0DB12A94B3DB00768FE7 /* EmptyView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79DD0DB02A94B3DB00768FE7 /* EmptyView.swift */; };
 		79DD0DB42A95F00B00768FE7 /* Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79DD0DB32A95F00B00768FE7 /* Extension.swift */; };
 		79DD0DBB2A971EB300768FE7 /* ZDViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79DD0DBA2A971EB300768FE7 /* ZDViewController.swift */; };
@@ -154,7 +153,6 @@
 		79DD0DA62A946B2500768FE7 /* OrderSchedulingDebug.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = OrderSchedulingDebug.entitlements; sourceTree = "<group>"; };
 		79DD0DA72A9480D000768FE7 /* NotificationAuthView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationAuthView.swift; sourceTree = "<group>"; };
 		79DD0DA92A9481BC00768FE7 /* NotificationAuthTool.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationAuthTool.swift; sourceTree = "<group>"; };
-		79DD0DAC2A94A0EE00768FE7 /* LaunchImage.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = LaunchImage.png; sourceTree = "<group>"; };
 		79DD0DB02A94B3DB00768FE7 /* EmptyView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmptyView.swift; sourceTree = "<group>"; };
 		79DD0DB32A95F00B00768FE7 /* Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Extension.swift; sourceTree = "<group>"; };
 		79DD0DBA2A971EB300768FE7 /* ZDViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ZDViewController.swift; sourceTree = "<group>"; };
@@ -603,7 +601,6 @@
 		79DD0DAB2A94A0EE00768FE7 /* Source */ = {
 			isa = PBXGroup;
 			children = (
-				79DD0DAC2A94A0EE00768FE7 /* LaunchImage.png */,
 				79FB760E2A9C6CAF00DB00A4 /* newJuheOrderAudio.wav */,
 				79FB76122A9C6CC100DB00A4 /* newOrderAudio.wav */,
 			);
@@ -809,7 +806,6 @@
 				79EAD8172A7B86610036E093 /* LaunchScreen.storyboard in Resources */,
 				79EAD8142A7B86610036E093 /* Assets.xcassets in Resources */,
 				79FB76132A9C6CC100DB00A4 /* newOrderAudio.wav in Resources */,
-				79DD0DAD2A94A0EE00768FE7 /* LaunchImage.png in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
--- a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate
+++ b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate
--- a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
+++ b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -555,8 +555,8 @@
            filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "776"
-            endingLineNumber = "776"
+            startingLineNumber = "777"
+            endingLineNumber = "777"
            landmarkName = "collectionView(_:cellForItemAt:)"
            landmarkType = "7">
         </BreakpointContent>
@@ -571,8 +571,8 @@
            filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "777"
-            endingLineNumber = "777"
+            startingLineNumber = "778"
+            endingLineNumber = "778"
            landmarkName = "collectionView(_:cellForItemAt:)"
            landmarkType = "7">
         </BreakpointContent>
@@ -1322,8 +1322,8 @@
            filePath = "OrderScheduling/Common/WebView/WebViewController.swift"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "101"
-            endingLineNumber = "101"
+            startingLineNumber = "107"
+            endingLineNumber = "107"
            landmarkName = "userContentController(_:didReceive:)"
            landmarkType = "7">
         </BreakpointContent>
@@ -1338,8 +1338,8 @@
            filePath = "OrderScheduling/Common/WebView/WebViewController.swift"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "105"
-            endingLineNumber = "105"
+            startingLineNumber = "111"
+            endingLineNumber = "111"
            landmarkName = "userContentController(_:didReceive:)"
            landmarkType = "7">
         </BreakpointContent>
@@ -1881,8 +1881,8 @@
            filePath = "OrderScheduling/Common/WebView/WebViewController.swift"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "110"
-            endingLineNumber = "110"
+            startingLineNumber = "116"
+            endingLineNumber = "116"
            landmarkName = "webView(_:didFinish:)"
            landmarkType = "7">
         </BreakpointContent>
@@ -1897,8 +1897,8 @@
            filePath = "OrderScheduling/Common/WebView/WebViewController.swift"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "117"
-            endingLineNumber = "117"
+            startingLineNumber = "123"
+            endingLineNumber = "123"
            landmarkName = "webView(_:didFail:withError:)"
            landmarkType = "7">
         </BreakpointContent>
@@ -1913,8 +1913,8 @@
            filePath = "OrderScheduling/Common/WebView/WebViewController.swift"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "125"
-            endingLineNumber = "125"
+            startingLineNumber = "131"
+            endingLineNumber = "131"
            landmarkName = "webView(_:didFailProvisionalNavigation:withError:)"
            landmarkType = "7">
         </BreakpointContent>
@@ -1929,8 +1929,8 @@
            filePath = "OrderScheduling/Common/WebView/WebViewController.swift"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "124"
-            endingLineNumber = "124"
+            startingLineNumber = "130"
+            endingLineNumber = "130"
            landmarkName = "webView(_:didFailProvisionalNavigation:withError:)"
            landmarkType = "7">
         </BreakpointContent>
@@ -2413,7 +2413,7 @@
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
         <BreakpointContent
            uuid = "84D8A0D2-4575-4070-BCC8-EA2E1343CEBB"
-            shouldBeEnabled = "Yes"
+            shouldBeEnabled = "No"
            ignoreCount = "0"
            continueAfterRunningActions = "No"
            filePath = "OrderSchedulingNotificationService/NotificationService.swift"
@@ -2681,5 +2681,229 @@
            landmarkType = "7">
         </BreakpointContent>
      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "857A91EA-67F7-4AA6-A563-89FA65E243DA"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "OrderScheduling/Login/ViewController/LoginController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "123"
+            endingLineNumber = "123"
+            landmarkName = "addActions()"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "29E57C23-7A9A-4839-BD0B-382BBE525870"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "OrderScheduling/Global/User/UserData.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "17"
+            endingLineNumber = "17"
+            landmarkName = "isLogin"
+            landmarkType = "24">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "37F3DD72-67FF-4D66-8812-A7410A24E7AD"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "OrderScheduling/Global/User/UserData.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "20"
+            endingLineNumber = "20"
+            landmarkName = "isLogin"
+            landmarkType = "24">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "CB30A1AE-EAC0-4AB2-B77E-6D6EAEAF19C4"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "OrderScheduling/Global/User/UserData.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "19"
+            endingLineNumber = "19"
+            landmarkName = "isLogin"
+            landmarkType = "24">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "46C198E2-695F-4366-A4D3-40DC74FF1585"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "OrderScheduling/Main/Initial.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "83"
+            endingLineNumber = "83"
+            landmarkName = "changeRootViewController(window:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "84B39C6E-9CB3-4E7D-80B2-899A13BF6092"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "OrderScheduling/Login/ViewController/LoginController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "122"
+            endingLineNumber = "122"
+            landmarkName = "addActions()"
+            landmarkType = "7">
+            <Locations>
+               <Location
+                  uuid = "84B39C6E-9CB3-4E7D-80B2-899A13BF6092 - b63923b868cc3d5f"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "OrderScheduling.LoginController.addActions() -&gt; ()"
+                  moduleName = "OrderScheduling"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/zd/Desktop/%E4%B8%AD%E9%81%93%E6%95%91%E6%8F%B4/OrderScheduling/OrderScheduling/Login/ViewController/LoginController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "122"
+                  endingLineNumber = "122"
+                  offsetFromSymbolStart = "4476">
+               </Location>
+               <Location
+                  uuid = "84B39C6E-9CB3-4E7D-80B2-899A13BF6092 - 7608552120db31a2"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "closure #10 (Swift.Optional&lt;Swift.String&gt;, Swift.Optional&lt;Swift.String&gt;, Swift.Optional&lt;Swift.String&gt;, Swift.Bool) -&gt; () in OrderScheduling.LoginController.addActions() -&gt; ()"
+                  moduleName = "OrderScheduling"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/zd/Desktop/%E4%B8%AD%E9%81%93%E6%95%91%E6%8F%B4/OrderScheduling/OrderScheduling/Login/ViewController/LoginController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "122"
+                  endingLineNumber = "122"
+                  offsetFromSymbolStart = "128">
+               </Location>
+            </Locations>
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "E92369D9-36D2-40A9-B7ED-F41FB3F5B5AA"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "OrderScheduling/Login/ViewController/LoginController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "125"
+            endingLineNumber = "125"
+            landmarkName = "addActions()"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "EF784E32-B0D2-4763-B132-DE4F4FD1F9C1"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "OrderScheduling/Login/ViewController/LoginController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "127"
+            endingLineNumber = "127"
+            landmarkName = "addActions()"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "09C5A87E-B137-4FF3-97E7-7B4DBFFA977C"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "OrderScheduling/Main/SceneDelegate.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "42"
+            endingLineNumber = "42"
+            landmarkName = "sceneDidBecomeActive(_:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "15F43A4A-700B-44BF-8D21-67632F1F57B8"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "OrderScheduling/Main/SceneDelegate.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "41"
+            endingLineNumber = "41"
+            landmarkName = "sceneDidBecomeActive(_:)"
+            landmarkType = "7">
+            <Locations>
+               <Location
+                  uuid = "15F43A4A-700B-44BF-8D21-67632F1F57B8 - a7950a51e299efe1"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "OrderScheduling.SceneDelegate.sceneDidBecomeActive(__C.UIScene) -&gt; ()"
+                  moduleName = "OrderScheduling"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/zd/Desktop/%E4%B8%AD%E9%81%93%E6%95%91%E6%8F%B4/OrderScheduling/OrderScheduling/Main/SceneDelegate.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "41"
+                  endingLineNumber = "41"
+                  offsetFromSymbolStart = "196">
+               </Location>
+               <Location
+                  uuid = "15F43A4A-700B-44BF-8D21-67632F1F57B8 - a7950a51e299efe1"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "OrderScheduling.SceneDelegate.sceneDidBecomeActive(__C.UIScene) -&gt; ()"
+                  moduleName = "OrderScheduling"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/zd/Desktop/%E4%B8%AD%E9%81%93%E6%95%91%E6%8F%B4/OrderScheduling/OrderScheduling/Main/SceneDelegate.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "41"
+                  endingLineNumber = "41"
+                  offsetFromSymbolStart = "652">
+               </Location>
+            </Locations>
+         </BreakpointContent>
+      </BreakpointProxy>
   </Breakpoints>
 </Bucket>
--- a/OrderScheduling/Base.lproj/LaunchScreen.storyboard
+++ b/OrderScheduling/Base.lproj/LaunchScreen.storyboard
@@ -4,6 +4,7 @@
    <dependencies>
        <deployment identifier="iOS"/>
        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21679"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
        <capability name="System colors in document resources" minToolsVersion="11.0"/>
        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
    </dependencies>
@@ -16,10 +17,11 @@
                        <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                        <subviews>
-                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="LaunchImage.png" translatesAutoresizingMaskIntoConstraints="NO" id="afd-7Z-uCQ">
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="afd-7Z-uCQ">
                                <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
                            </imageView>
                        </subviews>
+                        <viewLayoutGuide key="safeArea" id="hoc-Id-XdP"/>
                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                        <constraints>
                            <constraint firstItem="afd-7Z-uCQ" firstAttribute="top" secondItem="Ze5-6b-2t3" secondAttribute="top" id="9IV-E2-m37"/>
@@ -36,7 +38,6 @@
        </scene>
    </scenes>
    <resources>
-        <image name="LaunchImage.png" width="1290" height="2796"/>
        <systemColor name="systemBackgroundColor">
            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
        </systemColor>
--- a/OrderScheduling/Common/WebView/WebViewController.swift
+++ b/OrderScheduling/Common/WebView/WebViewController.swift
@@ -40,7 +40,7 @@ class WebViewController : DDViewController {
    open override func viewDidLoad() {
        super.viewDidLoad()

-        webView.scrollView.contentInsetAdjustmentBehavior = .never
+        webView.scrollView.contentInset = UIEdgeInsets(top: -view.safeAreaInsets.top, left: 0, bottom: 0, right: 0)
        webView.backgroundColor = .white
        webView.navigationDelegate = self
        webView.uiDelegate = self
@@ -54,6 +54,18 @@ class WebViewController : DDViewController {
            dd_navigationBarBackgroundColor = .clear

            view.addSubview(statusBarBackgroundView)
+        }else{
+            title = vcTitle
+            dd_navigationBarBackgroundColor = .hex("354683")
+            dd_navigationBarTitleTextAttributes = [.foregroundColor : UIColor.white(alpha: 0.7),.font:UIFont.mediumFont(17)]
+        }
+        
+        view.dd_showHUD()
+    }
+    
+    override func viewWillLayoutSubviews() {
+        super.viewWillLayoutSubviews()
+        if showNavBar == false {
            statusBarBackgroundView.snp.makeConstraints { make in
                make.top.left.right.equalToSuperview()
                make.height.equalTo(CGRectGetHeight(UIApplication.shared.dd_statusBarFrame))
@@ -61,22 +73,16 @@ class WebViewController : DDViewController {
            
            webView.snp.makeConstraints { make in
                make.left.right.equalToSuperview()
-                make.top.equalTo(CGRectGetHeight(UIApplication.shared.dd_statusBarFrame))
+                make.top.equalTo(CGRectGetHeight(UIApplication.shared.dd_statusBarFrame) - view.safeAreaInsets.top)
                make.bottom.equalTo(-view.safeAreaInsets.bottom)
            }
        }else{
-            title = vcTitle
-            dd_navigationBarBackgroundColor = .hex("354683")
-            dd_navigationBarTitleTextAttributes = [.foregroundColor : UIColor.white(alpha: 0.7),.font:UIFont.mediumFont(17)]
-        
            webView.snp.makeConstraints { make in
                make.left.right.equalToSuperview()
                make.top.equalTo(CGRectGetHeight(navigationController?.navigationBar.frame ?? .zero) + CGRectGetHeight(UIApplication.shared.dd_statusBarFrame))
                make.bottom.equalTo(-view.safeAreaInsets.bottom)
            }
        }
-        
-        view.dd_showHUD()
    }
    
    override func viewWillAppear(_ animated: Bool) {
--- a/OrderScheduling/History/ViewController/HistoryController.swift
+++ b/OrderScheduling/History/ViewController/HistoryController.swift
@@ -148,6 +148,7 @@ extension HistoryItemController : UITableViewDelegate, UITableViewDataSource {
            cell = HistoryItemCell(style: .default, reuseIdentifier: "cell")
            cell?.line.backgroundColor = .hex("E9E9EA").alpha(0.6)
            cell?.orderDateTitleLabel.text = "工单时间:"
+            cell?.orderStatusTitleLabel.text = "状态:"
            cell?.serviceTitleLabel.text = "故障地:"
            cell?.reportButton.setTitle("报备", for: .normal)
            cell?.additionalButton.setTitle("补结算单", for: .normal)
@@ -261,7 +262,7 @@ open class HistoryController : ZDViewController {
        super.viewDidLoad()
        dd_navigationBarBackgroundColor = .hex("354683")
        dd_navigationBarTitleTextAttributes = [.foregroundColor : UIColor.white(alpha: 0.7),.font:UIFont.mediumFont(auto(15))]
-        dd_navigationItemTitle = "救援工单"
+        dd_navigationItemTitle = "历史工单"
        navigationItem.leftBarButtonItems = nil
        addSubviews()
        addActions()
@@ -367,6 +368,7 @@ class HistoryItemCell : DDTableViewCell {
    public let radiusView : DDView
    public let typeLabel : DDLabel
    public let orderNumLabel : DDLabel
+    public let orderStatusTitleLabel : DDLabel
    public let orderStatusLabel : DDLabel
    public let line : DDView
    public let orderDateTitleLabel : DDLabel
@@ -387,6 +389,7 @@ class HistoryItemCell : DDTableViewCell {
        radiusView = DDView.init()
        typeLabel = DDLabel.dd_init(withText: "", font: .mediumFont(auto(13)), textColor: .hex("000000").alpha(0.85))
        orderNumLabel = DDLabel.dd_init(withText: "", font: .mediumFont(auto(11)), textColor: .hex("000000").alpha(0.55))
+        orderStatusTitleLabel = DDLabel.dd_init(withText: "", font: .mediumFont(auto(12)), textColor: .hex("000000").alpha(0.5))
        orderStatusLabel = DDLabel.dd_init(withText: "", font: .mediumFont(auto(12)), textColor: .hex("E69B0B"))
        line = DDView.init()
        orderDateTitleLabel = DDLabel.dd_init(withText: "", font: .mediumFont(auto(12)), textColor: .hex("000000").alpha(0.5))
@@ -418,8 +421,8 @@ class HistoryItemCell : DDTableViewCell {
        contentView.addSubview(radiusView)
        radiusView.addSubview(typeLabel)
        radiusView.addSubview(orderNumLabel)
+        radiusView.addSubview(orderStatusTitleLabel)
        orderStatusLabel.numberOfLines = 0
-        orderStatusLabel.textAlignment = .right
        radiusView.addSubview(orderStatusLabel)
        radiusView.addSubview(line)
        radiusView.addSubview(orderDateTitleLabel)
@@ -460,13 +463,6 @@ class HistoryItemCell : DDTableViewCell {
            make.left.equalTo(typeLabel.snp.right).offset(auto(10))
        }
        
-        orderStatusLabel.setContentCompressionResistancePriority(.defaultLow, for: .horizontal)
-        orderStatusLabel.snp.makeConstraints { make in
-            make.right.equalTo(-auto(15))
-            make.centerY.equalTo(orderNumLabel)
-            make.left.equalTo(orderNumLabel.snp.right).offset(0)
-        }
-        
        line.snp.makeConstraints { make in
            make.top.equalTo(typeLabel.snp.bottom).offset(auto(7))
            make.left.right.equalTo(0)
@@ -484,8 +480,20 @@ class HistoryItemCell : DDTableViewCell {
            make.top.equalTo(orderDateTitleLabel)
        }

-        serviceTitleLabel.snp.makeConstraints { make in
+        orderStatusTitleLabel.snp.makeConstraints { make in
+            make.left.equalTo(typeLabel)
            make.top.equalTo(orderDateLabel.snp.bottom).offset(auto(8))
+            make.width.equalTo(orderDateTitleLabel)
+        }
+        
+        orderStatusLabel.snp.makeConstraints { make in
+            make.right.equalTo(-auto(20))
+            make.top.equalTo(orderStatusTitleLabel)
+            make.left.equalTo(orderStatusTitleLabel.snp.right)
+        }
+        
+        serviceTitleLabel.snp.makeConstraints { make in
+            make.top.equalTo(orderStatusLabel.snp.bottom).offset(auto(8))
            make.left.equalTo(typeLabel)
            make.width.equalTo(orderDateTitleLabel)
        }
--- a/OrderScheduling/Login/ViewController/LoginController.swift
+++ b/OrderScheduling/Login/ViewController/LoginController.swift
@@ -280,6 +280,7 @@ class LoginView : DDView {
        agreeButton.contentMode = .scaleAspectFill
        inputContentView.addSubview(agreeButton)
        inputContentView.addSubview(agreeTextView)
+        loginButton.isEnabled = false
        addSubview(loginButton)
        
        backgroundImageView.snp.makeConstraints { make in
--- a/OrderScheduling/Main/AppDelegate.swift
+++ b/OrderScheduling/Main/AppDelegate.swift
@@ -114,7 +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
+//            self.userInfo = userInfo
            JPUSHService.resetBadge()
            UIApplication.shared.applicationIconBadgeNumber = 0
            JPUSHService.handleRemoteNotification(userInfo)
--- a/OrderScheduling/Main/SceneDelegate.swift
+++ b/OrderScheduling/Main/SceneDelegate.swift
@@ -37,10 +37,10 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
        JPUSHService.resetBadge()
        UIApplication.shared.applicationIconBadgeNumber = 0
        
-        let delegate = UIApplication.shared.delegate as? AppDelegate
-        if delegate?.userInfo != nil {
-            ACCEPTORDERTOOL.open(userInfo: delegate?.userInfo)
-            delegate?.userInfo = nil
+        let userDefault = UserDefaults.init(suiteName: "group.com.sino.supplier")
+        if let userInfo = userDefault?.object(forKey: "bestAttemptContentUserInfo") as? [AnyHashable:Any] {
+            ACCEPTORDERTOOL.open(userInfo: userInfo)
+            userDefault?.setValue(nil, forKey: "bestAttemptContentUserInfo")
        }
    }

--- a/OrderScheduling/OrderSchedulingDebug.entitlements
+++ b/OrderScheduling/OrderSchedulingDebug.entitlements
@@ -4,5 +4,9 @@
 <dict>
 	<key>aps-environment</key>
 	<string>development</string>
+	<key>com.apple.security.application-groups</key>
+	<array>
+		<string>group.com.sino.supplier</string>
+	</array>
 </dict>
 </plist>
--- a/OrderScheduling/OrderSchedulingRelease.entitlements
+++ b/OrderScheduling/OrderSchedulingRelease.entitlements
@@ -4,5 +4,9 @@
 <dict>
 	<key>aps-environment</key>
 	<string>development</string>
+	<key>com.apple.security.application-groups</key>
+	<array>
+		<string>group.com.sino.supplier</string>
+	</array>
 </dict>
 </plist>
--- a/OrderScheduling/Rescue/ViewController/RescueController.swift
+++ b/OrderScheduling/Rescue/ViewController/RescueController.swift
@@ -684,6 +684,7 @@ extension RescueIsIngController : UITableViewDelegate,UITableViewDataSource {
        if cell == nil {
            cell = RescueIsIngCell(style: .default, reuseIdentifier: "cell")
            cell?.line.backgroundColor = .hex("E9E9EA").alpha(0.6)
+            cell?.orderStatusTitleLabel.text = "状态:"
            cell?.serviceTitleLabel.text = "故障地:"
            cell?.destinationTitleLabel.text = "目的地:"
            cell?.reportButton.setTitle("报备", for: .normal)
@@ -1500,6 +1501,7 @@ class RescueIsIngCell : DDTableViewCell {
    public let radiusView : DDView
    public let typeLabel : DDLabel
    public let orderNumLabel : DDLabel
+    public let orderStatusTitleLabel : DDLabel
    public let orderStatusLabel : DDLabel
    public let line : DDView
    public let orderDateLabel : DDLabel
@@ -1516,6 +1518,7 @@ class RescueIsIngCell : DDTableViewCell {
        radiusView = DDView.init()
        typeLabel = DDLabel.dd_init(withText: "", font: .mediumFont(auto(13)), textColor: .hex("000000").alpha(0.85))
        orderNumLabel = DDLabel.dd_init(withText: "", font: .mediumFont(auto(11)), textColor: .hex("000000").alpha(0.55))
+        orderStatusTitleLabel = DDLabel.dd_init(withText: "", font: .mediumFont(auto(12)), textColor: .hex("000000").alpha(0.5))
        orderStatusLabel = DDLabel.dd_init(withText: "", font: .mediumFont(auto(12)), textColor: .hex("E69B0B"))
        line = DDView.init()
        orderDateLabel = DDLabel.dd_init(withText: "", font: .mediumFont(auto(12)), textColor: .hex("252525"))
@@ -1543,8 +1546,8 @@ class RescueIsIngCell : DDTableViewCell {
        contentView.addSubview(radiusView)
        radiusView.addSubview(typeLabel)
        radiusView.addSubview(orderNumLabel)
+        radiusView.addSubview(orderStatusTitleLabel)
        orderStatusLabel.numberOfLines = 0
-        orderStatusLabel.textAlignment = .right
        radiusView.addSubview(orderStatusLabel)
        radiusView.addSubview(line)
        radiusView.addSubview(orderDateLabel)
@@ -1574,19 +1577,12 @@ class RescueIsIngCell : DDTableViewCell {
            make.left.equalTo(auto(18))
            make.top.equalTo(auto(13))
        }
-        orderNumLabel.setContentCompressionResistancePriority(.defaultHigh, for: .horizontal)
+
        orderNumLabel.snp.makeConstraints { make in
            make.centerY.equalTo(typeLabel)
            make.left.equalTo(typeLabel.snp.right).offset(auto(10))
        }
        
-        orderStatusLabel.setContentCompressionResistancePriority(.defaultLow, for: .horizontal)
-        orderStatusLabel.snp.makeConstraints { make in
-            make.right.equalTo(-auto(20))
-            make.centerY.equalTo(orderNumLabel)
-            make.left.equalTo(orderNumLabel.snp.right).offset(auto(5))
-        }
-        
        line.snp.makeConstraints { make in
            make.top.equalTo(typeLabel.snp.bottom).offset(auto(7))
            make.left.right.equalTo(0)
@@ -1603,12 +1599,24 @@ class RescueIsIngCell : DDTableViewCell {
            make.centerY.equalTo(orderDateLabel)
        }

-        serviceTitleLabel.snp.makeConstraints { make in
+        orderStatusTitleLabel.snp.makeConstraints { make in
            make.top.equalTo(driverLabel.snp.bottom).offset(auto(8))
            make.left.equalTo(typeLabel)
            make.width.equalTo(auto(60))
        }
        
+        orderStatusLabel.snp.makeConstraints { make in
+            make.right.equalTo(-auto(20))
+            make.top.equalTo(orderStatusTitleLabel)
+            make.left.equalTo(orderStatusTitleLabel.snp.right)
+        }
+
+        serviceTitleLabel.snp.makeConstraints { make in
+            make.top.equalTo(orderStatusLabel.snp.bottom).offset(auto(8))
+            make.left.equalTo(typeLabel)
+            make.width.equalTo(orderStatusTitleLabel)
+        }
+        
        serviceLabel.snp.makeConstraints { make in
            make.top.equalTo(serviceTitleLabel)
            make.left.equalTo(serviceTitleLabel.snp.right)
--- a/OrderScheduling/Source/LaunchImage.png
+++ b/OrderScheduling/Source/LaunchImage.png
--- a/OrderSchedulingNotificationService/NotificationService.swift
+++ b/OrderSchedulingNotificationService/NotificationService.swift
@@ -32,6 +32,9 @@ class NotificationService: UNNotificationServiceExtension {
                }
            }

+            let userDefault = UserDefaults.init(suiteName: "group.com.sino.supplier")
+            userDefault?.setValue(userInfo, forKey: "bestAttemptContentUserInfo")
+            
            JPushNotificationExtensionService.jpushSetAppkey("259b546bb2aaf5f02ffa2547")
            JPushNotificationExtensionService.jpushReceive(request) {
                contentHandler(request.content)
--- a/OrderSchedulingNotificationService/OrderSchedulingNotificationService.entitlements
+++ b/OrderSchedulingNotificationService/OrderSchedulingNotificationService.entitlements
@@ -1,5 +1,10 @@
 <?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/>
+<dict>
+	<key>com.apple.security.application-groups</key>
+	<array>
+		<string>group.com.sino.supplier</string>
+	</array>
+</dict>
 </plist>