feat: 完善饮水 widget

ios/WaterWidget/AppIntent.swift

@@ -7,12 +7,68 @@
 
 import WidgetKit
 import AppIntents
+import Foundation
 
 struct ConfigurationAppIntent: WidgetConfigurationIntent {
-    static var title: LocalizedStringResource { "Configuration" }
-    static var description: IntentDescription { "This is an example widget." }
-
-    // An example configurable parameter.
-    @Parameter(title: "Favorite Emoji", default: "😃")
-    var favoriteEmoji: String
+    static var title: LocalizedStringResource { "Water Widget Configuration" }
+    static var description: IntentDescription { "Configure water intake widget settings." }
+}
+
+// Intent for adding water record
+struct AddWaterIntent: AppIntent {
+    static var title: LocalizedStringResource { "Add Water" }
+    static var description: IntentDescription { "Add water intake record" }
+    
+    @Parameter(title: "Amount (ml)")
+    var amount: Int
+    
+    init(amount: Int) {
+        self.amount = amount
+    }
+    
+    init() {
+        self.amount = 150 // default value
+    }
+    
+    func perform() async throws -> some IntentResult {
+        // Add water directly through shared UserDefaults
+        guard let sharedDefaults = UserDefaults(suiteName: "group.com.anonymous.digitalpilates") else {
+            print("Failed to access App Group UserDefaults")
+            return .result()
+        }
+        
+        // Get current values
+        let currentIntake = sharedDefaults.object(forKey: "widget_current_water_intake") as? Int ?? 0
+        let targetIntake = sharedDefaults.object(forKey: "widget_daily_water_goal") as? Int ?? 2000
+        
+        // Update current intake
+        let newIntake = currentIntake + amount
+        sharedDefaults.set(newIntake, forKey: "widget_current_water_intake")
+        
+        // Create ISO8601 formatted date string
+        let formatter = ISO8601DateFormatter()
+        let isoString = formatter.string(from: Date())
+        sharedDefaults.set(isoString, forKey: "widget_last_sync_time")
+        sharedDefaults.synchronize()
+        
+        print("Water added from widget: +\(amount)ml, New total: \(newIntake)ml")
+        
+        // 设置待同步标记，主应用启动时会检测并同步到 TypeScript/Redux
+        let pendingRecords = sharedDefaults.array(forKey: "widget_pending_water_records") as? [[String: Any]] ?? []
+        let newRecord: [String: Any] = [
+            "amount": amount,
+            "recordedAt": isoString,
+            "source": "auto",
+            "widgetAdded": true
+        ]
+        let updatedRecords = pendingRecords + [newRecord]
+        sharedDefaults.set(updatedRecords, forKey: "widget_pending_water_records")
+        
+        // Trigger widget refresh
+        WidgetCenter.shared.reloadTimelines(ofKind: "WaterWidget")
+        
+        print("水记录已添加到待同步队列，主应用启动时将同步到 Redux Store")
+        
+        return .result()
+    }
 }

ios/WaterWidget/WaterWidget.swift

@@ -8,50 +8,139 @@
 import WidgetKit
 import SwiftUI
 
