diff --git a/ios/PushDeer-iOS/Notification/NotificationService.swift b/ios/PushDeer-iOS/Notification/NotificationService.swift index 2a84990..92ce176 100644 --- a/ios/PushDeer-iOS/Notification/NotificationService.swift +++ b/ios/PushDeer-iOS/Notification/NotificationService.swift @@ -17,15 +17,16 @@ class NotificationService: UNNotificationServiceExtension { self.contentHandler = contentHandler bestAttemptContent = (request.content.mutableCopy() as? UNMutableNotificationContent) + NSLog("push-userInfo: %@", bestAttemptContent?.userInfo ?? "") + // 刷新所有桌面小部件 + WidgetCenter.shared.reloadAllTimelines() + if let bestAttemptContent = bestAttemptContent { // Modify the notification content here... // bestAttemptContent.title = "\(bestAttemptContent.title) [modified]" contentHandler(bestAttemptContent) } - - // 刷新所有桌面小部件 - WidgetCenter.shared.reloadAllTimelines() } override func serviceExtensionTimeWillExpire() { diff --git a/ios/PushDeer-iOS/PushDeer/AppDelegate.swift b/ios/PushDeer-iOS/PushDeer/AppDelegate.swift index 9ea971a..9fca6ec 100644 --- a/ios/PushDeer-iOS/PushDeer/AppDelegate.swift +++ b/ios/PushDeer-iOS/PushDeer/AppDelegate.swift @@ -56,7 +56,7 @@ class AppDelegate: NSObject, UIApplicationDelegate, UNUserNotificationCenterDele } func userNotificationCenter(_ center: UNUserNotificationCenter, willPresent notification: UNNotification) async -> UNNotificationPresentationOptions { - print("willPresent:", notification.request.content.userInfo) + NSLog("willPresent: %@", notification.request.content.userInfo) Task { // 收到推送后, 刷新本地消息列表 let messageItems = try await HttpRequest.getMessages().messages @@ -66,7 +66,7 @@ class AppDelegate: NSObject, UIApplicationDelegate, UNUserNotificationCenterDele } func userNotificationCenter(_ center: UNUserNotificationCenter, didReceive response: UNNotificationResponse) async { - print("didReceive:", response.notification.request.content.userInfo) + NSLog("didReceive: %@", response.notification.request.content.userInfo) } } diff --git a/ios/PushDeer-iOS/PushDeer/Assets.xcassets/AppIcon-SH.appiconset/128.png b/ios/PushDeer-iOS/PushDeer/Assets.xcassets/AppIcon-SH.appiconset/128.png deleted file mode 100644 index 33e313c..0000000 Binary files a/ios/PushDeer-iOS/PushDeer/Assets.xcassets/AppIcon-SH.appiconset/128.png and /dev/null differ diff --git a/ios/PushDeer-iOS/PushDeer/Assets.xcassets/AppIcon-SH.appiconset/16.png b/ios/PushDeer-iOS/PushDeer/Assets.xcassets/AppIcon-SH.appiconset/16.png deleted file mode 100644 index 3a165e0..0000000 Binary files a/ios/PushDeer-iOS/PushDeer/Assets.xcassets/AppIcon-SH.appiconset/16.png and /dev/null differ diff --git a/ios/PushDeer-iOS/PushDeer/Assets.xcassets/AppIcon-SH.appiconset/172.png b/ios/PushDeer-iOS/PushDeer/Assets.xcassets/AppIcon-SH.appiconset/172.png deleted file mode 100644 index 5f2b527..0000000 Binary files a/ios/PushDeer-iOS/PushDeer/Assets.xcassets/AppIcon-SH.appiconset/172.png and /dev/null differ diff --git a/ios/PushDeer-iOS/PushDeer/Assets.xcassets/AppIcon-SH.appiconset/196.png b/ios/PushDeer-iOS/PushDeer/Assets.xcassets/AppIcon-SH.appiconset/196.png deleted file mode 100644 index 2c91c45..0000000 Binary files a/ios/PushDeer-iOS/PushDeer/Assets.xcassets/AppIcon-SH.appiconset/196.png and /dev/null differ diff --git a/ios/PushDeer-iOS/PushDeer/Assets.xcassets/AppIcon-SH.appiconset/216.png b/ios/PushDeer-iOS/PushDeer/Assets.xcassets/AppIcon-SH.appiconset/216.png deleted file mode 100644 index 0e15495..0000000 Binary files a/ios/PushDeer-iOS/PushDeer/Assets.xcassets/AppIcon-SH.appiconset/216.png and /dev/null differ diff --git a/ios/PushDeer-iOS/PushDeer/Assets.xcassets/AppIcon-SH.appiconset/256.png b/ios/PushDeer-iOS/PushDeer/Assets.xcassets/AppIcon-SH.appiconset/256.png deleted file mode 100644 index 7769706..0000000 Binary files a/ios/PushDeer-iOS/PushDeer/Assets.xcassets/AppIcon-SH.appiconset/256.png and /dev/null differ diff --git a/ios/PushDeer-iOS/PushDeer/Assets.xcassets/AppIcon-SH.appiconset/32.png b/ios/PushDeer-iOS/PushDeer/Assets.xcassets/AppIcon-SH.appiconset/32.png deleted file mode 100644 index f88bb99..0000000 Binary files a/ios/PushDeer-iOS/PushDeer/Assets.xcassets/AppIcon-SH.appiconset/32.png and /dev/null differ diff --git a/ios/PushDeer-iOS/PushDeer/Assets.xcassets/AppIcon-SH.appiconset/48.png b/ios/PushDeer-iOS/PushDeer/Assets.xcassets/AppIcon-SH.appiconset/48.png deleted file mode 100644 index 80fd87a..0000000 Binary files a/ios/PushDeer-iOS/PushDeer/Assets.xcassets/AppIcon-SH.appiconset/48.png and /dev/null differ diff --git a/ios/PushDeer-iOS/PushDeer/Assets.xcassets/AppIcon-SH.appiconset/512.png b/ios/PushDeer-iOS/PushDeer/Assets.xcassets/AppIcon-SH.appiconset/512.png deleted file mode 100644 index 3431240..0000000 Binary files a/ios/PushDeer-iOS/PushDeer/Assets.xcassets/AppIcon-SH.appiconset/512.png and /dev/null differ diff --git a/ios/PushDeer-iOS/PushDeer/Assets.xcassets/AppIcon-SH.appiconset/55.png b/ios/PushDeer-iOS/PushDeer/Assets.xcassets/AppIcon-SH.appiconset/55.png deleted file mode 100644 index c4c3c93..0000000 Binary files a/ios/PushDeer-iOS/PushDeer/Assets.xcassets/AppIcon-SH.appiconset/55.png and /dev/null differ diff --git a/ios/PushDeer-iOS/PushDeer/Assets.xcassets/AppIcon-SH.appiconset/64.png b/ios/PushDeer-iOS/PushDeer/Assets.xcassets/AppIcon-SH.appiconset/64.png deleted file mode 100644 index 2bbbb5b..0000000 Binary files a/ios/PushDeer-iOS/PushDeer/Assets.xcassets/AppIcon-SH.appiconset/64.png and /dev/null differ diff --git a/ios/PushDeer-iOS/PushDeer/Assets.xcassets/AppIcon-SH.appiconset/88.png b/ios/PushDeer-iOS/PushDeer/Assets.xcassets/AppIcon-SH.appiconset/88.png deleted file mode 100644 index a630e2f..0000000 Binary files a/ios/PushDeer-iOS/PushDeer/Assets.xcassets/AppIcon-SH.appiconset/88.png and /dev/null differ diff --git a/ios/PushDeer-iOS/PushDeer/Assets.xcassets/AppIcon-SH.appiconset/Contents.json b/ios/PushDeer-iOS/PushDeer/Assets.xcassets/AppIcon-SH.appiconset/Contents.json index 04de9d4..4fdf882 100644 --- a/ios/PushDeer-iOS/PushDeer/Assets.xcassets/AppIcon-SH.appiconset/Contents.json +++ b/ios/PushDeer-iOS/PushDeer/Assets.xcassets/AppIcon-SH.appiconset/Contents.json @@ -149,178 +149,6 @@ "idiom" : "ios-marketing", "scale" : "1x", "size" : "1024x1024" - }, - { - "filename" : "48.png", - "idiom" : "watch", - "role" : "notificationCenter", - "scale" : "2x", - "size" : "24x24", - "subtype" : "38mm" - }, - { - "filename" : "55.png", - "idiom" : "watch", - "role" : "notificationCenter", - "scale" : "2x", - "size" : "27.5x27.5", - "subtype" : "42mm" - }, - { - "filename" : "58.png", - "idiom" : "watch", - "role" : "companionSettings", - "scale" : "2x", - "size" : "29x29" - }, - { - "filename" : "87.png", - "idiom" : "watch", - "role" : "companionSettings", - "scale" : "3x", - "size" : "29x29" - }, - { - "idiom" : "watch", - "role" : "notificationCenter", - "scale" : "2x", - "size" : "33x33", - "subtype" : "45mm" - }, - { - "filename" : "80.png", - "idiom" : "watch", - "role" : "appLauncher", - "scale" : "2x", - "size" : "40x40", - "subtype" : "38mm" - }, - { - "filename" : "88.png", - "idiom" : "watch", - "role" : "appLauncher", - "scale" : "2x", - "size" : "44x44", - "subtype" : "40mm" - }, - { - "idiom" : "watch", - "role" : "appLauncher", - "scale" : "2x", - "size" : "46x46", - "subtype" : "41mm" - }, - { - "filename" : "100.png", - "idiom" : "watch", - "role" : "appLauncher", - "scale" : "2x", - "size" : "50x50", - "subtype" : "44mm" - }, - { - "idiom" : "watch", - "role" : "appLauncher", - "scale" : "2x", - "size" : "51x51", - "subtype" : "45mm" - }, - { - "filename" : "172.png", - "idiom" : "watch", - "role" : "quickLook", - "scale" : "2x", - "size" : "86x86", - "subtype" : "38mm" - }, - { - "filename" : "196.png", - "idiom" : "watch", - "role" : "quickLook", - "scale" : "2x", - "size" : "98x98", - "subtype" : "42mm" - }, - { - "filename" : "216.png", - "idiom" : "watch", - "role" : "quickLook", - "scale" : "2x", - "size" : "108x108", - "subtype" : "44mm" - }, - { - "idiom" : "watch", - "role" : "quickLook", - "scale" : "2x", - "size" : "117x117", - "subtype" : "45mm" - }, - { - "filename" : "1024.png", - "idiom" : "watch-marketing", - "scale" : "1x", - "size" : "1024x1024" - }, - { - "filename" : "16.png", - "idiom" : "mac", - "scale" : "1x", - "size" : "16x16" - }, - { - "filename" : "32.png", - "idiom" : "mac", - "scale" : "2x", - "size" : "16x16" - }, - { - "filename" : "32.png", - "idiom" : "mac", - "scale" : "1x", - "size" : "32x32" - }, - { - "filename" : "64.png", - "idiom" : "mac", - "scale" : "2x", - "size" : "32x32" - }, - { - "filename" : "128.png", - "idiom" : "mac", - "scale" : "1x", - "size" : "128x128" - }, - { - "filename" : "256.png", - "idiom" : "mac", - "scale" : "2x", - "size" : "128x128" - }, - { - "filename" : "256.png", - "idiom" : "mac", - "scale" : "1x", - "size" : "256x256" - }, - { - "filename" : "512.png", - "idiom" : "mac", - "scale" : "2x", - "size" : "256x256" - }, - { - "filename" : "512.png", - "idiom" : "mac", - "scale" : "1x", - "size" : "512x512" - }, - { - "filename" : "1024.png", - "idiom" : "mac", - "scale" : "2x", - "size" : "512x512" } ], "info" : { diff --git a/ios/PushDeer-iOS/PushDeerWidget/PushDeerWidget.swift b/ios/PushDeer-iOS/PushDeerWidget/PushDeerWidget.swift index 1a33d85..7e9fabb 100644 --- a/ios/PushDeer-iOS/PushDeerWidget/PushDeerWidget.swift +++ b/ios/PushDeer-iOS/PushDeerWidget/PushDeerWidget.swift @@ -21,21 +21,24 @@ struct Provider: IntentTimelineProvider { } func getTimeline(for configuration: ConfigurationIntent, in context: Context, completion: @escaping (Timeline) -> ()) { + NSLog("getTimeline") Task { let currentDate = Date() - let entryDate = Calendar.current.date(byAdding: .minute, value: 1, to: currentDate)! var entries: [SimpleEntry] = [] - var entry = SimpleEntry(date: entryDate, configuration: configuration) + var entry = SimpleEntry(date: currentDate, configuration: configuration) AppState.shared.reloadUserDefaults() print("token", AppState.shared.token) do { let messages = try await HttpRequest.getMessages().messages entry.messages = handleList(messages, context: context) + NSLog("getMessages-success") } catch { - + NSLog("getMessages-catch") } entries.append(entry) - let timeline = Timeline(entries: entries, policy: .atEnd) + + let nextDate = Calendar.current.date(byAdding: .minute, value: 10, to: currentDate)! + let timeline = Timeline(entries: entries, policy: .after(nextDate)) completion(timeline) } }