diff --git a/OrderScheduling.xcodeproj/project.pbxproj b/OrderScheduling.xcodeproj/project.pbxproj index 9b22608..c9098f2 100644 --- a/OrderScheduling.xcodeproj/project.pbxproj +++ b/OrderScheduling.xcodeproj/project.pbxproj @@ -50,7 +50,6 @@ 79CECC282A8CADEA00B95D8B /* VehicleMonitoringVideoDetailController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79CECC272A8CADEA00B95D8B /* VehicleMonitoringVideoDetailController.swift */; }; 79DD0DA82A9480D000768FE7 /* NotificationAuthView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79DD0DA72A9480D000768FE7 /* NotificationAuthView.swift */; }; 79DD0DAA2A9481BC00768FE7 /* NotificationAuthTool.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79DD0DA92A9481BC00768FE7 /* NotificationAuthTool.swift */; }; - 79DD0DAD2A94A0EE00768FE7 /* LaunchImage.png in Resources */ = {isa = PBXBuildFile; fileRef = 79DD0DAC2A94A0EE00768FE7 /* LaunchImage.png */; }; 79DD0DB12A94B3DB00768FE7 /* EmptyView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79DD0DB02A94B3DB00768FE7 /* EmptyView.swift */; }; 79DD0DB42A95F00B00768FE7 /* Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79DD0DB32A95F00B00768FE7 /* Extension.swift */; }; 79DD0DBB2A971EB300768FE7 /* ZDViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79DD0DBA2A971EB300768FE7 /* ZDViewController.swift */; }; @@ -154,7 +153,6 @@ 79DD0DA62A946B2500768FE7 /* OrderSchedulingDebug.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = OrderSchedulingDebug.entitlements; sourceTree = ""; }; 79DD0DA72A9480D000768FE7 /* NotificationAuthView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationAuthView.swift; sourceTree = ""; }; 79DD0DA92A9481BC00768FE7 /* NotificationAuthTool.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationAuthTool.swift; sourceTree = ""; }; - 79DD0DAC2A94A0EE00768FE7 /* LaunchImage.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = LaunchImage.png; sourceTree = ""; }; 79DD0DB02A94B3DB00768FE7 /* EmptyView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmptyView.swift; sourceTree = ""; }; 79DD0DB32A95F00B00768FE7 /* Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Extension.swift; sourceTree = ""; }; 79DD0DBA2A971EB300768FE7 /* ZDViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ZDViewController.swift; sourceTree = ""; }; @@ -603,7 +601,6 @@ 79DD0DAB2A94A0EE00768FE7 /* Source */ = { isa = PBXGroup; children = ( - 79DD0DAC2A94A0EE00768FE7 /* LaunchImage.png */, 79FB760E2A9C6CAF00DB00A4 /* newJuheOrderAudio.wav */, 79FB76122A9C6CC100DB00A4 /* newOrderAudio.wav */, ); @@ -809,7 +806,6 @@ 79EAD8172A7B86610036E093 /* LaunchScreen.storyboard in Resources */, 79EAD8142A7B86610036E093 /* Assets.xcassets in Resources */, 79FB76132A9C6CC100DB00A4 /* newOrderAudio.wav in Resources */, - 79DD0DAD2A94A0EE00768FE7 /* LaunchImage.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate index 195e92e..215a113 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 61fe1c2..6c81f4b 100644 --- a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -555,8 +555,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "776" - endingLineNumber = "776" + startingLineNumber = "777" + endingLineNumber = "777" landmarkName = "collectionView(_:cellForItemAt:)" landmarkType = "7"> @@ -571,8 +571,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "777" - endingLineNumber = "777" + startingLineNumber = "778" + endingLineNumber = "778" landmarkName = "collectionView(_:cellForItemAt:)" landmarkType = "7"> @@ -1322,8 +1322,8 @@ filePath = "OrderScheduling/Common/WebView/WebViewController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "101" - endingLineNumber = "101" + startingLineNumber = "107" + endingLineNumber = "107" landmarkName = "userContentController(_:didReceive:)" landmarkType = "7"> @@ -1338,8 +1338,8 @@ filePath = "OrderScheduling/Common/WebView/WebViewController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "105" - endingLineNumber = "105" + startingLineNumber = "111" + endingLineNumber = "111" landmarkName = "userContentController(_:didReceive:)" landmarkType = "7"> @@ -1881,8 +1881,8 @@ filePath = "OrderScheduling/Common/WebView/WebViewController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "110" - endingLineNumber = "110" + startingLineNumber = "116" + endingLineNumber = "116" landmarkName = "webView(_:didFinish:)" landmarkType = "7"> @@ -1897,8 +1897,8 @@ filePath = "OrderScheduling/Common/WebView/WebViewController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "117" - endingLineNumber = "117" + startingLineNumber = "123" + endingLineNumber = "123" landmarkName = "webView(_:didFail:withError:)" landmarkType = "7"> @@ -1913,8 +1913,8 @@ filePath = "OrderScheduling/Common/WebView/WebViewController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "125" - endingLineNumber = "125" + startingLineNumber = "131" + endingLineNumber = "131" landmarkName = "webView(_:didFailProvisionalNavigation:withError:)" landmarkType = "7"> @@ -1929,8 +1929,8 @@ filePath = "OrderScheduling/Common/WebView/WebViewController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "124" - endingLineNumber = "124" + startingLineNumber = "130" + endingLineNumber = "130" landmarkName = "webView(_:didFailProvisionalNavigation:withError:)" landmarkType = "7"> @@ -2413,7 +2413,7 @@ BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/OrderScheduling/Base.lproj/LaunchScreen.storyboard b/OrderScheduling/Base.lproj/LaunchScreen.storyboard index eeb4cc5..2b65209 100644 --- a/OrderScheduling/Base.lproj/LaunchScreen.storyboard +++ b/OrderScheduling/Base.lproj/LaunchScreen.storyboard @@ -4,6 +4,7 @@ + @@ -16,10 +17,11 @@ - + + @@ -36,7 +38,6 @@ - diff --git a/OrderScheduling/Common/WebView/WebViewController.swift b/OrderScheduling/Common/WebView/WebViewController.swift index 7b12c5a..3bea5e3 100644 --- a/OrderScheduling/Common/WebView/WebViewController.swift +++ b/OrderScheduling/Common/WebView/WebViewController.swift @@ -40,7 +40,7 @@ class WebViewController : DDViewController { open override func viewDidLoad() { super.viewDidLoad() - webView.scrollView.contentInsetAdjustmentBehavior = .never + webView.scrollView.contentInset = UIEdgeInsets(top: -view.safeAreaInsets.top, left: 0, bottom: 0, right: 0) webView.backgroundColor = .white webView.navigationDelegate = self webView.uiDelegate = self @@ -54,6 +54,18 @@ class WebViewController : DDViewController { dd_navigationBarBackgroundColor = .clear view.addSubview(statusBarBackgroundView) + }else{ + title = vcTitle + dd_navigationBarBackgroundColor = .hex("354683") + dd_navigationBarTitleTextAttributes = [.foregroundColor : UIColor.white(alpha: 0.7),.font:UIFont.mediumFont(17)] + } + + view.dd_showHUD() + } + + override func viewWillLayoutSubviews() { + super.viewWillLayoutSubviews() + if showNavBar == false { statusBarBackgroundView.snp.makeConstraints { make in make.top.left.right.equalToSuperview() make.height.equalTo(CGRectGetHeight(UIApplication.shared.dd_statusBarFrame)) @@ -61,22 +73,16 @@ class WebViewController : DDViewController { webView.snp.makeConstraints { make in make.left.right.equalToSuperview() - make.top.equalTo(CGRectGetHeight(UIApplication.shared.dd_statusBarFrame)) + make.top.equalTo(CGRectGetHeight(UIApplication.shared.dd_statusBarFrame) - view.safeAreaInsets.top) make.bottom.equalTo(-view.safeAreaInsets.bottom) } }else{ - title = vcTitle - dd_navigationBarBackgroundColor = .hex("354683") - dd_navigationBarTitleTextAttributes = [.foregroundColor : UIColor.white(alpha: 0.7),.font:UIFont.mediumFont(17)] - webView.snp.makeConstraints { make in make.left.right.equalToSuperview() make.top.equalTo(CGRectGetHeight(navigationController?.navigationBar.frame ?? .zero) + CGRectGetHeight(UIApplication.shared.dd_statusBarFrame)) make.bottom.equalTo(-view.safeAreaInsets.bottom) } } - - view.dd_showHUD() } override func viewWillAppear(_ animated: Bool) { diff --git a/OrderScheduling/History/ViewController/HistoryController.swift b/OrderScheduling/History/ViewController/HistoryController.swift index 9069ab4..7d8bc31 100644 --- a/OrderScheduling/History/ViewController/HistoryController.swift +++ b/OrderScheduling/History/ViewController/HistoryController.swift @@ -148,6 +148,7 @@ extension HistoryItemController : UITableViewDelegate, UITableViewDataSource { cell = HistoryItemCell(style: .default, reuseIdentifier: "cell") cell?.line.backgroundColor = .hex("E9E9EA").alpha(0.6) cell?.orderDateTitleLabel.text = "工单时间:" + cell?.orderStatusTitleLabel.text = "状态:" cell?.serviceTitleLabel.text = "故障地:" cell?.reportButton.setTitle("报备", for: .normal) cell?.additionalButton.setTitle("补结算单", for: .normal) @@ -261,7 +262,7 @@ open class HistoryController : ZDViewController { super.viewDidLoad() dd_navigationBarBackgroundColor = .hex("354683") dd_navigationBarTitleTextAttributes = [.foregroundColor : UIColor.white(alpha: 0.7),.font:UIFont.mediumFont(auto(15))] - dd_navigationItemTitle = "救援工单" + dd_navigationItemTitle = "历史工单" navigationItem.leftBarButtonItems = nil addSubviews() addActions() @@ -367,6 +368,7 @@ class HistoryItemCell : DDTableViewCell { public let radiusView : DDView public let typeLabel : DDLabel public let orderNumLabel : DDLabel + public let orderStatusTitleLabel : DDLabel public let orderStatusLabel : DDLabel public let line : DDView public let orderDateTitleLabel : DDLabel @@ -387,6 +389,7 @@ class HistoryItemCell : DDTableViewCell { radiusView = DDView.init() typeLabel = DDLabel.dd_init(withText: "", font: .mediumFont(auto(13)), textColor: .hex("000000").alpha(0.85)) orderNumLabel = DDLabel.dd_init(withText: "", font: .mediumFont(auto(11)), textColor: .hex("000000").alpha(0.55)) + orderStatusTitleLabel = DDLabel.dd_init(withText: "", font: .mediumFont(auto(12)), textColor: .hex("000000").alpha(0.5)) orderStatusLabel = DDLabel.dd_init(withText: "", font: .mediumFont(auto(12)), textColor: .hex("E69B0B")) line = DDView.init() orderDateTitleLabel = DDLabel.dd_init(withText: "", font: .mediumFont(auto(12)), textColor: .hex("000000").alpha(0.5)) @@ -418,8 +421,8 @@ class HistoryItemCell : DDTableViewCell { contentView.addSubview(radiusView) radiusView.addSubview(typeLabel) radiusView.addSubview(orderNumLabel) + radiusView.addSubview(orderStatusTitleLabel) orderStatusLabel.numberOfLines = 0 - orderStatusLabel.textAlignment = .right radiusView.addSubview(orderStatusLabel) radiusView.addSubview(line) radiusView.addSubview(orderDateTitleLabel) @@ -460,13 +463,6 @@ class HistoryItemCell : DDTableViewCell { make.left.equalTo(typeLabel.snp.right).offset(auto(10)) } - orderStatusLabel.setContentCompressionResistancePriority(.defaultLow, for: .horizontal) - orderStatusLabel.snp.makeConstraints { make in - make.right.equalTo(-auto(15)) - make.centerY.equalTo(orderNumLabel) - make.left.equalTo(orderNumLabel.snp.right).offset(0) - } - line.snp.makeConstraints { make in make.top.equalTo(typeLabel.snp.bottom).offset(auto(7)) make.left.right.equalTo(0) @@ -484,8 +480,20 @@ class HistoryItemCell : DDTableViewCell { make.top.equalTo(orderDateTitleLabel) } - serviceTitleLabel.snp.makeConstraints { make in + orderStatusTitleLabel.snp.makeConstraints { make in + make.left.equalTo(typeLabel) make.top.equalTo(orderDateLabel.snp.bottom).offset(auto(8)) + make.width.equalTo(orderDateTitleLabel) + } + + orderStatusLabel.snp.makeConstraints { make in + make.right.equalTo(-auto(20)) + make.top.equalTo(orderStatusTitleLabel) + make.left.equalTo(orderStatusTitleLabel.snp.right) + } + + serviceTitleLabel.snp.makeConstraints { make in + make.top.equalTo(orderStatusLabel.snp.bottom).offset(auto(8)) make.left.equalTo(typeLabel) make.width.equalTo(orderDateTitleLabel) } diff --git a/OrderScheduling/Login/ViewController/LoginController.swift b/OrderScheduling/Login/ViewController/LoginController.swift index d32ae52..b8b0332 100644 --- a/OrderScheduling/Login/ViewController/LoginController.swift +++ b/OrderScheduling/Login/ViewController/LoginController.swift @@ -280,6 +280,7 @@ class LoginView : DDView { agreeButton.contentMode = .scaleAspectFill inputContentView.addSubview(agreeButton) inputContentView.addSubview(agreeTextView) + loginButton.isEnabled = false addSubview(loginButton) backgroundImageView.snp.makeConstraints { make in diff --git a/OrderScheduling/Main/AppDelegate.swift b/OrderScheduling/Main/AppDelegate.swift index 87eef85..4ca8cde 100644 --- a/OrderScheduling/Main/AppDelegate.swift +++ b/OrderScheduling/Main/AppDelegate.swift @@ -114,7 +114,7 @@ extension AppDelegate : JPUSHRegisterDelegate { func jpushNotificationCenter(_ center: UNUserNotificationCenter, didReceive response: UNNotificationResponse, withCompletionHandler completionHandler: (() -> Void)) { let userInfo = response.notification.request.content.userInfo if response.notification.request.trigger?.isKind(of: UNPushNotificationTrigger.self) == true { - self.userInfo = userInfo +// self.userInfo = userInfo JPUSHService.resetBadge() UIApplication.shared.applicationIconBadgeNumber = 0 JPUSHService.handleRemoteNotification(userInfo) diff --git a/OrderScheduling/Main/SceneDelegate.swift b/OrderScheduling/Main/SceneDelegate.swift index 449f8f8..e14e084 100644 --- a/OrderScheduling/Main/SceneDelegate.swift +++ b/OrderScheduling/Main/SceneDelegate.swift @@ -37,10 +37,10 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate { JPUSHService.resetBadge() UIApplication.shared.applicationIconBadgeNumber = 0 - let delegate = UIApplication.shared.delegate as? AppDelegate - if delegate?.userInfo != nil { - ACCEPTORDERTOOL.open(userInfo: delegate?.userInfo) - delegate?.userInfo = nil + let userDefault = UserDefaults.init(suiteName: "group.com.sino.supplier") + if let userInfo = userDefault?.object(forKey: "bestAttemptContentUserInfo") as? [AnyHashable:Any] { + ACCEPTORDERTOOL.open(userInfo: userInfo) + userDefault?.setValue(nil, forKey: "bestAttemptContentUserInfo") } } diff --git a/OrderScheduling/OrderSchedulingDebug.entitlements b/OrderScheduling/OrderSchedulingDebug.entitlements index 903def2..6c961f0 100644 --- a/OrderScheduling/OrderSchedulingDebug.entitlements +++ b/OrderScheduling/OrderSchedulingDebug.entitlements @@ -4,5 +4,9 @@ aps-environment development + com.apple.security.application-groups + + group.com.sino.supplier + diff --git a/OrderScheduling/OrderSchedulingRelease.entitlements b/OrderScheduling/OrderSchedulingRelease.entitlements index 903def2..6c961f0 100644 --- a/OrderScheduling/OrderSchedulingRelease.entitlements +++ b/OrderScheduling/OrderSchedulingRelease.entitlements @@ -4,5 +4,9 @@ aps-environment development + com.apple.security.application-groups + + group.com.sino.supplier + diff --git a/OrderScheduling/Rescue/ViewController/RescueController.swift b/OrderScheduling/Rescue/ViewController/RescueController.swift index 6fa0dcc..9fbae17 100644 --- a/OrderScheduling/Rescue/ViewController/RescueController.swift +++ b/OrderScheduling/Rescue/ViewController/RescueController.swift @@ -684,6 +684,7 @@ extension RescueIsIngController : UITableViewDelegate,UITableViewDataSource { if cell == nil { cell = RescueIsIngCell(style: .default, reuseIdentifier: "cell") cell?.line.backgroundColor = .hex("E9E9EA").alpha(0.6) + cell?.orderStatusTitleLabel.text = "状态:" cell?.serviceTitleLabel.text = "故障地:" cell?.destinationTitleLabel.text = "目的地:" cell?.reportButton.setTitle("报备", for: .normal) @@ -1500,6 +1501,7 @@ class RescueIsIngCell : DDTableViewCell { public let radiusView : DDView public let typeLabel : DDLabel public let orderNumLabel : DDLabel + public let orderStatusTitleLabel : DDLabel public let orderStatusLabel : DDLabel public let line : DDView public let orderDateLabel : DDLabel @@ -1516,6 +1518,7 @@ class RescueIsIngCell : DDTableViewCell { radiusView = DDView.init() typeLabel = DDLabel.dd_init(withText: "", font: .mediumFont(auto(13)), textColor: .hex("000000").alpha(0.85)) orderNumLabel = DDLabel.dd_init(withText: "", font: .mediumFont(auto(11)), textColor: .hex("000000").alpha(0.55)) + orderStatusTitleLabel = DDLabel.dd_init(withText: "", font: .mediumFont(auto(12)), textColor: .hex("000000").alpha(0.5)) orderStatusLabel = DDLabel.dd_init(withText: "", font: .mediumFont(auto(12)), textColor: .hex("E69B0B")) line = DDView.init() orderDateLabel = DDLabel.dd_init(withText: "", font: .mediumFont(auto(12)), textColor: .hex("252525")) @@ -1543,8 +1546,8 @@ class RescueIsIngCell : DDTableViewCell { contentView.addSubview(radiusView) radiusView.addSubview(typeLabel) radiusView.addSubview(orderNumLabel) + radiusView.addSubview(orderStatusTitleLabel) orderStatusLabel.numberOfLines = 0 - orderStatusLabel.textAlignment = .right radiusView.addSubview(orderStatusLabel) radiusView.addSubview(line) radiusView.addSubview(orderDateLabel) @@ -1574,19 +1577,12 @@ class RescueIsIngCell : DDTableViewCell { make.left.equalTo(auto(18)) make.top.equalTo(auto(13)) } - orderNumLabel.setContentCompressionResistancePriority(.defaultHigh, for: .horizontal) + orderNumLabel.snp.makeConstraints { make in make.centerY.equalTo(typeLabel) make.left.equalTo(typeLabel.snp.right).offset(auto(10)) } - orderStatusLabel.setContentCompressionResistancePriority(.defaultLow, for: .horizontal) - orderStatusLabel.snp.makeConstraints { make in - make.right.equalTo(-auto(20)) - make.centerY.equalTo(orderNumLabel) - make.left.equalTo(orderNumLabel.snp.right).offset(auto(5)) - } - line.snp.makeConstraints { make in make.top.equalTo(typeLabel.snp.bottom).offset(auto(7)) make.left.right.equalTo(0) @@ -1603,12 +1599,24 @@ class RescueIsIngCell : DDTableViewCell { make.centerY.equalTo(orderDateLabel) } - serviceTitleLabel.snp.makeConstraints { make in + orderStatusTitleLabel.snp.makeConstraints { make in make.top.equalTo(driverLabel.snp.bottom).offset(auto(8)) make.left.equalTo(typeLabel) make.width.equalTo(auto(60)) } + orderStatusLabel.snp.makeConstraints { make in + make.right.equalTo(-auto(20)) + make.top.equalTo(orderStatusTitleLabel) + make.left.equalTo(orderStatusTitleLabel.snp.right) + } + + serviceTitleLabel.snp.makeConstraints { make in + make.top.equalTo(orderStatusLabel.snp.bottom).offset(auto(8)) + make.left.equalTo(typeLabel) + make.width.equalTo(orderStatusTitleLabel) + } + serviceLabel.snp.makeConstraints { make in make.top.equalTo(serviceTitleLabel) make.left.equalTo(serviceTitleLabel.snp.right) diff --git a/OrderScheduling/Source/LaunchImage.png b/OrderScheduling/Source/LaunchImage.png deleted file mode 100644 index a2bb870..0000000 Binary files a/OrderScheduling/Source/LaunchImage.png and /dev/null differ diff --git a/OrderSchedulingNotificationService/NotificationService.swift b/OrderSchedulingNotificationService/NotificationService.swift index 0360246..b6080d7 100644 --- a/OrderSchedulingNotificationService/NotificationService.swift +++ b/OrderSchedulingNotificationService/NotificationService.swift @@ -32,6 +32,9 @@ class NotificationService: UNNotificationServiceExtension { } } + let userDefault = UserDefaults.init(suiteName: "group.com.sino.supplier") + userDefault?.setValue(userInfo, forKey: "bestAttemptContentUserInfo") + JPushNotificationExtensionService.jpushSetAppkey("259b546bb2aaf5f02ffa2547") JPushNotificationExtensionService.jpushReceive(request) { contentHandler(request.content) diff --git a/OrderSchedulingNotificationService/OrderSchedulingNotificationService.entitlements b/OrderSchedulingNotificationService/OrderSchedulingNotificationService.entitlements index 0c67376..41d6fc3 100644 --- a/OrderSchedulingNotificationService/OrderSchedulingNotificationService.entitlements +++ b/OrderSchedulingNotificationService/OrderSchedulingNotificationService.entitlements @@ -1,5 +1,10 @@ - + + com.apple.security.application-groups + + group.com.sino.supplier + +