diff --git a/OrderScheduling.xcodeproj/project.pbxproj b/OrderScheduling.xcodeproj/project.pbxproj index 2bd4d36..25d1365 100644 --- a/OrderScheduling.xcodeproj/project.pbxproj +++ b/OrderScheduling.xcodeproj/project.pbxproj @@ -7,7 +7,7 @@ objects = { /* Begin PBXBuildFile section */ - 484E98B33009439007606B9D /* libPods-OrderSchedulingNotificationService.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0AC8946386773D3E9F510BE6 /* libPods-OrderSchedulingNotificationService.a */; }; + 5C5E148BC19DCC3A1F56E894 /* libPods-OrderSchedulingNotificationService.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F4D22CCB18DAC27B34DA947D /* libPods-OrderSchedulingNotificationService.a */; }; 791887422A7CCCCD007EA0C1 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 791887402A7CCCCD007EA0C1 /* AppDelegate.swift */; }; 791887432A7CCCCD007EA0C1 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 791887412A7CCCCD007EA0C1 /* SceneDelegate.swift */; }; 791887452A7CD05B007EA0C1 /* MainTabBarController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 791887442A7CD05B007EA0C1 /* MainTabBarController.swift */; }; @@ -108,7 +108,8 @@ /* Begin PBXFileReference section */ 09A2779565B8D8C9A3C1A302 /* Pods-OrderScheduling.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OrderScheduling.debug.xcconfig"; path = "Target Support Files/Pods-OrderScheduling/Pods-OrderScheduling.debug.xcconfig"; sourceTree = ""; }; - 0AC8946386773D3E9F510BE6 /* libPods-OrderSchedulingNotificationService.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-OrderSchedulingNotificationService.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 28C5D2EBE7C155D595978D29 /* Pods-OrderSchedulingNotificationService.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OrderSchedulingNotificationService.release.xcconfig"; path = "Target Support Files/Pods-OrderSchedulingNotificationService/Pods-OrderSchedulingNotificationService.release.xcconfig"; sourceTree = ""; }; + 4FE1CC2313B501F36C3366E8 /* Pods-OrderSchedulingNotificationService.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OrderSchedulingNotificationService.debug.xcconfig"; path = "Target Support Files/Pods-OrderSchedulingNotificationService/Pods-OrderSchedulingNotificationService.debug.xcconfig"; sourceTree = ""; }; 791887402A7CCCCD007EA0C1 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 791887412A7CCCCD007EA0C1 /* SceneDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = ""; }; 791887442A7CD05B007EA0C1 /* MainTabBarController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainTabBarController.swift; sourceTree = ""; }; @@ -198,12 +199,11 @@ 79FB761B2A9EEC3700DB00A4 /* GroupData.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GroupData.swift; sourceTree = ""; }; 79FB76212A9EEED900DB00A4 /* CommonKeyStrings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CommonKeyStrings.swift; sourceTree = ""; }; 79FB76252A9F0A0000DB00A4 /* BackgroundTask.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BackgroundTask.swift; sourceTree = ""; }; - 88B8E188CE9A3B2123905342 /* Pods-OrderSchedulingNotificationService.prerelease.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OrderSchedulingNotificationService.prerelease.xcconfig"; path = "Target Support Files/Pods-OrderSchedulingNotificationService/Pods-OrderSchedulingNotificationService.prerelease.xcconfig"; sourceTree = ""; }; - 9758FDE3BEDA5A983CAE2DED /* Pods-OrderSchedulingNotificationService.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OrderSchedulingNotificationService.debug.xcconfig"; path = "Target Support Files/Pods-OrderSchedulingNotificationService/Pods-OrderSchedulingNotificationService.debug.xcconfig"; sourceTree = ""; }; 98784A61C325B3D6C408016C /* libPods-OrderScheduling.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-OrderScheduling.a"; sourceTree = BUILT_PRODUCTS_DIR; }; BD034FA1DD7C17CCBA6B0E5D /* Pods-OrderScheduling.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OrderScheduling.release.xcconfig"; path = "Target Support Files/Pods-OrderScheduling/Pods-OrderScheduling.release.xcconfig"; sourceTree = ""; }; BEFB1D0033356A04B31FA263 /* Pods-OrderScheduling.prerelease.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OrderScheduling.prerelease.xcconfig"; path = "Target Support Files/Pods-OrderScheduling/Pods-OrderScheduling.prerelease.xcconfig"; sourceTree = ""; }; - F76C33D505526F14E541D0A7 /* Pods-OrderSchedulingNotificationService.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OrderSchedulingNotificationService.release.xcconfig"; path = "Target Support Files/Pods-OrderSchedulingNotificationService/Pods-OrderSchedulingNotificationService.release.xcconfig"; sourceTree = ""; }; + DF9CE87B72CAB01C1BFFDCF9 /* Pods-OrderSchedulingNotificationService.prerelease.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OrderSchedulingNotificationService.prerelease.xcconfig"; path = "Target Support Files/Pods-OrderSchedulingNotificationService/Pods-OrderSchedulingNotificationService.prerelease.xcconfig"; sourceTree = ""; }; + F4D22CCB18DAC27B34DA947D /* libPods-OrderSchedulingNotificationService.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-OrderSchedulingNotificationService.a"; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -219,7 +219,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 484E98B33009439007606B9D /* libPods-OrderSchedulingNotificationService.a in Frameworks */, + 5C5E148BC19DCC3A1F56E894 /* libPods-OrderSchedulingNotificationService.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -753,10 +753,10 @@ children = ( 09A2779565B8D8C9A3C1A302 /* Pods-OrderScheduling.debug.xcconfig */, BD034FA1DD7C17CCBA6B0E5D /* Pods-OrderScheduling.release.xcconfig */, - 9758FDE3BEDA5A983CAE2DED /* Pods-OrderSchedulingNotificationService.debug.xcconfig */, - F76C33D505526F14E541D0A7 /* Pods-OrderSchedulingNotificationService.release.xcconfig */, BEFB1D0033356A04B31FA263 /* Pods-OrderScheduling.prerelease.xcconfig */, - 88B8E188CE9A3B2123905342 /* Pods-OrderSchedulingNotificationService.prerelease.xcconfig */, + 4FE1CC2313B501F36C3366E8 /* Pods-OrderSchedulingNotificationService.debug.xcconfig */, + 28C5D2EBE7C155D595978D29 /* Pods-OrderSchedulingNotificationService.release.xcconfig */, + DF9CE87B72CAB01C1BFFDCF9 /* Pods-OrderSchedulingNotificationService.prerelease.xcconfig */, ); path = Pods; sourceTree = ""; @@ -780,7 +780,7 @@ 79CECC9F2A8E03CF00B95D8B /* AVFoundation.framework */, 79CECC9D2A8E03C200B95D8B /* MediaPlayer.framework */, 98784A61C325B3D6C408016C /* libPods-OrderScheduling.a */, - 0AC8946386773D3E9F510BE6 /* libPods-OrderSchedulingNotificationService.a */, + F4D22CCB18DAC27B34DA947D /* libPods-OrderSchedulingNotificationService.a */, ); name = Frameworks; sourceTree = ""; @@ -813,7 +813,7 @@ isa = PBXNativeTarget; buildConfigurationList = 79FB75FD2A9C3BEE00DB00A4 /* Build configuration list for PBXNativeTarget "OrderSchedulingNotificationService" */; buildPhases = ( - 6EB5BBCDE56F555DA13D87D9 /* [CP] Check Pods Manifest.lock */, + 28823204484F77F3B2D9181E /* [CP] Check Pods Manifest.lock */, 79FB75F12A9C3BEE00DB00A4 /* Sources */, 79FB75F22A9C3BEE00DB00A4 /* Frameworks */, 79FB75F32A9C3BEE00DB00A4 /* Resources */, @@ -889,24 +889,7 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 341364273A38F3D379A18C5D /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-OrderScheduling/Pods-OrderScheduling-resources-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Copy Pods Resources"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-OrderScheduling/Pods-OrderScheduling-resources-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-OrderScheduling/Pods-OrderScheduling-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; - 6EB5BBCDE56F555DA13D87D9 /* [CP] Check Pods Manifest.lock */ = { + 28823204484F77F3B2D9181E /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -928,6 +911,23 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; + 341364273A38F3D379A18C5D /* [CP] Copy Pods Resources */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-OrderScheduling/Pods-OrderScheduling-resources-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Copy Pods Resources"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-OrderScheduling/Pods-OrderScheduling-resources-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-OrderScheduling/Pods-OrderScheduling-resources.sh\"\n"; + showEnvVarsInLog = 0; + }; BB88446118A3830B05D88DEC /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -1058,7 +1058,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = BD034FA1DD7C17CCBA6B0E5D /* Pods-OrderScheduling.release.xcconfig */; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)"; + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; @@ -1122,7 +1122,7 @@ CODE_SIGN_IDENTITY = "iPhone Distribution"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: SINO ASSISTANCE INDUSTRIAL CO., LTD. (X9WF5T89LV)"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 2; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = X9WF5T89LV; FRAMEWORK_SEARCH_PATHS = ( @@ -1151,7 +1151,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0; + MARKETING_VERSION = 4.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.sino.supplier; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -1169,14 +1169,14 @@ }; 79B9662E2AAF24EC00308A8D /* PreRelease */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 88B8E188CE9A3B2123905342 /* Pods-OrderSchedulingNotificationService.prerelease.xcconfig */; + baseConfigurationReference = DF9CE87B72CAB01C1BFFDCF9 /* Pods-OrderSchedulingNotificationService.prerelease.xcconfig */; buildSettings = { CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = OrderSchedulingNotificationService/OrderSchedulingNotificationService.entitlements; CODE_SIGN_IDENTITY = "Apple Distribution"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: SINO ASSISTANCE INDUSTRIAL CO., LTD. (X9WF5T89LV)"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 2; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = X9WF5T89LV; GENERATE_INFOPLIST_FILE = YES; @@ -1185,6 +1185,7 @@ INFOPLIST_KEY_NSHumanReadableCopyright = ""; INFOPLIST_KEY_NSLocationAlwaysAndWhenInUseUsageDescription = ""; INFOPLIST_KEY_NSLocationAlwaysUsageDescription = ""; + INFOPLIST_KEY_NSLocationTemporaryUsageDescriptionDictionary = ""; INFOPLIST_KEY_NSLocationUsageDescription = ""; INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = ""; IPHONEOS_DEPLOYMENT_TARGET = 13.0; @@ -1193,7 +1194,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 1.0; + MARKETING_VERSION = 4.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.sino.supplier.OrderSchedulingNotificationService; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -1202,7 +1203,7 @@ SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_OBJC_BRIDGING_HEADER = "OrderSchedulingNotificationService/OrderSchedulingNotificationService-Bridging-Header.h"; SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; + TARGETED_DEVICE_FAMILY = 1; }; name = PreRelease; }; @@ -1210,7 +1211,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 09A2779565B8D8C9A3C1A302 /* Pods-OrderScheduling.debug.xcconfig */; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)"; + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; @@ -1272,7 +1273,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = BD034FA1DD7C17CCBA6B0E5D /* Pods-OrderScheduling.release.xcconfig */; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)"; + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; @@ -1336,7 +1337,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development: Haifeng Cen (F2QAMRC42Q)"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 2; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = X9WF5T89LV; "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "$(inherited)"; @@ -1366,7 +1367,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0; + MARKETING_VERSION = 4.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.sino.supplier; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -1394,7 +1395,7 @@ CODE_SIGN_ENTITLEMENTS = OrderScheduling/OrderSchedulingRelease.entitlements; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: SINO ASSISTANCE INDUSTRIAL CO., LTD. (X9WF5T89LV)"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 2; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = X9WF5T89LV; FRAMEWORK_SEARCH_PATHS = ( @@ -1423,7 +1424,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0; + MARKETING_VERSION = 4.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.sino.supplier; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -1441,14 +1442,14 @@ }; 79FB75FE2A9C3BEE00DB00A4 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 9758FDE3BEDA5A983CAE2DED /* Pods-OrderSchedulingNotificationService.debug.xcconfig */; + baseConfigurationReference = 4FE1CC2313B501F36C3366E8 /* Pods-OrderSchedulingNotificationService.debug.xcconfig */; buildSettings = { CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = OrderSchedulingNotificationService/OrderSchedulingNotificationService.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development: Haifeng Cen (F2QAMRC42Q)"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 2; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = X9WF5T89LV; GENERATE_INFOPLIST_FILE = YES; @@ -1466,7 +1467,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 1.0; + MARKETING_VERSION = 4.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.sino.supplier.OrderSchedulingNotificationService; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -1476,20 +1477,20 @@ SWIFT_OBJC_BRIDGING_HEADER = "OrderSchedulingNotificationService/OrderSchedulingNotificationService-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; + TARGETED_DEVICE_FAMILY = 1; }; name = Debug; }; 79FB75FF2A9C3BEE00DB00A4 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = F76C33D505526F14E541D0A7 /* Pods-OrderSchedulingNotificationService.release.xcconfig */; + baseConfigurationReference = 28C5D2EBE7C155D595978D29 /* Pods-OrderSchedulingNotificationService.release.xcconfig */; buildSettings = { CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = OrderSchedulingNotificationService/OrderSchedulingNotificationService.entitlements; CODE_SIGN_IDENTITY = "Apple Distribution"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: SINO ASSISTANCE INDUSTRIAL CO., LTD. (X9WF5T89LV)"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 2; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = X9WF5T89LV; GENERATE_INFOPLIST_FILE = YES; @@ -1498,6 +1499,7 @@ INFOPLIST_KEY_NSHumanReadableCopyright = ""; INFOPLIST_KEY_NSLocationAlwaysAndWhenInUseUsageDescription = ""; INFOPLIST_KEY_NSLocationAlwaysUsageDescription = ""; + INFOPLIST_KEY_NSLocationTemporaryUsageDescriptionDictionary = ""; INFOPLIST_KEY_NSLocationUsageDescription = ""; INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = ""; IPHONEOS_DEPLOYMENT_TARGET = 13.0; @@ -1506,7 +1508,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 1.0; + MARKETING_VERSION = 4.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.sino.supplier.OrderSchedulingNotificationService; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -1515,7 +1517,7 @@ SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_OBJC_BRIDGING_HEADER = "OrderSchedulingNotificationService/OrderSchedulingNotificationService-Bridging-Header.h"; SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; + TARGETED_DEVICE_FAMILY = 1; }; name = Release; }; diff --git a/OrderScheduling.xcodeproj/xcshareddata/xcschemes/Debug.xcscheme b/OrderScheduling.xcodeproj/xcshareddata/xcschemes/Debug.xcscheme index 061c4bc..b3e2fe3 100644 --- a/OrderScheduling.xcodeproj/xcshareddata/xcschemes/Debug.xcscheme +++ b/OrderScheduling.xcodeproj/xcshareddata/xcschemes/Debug.xcscheme @@ -30,7 +30,7 @@ shouldAutocreateTestPlan = "YES"> diff --git a/OrderScheduling.xcodeproj/xcshareddata/xcschemes/OrderScheduling.xcscheme b/OrderScheduling.xcodeproj/xcshareddata/xcschemes/PreRelease.xcscheme similarity index 97% rename from OrderScheduling.xcodeproj/xcshareddata/xcschemes/OrderScheduling.xcscheme rename to OrderScheduling.xcodeproj/xcshareddata/xcschemes/PreRelease.xcscheme index 65a3e8f..80eec06 100644 --- a/OrderScheduling.xcodeproj/xcshareddata/xcschemes/OrderScheduling.xcscheme +++ b/OrderScheduling.xcodeproj/xcshareddata/xcschemes/PreRelease.xcscheme @@ -30,7 +30,7 @@ shouldAutocreateTestPlan = "YES"> diff --git a/OrderScheduling.xcodeproj/xcuserdata/zd.xcuserdatad/xcschemes/xcschememanagement.plist b/OrderScheduling.xcodeproj/xcuserdata/zd.xcuserdatad/xcschemes/xcschememanagement.plist index 2ac5b6f..3e299b4 100644 --- a/OrderScheduling.xcodeproj/xcuserdata/zd.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/OrderScheduling.xcodeproj/xcuserdata/zd.xcuserdatad/xcschemes/xcschememanagement.plist @@ -6,21 +6,25 @@ Debug.xcscheme_^#shared#^_ + isShown + orderHint 43 - OrderScheduling.xcscheme_^#shared#^_ - - orderHint - 0 - OrderSchedulingNotificationService.xcscheme_^#shared#^_ orderHint 41 + PreRelease.xcscheme_^#shared#^_ + + orderHint + 0 + Release.xcscheme_^#shared#^_ + isShown + orderHint 42 diff --git a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate index a40411a..016b4b5 100644 Binary files a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate and b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist index 9fe8b53..570633b 100644 --- a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -743,8 +743,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "362" - endingLineNumber = "362" + startingLineNumber = "374" + endingLineNumber = "374" landmarkName = "dd_mapView(_:viewFor:)" landmarkType = "7"> @@ -759,8 +759,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "340" - endingLineNumber = "340" + startingLineNumber = "352" + endingLineNumber = "352" landmarkName = "dd_mapView(_:viewFor:)" landmarkType = "7"> @@ -775,8 +775,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "342" - endingLineNumber = "342" + startingLineNumber = "354" + endingLineNumber = "354" landmarkName = "dd_mapView(_:viewFor:)" landmarkType = "7"> @@ -791,8 +791,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "368" - endingLineNumber = "368" + startingLineNumber = "380" + endingLineNumber = "380" landmarkName = "dd_mapView(_:viewFor:)" landmarkType = "7"> @@ -807,8 +807,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "367" - endingLineNumber = "367" + startingLineNumber = "379" + endingLineNumber = "379" landmarkName = "dd_mapView(_:viewFor:)" landmarkType = "7"> @@ -857,6 +857,66 @@ endingLineNumber = "367" offsetFromSymbolStart = "28"> + + + + + + + + @@ -2377,8 +2437,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "634" - endingLineNumber = "634" + startingLineNumber = "646" + endingLineNumber = "646" landmarkName = "viewDidAppear(_:)" landmarkType = "7"> @@ -2393,8 +2453,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "587" - endingLineNumber = "587" + startingLineNumber = "599" + endingLineNumber = "599" landmarkName = "viewDidLoad()" landmarkType = "7"> @@ -2886,8 +2946,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "388" - endingLineNumber = "388" + startingLineNumber = "400" + endingLineNumber = "400" landmarkName = "dd_mapView(_:viewFor:)" landmarkType = "7"> @@ -2982,8 +3042,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "557" - endingLineNumber = "557" + startingLineNumber = "569" + endingLineNumber = "569" landmarkName = "reloadData(index:)" landmarkType = "7"> @@ -2998,8 +3058,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "555" - endingLineNumber = "555" + startingLineNumber = "567" + endingLineNumber = "567" landmarkName = "reloadData(index:)" landmarkType = "7"> @@ -3014,8 +3074,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "558" - endingLineNumber = "558" + startingLineNumber = "570" + endingLineNumber = "570" landmarkName = "reloadData(index:)" landmarkType = "7"> @@ -3259,54 +3319,6 @@ landmarkType = "7"> - - - - - - - - - - diff --git a/OrderScheduling/Info.plist b/OrderScheduling/Info.plist index 71c62a7..48b3c82 100644 --- a/OrderScheduling/Info.plist +++ b/OrderScheduling/Info.plist @@ -2,6 +2,8 @@ + ITSAppUsesNonExemptEncryption + UIUserInterfaceStyle Light CFBundleLocalizations diff --git a/OrderScheduling/Main/SceneDelegate.swift b/OrderScheduling/Main/SceneDelegate.swift index b1cb3ab..77c536e 100644 --- a/OrderScheduling/Main/SceneDelegate.swift +++ b/OrderScheduling/Main/SceneDelegate.swift @@ -35,9 +35,9 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate { } func sceneDidBecomeActive(_ scene: UIScene) { - if USER.isLogin == true,appIsAlive == true { - // 处理app收到推送后写入GROUP的数据，当app处于后台时才要弹出，app热启动时不需要 - TOOL.dealWithOrderPushNotification { userInfo in + // 处理app收到推送后写入GROUP的数据，当app处于后台时才要弹出，app热启动时不需要 + TOOL.dealWithOrderPushNotification {[weak self] userInfo in + if USER.isLogin == true,self?.appIsAlive == true { TOOL.playAlertWith(userInfo: userInfo) } } diff --git a/OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift b/OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift index 584b3d7..2dfb16e 100644 --- a/OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift +++ b/OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift @@ -275,7 +275,7 @@ open class ReviewFailedView : DDView { tableView = DDTableView(frame: CGRectZero, style: .plain) super.init(frame: frame) - tableView.backgroundColor = .hex("F4F5F7") + tableView.backgroundColor = .hex("FAFAFA") tableView.separatorStyle = .none addSubview(tableView) tableView.snp.makeConstraints { make in diff --git a/OrderScheduling/Strings/EnvironmentStrings.swift b/OrderScheduling/Strings/EnvironmentStrings.swift index bae41a5..87c0a45 100644 --- a/OrderScheduling/Strings/EnvironmentStrings.swift +++ b/OrderScheduling/Strings/EnvironmentStrings.swift @@ -12,10 +12,10 @@ public let HOST = "https://api1.sino-assist.com" public let DOCMENT_HOST = "https://crm1.sino-assist.com" #elseif PRERELEASE public let HOST = "http://interface.review.sino-assist.com" -public let DOCMENT_HOST = "http://www.sinoassist.com" +public let DOCMENT_HOST = "https://www.sinoassist.com" #else public let HOST = "https://api1.sino-assist.com" -public let DOCMENT_HOST = "http://www.sinoassist.com" +public let DOCMENT_HOST = "https://www.sinoassist.com" #endif diff --git a/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift b/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift index 246a9a7..399df59 100644 --- a/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift +++ b/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift @@ -327,13 +327,25 @@ extension VehicleMonitoringController : DDMAMapViewDelegate { content.append("· \((model?.orderCode)!)") } if model?.serviceName?.isEmpty == false { - content.append("\n· \((model?.serviceName)!)") + if content.isEmpty == false { + content.append("\n· \((model?.serviceName)!)") + }else{ + content.append("· \((model?.serviceName)!)") + } } if model?.taskStatusString?.isEmpty == false { - content.append("\n· \((model?.taskStatusString)!)") + if content.isEmpty == false { + content.append("\n· \((model?.taskStatusString)!)") + }else{ + content.append("· \((model?.taskStatusString)!)") + } } if model?.workingCount != nil { - content = content + "\n· " + "背单" + " " + String((model?.workingCount)!) + if content.isEmpty == false { + content = content + "\n· " + "背单" + " " + String((model?.workingCount)!) + }else{ + content = content + "· " + "背单" + " " + String((model?.workingCount)!) + } } annotationView?.contentLabel.text = content annotationView?.zIndex = zIndex + 1 diff --git a/OrderSchedulingNotificationService/OrderSchedulingNotificationService-Bridging-Header.h b/OrderSchedulingNotificationService/OrderSchedulingNotificationService-Bridging-Header.h index 4f54d4f..b818a1a 100644 --- a/OrderSchedulingNotificationService/OrderSchedulingNotificationService-Bridging-Header.h +++ b/OrderSchedulingNotificationService/OrderSchedulingNotificationService-Bridging-Header.h @@ -3,11 +3,4 @@ // // 引入 JPush 功能所需头文件 -# import "JPUSHService.h" -# import "JGInforCollectionAuth.h" # import "JPushNotificationExtensionService.h" - -// iOS10 注册 APNs 所需头文件 -# ifdef NSFoundationVersionNumber_iOS_9_x_Max -# import -# endif diff --git a/Podfile b/Podfile index 7d7a1ee..3373d57 100644 --- a/Podfile +++ b/Podfile @@ -60,6 +60,5 @@ target 'OrderScheduling' do end target 'OrderSchedulingNotificationService' do - pod 'JPush',:modular_headers => true pod 'JPushExtension' end diff --git a/Podfile.lock b/Podfile.lock index 0ebec14..1265234 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -414,6 +414,6 @@ SPEC CHECKSUMS: SwiftEntryKit: 61b5fa36f34a97dd8013e48a7345bc4c4720be9a ZLPhotoBrowser: 0563c2bfc7b247b65d023d646012f46cba94101b -PODFILE CHECKSUM: a0afaf50bf183a50e52209ab4960fdd02d852dd8 +PODFILE CHECKSUM: d96388a4c16d63e54b021499e983b7698245eb27 COCOAPODS: 1.11.3 diff --git a/Pods/Manifest.lock b/Pods/Manifest.lock index 0ebec14..1265234 100644 --- a/Pods/Manifest.lock +++ b/Pods/Manifest.lock @@ -414,6 +414,6 @@ SPEC CHECKSUMS: SwiftEntryKit: 61b5fa36f34a97dd8013e48a7345bc4c4720be9a ZLPhotoBrowser: 0563c2bfc7b247b65d023d646012f46cba94101b -PODFILE CHECKSUM: a0afaf50bf183a50e52209ab4960fdd02d852dd8 +PODFILE CHECKSUM: d96388a4c16d63e54b021499e983b7698245eb27 COCOAPODS: 1.11.3 diff --git a/Pods/Pods.xcodeproj/project.pbxproj b/Pods/Pods.xcodeproj/project.pbxproj index a250161..f987203 100644 --- a/Pods/Pods.xcodeproj/project.pbxproj +++ b/Pods/Pods.xcodeproj/project.pbxproj @@ -255,7 +255,6 @@ 254DB7DF69C8F0DA8BAC684099B27944 /* ZLAlbumListModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = AF8E60CC4FFE37411DB7A770FFFAF5E1 /* ZLAlbumListModel.swift */; }; 259E4E7BE93D0BC02E039E94F4F54EC9 /* DDTimerKit_Private-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = C3B9A035C7BEC1919C85AB75421846A2 /* DDTimerKit_Private-umbrella.h */; settings = {ATTRIBUTES = (Project, ); }; }; 25BF5D9FAE084BAE3824007EA8E0196C /* IQToolbar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9631F1072C88BBC48AFA2BF7CBCA59CC /* IQToolbar.swift */; }; - 25D167032F1BADEC0166CC849C3C04A0 /* Pods-OrderSchedulingNotificationService-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 861E3EABF816A1CA179B292C434C7624 /* Pods-OrderSchedulingNotificationService-dummy.m */; }; 263E6DC0FCCF45948585AE8D649ADCE4 /* UICollectionView+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = ACC2B6ECA44F3143A8A1C529085F0807 /* UICollectionView+Rx.swift */; }; 2655C03CDF30A7690E43D892DDC95AB5 /* ZFPlayerLogManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 97266291DC320A65B641CCE9D069CF37 /* ZFPlayerLogManager.m */; }; 2690D1525CABCA451F9C5CE532A54A08 /* GroupBy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8FFB3800C9DA780DD5CC3CAF55481695 /* GroupBy.swift */; }; @@ -741,6 +740,7 @@ 8ED0EA8B64CA7C4860DC6D8B565F4448 /* RxCocoa.swift in Sources */ = {isa = PBXBuildFile; fileRef = E52F2B4E1FD5F2CEC9961E4EF9F04644 /* RxCocoa.swift */; }; 8EF8D0C1BE201C03A65D66C92BAD9206 /* SDWebImageDownloaderOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = A2BCC83582C6BDCBDE23D0348ED23735 /* SDWebImageDownloaderOperation.m */; }; 8F6506D57C5E1975FB46617246AB4C2E /* ConcurrentDispatchQueueScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAF52B23F1192443B3A471C3A150113B /* ConcurrentDispatchQueueScheduler.swift */; }; + 8F7C09C252C91A4C49C70B874D9AD4EF /* Pods-OrderSchedulingNotificationService-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 861E3EABF816A1CA179B292C434C7624 /* Pods-OrderSchedulingNotificationService-dummy.m */; }; 8F94DE7C574F2E68FB7F4182FF4AA19A /* JXCategoryTitleImageCellModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 5CCFCC8C4F34B1FBEAEA0BD58582B4CA /* JXCategoryTitleImageCellModel.m */; }; 8FE1214CE7BA96B6D54D9E0F7F9F3309 /* RxSwift-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = D14A4821644C229CD0DCE4E9E9944276 /* RxSwift-dummy.m */; }; 903A71840C870FA00E3A9643D2FA47AE /* DDBaseSwitch.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CB8A0EA0521BCF907B32C52CF64B913 /* DDBaseSwitch.m */; }; @@ -1299,6 +1299,13 @@ remoteGlobalIDString = 4BD4E22D3419D68A85BDD6119CB37C6C; remoteInfo = "AMapLocation-NO-IDFA"; }; + 27E7A212E4087A1CF931A95E79DCEAD5 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = BFDFE7DC352907FC980B868725387E98 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 609276B985CD7549B9F1DEE4969208FF; + remoteInfo = JPushExtension; + }; 2D56075F8D685B618D5AAA2883347508 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = BFDFE7DC352907FC980B868725387E98 /* Project object */; @@ -1369,13 +1376,6 @@ remoteGlobalIDString = A8B712B20F60AB02004557B884A28FD4; remoteInfo = DDUtilsSwiftKit_Private; }; - 62B52FBD916CBACFE791C7ED36C67E49 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = BFDFE7DC352907FC980B868725387E98 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 609276B985CD7549B9F1DEE4969208FF; - remoteInfo = JPushExtension; - }; 68BE16608307335F2CCBE1B5F97A589E /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = BFDFE7DC352907FC980B868725387E98 /* Project object */; @@ -1628,13 +1628,6 @@ remoteGlobalIDString = BFED7668E8D0960F3873C9C1329EB63F; remoteInfo = DDColorKit_Private; }; - DF1C9D195887F501675AD4FC67824C97 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = BFDFE7DC352907FC980B868725387E98 /* Project object */; - proxyType = 1; - remoteGlobalIDString = D504B99928659EA67A1C3A9E981EB8FF; - remoteInfo = JCore; - }; E262CE6FA8B45F1EF134D8B0C945E089 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = BFDFE7DC352907FC980B868725387E98 /* Project object */; @@ -1698,13 +1691,6 @@ remoteGlobalIDString = D504B99928659EA67A1C3A9E981EB8FF; remoteInfo = JCore; }; - F2C720EBD2500CA4EB54BDC6D2E1E7D5 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = BFDFE7DC352907FC980B868725387E98 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 5FB6AB0A09E7A2F2BE11AD6BAEFD9AED; - remoteInfo = JPush; - }; F4353065155B0B282D64215E6ADA3246 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = BFDFE7DC352907FC980B868725387E98 /* Project object */; @@ -3313,6 +3299,13 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 6E9E7115CE7BC24746DDEB5F0E25616D /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; 81D4EA84926136F0D0AEEBAEE01452A4 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -3439,13 +3432,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - F047D39C2DD50AA41AFFBF8518AE3BB5 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; F0DA3A06481848CDF6808E32230EFDA0 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -6904,13 +6890,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 5846EC550B42F208DB83B31241124E74 /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; 5E098BB7BE997CD5D50F43C8D362569C /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; @@ -6928,6 +6907,13 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 78CB62404BB42411C48B82E288A4EA60 /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; 8AF8013021BC9C5C63FFB8A23BC8D912 /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; @@ -7368,18 +7354,16 @@ }; 775A96192E9F3E75FE7B0644CEB05EB1 /* Pods-OrderSchedulingNotificationService */ = { isa = PBXNativeTarget; - buildConfigurationList = EFF5D2B0C639F212FB77A0749292DC44 /* Build configuration list for PBXNativeTarget "Pods-OrderSchedulingNotificationService" */; + buildConfigurationList = AE7446B97173A69641977C096891CA8C /* Build configuration list for PBXNativeTarget "Pods-OrderSchedulingNotificationService" */; buildPhases = ( - 5846EC550B42F208DB83B31241124E74 /* Headers */, - 4FB2397F5F8636A393E86B489ABA9A40 /* Sources */, - F047D39C2DD50AA41AFFBF8518AE3BB5 /* Frameworks */, + 78CB62404BB42411C48B82E288A4EA60 /* Headers */, + F0C06941B1B124C19A1B942250436C58 /* Sources */, + 6E9E7115CE7BC24746DDEB5F0E25616D /* Frameworks */, ); buildRules = ( ); dependencies = ( - A03E718FE2976D170C26342D5823F749 /* PBXTargetDependency */, - C94C8E5A84EF6263BFBA229280FCDA84 /* PBXTargetDependency */, - 13D55CD759CBB0999E7ED9050EBD138F /* PBXTargetDependency */, + 3CB6B6ECE5AF55A2155C7AAFF8567793 /* PBXTargetDependency */, ); name = "Pods-OrderSchedulingNotificationService"; productName = "Pods-OrderSchedulingNotificationService"; @@ -8571,14 +8555,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 4FB2397F5F8636A393E86B489ABA9A40 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 25D167032F1BADEC0166CC849C3C04A0 /* Pods-OrderSchedulingNotificationService-dummy.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; 577DDFE07E06E2FB7F993186B2A3D630 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -9260,6 +9236,14 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + F0C06941B1B124C19A1B942250436C58 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 8F7C09C252C91A4C49C70B874D9AD4EF /* Pods-OrderSchedulingNotificationService-dummy.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; F232AD196DD62CDB2A3B404892E213CD /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -9549,12 +9533,6 @@ target = 087B100C5691B6A3C04A45198E6C32F6 /* DDBasicControlsKit_Private */; targetProxy = B0E76501CC6888DEFCC110D4262F354B /* PBXContainerItemProxy */; }; - 13D55CD759CBB0999E7ED9050EBD138F /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = JPushExtension; - target = 609276B985CD7549B9F1DEE4969208FF /* JPushExtension */; - targetProxy = 62B52FBD916CBACFE791C7ED36C67E49 /* PBXContainerItemProxy */; - }; 15296756D9731051F31D574DC88256C0 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = JCore; @@ -9615,6 +9593,12 @@ target = 7AD0C6DCDC9CEC8A3C7C10C7FEE07BE6 /* RxCocoa */; targetProxy = D3BD1A43DE52C6DB6447D536E9EC9522 /* PBXContainerItemProxy */; }; + 3CB6B6ECE5AF55A2155C7AAFF8567793 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = JPushExtension; + target = 609276B985CD7549B9F1DEE4969208FF /* JPushExtension */; + targetProxy = 27E7A212E4087A1CF931A95E79DCEAD5 /* PBXContainerItemProxy */; + }; 3DFD07DB0446AEF9ED5E6C9E8DB63FA4 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = "AMapFoundation-NO-IDFA"; @@ -9789,12 +9773,6 @@ target = 087B100C5691B6A3C04A45198E6C32F6 /* DDBasicControlsKit_Private */; targetProxy = D715F315E978C429FE17B9A50142C8F6 /* PBXContainerItemProxy */; }; - A03E718FE2976D170C26342D5823F749 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = JCore; - target = D504B99928659EA67A1C3A9E981EB8FF /* JCore */; - targetProxy = DF1C9D195887F501675AD4FC67824C97 /* PBXContainerItemProxy */; - }; A3264F52A7FF9FEFF678DC6E5640E45F /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = JCore; @@ -9849,12 +9827,6 @@ target = 79638F3BF2709E118064EF8B13DE3317 /* DDTimerKit_Private */; targetProxy = 70C513C3602CB9F5428B2185D51C0F82 /* PBXContainerItemProxy */; }; - C94C8E5A84EF6263BFBA229280FCDA84 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = JPush; - target = 5FB6AB0A09E7A2F2BE11AD6BAEFD9AED /* JPush */; - targetProxy = F2C720EBD2500CA4EB54BDC6D2E1E7D5 /* PBXContainerItemProxy */; - }; CC20349C9FCD82703EB3BAEE609FF717 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = DDCategoryKit_Private; @@ -10903,53 +10875,6 @@ }; name = PreRelease; }; - 3318895977BAD35543BF4DFB84CBF7CE /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 7BF437F1301E282D248141EA0E4FDED5 /* Pods-OrderSchedulingNotificationService.debug.xcconfig */; - buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; - CLANG_ENABLE_OBJC_WEAK = NO; - "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; - DEVELOPMENT_TEAM = W4SG324NS4; - "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; - MACH_O_TYPE = staticlib; - OTHER_LDFLAGS = ""; - OTHER_LIBTOOLFLAGS = ""; - PODS_ROOT = "$(SRCROOT)"; - PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; - SDKROOT = iphoneos; - SKIP_INSTALL = YES; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Debug; - }; - 332D0A14216F38818FA544882A34A0F9 /* PreRelease */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = A7EC9B31B72E86761444A2C60DB92CC6 /* Pods-OrderSchedulingNotificationService.prerelease.xcconfig */; - buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; - CLANG_ENABLE_OBJC_WEAK = NO; - "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; - DEVELOPMENT_TEAM = W4SG324NS4; - "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; - MACH_O_TYPE = staticlib; - OTHER_LDFLAGS = ""; - OTHER_LIBTOOLFLAGS = ""; - PODS_ROOT = "$(SRCROOT)"; - PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; - SDKROOT = iphoneos; - SKIP_INSTALL = YES; - TARGETED_DEVICE_FAMILY = "1,2"; - VALIDATE_PRODUCT = YES; - }; - name = PreRelease; - }; 36948E31B5F7BD244184E79B3635846C /* PreRelease */ = { isa = XCBuildConfiguration; baseConfigurationReference = F375C7DA720F6C0C81573E458E9A4020 /* Pods-OrderScheduling.prerelease.xcconfig */; @@ -11022,6 +10947,29 @@ }; name = Release; }; + 443AAC2D2192D04E03EB3B4A97A49FCC /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7BF437F1301E282D248141EA0E4FDED5 /* Pods-OrderSchedulingNotificationService.debug.xcconfig */; + buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; + CLANG_ENABLE_OBJC_WEAK = NO; + "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; + DEVELOPMENT_TEAM = W4SG324NS4; + "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; + MACH_O_TYPE = staticlib; + OTHER_LDFLAGS = ""; + OTHER_LIBTOOLFLAGS = ""; + PODS_ROOT = "$(SRCROOT)"; + PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; + SDKROOT = iphoneos; + SKIP_INSTALL = YES; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Debug; + }; 4549DD8A99E980FBB0D9E6B18BA9116F /* PreRelease */ = { isa = XCBuildConfiguration; baseConfigurationReference = 023696DFCA7B38573E73AFB03BE7296D /* DDUtilsSwiftKit_Private.release.xcconfig */; @@ -11258,6 +11206,31 @@ }; name = Release; }; + 5776ED848C82B0310FAF78DF8E22D701 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 18BCA08F5CEEE178EA4B5E4C7521ECB7 /* Pods-OrderSchedulingNotificationService.release.xcconfig */; + buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; + CLANG_ENABLE_OBJC_WEAK = NO; + "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; + DEVELOPMENT_TEAM = W4SG324NS4; + "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; + MACH_O_TYPE = staticlib; + OTHER_LDFLAGS = ""; + OTHER_LIBTOOLFLAGS = ""; + PODS_ROOT = "$(SRCROOT)"; + PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; + SDKROOT = iphoneos; + SKIP_INSTALL = YES; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) RELEASE"; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; 577813FB86763A6ADFB7460A091E77EA /* PreRelease */ = { isa = XCBuildConfiguration; baseConfigurationReference = E97BA54B0DCB0A05A92A0C289CB79E32 /* JPush.release.xcconfig */; @@ -12584,6 +12557,30 @@ }; name = Release; }; + BF8138C640EDD6FDAD55B4BD35354072 /* PreRelease */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = A7EC9B31B72E86761444A2C60DB92CC6 /* Pods-OrderSchedulingNotificationService.prerelease.xcconfig */; + buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; + CLANG_ENABLE_OBJC_WEAK = NO; + "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; + DEVELOPMENT_TEAM = W4SG324NS4; + "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; + MACH_O_TYPE = staticlib; + OTHER_LDFLAGS = ""; + OTHER_LIBTOOLFLAGS = ""; + PODS_ROOT = "$(SRCROOT)"; + PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; + SDKROOT = iphoneos; + SKIP_INSTALL = YES; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + }; + name = PreRelease; + }; C4879EE709DDBAAA009F3A5FB2176461 /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = E783692AD34B705D69EF16742D95206B /* ZLPhotoBrowser.debug.xcconfig */; @@ -12731,31 +12728,6 @@ }; name = Release; }; - CCE875A28122602BDE43318515C0D48A /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 18BCA08F5CEEE178EA4B5E4C7521ECB7 /* Pods-OrderSchedulingNotificationService.release.xcconfig */; - buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; - CLANG_ENABLE_OBJC_WEAK = NO; - "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; - DEVELOPMENT_TEAM = W4SG324NS4; - "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; - MACH_O_TYPE = staticlib; - OTHER_LDFLAGS = ""; - OTHER_LIBTOOLFLAGS = ""; - PODS_ROOT = "$(SRCROOT)"; - PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; - SDKROOT = iphoneos; - SKIP_INSTALL = YES; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) RELEASE"; - TARGETED_DEVICE_FAMILY = "1,2"; - VALIDATE_PRODUCT = YES; - }; - name = Release; - }; CD3DA0777F01017D14788F47C7BEBC7A /* PreRelease */ = { isa = XCBuildConfiguration; baseConfigurationReference = 6A3B6031D40B21AC55C63D5249BF94CD /* DDBasicControlsKit_Private.release.xcconfig */; @@ -13583,6 +13555,16 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; + AE7446B97173A69641977C096891CA8C /* Build configuration list for PBXNativeTarget "Pods-OrderSchedulingNotificationService" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 443AAC2D2192D04E03EB3B4A97A49FCC /* Debug */, + BF8138C640EDD6FDAD55B4BD35354072 /* PreRelease */, + 5776ED848C82B0310FAF78DF8E22D701 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; B4F27C1BD05C95157EA376F9A95D1D93 /* Build configuration list for PBXNativeTarget "DDColorKit_Private" */ = { isa = XCConfigurationList; buildConfigurations = ( @@ -13693,16 +13675,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - EFF5D2B0C639F212FB77A0749292DC44 /* Build configuration list for PBXNativeTarget "Pods-OrderSchedulingNotificationService" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 3318895977BAD35543BF4DFB84CBF7CE /* Debug */, - 332D0A14216F38818FA544882A34A0F9 /* PreRelease */, - CCE875A28122602BDE43318515C0D48A /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; F6BDC633A594EFE95B0539379C061D7A /* Build configuration list for PBXNativeTarget "MJRefresh" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/Pods/Target Support Files/JCore/JCore.debug.xcconfig b/Pods/Target Support Files/JCore/JCore.debug.xcconfig index 0decf67..1a9a302 100644 --- a/Pods/Target Support Files/JCore/JCore.debug.xcconfig +++ b/Pods/Target Support Files/JCore/JCore.debug.xcconfig @@ -1,4 +1,3 @@ -APPLICATION_EXTENSION_API_ONLY = YES CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/JCore FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/JCore" diff --git a/Pods/Target Support Files/JCore/JCore.release.xcconfig b/Pods/Target Support Files/JCore/JCore.release.xcconfig index 0decf67..1a9a302 100644 --- a/Pods/Target Support Files/JCore/JCore.release.xcconfig +++ b/Pods/Target Support Files/JCore/JCore.release.xcconfig @@ -1,4 +1,3 @@ -APPLICATION_EXTENSION_API_ONLY = YES CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/JCore FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/JCore" diff --git a/Pods/Target Support Files/JPush/JPush.debug.xcconfig b/Pods/Target Support Files/JPush/JPush.debug.xcconfig index 530056f..4dc175d 100644 --- a/Pods/Target Support Files/JPush/JPush.debug.xcconfig +++ b/Pods/Target Support Files/JPush/JPush.debug.xcconfig @@ -1,4 +1,3 @@ -APPLICATION_EXTENSION_API_ONLY = YES CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/JPush FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/JCore" "${PODS_ROOT}/JPush" diff --git a/Pods/Target Support Files/JPush/JPush.release.xcconfig b/Pods/Target Support Files/JPush/JPush.release.xcconfig index 530056f..4dc175d 100644 --- a/Pods/Target Support Files/JPush/JPush.release.xcconfig +++ b/Pods/Target Support Files/JPush/JPush.release.xcconfig @@ -1,4 +1,3 @@ -APPLICATION_EXTENSION_API_ONLY = YES CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/JPush FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/JCore" "${PODS_ROOT}/JPush" diff --git a/Pods/Target Support Files/Pods-OrderSchedulingNotificationService/Pods-OrderSchedulingNotificationService-acknowledgements.markdown b/Pods/Target Support Files/Pods-OrderSchedulingNotificationService/Pods-OrderSchedulingNotificationService-acknowledgements.markdown index 281c5e2..0c258c6 100644 --- a/Pods/Target Support Files/Pods-OrderSchedulingNotificationService/Pods-OrderSchedulingNotificationService-acknowledgements.markdown +++ b/Pods/Target Support Files/Pods-OrderSchedulingNotificationService/Pods-OrderSchedulingNotificationService-acknowledgements.markdown @@ -1,14 +1,6 @@ # Acknowledgements This application makes use of the following third party libraries: -## JCore - -Copyright jpush.cn - -## JPush - -Copyright jiguang.cn - ## JPushExtension Copyright jiguang.cn diff --git a/Pods/Target Support Files/Pods-OrderSchedulingNotificationService/Pods-OrderSchedulingNotificationService-acknowledgements.plist b/Pods/Target Support Files/Pods-OrderSchedulingNotificationService/Pods-OrderSchedulingNotificationService-acknowledgements.plist index 8fce2ac..b710703 100644 --- a/Pods/Target Support Files/Pods-OrderSchedulingNotificationService/Pods-OrderSchedulingNotificationService-acknowledgements.plist +++ b/Pods/Target Support Files/Pods-OrderSchedulingNotificationService/Pods-OrderSchedulingNotificationService-acknowledgements.plist @@ -12,26 +12,6 @@ Type PSGroupSpecifier - - FooterText - Copyright jpush.cn - License - Copyright - Title - JCore - Type - PSGroupSpecifier - - - FooterText - Copyright jiguang.cn - License - Copyright - Title - JPush - Type - PSGroupSpecifier - FooterText Copyright jiguang.cn diff --git a/Pods/Target Support Files/Pods-OrderSchedulingNotificationService/Pods-OrderSchedulingNotificationService-umbrella.h b/Pods/Target Support Files/Pods-OrderSchedulingNotificationService/Pods-OrderSchedulingNotificationService-umbrella.h deleted file mode 100644 index e809457..0000000 --- a/Pods/Target Support Files/Pods-OrderSchedulingNotificationService/Pods-OrderSchedulingNotificationService-umbrella.h +++ /dev/null @@ -1,16 +0,0 @@ -#ifdef __OBJC__ -#import -#else -#ifndef FOUNDATION_EXPORT -#if defined(__cplusplus) -#define FOUNDATION_EXPORT extern "C" -#else -#define FOUNDATION_EXPORT extern -#endif -#endif -#endif - - -FOUNDATION_EXPORT double Pods_OrderSchedulingNotificationServiceVersionNumber; -FOUNDATION_EXPORT const unsigned char Pods_OrderSchedulingNotificationServiceVersionString[]; - diff --git a/Pods/Target Support Files/Pods-OrderSchedulingNotificationService/Pods-OrderSchedulingNotificationService.debug.xcconfig b/Pods/Target Support Files/Pods-OrderSchedulingNotificationService/Pods-OrderSchedulingNotificationService.debug.xcconfig index 51e3b8a..b484d53 100644 --- a/Pods/Target Support Files/Pods-OrderSchedulingNotificationService/Pods-OrderSchedulingNotificationService.debug.xcconfig +++ b/Pods/Target Support Files/Pods-OrderSchedulingNotificationService/Pods-OrderSchedulingNotificationService.debug.xcconfig @@ -1,9 +1,9 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO -FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/JCore" "${PODS_ROOT}/JPush" "${PODS_ROOT}/JPushExtension" +FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/JPushExtension" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 -HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/BRPickerView" "${PODS_ROOT}/Headers/Public/DDBasicControlsKit_Private" "${PODS_ROOT}/Headers/Public/DDCategoryKit_Private" "${PODS_ROOT}/Headers/Public/DDLogKit_Private" "${PODS_ROOT}/Headers/Public/DDMAMapKit_Private" "${PODS_ROOT}/Headers/Public/DDProgressHUDKit_Private" "${PODS_ROOT}/Headers/Public/DDTimerKit_Private" "${PODS_ROOT}/Headers/Public/DDWebImageKit_Private" "${PODS_ROOT}/Headers/Public/DDZFPlayerKit_Private" "${PODS_ROOT}/Headers/Public/JXCategoryView" "${PODS_ROOT}/Headers/Public/MJRefresh" "${PODS_ROOT}/Headers/Public/RxCocoa" "${PODS_ROOT}/Headers/Public/ZLPhotoBrowser" "${PODS_XCFRAMEWORKS_BUILD_DIR}/JCore/Headers" "${PODS_XCFRAMEWORKS_BUILD_DIR}/JPush/Headers" "${PODS_XCFRAMEWORKS_BUILD_DIR}/JPushExtension/Headers" -LIBRARY_SEARCH_PATHS = $(inherited) "${PODS_XCFRAMEWORKS_BUILD_DIR}/JCore" "${PODS_XCFRAMEWORKS_BUILD_DIR}/JPush" "${PODS_XCFRAMEWORKS_BUILD_DIR}/JPushExtension" -OTHER_LDFLAGS = $(inherited) -ObjC -l"JCore" -l"JPush" -l"JPushExtension" -l"resolv" -l"z" -framework "CFNetwork" -framework "CoreFoundation" -framework "CoreGraphics" -framework "CoreTelephony" -framework "Foundation" -framework "Security" -framework "SystemConfiguration" -framework "UIKit" -framework "WebKit" -weak_framework "AppTrackingTransparency" -weak_framework "UserNotifications" +HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/BRPickerView" "${PODS_ROOT}/Headers/Public/DDBasicControlsKit_Private" "${PODS_ROOT}/Headers/Public/DDCategoryKit_Private" "${PODS_ROOT}/Headers/Public/DDLogKit_Private" "${PODS_ROOT}/Headers/Public/DDMAMapKit_Private" "${PODS_ROOT}/Headers/Public/DDProgressHUDKit_Private" "${PODS_ROOT}/Headers/Public/DDTimerKit_Private" "${PODS_ROOT}/Headers/Public/DDWebImageKit_Private" "${PODS_ROOT}/Headers/Public/DDZFPlayerKit_Private" "${PODS_ROOT}/Headers/Public/JXCategoryView" "${PODS_ROOT}/Headers/Public/MJRefresh" "${PODS_ROOT}/Headers/Public/RxCocoa" "${PODS_ROOT}/Headers/Public/ZLPhotoBrowser" "${PODS_XCFRAMEWORKS_BUILD_DIR}/JPushExtension/Headers" +LIBRARY_SEARCH_PATHS = $(inherited) "${PODS_XCFRAMEWORKS_BUILD_DIR}/JPushExtension" +OTHER_LDFLAGS = $(inherited) -ObjC -l"JPushExtension" -l"resolv" -l"z" -framework "CFNetwork" -framework "CoreFoundation" -framework "CoreGraphics" -framework "CoreTelephony" -framework "Foundation" -framework "Security" -framework "SystemConfiguration" -framework "UIKit" -weak_framework "UserNotifications" PODS_BUILD_DIR = ${BUILD_DIR} PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) PODS_PODFILE_DIR_PATH = ${SRCROOT}/. diff --git a/Pods/Target Support Files/Pods-OrderSchedulingNotificationService/Pods-OrderSchedulingNotificationService.modulemap b/Pods/Target Support Files/Pods-OrderSchedulingNotificationService/Pods-OrderSchedulingNotificationService.modulemap deleted file mode 100644 index 033adaa..0000000 --- a/Pods/Target Support Files/Pods-OrderSchedulingNotificationService/Pods-OrderSchedulingNotificationService.modulemap +++ /dev/null @@ -1,6 +0,0 @@ -module Pods_OrderSchedulingNotificationService { - umbrella header "Pods-OrderSchedulingNotificationService-umbrella.h" - - export * - module * { export * } -} diff --git a/Pods/Target Support Files/Pods-OrderSchedulingNotificationService/Pods-OrderSchedulingNotificationService.prerelease.xcconfig b/Pods/Target Support Files/Pods-OrderSchedulingNotificationService/Pods-OrderSchedulingNotificationService.prerelease.xcconfig index 51e3b8a..b484d53 100644 --- a/Pods/Target Support Files/Pods-OrderSchedulingNotificationService/Pods-OrderSchedulingNotificationService.prerelease.xcconfig +++ b/Pods/Target Support Files/Pods-OrderSchedulingNotificationService/Pods-OrderSchedulingNotificationService.prerelease.xcconfig @@ -1,9 +1,9 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO -FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/JCore" "${PODS_ROOT}/JPush" "${PODS_ROOT}/JPushExtension" +FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/JPushExtension" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 -HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/BRPickerView" "${PODS_ROOT}/Headers/Public/DDBasicControlsKit_Private" "${PODS_ROOT}/Headers/Public/DDCategoryKit_Private" "${PODS_ROOT}/Headers/Public/DDLogKit_Private" "${PODS_ROOT}/Headers/Public/DDMAMapKit_Private" "${PODS_ROOT}/Headers/Public/DDProgressHUDKit_Private" "${PODS_ROOT}/Headers/Public/DDTimerKit_Private" "${PODS_ROOT}/Headers/Public/DDWebImageKit_Private" "${PODS_ROOT}/Headers/Public/DDZFPlayerKit_Private" "${PODS_ROOT}/Headers/Public/JXCategoryView" "${PODS_ROOT}/Headers/Public/MJRefresh" "${PODS_ROOT}/Headers/Public/RxCocoa" "${PODS_ROOT}/Headers/Public/ZLPhotoBrowser" "${PODS_XCFRAMEWORKS_BUILD_DIR}/JCore/Headers" "${PODS_XCFRAMEWORKS_BUILD_DIR}/JPush/Headers" "${PODS_XCFRAMEWORKS_BUILD_DIR}/JPushExtension/Headers" -LIBRARY_SEARCH_PATHS = $(inherited) "${PODS_XCFRAMEWORKS_BUILD_DIR}/JCore" "${PODS_XCFRAMEWORKS_BUILD_DIR}/JPush" "${PODS_XCFRAMEWORKS_BUILD_DIR}/JPushExtension" -OTHER_LDFLAGS = $(inherited) -ObjC -l"JCore" -l"JPush" -l"JPushExtension" -l"resolv" -l"z" -framework "CFNetwork" -framework "CoreFoundation" -framework "CoreGraphics" -framework "CoreTelephony" -framework "Foundation" -framework "Security" -framework "SystemConfiguration" -framework "UIKit" -framework "WebKit" -weak_framework "AppTrackingTransparency" -weak_framework "UserNotifications" +HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/BRPickerView" "${PODS_ROOT}/Headers/Public/DDBasicControlsKit_Private" "${PODS_ROOT}/Headers/Public/DDCategoryKit_Private" "${PODS_ROOT}/Headers/Public/DDLogKit_Private" "${PODS_ROOT}/Headers/Public/DDMAMapKit_Private" "${PODS_ROOT}/Headers/Public/DDProgressHUDKit_Private" "${PODS_ROOT}/Headers/Public/DDTimerKit_Private" "${PODS_ROOT}/Headers/Public/DDWebImageKit_Private" "${PODS_ROOT}/Headers/Public/DDZFPlayerKit_Private" "${PODS_ROOT}/Headers/Public/JXCategoryView" "${PODS_ROOT}/Headers/Public/MJRefresh" "${PODS_ROOT}/Headers/Public/RxCocoa" "${PODS_ROOT}/Headers/Public/ZLPhotoBrowser" "${PODS_XCFRAMEWORKS_BUILD_DIR}/JPushExtension/Headers" +LIBRARY_SEARCH_PATHS = $(inherited) "${PODS_XCFRAMEWORKS_BUILD_DIR}/JPushExtension" +OTHER_LDFLAGS = $(inherited) -ObjC -l"JPushExtension" -l"resolv" -l"z" -framework "CFNetwork" -framework "CoreFoundation" -framework "CoreGraphics" -framework "CoreTelephony" -framework "Foundation" -framework "Security" -framework "SystemConfiguration" -framework "UIKit" -weak_framework "UserNotifications" PODS_BUILD_DIR = ${BUILD_DIR} PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) PODS_PODFILE_DIR_PATH = ${SRCROOT}/. diff --git a/Pods/Target Support Files/Pods-OrderSchedulingNotificationService/Pods-OrderSchedulingNotificationService.release.xcconfig b/Pods/Target Support Files/Pods-OrderSchedulingNotificationService/Pods-OrderSchedulingNotificationService.release.xcconfig index 51e3b8a..b484d53 100644 --- a/Pods/Target Support Files/Pods-OrderSchedulingNotificationService/Pods-OrderSchedulingNotificationService.release.xcconfig +++ b/Pods/Target Support Files/Pods-OrderSchedulingNotificationService/Pods-OrderSchedulingNotificationService.release.xcconfig @@ -1,9 +1,9 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO -FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/JCore" "${PODS_ROOT}/JPush" "${PODS_ROOT}/JPushExtension" +FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/JPushExtension" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 -HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/BRPickerView" "${PODS_ROOT}/Headers/Public/DDBasicControlsKit_Private" "${PODS_ROOT}/Headers/Public/DDCategoryKit_Private" "${PODS_ROOT}/Headers/Public/DDLogKit_Private" "${PODS_ROOT}/Headers/Public/DDMAMapKit_Private" "${PODS_ROOT}/Headers/Public/DDProgressHUDKit_Private" "${PODS_ROOT}/Headers/Public/DDTimerKit_Private" "${PODS_ROOT}/Headers/Public/DDWebImageKit_Private" "${PODS_ROOT}/Headers/Public/DDZFPlayerKit_Private" "${PODS_ROOT}/Headers/Public/JXCategoryView" "${PODS_ROOT}/Headers/Public/MJRefresh" "${PODS_ROOT}/Headers/Public/RxCocoa" "${PODS_ROOT}/Headers/Public/ZLPhotoBrowser" "${PODS_XCFRAMEWORKS_BUILD_DIR}/JCore/Headers" "${PODS_XCFRAMEWORKS_BUILD_DIR}/JPush/Headers" "${PODS_XCFRAMEWORKS_BUILD_DIR}/JPushExtension/Headers" -LIBRARY_SEARCH_PATHS = $(inherited) "${PODS_XCFRAMEWORKS_BUILD_DIR}/JCore" "${PODS_XCFRAMEWORKS_BUILD_DIR}/JPush" "${PODS_XCFRAMEWORKS_BUILD_DIR}/JPushExtension" -OTHER_LDFLAGS = $(inherited) -ObjC -l"JCore" -l"JPush" -l"JPushExtension" -l"resolv" -l"z" -framework "CFNetwork" -framework "CoreFoundation" -framework "CoreGraphics" -framework "CoreTelephony" -framework "Foundation" -framework "Security" -framework "SystemConfiguration" -framework "UIKit" -framework "WebKit" -weak_framework "AppTrackingTransparency" -weak_framework "UserNotifications" +HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/BRPickerView" "${PODS_ROOT}/Headers/Public/DDBasicControlsKit_Private" "${PODS_ROOT}/Headers/Public/DDCategoryKit_Private" "${PODS_ROOT}/Headers/Public/DDLogKit_Private" "${PODS_ROOT}/Headers/Public/DDMAMapKit_Private" "${PODS_ROOT}/Headers/Public/DDProgressHUDKit_Private" "${PODS_ROOT}/Headers/Public/DDTimerKit_Private" "${PODS_ROOT}/Headers/Public/DDWebImageKit_Private" "${PODS_ROOT}/Headers/Public/DDZFPlayerKit_Private" "${PODS_ROOT}/Headers/Public/JXCategoryView" "${PODS_ROOT}/Headers/Public/MJRefresh" "${PODS_ROOT}/Headers/Public/RxCocoa" "${PODS_ROOT}/Headers/Public/ZLPhotoBrowser" "${PODS_XCFRAMEWORKS_BUILD_DIR}/JPushExtension/Headers" +LIBRARY_SEARCH_PATHS = $(inherited) "${PODS_XCFRAMEWORKS_BUILD_DIR}/JPushExtension" +OTHER_LDFLAGS = $(inherited) -ObjC -l"JPushExtension" -l"resolv" -l"z" -framework "CFNetwork" -framework "CoreFoundation" -framework "CoreGraphics" -framework "CoreTelephony" -framework "Foundation" -framework "Security" -framework "SystemConfiguration" -framework "UIKit" -weak_framework "UserNotifications" PODS_BUILD_DIR = ${BUILD_DIR} PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) PODS_PODFILE_DIR_PATH = ${SRCROOT}/. diff --git a/fastlane/Fastfile b/fastlane/Fastfile index a259ea8..9d0aadf 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -20,18 +20,50 @@ platform :ios do lane :debug do # add actions here: https://docs.fastlane.tools/actions gym( - scheme:"OrderScheduling", + scheme:"Debug", workspace:"OrderScheduling.xcworkspace", clean:true, output_directory:"/Users/zd/Desktop/Ipa包/中道调度/Debug", - output_name:"drivers_debug", + output_name:"OrderScheduling_debug", configuration:"Debug", include_symbols:true, build_path:"/Users/zd/Desktop/Ipa包/中道调度/Debug", archive_path:"/Users/zd/Desktop/Ipa包/中道调度/Debug", include_bitcode: false, - export_method:"development" + export_method:"development", + export_options: { + signingStyle: 'development', + provisioningProfiles: { + "com.sino.supplier.OrderSchedulingNotificationService" => "sino supplier notification service extension", + "com.sino.supplier" => "sup dev" + } + } ) pgyer(api_key: "f024760fe1519016c3a61b7a29f19dcb", update_description: "开发环境") end + +lane :preRelease do + # add actions here: https://docs.fastlane.tools/actions + gym( + scheme:"PreRelease", + workspace:"OrderScheduling.xcworkspace", + clean:true, + output_directory:"/Users/zd/Desktop/Ipa包/中道调度/PreRelease/", + output_name:"OrderScheduling_adhoc", + configuration:"ADHOC", + include_symbols:true, + build_path:"/Users/zd/Desktop/Ipa包/中道调度/PreRelease/", + archive_path:"/Users/zd/Desktop/Ipa包/中道调度/PreRelease/", + include_bitcode: false, + export_method:"ad-hoc", + export_options: { + signingStyle: 'ad-hoc', + provisioningProfiles: { + "com.sino.supplier.OrderSchedulingNotificationService" => "sino supplier notification service extension adhoc", + "com.sino.supplier" => "supplier adhoc" + } + } + ) + pgyer(api_key: "f024760fe1519016c3a61b7a29f19dcb", update_description: "模拟环境") + end end diff --git a/fastlane/README.md b/fastlane/README.md index 65900ac..5af394f 100644 --- a/fastlane/README.md +++ b/fastlane/README.md @@ -23,6 +23,14 @@ For _fastlane_ installation instructions, see [Installing _fastlane_](https://do Description of what the lane does +### ios preRelease + +```sh +[bundle exec] fastlane ios preRelease +``` + + + ---- This README.md is auto-generated and will be re-generated every time [_fastlane_](https://fastlane.tools) is run. diff --git a/fastlane/report.xml b/fastlane/report.xml index 2b2e314..24bbf82 100644 --- a/fastlane/report.xml +++ b/fastlane/report.xml @@ -5,17 +5,17 @@ - + - + - +