feat(ui):首页/好友页互动入口

@@ -163,7 +163,7 @@ class TodayTabBody extends StatelessWidget {
           if (controller.isFriend || showInteractionEntry)
           if (controller.isFriend || showInteractionEntry)
             const Positioned(
             const Positioned(
               right: 16,
               right: 16,
-              bottom: 92,
+              bottom: 160,
               child: FriendInteractionFloatingEntry(),
               child: FriendInteractionFloatingEntry(),
             ),
             ),
         ],
         ],

@@ -15,7 +15,7 @@ class TodayHrvNumberCard extends StatelessWidget {
   @override
   @override
   Widget build(BuildContext context) {
   Widget build(BuildContext context) {
     return Container(
     return Container(
-      padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 14),
+      padding: const EdgeInsets.symmetric(vertical: 16),
       decoration: BoxDecoration(
       decoration: BoxDecoration(
         color: Colors.white,
         color: Colors.white,
         borderRadius: BorderRadius.circular(16),
         borderRadius: BorderRadius.circular(16),
@@ -87,7 +87,7 @@ class _NumberItem extends StatelessWidget {
   @override
   @override
   Widget build(BuildContext context) {
   Widget build(BuildContext context) {
     return Padding(
     return Padding(
-      padding: const EdgeInsets.symmetric(horizontal: 12),
+      padding: const EdgeInsets.only(left: 20, right: 2),
       child: Column(
       child: Column(
         crossAxisAlignment: CrossAxisAlignment.start,
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
         children: [
@@ -105,11 +105,8 @@ class _NumberItem extends StatelessWidget {
                   ),
                   ),
                 ),
                 ),
               ),
               ),
-              if (interactionEnabled != null)
-                FriendInteractionButton(enabled: interactionEnabled!),
             ],
             ],
           ),
           ),
-          const SizedBox(height: 6),
           Row(
           Row(
             crossAxisAlignment: CrossAxisAlignment.end,
             crossAxisAlignment: CrossAxisAlignment.end,
             children: [
             children: [
@@ -124,7 +121,7 @@ class _NumberItem extends StatelessWidget {
               ),
               ),
               const SizedBox(width: 4),
               const SizedBox(width: 4),
               Padding(
               Padding(
-                padding: const EdgeInsets.only(bottom: 3),
+                padding: const EdgeInsets.only(bottom: 0),
                 child: Text(
                 child: Text(
                   unit,
                   unit,
                   style: TextStyle(
                   style: TextStyle(
@@ -134,6 +131,18 @@ class _NumberItem extends StatelessWidget {
                   ),
                   ),
                 ),
                 ),
               ),
               ),
+              if (interactionEnabled != null) ...[
+                const SizedBox(width: 8),
+                FriendInteractionButton(
+                  enabled: interactionEnabled!,
+                  padding: const EdgeInsets.only(
+                    left: 8,
+                    right: 20,
+                    top: 8,
+                    bottom: 0,
+                  ),
+                ),
+              ],
             ],
             ],
           ),
           ),
         ],
         ],

@@ -458,7 +458,7 @@ class _TodaySummaryCard extends StatelessWidget {
 
 
     return Container(
     return Container(
       margin: const EdgeInsets.only(bottom: 8),
       margin: const EdgeInsets.only(bottom: 8),
-      padding: const EdgeInsets.fromLTRB(20, 18, 20, 15),
+      padding: const EdgeInsets.fromLTRB(20, 10, 10, 15),
       decoration: BoxDecoration(
       decoration: BoxDecoration(
         color: Colors.white,
         color: Colors.white,
         borderRadius: BorderRadius.circular(16),
         borderRadius: BorderRadius.circular(16),
@@ -477,28 +477,20 @@ class _TodaySummaryCard extends StatelessWidget {
                   fontWeight: FontWeight.w600,
                   fontWeight: FontWeight.w600,
                 ),
                 ),
               ),
               ),
-              if (interactionEnabled != null) ...[
-                const SizedBox(width: 8),
-                FriendInteractionButton(enabled: interactionEnabled!),
-              ],
-              const Spacer(),
-              Text(
-                actionText,
-                style: TextStyle(
-                  color: colors.textSecondary,
-                  fontSize: 12,
-                  fontWeight: FontWeight.w400,
-                ),
-              ),
+              SizedBox(width: 4),
               Image.asset(
               Image.asset(
                 'assets/images/common/ic_more_gray.png',
                 'assets/images/common/ic_more_gray.png',
                 width: 16,
                 width: 16,
                 height: 16,
                 height: 16,
                 color: colors.textTertiary,
                 color: colors.textTertiary,
               ),
               ),
+              const Spacer(),
+              if (interactionEnabled != null) ...[
+                FriendInteractionButton(enabled: interactionEnabled!),
+              ],
             ],
             ],
           ),
           ),
-          const SizedBox(height: 16),
+          const SizedBox(height: 8),
           Row(
           Row(
             crossAxisAlignment: CrossAxisAlignment.start,
             crossAxisAlignment: CrossAxisAlignment.start,
             children: [
             children: [

@@ -6,11 +6,18 @@ class FriendInteractionButton extends StatelessWidget {
   const FriendInteractionButton({
   const FriendInteractionButton({
     super.key,
     super.key,
     required this.enabled,
     required this.enabled,
-    this.size = 24,
+    this.size = 24, 
+    this.padding = const EdgeInsets.only(
+      left: 20,
+      right: 10,
+      top: 8,
+      bottom: 8,
+    ),
   });
   });
 
 
   final bool enabled;
   final bool enabled;
   final double size;
   final double size;
+  final EdgeInsets padding;
 
 
   @override
   @override
   Widget build(BuildContext context) => Opacity(
   Widget build(BuildContext context) => Opacity(
@@ -18,18 +25,12 @@ class FriendInteractionButton extends StatelessWidget {
     child: GestureDetector(
     child: GestureDetector(
       behavior: HitTestBehavior.opaque,
       behavior: HitTestBehavior.opaque,
       onTap: enabled ? _openInteraction : null,
       onTap: enabled ? _openInteraction : null,
-      child: SizedBox(
-        width: size,
-        height: size,
-        child: DecoratedBox(
-          decoration: const BoxDecoration(
-            color: Color(0xFF845EEE),
-            shape: BoxShape.circle,
-          ),
-          child: Padding(
-            padding: EdgeInsets.all(size / 8),
-            child: Image.asset('assets/images/interact/icon_stick.png'),
-          ),
+      child: Padding(
+        padding: padding,
+        child: SizedBox(
+          width: size,
+          height: size,
+          child: Image.asset('assets/images/interact/icon_stick.png'),
         ),
         ),
       ),
       ),
     ),
     ),

@@ -2136,6 +2136,11 @@ double _integerDouble(num value) => value.toInt().toDouble();
 int _unixSecondsNow() => DateTime.now().millisecondsSinceEpoch ~/ 1000;
 int _unixSecondsNow() => DateTime.now().millisecondsSinceEpoch ~/ 1000;
 
 
 class HealthRawStressLocalStore {
 class HealthRawStressLocalStore {
+  // Version 12 deliberately re-runs the date-key migration. Some shipped
+  // databases were stamped with version 11 before this column was present.
+  // SQLite consequently skips the old (< 9) migration for those databases.
+  static const _databaseVersion = 12;
+
   HealthRawStressLocalStore({
   HealthRawStressLocalStore({
     Directory? rootDirectory,
     Directory? rootDirectory,
     DatabaseFactory? databaseFactory,
     DatabaseFactory? databaseFactory,
@@ -2625,7 +2630,7 @@ class HealthRawStressLocalStore {
     final db = await factory.openDatabase(
     final db = await factory.openDatabase(
       path,
       path,
       options: OpenDatabaseOptions(
       options: OpenDatabaseOptions(
-        version: 11,
+        version: _databaseVersion,
         onCreate: (db, version) async {
         onCreate: (db, version) async {
           await _createTables(db);
           await _createTables(db);
         },
         },
@@ -2661,9 +2666,17 @@ class HealthRawStressLocalStore {
           if (oldVersion < 11) {
           if (oldVersion < 11) {
             await _createIndexes(db);
             await _createIndexes(db);
           }
           }
+          if (oldVersion < _databaseVersion) {
+            await _repairDateKeySchema(db);
+          }
         },
         },
       ),
       ),
     );
     );
+    // Do not rely exclusively on user_version here. Historical releases may
+    // have recorded the target version even though their schema migration did
+    // not complete. This is idempotent, so it also protects a database whose
+    // migration was interrupted before the app was terminated.
+    await _repairDateKeySchema(db);
     _opened[userId] = db;
     _opened[userId] = db;
     return db;
     return db;
   }
   }
@@ -2842,6 +2855,10 @@ CREATE TABLE IF NOT EXISTS $sleepResultsTable (
     }
     }
   }
   }
 
 
+  Future<void> _repairDateKeySchema(DatabaseExecutor db) async {
+    await _addDateKeyColumns(db);
+  }
+
   Future<void> _addPushSendTimeColumns(DatabaseExecutor db) async {
   Future<void> _addPushSendTimeColumns(DatabaseExecutor db) async {
     for (final table in const [
     for (final table in const [
       hrvResultsTable,
       hrvResultsTable,

@@ -10,6 +10,10 @@ import 'huawei_health_data_type.dart';
 import 'ohos_health_raw_data_sync_service.dart';
 import 'ohos_health_raw_data_sync_service.dart';
 
 
 class OhosHealthRawDataSqliteStore implements OhosHealthRawDataLocalStore {
 class OhosHealthRawDataSqliteStore implements OhosHealthRawDataLocalStore {
+  // Re-run the date-key repair for databases that were marked as v2 before
+  // their dynamic raw-data tables completed the v2 migration.
+  static const _databaseVersion = 3;
+
   OhosHealthRawDataSqliteStore({
   OhosHealthRawDataSqliteStore({
     required int Function()? userIdProvider,
     required int Function()? userIdProvider,
     Directory? rootDirectory,
     Directory? rootDirectory,
@@ -417,15 +421,22 @@ class OhosHealthRawDataSqliteStore implements OhosHealthRawDataLocalStore {
     final db = await factory.openDatabase(
     final db = await factory.openDatabase(
       path,
       path,
       options: OpenDatabaseOptions(
       options: OpenDatabaseOptions(
-        version: 2,
+        version: _databaseVersion,
         onCreate: (db, version) => _createTables(db),
         onCreate: (db, version) => _createTables(db),
         onUpgrade: (db, oldVersion, newVersion) async {
         onUpgrade: (db, oldVersion, newVersion) async {
           if (oldVersion < 2) {
           if (oldVersion < 2) {
             await _addDateKeyColumns(db);
             await _addDateKeyColumns(db);
           }
           }
+          if (oldVersion < _databaseVersion) {
+            await _repairDateKeySchema(db);
+          }
         },
         },
       ),
       ),
     );
     );
+    // Dynamic raw-data tables can be created while a prior app version is
+    // running. Do not trust user_version alone: make their date-key schema
+    // valid before any read or write uses the cached database handle.
+    await _repairDateKeySchema(db);
     _opened[userId] = db;
     _opened[userId] = db;
     return db;
     return db;
   }
   }
@@ -703,6 +714,10 @@ CREATE TABLE IF NOT EXISTS $table (
     }
     }
   }
   }
 
 
+  Future<void> _repairDateKeySchema(DatabaseExecutor db) async {
+    await _addDateKeyColumns(db);
+  }
+
   Future<void> _backfillDateKey(DatabaseExecutor db, String table) async {
   Future<void> _backfillDateKey(DatabaseExecutor db, String table) async {
     final columns = await db.rawQuery('PRAGMA table_info($table)');
     final columns = await db.rawQuery('PRAGMA table_info($table)');
     final columnNames =
     final columnNames =

@@ -138,3 +138,5 @@ flutter:
     - assets/images/user_onboarding/oh/
     - assets/images/user_onboarding/oh/
     - assets/images/premium/
     - assets/images/premium/
     - assets/images/premium/zh/
     - assets/images/premium/zh/
+    - assets/images/interact/
+    - assets/images/interact/animations/