+// Data model for water intake
+struct WaterData {
+    let currentIntake: Int
+    let targetIntake: Int
+    let quickAddAmount: Int
+    let progressPercentage: Double
+    
+    init(currentIntake: Int = 0, targetIntake: Int = 2000, quickAddAmount: Int = 150) {
+        self.currentIntake = currentIntake
+        self.targetIntake = targetIntake
+        self.quickAddAmount = quickAddAmount
+        self.progressPercentage = min(Double(currentIntake) / Double(targetIntake), 1.0)
+    }
+}
+
 struct Provider: AppIntentTimelineProvider {
     func placeholder(in context: Context) -> SimpleEntry {
-        SimpleEntry(date: Date(), configuration: ConfigurationAppIntent())
+        SimpleEntry(date: Date(), configuration: ConfigurationAppIntent(), waterData: WaterData())
     }
 
     func snapshot(for configuration: ConfigurationAppIntent, in context: Context) async -> SimpleEntry {
-        SimpleEntry(date: Date(), configuration: configuration)
+        // In a real app, you would fetch the actual water data here
+        let waterData = await fetchWaterData()
+        return SimpleEntry(date: Date(), configuration: configuration, waterData: waterData)
     }
     
     func timeline(for configuration: ConfigurationAppIntent, in context: Context) async -> Timeline<SimpleEntry> {
         var entries: [SimpleEntry] = []
-
-        // Generate a timeline consisting of five entries an hour apart, starting from the current date.
         let currentDate = Date()
+        
+        // Fetch current water data
+        let waterData = await fetchWaterData()
+        
+        // Generate timeline entries for every hour for the next 5 hours
         for hourOffset in 0 ..< 5 {
             let entryDate = Calendar.current.date(byAdding: .hour, value: hourOffset, to: currentDate)!
-            let entry = SimpleEntry(date: entryDate, configuration: configuration)
+            let entry = SimpleEntry(date: entryDate, configuration: configuration, waterData: waterData)
             entries.append(entry)
         }
 
-        return Timeline(entries: entries, policy: .atEnd)
+        // Refresh every 15 minutes to keep data current
+        return Timeline(entries: entries, policy: .after(Calendar.current.date(byAdding: .minute, value: 15, to: currentDate)!))
+    }
+    
+    // Fetch water data from shared App Group storage
+    private func fetchWaterData() async -> WaterData {
+        guard let sharedDefaults = UserDefaults(suiteName: "group.com.anonymous.digitalpilates") else {
+            print("Failed to access App Group UserDefaults")
+            return WaterData() // Return default data
+        }
+        
+        // Read data using the same keys as defined in widgetDataSync.ts
+        let currentIntake = sharedDefaults.object(forKey: "widget_current_water_intake") as? Int ?? 0
+        let targetIntake = sharedDefaults.object(forKey: "widget_daily_water_goal") as? Int ?? 2000
+        let quickAddAmount = sharedDefaults.object(forKey: "widget_quick_add_amount") as? Int ?? 150
+        
+        print("Widget data loaded - Current: \(currentIntake)ml, Target: \(targetIntake)ml, Quick: \(quickAddAmount)ml")
+        
+        return WaterData(
+            currentIntake: currentIntake,
+            targetIntake: targetIntake,
+            quickAddAmount: quickAddAmount
+        )
     }
-
-//    func relevances() async -> WidgetRelevances<ConfigurationAppIntent> {
-//        // Generate a list containing the contexts this widget is relevant in.
-//    }
 }
 
 struct SimpleEntry: TimelineEntry {
     let date: Date
     let configuration: ConfigurationAppIntent
+    let waterData: WaterData
 }
 
 struct WaterWidgetEntryView : View {
     var entry: Provider.Entry
 
     var body: some View {
-        VStack {
-            Text("Time:")
-            Text(entry.date, style: .time)
-
-            Text("Favorite Emoji:")
-            Text(entry.configuration.favoriteEmoji)
+        VStack(spacing: 0) {
+            // Header with title and add button
+            HStack {
+                Text("喝水")
+                    .font(.system(size: 14, weight: .medium))
+                    .foregroundColor(Color(red: 0.098, green: 0.129, blue: 0.149))
+                
+                Spacer()
+                
+                // Quick add water button
+                Button(intent: AddWaterIntent(amount: entry.waterData.quickAddAmount)) {
+                    HStack(spacing: 2) {
+                        Text("+")
+                        Text("\(entry.waterData.quickAddAmount)ml")
+                    }
+                    .font(.system(size: 10, weight: .bold))
+                    .foregroundColor(Color(red: 0.388, green: 0.4, blue: 0.945))
+                    .padding(.horizontal, 6)
+                    .padding(.vertical, 5)
+                    .background(Color(red: 0.882, green: 0.906, blue: 1.0))
+                    .cornerRadius(16)
+                }
+                .buttonStyle(PlainButtonStyle())
+            }
+            .padding(.bottom, 8)
+            
+            Spacer()
+            
+            // Progress visualization - simplified bar chart representation
+            HStack(spacing: 2) {
+                ForEach(0..<12, id: \.self) { index in
+                    RoundedRectangle(cornerRadius: 1)
+                        .fill(index < Int(entry.waterData.progressPercentage * 12) ? 
+                              Color(red: 0.49, green: 0.827, blue: 0.988) : 
+                              Color(red: 0.941, green: 0.976, blue: 1.0))
+                        .frame(width: 3, height: 12)
+                }
+            }
+            .padding(.bottom, 8)
+            
+            // Water intake stats
+            HStack(alignment: .firstTextBaseline, spacing: 2) {
+                Text("\(entry.waterData.currentIntake)")
+                    .font(.system(size: 14, weight: .semibold))
+                    .foregroundColor(Color(red: 0.098, green: 0.129, blue: 0.149))
+                
+                Text("ml")
+                    .font(.system(size: 14, weight: .semibold))
+                    .foregroundColor(Color(red: 0.098, green: 0.129, blue: 0.149))
+                
+                Text("/ \(entry.waterData.targetIntake)ml")
+                    .font(.system(size: 12))
+                    .foregroundColor(Color(red: 0.42, green: 0.447, blue: 0.502))
+            }
         }
+        .padding(16)
+        .containerBackground(.fill.tertiary, for: .widget)
     }
 }
 
@@ -61,28 +150,23 @@ struct WaterWidget: Widget {
     var body: some WidgetConfiguration {
         AppIntentConfiguration(kind: kind, intent: ConfigurationAppIntent.self, provider: Provider()) { entry in
             WaterWidgetEntryView(entry: entry)
-                .containerBackground(.fill.tertiary, for: .widget)
         }
+        .configurationDisplayName("饮水记录")
+        .description("追踪你的每日饮水量，快速添加饮水记录")
+        .supportedFamilies([.systemSmall])
     }
 }
 
 extension ConfigurationAppIntent {
-    fileprivate static var smiley: ConfigurationAppIntent {
-        let intent = ConfigurationAppIntent()
-        intent.favoriteEmoji = "😀"
-        return intent
-    }
-    
-    fileprivate static var starEyes: ConfigurationAppIntent {
-        let intent = ConfigurationAppIntent()
-        intent.favoriteEmoji = "🤩"
-        return intent
+    fileprivate static var defaultConfig: ConfigurationAppIntent {
+        return ConfigurationAppIntent()
     }
 }
 
 #Preview(as: .systemSmall) {
     WaterWidget()
 } timeline: {
-    SimpleEntry(date: .now, configuration: .smiley)
-    SimpleEntry(date: .now, configuration: .starEyes)
+    SimpleEntry(date: .now, configuration: .defaultConfig, waterData: WaterData(currentIntake: 500, targetIntake: 2000, quickAddAmount: 150))
+    SimpleEntry(date: .now, configuration: .defaultConfig, waterData: WaterData(currentIntake: 1200, targetIntake: 2000, quickAddAmount: 200))
+    SimpleEntry(date: .now, configuration: .defaultConfig, waterData: WaterData(currentIntake: 1800, targetIntake: 2000, quickAddAmount: 150))
 }

ios/digitalpilates/AppGroupUserDefaults.m

@@ -0,0 +1,39 @@
+//
+//  AppGroupUserDefaults.m
+//  digitalpilates
+//
+//  Objective-C bridge file for AppGroupUserDefaults Swift module
+//
+
+#import <React/RCTBridgeModule.h>
+
+@interface RCT_EXTERN_MODULE(AppGroupUserDefaults, NSObject)
+
+RCT_EXTERN_METHOD(setString:(NSString *)groupId 
+                  key:(NSString *)key 
+                  value:(NSString *)value 
+                  resolver:(RCTPromiseResolveBlock)resolve 
+                  rejecter:(RCTPromiseRejectBlock)reject)
+
+RCT_EXTERN_METHOD(getString:(NSString *)groupId 
+                  key:(NSString *)key 
+                  resolver:(RCTPromiseResolveBlock)resolve 
+                  rejecter:(RCTPromiseRejectBlock)reject)
+
+RCT_EXTERN_METHOD(setNumber:(NSString *)groupId 
+                  key:(NSString *)key 
+                  value:(NSNumber *)value 
+                  resolver:(RCTPromiseResolveBlock)resolve 
+                  rejecter:(RCTPromiseRejectBlock)reject)
+
+RCT_EXTERN_METHOD(getNumber:(NSString *)groupId 
+                  key:(NSString *)key 
+                  resolver:(RCTPromiseResolveBlock)resolve 
+                  rejecter:(RCTPromiseRejectBlock)reject)
+
+RCT_EXTERN_METHOD(removeKey:(NSString *)groupId 
+                  key:(NSString *)key 
+                  resolver:(RCTPromiseResolveBlock)resolve 
+                  rejecter:(RCTPromiseRejectBlock)reject)
+
+@end

ios/digitalpilates/AppGroupUserDefaults.swift

@@ -0,0 +1,111 @@
+//
+//  AppGroupUserDefaults.swift
+//  digitalpilates
+//
+//  Native module for accessing App Group UserDefaults
+//  Allows sharing data between main app and widget
+//
+
+import Foundation
+import React
+
+@objc(AppGroupUserDefaults)
+class AppGroupUserDefaults: NSObject, RCTBridgeModule {
+  
+  static func moduleName() -> String! {
+    return "AppGroupUserDefaults"
+  }
+  
+  static func requiresMainQueueSetup() -> Bool {
+    return false
+  }
+  
+  // MARK: - String Methods
+  
+  @objc
+  func setString(_ groupId: String, key: String, value: String, resolver: @escaping RCTPromiseResolveBlock, rejecter: @escaping RCTPromiseRejectBlock) {
+    DispatchQueue.global(qos: .background).async {
+      guard let userDefaults = UserDefaults(suiteName: groupId) else {
+        rejecter("ERROR", "Failed to create UserDefaults with suite name: \(groupId)", nil)
+        return
+      }
+      
+      userDefaults.set(value, forKey: key)
+      userDefaults.synchronize()
+      
+      DispatchQueue.main.async {
+        resolver(nil)
+      }
+    }
+  }
+  
+  @objc
+  func getString(_ groupId: String, key: String, resolver: @escaping RCTPromiseResolveBlock, rejecter: @escaping RCTPromiseRejectBlock) {
+    DispatchQueue.global(qos: .background).async {
+      guard let userDefaults = UserDefaults(suiteName: groupId) else {
+        rejecter("ERROR", "Failed to create UserDefaults with suite name: \(groupId)", nil)
+        return
+      }
+      
+      let value = userDefaults.string(forKey: key)
+      
+      DispatchQueue.main.async {
+        resolver(value)
+      }
+    }
+  }
+  
+  // MARK: - Number Methods
+  
+  @objc
+  func setNumber(_ groupId: String, key: String, value: NSNumber, resolver: @escaping RCTPromiseResolveBlock, rejecter: @escaping RCTPromiseRejectBlock) {
+    DispatchQueue.global(qos: .background).async {
+      guard let userDefaults = UserDefaults(suiteName: groupId) else {
+        rejecter("ERROR", "Failed to create UserDefaults with suite name: \(groupId)", nil)
+        return
+      }
+      
+      userDefaults.set(value, forKey: key)
+      userDefaults.synchronize()
+      
+      DispatchQueue.main.async {
+        resolver(nil)
+      }
+    }
+  }
+  
+  @objc
+  func getNumber(_ groupId: String, key: String, resolver: @escaping RCTPromiseResolveBlock, rejecter: @escaping RCTPromiseRejectBlock) {
+    DispatchQueue.global(qos: .background).async {
+      guard let userDefaults = UserDefaults(suiteName: groupId) else {
+        rejecter("ERROR", "Failed to create UserDefaults with suite name: \(groupId)", nil)
+        return
+      }
+      
+      let value = userDefaults.object(forKey: key) as? NSNumber ?? NSNumber(value: 0)
+      
+      DispatchQueue.main.async {
+        resolver(value)
+      }
+    }
+  }
+  
+  // MARK: - Remove Key Method
+  
+  @objc
+  func removeKey(_ groupId: String, key: String, resolver: @escaping RCTPromiseResolveBlock, rejecter: @escaping RCTPromiseRejectBlock) {
+    DispatchQueue.global(qos: .background).async {
+      guard let userDefaults = UserDefaults(suiteName: groupId) else {
+        rejecter("ERROR", "Failed to create UserDefaults with suite name: \(groupId)", nil)
+        return
+      }
+      
+      userDefaults.removeObject(forKey: key)
+      userDefaults.synchronize()
+      
+      DispatchQueue.main.async {
+        resolver(nil)
+      }
+    }
+  }
+}

ios/digitalpilates/WaterRecordManager.m

@@ -0,0 +1,16 @@
+//
+//  WaterRecordManager.m
+//  digitalpilates
+//
+//  Objective-C bridge file for WaterRecordManager Swift module
+//
+
+#import <React/RCTBridgeModule.h>
+
+@interface RCT_EXTERN_MODULE(WaterRecordManager, NSObject)
+
+RCT_EXTERN_METHOD(addWaterRecord:(int)amount 
+                  resolver:(RCTPromiseResolveBlock)resolve 
+                  rejecter:(RCTPromiseRejectBlock)reject)
+
+@end

ios/digitalpilates/WaterRecordManager.swift

@@ -0,0 +1,81 @@
+//
+//  WaterRecordManager.swift
+//  digitalpilates
+//
+//  Native module for managing water records through React Native bridge
+//
+
+import Foundation
+import React
+import WidgetKit
+
+@objc(WaterRecordManager)
+class WaterRecordManager: NSObject, RCTBridgeModule {
+  
+  static func moduleName() -> String! {
+    return "WaterRecordManager"
+  }
+  
+  static func requiresMainQueueSetup() -> Bool {
+    return false
+  }
+  
+  @objc
+  func addWaterRecord(_ amount: Int, resolver: @escaping RCTPromiseResolveBlock, rejecter: @escaping RCTPromiseRejectBlock) {
+    
+    // 更新 App Group UserDefaults（用于 Widget 显示）
+    guard let sharedDefaults = UserDefaults(suiteName: "group.com.anonymous.digitalpilates") else {
+      rejecter("USERDEFAULTS_ERROR", "Failed to access App Group UserDefaults", nil)
+      return
+    }
+    
+    let currentIntake = sharedDefaults.object(forKey: "widget_current_water_intake") as? Int ?? 0
+    let newIntake = currentIntake + amount
+    sharedDefaults.set(newIntake, forKey: "widget_current_water_intake")
+    
+    // 创建 ISO8601 格式的日期字符串
+    let formatter = ISO8601DateFormatter()
+    let isoString = formatter.string(from: Date())
+    sharedDefaults.set(isoString, forKey: "widget_last_sync_time")
+    sharedDefaults.synchronize()
+    
+    print("Water record added via bridge: +\(amount)ml, New total: \(newIntake)ml")
+    
+    // 通过 React Native bridge 调用 TypeScript 代码来创建记录
+    DispatchQueue.main.async { [weak self] in
+      guard let bridge = self?.bridge else {
+        rejecter("BRIDGE_ERROR", "React Native bridge is not available", nil)
+        return
+      }
+      
+      // 调用 TypeScript 中的 Redux action 来创建喝水记录
+      let eventData = [
+        "amount": amount,
+        "recordedAt": isoString,
+        "source": "auto" // 标记为来自 Widget/自动添加
+      ]
+      
+      // 发送事件给 TypeScript 代码
+      self?.sendEvent(withName: "WaterRecordAdded", body: eventData)
+      
+      // 刷新 Widget
+      if #available(iOS 14.0, *) {
+        WidgetCenter.shared.reloadTimelines(ofKind: "WaterWidget")
+      }
+      
+      resolver(["success": true, "amount": amount, "newTotal": newIntake])
+    }
+  }
+  
+  // MARK: - Event Emitter
+  
+  override func supportedEvents() -> [String]! {
+    return ["WaterRecordAdded"]
+  }
+  
+  private func sendEvent(withName name: String, body: Any) {
+    if let bridge = self.bridge {
+      bridge.eventDispatcher().sendAppEvent(withName: name, body: body)
+    }
+  }
+}

