react-native-live-widgets 1.2.1 → 1.2.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +27 -0
- package/README.md +89 -49
- package/android/src/main/AndroidManifest.xml +12 -0
- package/android/src/main/assets/fonts/MaterialIcons-Regular.ttf +0 -0
- package/android/src/main/java/com/reactnativeliveactivity/bridge/LiveActivityModule.kt +61 -1
- package/android/src/main/java/com/reactnativeliveactivity/liveactivity/LiveActivityNotifier.kt +153 -17
- package/android/src/main/java/com/reactnativeliveactivity/liveactivity/LiveActivityReceiver.kt +1 -1
- package/android/src/main/java/com/reactnativeliveactivity/renderer/DynamicWidgetCanvasRenderer.kt +86 -13
- package/android/src/main/java/com/reactnativeliveactivity/storage/DynamicWidgetImageCache.kt +53 -0
- package/android/src/main/java/com/reactnativeliveactivity/storage/DynamicWidgetStateStore.kt +647 -104
- package/android/src/main/java/com/reactnativeliveactivity/widgets/DynamicHomeScreenWidgetProvider.kt +3 -1
- package/android/src/main/java/com/reactnativeliveactivity/widgets/DynamicQuickSettingsTileService.kt +120 -0
- package/app.plugin.js +36 -0
- package/assets/MaterialIcons.json +2236 -0
- package/cli/codegen.js +789 -0
- package/cli/setup.js +323 -63
- package/docs/EXPO-GUIDE-EN.md +21 -3
- package/docs/EXPO-GUIDE-VI.md +21 -3
- package/docs/GUIDE-EN.md +203 -21
- package/docs/GUIDE-VI.md +207 -22
- package/docs/index.html +1328 -211
- package/docs/llms-full.txt +15 -0
- package/docs/llms.txt +16 -7
- package/ios/Bridge/LiveActivityModule.swift +333 -44
- package/ios/Intents/DynamicWidgetActionIntent.swift +57 -2
- package/ios/Models/DynamicLayoutModels.swift +114 -4
- package/ios/Renderer/DynamicNodeView.swift +15 -6
- package/ios/Storage/DynamicWidgetStateStore.swift +649 -38
- package/ios/Widgets/DynamicControlWidget.swift +63 -0
- package/ios/Widgets/DynamicHomeScreenWidget.swift +99 -26
- package/ios/Widgets/DynamicLiveActivityWidget.swift +25 -4
- package/lib/builder.d.ts +50 -7
- package/lib/builder.d.ts.map +1 -1
- package/lib/builder.js +326 -18
- package/lib/builder.js.map +1 -1
- package/lib/hooks.d.ts +13 -9
- package/lib/hooks.d.ts.map +1 -1
- package/lib/hooks.js +70 -12
- package/lib/hooks.js.map +1 -1
- package/lib/index.d.ts +80 -7
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js +303 -59
- package/lib/index.js.map +1 -1
- package/lib/ir.d.ts.map +1 -1
- package/lib/ir.js +9 -2
- package/lib/ir.js.map +1 -1
- package/lib/jsx.d.ts +11 -7
- package/lib/jsx.d.ts.map +1 -1
- package/lib/jsx.js +50 -13
- package/lib/jsx.js.map +1 -1
- package/lib/material-icons.generated.d.ts +8 -0
- package/lib/material-icons.generated.d.ts.map +1 -0
- package/lib/material-icons.generated.js +9 -0
- package/lib/material-icons.generated.js.map +1 -0
- package/lib/preview.d.ts +11 -4
- package/lib/preview.d.ts.map +1 -1
- package/lib/preview.js +150 -82
- package/lib/preview.js.map +1 -1
- package/lib/sf-symbols.generated.d.ts +8 -0
- package/lib/sf-symbols.generated.d.ts.map +1 -0
- package/lib/sf-symbols.generated.js +9 -0
- package/lib/sf-symbols.generated.js.map +1 -0
- package/lib/types.d.ts +302 -18
- package/lib/types.d.ts.map +1 -1
- package/package.json +6 -2
- package/scripts/build.js +98 -0
- package/scripts/generate-material-icons.js +93 -0
- package/scripts/generate-sf-symbols.js +95 -0
- package/scripts/release.js +115 -0
- package/scripts/test-ir-semantic.js +314 -0
- package/src/builder.ts +382 -24
- package/src/hooks.ts +88 -12
- package/src/index.ts +319 -56
- package/src/ir.ts +8 -2
- package/src/jsx.tsx +69 -21
- package/src/material-icons.generated.ts +3844 -0
- package/src/preview.tsx +235 -81
- package/src/sf-symbols.generated.ts +9533 -0
- package/src/types.ts +348 -18
package/docs/llms-full.txt
CHANGED
|
@@ -156,3 +156,18 @@ export interface WidgetRemoteConfig {
|
|
|
156
156
|
- Encapsulated `Font` resolution in `renderText()` within self-invoking closures `{ ... }()`.
|
|
157
157
|
- Refactored `DynamicNodeAccessibilityModifier` procedural assignments into a dedicated `buildAccessibilityView(content:) -> AnyView` helper method.
|
|
158
158
|
- Added fallback `else { EmptyView() }` branches to `backgroundView` and `borderOverlay` in `ContainerStyleModifier`.
|
|
159
|
+
|
|
160
|
+
### 6. Extended Widget Families, Background Data Engine 2.0 & Live Activity Lifecycle
|
|
161
|
+
- **Widget Families & Control Widgets**: Added `extraLarge?: LayoutNode`, `standBy?: LayoutNode` (triggered via `showsWidgetContainerBackground == false` on iOS 17+ with `.applyStandByMargins()` & `widgetAccentable` on Text/Progress/Gauge), and cross-platform Control Widgets via `ControlWidget` (`ControlWidget.set`, `ControlWidget.getState`, `ControlWidget.button` / `UI.ControlButton`, `ControlWidget.toggle` / `UI.ControlToggle`, `Widget.setControl`). Implemented natively in `ios/Widgets/DynamicControlWidget.swift` (`DynamicControlWidget` & `DynamicControlToggleWidget` for iOS 18+ Control Center / Lock Screen / Action Button) and `DynamicQuickSettingsTileService.kt` (Android Quick Settings Tile). `<WidgetPreview>` supports `size="extraLarge"`, `size="standBy"`, and `size="control"` (with `controlConfig`).
|
|
162
|
+
- **Background Data Engine 2.0 & Structured Data Binding**: Upgraded `Widget.setRemoteConfig` across TypeScript, Swift (`DynamicWidgetStateStore.swift`), and Kotlin (`DynamicWidgetStateStore.kt`) with REST `body`, `headers`, `timeoutMs`, `cacheTtlSeconds`, `enableETag` (`If-None-Match` / `If-Modified-Since` & HTTP `304`), `maxRetries`/`retryDelayMs` (Exponential Backoff), multi-API `sources`, declarative `mapping`, `schema` validation (`requiredKeys`, `types`, `defaults`), `authRefresh` (HTTP `401` token refresh & immediate retry), and Error State (`_syncStatus`, `_syncError`, `_httpStatus`, `errorFallback`). Added `Widget.createDataBinding<T>()` and `UI.bind(path, pipes)` supporting nested dot-notation paths and native pipe transforms (`default`, `divide`, `multiply`, `add`, `round`, `upper`, `lower`, `currency`, `percent`, `if`) in JSX (`<Text>{data.user.name}</Text>`, `<Progress value={data.attendance.progress.divide(100)} />`) and `<WidgetPreview data={...} />`. Remember OS reload budgets: Apple WidgetKit allocates ~40–70 dynamic reloads/day (never guaranteed exact 15m intervals when closed) and Android enforces Doze Mode / App Standby.
|
|
163
|
+
- **Complete Live Activity Lifecycle**: Added `LiveActivity.get(id)`, `LiveActivity.isActive(id)`, `LiveActivity.onStateChange(listener)`, `LiveActivity.cleanupExpired()`, `relevanceScore`, `staleLockScreen`/`staleDynamicIsland` (`context.isStale`), `alertConfig` (`AlertConfiguration`), and `scheduledEndTimestamp`/`autoEndAfterSeconds` (`expiredLockScreen`, `expiredDismissalPolicy`), plus expanded `useLiveActivity()` state (`activities`, `lifecycleState`, `isStale`, `refreshActivities`, `cleanupExpired`).
|
|
164
|
+
|
|
165
|
+
---
|
|
166
|
+
|
|
167
|
+
## 6. Official Documentation & Web Links
|
|
168
|
+
|
|
169
|
+
- **Official Interactive Web Docs & Simulator**: [https://react-native-vu.github.io/react-native-live-widgets/](https://react-native-vu.github.io/react-native-live-widgets/)
|
|
170
|
+
- **LLM Quick Summary (`llms.txt`)**: [https://react-native-vu.github.io/react-native-live-widgets/llms.txt](https://react-native-vu.github.io/react-native-live-widgets/llms.txt)
|
|
171
|
+
- **LLM Full Reference (`llms-full.txt`)**: [https://react-native-vu.github.io/react-native-live-widgets/llms-full.txt](https://react-native-vu.github.io/react-native-live-widgets/llms-full.txt)
|
|
172
|
+
- **Vietnamese Full Guide (`GUIDE-VI.md`)**: [https://github.com/React-Native-Vu/react-native-live-widgets/blob/dev/docs/GUIDE-VI.md](https://github.com/React-Native-Vu/react-native-live-widgets/blob/dev/docs/GUIDE-VI.md)
|
|
173
|
+
- **English Full Guide (`GUIDE-EN.md`)**: [https://github.com/React-Native-Vu/react-native-live-widgets/blob/dev/docs/GUIDE-EN.md](https://github.com/React-Native-Vu/react-native-live-widgets/blob/dev/docs/GUIDE-EN.md)
|
package/docs/llms.txt
CHANGED
|
@@ -12,18 +12,22 @@ Write 100% Declarative TypeScript (`UI.*`) in your React Native code. Automatica
|
|
|
12
12
|
- `SharedStorage`: Fast synchronous App Group (iOS) and SharedPreferences (Android) key-value bridge.
|
|
13
13
|
- `UI`: Declarative DSL builder (`UI.VStack`, `UI.HStack`, `UI.ZStack`, `UI.Text`, `UI.Button`, `UI.Progress`, `UI.Timer`, `UI.Equalizer`, `UI.Image`, `UI.Gauge`, `UI.Chart`).
|
|
14
14
|
|
|
15
|
-
### Installation & Scaffolding
|
|
16
|
-
- **Expo (SDK 50, 51, 52, 58+)**:
|
|
15
|
+
### Installation & Scaffolding (Essential Commands)
|
|
16
|
+
- **Expo (SDK 50, 51, 52, 58+ CNG & EAS Build)**:
|
|
17
17
|
```bash
|
|
18
18
|
npx expo install react-native-live-widgets
|
|
19
|
-
#
|
|
20
|
-
npx expo
|
|
21
|
-
npx react-native-live-widgets init --group group.com.yourcompany.app
|
|
19
|
+
npx react-native-live-widgets init # 1-command: auto updates app.json, creates widgets.config.ts, syncs icons & Swift
|
|
20
|
+
npx expo run:ios # or: npx expo run:android
|
|
22
21
|
```
|
|
23
22
|
- **Bare React Native CLI**:
|
|
24
23
|
```bash
|
|
25
24
|
npm install react-native-live-widgets
|
|
26
|
-
npx react-native-live-widgets init
|
|
25
|
+
npx react-native-live-widgets init # 1-command: auto links Xcode target, Podfile, pod install, Android permissions, codegen
|
|
26
|
+
npx react-native run-ios # or: npx react-native run-android
|
|
27
|
+
```
|
|
28
|
+
- **Updating widgets.config.ts**:
|
|
29
|
+
```bash
|
|
30
|
+
npx react-native-live-widgets codegen # Re-syncs Swift bundle, iOS xcstrings, Android strings.xml & icon types
|
|
27
31
|
```
|
|
28
32
|
|
|
29
33
|
### Dual UI Authoring Syntax: JSX Components & Functional DSL
|
|
@@ -79,15 +83,20 @@ const unsubscribe = Widget.onWidgetAction((actionId, payload) => {
|
|
|
79
83
|
- **Android Native Live Chronometer**: Realtime 1s countdowns driven by native `android.widget.Chronometer` without Canvas bitmap redraws.
|
|
80
84
|
- **Dynamic Template Variable Interpolation**: Resolves `{{id}}`, `{{title}}`, and counter values dynamically, with initial `defaultChecked` persistence in `DynamicWidgetStateStore`.
|
|
81
85
|
- **Swift 6 Compatibility**: Full compliance with Swift 6 language mode and `@ViewBuilder` closure encapsulation on iOS Xcode.
|
|
86
|
+
- **Extended Widget Families**: Supports `extraLarge` (iPadOS/Tablet), `standBy` (iOS 17+ StandBy Mode with `.applyStandByMargins()` & `widgetAccentable` on `Text`, `Progress`, `Gauge`), and iOS 18+ Control Widgets + Android Quick Settings Tiles (`ControlWidget.set`, `ControlWidget.getState`, `ControlWidget.button` / `UI.ControlButton`, `ControlWidget.toggle` / `UI.ControlToggle`, `ios/Widgets/DynamicControlWidget.swift`, Android `DynamicQuickSettingsTileService.kt`, and `<WidgetPreview size="control" controlConfig={...} />`).
|
|
87
|
+
- **Background Data Engine 2.0 & Structured Data Binding**: `Widget.setRemoteConfig` supports REST `body`, `headers`, `timeoutMs`, `cacheTtlSeconds`, `enableETag` (304 Not Modified), `maxRetries`/`retryDelayMs`, `sources` (multi-API namespacing), `mapping`, `schema` validation, `authRefresh` (401 refresh + retry), and `errorFallback` (`{{_syncStatus}}`, `{{_syncError}}`, `{{_httpStatus}}`). `Widget.createDataBinding<T>()` & `UI.bind()` support nested dot paths and native pipes (`default`, `divide`, `multiply`, `add`, `round`, `upper`, `lower`, `currency`, `percent`, `if`) in JSX (`<Text>{data.user.name}</Text>`, `<Progress value={data.attendance.progress.divide(100)} />`).
|
|
88
|
+
- **Complete Live Activity Lifecycle**: Supports simultaneous multi-activity inspection (`LiveActivity.get`, `LiveActivity.isActive`), `staleLockScreen`/`staleDynamicIsland`, `relevanceScore`, `alertConfig`, `scheduledEndTimestamp`/`autoEndAfterSeconds` with `expiredLockScreen`, `LiveActivity.cleanupExpired()`, and `LiveActivity.onStateChange` (`active`, `started_by_push`, `stale`, `expired`, `ended`, `dismissed`).
|
|
82
89
|
|
|
83
90
|
### Golden Rules for AI Agents
|
|
84
91
|
1. **Never write Swift or Kotlin files manually** when a declarative `UI.*` node exists.
|
|
85
92
|
2. **App Groups**: Both iOS app and Widget Extension MUST share the identical App Group name (e.g. `group.<bundle_id>`).
|
|
86
93
|
3. **Dynamic Island**: Always configure `compactLeading`, `compactTrailing`, `minimal`, and `expanded` (`leading`, `trailing`, `bottom`, `center`).
|
|
87
94
|
4. **App Termination (Force-Kill)**: When the app is force-killed on iOS, JS runtime stops. Design mission-critical actions (like employee attendance check-ins) using native `SharedStorage` queue rather than expecting live JS callbacks while killed.
|
|
88
|
-
5. **Background Sync**: `Widget.setRemoteConfig` allows native widgets to fetch fresh JSON from
|
|
95
|
+
5. **Background Sync & OS Budgets**: `Widget.setRemoteConfig` allows native widgets to fetch fresh JSON from REST endpoints without APNs push, but never promise fixed 15-minute intervals when killed — Apple WidgetKit enforces a dynamic budget (~40–70 reloads/day based on usage) and Android enforces Doze Mode / App Standby limits.
|
|
89
96
|
|
|
90
97
|
## Documentation Links
|
|
98
|
+
- [Official Interactive Web Docs & Simulator](https://react-native-vu.github.io/react-native-live-widgets/)
|
|
99
|
+
- [Full LLM Reference (llms-full.txt)](https://react-native-vu.github.io/react-native-live-widgets/llms-full.txt)
|
|
91
100
|
- [English Full Guide](https://github.com/React-Native-Vu/react-native-live-widgets/blob/dev/docs/GUIDE-EN.md)
|
|
92
101
|
- [Vietnamese Full Guide](https://github.com/React-Native-Vu/react-native-live-widgets/blob/dev/docs/GUIDE-VI.md)
|
|
93
102
|
- [Dedicated Expo Guide (EN)](https://github.com/React-Native-Vu/react-native-live-widgets/blob/dev/docs/EXPO-GUIDE-EN.md)
|
|
@@ -14,9 +14,13 @@ public class LiveActivityModule: RCTEventEmitter {
|
|
|
14
14
|
private static var currentPushToStartToken: String?
|
|
15
15
|
private static var _activityUpdateTokens: [String: String] = [:]
|
|
16
16
|
private static var observedActivityIds: Set<String> = []
|
|
17
|
+
private static var startedActivityIds: Set<String> = []
|
|
18
|
+
private static var scheduledEndTimestamps: [String: Double] = [:]
|
|
19
|
+
private static var scheduledEndTasks: [String: Task<Void, Never>] = [:]
|
|
17
20
|
private static var isObservingTokens = false
|
|
18
21
|
private static var isObservingActivities = false
|
|
19
22
|
private var hasListeners = false
|
|
23
|
+
private var lastDispatchedUpdatedAt: Double = 0
|
|
20
24
|
|
|
21
25
|
private static func setActivityUpdateToken(_ token: String, for activityId: String) {
|
|
22
26
|
tokenLock.lock()
|
|
@@ -36,6 +40,51 @@ public class LiveActivityModule: RCTEventEmitter {
|
|
|
36
40
|
return _activityUpdateTokens
|
|
37
41
|
}
|
|
38
42
|
|
|
43
|
+
private static func markStarted(activityId: String) {
|
|
44
|
+
tokenLock.lock()
|
|
45
|
+
defer { tokenLock.unlock() }
|
|
46
|
+
startedActivityIds.insert(activityId)
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
private static func consumeIsRemotePushStart(activityId: String) -> Bool {
|
|
50
|
+
tokenLock.lock()
|
|
51
|
+
defer { tokenLock.unlock() }
|
|
52
|
+
if startedActivityIds.contains(activityId) {
|
|
53
|
+
return false
|
|
54
|
+
}
|
|
55
|
+
return true
|
|
56
|
+
}
|
|
57
|
+
|
|
58
|
+
private static func setScheduledEnd(_ ts: Double?, for activityId: String, task: Task<Void, Never>?) {
|
|
59
|
+
tokenLock.lock()
|
|
60
|
+
scheduledEndTasks[activityId]?.cancel()
|
|
61
|
+
if let ts = ts {
|
|
62
|
+
scheduledEndTimestamps[activityId] = ts
|
|
63
|
+
} else {
|
|
64
|
+
scheduledEndTimestamps.removeValue(forKey: activityId)
|
|
65
|
+
}
|
|
66
|
+
if let task = task {
|
|
67
|
+
scheduledEndTasks[activityId] = task
|
|
68
|
+
} else {
|
|
69
|
+
scheduledEndTasks.removeValue(forKey: activityId)
|
|
70
|
+
}
|
|
71
|
+
tokenLock.unlock()
|
|
72
|
+
}
|
|
73
|
+
|
|
74
|
+
private static func getScheduledEnd(for activityId: String) -> Double? {
|
|
75
|
+
tokenLock.lock()
|
|
76
|
+
defer { tokenLock.unlock() }
|
|
77
|
+
return scheduledEndTimestamps[activityId]
|
|
78
|
+
}
|
|
79
|
+
|
|
80
|
+
private static func cancelScheduledEnd(for activityId: String) {
|
|
81
|
+
tokenLock.lock()
|
|
82
|
+
scheduledEndTasks[activityId]?.cancel()
|
|
83
|
+
scheduledEndTasks.removeValue(forKey: activityId)
|
|
84
|
+
scheduledEndTimestamps.removeValue(forKey: activityId)
|
|
85
|
+
tokenLock.unlock()
|
|
86
|
+
}
|
|
87
|
+
|
|
39
88
|
private static func shouldObserve(activityId: String) -> Bool {
|
|
40
89
|
tokenLock.lock()
|
|
41
90
|
defer { tokenLock.unlock() }
|
|
@@ -48,9 +97,24 @@ public class LiveActivityModule: RCTEventEmitter {
|
|
|
48
97
|
|
|
49
98
|
private static func removeObserved(activityId: String) {
|
|
50
99
|
tokenLock.lock()
|
|
51
|
-
defer { tokenLock.unlock() }
|
|
52
100
|
observedActivityIds.remove(activityId)
|
|
101
|
+
startedActivityIds.remove(activityId)
|
|
53
102
|
_activityUpdateTokens.removeValue(forKey: activityId)
|
|
103
|
+
scheduledEndTasks[activityId]?.cancel()
|
|
104
|
+
scheduledEndTasks.removeValue(forKey: activityId)
|
|
105
|
+
scheduledEndTimestamps.removeValue(forKey: activityId)
|
|
106
|
+
tokenLock.unlock()
|
|
107
|
+
}
|
|
108
|
+
|
|
109
|
+
private static func removeAllObserved() {
|
|
110
|
+
tokenLock.lock()
|
|
111
|
+
for (_, task) in scheduledEndTasks { task.cancel() }
|
|
112
|
+
scheduledEndTasks.removeAll()
|
|
113
|
+
scheduledEndTimestamps.removeAll()
|
|
114
|
+
observedActivityIds.removeAll()
|
|
115
|
+
startedActivityIds.removeAll()
|
|
116
|
+
_activityUpdateTokens.removeAll()
|
|
117
|
+
tokenLock.unlock()
|
|
54
118
|
}
|
|
55
119
|
|
|
56
120
|
public override init() {
|
|
@@ -100,16 +164,31 @@ public class LiveActivityModule: RCTEventEmitter {
|
|
|
100
164
|
private func checkPendingAction() {
|
|
101
165
|
let state = DynamicWidgetStateStore.loadState()
|
|
102
166
|
guard let actionId = state.lastActionId, !actionId.isEmpty else { return }
|
|
103
|
-
|
|
104
|
-
let body: [String: Any] = [
|
|
105
|
-
"actionId": actionId,
|
|
106
|
-
"updatedAt": state.updatedAt
|
|
107
|
-
]
|
|
167
|
+
let actionTs = state.actionUpdatedAt ?? state.updatedAt
|
|
108
168
|
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
169
|
+
Self.tokenLock.lock()
|
|
170
|
+
let alreadyDispatched = actionTs <= lastDispatchedUpdatedAt
|
|
171
|
+
if !alreadyDispatched && Date().timeIntervalSince1970 - actionTs < 60 {
|
|
172
|
+
lastDispatchedUpdatedAt = actionTs
|
|
173
|
+
} else {
|
|
174
|
+
Self.tokenLock.unlock()
|
|
175
|
+
return
|
|
176
|
+
}
|
|
177
|
+
Self.tokenLock.unlock()
|
|
178
|
+
|
|
179
|
+
var body: [String: Any] = [
|
|
180
|
+
"actionId": actionId,
|
|
181
|
+
"updatedAt": actionTs,
|
|
182
|
+
"fromNativeWidget": true,
|
|
183
|
+
]
|
|
184
|
+
if let counterVal = DynamicWidgetProvider.readSharedString(forKey: "widget_counter_value", appGroup: "")
|
|
185
|
+
?? state.remoteVariables?["counter"] {
|
|
186
|
+
body["counterValue"] = counterVal
|
|
187
|
+
}
|
|
188
|
+
|
|
189
|
+
DispatchQueue.main.async {
|
|
190
|
+
if self.hasListeners {
|
|
191
|
+
self.sendEvent(withName: "LiveActivityActionClicked", body: body)
|
|
113
192
|
}
|
|
114
193
|
}
|
|
115
194
|
}
|
|
@@ -143,6 +222,7 @@ public class LiveActivityModule: RCTEventEmitter {
|
|
|
143
222
|
"LiveActivityTokenChanged",
|
|
144
223
|
"LiveActivityUpdateTokenChanged",
|
|
145
224
|
"LiveActivityActionClicked",
|
|
225
|
+
"LiveActivityStateChanged",
|
|
146
226
|
]
|
|
147
227
|
}
|
|
148
228
|
|
|
@@ -154,6 +234,26 @@ public class LiveActivityModule: RCTEventEmitter {
|
|
|
154
234
|
hasListeners = false
|
|
155
235
|
}
|
|
156
236
|
|
|
237
|
+
private func emitStateEvent(
|
|
238
|
+
activityId: String,
|
|
239
|
+
systemActivityId: String? = nil,
|
|
240
|
+
state: String,
|
|
241
|
+
pushToken: String? = nil
|
|
242
|
+
) {
|
|
243
|
+
var body: [String: Any] = [
|
|
244
|
+
"activityId": activityId,
|
|
245
|
+
"state": state,
|
|
246
|
+
"timestamp": Date().timeIntervalSince1970,
|
|
247
|
+
]
|
|
248
|
+
if let sysId = systemActivityId { body["systemActivityId"] = sysId }
|
|
249
|
+
if let tok = pushToken { body["pushToken"] = tok }
|
|
250
|
+
|
|
251
|
+
DispatchQueue.main.async { [weak self] in
|
|
252
|
+
guard let self = self, self.hasListeners else { return }
|
|
253
|
+
self.sendEvent(withName: "LiveActivityStateChanged", body: body)
|
|
254
|
+
}
|
|
255
|
+
}
|
|
256
|
+
|
|
157
257
|
// MARK: - Live Activity Lifecycle
|
|
158
258
|
|
|
159
259
|
@objc(start:payloadJson:resolver:rejecter:)
|
|
@@ -176,29 +276,34 @@ public class LiveActivityModule: RCTEventEmitter {
|
|
|
176
276
|
let attributes = DynamicActivityAttributes(activityId: activityId)
|
|
177
277
|
let initialContentState = DynamicActivityAttributes.ContentState(payloadJson: payloadJson)
|
|
178
278
|
let initialStaleDate = parseStaleDate(from: payloadJson)
|
|
279
|
+
let relevanceScore = parseRelevanceScore(from: payloadJson)
|
|
179
280
|
Self.lastPayloadJson = payloadJson
|
|
281
|
+
Self.markStarted(activityId: activityId)
|
|
180
282
|
|
|
181
283
|
Task {
|
|
182
284
|
await DynamicWidgetImageCache.prefetchUrls(in: payloadJson)
|
|
183
285
|
|
|
184
286
|
do {
|
|
287
|
+
let activity: Activity<DynamicActivityAttributes>
|
|
185
288
|
do {
|
|
186
|
-
|
|
289
|
+
activity = try Activity.request(
|
|
187
290
|
attributes: attributes,
|
|
188
|
-
content: .init(state: initialContentState, staleDate: initialStaleDate),
|
|
291
|
+
content: .init(state: initialContentState, staleDate: initialStaleDate, relevanceScore: relevanceScore),
|
|
189
292
|
pushType: .token
|
|
190
293
|
)
|
|
191
|
-
self.observePushToken(for: activity)
|
|
192
294
|
} catch {
|
|
193
295
|
// Fallback sang local Live Activity (pushType: nil) khi chạy môi trường chưa cấu hình APNs
|
|
194
|
-
|
|
296
|
+
activity = try Activity.request(
|
|
195
297
|
attributes: attributes,
|
|
196
|
-
content: .init(state: initialContentState, staleDate: initialStaleDate),
|
|
298
|
+
content: .init(state: initialContentState, staleDate: initialStaleDate, relevanceScore: relevanceScore),
|
|
197
299
|
pushType: nil
|
|
198
300
|
)
|
|
199
|
-
self.observePushToken(for: activity)
|
|
200
301
|
}
|
|
201
302
|
|
|
303
|
+
self.observeActivityLifecycle(for: activity)
|
|
304
|
+
self.scheduleAutoEndIfNeeded(activityId: activityId, payloadJson: payloadJson)
|
|
305
|
+
self.emitStateEvent(activityId: activityId, systemActivityId: activity.id, state: "active")
|
|
306
|
+
|
|
202
307
|
#if targetEnvironment(simulator)
|
|
203
308
|
if Self.getActivityUpdateToken(for: activityId) == nil {
|
|
204
309
|
let simUpdateToken = Self.generateSimulatorHexToken(seed: "apns_update_\(activityId)", byteLength: 64)
|
|
@@ -221,8 +326,9 @@ public class LiveActivityModule: RCTEventEmitter {
|
|
|
221
326
|
}
|
|
222
327
|
|
|
223
328
|
@available(iOS 16.2, *)
|
|
224
|
-
private func
|
|
329
|
+
private func observeActivityLifecycle(for activity: Activity<DynamicActivityAttributes>) {
|
|
225
330
|
let actId = activity.attributes.activityId
|
|
331
|
+
let sysId = activity.id
|
|
226
332
|
guard Self.shouldObserve(activityId: actId) else { return }
|
|
227
333
|
|
|
228
334
|
Task {
|
|
@@ -239,15 +345,45 @@ public class LiveActivityModule: RCTEventEmitter {
|
|
|
239
345
|
}
|
|
240
346
|
}
|
|
241
347
|
}
|
|
348
|
+
|
|
349
|
+
Task { [weak self] in
|
|
350
|
+
for await newState in activity.activityStateUpdates {
|
|
351
|
+
let mapped: String
|
|
352
|
+
switch newState {
|
|
353
|
+
case .active: mapped = "active"
|
|
354
|
+
case .stale: mapped = "stale"
|
|
355
|
+
case .ended: mapped = "ended"
|
|
356
|
+
case .dismissed: mapped = "dismissed"
|
|
357
|
+
@unknown default: mapped = String(describing: newState)
|
|
358
|
+
}
|
|
359
|
+
self?.emitStateEvent(
|
|
360
|
+
activityId: actId,
|
|
361
|
+
systemActivityId: sysId,
|
|
362
|
+
state: mapped,
|
|
363
|
+
pushToken: Self.getActivityUpdateToken(for: actId)
|
|
364
|
+
)
|
|
365
|
+
if newState == .ended || newState == .dismissed {
|
|
366
|
+
Self.removeObserved(activityId: actId)
|
|
367
|
+
}
|
|
368
|
+
}
|
|
369
|
+
}
|
|
242
370
|
}
|
|
243
371
|
|
|
244
372
|
private func startObservingActivityUpdatesIfNeeded() {
|
|
245
373
|
guard #available(iOS 16.2, *), !Self.isObservingActivities else { return }
|
|
246
374
|
Self.isObservingActivities = true
|
|
247
375
|
|
|
248
|
-
Task {
|
|
376
|
+
Task { [weak self] in
|
|
249
377
|
for await activity in Activity<DynamicActivityAttributes>.activityUpdates {
|
|
250
|
-
|
|
378
|
+
let actId = activity.attributes.activityId
|
|
379
|
+
if Self.consumeIsRemotePushStart(activityId: actId) {
|
|
380
|
+
self?.emitStateEvent(
|
|
381
|
+
activityId: actId,
|
|
382
|
+
systemActivityId: activity.id,
|
|
383
|
+
state: "started_by_push"
|
|
384
|
+
)
|
|
385
|
+
}
|
|
386
|
+
self?.observeActivityLifecycle(for: activity)
|
|
251
387
|
}
|
|
252
388
|
}
|
|
253
389
|
}
|
|
@@ -266,23 +402,29 @@ public class LiveActivityModule: RCTEventEmitter {
|
|
|
266
402
|
|
|
267
403
|
let updatedState = DynamicActivityAttributes.ContentState(payloadJson: payloadJson)
|
|
268
404
|
let updatedStaleDate = parseStaleDate(from: payloadJson)
|
|
405
|
+
let relevanceScore = parseRelevanceScore(from: payloadJson)
|
|
406
|
+
let alertConfig = parseAlertConfiguration(from: payloadJson)
|
|
269
407
|
Self.lastPayloadJson = payloadJson
|
|
270
408
|
|
|
271
409
|
Task {
|
|
272
|
-
// Cập nhật ngay, không chờ tải ảnh (tránh delay mỗi lần update). Ảnh mới sẽ được tải nền,
|
|
273
|
-
// xong thì đẩy lại 1 lần để hiển thị.
|
|
274
410
|
for activity in Activity<DynamicActivityAttributes>.activities {
|
|
275
|
-
if activity.attributes.activityId == activityId {
|
|
276
|
-
await activity.update(
|
|
411
|
+
if activity.attributes.activityId == activityId || activity.id == activityId {
|
|
412
|
+
await activity.update(
|
|
413
|
+
.init(state: updatedState, staleDate: updatedStaleDate, relevanceScore: relevanceScore),
|
|
414
|
+
alertConfiguration: alertConfig
|
|
415
|
+
)
|
|
277
416
|
}
|
|
278
417
|
}
|
|
418
|
+
self.scheduleAutoEndIfNeeded(activityId: activityId, payloadJson: payloadJson)
|
|
279
419
|
resolve(true)
|
|
280
420
|
|
|
281
421
|
let fetchedNew = await DynamicWidgetImageCache.prefetchUrls(in: payloadJson)
|
|
282
422
|
if fetchedNew {
|
|
283
423
|
for activity in Activity<DynamicActivityAttributes>.activities {
|
|
284
|
-
if activity.attributes.activityId == activityId {
|
|
285
|
-
await activity.update(
|
|
424
|
+
if activity.attributes.activityId == activityId || activity.id == activityId {
|
|
425
|
+
await activity.update(
|
|
426
|
+
.init(state: updatedState, staleDate: updatedStaleDate, relevanceScore: relevanceScore)
|
|
427
|
+
)
|
|
286
428
|
}
|
|
287
429
|
}
|
|
288
430
|
}
|
|
@@ -314,20 +456,76 @@ public class LiveActivityModule: RCTEventEmitter {
|
|
|
314
456
|
let seconds = options?["dismissalAfterSeconds"] as? Double ?? 900
|
|
315
457
|
let finalPayloadJson = options?["finalPayloadJson"] as? String
|
|
316
458
|
|
|
317
|
-
let policy:
|
|
459
|
+
let policy = parseDismissalPolicy(policyStr, seconds: seconds)
|
|
460
|
+
|
|
461
|
+
Task {
|
|
462
|
+
for activity in Activity<DynamicActivityAttributes>.activities {
|
|
463
|
+
if activity.attributes.activityId == activityId || activity.id == activityId {
|
|
464
|
+
if let json = finalPayloadJson, !json.isEmpty {
|
|
465
|
+
let finalState = DynamicActivityAttributes.ContentState(payloadJson: json)
|
|
466
|
+
await activity.end(ActivityContent(state: finalState, staleDate: nil), dismissalPolicy: policy)
|
|
467
|
+
} else {
|
|
468
|
+
await activity.end(nil, dismissalPolicy: policy)
|
|
469
|
+
}
|
|
470
|
+
}
|
|
471
|
+
}
|
|
472
|
+
Self.removeObserved(activityId: activityId)
|
|
473
|
+
self.emitStateEvent(activityId: activityId, state: "ended")
|
|
474
|
+
resolve(true)
|
|
475
|
+
}
|
|
476
|
+
}
|
|
477
|
+
|
|
478
|
+
@available(iOS 16.2, *)
|
|
479
|
+
private func parseDismissalPolicy(_ policyStr: String, seconds: Double = 900) -> ActivityUIDismissalPolicy {
|
|
318
480
|
switch policyStr {
|
|
319
481
|
case "default":
|
|
320
|
-
|
|
482
|
+
return .default
|
|
321
483
|
case "after", "afterDate":
|
|
322
|
-
|
|
484
|
+
return .after(Date().addingTimeInterval(seconds))
|
|
323
485
|
default:
|
|
324
|
-
|
|
486
|
+
return .immediate
|
|
325
487
|
}
|
|
488
|
+
}
|
|
326
489
|
|
|
327
|
-
|
|
490
|
+
@available(iOS 16.2, *)
|
|
491
|
+
private func scheduleAutoEndIfNeeded(activityId: String, payloadJson: String) {
|
|
492
|
+
guard let data = payloadJson.data(using: .utf8),
|
|
493
|
+
let obj = try? JSONSerialization.jsonObject(with: data) as? [String: Any] else {
|
|
494
|
+
return
|
|
495
|
+
}
|
|
496
|
+
|
|
497
|
+
var targetEpochSec: Double?
|
|
498
|
+
if let ts = obj["scheduledEndTimestamp"] as? Double, ts > 0 {
|
|
499
|
+
targetEpochSec = ts > 10_000_000_000 ? ts / 1000.0 : ts
|
|
500
|
+
} else if let autoSec = obj["autoEndAfterSeconds"] as? Double, autoSec > 0 {
|
|
501
|
+
targetEpochSec = Date().timeIntervalSince1970 + autoSec
|
|
502
|
+
}
|
|
503
|
+
|
|
504
|
+
guard let endEpoch = targetEpochSec else { return }
|
|
505
|
+
|
|
506
|
+
let delaySec = max(0.0, endEpoch - Date().timeIntervalSince1970)
|
|
507
|
+
let policyStr = obj["expiredDismissalPolicy"] as? String ?? (obj["expiredLockScreen"] != nil ? "default" : "immediate")
|
|
508
|
+
var expiredPayloadStr: String?
|
|
509
|
+
if let expiredLockScreen = obj["expiredLockScreen"] {
|
|
510
|
+
var expiredDict: [String: Any] = ["activityId": activityId, "lockScreen": expiredLockScreen]
|
|
511
|
+
if let di = obj["dynamicIsland"] { expiredDict["dynamicIsland"] = di }
|
|
512
|
+
if let d = try? JSONSerialization.data(withJSONObject: expiredDict),
|
|
513
|
+
let s = String(data: d, encoding: .utf8) {
|
|
514
|
+
expiredPayloadStr = s
|
|
515
|
+
}
|
|
516
|
+
}
|
|
517
|
+
|
|
518
|
+
let task = Task { [weak self] in
|
|
519
|
+
if delaySec > 0 {
|
|
520
|
+
let nanos = UInt64(min(delaySec, 86400 * 7) * 1_000_000_000)
|
|
521
|
+
try? await Task.sleep(nanoseconds: nanos)
|
|
522
|
+
}
|
|
523
|
+
guard !Task.isCancelled else { return }
|
|
524
|
+
|
|
525
|
+
let policy = self?.parseDismissalPolicy(policyStr) ?? .immediate
|
|
328
526
|
for activity in Activity<DynamicActivityAttributes>.activities {
|
|
329
527
|
if activity.attributes.activityId == activityId {
|
|
330
|
-
if let json =
|
|
528
|
+
if let json = expiredPayloadStr, !json.isEmpty {
|
|
331
529
|
let finalState = DynamicActivityAttributes.ContentState(payloadJson: json)
|
|
332
530
|
await activity.end(ActivityContent(state: finalState, staleDate: nil), dismissalPolicy: policy)
|
|
333
531
|
} else {
|
|
@@ -335,21 +533,53 @@ public class LiveActivityModule: RCTEventEmitter {
|
|
|
335
533
|
}
|
|
336
534
|
}
|
|
337
535
|
}
|
|
536
|
+
self?.emitStateEvent(activityId: activityId, state: "expired")
|
|
338
537
|
Self.removeObserved(activityId: activityId)
|
|
339
|
-
resolve(true)
|
|
340
538
|
}
|
|
539
|
+
|
|
540
|
+
Self.setScheduledEnd(endEpoch, for: activityId, task: task)
|
|
341
541
|
}
|
|
342
542
|
|
|
343
543
|
private func parseStaleDate(from json: String) -> Date? {
|
|
344
544
|
guard let data = json.data(using: .utf8),
|
|
345
545
|
let obj = try? JSONSerialization.jsonObject(with: data) as? [String: Any],
|
|
346
|
-
let ts = obj["staleTimestamp"] as? Double else {
|
|
546
|
+
let ts = obj["staleTimestamp"] as? Double, ts > 0 else {
|
|
347
547
|
return nil
|
|
348
548
|
}
|
|
349
549
|
let seconds = ts > 10_000_000_000 ? ts / 1000.0 : ts
|
|
350
550
|
return Date(timeIntervalSince1970: seconds)
|
|
351
551
|
}
|
|
352
552
|
|
|
553
|
+
private func parseRelevanceScore(from json: String) -> Double {
|
|
554
|
+
guard let data = json.data(using: .utf8),
|
|
555
|
+
let obj = try? JSONSerialization.jsonObject(with: data) as? [String: Any],
|
|
556
|
+
let score = obj["relevanceScore"] as? Double else {
|
|
557
|
+
return 0.0
|
|
558
|
+
}
|
|
559
|
+
return score
|
|
560
|
+
}
|
|
561
|
+
|
|
562
|
+
@available(iOS 16.2, *)
|
|
563
|
+
private func parseAlertConfiguration(from json: String) -> AlertConfiguration? {
|
|
564
|
+
guard let data = json.data(using: .utf8),
|
|
565
|
+
let obj = try? JSONSerialization.jsonObject(with: data) as? [String: Any] else {
|
|
566
|
+
return nil
|
|
567
|
+
}
|
|
568
|
+
let alertObj = obj["alertConfig"] as? [String: Any]
|
|
569
|
+
let title = (alertObj?["title"] as? String) ?? (obj["alertTitle"] as? String) ?? ""
|
|
570
|
+
let body = (alertObj?["body"] as? String) ?? (obj["alertBody"] as? String) ?? ""
|
|
571
|
+
if title.isEmpty && body.isEmpty {
|
|
572
|
+
return nil
|
|
573
|
+
}
|
|
574
|
+
let soundName = (alertObj?["sound"] as? String) ?? (obj["alertSound"] as? String) ?? "default"
|
|
575
|
+
let sound: AlertConfiguration.AlertSound = (soundName == "default" || soundName.isEmpty) ? .default : .named(soundName)
|
|
576
|
+
return AlertConfiguration(
|
|
577
|
+
title: LocalizedStringResource(stringLiteral: title),
|
|
578
|
+
body: LocalizedStringResource(stringLiteral: body),
|
|
579
|
+
sound: sound
|
|
580
|
+
)
|
|
581
|
+
}
|
|
582
|
+
|
|
353
583
|
@objc(endAll:rejecter:)
|
|
354
584
|
public func endAll(
|
|
355
585
|
resolve: @escaping RCTPromiseResolveBlock,
|
|
@@ -362,8 +592,11 @@ public class LiveActivityModule: RCTEventEmitter {
|
|
|
362
592
|
|
|
363
593
|
Task {
|
|
364
594
|
for activity in Activity<DynamicActivityAttributes>.activities {
|
|
595
|
+
let actId = activity.attributes.activityId
|
|
365
596
|
await activity.end(nil, dismissalPolicy: .immediate)
|
|
597
|
+
self.emitStateEvent(activityId: actId, state: "ended")
|
|
366
598
|
}
|
|
599
|
+
Self.removeAllObserved()
|
|
367
600
|
resolve(true)
|
|
368
601
|
}
|
|
369
602
|
}
|
|
@@ -544,6 +777,16 @@ public class LiveActivityModule: RCTEventEmitter {
|
|
|
544
777
|
|
|
545
778
|
// MARK: - Shared Storage (App Group)
|
|
546
779
|
|
|
780
|
+
private func removeSharedStorageKey(_ targetKey: String, appGroup: String) {
|
|
781
|
+
if let fileURL = DynamicWidgetProvider.sharedFileURL(key: targetKey, appGroup: appGroup) {
|
|
782
|
+
try? FileManager.default.removeItem(at: fileURL)
|
|
783
|
+
}
|
|
784
|
+
getDefaults(appGroup: appGroup).removeObject(forKey: targetKey)
|
|
785
|
+
#if targetEnvironment(simulator)
|
|
786
|
+
try? FileManager.default.removeItem(atPath: "/tmp/rn_live_widgets_\(targetKey).json")
|
|
787
|
+
#endif
|
|
788
|
+
}
|
|
789
|
+
|
|
547
790
|
@objc(setSharedItem:value:appGroup:resolver:rejecter:)
|
|
548
791
|
public func setSharedItem(
|
|
549
792
|
key: String,
|
|
@@ -575,15 +818,38 @@ public class LiveActivityModule: RCTEventEmitter {
|
|
|
575
818
|
// để Widget không bị gọi API ngầm không cần thiết khi đổi kích thước.
|
|
576
819
|
if !value.contains("{{") {
|
|
577
820
|
let wKey = String(key.dropFirst("widget_layout_".count))
|
|
578
|
-
|
|
579
|
-
|
|
580
|
-
|
|
581
|
-
|
|
582
|
-
|
|
583
|
-
|
|
584
|
-
|
|
585
|
-
|
|
821
|
+
removeSharedStorageKey("widget_remote_config_\(wKey)", appGroup: appGroup)
|
|
822
|
+
}
|
|
823
|
+
} else if key == "widget_counter_value" {
|
|
824
|
+
var state = DynamicWidgetStateStore.loadState()
|
|
825
|
+
var vars = state.remoteVariables ?? [:]
|
|
826
|
+
vars["counter"] = value.trimmingCharacters(in: .whitespacesAndNewlines)
|
|
827
|
+
state.remoteVariables = vars
|
|
828
|
+
state.updatedAt = Date().timeIntervalSince1970
|
|
829
|
+
DynamicWidgetStateStore.saveState(state)
|
|
830
|
+
} else if key.hasPrefix("widget_bound_data_"),
|
|
831
|
+
let data = value.data(using: .utf8),
|
|
832
|
+
let jsonObj = try? JSONSerialization.jsonObject(with: data) {
|
|
833
|
+
let wKey = String(key.dropFirst("widget_bound_data_".count))
|
|
834
|
+
removeSharedStorageKey("widget_remote_config_\(wKey)", appGroup: appGroup)
|
|
835
|
+
|
|
836
|
+
var state = DynamicWidgetStateStore.loadState()
|
|
837
|
+
var vars = state.remoteVariables ?? [:]
|
|
838
|
+
DynamicWidgetStateStore.flattenJsonObject(jsonObj, prefix: "", into: &vars)
|
|
839
|
+
if let syncTime = vars["_lastSyncTime"], !syncTime.isEmpty {
|
|
840
|
+
state.lastSyncTime = syncTime
|
|
586
841
|
}
|
|
842
|
+
let status = (vars["_syncStatus"]?.isEmpty == false) ? vars["_syncStatus"]! : "ok"
|
|
843
|
+
state.syncStatus = status
|
|
844
|
+
vars["_syncStatus"] = status
|
|
845
|
+
state.lastSyncError = nil
|
|
846
|
+
vars["_syncError"] = ""
|
|
847
|
+
state.remoteVariables = vars
|
|
848
|
+
state.updatedAt = Date().timeIntervalSince1970
|
|
849
|
+
DynamicWidgetStateStore.saveState(state)
|
|
850
|
+
} else if key.hasPrefix("widget_remote_config_") {
|
|
851
|
+
let wKey = String(key.dropFirst("widget_remote_config_".count))
|
|
852
|
+
removeSharedStorageKey("widget_bound_data_\(wKey)", appGroup: appGroup)
|
|
587
853
|
}
|
|
588
854
|
|
|
589
855
|
let defaults = getDefaults(appGroup: appGroup)
|
|
@@ -596,8 +862,15 @@ public class LiveActivityModule: RCTEventEmitter {
|
|
|
596
862
|
#endif
|
|
597
863
|
|
|
598
864
|
Task {
|
|
865
|
+
if key.hasPrefix("widget_remote_config_") {
|
|
866
|
+
let wKey = String(key.dropFirst("widget_remote_config_".count))
|
|
867
|
+
await DynamicWidgetStateStore.performRemoteSync(widgetKey: wKey, forceRefresh: true)
|
|
868
|
+
}
|
|
599
869
|
await DynamicWidgetImageCache.prefetchUrls(in: value)
|
|
600
870
|
WidgetCenter.shared.reloadAllTimelines()
|
|
871
|
+
if #available(iOS 18.0, *), key.hasPrefix("widget_control_") {
|
|
872
|
+
ControlCenter.shared.reloadAllControls()
|
|
873
|
+
}
|
|
601
874
|
resolve(true)
|
|
602
875
|
}
|
|
603
876
|
}
|
|
@@ -914,11 +1187,27 @@ public class LiveActivityModule: RCTEventEmitter {
|
|
|
914
1187
|
if #available(iOS 16.1, *) {
|
|
915
1188
|
var result: [[String: Any]] = []
|
|
916
1189
|
for activity in Activity<DynamicActivityAttributes>.activities {
|
|
1190
|
+
let actId = activity.attributes.activityId
|
|
1191
|
+
var isStale = false
|
|
1192
|
+
if #available(iOS 16.2, *) {
|
|
1193
|
+
isStale = (activity.activityState == .stale)
|
|
1194
|
+
}
|
|
917
1195
|
var item: [String: Any] = [
|
|
918
|
-
"activityId":
|
|
919
|
-
"
|
|
1196
|
+
"activityId": actId,
|
|
1197
|
+
"systemActivityId": activity.id,
|
|
1198
|
+
"activityState": String(describing: activity.activityState),
|
|
1199
|
+
"isStale": isStale,
|
|
920
1200
|
]
|
|
921
|
-
if
|
|
1201
|
+
if #available(iOS 16.2, *) {
|
|
1202
|
+
item["relevanceScore"] = activity.content.relevanceScore
|
|
1203
|
+
if let staleDate = activity.content.staleDate {
|
|
1204
|
+
item["staleTimestamp"] = staleDate.timeIntervalSince1970
|
|
1205
|
+
}
|
|
1206
|
+
}
|
|
1207
|
+
if let scheduledEnd = Self.getScheduledEnd(for: actId) {
|
|
1208
|
+
item["scheduledEndTimestamp"] = scheduledEnd
|
|
1209
|
+
}
|
|
1210
|
+
if let token = Self.getActivityUpdateToken(for: actId) {
|
|
922
1211
|
item["pushToken"] = token
|
|
923
1212
|
}
|
|
924
1213
|
result.append(item)
|