update

2023-08-30 17:48:23 +08:00
parent 61ff533423
commit 456b879a00
8 changed files with 137 additions and 298 deletions
--- 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
@@ -497,22 +497,6 @@
            landmarkType = "7">
         </BreakpointContent>
      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "2198A952-6487-4CF8-AD6E-6F59C30D7D6E"
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "801"
-            endingLineNumber = "801"
-            landmarkName = "collectionView(_:cellForItemAt:)"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
      <BreakpointProxy
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
         <BreakpointContent
@@ -523,8 +507,8 @@
            filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "802"
-            endingLineNumber = "802"
+            startingLineNumber = "812"
+            endingLineNumber = "812"
            landmarkName = "collectionView(_:cellForItemAt:)"
            landmarkType = "7">
         </BreakpointContent>
@@ -1018,8 +1002,8 @@
            filePath = "OrderScheduling/Rescue/ViewController/RescuePhotoController.swift"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "130"
-            endingLineNumber = "130"
+            startingLineNumber = "139"
+            endingLineNumber = "139"
            landmarkName = "viewDidLoad()"
            landmarkType = "7">
         </BreakpointContent>
@@ -1034,8 +1018,8 @@
            filePath = "OrderScheduling/Rescue/ViewController/RescuePhotoController.swift"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "109"
-            endingLineNumber = "109"
+            startingLineNumber = "118"
+            endingLineNumber = "118"
            landmarkName = "viewDidLoad()"
            landmarkType = "7">
         </BreakpointContent>
@@ -1050,8 +1034,8 @@
            filePath = "OrderScheduling/Rescue/ViewController/RescuePhotoController.swift"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "119"
-            endingLineNumber = "119"
+            startingLineNumber = "128"
+            endingLineNumber = "128"
            landmarkName = "viewDidLoad()"
            landmarkType = "7">
         </BreakpointContent>
@@ -1072,22 +1056,6 @@
            landmarkType = "7">
         </BreakpointContent>
      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "CE721275-F5D6-4B5F-96AC-107248F19C7C"
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "OrderScheduling/Rescue/ViewController/RescuePhotoController.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "33"
-            endingLineNumber = "33"
-            landmarkName = "collectionView(_:cellForItemAt:)"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
      <BreakpointProxy
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
         <BreakpointContent
@@ -1284,7 +1252,7 @@
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
         <BreakpointContent
            uuid = "0AB5E12D-53CA-429C-8322-7C8342D48DEC"
-            shouldBeEnabled = "No"
+            shouldBeEnabled = "Yes"
            ignoreCount = "0"
            continueAfterRunningActions = "No"
            filePath = "OrderScheduling/Main/AppDelegate.swift"
@@ -1370,6 +1338,21 @@
                  endingLineNumber = "104"
                  offsetFromSymbolStart = "382">
               </Location>
+               <Location
+                  uuid = "0AB5E12D-53CA-429C-8322-7C8342D48DEC - 80f31cf5eda3179c"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "OrderScheduling.AppDelegate.jpushNotificationCenter(_: __C.UNUserNotificationCenter, willPresent: __C.UNNotification, withCompletionHandler: (Swift.Int) -&gt; ()) -&gt; ()"
+                  moduleName = "OrderScheduling"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/zd/Desktop/%E4%B8%AD%E9%81%93%E6%95%91%E6%8F%B4/OrderScheduling/OrderScheduling/Main/AppDelegate.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "104"
+                  endingLineNumber = "104"
+                  offsetFromSymbolStart = "317">
+               </Location>
            </Locations>
         </BreakpointContent>
      </BreakpointProxy>
@@ -2261,70 +2244,6 @@
            </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 = "33"
