diff --git a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate index 259daa4..a40411a 100644 Binary files a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate and b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/OrderSchedulingNotificationService/NotificationService.swift b/OrderSchedulingNotificationService/NotificationService.swift index 55653f9..f05b078 100644 --- a/OrderSchedulingNotificationService/NotificationService.swift +++ b/OrderSchedulingNotificationService/NotificationService.swift @@ -54,7 +54,7 @@ class NotificationService: UNNotificationServiceExtension { contentHandler(bestAttemptContent) }else{ // 当group中没有订单类型的数据时才写入 - if let isShowPop = (userInfo[pushNoti_broadcastKeywords_key] as? Bool), isShowPop == true { + if let isShowPop = (userInfo[pushNoti_isShowPop_key] as? Bool), isShowPop == true { if let userInfo = GROUP.bestAttemptContentUserInfo,GROUP.isOrderPushNotification(userInfo: userInfo) == true { }else{ GROUP.setBestAttemptContentUserInfo(bestAttemptContentUserInfo: userInfo) @@ -109,7 +109,7 @@ class NotificationService: UNNotificationServiceExtension { contentHandler(bestAttemptContent) }else{ // 当group中没有订单类型的数据时才写入 - if let isShowPop = (userInfo[pushNoti_broadcastKeywords_key] as? Bool), isShowPop == true { + if let isShowPop = (userInfo[pushNoti_isShowPop_key] as? Bool), isShowPop == true { if let userInfo = GROUP.bestAttemptContentUserInfo,GROUP.isOrderPushNotification(userInfo: userInfo) == true { }else{ GROUP.setBestAttemptContentUserInfo(bestAttemptContentUserInfo: userInfo)