新增:宠物头像接线——铅笔角标接上传、列表与详情展示真实头像(T3.5-09)

- `Pet.avatarUrl` 入模型;列表卡与详情头像改用真实预签名 URL(无图仍回退
  爪印占位——服务端对非 ready 的 asset 直接给 null,客户端只有一种占位)。
- 详情页铅笔角标自此有功能:接 `MediaUploader`(purpose=pet_avatar);已有
  头像时先给「更换 / 移除」二选一,移除即三态显式 null。
- 权限按 **WRITE 档**呈现(ADR-022 D3.5-3:owner + caregiver 可改头像,
  viewer 无入口),与资料编辑的 MANAGE 档刻意不同。因此纯头像 PATCH 只发
  `version` + `avatarAssetId`,**不夹带任何资料字段**——夹带会让服务端按更严
  的一半定档,caregiver 立刻 403。
- `UpdatePetRequest.avatarAssetId` 是该 schema 唯一的三态字段,其余字段保持
  M2 两态语义(它们的 CHECK 约束本就不允许空值,「清空」无意义)。
- 40902 冲突后重取档案让用户自行决定重来,不静默重放(头像是用户可见的
  覆盖操作,不该自动生效两次)。

测试 588 → 597(+9)。

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
2026-09-11 15:37:25 +08:00
parent a4a97c03c2
commit eff3526840
7 changed files with 519 additions and 25 deletions
+116 -3
View File
@@ -2,10 +2,12 @@ import 'package:flutter/material.dart';
import 'package:patbond_flutter/core/navigation/fade_route.dart';
import 'package:patbond_flutter/core/network/api_exception.dart';
import 'package:patbond_flutter/core/theme/app_theme.dart';
import 'package:patbond_flutter/core/widgets/avatar_upload_sheet.dart';
import 'package:patbond_flutter/core/widgets/empty_state_illustration.dart';
import 'package:patbond_flutter/core/widgets/inline_error_banner.dart';
import 'package:patbond_flutter/core/widgets/pet_avatar.dart';
import 'package:patbond_flutter/core/widgets/record_type_dot.dart';
import 'package:patbond_flutter/features/community/community_models.dart';
import 'package:patbond_flutter/features/pets/care_reminders_page.dart';
import 'package:patbond_flutter/features/pets/health_events_page.dart';
import 'package:patbond_flutter/features/pets/health_record_analytics.dart';
@@ -43,6 +45,7 @@ class PetDetailPage extends StatefulWidget {
super.key,
this.analytics,
this.healthAnalytics,
this.avatarUploaderBuilder,
});
final PetsController controller;
@@ -50,6 +53,10 @@ class PetDetailPage extends StatefulWidget {
final PetAnalytics? analytics;
final HealthRecordAnalytics? healthAnalytics;
/// 头像上传编排器构造口(T3.5-09);null 即本次构建未装配上传能力,
/// 隐藏头像编辑入口(生产装配恒注入,见 `app.dart`)。
final AvatarUploaderBuilder? avatarUploaderBuilder;
@override
State<PetDetailPage> createState() => _PetDetailPageState();
}
@@ -186,6 +193,109 @@ class _PetDetailPageState extends State<PetDetailPage> {
/// 记录写入权限档 WRITEowner + caregiver);viewer 隐藏录入入口。
bool get _canWriteRecords => _pet?.myRole != PetRole.viewer;
/// 头像写入权限档 **WRITE**ADR-022 决策 D3.5-3:头像属日常照护信息,
/// 与体重/疫苗同档,owner + caregiver 均可改;viewer 只读)。
///
/// 注意这与 [_canEdit]MANAGE,仅 owner**刻意不同**:服务端按「本次
/// 请求触及了哪些字段」定档——只带 avatarAssetId 走 WRITE,碰任一资料
/// 字段即 MANAGE。故这里只发纯头像 PATCH,不夹带任何资料字段。
bool get _canEditAvatar =>
_phase == _DetailPhase.ready &&
_pet?.myRole != PetRole.viewer &&
widget.avatarUploaderBuilder != null;
/// 头像入口:已有头像时先给「更换 / 移除」二选一,没有则直接拉起上传。
Future<void> _onAvatarTap() async {
final pet = _pet;
if (pet == null || !_canEditAvatar) return;
if (pet.avatarUrl == null) {
await _uploadAvatar();
return;
}
final action = await showModalBottomSheet<String>(
context: context,
showDragHandle: true,
builder: (context) => SafeArea(
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
ListTile(
leading: const Icon(Icons.photo_camera_outlined),
title: const Text('更换头像'),
onTap: () => Navigator.pop(context, 'replace'),
),
ListTile(
leading: const Icon(
Icons.delete_outline,
color: AppColors.errorDark,
),
title: const Text(
'移除头像',
style: TextStyle(color: AppColors.errorDark),
),
onTap: () => Navigator.pop(context, 'clear'),
),
],
),
),
);
if (!mounted || action == null) return;
if (action == 'replace') {
await _uploadAvatar();
} else {
// 三态「显式 null」= 清除头像(缺省是「不改」,两者在 JSON 上不同)。
await _patchAvatar(const PatchField<String>.clear(), '已移除头像');
}
}
Future<void> _uploadAvatar() async {
final builder = widget.avatarUploaderBuilder;
if (builder == null) return;
final assetId = await showAvatarUploadSheet(
context,
builder: builder,
// 用途即引用侧的类型检查:帖图或用户头像挂到宠物上会被答 404/40405。
purpose: MediaPurpose.petAvatar,
);
if (assetId == null || !mounted) return;
await _patchAvatar(PatchField<String>.value(assetId), '头像已更新');
}
/// 纯头像 PATCH:请求体只有 `version` + `avatarAssetId`**不带任何资料
/// 字段**——夹带资料字段会把权限档从 WRITE 抬到 MANAGEcaregiver 立刻
/// 403(服务端刻意按更严的一半判,堵「夹带改名」)。
Future<void> _patchAvatar(PatchField<String> intent, String okMessage) async {
final pet = _pet;
if (pet == null) return;
try {
final updated = await widget.controller.updatePet(
pet.id,
UpdatePetRequest(version: pet.version, avatarAssetId: intent),
);
if (!mounted) return;
setState(() {
_pet = updated;
_phase = _DetailPhase.ready;
});
ScaffoldMessenger.of(
context,
).showSnackBar(SnackBar(content: Text(okMessage)));
} on PetVersionConflictException catch (error) {
// 40902:他人已改过这行。重取档案拿新 version,让用户自行决定是否重来
// (不静默重放——头像是用户可见的覆盖操作,不该自动生效两次)。
if (!mounted) return;
ScaffoldMessenger.of(
context,
).showSnackBar(SnackBar(content: Text(petAvatarSaveErrorMessage(error))));
await _load();
} on ApiException catch (error) {
if (!mounted) return;
ScaffoldMessenger.of(
context,
).showSnackBar(SnackBar(content: Text(petAvatarSaveErrorMessage(error))));
}
}
Future<void> _openWeights(Pet pet) async {
await Navigator.of(context).push(
// 列表页页名不在字典 v2 枚举内(06 §5.2 验收 4:字典外不上报),
@@ -306,11 +416,14 @@ class _PetDetailPageState extends State<PetDetailPage> {
children: [
Column(
children: [
// T3.5-09:头像展示真实预签名 URL(无图回退爪印占位);铅笔角标
// 自此有功能——接 MediaUploader 上传 pet_avatarWRITE 档可见。
PetAvatar(
size: PetAvatarSize.xl,
showEditBadge: _canEdit,
onTap: _canEdit ? _openEdit : null,
semanticLabel: _canEdit ? '编辑宠物资料' : null,
url: pet.avatarUrl,
showEditBadge: _canEditAvatar,
onTap: _canEditAvatar ? _onAvatarTap : null,
semanticLabel: _canEditAvatar ? '更换宠物头像' : null,
),
const SizedBox(height: 12),
Text(pet.name, style: Theme.of(context).textTheme.headlineSmall),