-            endingLineNumber = "33"
-            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 = "35"
-            endingLineNumber = "35"
-            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
@@ -2485,86 +2404,6 @@
            landmarkType = "7">
         </BreakpointContent>
      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "7EFC41FE-B60A-49CB-B9EA-B5807B0B16BA"
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "798"
-            endingLineNumber = "798"
-            landmarkName = "collectionView(_:cellForItemAt:)"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "F3E4045E-F870-4AFA-B669-3BA74CE4A944"
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "796"
-            endingLineNumber = "796"
-            landmarkName = "collectionView(_:cellForItemAt:)"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "1FB991B7-D6C8-4379-BE42-64E92BFC5115"
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "797"
-            endingLineNumber = "797"
-            landmarkName = "collectionView(_:cellForItemAt:)"
-            landmarkType = "7">
-            <Locations>
-               <Location
-                  uuid = "1FB991B7-D6C8-4379-BE42-64E92BFC5115 - f2a3ff53cb33940d"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "closure #1 () -&gt; () in OrderScheduling.RescuePendingDispatchController.collectionView(_: __C.UICollectionView, cellForItemAt: Foundation.IndexPath) -&gt; __C.UICollectionViewCell"
-                  moduleName = "OrderScheduling"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/zd/Desktop/%E4%B8%AD%E9%81%93%E6%95%91%E6%8F%B4/OrderScheduling/OrderScheduling/Rescue/ViewController/RescueController.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "773"
-                  endingLineNumber = "773"
-                  offsetFromSymbolStart = "566">
-               </Location>
-               <Location
-                  uuid = "1FB991B7-D6C8-4379-BE42-64E92BFC5115 - ec723f9f922c6918"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "closure #1 @Swift.MainActor () -&gt; () in closure #1 () -&gt; () in OrderScheduling.RescuePendingDispatchController.collectionView(_: __C.UICollectionView, cellForItemAt: Foundation.IndexPath) -&gt; __C.UICollectionViewCell"
-                  moduleName = "OrderScheduling"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/zd/Desktop/%E4%B8%AD%E9%81%93%E6%95%91%E6%8F%B4/OrderScheduling/OrderScheduling/Rescue/ViewController/RescueController.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "774"
-                  endingLineNumber = "774"
-                  offsetFromSymbolStart = "64">
-               </Location>
-            </Locations>
-         </BreakpointContent>
-      </BreakpointProxy>
      <BreakpointProxy
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
         <BreakpointContent
@@ -2623,8 +2462,8 @@
            filePath = "../../PodRepository/DDCategoryKit_Private/DDCategoryKit_Private/Classes/UIImage+DDCategory/UIImage+DDCategory.m"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "73"
-            endingLineNumber = "73"
+            startingLineNumber = "66"
+            endingLineNumber = "66"
            landmarkName = "-dd_compressWithQulitySize:"
            landmarkType = "7">
         </BreakpointContent>
@@ -2687,8 +2526,8 @@
            filePath = "OrderScheduling/Rescue/ViewController/RescuePhotoController.swift"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "98"
-            endingLineNumber = "98"
+            startingLineNumber = "107"
+            endingLineNumber = "107"
            landmarkName = "init(environmentPics:)"
            landmarkType = "7">
         </BreakpointContent>
@@ -2703,8 +2542,8 @@
            filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "814"
-            endingLineNumber = "814"
+            startingLineNumber = "823"
+            endingLineNumber = "823"
            landmarkName = "collectionView(_:didSelectItemAt:)"
            landmarkType = "7">
         </BreakpointContent>
@@ -2797,8 +2636,8 @@
            filePath = "OrderSchedulingNotificationService/NotificationService.swift"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "48"
-            endingLineNumber = "48"
+            startingLineNumber = "47"
+            endingLineNumber = "47"
            landmarkName = "didReceive(_:withContentHandler:)"
            landmarkType = "7">
         </BreakpointContent>
@@ -3037,54 +2876,6 @@
            </Locations>
         </BreakpointContent>
      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "07A65536-4F34-4042-B833-DE0DE4D66E50"
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "OrderSchedulingNotificationService/NotificationService.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "40"
-            endingLineNumber = "40"
-            landmarkName = "didReceive(_:withContentHandler:)"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "CF0FADF1-41F5-44EA-BC9F-C59AADF56048"
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "OrderScheduling/Global/Tool/Tool.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "203"
-            endingLineNumber = "203"
-            landmarkName = "playVoiceWith(userInfo:)"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "D611A400-E2A5-4384-973C-FBFAB1FD105F"
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "OrderScheduling/Global/Tool/Tool.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "200"
-            endingLineNumber = "200"
-            landmarkName = "playVoiceWith(userInfo:)"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
      <BreakpointProxy
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
         <BreakpointContent
@@ -3095,8 +2886,8 @@
            filePath = "OrderScheduling/Global/Tool/Tool.swift"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "210"
-            endingLineNumber = "210"
+            startingLineNumber = "205"
+            endingLineNumber = "205"
            landmarkName = "cycleVoice()"
            landmarkType = "7">
         </BreakpointContent>
