Merge branch 'dev' into happi/dev/database-update

# Conflicts: # apps/im_app/lib/data/models/user_dto.dart # apps/im_app/lib/data/remote/login_request.dart # apps/im_app/lib/features/chat/presentation/chat_db_test_view_model.dart # apps/im_app/lib/features/chat/view/chat_db_test_page.dart # apps/im_app/lib/features/login/presentation/login_view_model.dart
2026-03-09 15:08:45 +08:00
parent fe54f79b21 76e36ecc72
commit c278d1329e
163 changed files with 4341 additions and 1785 deletions
--- a/apps/im_app/lib/features/chat/presentation/.gitkeep
+++ b/apps/im_app/lib/features/chat/presentation/.gitkeep
--- a/apps/im_app/lib/features/chat/presentation/chat_db_test_state.dart
+++ b/apps/im_app/lib/features/chat/presentation/chat_db_test_state.dart
@@ -0,0 +1,39 @@
+// 数据库测试页状态（Demo，正式开发后随页面一并删除）
+
+/// 单条测试结果记录
+class TestResult {
+  final String title;
+  final String subtitle;
+  final String duration;
+
+  TestResult({
+    required this.title,
+    required this.subtitle,
+    required this.duration,
+  });
+}
+
+class ChatDbTestState {
+  final bool testStarted;
+  final List<TestResult> testResults;
+  final String currentState;
+
+  const ChatDbTestState({
+    this.testStarted = false,
+    this.testResults = const [],
+    this.currentState = '',
+  });
+
+  /// 按钮文案（Widget 直接读，不在 View 层做判断）
+  String get buttonLabel => testStarted ? '结束' : '开始';
+
+  ChatDbTestState copyWith({
+    bool? testStarted,
+    List<TestResult>? testResults,
+    String? currentState,
+  }) => ChatDbTestState(
+    testStarted: testStarted ?? this.testStarted,
+    testResults: testResults ?? this.testResults,
+    currentState: currentState ?? this.currentState,
+  );
+}
--- a/apps/im_app/lib/features/chat/view/chat_detail_page.dart
+++ b/apps/im_app/lib/features/chat/view/chat_detail_page.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';

 import '../../../../core/ui/base/context_theme_ext.dart';

@@ -12,7 +13,7 @@ import '../../../../core/ui/base/context_theme_ext.dart';
 ///
 /// 将 [conversationId] 传给对应的 Riverpod `.family` provider 加载完整会话数据。
 /// 构造参数保持不变，数据来源从 `extra` 换成 provider 即可。
