- VaccinationFormPage:目录按宠物物种过滤(四态)、seriesKey 目录 code
预填、scheduled/completed 状态-日期规则结构化 + 纯函数双重前端拦截,
42201/40904 后端兜底横幅(均有测试)
- VaccinationRecordsPage:按系列分组、三态 TagPill(含 cancelled 留痕)、
四态齐备;viewer 隐藏登记入口
- 档案页数据卡行接 GET /pets/{id}/summary 实时聚合:最新体重/疫苗进度/
下一针三卡,null 语义为空态文案而非 0/0;从记录页返回即重拉摘要
- health_record 埋点装配(app→shell→pets→detail→记录页面族)
- 测试 205 → 224(+19)全绿;analyze 0 问题;format 无 diff
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
@@ -5,35 +5,45 @@ import 'package:patbond_flutter/core/theme/app_theme.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/pets/health_record_analytics.dart';
|
||||
import 'package:patbond_flutter/features/pets/health_record_display.dart';
|
||||
import 'package:patbond_flutter/features/pets/pet_analytics.dart';
|
||||
import 'package:patbond_flutter/features/pets/pet_display.dart';
|
||||
import 'package:patbond_flutter/features/pets/pet_exceptions.dart';
|
||||
import 'package:patbond_flutter/features/pets/pet_form_page.dart';
|
||||
import 'package:patbond_flutter/features/pets/pet_models.dart';
|
||||
import 'package:patbond_flutter/features/pets/pets_controller.dart';
|
||||
import 'package:patbond_flutter/features/pets/vaccination_records_page.dart';
|
||||
import 'package:patbond_flutter/features/pets/weight_records_page.dart';
|
||||
import 'package:patbond_flutter/widgets/common.dart';
|
||||
|
||||
enum _DetailPhase { loading, ready, error, notFound }
|
||||
|
||||
enum _SummaryPhase { loading, ready, error }
|
||||
|
||||
/// 宠物详情页(T2-12 / 05 号规范 §4.2 P2 的档案信息部分)。
|
||||
///
|
||||
/// 打开即用控制器内存副本首屏渲染,同时经 [PetsController.getPet]
|
||||
/// 拉取最新详情(同步列表副本)。四态:loading / ready / error+重试 /
|
||||
/// notFound(40401 防枚举三态同响应 → 提示后返回列表并刷新)。
|
||||
///
|
||||
/// 体重、疫苗进度、健康时间线与提醒区块随 T2-13/14 接入摘要与
|
||||
/// 记录接口后补充,本单不渲染 demo 占位。
|
||||
/// T2-13:数据卡行接 `GET /pets/{id}/summary` 实时聚合(最新体重 /
|
||||
/// 疫苗进度 / 下一针,null 语义为空态文案而非 0/0),并作为体重历史、
|
||||
/// 疫苗记录两页的导航入口;从记录页返回即重拉摘要。
|
||||
class PetDetailPage extends StatefulWidget {
|
||||
const PetDetailPage({
|
||||
required this.controller,
|
||||
required this.petId,
|
||||
super.key,
|
||||
this.analytics,
|
||||
this.healthAnalytics,
|
||||
});
|
||||
|
||||
final PetsController controller;
|
||||
final String petId;
|
||||
final PetAnalytics? analytics;
|
||||
final HealthRecordAnalytics? healthAnalytics;
|
||||
|
||||
@override
|
||||
State<PetDetailPage> createState() => _PetDetailPageState();
|
||||
@@ -44,12 +54,16 @@ class _PetDetailPageState extends State<PetDetailPage> {
|
||||
Pet? _pet;
|
||||
ApiException? _error;
|
||||
|
||||
_SummaryPhase _summaryPhase = _SummaryPhase.loading;
|
||||
PetSummary? _summary;
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
_pet = _fromController();
|
||||
if (_pet != null) _phase = _DetailPhase.ready;
|
||||
_load();
|
||||
_loadSummary();
|
||||
}
|
||||
|
||||
Pet? _fromController() {
|
||||
@@ -89,6 +103,24 @@ class _PetDetailPageState extends State<PetDetailPage> {
|
||||
}
|
||||
}
|
||||
|
||||
/// 摘要实时聚合(40401 由主链路 notFound 态承载,摘要只降级为 error 态)。
|
||||
Future<void> _loadSummary() async {
|
||||
setState(() => _summaryPhase = _SummaryPhase.loading);
|
||||
try {
|
||||
final summary = await widget.controller.repository.getPetSummary(
|
||||
widget.petId,
|
||||
);
|
||||
if (!mounted) return;
|
||||
setState(() {
|
||||
_summary = summary;
|
||||
_summaryPhase = _SummaryPhase.ready;
|
||||
});
|
||||
} on ApiException {
|
||||
if (!mounted) return;
|
||||
setState(() => _summaryPhase = _SummaryPhase.error);
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> _openEdit() async {
|
||||
final pet = _pet;
|
||||
if (pet == null) return;
|
||||
@@ -118,6 +150,41 @@ class _PetDetailPageState extends State<PetDetailPage> {
|
||||
bool get _canEdit =>
|
||||
_phase == _DetailPhase.ready && _pet?.myRole == PetRole.owner;
|
||||
|
||||
/// 记录写入权限档 WRITE(owner + caregiver);viewer 隐藏录入入口。
|
||||
bool get _canWriteRecords => _pet?.myRole != PetRole.viewer;
|
||||
|
||||
Future<void> _openWeights(Pet pet) async {
|
||||
await Navigator.of(context).push(
|
||||
// 列表页页名不在字典 v2 枚举内(06 §5.2 验收 4:字典外不上报),
|
||||
// 曝光由 health_record_viewed 承载。
|
||||
fadePageRoute(
|
||||
WeightRecordsPage(
|
||||
repository: widget.controller.repository,
|
||||
petId: pet.id,
|
||||
canWrite: _canWriteRecords,
|
||||
analytics: widget.healthAnalytics,
|
||||
),
|
||||
),
|
||||
);
|
||||
// 记录可能已变化:返回即重拉摘要(服务端实时聚合是唯一事实来源)。
|
||||
if (mounted) await _loadSummary();
|
||||
}
|
||||
|
||||
Future<void> _openVaccinations(Pet pet) async {
|
||||
await Navigator.of(context).push(
|
||||
fadePageRoute(
|
||||
VaccinationRecordsPage(
|
||||
repository: widget.controller.repository,
|
||||
petId: pet.id,
|
||||
petSpecies: pet.species,
|
||||
canWrite: _canWriteRecords,
|
||||
analytics: widget.healthAnalytics,
|
||||
),
|
||||
),
|
||||
);
|
||||
if (mounted) await _loadSummary();
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Scaffold(
|
||||
@@ -201,6 +268,10 @@ class _PetDetailPageState extends State<PetDetailPage> {
|
||||
],
|
||||
),
|
||||
const SizedBox(height: 24),
|
||||
Text('健康数据', style: Theme.of(context).textTheme.titleLarge),
|
||||
const SizedBox(height: 10),
|
||||
_summarySection(pet),
|
||||
const SizedBox(height: 24),
|
||||
Text('基本资料', style: Theme.of(context).textTheme.titleLarge),
|
||||
const SizedBox(height: 10),
|
||||
SectionCard(
|
||||
@@ -244,6 +315,138 @@ class _PetDetailPageState extends State<PetDetailPage> {
|
||||
],
|
||||
);
|
||||
}
|
||||
|
||||
/// 数据卡行(05 §4.2 stat-row):三卡取数全部来自 summary 实时聚合,
|
||||
/// 不落任何本地展示字符串(第 4.3 节红线)。null 语义 → 空态文案。
|
||||
Widget _summarySection(Pet pet) {
|
||||
switch (_summaryPhase) {
|
||||
case _SummaryPhase.loading:
|
||||
return const SizedBox(
|
||||
height: 86,
|
||||
child: Center(
|
||||
child: SizedBox(
|
||||
width: 22,
|
||||
height: 22,
|
||||
child: CircularProgressIndicator(strokeWidth: 2),
|
||||
),
|
||||
),
|
||||
);
|
||||
case _SummaryPhase.error:
|
||||
return Row(
|
||||
children: [
|
||||
const Expanded(
|
||||
child: Text(
|
||||
'健康数据加载失败',
|
||||
style: TextStyle(color: AppColors.error, fontSize: 12),
|
||||
),
|
||||
),
|
||||
TextButton(onPressed: _loadSummary, child: const Text('重试')),
|
||||
],
|
||||
);
|
||||
case _SummaryPhase.ready:
|
||||
final summary = _summary!;
|
||||
final weight = summary.latestWeight;
|
||||
final progress = summary.vaccinationProgress;
|
||||
final next = summary.nextVaccination;
|
||||
return IntrinsicHeight(
|
||||
child: Row(
|
||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||
children: [
|
||||
Expanded(
|
||||
child: _SummaryCard(
|
||||
type: RecordType.weight,
|
||||
value: weight == null
|
||||
? '暂无记录'
|
||||
: '${formatWeightKg(weight.weightKg)} kg',
|
||||
emphasized: weight != null,
|
||||
label: '最新体重',
|
||||
onTap: () => _openWeights(pet),
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 10),
|
||||
Expanded(
|
||||
child: _SummaryCard(
|
||||
type: RecordType.vaccine,
|
||||
// 契约:totalDoses=0 → 整体 null(不是 0/0)→ 空态文案。
|
||||
value: progress == null
|
||||
? '未登记'
|
||||
: '${vaccinationProgressLabel(progress)} 针',
|
||||
emphasized: progress != null,
|
||||
label: '疫苗进度',
|
||||
onTap: () => _openVaccinations(pet),
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 10),
|
||||
Expanded(
|
||||
child: _SummaryCard(
|
||||
type: RecordType.vaccine,
|
||||
value: next == null ? '暂无安排' : dateToJson(next.dueOn),
|
||||
emphasized: next != null,
|
||||
label: next == null ? '下一针' : '下一针·${next.vaccineName}',
|
||||
onTap: () => _openVaccinations(pet),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// 数据卡(正典 stat-card 形态):类型图标 + 数值 15/w800 + 标签 12 inkSoft;
|
||||
/// 空态数值降级 inkSoft 常规字重(区分「有数据」与「空态」两种视觉)。
|
||||
class _SummaryCard extends StatelessWidget {
|
||||
const _SummaryCard({
|
||||
required this.type,
|
||||
required this.value,
|
||||
required this.label,
|
||||
required this.emphasized,
|
||||
this.onTap,
|
||||
});
|
||||
|
||||
final RecordType type;
|
||||
final String value;
|
||||
final String label;
|
||||
final bool emphasized;
|
||||
final VoidCallback? onTap;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final style = recordTypeStyles[type]!;
|
||||
return Card(
|
||||
child: InkWell(
|
||||
onTap: onTap,
|
||||
borderRadius: BorderRadius.circular(AppRadius.xl),
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 12),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Icon(style.icon, size: 18, color: style.iconColor),
|
||||
const SizedBox(height: 8),
|
||||
Text(
|
||||
value,
|
||||
maxLines: 1,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
style: TextStyle(
|
||||
color: emphasized ? AppColors.ink : AppColors.inkSoft,
|
||||
fontSize: emphasized ? 15 : 13,
|
||||
fontWeight: emphasized ? FontWeight.w800 : FontWeight.w600,
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 4),
|
||||
Text(
|
||||
label,
|
||||
maxLines: 1,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
style: const TextStyle(color: AppColors.inkSoft, fontSize: 11),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
/// 键值行(05 §4.3 P3 风格:字段名 12 inkSoft / 值 bodyMedium ink)。
|
||||
|
||||
Reference in New Issue
Block a user