@@ -3111,8 +2902,8 @@
            filePath = "OrderScheduling/Global/Tool/Tool.swift"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "212"
-            endingLineNumber = "212"
+            startingLineNumber = "207"
+            endingLineNumber = "207"
            landmarkName = "cycleVoice()"
            landmarkType = "7">
         </BreakpointContent>
@@ -3127,8 +2918,8 @@
            filePath = "OrderScheduling/Global/Tool/Tool.swift"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "211"
-            endingLineNumber = "211"
+            startingLineNumber = "206"
+            endingLineNumber = "206"
            landmarkName = "cycleVoice()"
            landmarkType = "7">
         </BreakpointContent>
@@ -3143,8 +2934,8 @@
            filePath = "OrderScheduling/Global/Tool/Tool.swift"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "213"
-            endingLineNumber = "213"
+            startingLineNumber = "208"
+            endingLineNumber = "208"
            landmarkName = "cycleVoice()"
            landmarkType = "7">
         </BreakpointContent>
@@ -3197,5 +2988,21 @@
            landmarkType = "7">
         </BreakpointContent>
      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "ACB4E72D-644F-44DF-A811-FD949EC7D040"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../../PodRepository/DDCategoryKit_Private/DDCategoryKit_Private/Classes/UIImage+DDCategory/UIImage+DDCategory.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "52"
+            endingLineNumber = "52"
+            landmarkName = "+dd_thumbnailImageForVideo:completionHandler:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
   </Breakpoints>
 </Bucket>
--- a/OrderScheduling/Global/GroupData/GroupData.swift
+++ b/OrderScheduling/Global/GroupData/GroupData.swift
@@ -13,6 +13,16 @@ open class GroupData {
    public static let `default` = GroupData()
    let groudUserDefault = UserDefaults(suiteName: GROUPID)
    
+    // 判断新推送是不是新订单
+    func isOrderPushNotification(userInfo:[AnyHashable:Any]?) -> Bool {
+        if let userInfo {
+            if let aps = userInfo[pushNoti_aps_key] as? [String:Any], let dict = (aps[pushNoti_alert_key] as? Dictionary<String, Any>), (dict[pushNoti_title_key] as? String) == pushNoti_newOrder_key {
+                return true
+            }
+        }
+        return false
+    }
+    
    // 不需要记录
    public var bestAttemptContentUserInfo : [AnyHashable:Any]? {
        return groudUserDefault?.object(forKey: bestAttemptContentUserInfo_key) as? [AnyHashable:Any]
--- a/OrderScheduling/Global/Tool/Tool.swift
+++ b/OrderScheduling/Global/Tool/Tool.swift
@@ -138,21 +138,19 @@ open class Tool {
        return "未知"
    }
    
+    // MARK: 远程推送相关
    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 GROUP.isOrderPushNotification(userInfo: userInfo) == true {
+            let taskCode = userInfo?[pushNoti_taskCode_key] as? String
+            let juheVehcileName = userInfo?[pushNoti_juheVehcileName_key] as? String
            if juheVehcileName?.isEmpty == false {
                string = "您有一条新的聚合订单\(taskCode ?? "")"
            }else{
                string = "您有一条新订单\(taskCode ?? "")"
            }
        }
-        }
        
        return string
    }
@@ -183,10 +181,8 @@ open class Tool {
            return
        }
        