-class ChatDetailPage extends StatelessWidget {
+class ChatDetailPage extends ConsumerWidget {
  const ChatDetailPage({
    super.key,
    required this.conversationId,
@@ -23,7 +24,7 @@ class ChatDetailPage extends StatelessWidget {
  final String title;

  @override
-  Widget build(BuildContext context) {
+  Widget build(BuildContext context, WidgetRef ref) {
    final s = context.styles;

    return Scaffold(
--- a/apps/im_app/lib/features/chat/view/chat_page.dart
+++ b/apps/im_app/lib/features/chat/view/chat_page.dart
@@ -20,8 +20,6 @@ class ChatPage extends ConsumerWidget {

  @override
  Widget build(BuildContext context, WidgetRef ref) {
-    final vm = ref.read(chatViewModelProvider.notifier);
-
    return Scaffold(
      appBar: AppBar(title: const Text('聊天')),
      body: Center(
@@ -32,36 +30,48 @@ class ChatPage extends ConsumerWidget {
            // 切换 Tab：用 go，替换整个历史栈，不可返回
            AppButton.inverse(
              label: '切换 Tab（go）',
-              onPressed: () => vm.goToContact(context),
+              onPressed: () =>
+                  ref.read(chatViewModelProvider.notifier).goToContact(context),
            ),
            // 带参数 push：extra 传 Dart Record，适合已有对象的场景
            AppButton.inverse(
              label: '有参 push（extra）',
-              onPressed: () => vm.pushChatDetailWithExtra(context),
+              onPressed: () => ref
+                  .read(chatViewModelProvider.notifier)
+                  .pushChatDetailWithExtra(context),
            ),
            // 带参数 push：id 内嵌在路径中，适合需要深链接 / 分享的场景
            AppButton.inverse(
              label: '有参 push（路径参数）',
-              onPressed: () => vm.pushChatDetailById(context),
+              onPressed: () => ref
+                  .read(chatViewModelProvider.notifier)
+                  .pushChatDetailById(context),
            ),
            // 无参 push：压栈，自动显示返回按钮，不切 Tab
            AppButton.inverse(
              label: '无参 push',
-              onPressed: () => vm.pushSettingsTheme(context),
+              onPressed: () => ref
+                  .read(chatViewModelProvider.notifier)
+                  .pushSettingsTheme(context),
            ),
            // 无参 go：替换历史，切换到对应 Tab，TabBar 可见，不可返回
            AppButton.inverse(
              label: '无参 go',
-              onPressed: () => vm.goToSettings(context),
+              onPressed: () => ref
+                  .read(chatViewModelProvider.notifier)
+                  .goToSettings(context),
            ),
            AppButton.inverse(
              label: '测试数据库性能',
-              onPressed: () => vm.goToDatabaseTest(context),
+              onPressed: () => ref
+                  .read(chatViewModelProvider.notifier)
+                  .goToDatabaseTest(context),
            ),
            AppButton.secondary(
              label: '退出登录',
              fullWidth: false,
-              onPressed: () => vm.logout(),
+              onPressed: () =>
+                  ref.read(chatViewModelProvider.notifier).logout(),
            ),
          ],
        ),
--- a/apps/im_app/lib/features/contact/view/contact_page.dart
+++ b/apps/im_app/lib/features/contact/view/contact_page.dart
@@ -1,13 +1,14 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';

 /// 联系人页占位
 ///
 /// 待 contact 功能开发后替换为实际内容。
-class ContactPage extends StatelessWidget {
+class ContactPage extends ConsumerWidget {
  const ContactPage({super.key});

  @override
-  Widget build(BuildContext context) {
+  Widget build(BuildContext context, WidgetRef ref) {
    return const Scaffold();
  }
 }
--- a/apps/im_app/lib/features/login/di/auth_providers.dart
+++ b/apps/im_app/lib/features/login/di/auth_providers.dart
@@ -12,7 +12,7 @@ import '../usecases/login_usecase.dart';
 /// ViewModel Provider 由 `@riverpod` 注解自动生成，不在此文件中。
 ///
 /// Auth 模块的 DI 链路：Repository → UseCase（按需）。
-/// app/di/ 只提供 SDK 基础设施（apiConfig / apiClient / socketManager / storageApi），
+/// app/di/ 只提供 SDK 基础设施（apiConfig / networkSdkApi / socketManager / storageApi），
 /// 业务模块的 Provider 内聚在 features/{模块}/di/ 下。
 ///
 /// ```
@@ -21,7 +21,7 @@ import '../usecases/login_usecase.dart';
 ///     → ref.read(authRepositoryProvider)   ← di/ 手动装配
 ///     → ref.read(socketManagerProvider)    ← app/di/ 手动装配
 ///     → ref.read(apiConfigProvider)        ← app/di/ 手动装配
-///       → ref.read(apiClientProvider)      ← app/di/ 手动装配
+///       → ref.read(networkSdkApiProvider)  ← app/di/ 手动装配
 ///     → ref.read(storageSdkProvider)       ← app/di/ 手动装配
 /// ```

@@ -41,7 +41,7 @@ final authRepositoryProvider = Provider<AuthRepository>((ref) {
  // TODO: final secureStorage = ref.read(secureStorageProvider);

  return AuthRepositoryImpl(
-    client: ref.read(networkSdkApiProvider), // 直接注入 ApiClient
+    client: ref.read(networkSdkApiProvider), // 注入 Facade 接口
    onTokenUpdate: (token) {
      apiConfig.updateToken(token); // 内存（network_sdk）
      // TODO: secureStorage.saveToken(token); // 持久化（crypto_sdk）
--- a/apps/im_app/lib/features/login/presentation/login_view_model.dart
+++ b/apps/im_app/lib/features/login/presentation/login_view_model.dart
@@ -1,10 +1,10 @@
 import 'dart:convert';

 import 'package:flutter/services.dart';
-import 'package:im_app/app/di/user_provider.dart';
-import 'package:im_app/data/remote/login_request.dart';
-import 'package:networks_sdk/networks_sdk.dart';
 import 'package:im_app/app/di/db_provider.dart';
+import 'package:im_app/app/di/user_provider.dart';
+import 'package:im_app/domain/entities/user.dart';
+import 'package:networks_sdk/networks_sdk.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:storage_sdk/storage_sdk.dart';

@@ -33,7 +33,7 @@ part 'login_view_model.g.dart';
 /// loginViewModelProvider                    ← @riverpod 自动生成（本文件）
 ///   → ref.read(loginUseCaseProvider)       ← di/ 手动装配
 ///     → ref.read(authRepositoryProvider)   ← di/ 手动装配
-///       → ref.read(apiClientProvider)      ← app/di/ 手动装配
+///       → ref.read(networkSdkApiProvider)  ← app/di/ 手动装配
 /// ```
 ///
 /// ## 数据流位置
@@ -44,7 +44,7 @@ part 'login_view_model.g.dart';
 ///     → LoginUseCase.execute()                     ← 格式校验 + 调 Repository
 ///       → AuthRepository.login()
 ///         → _client.executeRequest(LoginRequest)
-///       ← LoginData → User
+///       ← LoginResponse → User
 ///     ← User
 ///   → state = state.copyWith(user: user)           ← 更新状态
 /// View: ref.watch → 自动 rebuild                    ← UI 刷新
@@ -59,27 +59,52 @@ class LoginViewModel extends _$LoginViewModel {
  /// 仅用于演示路由守卫行为，正式 UI 就绪后删除此方法，改用 [login]。
  /// 正式 [login] 成功后同样需要调用 [AuthNotifier.login] 更新守卫状态。
  Future<void> demoLogin() async {
+    // 防止连点重入：第一次调用未完成前忽略后续调用
+    if (state.isLoading) return;
+    state = state.copyWith(isLoading: true, error: null);
    final storageApi = ref.read(storageSdkProvider);
    final storageLifeCycle = storageApi as StorageSdkLifecycle;
    final repositoryProvider = ref.read(userRepositoryProvider);
    final provider = ref.read(authNotifierProvider);

-    // Read mock response from assets
-    final String raw = await rootBundle.loadString('assets/loginData.json');
-    final Map<String, dynamic> json = jsonDecode(raw);
+    try {
+      // 读取 mock 数据（loginData.json 结构: { code, message, data: {...} }）
+      // 手动拆包 data 字段，对应 SDK 内部 ApiResponseWrapper 的行为
+      final raw = await rootBundle.loadString('assets/loginData.json');
+      final json = jsonDecode(raw) as Map<String, dynamic>;
+      final data = json['data'] as Map<String, dynamic>;
+      final profile = data['profile'] as Map<String, dynamic>;
+      // 生成器生成的 _$XFromJson 是 library 私有函数，外部不可调用。
+      // Demo 场景直接从 JSON 字段构建 User，不依赖生成的 fromJson。
+      final user = User(
+        uid: profile['uid'] as int,
+        uuid: profile['uuid'] as String,
+        lastOnline: profile['last_online'] as int,
+        profilePic: profile['profile_pic'] as String,
+        profilePicGaussian: profile['profile_pic_gaussian'] as String,
+        nickname: profile['nickname'] as String,
+        contact: profile['contact'] as String,
+        countryCode: profile['country_code'] as String,
+        email: profile['email'] as String,
+        recoveryEmail: profile['recovery_email'] as String,
+        username: profile['username'] as String,
+        bio: profile['bio'] as String,
+        relationship: profile['relationship'] as int,
+        userAlias: profile['user_alias'] as String?,
+        hint: profile['hint'] as String,
+      );

-    // Parse → Domain User directly
-    final loginResponse = LoginResponse.fromJson(json);
-    final user = loginResponse.data.toEntity();
+      // 先完成 DB 操作，再标记登录状态（失败时不会误标为已登录）
+      await storageLifeCycle.openDatabase(user.uid);
+      // Save user to DB via repository
+      await repositoryProvider.saveUser(user);

-    // Open database for the user
-    await storageLifeCycle.openDatabase(user.uid);
-
-    // Save user to DB via repository
-    await repositoryProvider.saveUser(user);
-
-    // Trigger auth state
-    provider.login();
+      // Trigger auth state
+      provider.login();
+    } catch (e) {
+      // 导航已发生时 provider 已被 dispose，静默丢弃，不再写 state
+      state = state.copyWith(error: e.toString(), isLoading: false);
+    }
  }

  /// 执行登录
@@ -89,12 +114,10 @@ class LoginViewModel extends _$LoginViewModel {
  /// 3. 成功：写入 user；失败：写入 error
  Future<void> login(String email, String password) async {
    state = state.copyWith(isLoading: true, error: null);
+    final provider = ref.read(loginUseCaseProvider);

    try {
-      final user = await ref
-          .read(loginUseCaseProvider)
-          .execute(email: email, password: password);
-
+      final user = await provider.execute(email: email, password: password);
      state = state.copyWith(user: user, isLoading: false);
    } on FormatException catch (e) {
      // 格式校验失败（UseCase 层抛出）
--- a/apps/im_app/lib/features/login/usecases/login_usecase.dart
+++ b/apps/im_app/lib/features/login/usecases/login_usecase.dart
@@ -28,9 +28,9 @@ import '../../../domain/repositories/auth_repository.dart';
 ///     → AuthRepository.login()
 ///       → AuthRepositoryImpl.login()
 ///         → _client.executeRequest(LoginRequest)
-///       ← LoginData（DTO）
-///       → _onTokenUpdate(token)               ← 回调写入 Token（内存 + 持久化，由 Provider 层组合）
-///       ← LoginData.toEntity() → User
+///       ← LoginResponse（SDK 已拆包 envelope）
+///       → _onTokenUpdate(accessToken)         ← 回调写入 Token（内存 + 持久化，由 Provider 层组合）
+///       ← LoginResponse.toEntity() → User
 ///     → SocketManager.connect(token)           ← 登录后连接 WebSocket
 ///     → StorageSdkApi.openDatabase(user.id)    ← 按用户 id 打开本地库
 ///   ← User
@@ -41,17 +41,18 @@ class LoginUseCase {
  final ApiConfig _apiConfig;
  final StorageSdkApi _storageApi;

-  StorageSdkLifecycle get _storageLifeCycle => _storageApi as StorageSdkLifecycle;
+  StorageSdkLifecycle get _storageLifeCycle =>
+      _storageApi as StorageSdkLifecycle;

  LoginUseCase({
    required AuthRepository authRepository,
    required SocketManager socketManager,
    required ApiConfig apiConfig,
    required StorageSdkApi storageApi,
-  })  : _authRepository = authRepository,
-        _socketManager = socketManager,
-        _apiConfig = apiConfig,
-        _storageApi = storageApi;
+  }) : _authRepository = authRepository,
+       _socketManager = socketManager,
+       _apiConfig = apiConfig,
+       _storageApi = storageApi;

  /// 执行登录
  ///
@@ -72,10 +73,7 @@ class LoginUseCase {
    _validatePassword(password);

    // ── 2. 登录 ──
-    final user = await _authRepository.login(
-      email: email,
-      password: password,
-    );
+    final user = await _authRepository.login(email: email, password: password);

    // ── 3. 连接 WebSocket ──
    // token 在 Repository 的 _onTokenUpdate 回调中已写入 ApiConfig，
--- a/apps/im_app/lib/features/login/view/login_page.dart
+++ b/apps/im_app/lib/features/login/view/login_page.dart
@@ -15,13 +15,12 @@ class LoginPage extends ConsumerWidget {

  @override
  Widget build(BuildContext context, WidgetRef ref) {
+    // ref.watch 保持 loginViewModelProvider 存活（AutoDispose 需要至少一个监听者）
+    final state = ref.watch(loginViewModelProvider);
    final s = context.styles;

    return Scaffold(
-      appBar: AppBar(
-        title: const Text('登录'),
-        automaticallyImplyLeading: false,
-      ),
+      appBar: AppBar(title: const Text('登录'), automaticallyImplyLeading: false),
      body: Center(
        child: Column(
          mainAxisSize: MainAxisSize.min,
@@ -34,7 +33,9 @@ class LoginPage extends ConsumerWidget {
            ),
            const SizedBox(height: 32),
            FilledButton(
-              onPressed: () => ref.read(loginViewModelProvider.notifier).demoLogin(),
+              onPressed: state.isLoading
+                  ? null
+                  : () => ref.read(loginViewModelProvider.notifier).demoLogin(),
              child: const Text('登录'),
            ),
          ],
--- a/apps/im_app/lib/features/settings/view/theme_view.dart
+++ b/apps/im_app/lib/features/settings/view/theme_view.dart
@@ -16,32 +16,27 @@ class ThemeView extends ConsumerWidget {
    final current = ref.watch(themeViewModelProvider);

    return Scaffold(
-      appBar: AppBar(
-        title: const Text('主题'),
-      ),
+      appBar: AppBar(title: const Text('主题')),
      body: ListView(
        children: [
          const SettingsSectionHeader(title: '外观'),
          ThemeOptionTile(
            label: '跟随系统',
-            mode: ThemeMode.system,
-            current: current,
+            isSelected: current == ThemeMode.system,
            onTap: () => ref
                .read(themeViewModelProvider.notifier)
                .setMode(ThemeMode.system),
          ),
          ThemeOptionTile(
            label: '黑色模式',
-            mode: ThemeMode.dark,
-            current: current,
+            isSelected: current == ThemeMode.dark,
            onTap: () => ref
                .read(themeViewModelProvider.notifier)
                .setMode(ThemeMode.dark),
          ),
          ThemeOptionTile(
            label: '白色模式',
-            mode: ThemeMode.light,
-            current: current,
+            isSelected: current == ThemeMode.light,
            onTap: () => ref
                .read(themeViewModelProvider.notifier)
                .setMode(ThemeMode.light),
--- a/apps/im_app/lib/features/settings/view/widgets/theme_option_tile.dart
+++ b/apps/im_app/lib/features/settings/view/widgets/theme_option_tile.dart
@@ -5,14 +5,13 @@ import '../../../../../core/ui/base/context_theme_ext.dart';
 /// 单个主题选项行
 ///
 /// 纯展示 + 事件透传，不感知任何 Provider。
-/// 由父级传入 [current] 判断选中状态，[onTap] 处理切换。
+/// 父级传入 [isSelected] 决定是否显示勾选图标，[onTap] 处理切换。
 ///
 /// 用法：
 /// ```dart
 /// ThemeOptionTile(
 ///   label: '黑色模式',
-///   mode: ThemeMode.dark,
-///   current: current,
+///   isSelected: current == ThemeMode.dark,
 ///   onTap: () => ref.read(themeViewModelProvider.notifier).setMode(ThemeMode.dark),
 /// )
 /// ```
@@ -20,20 +19,17 @@ class ThemeOptionTile extends StatelessWidget {
  const ThemeOptionTile({
    super.key,
    required this.label,
-    required this.mode,
-    required this.current,
+    required this.isSelected,
    required this.onTap,
  });

  final String label;
-  final ThemeMode mode;
-  final ThemeMode current;
+  final bool isSelected;
  final VoidCallback onTap;

  @override
  Widget build(BuildContext context) {
    final s = context.styles;
-    final isSelected = current == mode;

    return ListTile(
      title: Text(label),