ios/digitalpilates/WidgetManager.m

@@ -0,0 +1,18 @@
+//
+//  WidgetManager.m
+//  digitalpilates
+//
+//  Objective-C bridge file for WidgetManager Swift module
+//
+
+#import <React/RCTBridgeModule.h>
+
+@interface RCT_EXTERN_MODULE(WidgetManager, NSObject)
+
+RCT_EXTERN_METHOD(reloadTimelines:(RCTPromiseResolveBlock)resolve 
+                  rejecter:(RCTPromiseRejectBlock)reject)
+
+RCT_EXTERN_METHOD(reloadAllTimelines:(RCTPromiseResolveBlock)resolve 
+                  rejecter:(RCTPromiseRejectBlock)reject)
+
+@end

ios/digitalpilates/WidgetManager.swift

@@ -0,0 +1,46 @@
+//
+//  WidgetManager.swift
+//  digitalpilates
+//
+//  Native module for managing widget refresh
+//
+
+import Foundation
+import React
+import WidgetKit
+
+@objc(WidgetManager)
+class WidgetManager: NSObject, RCTBridgeModule {
+  
+  static func moduleName() -> String! {
+    return "WidgetManager"
+  }
+  
+  static func requiresMainQueueSetup() -> Bool {
+    return false
+  }
+  
+  @objc
+  func reloadTimelines(_ resolver: @escaping RCTPromiseResolveBlock, rejecter: @escaping RCTPromiseRejectBlock) {
+    DispatchQueue.main.async {
+      if #available(iOS 14.0, *) {
+        WidgetCenter.shared.reloadTimelines(ofKind: "WaterWidget")
+        resolver(nil)
+      } else {
+        rejecter("UNSUPPORTED", "WidgetKit is only available on iOS 14.0 and later", nil)
+      }
+    }
+  }
+  
+  @objc
+  func reloadAllTimelines(_ resolver: @escaping RCTPromiseResolveBlock, rejecter: @escaping RCTPromiseRejectBlock) {
+    DispatchQueue.main.async {
+      if #available(iOS 14.0, *) {
+        WidgetCenter.shared.reloadAllTimelines()
+        resolver(nil)
+      } else {
+        rejecter("UNSUPPORTED", "WidgetKit is only available on iOS 14.0 and later", nil)
+      }
+    }
+  }
+}