From 3ecb0be5269ad5f7455924929c13f136b5cc16cd Mon Sep 17 00:00:00 2001
From: ddisfriend <chemailaddress2@gmail.com>
Date: Wed, 25 Jun 2025 17:05:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E9=80=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Global/GroupData/GroupData.swift           |  9 +++------
 .../Rescue/View/PushNotiCommonTool.swift       | 18 +++++++++---------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/OrderScheduling/Global/GroupData/GroupData.swift b/OrderScheduling/Global/GroupData/GroupData.swift
index fc138bf..670937e 100644
--- a/OrderScheduling/Global/GroupData/GroupData.swift
+++ b/OrderScheduling/Global/GroupData/GroupData.swift
@@ -34,7 +34,7 @@ open class GroupData {
     // 判断新推送是不是新订单
     func isOrderPushNotification(userInfo:[AnyHashable:Any]?) -> Bool {
         if let userInfo {
-            if let dict = parserAlertToDictionary(userInfo: userInfo), dict[pushNoti_pushType_key] == "1" {
+            if let pushType = (userInfo[pushNoti_pushType_key] as? String), pushType == "1" {
                 return true
             }
         }
@@ -44,7 +44,7 @@ open class GroupData {
     // 判断新推送是不是取消订单
     func isCancelOrderPushNotification(userInfo:[AnyHashable:Any]?) -> Bool {
         if let userInfo {
-            if let dict = parserAlertToDictionary(userInfo: userInfo), dict[pushNoti_pushType_key] == "8" {
+            if let pushType = (userInfo[pushNoti_pushType_key] as? String), pushType == "8" {
                 return true
             }
         }
@@ -54,7 +54,7 @@ open class GroupData {
     // 判断是不是跳转报备的订单推送
     func isReportIndexPushNotification(userInfo:[AnyHashable:Any]?) -> Bool {
         if let userInfo {
-            if let dict = parserAlertToDictionary(userInfo: userInfo), dict[pushNoti_pushType_key] == "10" {
+            if let pushType = (userInfo[pushNoti_pushType_key] as? String), pushType == "10" {
                 return true
             }
         }
@@ -82,9 +82,6 @@ open class GroupData {
         if let isShowPop = (userInfo?[pushNoti_isShowPop_key] as? Bool),isShowPop == true {
             return true
         }
-        if let isShowPop = (userInfo?[pushNoti_isShowPop_key] as? String),isShowPop == "true" {
-            return true
-        }
         return false
     }
     
diff --git a/OrderScheduling/Rescue/View/PushNotiCommonTool.swift b/OrderScheduling/Rescue/View/PushNotiCommonTool.swift
index 01ca41e..a9564ed 100644
--- a/OrderScheduling/Rescue/View/PushNotiCommonTool.swift
+++ b/OrderScheduling/Rescue/View/PushNotiCommonTool.swift
@@ -27,15 +27,15 @@ open class PushNotiCommonTool : NSObject {
             if let body = dict[pushNoti_body_key] {
                 commonView.contentLabel.text = body
             }
-            if let _userOrderId = dict[pushNoti_userOrderId_key] {
-                userOrderId = Int(_userOrderId)
-            }
-            if let _taskOrderId = dict[pushNoti_taskOrderId_key] {
-                taskOrderId = Int(_taskOrderId)
-            }
-            if let _taskCode = dict[pushNoti_taskCode_key] {
-                taskCode = _taskCode
-            }
+        }
+        if let _userOrderId = (userInfo?[pushNoti_userOrderId_key] as? Int) {
+            userOrderId = _userOrderId
+        }
+        if let _taskOrderId = (userInfo?[pushNoti_taskOrderId_key] as? Int) {
+            taskOrderId = _taskOrderId
+        }
+        if let _taskCode = (userInfo?[pushNoti_taskCode_key] as? String) {
+            taskCode = _taskCode
         }
         if let cancel = (userInfo?[pushNoti_cancelButtonText_key] as? String) {
             commonView.cancelButton.setTitle(cancel, for: .normal)