- 档案 Tab 替换为真实宠物列表(05 号规范 P1):PetsController 四态 驱动(loading/empty/error+重试/ready),空态插画 + 建档 CTA, 下拉刷新,虚线添加卡;页面一律走 T2-11 数据层、不直连 ApiClient - 新增 PetDetailPage(P2 档案信息部分):内存副本首屏 + getPet 刷新, 40401 防枚举 → 不存在态返回列表并刷新;仅 owner 显示编辑入口 (40300 语义);体重/疫苗/时间线区块留待 T2-13/14 接摘要与记录接口 - 新增 PetFormPage(建档/编辑):品种目录接口 + 自定义品种互斥 (目录失败回落自定义 + 重试)、性别契约必填、生日+估算、芯片号; 失焦+提交双校验、错误三层模型沿用登录纵切 - 40902 版本冲突:明确提示 + 自动拉取最新 version 重提路径(有测试); 40903 芯片号冲突字段级报错(有测试) - 埋点挂接:pet_create_started(表单首次输入、每次进入一次)/ succeeded / failed 三事件接线;建宠表单路由名 pet_form、详情页 pet_detail 进入既有 RouteObserver 采集;档案 Tab 页名 pet_archive 改报 pet_list(字典 v2);编辑表单不带路由名(漏斗到达段不掺编辑) - app.dart 装配:pet 服务 ApiClient(:8083)共享 TokenRefresher; 登出 reset 控制器防跨账号泄漏;PetsController.loadBreeds 按物种缓存 - AppState 清理:pets 页原 demo 消费方移除,vaccines 及其模型/持久化 删除;pet demo 仅存首页问候/创作页/主壳头像(后续工单收敛) - 头像按 ADR-010 本地占位,不做上传 - 测试 145 → 177 全绿(列表/详情/表单四态与冲突路径 widget 测试、 控制器 loadBreeds/reset、展示纯函数);analyze 0;format 无 diff Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
+47
-2
@@ -13,14 +13,23 @@ import 'package:patbond_flutter/features/auth/login_page.dart';
|
||||
import 'package:patbond_flutter/features/auth/session_manager.dart';
|
||||
import 'package:patbond_flutter/features/auth/splash_page.dart';
|
||||
import 'package:patbond_flutter/features/main/main_shell_page.dart';
|
||||
import 'package:patbond_flutter/features/pets/pet_analytics.dart';
|
||||
import 'package:patbond_flutter/features/pets/pets_controller.dart';
|
||||
import 'package:patbond_flutter/features/pets/pets_repository.dart';
|
||||
import 'package:patbond_flutter/state/app_state.dart';
|
||||
|
||||
class App extends StatefulWidget {
|
||||
const App({super.key, this.sessionManager, this.authRepository});
|
||||
const App({
|
||||
super.key,
|
||||
this.sessionManager,
|
||||
this.authRepository,
|
||||
this.petsRepository,
|
||||
});
|
||||
|
||||
/// 测试注入口;生产默认走安全存储 + 真实 API。
|
||||
final SessionManager? sessionManager;
|
||||
final AuthRepository? authRepository;
|
||||
final PetsRepository? petsRepository;
|
||||
|
||||
@override
|
||||
State<App> createState() => _AppState();
|
||||
@@ -30,10 +39,13 @@ class _AppState extends State<App> {
|
||||
late final AppState appState;
|
||||
late final SessionManager sessionManager;
|
||||
late final AuthRepository authRepository;
|
||||
late final PetsController petsController;
|
||||
late final PetAnalytics petAnalytics;
|
||||
late final SessionTracker _sessionTracker;
|
||||
late final AnalyticsService _analytics;
|
||||
late final PageViewTracker _pageViewTracker;
|
||||
late final AnalyticsRouteObserver _routeObserver;
|
||||
TokenRefresher? _sharedRefresher;
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
@@ -64,6 +76,10 @@ class _AppState extends State<App> {
|
||||
);
|
||||
|
||||
authRepository = widget.authRepository ?? _buildRepository();
|
||||
petsController = PetsController(
|
||||
repository: widget.petsRepository ?? _buildPetsRepository(),
|
||||
);
|
||||
petAnalytics = PetAnalytics(_analytics.trackEvent);
|
||||
|
||||
// 认证状态切换补点(根路由 AnimatedSwitcher 无路由事件)
|
||||
sessionManager.addListener(_reportAuthStateChange);
|
||||
@@ -79,9 +95,18 @@ class _AppState extends State<App> {
|
||||
}
|
||||
}
|
||||
|
||||
/// 三服务分端口直连(ADR-002 无网关),token 刷新单飞经共享
|
||||
/// [TokenRefresher](22 号报告 §7 交接约定)。
|
||||
TokenRefresher _ensureRefresher() {
|
||||
return _sharedRefresher ??= TokenRefresher(
|
||||
dio: buildPatbondDio(session: sessionManager),
|
||||
session: sessionManager,
|
||||
);
|
||||
}
|
||||
|
||||
AuthRepository _buildRepository() {
|
||||
final dio = buildPatbondDio(session: sessionManager);
|
||||
final refresher = TokenRefresher(dio: dio, session: sessionManager);
|
||||
final refresher = _ensureRefresher();
|
||||
final api = ApiClient(
|
||||
dio: dio,
|
||||
session: sessionManager,
|
||||
@@ -95,6 +120,19 @@ class _AppState extends State<App> {
|
||||
);
|
||||
}
|
||||
|
||||
PetsRepository _buildPetsRepository() {
|
||||
final dio = buildPatbondDio(
|
||||
session: sessionManager,
|
||||
baseUrl: patbondPetApiBaseUrl,
|
||||
);
|
||||
final api = ApiClient(
|
||||
dio: dio,
|
||||
session: sessionManager,
|
||||
refresher: _ensureRefresher(),
|
||||
);
|
||||
return ApiPetsRepository(api: api);
|
||||
}
|
||||
|
||||
AnalyticsPageName? _resolveRootPage() {
|
||||
// 回栈到无名根路由时解析当前认证状态页/主壳 Tab
|
||||
return switch (sessionManager.status) {
|
||||
@@ -105,6 +143,10 @@ class _AppState extends State<App> {
|
||||
}
|
||||
|
||||
void _reportAuthStateChange() {
|
||||
// 登出即清宠物档案内存副本(跨账号不泄漏;重登后列表页重新拉取)。
|
||||
if (sessionManager.status == AuthStatus.unauthenticated) {
|
||||
petsController.reset();
|
||||
}
|
||||
// 认证状态机切页补点(03 §3.2 非路由曝光 1/2)
|
||||
final page = switch (sessionManager.status) {
|
||||
AuthStatus.unauthenticated => AnalyticsPageName.login,
|
||||
@@ -119,6 +161,7 @@ class _AppState extends State<App> {
|
||||
sessionManager.removeListener(_reportAuthStateChange);
|
||||
WidgetsBinding.instance.removeObserver(_sessionTracker);
|
||||
appState.dispose();
|
||||
petsController.dispose();
|
||||
if (widget.sessionManager == null) sessionManager.dispose();
|
||||
super.dispose();
|
||||
}
|
||||
@@ -140,6 +183,8 @@ class _AppState extends State<App> {
|
||||
return MainShellPage(
|
||||
key: const ValueKey('shell'),
|
||||
appState: appState,
|
||||
petsController: petsController,
|
||||
petAnalytics: petAnalytics,
|
||||
pageViewTracker: _pageViewTracker,
|
||||
onLogout: authRepository.logout,
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user