新增:资料页真实化 + 编辑页——/me 读写、PATCH 三态、获赞与作品统计(T3.5-08)
资料页头部三项(展示名 / 头像 / 数字)自此全部来自服务端,176 行硬编码 demo(「萌宠新手(豆豆家长)」/ 24 / 1.8k / 2)退役。 - `PatchField<T>` 承载契约 v1.4.0 的 PATCH 三态(absent 不落键 / clear 落 显式 null / value 落值)。三态必须由类型承载而非 `T?` 加约定:把「不改」 也编码成 null,用户只改昵称就会连头像一起被服务端清掉。 - `UserProfile` 补 nickname / avatarUrl,展示回退 `nickname ?? username` **做在客户端展示层**——服务端 /me 刻意返回 DB 原值,编辑页因此只用原值 预填,避免把展示约定固化成真实昵称。 - `ProfileController`:`/me` 主链路四态 + 两块统计独立三态(统计失败只降级 这一块,不为两个数字丢掉整页);登出 reset 防跨账号泄漏。 - 编辑页维护三态意图而非「当前值整体提交」:昵称 / 头像各有显式清除入口, 未改字段的键根本不进 JSON;空 patch 直接短路(服务端对空 patch 答 400)。 - 昵称校验按**码点**计 1~32 且先 btrim,与 `ck_users_nickname` 对齐; 纯空白是校验失败而非隐式清空。 - `MediaUploader` 的 purpose 参数化 + 复用其六态编排的 `AvatarUploadSheet` (单图、预览确认后才交付 ready assetId,孤儿防护不变)。 - 修复 `/api/v1/me` 端口线路:该端点由 user 服务(:8082)提供,`ApiAuthRepository` 此前只挂 auth(:8081)会得到 404。此前无人消费 me(),故这条错线一直没被 触发;本单是第一个真实消费者,桌面实测即暴露。 测试 526 → 588(+62)。 Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
+42
-2
@@ -9,6 +9,7 @@ import 'package:patbond_flutter/app/app_localization.dart';
|
||||
import 'package:patbond_flutter/core/network/api_client.dart';
|
||||
import 'package:patbond_flutter/core/network/token_refresher.dart';
|
||||
import 'package:patbond_flutter/core/theme/app_theme.dart';
|
||||
import 'package:patbond_flutter/core/widgets/avatar_upload_sheet.dart';
|
||||
import 'package:patbond_flutter/features/auth/auth_repository.dart';
|
||||
import 'package:patbond_flutter/features/auth/login_page.dart';
|
||||
import 'package:patbond_flutter/features/auth/session_manager.dart';
|
||||
@@ -24,6 +25,7 @@ import 'package:patbond_flutter/features/pets/health_record_analytics.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/features/profile/profile_controller.dart';
|
||||
import 'package:patbond_flutter/state/app_state.dart';
|
||||
|
||||
class App extends StatefulWidget {
|
||||
@@ -34,6 +36,7 @@ class App extends StatefulWidget {
|
||||
this.petsRepository,
|
||||
this.communityRepository,
|
||||
this.mediaUploaderFactory,
|
||||
this.avatarUploaderFactory,
|
||||
});
|
||||
|
||||
/// 测试注入口;生产默认走安全存储 + 真实 API。
|
||||
@@ -45,6 +48,11 @@ class App extends StatefulWidget {
|
||||
/// 发布页媒体上传器构造口(桌面实测替换选图/压缩层;生产为 null)。
|
||||
final MediaUploaderFactory? mediaUploaderFactory;
|
||||
|
||||
/// 头像上传器构造口(T3.5-08/09)。生产为 null → 走
|
||||
/// [defaultAvatarUploader];桌面实测与集成测试在此替换选图/压缩层
|
||||
/// (Linux 桌面无 image_picker / 压缩原生实现),网络三段仍是生产实现。
|
||||
final AvatarUploaderFactory? avatarUploaderFactory;
|
||||
|
||||
@override
|
||||
State<App> createState() => _AppState();
|
||||
}
|
||||
@@ -55,6 +63,8 @@ class _AppState extends State<App> {
|
||||
late final AuthRepository authRepository;
|
||||
late final PetsController petsController;
|
||||
late final CommunityController communityController;
|
||||
late final ProfileController profileController;
|
||||
late final AvatarUploaderBuilder _avatarUploaderBuilder;
|
||||
late final PetAnalytics petAnalytics;
|
||||
late final HealthRecordAnalytics healthRecordAnalytics;
|
||||
late final FeedAnalytics feedAnalytics;
|
||||
@@ -108,10 +118,24 @@ class _AppState extends State<App> {
|
||||
// T3-14:Feed segment 接线主壳(数据层 T3-12 就位);T3-16 起
|
||||
// 点赞/收藏成功埋点经 interactionAnalytics 在 controller 内上报。
|
||||
interactionAnalytics = CommunityInteractionAnalytics(_analytics.trackEvent);
|
||||
final communityRepository =
|
||||
widget.communityRepository ?? _buildCommunityRepository();
|
||||
communityController = CommunityController(
|
||||
repository: widget.communityRepository ?? _buildCommunityRepository(),
|
||||
repository: communityRepository,
|
||||
interactionAnalytics: interactionAnalytics,
|
||||
);
|
||||
// T3.5-08/10:资料与统计单例,资料 Tab 与首页问候语共用(一次 /me
|
||||
// 供两个消费点,改昵称后两处同时变)。
|
||||
profileController = ProfileController(
|
||||
authRepository: authRepository,
|
||||
communityRepository: communityRepository,
|
||||
);
|
||||
// 头像上传:purpose 由调用页给定(user_avatar / pet_avatar)。仓库复用
|
||||
// community 仓库——media 两步上传端点由 user 服务提供,已在
|
||||
// _buildCommunityRepository 里单独接线(mediaApi)。
|
||||
final avatarFactory = widget.avatarUploaderFactory ?? defaultAvatarUploader;
|
||||
_avatarUploaderBuilder = (purpose) =>
|
||||
avatarFactory(communityRepository, purpose);
|
||||
petAnalytics = PetAnalytics(_analytics.trackEvent);
|
||||
healthRecordAnalytics = HealthRecordAnalytics(_analytics.trackEvent);
|
||||
feedAnalytics = FeedAnalytics(_analytics.trackEvent);
|
||||
@@ -149,8 +173,19 @@ class _AppState extends State<App> {
|
||||
session: sessionManager,
|
||||
refresher: refresher,
|
||||
);
|
||||
// `/api/v1/me` 由 user 服务(:8082)提供,auth(:8081)上没有该路由,
|
||||
// 故单独接一条 user 线路(与 community 仓库的 mediaApi 同构)。
|
||||
final userApi = ApiClient(
|
||||
dio: buildPatbondDio(
|
||||
session: sessionManager,
|
||||
baseUrl: patbondUserApiBaseUrl,
|
||||
),
|
||||
session: sessionManager,
|
||||
refresher: refresher,
|
||||
);
|
||||
return ApiAuthRepository(
|
||||
api: api,
|
||||
userApi: userApi,
|
||||
session: sessionManager,
|
||||
refresher: refresher,
|
||||
analytics: _analytics,
|
||||
@@ -205,10 +240,12 @@ class _AppState extends State<App> {
|
||||
}
|
||||
|
||||
void _reportAuthStateChange() {
|
||||
// 登出即清宠物档案与社区 Feed 内存副本(跨账号不泄漏;重登后重新拉取)。
|
||||
// 登出即清宠物档案、社区 Feed 与本人资料内存副本(跨账号不泄漏;
|
||||
// 重登后重新拉取)。
|
||||
if (sessionManager.status == AuthStatus.unauthenticated) {
|
||||
petsController.reset();
|
||||
communityController.reset();
|
||||
profileController.reset();
|
||||
}
|
||||
// 认证状态机切页补点(03 §3.2 非路由曝光 1/2)
|
||||
final page = switch (sessionManager.status) {
|
||||
@@ -227,6 +264,7 @@ class _AppState extends State<App> {
|
||||
appState.dispose();
|
||||
petsController.dispose();
|
||||
communityController.dispose();
|
||||
profileController.dispose();
|
||||
if (widget.sessionManager == null) sessionManager.dispose();
|
||||
super.dispose();
|
||||
}
|
||||
@@ -250,6 +288,7 @@ class _AppState extends State<App> {
|
||||
appState: appState,
|
||||
petsController: petsController,
|
||||
communityController: communityController,
|
||||
profileController: profileController,
|
||||
currentUserId: sessionManager.userId,
|
||||
petAnalytics: petAnalytics,
|
||||
healthRecordAnalytics: healthRecordAnalytics,
|
||||
@@ -257,6 +296,7 @@ class _AppState extends State<App> {
|
||||
interactionAnalytics: interactionAnalytics,
|
||||
postAnalytics: postAnalytics,
|
||||
mediaUploaderFactory: widget.mediaUploaderFactory,
|
||||
avatarUploaderBuilder: _avatarUploaderBuilder,
|
||||
pageViewTracker: _pageViewTracker,
|
||||
onLogout: authRepository.logout,
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user