-        if let userInfo {
-            let aps = userInfo[aps_key] as? [String:Any]
-            if let aps, (aps[alert_key] as? String) == "新订单" {
-                let juheVehcileName = userInfo[juheVehcileName_key] as? String
+        if GROUP.isOrderPushNotification(userInfo: userInfo) == true {
+            let juheVehcileName = userInfo?[pushNoti_juheVehcileName_key] as? String
            var auidoUrl : URL?
            if juheVehcileName?.isEmpty == false {
                auidoUrl = URL(string: Bundle.main.path(forResource: juheNewOrderAudio_key, ofType: nil) ?? "")
@@ -204,7 +200,6 @@ open class Tool {
            }
        }
    }
-    }
    
    func cycleVoice() {
        if let systemSoundID, soundCount < 10, needPlayAudio == true {
--- a/OrderScheduling/Rescue/ViewController/RescueController.swift
+++ b/OrderScheduling/Rescue/ViewController/RescueController.swift
@@ -792,14 +792,23 @@ extension RescuePendingDispatchController : UICollectionViewDelegate, UICollecti
        let imageUrlStr = environmentPics[indexPath.item]
        cell!.imageView.image = nil
        if imageUrlStr.contains(".mp4?") == true {
+            if let url = URL(string: imageUrlStr) {
                DispatchQueue.global().async {
-                let image = DDImage.dd_thumbnailImage(forVideo: URL(string: imageUrlStr)!).dd_compress(withQulitySize: 5 * 1024)
+                    DDImage.dd_thumbnailImage(forVideo: url) { (thumbnailImage, _, _) in
+                        let image = thumbnailImage?.dd_compress(withQulitySize: 5 * 1024)
                        DispatchQueue.main.async {
                            cell!.imageView.image = image
                        }
                    }
-            let cmTime = TOOL.getDuration(url: URL(string: imageUrlStr)!)
+                }
+
+                DispatchQueue.global().async {
+                    let cmTime = TOOL.getDuration(url: url)
+                    DispatchQueue.main.async {
                        cell!.dateLabel.text = TOOL.getVideoDateString(duration: Int(cmTime.seconds))
+                    }
+                }
+            }
        }else{
            cell!.imageView.sd_setImage(with: URL(string: imageUrlStr))
            cell!.dateLabel.text = nil
--- a/OrderScheduling/Rescue/ViewController/RescuePhotoController.swift
+++ b/OrderScheduling/Rescue/ViewController/RescuePhotoController.swift
@@ -24,14 +24,23 @@ extension RescuePhotoController : UICollectionViewDelegate,UICollectionViewDataS
       cell?.imageView.image = nil
       
       if model.url.contains(".mp4?") == true {
+           if let url = URL(string: model.url) {
               DispatchQueue.global().async {
-                let image = DDImage.dd_thumbnailImage(forVideo: URL(string: model.url)!)
+                   DDImage.dd_thumbnailImage(forVideo: url) { (thumbnailImage, _, _) in
+                       let image = thumbnailImage?.dd_compress(withQulitySize: 5 * 1024)
                       DispatchQueue.main.async {
                           cell!.imageView.image = image
                       }
                   }
-           let cmTime = TOOL.getDuration(url: URL(string: model.url)!)
+               }
+
+               DispatchQueue.global().async {
+                   let cmTime = TOOL.getDuration(url: url)
+                   DispatchQueue.main.async {
                       cell!.dateLabel.text = TOOL.getVideoDateString(duration: Int(cmTime.seconds))
+                   }
+               }
+           }
        }else{
            cell!.imageView.sd_setImage(with: URL(string: model.url))
            cell!.dateLabel.text = nil
--- a/OrderScheduling/Strings/CommonKeyStrings.swift
+++ b/OrderScheduling/Strings/CommonKeyStrings.swift
@@ -7,12 +7,22 @@

 import Foundation

-public let aps_key = "aps"
+// 远程推送的键，字符串为后台定义，切勿更改
+public let pushNoti_aps_key = "aps"

-public let alert_key = "alert"
+public let pushNoti_alert_key = "alert"

-public let juheVehcileName_key = "juheVehcileName"
+public let pushNoti_title_key = "title"

+public let pushNoti_body_key = "body"
+
+public let pushNoti_juheVehcileName_key = "juheVehcileName"
+
+public let pushNoti_taskCode_key = "taskCode"
+
+public let pushNoti_newOrder_key = "新订单"
+
+// 本地音频的键
 public let juheNewOrderAudio_key = "juheNewOrderAudio.wav"

 public let newOrderAudio_key = "newOrderAudio.wav"
--- a/OrderSchedulingNotificationService/NotificationService.swift
+++ b/OrderSchedulingNotificationService/NotificationService.swift
@@ -23,11 +23,10 @@ class NotificationService: UNNotificationServiceExtension {
            let userInfo = bestAttemptContent.userInfo
             
            // 只有订单类型才写入group，因为需要弹窗和声音
-            let aps = userInfo[aps_key] as? [String:Any]
-            if let aps, (aps[alert_key] as? String) == "新订单" {
+            if GROUP.isOrderPushNotification(userInfo: userInfo) == true {
                var sound : UNNotificationSound?
                
-                let juheVehcileName = userInfo[juheVehcileName_key] as? String
+                let juheVehcileName = userInfo[pushNoti_juheVehcileName_key] as? String
                if juheVehcileName?.isEmpty == false {
                    sound = UNNotificationSound(named: UNNotificationSoundName(rawValue: juheNewOrderAudio_key))
                }else{