推送的isshowpop适配

OrderScheduling.xcodeproj/project.pbxproj

@@ -960,10 +960,14 @@
 			inputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-OrderScheduling/Pods-OrderScheduling-resources-${CONFIGURATION}-input-files.xcfilelist",
 			);
+			inputPaths = (
+			);
 			name = "[CP] Copy Pods Resources";
 			outputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-OrderScheduling/Pods-OrderScheduling-resources-${CONFIGURATION}-output-files.xcfilelist",
 			);
+			outputPaths = (
+			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-OrderScheduling/Pods-OrderScheduling-resources.sh\"\n";
@@ -1383,12 +1387,10 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = OrderScheduling/OrderSchedulingDebug.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				CODE_SIGN_STYLE = Automatic;
-				CODE_SIGN_STYLE = Manual;
 				CURRENT_PROJECT_VERSION = 1;
 				DEBUG_INFORMATION_FORMAT = dwarf;
-				DEVELOPMENT_TEAM = "";
+				DEVELOPMENT_TEAM = X9WF5T89LV;
-				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = X9WF5T89LV;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "$(inherited)";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -1420,7 +1422,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.sino.supplier;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "sup dev";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
 				SUPPORTS_MACCATALYST = NO;
 				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
@@ -1496,11 +1497,9 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = OrderSchedulingNotificationService/OrderSchedulingNotificationService.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				CODE_SIGN_STYLE = Automatic;
-				CODE_SIGN_STYLE = Manual;
 				CURRENT_PROJECT_VERSION = 8;
-				DEVELOPMENT_TEAM = "";
+				DEVELOPMENT_TEAM = X9WF5T89LV;
-				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = X9WF5T89LV;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = OrderSchedulingNotificationService/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = OrderSchedulingNotificationService;
@@ -1520,7 +1519,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.sino.supplier.OrderSchedulingNotificationService;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "sino supplier notification service extension";
 				SKIP_INSTALL = YES;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "OrderSchedulingNotificationService/OrderSchedulingNotificationService-Bridging-Header.h";

OrderScheduling/Global/GroupData/GroupData.swift

@@ -82,6 +82,9 @@ 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
     }
     

OrderSchedulingNotificationService/NotificationService.swift

@@ -54,7 +54,7 @@ class NotificationService: UNNotificationServiceExtension {
                 contentHandler(bestAttemptContent)
             }else{
                 // 当group中没有订单类型的数据时才写入
-                if let isShowPop = (userInfo[pushNoti_isShowPop_key] as? Bool), isShowPop == true {
+                if GROUP.isShowPopPushNotification(userInfo: userInfo) == true {
                     if let userInfo = GROUP.bestAttemptContentUserInfo,GROUP.isOrderPushNotification(userInfo: userInfo) == true {
                     }else{
                         GROUP.setBestAttemptContentUserInfo(bestAttemptContentUserInfo: userInfo)
@@ -101,7 +101,7 @@ class NotificationService: UNNotificationServiceExtension {
                 contentHandler(bestAttemptContent)
             }else{
                 // 当group中没有订单类型的数据时才写入
-                if let isShowPop = (userInfo[pushNoti_isShowPop_key] as? Bool), isShowPop == true {
+                if GROUP.isShowPopPushNotification(userInfo: userInfo) == true{
                     if let userInfo = GROUP.bestAttemptContentUserInfo,GROUP.isOrderPushNotification(userInfo: userInfo) == true {
                     }else{
                         GROUP.setBestAttemptContentUserInfo(bestAttemptContentUserInfo: userInfo)