Compare commits
19 Commits
910ca99f21
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ac11aa0f99 | ||
|
|
77a4ee1c37 | ||
|
|
074d99715d | ||
|
|
60b6ad6d65 | ||
|
|
675c33bea1 | ||
|
|
77697e1600 | ||
|
|
30f97b3535 | ||
|
|
3798efa48d | ||
|
|
770dd6bedf | ||
|
|
bff7cfd4b6 | ||
|
|
32e7c25ed7 | ||
|
|
d72a1fec17 | ||
|
|
db7cc1bba7 | ||
|
|
adb589af16 | ||
|
|
da6223e051 | ||
|
|
40155de709 | ||
|
|
7ad41c5f09 | ||
|
|
dad9d43486 | ||
|
|
d2c77d5c51 |
2
.gitignore
vendored
@@ -1,2 +1,4 @@
|
||||
# 大模型素材:本地下载用于上传到 OpenList,不入库(~3GB)
|
||||
/Models/
|
||||
/build/
|
||||
.DS_Store
|
||||
|
||||
290
AGENTS.md
Normal file
@@ -0,0 +1,290 @@
|
||||
# 康康 —— 工程前提
|
||||
|
||||
> 这是一个 6 周决赛 demo 项目。今天是 2026-05-25,处于 W1末/W2初。
|
||||
> 任何 IDE/Codex 会话开始干活前,先读这份文件。
|
||||
|
||||
---
|
||||
|
||||
## 1. 产品定位
|
||||
|
||||
- **名字**:康康(对内代号 Kangkang)
|
||||
- **形态**:iOS 原生 App,SwiftUI + SwiftData
|
||||
- **核心卖点**:**100% 本地推理**的个人健康影像档案 + 大白话解读 + 本地 RAG 问答
|
||||
- **目标用户**:不愿把体检/化验报告交给云端的普通人
|
||||
- **明确不做**:医疗诊断、剂量推荐、急诊判断、医生预约、社交、广告、内购、数据上云、账号系统
|
||||
|
||||
---
|
||||
|
||||
## 2. 技术栈 / 选型(已锁定,不要再讨论)
|
||||
|
||||
| 项 | 选型 | 备注 |
|
||||
|---|---|---|
|
||||
| UI | SwiftUI | iOS 17+,用 `@Observable` / `@Model` |
|
||||
| 持久化 | SwiftData | 见 §5 数据模型 |
|
||||
| 图表 | Swift Charts | iOS 16+ 原生 |
|
||||
| **AI 运行时** | **MLX Swift (Apple 官方)** | 不要建议 Core ML / llama.cpp / Ollama |
|
||||
| LLM | Qwen3-1.7B 4bit (HF: `mlx-community/Qwen3-1.7B-4bit`) | ~1.0GB,负责文本生成、关键词抽取、趋势解读 |
|
||||
| VL | Qwen2.5-VL-3B-Instruct 4bit (HF: `mlx-community/Qwen2.5-VL-3B-Instruct-4bit`) | ~2.0GB,负责拍照→结构化指标 |
|
||||
| 文档扫描 | VisionKit `VNDocumentCameraView` | 不要自己写透视校正 |
|
||||
| Face ID | LocalAuthentication | |
|
||||
| Live Activity | ActivityKit + WidgetExtension | demo 杀手锏,真机才能测 |
|
||||
|
||||
**不引入**:任何云服务 SDK、任何 embedding 模型(RAG 用结构化检索,不用语义)、任何账号系统、任何分析 SDK。
|
||||
|
||||
---
|
||||
|
||||
## 3. AI 链路核心规则
|
||||
|
||||
### 3.1 模块边界(强制)
|
||||
|
||||
```
|
||||
UI → CaptureService / AskService / TrendService → AIRuntime → MLX
|
||||
↓
|
||||
Persistence
|
||||
```
|
||||
|
||||
- **UI 永远不直接调 `AIRuntime`**。所有 AI 调用必须经过 `*Service` 层,这样 UI 可以注入 mock、可以预览。
|
||||
- **`AIRuntime` 是 `actor` 单例,串行化**。同一时刻只允许一个推理任务,MLX 共享显存,并发会 OOM。CaptureService 拍照时如果 AskService 正在流式生成,要在队列里排队。
|
||||
- **`*Service` 不直接读写 SwiftData 主上下文**。要么传入 `ModelContext`,要么走 ServiceLocator,方便测试。
|
||||
|
||||
### 3.2 VL pipeline(拍一张 = 一条流程)
|
||||
|
||||
**重要**:快拍(1.x) 和 报告归档(2.x) 已经合并成统一 `CaptureService`,UI 不再有 A1-A3 和 B1-B4 两条独立路径。流程:
|
||||
|
||||
```
|
||||
拍照 → 写 Vault(加密目录) → VL 推理(要求输出 JSON,含 kind=single|report)
|
||||
→ 解析容错(失败回退到手动录入,不卡死)
|
||||
→ 单项走 A2ConfirmView,整份走 B3MetaView
|
||||
→ 保存到 Indicator/Report + 关联 Asset
|
||||
```
|
||||
|
||||
VL prompt 必须:
|
||||
- 明确要求"只输出 JSON,不要解释"
|
||||
- 带 2 个 few-shot 示例(单项 + 多项)
|
||||
- 异常状态由 VL 模型基于参考范围直接判断,不要再二次调用 LLM
|
||||
|
||||
### 3.3 RAG(结构化检索,不做 embedding)
|
||||
|
||||
**两段式调用**:
|
||||
1. 用 Qwen3-1.7B 抽取意图 + 关键词,输出 JSON `{indicators, time_range, intent}`,~50 token,<1s
|
||||
2. SwiftData 按关键词检索 ≤ 10 条记录,拼 `ChatRAG` prompt,流式生成回答
|
||||
|
||||
**第 1 步失败时**回退到"近 30 天全表扫描",不卡死。
|
||||
**引用回链**:回答中 `[1][2]` 后处理为可点击 Pill,点击跳源记录详情。
|
||||
|
||||
### 3.4 Live Activity
|
||||
|
||||
- VL 推理 / RAG 生成开始时启动 Activity
|
||||
- 每 0.5s 通过 `AIRuntime.lastDecodeRate` 推送 tok/s
|
||||
- 推理完成保留 2s 显示"已完成 · 0.8s"再 dismiss
|
||||
- **只能真机测**,模拟器不显示。W5 末预留时间。
|
||||
|
||||
---
|
||||
|
||||
## 4. 模型分发
|
||||
|
||||
- 模型放 `Application Support/Models/`,首启动用 `URLSession.downloadTask` 拉,带断点续传 + 进度条
|
||||
- 总体积 ~4GB(LLM ~1.0GB + VL ~3.1GB),WiFi 提示必须有
|
||||
- App 在模型未就绪时**仍可启动**,但所有 AI 入口显示"模型未就绪,前往下载"
|
||||
- `ModelStore` 必须提供**旁路接口**:允许把模型预拷进沙盒(demo 现场重装时用)
|
||||
|
||||
---
|
||||
|
||||
## 5. 数据模型(SwiftData)
|
||||
|
||||
**当前 schema(2026-05-26)**:7 个 @Model。
|
||||
|
||||
```swift
|
||||
@Model class Indicator {
|
||||
name, value, unit, range, statusRaw, note, capturedAt,
|
||||
report: Report?, asset: Asset?,
|
||||
pinned: Bool, // 长期监测自动 true,Trends 默认展示
|
||||
seriesKey: String? // "bp.systolic" / "glucose.fasting" / ... 长期指标分组 key
|
||||
}
|
||||
@Model class Report { title, typeRaw, reportDate, institution, note, summary, pageCount, createdAt,
|
||||
indicators: [Indicator] cascade,
|
||||
assets: [Asset] cascade }
|
||||
@Model class DiaryEntry { content, createdAt, tags: [String] }
|
||||
@Model class Symptom { name, startedAt, endedAt?, note?, severity 1-5, tags, createdAt }
|
||||
@Model class Asset { relativePath, mimeType, bytes, createdAt }
|
||||
@Model class ChatTurn { question, answer, referencedIndicatorIDs, referencedReportIDs, createdAt, decodeRate }
|
||||
|
||||
@Model class UserProfile { // 全 App 单例(UserProfileStore.loadOrCreate)
|
||||
birthYear?, biologicalSexRaw, heightCM?, bloodTypeRaw,
|
||||
allergies, chronicConditions, familyHistory, currentMedications,
|
||||
updatedAt
|
||||
}
|
||||
```
|
||||
|
||||
**原图存储**: `Asset` 只存元数据 + 相对路径,真实 JPEG 落在 `Application Support/Vault/`,目录用 `.completeFileProtection`(iOS 硬件级加密,不要自己造 AES 轮子)。
|
||||
|
||||
---
|
||||
|
||||
## 6. 安全 / 隐私(已收敛 — 不要扩展)
|
||||
|
||||
| 做 | 不做 |
|
||||
|---|---|
|
||||
| `Application Support/Vault/` 全目录 `.completeFileProtection` | 自实现 AES 加密 |
|
||||
| SwiftData store 文件 `.completeFileProtection` | |
|
||||
| Face ID 启动锁(可选开关,默认关) | |
|
||||
| 永久删除(SwiftData 硬删 + Asset 文件 unlink) | |
|
||||
| 离线运行(自然结果,不用单独做) | |
|
||||
| | 截屏黑屏防护(iOS 没有官方 API,不做) |
|
||||
| | 加密 ZIP 导出 |
|
||||
|
||||
唯一的"导出"是 **9.4 分享文字摘要**(只分享解读文本,不带原图)。
|
||||
|
||||
---
|
||||
|
||||
## 7. 信息架构
|
||||
|
||||
```
|
||||
TabBar: [主页] [记录] [+ 新建] [趋势] [我的]
|
||||
│ │ │ │ │
|
||||
│ │ │ │ └─ 个人资料 / 模型管理 / Face ID / 关于
|
||||
│ │ │ └─ 折线图 + AI 一句话解读
|
||||
│ │ └─ Sheet: 拍一张 / 指标记录 / 报告归档 / 写日记 / 症状
|
||||
│ └─ ArchiveListView(时间线 + 分类 chip + 年/月分组)
|
||||
└─ 问候 + 今日摘要 + 进行中症状 + 最近时间线
|
||||
```
|
||||
|
||||
- TabBar **5 槽**:左 2 个内容 Tab + 中间 + 号 + 右 2 个 Tab
|
||||
- "+ 新建" 是 sheet 不是 Tab
|
||||
- AI 问答以 Modal Sheet 形式出现,**不占 Tab**
|
||||
- 「指标记录」sheet 顶部 LazyVGrid 是 8 个 MonitorMetric 长期监测预设(进趋势),
|
||||
下方 horizontal scroll 是化验项快捷预设(不进趋势),不选预设走自由输入
|
||||
- 「我的 · 个人资料」是 NavigationLink push 的 Form 编辑页
|
||||
|
||||
### 7.1 档案库 C1 / C2 导航(看的一半)
|
||||
|
||||
录入流程(拍照→VL→编辑→存)只是"录的一半"。**"看的一半"由 C1 列表 + C2 详情承担**——这是 demo 的核心看点之一,不能砍。
|
||||
|
||||
```
|
||||
首页 "我的报告档案" 卡 ──push──► C1 ArchiveListView
|
||||
│
|
||||
│ 分类 chip:全部/体检/化验/影像/处方
|
||||
│ 按 reportDate 年份分组,卡片显示异常 chip
|
||||
│
|
||||
└──push──► C2 ReportDetailView
|
||||
│
|
||||
├─ Tab "原图":TabView(.page) 翻页 + 长按保存
|
||||
├─ Tab "解读":数字摘要(总/高/低/正常)
|
||||
│ + AI 整体摘要
|
||||
│ + 对比上次(同类型上一份 Report diff)
|
||||
└─ Tab "指标":Indicator 列表,异常优先
|
||||
|
||||
C2 底部两个动作:
|
||||
├─ "关联到趋势" ──► 把本报告内未 pinned 的 Indicator 批量 pinned = true,Trends 默认展示
|
||||
└─ "重新解读" ──► CaptureService.reanalyze(report:),重跑 VL 覆盖 summary/indicators
|
||||
|
||||
其他进入 C2 的入口:
|
||||
• ChatTurn 引用 Pill 点击(referencedReportIDs)
|
||||
• 趋势页数据点 tap → 跳到该点来源 Report 的 C2
|
||||
• HomeView 时间线点报告类条目
|
||||
```
|
||||
|
||||
### 7.2 对比上次("对比上次"=报告对比,已加回)
|
||||
|
||||
C2 解读 Tab 底部显示一段 diff 文本,**由 `ReportCompareService` 计算,不再调 LLM**:
|
||||
|
||||
- 找出"同 `typeRaw` 的上一份 Report"(`reportDate < current AND ORDER BY DESC LIMIT 1`)
|
||||
- 同名 `Indicator` 配对,数值 diff:`Δ` 绝对值 + 百分比 + 升/降箭头
|
||||
- 标红:跨越参考范围边界(原本正常→偏高,或反过来)
|
||||
- 文案模板拼装,不走 LLM,响应即时
|
||||
- 若无上一份,该区块隐藏
|
||||
|
||||
---
|
||||
|
||||
## 8. 现有代码状态(2026-05-25)
|
||||
|
||||
```
|
||||
康康/
|
||||
├── App/KangkangApp.swift ✅ SwiftData container 已建
|
||||
├── RootView.swift ✅ 3 Tab + RecordSheet 已建
|
||||
├── Models/Models.swift ✅ Indicator / Report / DiaryEntry,缺 Asset / ChatTurn
|
||||
├── DesignSystem/ ✅ Tokens + Components,沿用
|
||||
└── Features/
|
||||
├── Home/ ✅ HomeView 静态 UI,数据未接
|
||||
├── Quick/A1-A3 🔧 待合并进 UnifiedCaptureFlow
|
||||
├── Archive/B1-B4 🔧 B1 砍,B2 改用 VisionKit DocumentCamera
|
||||
├── Record/RecordSheet ✅ 入口选择 UI
|
||||
├── Trends/ ❌ 只有 placeholder
|
||||
└── Me/ ❌ 只有 placeholder
|
||||
|
||||
待建:
|
||||
├── AI/ ⚠️ AIRuntime + LLMSession + ModelStore + TokenChunk ✅;VLSession + Prompts/ ❌
|
||||
├── Debug/DebugAIRunner.swift ✅ DEBUG-only AI 自检入口
|
||||
├── Services/ ❌ CaptureService, AskService, TrendService, ReportCompareService
|
||||
├── Persistence/FileVault.swift ✅ 原图加密目录管理
|
||||
├── Security/AppLock.swift ❌ Face ID 启动锁
|
||||
├── Features/Ask/ ❌ AskSheet (RAG 问答 UI)
|
||||
├── Features/Archive/
|
||||
│ ├── ArchiveListView ❌ C1 档案列表(分类 chip + 年份分组)
|
||||
│ └── ReportDetailView ❌ C2 报告详情(三 Tab:原图/解读/指标 + 对比上次)
|
||||
├── Features/Capture/
|
||||
│ └── UnifiedCaptureFlow ❌ 替代 QuickCaptureFlow,状态机驱动 A1→VL→A2/B3
|
||||
├── Features/Onboarding/ ❌ 首启动隐私承诺 + 模型下载
|
||||
└── LiveActivity/ ❌ WidgetExtension target
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 9. 设计系统约束
|
||||
|
||||
- **不要新增颜色 token**。所有颜色走 `Tj.Palette.*` (sand / paper / ink / brick / leaf / line / text / text3)
|
||||
- **不要新增字体大小**。走 `Font.tjTitle()` / `tjH2()` / `tjSerifBody()` / 系统 size
|
||||
- **圆角走 `Tj.Radius.*`**,卡片走 `.tjCard()` modifier
|
||||
- 按钮走 `TjPrimaryButton` / `TjGhostButton`
|
||||
|
||||
新加 View 时先看 `DesignSystem/Components.swift`,有现成的不要复刻。
|
||||
|
||||
---
|
||||
|
||||
## 10. 不能跨越的红线
|
||||
|
||||
写代码前必读:
|
||||
|
||||
1. **不引入云服务**——任何 SDK 都不行,包括崩溃上报、分析、灰度
|
||||
2. **不自己实现密码学**——`.completeFileProtection` 已经够
|
||||
3. **UI 不直接调 AIRuntime**——必须经过 Service
|
||||
4. **AIRuntime 必须 actor 化**——禁止 class + lock
|
||||
5. **VL/LLM prompt 必须有 few-shot + 失败回退**——不能让用户卡在 AI 错误屏
|
||||
6. **新功能必须问"清单里有吗"**——清单外的功能(用药提醒、多 profile、暗黑模式、iCloud 同步……)默认不做,要做必须先讨论。**已加回的例外**:报告对比(16.1,§7.2)、症状追踪(Symptom @Model)、长期监测指标(MonitorMetric / IndicatorQuickSheet,W2)、个人资料(UserProfile,W2)
|
||||
7. **不要在 6 周里重构现有 Tab/RecordSheet 骨架**——增量加东西,不要推倒重来
|
||||
8. **报告详情(C2)与归档元信息编辑(B3)是两个 View**——B3 是 draft 编辑(写),C2 是 detail 浏览(读),不要合并复用主框架
|
||||
|
||||
---
|
||||
|
||||
## 11. 6 周时间表
|
||||
|
||||
| 周次 | 必交付 |
|
||||
|---|---|
|
||||
| W1 末 / W2 当前 | 项目结构、MLX 跑通 Qwen3-1.7B、首个 token 在设备吐出 |
|
||||
| W2-W3 | AIRuntime + LLMSession,文字日记 + 基础 RAG 问答(打字机效果)(W2 进行中) |
|
||||
| W3-W4 | VLSession + 统一拍照流程(单项 + 整份)、Asset / FileVault |
|
||||
| W4 末 | **C1 ArchiveListView**(分类 chip + 年份分组,接 @Query) |
|
||||
| W4-W5 | 趋势(Swift Charts + AI 解读)、**C2 ReportDetailView**(三 Tab + 重新解读) |
|
||||
| W5 中 | **ReportCompareService** + C2 解读 Tab "对比上次" 区块 |
|
||||
| W5 末 | Face ID、永久删除、首页时间线接入真数据、Live Activity(真机) |
|
||||
| W6 | 模型管理页、首启动下载流程、UI polish、demo 视频、PPT |
|
||||
|
||||
**P0 新增项**(从 C 区视觉稿补回):C1 档案列表、C2 报告详情三 Tab、对比上次、关联到趋势、重新解读
|
||||
|
||||
**P1**(必须做完):Live Activity、分享文字摘要(9.4)、首启动隐私承诺页
|
||||
|
||||
**P2**(余力做):—— 任何 P2/P3 都暂时不做,清单里 11/12/13/14/15/17/18/19 全部 deferred(注意:16.1 报告对比已升 P0)
|
||||
|
||||
**砍 P1 决策顺序**(任何一周延期触发):Live Activity → Onboarding 简化 → 分享摘要 → 模型管理页 polish。**绝不动 C1/C2/对比上次**——视觉稿都做了,demo PPT 也要展示,这是核心卖点之一。
|
||||
|
||||
---
|
||||
|
||||
## 12. 评委 PPT 卖点排序(写代码时记住为什么这么做)
|
||||
|
||||
1. 影像档案系统(统一 VL 拍照 + 归档) — 核心创意
|
||||
2. 100% 本地 + SME2 加速 — 技术亮点
|
||||
3. 本地 RAG 长期记忆 — 端侧不可替代性
|
||||
4. 隐私三件套(系统级加密 + Face ID + 永久删除) — 信任建立
|
||||
5. AI 趋势解读 — 长期价值
|
||||
6. Live Activity 实时 tok/s — 现场记忆点
|
||||
|
||||
每写一个功能,问自己:这条提升了上面哪一项?如果都没有,就别做。
|
||||
@@ -84,7 +84,7 @@ VL prompt 必须:
|
||||
## 4. 模型分发
|
||||
|
||||
- 模型放 `Application Support/Models/`,首启动用 `URLSession.downloadTask` 拉,带断点续传 + 进度条
|
||||
- 总体积 ~3GB,WiFi 提示必须有
|
||||
- 总体积 ~4GB(LLM ~1.0GB + VL ~3.1GB),WiFi 提示必须有
|
||||
- App 在模型未就绪时**仍可启动**,但所有 AI 入口显示"模型未就绪,前往下载"
|
||||
- `ModelStore` 必须提供**旁路接口**:允许把模型预拷进沙盒(demo 现场重装时用)
|
||||
|
||||
|
||||
65
docs/legal/privacy-policy.md
Normal file
@@ -0,0 +1,65 @@
|
||||
# 康康KK 隐私政策
|
||||
|
||||
生效日期:2026-05-31
|
||||
|
||||
康康KK 是一款本地优先的个人健康记录工具。本政策说明我们如何处理你的信息。
|
||||
|
||||
## 我们收集的信息
|
||||
|
||||
康康KK 不要求注册账号,不内置广告 SDK,不使用第三方分析 SDK,也不会主动将你的健康记录上传到我们的服务器。
|
||||
|
||||
你可以在 App 内自行记录或导入以下信息:
|
||||
|
||||
- 健康指标,例如血压、血糖、血脂、体重等。
|
||||
- 体检、化验报告或其他健康资料照片。
|
||||
- 症状记录、健康日记和个人资料。
|
||||
- 本地提醒设置。
|
||||
|
||||
这些信息默认保存在你的设备本地。
|
||||
|
||||
## 权限用途
|
||||
|
||||
康康KK 可能请求以下系统权限:
|
||||
|
||||
- 相机:用于拍摄体检、化验报告或其他健康资料。
|
||||
- 相册:用于读取你主动选择导入的报告或照片。
|
||||
- Face ID:用于可选的本地 App 启动锁。
|
||||
- 通知:用于你主动设置的本地提醒。
|
||||
|
||||
我们不会因为这些权限而访问与你选择无关的内容。
|
||||
|
||||
## AI 模型下载
|
||||
|
||||
康康KK 的本地 AI 功能需要下载模型文件。下载模型时,App 会连接模型文件服务器获取模型资源。模型下载请求可能包含常规网络信息,例如 IP 地址、请求时间和设备网络环境产生的技术日志。
|
||||
|
||||
健康记录、报告照片、症状和日记不会因为下载模型而上传。
|
||||
|
||||
## 数据存储
|
||||
|
||||
健康记录和导入的资料默认保存在设备本地。App 使用 iOS 系统提供的文件保护能力保护本地文件。你可以在 App 内删除记录;删除后,相关本地数据会从 App 数据库或文件目录中移除。
|
||||
|
||||
如果你通过系统备份、迁移或其他第三方工具处理设备数据,相关行为受对应服务或工具的政策约束。
|
||||
|
||||
## 数据共享
|
||||
|
||||
康康KK 不出售个人数据,不将健康记录用于广告追踪,也不会与第三方广告或分析服务共享你的健康数据。
|
||||
|
||||
只有在你主动使用系统分享功能时,相关内容才会由你选择的系统分享目标处理。
|
||||
|
||||
## 医疗说明
|
||||
|
||||
康康KK 是健康信息记录与整理工具,并非医疗器械。App 内的 AI 解读、趋势分析或问答内容仅供日常记录参考,不构成医疗诊断、治疗建议、用药或剂量建议,也不能替代医生、药师或其他专业人员的意见。任何健康决策请咨询专业医疗人员。
|
||||
|
||||
## 儿童隐私
|
||||
|
||||
康康KK 不面向儿童提供专门服务。未成年人使用本 App 时应取得监护人同意。
|
||||
|
||||
## 联系我们
|
||||
|
||||
如果你对本隐私政策有疑问,可以通过以下邮箱联系我们:
|
||||
|
||||
xuhuayong@gmail.com
|
||||
|
||||
## 政策更新
|
||||
|
||||
我们可能会根据功能变化或法律要求更新本政策。更新后的政策会在 App 或公开页面中展示。
|
||||
81
docs/release/app-store-metadata.md
Normal file
@@ -0,0 +1,81 @@
|
||||
# App Store Metadata
|
||||
|
||||
## App Name
|
||||
|
||||
康康KK
|
||||
|
||||
## Subtitle
|
||||
|
||||
本地优先的个人健康档案
|
||||
|
||||
## Promotional Text
|
||||
|
||||
把体检报告、化验指标、症状和日记整理在本机。无需账号,健康数据默认不上传。
|
||||
|
||||
## Description
|
||||
|
||||
康康KK 是一款本地优先的个人健康记录工具,帮助你把体检报告、化验指标、症状、日记和趋势整理在同一个地方。
|
||||
|
||||
你可以手动记录常见健康指标,拍照归档体检或化验报告,在时间线里回顾每次记录,也可以把重点指标加入趋势页,查看长期变化。
|
||||
|
||||
主要功能:
|
||||
|
||||
- 健康指标记录:记录血压、血糖、血脂、体重等常见指标,也支持自定义指标。
|
||||
- 报告与照片归档:通过相机或相册导入体检、化验报告照片,保存到本机档案。
|
||||
- 症状与日记:记录身体感受、症状变化和就医前想补充的信息。
|
||||
- 趋势回顾:把长期关注的指标加入趋势页,查看变化曲线。
|
||||
- 本地优先:无需注册账号,健康记录默认保存在设备本地。
|
||||
- 可选本地 AI:下载模型后,可在设备本地辅助整理和通俗解释健康记录。
|
||||
|
||||
隐私与安全:
|
||||
|
||||
康康KK 不提供账号系统,不内置广告或第三方分析 SDK。健康数据默认保存在你的设备上。相机和相册权限仅用于导入你选择的报告或照片;Face ID 可用于本地 App 启动锁。
|
||||
|
||||
重要说明:
|
||||
|
||||
康康KK 是健康信息记录与整理工具,并非医疗器械。App 内的任何 AI 解读、趋势分析或问答内容仅供日常记录参考,不构成医疗诊断、治疗建议、用药或剂量建议,也不能替代医生、药师或其他专业人员的意见。任何健康决策请咨询专业医疗人员,并以原始报告和专业意见为准。
|
||||
|
||||
## Keywords
|
||||
|
||||
健康记录,体检报告,化验单,血压,血糖,健康档案,症状记录,健康日记,本地AI,隐私
|
||||
|
||||
## What's New
|
||||
|
||||
首次发布:支持健康指标、症状、日记和体检/化验报告的本地记录与趋势查看。
|
||||
|
||||
## Support URL
|
||||
|
||||
TODO: Add a public support URL before App Store submission.
|
||||
|
||||
## Privacy Policy URL
|
||||
|
||||
TODO: Add a public privacy policy URL before App Store submission.
|
||||
|
||||
## Category
|
||||
|
||||
Primary: Medical
|
||||
|
||||
Secondary: Health & Fitness
|
||||
|
||||
## Age Rating Notes
|
||||
|
||||
No gambling, no unrestricted web access, no user-generated public content, no commerce, no alcohol/tobacco/drug promotion, no medical treatment instructions. The app stores personal health records and includes medical disclaimers.
|
||||
|
||||
## App Review Notes
|
||||
|
||||
No login is required.
|
||||
|
||||
KangkangKK is a local-first personal health record app. It is not a medical device and does not provide diagnosis, treatment, medication, dosage, emergency triage, or doctor appointment services.
|
||||
|
||||
Suggested review steps:
|
||||
|
||||
1. Launch the app.
|
||||
2. Tap the center + button.
|
||||
3. Add a manual health metric, symptom, or diary entry.
|
||||
4. View saved entries in the Records tab.
|
||||
5. View charts in the Trends tab.
|
||||
6. Open Me > About to review privacy and medical disclaimer information.
|
||||
|
||||
Camera and photo library permissions are used only when the reviewer chooses to import photos of lab reports or health documents. The app stores user records locally on device.
|
||||
|
||||
AI features are optional. They require downloading local models from the Model Management page and may require a higher-memory device. If the models are not downloaded, the app will show a model-not-ready state; this is expected and does not block the core record-management flows.
|
||||
@@ -413,3 +413,18 @@ Output:
|
||||
| **合计** | **~14h ≈ 2 个工作日** |
|
||||
|
||||
也是 W3「AskService 基础 RAG」的前置铺路工作,工程上一举两得。
|
||||
|
||||
---
|
||||
|
||||
## 14. 修订记录:防编造加固(2026-05-30)
|
||||
|
||||
**现象**:导出摘要出现整份虚构病例(疲劳/盗汗/血红蛋白98/阿司匹林…),不符任何真实记录。
|
||||
|
||||
**根因(双重)**:① §数据范围里「Diary 由关键词过滤后入 prompt」在泛化请求(无症状词,如「最近身体异常」)下把日记**全部清空** → 真实记录没进 prompt;② 数据稀疏时,1.7B 在固定 6 段模板上**凭训练先验脑补**完整病例(对「只用数据/缺失写无记录」这类约束遵循差)。
|
||||
|
||||
**修复(三层,客户端硬保证为主)**:
|
||||
1. **检索**:`retrieve` 改为——有症状词→按词过滤(保留隐私);无症状词→纳入时间窗内最近 5 条日记,确保真实记录进 prompt。
|
||||
2. **空数据硬兜底**:`isEffectivelyEmpty` 判定无任何记录且 profile 空时,**跳过 LLM**,用 `fallbackReport` 产出确定性「6 段全无记录、主诉仅照搬原话」的摘要,从根上杜绝空数据编造。
|
||||
3. **prompt 重写**:从「撰写」改为「抽取/搬运」框架;反编造铁律首尾各一遍;加一条**稀疏 few-shot** 教模型「缺失写无记录、数值原样照搬」。
|
||||
|
||||
**残留限制**:部分数据(如仅 1 条日记)仍走 LLM,强约束 + few-shot 大幅降低但不能 100% 杜绝小模型臆造;后续可加生成后数值校验。
|
||||
|
||||
146
docs/superpowers/specs/2026-05-30-custom-reminder-design.md
Normal file
@@ -0,0 +1,146 @@
|
||||
# 自由周期提醒(CustomReminder)— 设计文档
|
||||
|
||||
**日期**:2026-05-30(W2)
|
||||
**作者**:link2026 + Claude
|
||||
**关联卖点**:#4 隐私三件套之外的实用粘性功能(本地通知,无云)
|
||||
**优先级**:用户明确要求(注:§10.6「用药提醒」原列默认不做,本轮经讨论确认要做,按最小可用实现)
|
||||
|
||||
---
|
||||
|
||||
## 1. 一句话定位
|
||||
|
||||
让用户新建**自由文案的周期性本地提醒**(如「每天 20:00 跑步 5 公里」「每天 12:30 吃 2 片护肝片」),与现有「指标记录提醒」(去录某项指标)并存但相互独立。完全本地 `UserNotifications`,不引云。
|
||||
|
||||
---
|
||||
|
||||
## 2. 已确认的设计决策
|
||||
|
||||
| 决策点 | 选择 |
|
||||
|---|---|
|
||||
| 模型 | 新建独立 `CustomReminder` @Model,不动现有 `MetricReminder` |
|
||||
| 周期粒度 | **每日 / 每周选几天 / 每月某日 / 每年某月某日**(2026-05-30 用户反转原「不做按月/按年」决策)。仍不做「每 N 天间隔」/一次性 |
|
||||
| 时间选择 | 常用时间快捷预设(8:00/12:00/18:00/22:00 chip)+ 保留 `DatePicker` 精调 |
|
||||
| 入口 | 新建 → 开启一个提醒 → `RemindersListView`(提醒中心),顶部「+ 新建提醒」打开编辑 sheet |
|
||||
| 列表范围 | 自由提醒 + 指标提醒**合展**(上次删了「我的」入口,指标提醒也只能从这里管) |
|
||||
| 量词(5公里/2片) | 写在自由文本 `title` 里,不单设字段 |
|
||||
| 多语言 | 所有固定文案走 `String(appLoc:)`,新增中文 key 补 en/ja/ko 到 `Localizable.xcstrings` |
|
||||
|
||||
---
|
||||
|
||||
## 3. 数据模型
|
||||
|
||||
`Models/Models.swift` 新增:
|
||||
|
||||
```swift
|
||||
@Model final class CustomReminder {
|
||||
enum Frequency: String { case daily, weekly, monthly, yearly } // 嵌套枚举
|
||||
@Attribute(.unique) var id: UUID
|
||||
var title: String // 用户文案:"跑步5公里"
|
||||
var note: String // 可选备注 → 通知正文
|
||||
var hour: Int // 0...23
|
||||
var minute: Int // 0...59
|
||||
var weekdays: [Int] // 1=日…7=六,仅 weekly 用(复用 MetricReminder 约定)
|
||||
var frequencyRaw: String = "daily" // Frequency 原始值(内联默认 → 走轻量迁移)
|
||||
var dayOfMonth: Int = 1 // monthly / yearly 用,1...31
|
||||
var month: Int = 1 // yearly 用,1...12
|
||||
var enabled: Bool
|
||||
var createdAt: Date
|
||||
var updatedAt: Date
|
||||
// computed: frequency(get/set 包 frequencyRaw)/ isEveryDay / frequencyLabel(分档)/ timeLabel
|
||||
}
|
||||
```
|
||||
|
||||
Schema 已含 `CustomReminder.self`。**本轮只给已存在的 `CustomReminder` 加 3 个带内联默认值的属性 → SwiftData 自动轻量迁移,不触发删库兜底(见 §10)。**
|
||||
|
||||
四档语义 → iOS `UNCalendarNotificationTrigger(repeats:true)`:
|
||||
| 频率 | DateComponents | 通知数 | id 后缀 |
|
||||
|---|---|---|---|
|
||||
| daily | hour,minute | 1 | `.daily` |
|
||||
| weekly | hour,minute,weekday ×N | N | `.w<weekday>` |
|
||||
| monthly | day,hour,minute | 1 | `.monthly` |
|
||||
| yearly | month,day,hour,minute | 1 | `.yearly` |
|
||||
|
||||
边界:iOS 重复触发**不顺延**。monthly 选 29/30/31 → 无此日的月份跳过(UI 给浅色提示);yearly 的「日」选项按所选月份最大天数动态收口(避免「4月31日」永不触发),仅闰年 2/29 给提示。
|
||||
|
||||
---
|
||||
|
||||
## 4. 通知调度(ReminderService 泛化)
|
||||
|
||||
抽出私有共享核心,两种提醒复用:
|
||||
|
||||
```swift
|
||||
private static func schedule(idBase:title:body:hour:minute:weekdays:thread:) async
|
||||
static func sync(_ custom: CustomReminder) async // 新增
|
||||
static func cancel(customId: UUID) // 新增
|
||||
static func sync(_ metric: MetricReminder) async // 现有,内部改走共享核心,行为不变
|
||||
```
|
||||
|
||||
- custom 通知:`title` = 提醒标题,`body` = 备注(空则用默认文案「到点啦,记得完成」)。
|
||||
- id 前缀 `kangkang.custom.<uuid>.w<weekday>`(与指标的 `kangkang.reminder.<metricId>.w<weekday>` 不冲突)。
|
||||
- 保存时调 `requestAuthorization()`;被拒则提示去系统设置。
|
||||
|
||||
---
|
||||
|
||||
## 5. UI
|
||||
|
||||
### 5.1 `CustomReminderEditSheet`(新增)
|
||||
创建 / 编辑共用。字段:
|
||||
- 标题 TextField(占位:「做点什么?例:跑步5公里 / 吃2片护肝片」),空标题禁用保存。
|
||||
- 备注 TextField(可选)。
|
||||
- 时间 DatePicker(.hourAndMinute)。
|
||||
- 周几选择(复用 RemindersListView 的 chip 行)。
|
||||
- 保存 / 取消;编辑态多一个「删除提醒」。
|
||||
保存:写 SwiftData → 请求通知权限 → `ReminderService.sync(custom)`。
|
||||
|
||||
### 5.2 `RemindersListView`(改造为提醒中心)
|
||||
- 顶部「+ 新建提醒」按钮 → 打开 `CustomReminderEditSheet`(create)。
|
||||
- 「我的提醒」区:`@Query CustomReminder`,每行点开走编辑 sheet,行上 Toggle 控 enabled。
|
||||
- 「指标记录提醒」区:`@Query MetricReminder`,保持现有内联编辑不变(仅非空时显示区头)。
|
||||
- 表头副文案、空状态文案更新。
|
||||
|
||||
---
|
||||
|
||||
## 6. 多语言
|
||||
|
||||
新增中文 key + en/ja/ko 译文写入 `Localizable.xcstrings`(源语言 zh-Hans,key 即中文)。脚本只增不改,已存在的 key 跳过。复用已有 key:时间/保存/取消/删除提醒/每天/已关闭/周几名等。用户输入的标题/备注是数据,不翻译。
|
||||
|
||||
---
|
||||
|
||||
## 7. 文件清单
|
||||
|
||||
| 文件 | 改动 |
|
||||
|---|---|
|
||||
| `Models/Models.swift` | `CustomReminder` +`Frequency` 枚举 +`frequencyRaw/dayOfMonth/month`(均带内联默认)+ 分档 `frequencyLabel` |
|
||||
| `App/KangkangApp.swift` | **持久化兜底改造**:迁移失败时由「删库」改为「挪到 `StoreBackups/<时间戳>/` 再重建」(见 §10) |
|
||||
| `Services/ReminderService.swift` | 调度核心泛化为 `Slot(suffix,DateComponents)` 列表;custom sync 按 frequency 分档;`cancelBase` 覆盖 daily/monthly/yearly/w1-7 |
|
||||
| `Features/Me/CustomReminderEditSheet.swift` | 频率分段 Picker + 各档子控件(周几 / 日 / 月+日)+ 时间快捷预设行 |
|
||||
| `Features/Me/RemindersListView.swift` | 不变(`frequencyLabel` 来自模型) |
|
||||
| `Localizable.xcstrings` | 新增 11 个 key × en/ja/ko |
|
||||
|
||||
---
|
||||
|
||||
## 8. 红线对齐
|
||||
|
||||
- 不引云、不碰密码学(纯本地通知)✅
|
||||
- 不重构 Tab/RecordSheet 骨架 ✅
|
||||
- §10.6「用药提醒默认不做」→ 已讨论确认,最小实现(无贪睡/铃声/间隔)✅
|
||||
|
||||
---
|
||||
|
||||
## 9. 验收(真机)
|
||||
|
||||
① 新建「每天 20:00 跑步 5 公里」→ 列表出现 → 到点收到本地通知(标题=跑步5公里);② 改时间/周几即时重排;③ 关闭 Toggle 取消通知;④ 删除清除 pending;⑤ 切换语言后固定文案随之变化(用户输入文案不变);⑥ 指标提醒仍在同一列表可管;⑦ **每月/每年**:切频率后子控件随之变化,边界提示出现;改频率后旧档 pending 通知被清掉(不留孤儿);⑧ **时间预设**:点 8:00/12:00/18:00/22:00 即填,精调仍可用。
|
||||
|
||||
---
|
||||
|
||||
## 10. 顺带修复:重打包数据丢失(根因 + 方案)
|
||||
|
||||
**问题**:Demo 期每次改 schema 重打包,SwiftData 数据被清空。
|
||||
|
||||
**根因(单点)**:`App/KangkangApp.swift` 的 `ModelContainer` 创建 catch 块**直接删 store 文件**。SwiftData 只对**纯增量**改动自动轻量迁移;一旦某次改动超纲(最常见:给已存在的 `@Model` 新增「非可选且无内联默认值」的属性),自动迁移抛错 → 落入 catch → 删库。W2 几乎每次都在改 schema,故体感「每次都丢」。
|
||||
|
||||
**方案(两层)**:
|
||||
1. **治本**:新增 `@Model` 属性一律「可选」或「内联默认值」(本轮 3 个新字段都给了 `= "daily"` / `= 1`)→ 走轻量迁移、不进 catch、数据保留。
|
||||
2. **兜底**:catch 不再删库,改为把旧 store(含 `-wal`/`-shm`)**挪到 `Application Support/StoreBackups/<时间戳>/`** 再重建——App 仍能启动,旧数据可手动恢复;挪不动才降级删除。
|
||||
|
||||
⚠️ 正式发布前仍应升级为 `VersionedSchema` + `SchemaMigrationPlan` 的正式迁移(注释已就地标注)。
|
||||
130
docs/superpowers/specs/2026-05-30-faceid-app-lock-design.md
Normal file
@@ -0,0 +1,130 @@
|
||||
# Face ID 启动锁 — 设计文档
|
||||
|
||||
**日期**:2026-05-30(W2)
|
||||
**作者**:link2026 + Claude
|
||||
**关联卖点**:#4 隐私三件套(系统级加密 + Face ID + 永久删除)
|
||||
**优先级**:P1(CLAUDE.md §6 / §8 / §11,原排期 W5 末,提前实现)
|
||||
|
||||
---
|
||||
|
||||
## 1. 一句话定位
|
||||
|
||||
可选的 Face ID/Touch ID 启动锁(默认关)。开启后,冷启动与「后台超过 1 分钟再回前台」都需要系统认证才能进入 App;失败可用设备密码兜底。完全基于系统 `LocalAuthentication`,不自造任何密码学(对齐红线 §10.2)。
|
||||
|
||||
---
|
||||
|
||||
## 2. 设计决策(已与用户确认)
|
||||
|
||||
| 决策点 | 选择 |
|
||||
|---|---|
|
||||
| 锁屏时机 | 冷启动 + 后台超过宽限才重锁 |
|
||||
| 后台宽限 | 60 秒 |
|
||||
| 认证策略 | `.deviceOwnerAuthentication`(Face ID/Touch ID 优先,自动跳设备密码兜底,避免锁死) |
|
||||
| 默认状态 | 关(§6) |
|
||||
| 开关位置 | 「我的」Tab 现有的 Face ID 卡,改为可交互 Toggle |
|
||||
| 任务切换器隐私遮罩 | 加,**仅锁开启时生效**(进 `.inactive`/`.background` 盖品牌遮罩,防多任务快照泄露;默认关用户无感) |
|
||||
|
||||
**关于 §6「截屏黑屏防护…不做」**:那条针对的是**截图防护**(iOS 无官方 API);本设计的任务切换器遮罩是 `.inactive` 盖视图,是官方支持的标准做法,性质不同。
|
||||
|
||||
---
|
||||
|
||||
## 3. 架构
|
||||
|
||||
```
|
||||
KangkangApp
|
||||
└─ WindowGroup { AppLockContainer { RootView() } } ← 仅包一层,RootView 零改动(§10.7)
|
||||
│
|
||||
┌─────────────┴──────────────────────────────┐
|
||||
│ AppLockContainer<Content> │
|
||||
│ @Environment(\.scenePhase) │
|
||||
│ 渲染 content │
|
||||
│ .overlay { if isLocked → LockScreen}│
|
||||
│ .overlay { else if showsCover → PrivacyCover}│
|
||||
│ onAppear → handleAppear(); │
|
||||
│ onChange(scenePhase) → handleScenePhase() │
|
||||
└─────────────────────────────────────────────┘
|
||||
│ 读写
|
||||
┌─────────────┴──────────────────────────────┐
|
||||
│ AppLock.shared (@MainActor @Observable) │ ← Security/AppLock.swift
|
||||
│ enabled ←→ UserDefaults("faceIDLockEnabled")│
|
||||
│ isLocked / showsPrivacyCover │
|
||||
│ biometryAvailable / biometryLabel │
|
||||
│ gracePeriod = 60s,lastBackgroundedAt │
|
||||
│ authenticate() / enableWithAuth() / disable()│
|
||||
└──────────────────────────────────────────────┘
|
||||
```
|
||||
|
||||
单例写法与项目既有 `ModelDownloadService.shared` 一致(`@MainActor @Observable final class` + `static let shared`)。
|
||||
|
||||
---
|
||||
|
||||
## 4. 触发逻辑(状态机)
|
||||
|
||||
| scenePhase / 事件 | 行为 |
|
||||
|---|---|
|
||||
| 容器 `onAppear`(冷启动) | `enabled` 为真且尚未冷启动锁过 → `isLocked = true` + 触发认证 |
|
||||
| `.background` | `lastBackgroundedAt = now`;`showsPrivacyCover = enabled` |
|
||||
| `.inactive`(任务切换器) | `showsPrivacyCover = enabled && !isLocked` |
|
||||
| `.active` | 隐藏遮罩;若 `enabled && !isLocked && 离开 > 60s` → `isLocked = true`;若 `isLocked` → 触发认证;清空 `lastBackgroundedAt` |
|
||||
| 认证成功 | `isLocked = false` |
|
||||
| 认证失败/取消 | 保持锁定,锁屏提供「解锁」按钮重试(`isAuthenticating` 防重入,不重复弹窗) |
|
||||
|
||||
冷启动时 scenePhase 初值为 `.active` 不触发 `onChange`,由 `handleAppear()` 负责冷启动锁;两路触发由 `isAuthenticating` 守卫去重。
|
||||
|
||||
---
|
||||
|
||||
## 5. 能力探测与兜底
|
||||
|
||||
- `refreshAvailability()`:`LAContext.canEvaluatePolicy(.deviceOwnerAuthentication)` → `biometryAvailable`;读 `biometryType` 决定文案(Face ID / Touch ID / 密码)。
|
||||
- 设备未设密码/无生物识别 → `biometryAvailable = false`,「我的」开关置灰,副标题「本设备未设置 Face ID 或密码」。
|
||||
- 认证全程系统弹窗;失败/取消不抛错给 UI,只是停留锁屏。
|
||||
|
||||
---
|
||||
|
||||
## 6. 文件清单
|
||||
|
||||
| 文件 | 改动 |
|
||||
|---|---|
|
||||
| `康康/Security/AppLock.swift` | **新增**:单例 + LAContext 封装 + 触发逻辑 |
|
||||
| `康康/Security/AppLockContainer.swift` | **新增**:包裹层 + scenePhase 驱动 + 两个 overlay |
|
||||
| `康康/Security/LockScreenView.swift` | **新增**:`LockScreenView` + `PrivacyCoverView` |
|
||||
| `康康/App/KangkangApp.swift` | `RootView()` → `AppLockContainer { RootView() }` |
|
||||
| `康康/Features/Me/MeView.swift` | 静态 Face ID 卡 → 可交互 Toggle 卡 |
|
||||
| `康康.xcodeproj/project.pbxproj` | 加 `INFOPLIST_KEY_NSFaceIDUsageDescription`(Debug + Release) |
|
||||
|
||||
工程用文件系统同步组,新增 `Security/` 下的源文件自动纳入编译,无需手改 pbxproj 注册。
|
||||
|
||||
---
|
||||
|
||||
## 7. UI
|
||||
|
||||
锁屏(`LockScreenView`,全遮罩,走 Tj tokens):
|
||||
|
||||
```
|
||||
🔒 (lock glyph)
|
||||
康康 已锁定
|
||||
你的健康档案已加密保护
|
||||
[ Face ID 解锁 ] ← onAppear 自动触发一次认证;按钮文案随设备能力变
|
||||
```
|
||||
|
||||
隐私遮罩(`PrivacyCoverView`):品牌色底 + app 名,无交互,仅用于遮挡多任务快照。
|
||||
|
||||
「我的」Face ID 卡:Toggle 开启时先认证一次(成功才置 `enabled`),关闭直接关。副标题动态:「已开启 · Face ID」/「关闭」/「本设备未设置 Face ID 或密码」。
|
||||
|
||||
---
|
||||
|
||||
## 8. 红线对齐(CLAUDE.md §10)
|
||||
|
||||
- 不自造密码学,只用系统 `LocalAuthentication` ✅
|
||||
- 默认关,可选开关 ✅
|
||||
- 不引云 ✅
|
||||
- 不重构 Tab/RecordSheet 骨架,只加一层包裹 ✅
|
||||
- 清单内功能(§6/§8/§11 明列 Face ID 启动锁)✅
|
||||
|
||||
---
|
||||
|
||||
## 9. 测试与验收
|
||||
|
||||
- 单元测试价值低(核心是系统弹窗 + scenePhase),不强求;`AppLock` 的宽限判定逻辑可抽纯函数测(可选)。
|
||||
- **真机验收**:① 开关开启走 Face ID;② 杀进程冷启动需认证;③ 后台 <60s 回来不锁、>60s 回来锁;④ 多任务切换器快照被遮罩;⑤ 关 Face ID 录入(模拟失败)能跳设备密码;⑥ 默认关时全程无感。
|
||||
- 模拟器:Features → Face ID → Enrolled / Matching Face 可模拟。
|
||||
@@ -0,0 +1,87 @@
|
||||
# 异常项快拍(局部小框 + VL 识别)— 设计
|
||||
|
||||
> 日期:2026-05-31 · 分支:feat/w2-ai-foundation
|
||||
> 需求:异常项快拍要拍摄局部,采用小框拍局部,用 Qwen-VL 识别被拍区域→检测项目结构化数据;
|
||||
> 存储前用户确认;最后只存参数和异常值,可和「记录指标」统一保存。
|
||||
|
||||
## 1. 现状与缺口
|
||||
|
||||
- `RecordSheet.quick`(标题「异常项快拍」)已存在,但 `RootView.recordFlow(.quick)` 当前直接路由到
|
||||
`UnifiedCaptureFlow` —— 与「体检报告归档」(`.archive`)完全一样,走的是整页文档扫描,**没有局部小框**,
|
||||
也会把整份当 `Report` + 原图存档。这与需求(局部 / 只存数值 / 不留图 / 并入指标)不符。
|
||||
- `Features/Quick/` 下 `A1ViewfinderView` / `A2ConfirmView` / `SmartFramer` / `QuickCaptureFlow` /
|
||||
`A3BatchView` 均为早期 mockup,全树无外部引用(纯孤儿)。`A1ViewfinderView` 有小框引导和 AVFoundation
|
||||
预览,但**快门未接线**(`capturePhoto()` 从不触发)、**不裁剪**。
|
||||
|
||||
## 2. 目标流程
|
||||
|
||||
```
|
||||
RecordSheet(.quick)
|
||||
→ QuickRegionCaptureFlow(状态机)
|
||||
├ 真机: RegionCameraView(实时预览 + 居中小框 + 快门 → 裁剪到小框的 UIImage)
|
||||
└ 模拟器: PhotoPickerSheet(无小框,整图送 VL)
|
||||
→ CaptureService.recognizeRegion(imageData:) ──actor──► AIRuntime.analyzeReport ─► VLSession
|
||||
↑ VLPrompts.regionExtraction()
|
||||
→ QuickRegionConfirmView(逐项可编辑 + 勾选纳入 + 测量时间;异常项高亮置顶)
|
||||
→ 保存:勾选项各插入一条独立 Indicator(无 Report、无 Asset);ctx.save()
|
||||
```
|
||||
|
||||
红线遵守:UI 不直接调 `AIRuntime`,经 `CaptureService`(§3.1);`AIRuntime` actor 串行(复用既有 VL 路径,
|
||||
不新增并发);无新增 `@Model`,不触发 SwiftData 迁移。
|
||||
|
||||
## 3. 组件
|
||||
|
||||
### 3.1 RegionCameraView.swift(新建,取代 A1ViewfinderView)
|
||||
- AVFoundation 实时预览,`videoGravity = .resizeAspectFill`。
|
||||
- 居中**局部小框**(屏宽 ~84% × 高 ~140pt,虚线框 + 半透明遮罩挖空),提示「把异常项放进框里 · 对准一两行」。
|
||||
- 底部快门键、顶部取消键。
|
||||
- 拍照后:`previewLayer.metadataOutputRectConverted(fromLayerRect: 小框rect)` → 归一化裁剪 rect;
|
||||
先把照片方向 bake 成 `.up`,再按归一化 rect 裁 `CGImage`,回调裁剪后的 `UIImage`。
|
||||
- 相机权限:被拒时显示「去设置开启相机」态。
|
||||
- 纯函数 `RegionImageCropper.crop(_:normalizedRect:)` + `UIImage.normalizedUp()`,与 View 解耦便于推理/复用。
|
||||
|
||||
### 3.2 VLPrompts.regionExtraction()(加进 VLPrompts.swift)
|
||||
- 说明「这是报告的局部照片,可能只有一两行指标」。
|
||||
- 严格 JSON,只要 `{"indicators":[{name,value,unit,range,status}]}`,**不要**报告元信息。
|
||||
- status 由 value 与 range 自判;range 保留原文;不发明指标,看不清整行跳过。
|
||||
- 2 个 few-shot(单行 / 两行)。
|
||||
|
||||
### 3.3 CaptureService.recognizeRegion(imageData: Data)(加进 CaptureService.swift)
|
||||
- 把 JPEG 写临时文件(`NSTemporaryDirectory`,`.completeFileProtection`),`defer` 删除。
|
||||
- `prepareVL()` → `analyzeReport(imageURLs:[temp], prompt: regionExtraction())`。
|
||||
- 新增 `parseIndicatorsJSON(_:)`:复用 `extractJSONObject` + `parseIndicator`,抽出 `indicators` 数组,
|
||||
返回 `[ParsedReport.ParsedIndicator]`。失败抛 `CaptureError`(UI 回退手动录入)。
|
||||
|
||||
### 3.4 QuickRegionCaptureFlow.swift(新建,状态机)
|
||||
- `Phase { idle, analyzing(UIImage), confirm(items, warning) }`。
|
||||
- 裁剪图 → analyzing → Task:JPEG 编码 → `recognizeRegion` → confirm。
|
||||
- 30s 超时哨兵 → confirm(空 + warning);各类错误 → confirm(空 + warning)。
|
||||
- 无 Vault 资产需清理(临时文件已在 service 内删除);取消即关闭。
|
||||
|
||||
### 3.5 QuickRegionConfirmView.swift(新建,确认 UI)
|
||||
- 头部「核对异常项 · 只存数值,不保留照片」+ 内存中的裁剪缩略图(仅核对用,**不持久化**)。
|
||||
- 测量时间 DatePicker(默认 now)。
|
||||
- 指标列表:逐项可编辑(name/value/unit/range/status)+ 勾选「纳入保存」。
|
||||
异常(high/low)项红色高亮、置顶、默认勾选;正常项默认也勾选(用户可取消),体现「只存参数和异常值」由用户掌控。
|
||||
- 「加一项」手动补充(VL 空结果回退)。
|
||||
- 底栏:取消 / 保存到记录(N 项)。
|
||||
|
||||
### 3.6 RootView 路由
|
||||
- `.quick → QuickRegionCaptureFlow(onClose:)`(原为 `UnifiedCaptureFlow`)。
|
||||
|
||||
### 3.7 清理
|
||||
- 删除 5 个孤儿 mockup:A1ViewfinderView / A2ConfirmView / SmartFramer / QuickCaptureFlow / A3BatchView。
|
||||
|
||||
## 4. 数据落库
|
||||
|
||||
- 每个勾选项 → 一条 `Indicator(name,value,unit,range,status,capturedAt,note=nil,pinned=false,seriesKey=nil)`。
|
||||
- 不建 `Report`,不存 `Asset`(原图丢弃)→ 符合「最后只存参数和异常值」。
|
||||
- 与「记录指标」自由输入路径落库一致(同一 Indicator 表,进记录时间线;不带 seriesKey 不强制进趋势)。
|
||||
|
||||
## 5. 取舍
|
||||
|
||||
- **裁剪 vs 整图**:需求明确「小框拍局部 / 识别被拍区域」,故真机裁剪到小框(也提升小目标 VL 准确率、降 token)。
|
||||
模拟器无实时小框 → 退化为整图(与既有 UnifiedCaptureFlow 模拟器退化一致)。
|
||||
- **不留图**:遵循「只存参数和异常值」与隐私基线,临时文件推理后即删,不写 Vault、不建 Asset。
|
||||
- **正常项是否保存**:默认全部勾选、异常项高亮,正常项可手动取消 —— 不静默丢弃用户可能想留的读数。
|
||||
- **不动既有归档流程**:UnifiedCaptureFlow / B3 / C2 不变;本功能只重写 `.quick` 这一条路径。
|
||||
@@ -0,0 +1,117 @@
|
||||
# 导出身体档案 — 指标趋势段 设计
|
||||
|
||||
> 2026-06-07 · 在「导出身体档案」(`HealthExportService`)的输出里,为本次就诊相关、且有历史记录的指标补一段确定性计算的趋势摘要。
|
||||
|
||||
## 背景
|
||||
|
||||
当前导出是「快照式」:`HealthExportService.retrieve()` 在时间窗内每个指标只取最近一条,`serializeData()` 序列化成单点数值(name/value/unit/range/status/date),交给 LLM 拼成「## 关键指标」一段。医生看不到指标随时间的变化方向。
|
||||
|
||||
需求:导出要带上**相关指标的趋势信息**(同一指标多次记录的变化)。
|
||||
|
||||
## 决策(已与用户确认)
|
||||
|
||||
| 维度 | 决定 |
|
||||
|---|---|
|
||||
| 覆盖范围 | 本次就诊相关(命中关键词或异常)且时间窗内有 **≥2 次**记录的指标 |
|
||||
| 粒度 | 一行摘要(首值→末值 + 方向箭头 + 时间跨度 + 次数) |
|
||||
| 生成方式 | **确定性计算**(模板拼装,不经 LLM),与 `ReportCompareService` 同思路,零编造风险 |
|
||||
| 呈现位置 | LLM 输出 6 段之后,**追加**独立一段 `## 指标趋势`;无数据则整段省略 |
|
||||
|
||||
## 架构
|
||||
|
||||
```
|
||||
retrieve() ──► 全量 in-window 指标(裁剪前) ┐
|
||||
└─► 相关指标集(裁剪后,决定哪些 series 出趋势) ┤
|
||||
▼
|
||||
ExportTrendBuilder.build(...) → [TrendSummary]
|
||||
▼
|
||||
Snapshot.trends ──► export() 在 completed 前追加 "## 指标趋势"
|
||||
```
|
||||
|
||||
LLM 链路(prompt / `serializeData`)**完全不变**——趋势不进 JSON,LLM 不知情。
|
||||
|
||||
## 组件
|
||||
|
||||
### 1. `TrendSummary`(值类型)
|
||||
|
||||
一个 series 的趋势结果。字段:
|
||||
|
||||
- `title: String` — 显示名(如「收缩压」「血压」)
|
||||
- `unit: String`
|
||||
- `firstValue: Double`、`lastValue: Double`
|
||||
- `firstDate: Date`、`lastDate: Date`
|
||||
- `count: Int` — 时间窗内记录次数
|
||||
- `direction: Direction`(`.up` / `.down` / `.flat`)
|
||||
- `range: String` — 参考范围原文(可空)
|
||||
- `flagged: Bool` — 末值仍异常 **或** 跨越参考范围边界,为真时行首加 `⚠️`
|
||||
|
||||
方法 `line() -> String`,一行中文,格式:
|
||||
|
||||
```
|
||||
收缩压 152→138 mmHg ↓(参考 90-140),近 21 天 4 次
|
||||
```
|
||||
|
||||
- 方向箭头:`.up` → `↑`、`.down` → `↓`、`.flat` → `→`
|
||||
- `flagged` 为真前缀 `⚠️ `
|
||||
- `range` 为空时省略「(参考 …)」括号
|
||||
- 数值用与现有指标一致的格式化(去掉无意义小数;血压等整数不带小数点)
|
||||
|
||||
> 血压合并行:`title` = 「血压」,数值写成「收缩/舒张」对,如 `血压 152/96→138/88 mmHg ↓…`;方向以收缩压为准。
|
||||
|
||||
### 2. `ExportTrendBuilder`(纯函数,可单测)
|
||||
|
||||
```swift
|
||||
enum ExportTrendBuilder {
|
||||
static func build(allInWindow: [Indicator],
|
||||
relevant: [Indicator]) -> [TrendSummary]
|
||||
}
|
||||
```
|
||||
|
||||
逻辑:
|
||||
|
||||
1. **确定相关 series**:从 `relevant` 收集 series 标识(优先 `seriesKey`,无则 `name|unit`)。
|
||||
2. **分组全量点**:把 `allInWindow` 按同一 series 标识分组;血压 `bp.systolic` + `bp.diastolic` 归到合成 series「血压」。
|
||||
3. **过滤**:只保留(a)属于相关 series、(b)点数 ≥2 的组。
|
||||
4. 每组按 `capturedAt` 升序,取首/末点,算:
|
||||
- `direction`:相对变化 `|last-first|/first`,<5% → `.flat`,否则按符号 `.up`/`.down`(first 为 0 时退化按绝对差判定)
|
||||
- `flagged`:末点 `status != .normal`,或首点 normal 而末点非 normal(或反之,跨界)
|
||||
- `count`、`firstDate`、`lastDate`、`range`(取末点的 range)
|
||||
5. 排序:`flagged` 优先,其次按 `lastDate` 倒序。
|
||||
6. 返回 `[TrendSummary]`。
|
||||
|
||||
数值解析复用现有方式(`Double(indicator.value)`);解析失败的点跳过,若有效点 <2 则该 series 不出趋势。
|
||||
|
||||
### 3. 接入 `HealthExportService`
|
||||
|
||||
- `Snapshot` 加 `trends: [TrendSummary]`。
|
||||
- `retrieve()`:在现有第 268 行 fetch 全量 in-window 指标后,保留该全量列表;裁剪逻辑不变得到 `indicators`(相关集);调用 `ExportTrendBuilder.build(allInWindow: 全量, relevant: indicators)` 填入 `Snapshot.trends`。
|
||||
- `serializeData()`:**不改**(趋势不进 LLM)。
|
||||
- `export()`:在发出 `completed` 事件、把内容存进 `HealthExport.content` 之前,若 `snapshot.trends` 非空,把 `## 指标趋势` 段追加到 LLM markdown 末尾。空数据兜底路径(`isEffectivelyEmpty`)trends 自然为空,不追加。
|
||||
|
||||
`## 指标趋势` 段渲染:
|
||||
|
||||
```markdown
|
||||
## 指标趋势
|
||||
⚠️ 收缩压 152→138 mmHg ↓(参考 90-140),近 21 天 4 次
|
||||
空腹血糖 6.8→6.2 mmol/L ↓(参考 3.9-6.1),近 28 天 3 次
|
||||
```
|
||||
|
||||
## 测试
|
||||
|
||||
`ExportTrendBuilder.build` 是纯函数,单测覆盖:
|
||||
|
||||
- 升 / 降 / 平稳(阈值边界)方向判定
|
||||
- 血压双 series 合并成一行
|
||||
- 点数 <2 的 series 被过滤
|
||||
- 不相关 series(不在 relevant 集)被过滤
|
||||
- 跨参考范围边界 → `flagged = true`
|
||||
- 数值无法解析的点被跳过
|
||||
|
||||
## 不做
|
||||
|
||||
- 不改 LLM prompt / `serializeData`(零编造风险的前提)
|
||||
- 不引入 embedding、不加新颜色/字体 token
|
||||
- 不改导出 UI 布局(仅输出内容多一段;`HealthExportSheet` / `HealthExportDetailView` 的 `MarkdownView` 已能渲染新段落)
|
||||
- 不做逐点列表 / 峰谷均值(本次只要一行摘要)
|
||||
```
|
||||
|
||||
@@ -0,0 +1,176 @@
|
||||
# 趋势大改 + 健康日历移至主页 — 设计文档
|
||||
|
||||
> 日期:2026-06-07 · 状态:已定方案(用户授权直接实现,免确认)
|
||||
|
||||
## 1. 背景与目标
|
||||
|
||||
当前「趋势」Tab(`TrendsView.swift`)把两件事混在一起:
|
||||
|
||||
1. **健康日历**(月/年视图 + 当日详情)—— 占据页面上半部分。
|
||||
2. **长期监测折线图**(`seriesSection`)—— 页面下半部分。
|
||||
|
||||
两个问题:
|
||||
|
||||
- **日历放错了地方**。它是「总览记录情况」的入口,更适合放在主页(用户每天第一眼看的页面),而不是埋在趋势 Tab 里。
|
||||
- **趋势能力太弱**。`SeriesBucket.build` **只按 `seriesKey` 分桶**,因此只有 8 个长期监测预设(血压/血糖/体温…)和自定义指标能成图。所有**没有 seriesKey 的指标**——报告里解析出来的化验项、VL 快拍、自由输入——即使在多份报告里反复出现(如「血红蛋白」体检了 3 次),也**完全看不到趋势**。
|
||||
|
||||
### 目标
|
||||
|
||||
1. **健康日历移到主页**:主页新增一张紧凑的「健康日历」卡(当前周的横条 + 本月记录摘要),点击展开完整的月/年总览页(可切月视图/年视图、看当日详情)。
|
||||
2. **趋势 Tab 重构**:对**任何出现 ≥2 次的指标**(不限于长期监测预设)做时间序列查看。趋势页变成一个「可成趋势的指标」总览列表(分长期监测 / 化验指标两段),点任一项进入详情页:大图表 + 参考范围带 + 统计摘要(最新/最高/最低/平均/对比上次)+ 时间范围筛选 + 数据点列表(点击跳当日详情)。
|
||||
|
||||
### 非目标(本次不做)
|
||||
|
||||
- **AI 趋势解读**:需要 AIRuntime + TrendService 跑通,风险大、与本次「时间序列查看」正交。本次预留 UI 位但不接 LLM,留作后续。
|
||||
- 不改 SwiftData schema(无 @Model 字段变更,规避迁移丢数据风险)。
|
||||
- 不改 `Localizable.xcstrings`(新文案用 `String(appLoc: "中文")`,无对应词条时优雅回退到中文 key,符合既有大量用法;避免 xcstrings 噪声 diff)。
|
||||
- 不动 TabBar 5 槽骨架、不动录入流程。
|
||||
|
||||
## 2. 架构总览
|
||||
|
||||
```
|
||||
主页 HomeView
|
||||
└─ HomeCalendarCard(自包含 @Query) ← 新增
|
||||
当前周横条 + "本月 N 天有记录" + chevron
|
||||
tap → fullScreenCover(CalendarOverviewView) ← 新增(从 TrendsView 抽出)
|
||||
|
||||
趋势 TrendsView(重写)
|
||||
└─ TrendSeriesList:两段 section
|
||||
├─ 长期监测(kind=.monitor:seriesKey 分桶,含血压合并/自定义)
|
||||
└─ 化验指标趋势(kind=.lab:按 name+unit 分桶,≥2 点)
|
||||
每行 TrendRow:名称 + 最新值/状态 + mini sparkline + 条数·跨度
|
||||
tap → TrendDetailView(bucket) ← 新增
|
||||
大图表 + 参考范围带 + 时间范围 chips + 统计摘要 + 数据点列表
|
||||
数据点 tap → DayDetailSheet(date)(复用)
|
||||
```
|
||||
|
||||
数据层只扩展 `SeriesBucket.build`,UI 层新增 4 个文件、改 2 个文件、删 1 段。
|
||||
|
||||
## 3. 数据层:`SeriesBucket` 扩展
|
||||
|
||||
文件:`Features/Trends/SeriesBucket.swift`(改)
|
||||
|
||||
### 3.1 新增 `kind` 区分两段
|
||||
|
||||
```swift
|
||||
enum SeriesKind { case monitor, lab } // monitor=长期监测预设/自定义/血压;lab=按名分组的化验项
|
||||
|
||||
struct SeriesBucket: Identifiable {
|
||||
let id: String
|
||||
let title: String
|
||||
let unit: String
|
||||
let lines: [SeriesLine]
|
||||
let latestDate: Date
|
||||
let kind: SeriesKind // 新增
|
||||
let sourceIndicatorIDs: [String] // 新增:本桶包含的 Indicator persistentModelID 字符串,供详情页定位来源
|
||||
// ... SeriesLine / Point 不变
|
||||
}
|
||||
```
|
||||
|
||||
### 3.2 `build` 流程改为两段
|
||||
|
||||
1. **seriesKey 段(原逻辑,kind=.monitor)**:血压合并、单系列预设、自定义。这些桶里的 Indicator 标记为「已消费」。
|
||||
2. **name 段(新,kind=.lab)**:对**所有没有 seriesKey** 的 Indicator,按 `normalizedKey(name, unit)` 分桶;每桶 ≥ `minPoints` 才保留。参考范围从该桶**最新一条** Indicator 的 `range` 字符串解析。
|
||||
3. 两段合并返回,各自按 `latestDate` 倒序。详情/列表按 `kind` 分段。
|
||||
|
||||
```swift
|
||||
// name 归一化:trim + 小写 + 折叠内部空白;unit 同样 trim。key = "name|unit"
|
||||
static func normalizedKey(name: String, unit: String) -> String
|
||||
|
||||
// 解析参考范围字符串 → ClosedRange<Double>?
|
||||
// 支持 "3.9-6.1" / "3.9~6.1" / "3.9 - 6.1";单边("<5.2"/">40"/"≤120")暂返回 nil(图不画带,正常)
|
||||
static func parseRange(_ raw: String) -> ClosedRange<Double>?
|
||||
```
|
||||
|
||||
> **去重**:有 seriesKey 的指标只进 monitor 段;无 seriesKey 的只进 lab 段。即使同名也不混。
|
||||
> **状态着色**:lab 段每个 Point 的 `status` 直接取 Indicator.status(已由 VL/录入判定),无需重算。
|
||||
|
||||
## 4. UI:健康日历移至主页
|
||||
|
||||
### 4.1 `CalendarOverviewView`(新文件 `Features/Calendar/CalendarOverviewView.swift`)
|
||||
|
||||
把现 `TrendsView` 的日历部分**原样抽出**为独立页:`modeSwitch`(月/年)+ `anchorBar`(◀ 年月 ▶)+ `calendarBody`(`CalendarMonthGrid`/`CalendarYearGrid`)+ `legend` + 月视图下的 `dayDetailInline`。
|
||||
|
||||
- 自带 `@Query`(indicators/reports/diaries/symptoms/profiles/customMetrics)。
|
||||
- 接收可选 `initialDate`(从主页某天进入时定位选中)。
|
||||
- 包在 `NavigationStack`,标题「健康日历」,右上「完成」关闭(用于 fullScreenCover)。
|
||||
- `CalendarMonthGrid` / `CalendarYearGrid` / `CalendarMarkers` / `DayDetailSheet` **不改**,直接复用。
|
||||
|
||||
### 4.2 `HomeCalendarCard`(新文件 `Features/Home/HomeCalendarCard.swift`)
|
||||
|
||||
自包含组件(对齐 `TodayRemindersCard` 模式):
|
||||
|
||||
- 自带 `@Query`,`CalendarData.build` 计算标记。
|
||||
- **当前周横条**:周一→周日 7 个紧凑日格(日期数字 + 标记圆点,复用 `DayMarks` 颜色规则:异常红 / 报告灰 / 正常绿 / 日记浅灰;有进行中症状则该格底色淡 amber)。今天高亮。
|
||||
- 顶部标题「健康日历」+ 右侧「本月 N 天有记录 ›」。
|
||||
- 整卡可点 → `fullScreenCover(CalendarOverviewView())`;点某一天 → 带 `initialDate` 进入。
|
||||
- 样式走 `.tjCard()`,放在主页 `greeting` 之后、`TodayRemindersCard` 之前。
|
||||
|
||||
### 4.3 `HomeView` 改动
|
||||
|
||||
`body` 的 VStack 在 `greeting` 后插入 `HomeCalendarCard()`。其余不动。
|
||||
|
||||
## 5. UI:趋势 Tab 重构
|
||||
|
||||
### 5.1 `TrendsView`(重写)
|
||||
|
||||
移除所有日历相关代码(已迁到主页)。新结构:
|
||||
|
||||
- header「趋势」。
|
||||
- 若无可成趋势的桶 → 空状态(「还没有可成趋势的指标 / 同一指标记录满 2 次后会出现在这里」)。
|
||||
- 否则两段:
|
||||
- **长期监测**(`kind == .monitor`):标题 + 计数。
|
||||
- **化验指标趋势**(`kind == .lab`):标题 + 计数。
|
||||
- 每段 `ForEach` 渲染 `TrendRow`,点击 push/present `TrendDetailView`。
|
||||
- 导航:`TrendsView` 包 `NavigationStack`,行用 `NavigationLink` 进详情(趋势 Tab 当前无 NavigationStack,新增之)。
|
||||
|
||||
### 5.2 `TrendRow`(新文件 `Features/Trends/TrendRow.swift`)
|
||||
|
||||
紧凑行:
|
||||
|
||||
- 左:指标名 + 「N 条 · 近 X 个月」副标题。
|
||||
- 中:mini sparkline(小号 `Chart`,height≈36,无坐标轴,单/双线,异常点红)。
|
||||
- 右:最新值 + 单位(异常红)+ chevron。
|
||||
- `.tjCard(bordered: true)`。
|
||||
|
||||
### 5.3 `TrendDetailView`(新文件 `Features/Trends/TrendDetailView.swift`)
|
||||
|
||||
接收 `bucket: SeriesBucket`,自带 `@Query` 用于数据点→来源跳转。
|
||||
|
||||
- **大图表**(height≈220):复用 `SeriesChartCard` 的绘制逻辑(参考范围带 + catmullRom 折线 + 点 + 双线图例),但加坐标轴、按所选时间范围裁剪 domain。
|
||||
- **时间范围 chips**:全部 / 近1年 / 近6月 / 近3月(仅当跨度 > 该范围才显示对应 chip)。切换裁剪图表点 + 重算 domain + 重算统计。
|
||||
- **统计摘要卡**:最新值(带状态)/ 对比上次(Δ 绝对值+百分比+升降箭头,跨参考范围边界标红)/ 最低 / 最高 / 平均 / 记录数 / 时间跨度。文案模板拼装,不走 LLM。
|
||||
- **AI 解读占位**:一行灰字「AI 解读即将上线」(预留,不接 LLM)。
|
||||
- **数据点列表**(倒序):日期 + 值+单位 + 状态箭头/徽章;`onTapGesture` → `DayDetailSheet(date:)`(复用现有 sheet,给出当天来源上下文)。
|
||||
- 标题 = bucket.title。
|
||||
|
||||
血压(双线)在详情页:统计摘要按「收缩/舒张」分别给最新值;列表每行显示「收缩/舒张」两值。
|
||||
|
||||
## 6. 受影响文件清单
|
||||
|
||||
**新增**
|
||||
- `Features/Calendar/CalendarOverviewView.swift`
|
||||
- `Features/Home/HomeCalendarCard.swift`
|
||||
- `Features/Trends/TrendRow.swift`
|
||||
- `Features/Trends/TrendDetailView.swift`
|
||||
|
||||
**修改**
|
||||
- `Features/Trends/SeriesBucket.swift`(加 kind / sourceIndicatorIDs / name 段 / parseRange)
|
||||
- `Features/Trends/TrendsView.swift`(删日历,重写为趋势列表 + NavigationStack)
|
||||
- `Features/Home/HomeView.swift`(插入 HomeCalendarCard)
|
||||
- `康康.xcodeproj/project.pbxproj`(新文件加入 target — 若用 file-system-synchronized group 则免改;需确认)
|
||||
|
||||
**不改**:`CalendarMonthGrid/YearGrid/Markers/DayDetailSheet`、`SeriesChartCard`(详情页复用其绘制思路,可抽 helper 或直接内置)、Models、xcstrings、RootView/TabBar、录入流程。
|
||||
|
||||
## 7. 验证
|
||||
|
||||
- 构建无错误/无新警告(`DEVELOPER_DIR` 指完整 Xcode,touch 强制重编 — 见记忆 build-from-cli)。
|
||||
- 主页:日历卡显示当前周标记;点卡进总览;月/年切换;点某天→当日详情正确。
|
||||
- 趋势:制造同名指标 ≥2 条(如手动录两次「血红蛋白」或两份报告同含一项)→ 出现在「化验指标趋势」段;预设监测仍在「长期监测」段;详情图表/统计/数据点跳转正确;血压双线正常。
|
||||
- 空状态:全新库时两个页面都给出友好空态。
|
||||
|
||||
## 8. 风险与回退
|
||||
|
||||
- **range 解析覆盖不全**:单边区间("<5.2")暂不画带,图仍可用 —— 可接受,后续增强。
|
||||
- **lab 段噪声**:同名但单位不同的指标会分成两桶(key 含 unit)—— 正确行为。若用户名字录入不一致(「血红蛋白」vs「Hb」)会分开 —— demo 可接受,不做模糊归并。
|
||||
- **pbxproj**:若新文件未自动入 target,构建会报 missing symbol;届时手动加 build file 引用。
|
||||
112
scripts/build-launch.sh
Executable file
@@ -0,0 +1,112 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
|
||||
ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||
PROJECT="${PROJECT:-$ROOT_DIR/康康.xcodeproj}"
|
||||
SCHEME="${SCHEME:-康康}"
|
||||
APP_NAME="${APP_NAME:-$SCHEME}"
|
||||
CONFIGURATION="${CONFIGURATION:-Debug}"
|
||||
BUNDLE_ID="${BUNDLE_ID:-com.xuhuayong.kangkang}"
|
||||
DERIVED_DATA_PATH="${DERIVED_DATA_PATH:-$ROOT_DIR/build/DerivedData}"
|
||||
SIMULATOR_NAME="${SIMULATOR_NAME:-iPhone 16 Pro}"
|
||||
SCREENSHOT_PATH="${SCREENSHOT_PATH:-$ROOT_DIR/build/screenshots/${SCHEME}-launch.png}"
|
||||
|
||||
require_tool() {
|
||||
if ! command -v "$1" >/dev/null 2>&1; then
|
||||
echo "error: required tool not found: $1" >&2
|
||||
exit 1
|
||||
fi
|
||||
}
|
||||
|
||||
require_full_xcode() {
|
||||
local developer_dir
|
||||
developer_dir="$(xcode-select -p 2>/dev/null || true)"
|
||||
if [[ "$developer_dir" != *"/Xcode.app/Contents/Developer"* ]]; then
|
||||
cat >&2 <<EOF
|
||||
error: active developer directory is not a full Xcode install:
|
||||
${developer_dir:-<unset>}
|
||||
|
||||
Select Xcode before running this script:
|
||||
sudo xcode-select -s /Applications/Xcode.app/Contents/Developer
|
||||
EOF
|
||||
exit 1
|
||||
fi
|
||||
}
|
||||
|
||||
extract_udid() {
|
||||
sed -n 's/.*(\([0-9A-Fa-f-]\{36\}\)).*/\1/p' | head -n 1
|
||||
}
|
||||
|
||||
find_simulator_udid() {
|
||||
if [[ -n "${SIMULATOR_UDID:-}" ]]; then
|
||||
echo "$SIMULATOR_UDID"
|
||||
return
|
||||
fi
|
||||
|
||||
local udid
|
||||
udid="$(xcrun simctl list devices available | grep -F "$SIMULATOR_NAME" | extract_udid || true)"
|
||||
if [[ -n "$udid" ]]; then
|
||||
echo "$udid"
|
||||
return
|
||||
fi
|
||||
|
||||
udid="$(
|
||||
xcrun simctl list devices available |
|
||||
awk '/-- iOS / { in_ios = 1; next } /-- / { in_ios = 0 } in_ios && /iPhone/ { print; exit }' |
|
||||
extract_udid || true
|
||||
)"
|
||||
if [[ -n "$udid" ]]; then
|
||||
echo "$udid"
|
||||
return
|
||||
fi
|
||||
|
||||
echo "error: no available iOS simulator found. Install an iPhone simulator in Xcode." >&2
|
||||
exit 1
|
||||
}
|
||||
|
||||
main() {
|
||||
require_tool xcode-select
|
||||
require_tool xcodebuild
|
||||
require_tool xcrun
|
||||
require_full_xcode
|
||||
|
||||
local simulator_udid app_path
|
||||
simulator_udid="$(find_simulator_udid)"
|
||||
|
||||
echo "Project: $PROJECT"
|
||||
echo "Scheme: $SCHEME"
|
||||
echo "Configuration: $CONFIGURATION"
|
||||
echo "Simulator: ${SIMULATOR_UDID:-$SIMULATOR_NAME} ($simulator_udid)"
|
||||
|
||||
xcodebuild \
|
||||
-project "$PROJECT" \
|
||||
-scheme "$SCHEME" \
|
||||
-configuration "$CONFIGURATION" \
|
||||
-destination "id=$simulator_udid" \
|
||||
-derivedDataPath "$DERIVED_DATA_PATH" \
|
||||
build
|
||||
|
||||
app_path="$DERIVED_DATA_PATH/Build/Products/${CONFIGURATION}-iphonesimulator/${APP_NAME}.app"
|
||||
if [[ ! -d "$app_path" ]]; then
|
||||
echo "error: built app not found at $app_path" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
xcrun simctl boot "$simulator_udid" >/dev/null 2>&1 || true
|
||||
xcrun simctl bootstatus "$simulator_udid" -b
|
||||
if [[ "${OPEN_SIMULATOR:-1}" == "1" ]]; then
|
||||
open -a Simulator --args -CurrentDeviceUDID "$simulator_udid"
|
||||
fi
|
||||
|
||||
xcrun simctl install "$simulator_udid" "$app_path"
|
||||
xcrun simctl launch "$simulator_udid" "$BUNDLE_ID"
|
||||
|
||||
mkdir -p "$(dirname "$SCREENSHOT_PATH")"
|
||||
sleep "${SCREENSHOT_DELAY_SECONDS:-2}"
|
||||
xcrun simctl io "$simulator_udid" screenshot "$SCREENSHOT_PATH"
|
||||
|
||||
echo "Launched $BUNDLE_ID"
|
||||
echo "Screenshot: $SCREENSHOT_PATH"
|
||||
}
|
||||
|
||||
main "$@"
|
||||
68
scripts/fetch-qwen3vl.sh
Executable file
@@ -0,0 +1,68 @@
|
||||
#!/usr/bin/env bash
|
||||
# 下载 Qwen3-VL-4B-Instruct-4bit(MLX 4bit)全量文件到本地镜像目录,并逐个校验字节数。
|
||||
# 字节数权威来源:康康/AI/ModelManifest.swift(HF API blobs=true,2026-05 核对)。
|
||||
# 用法: bash scripts/fetch-qwen3vl.sh
|
||||
set -uo pipefail
|
||||
|
||||
REPO="mlx-community/Qwen3-VL-4B-Instruct-4bit"
|
||||
BASE="https://huggingface.co/${REPO}/resolve/main"
|
||||
# 目标 = 康康仓库内的 Models/(已被 .gitignore 忽略,App 旁路导入也认这个目录名)。
|
||||
# 可用环境变量 KK_MODELS_DIR 覆盖根目录(如指向另一块盘)。
|
||||
ROOT="${KK_MODELS_DIR:-/Users/xuhuayong/apps/康康/Models}"
|
||||
DEST="$ROOT/Qwen3-VL-4B-Instruct-4bit"
|
||||
mkdir -p "$DEST"
|
||||
|
||||
# 文件名:期望字节数(与 ModelManifest.swift 的 .vl 清单一一对应)
|
||||
FILES=(
|
||||
"config.json:7137"
|
||||
"model.safetensors:3093767283"
|
||||
"model.safetensors.index.json:64742"
|
||||
"tokenizer.json:11422654"
|
||||
"tokenizer_config.json:5445"
|
||||
"vocab.json:2776833"
|
||||
"merges.txt:1671853"
|
||||
"special_tokens_map.json:613"
|
||||
"added_tokens.json:707"
|
||||
"generation_config.json:269"
|
||||
"chat_template.json:5502"
|
||||
"chat_template.jinja:5292"
|
||||
"preprocessor_config.json:782"
|
||||
"video_preprocessor_config.json:817"
|
||||
)
|
||||
|
||||
fsize() { stat -f%z "$1" 2>/dev/null || echo 0; }
|
||||
|
||||
fail=0
|
||||
for entry in "${FILES[@]}"; do
|
||||
name="${entry%%:*}"; want="${entry##*:}"; out="$DEST/$name"
|
||||
if [[ -f "$out" && "$(fsize "$out")" == "$want" ]]; then
|
||||
echo "SKIP $name (已完整 $want)"; continue
|
||||
fi
|
||||
echo "GET $name (期望 $want 字节)"
|
||||
curl -fL -C - --retry 5 --retry-delay 3 --connect-timeout 30 \
|
||||
-o "$out" "$BASE/$name" || { echo " !! 下载失败 $name"; fail=1; continue; }
|
||||
have="$(fsize "$out")"
|
||||
if [[ "$have" != "$want" ]]; then
|
||||
echo " !! 字节不符 $name: 实得 $have / 期望 $want"; fail=1
|
||||
else
|
||||
echo " OK $name $have"
|
||||
fi
|
||||
done
|
||||
|
||||
# 大权重额外做 SHA256 校验(HF LFS oid,密码学级,字节数相同也能查出脏数据)。
|
||||
WEIGHT_SHA="90eeb02604181dbcccd0a30a1f550a4a8928ca7dcbee4aee1449239306cfdfca"
|
||||
if [[ -f "$DEST/model.safetensors" ]]; then
|
||||
echo "校验 model.safetensors SHA256(约需 10 余秒)..."
|
||||
got="$(shasum -a 256 "$DEST/model.safetensors" | awk '{print $1}')"
|
||||
if [[ "$got" == "$WEIGHT_SHA" ]]; then
|
||||
echo " ✓ SHA256 匹配"
|
||||
else
|
||||
echo " !! SHA256 不符: 实得 $got / 期望 $WEIGHT_SHA"; fail=1
|
||||
fi
|
||||
fi
|
||||
|
||||
echo "================================================"
|
||||
total=$(du -sh "$DEST" 2>/dev/null | cut -f1)
|
||||
echo "目录: $DEST (合计 $total)"
|
||||
if [[ "$fail" == "0" ]]; then echo "✅ 全部 14 个文件下载并校验通过(权重含 SHA256)"; else echo "❌ 有文件失败,重跑本脚本可断点续传"; fi
|
||||
exit "$fail"
|
||||
88
scripts/release-testflight.sh
Executable file
@@ -0,0 +1,88 @@
|
||||
#!/usr/bin/env bash
|
||||
# 一键发布 TestFlight:archive → export → 上传 App Store Connect
|
||||
# 用法:
|
||||
# ./scripts/release-testflight.sh # 用当前 build 号
|
||||
# BUMP=1 ./scripts/release-testflight.sh # 自动递增 build 号后再发布
|
||||
# 认证:依赖 Xcode 已登录的 Apple ID(Xcode → Settings → Accounts)
|
||||
set -euo pipefail
|
||||
|
||||
ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||
PROJECT="${PROJECT:-$ROOT_DIR/康康.xcodeproj}"
|
||||
SCHEME="${SCHEME:-康康}"
|
||||
CONFIGURATION="${CONFIGURATION:-Release}"
|
||||
BUILD_DIR="$ROOT_DIR/build/Release"
|
||||
ARCHIVE_PATH="$BUILD_DIR/${SCHEME}.xcarchive"
|
||||
EXPORT_PATH="$BUILD_DIR/export"
|
||||
EXPORT_PLIST="$BUILD_DIR/ExportOptions.plist"
|
||||
TEAM_ID="${TEAM_ID:-F2C8C774FG}"
|
||||
|
||||
require_full_xcode() {
|
||||
local developer_dir
|
||||
developer_dir="$(xcode-select -p 2>/dev/null || true)"
|
||||
if [[ "$developer_dir" != *"/Xcode.app/Contents/Developer"* ]]; then
|
||||
cat >&2 <<EOF
|
||||
error: 当前 developer directory 不是完整 Xcode:
|
||||
${developer_dir:-<unset>}
|
||||
请先执行:
|
||||
sudo xcode-select -s /Applications/Xcode.app/Contents/Developer
|
||||
EOF
|
||||
exit 1
|
||||
fi
|
||||
}
|
||||
|
||||
require_full_xcode
|
||||
mkdir -p "$BUILD_DIR"
|
||||
|
||||
# 可选:递增 build 号
|
||||
if [[ "${BUMP:-0}" == "1" ]]; then
|
||||
CURRENT=$(sed -n 's/.*CURRENT_PROJECT_VERSION = \([0-9]*\);.*/\1/p' "$PROJECT/project.pbxproj" | head -1)
|
||||
NEXT=$((CURRENT + 1))
|
||||
sed -i '' "s/CURRENT_PROJECT_VERSION = $CURRENT;/CURRENT_PROJECT_VERSION = $NEXT;/g" "$PROJECT/project.pbxproj"
|
||||
echo "==> Build 号: $CURRENT → $NEXT"
|
||||
fi
|
||||
|
||||
BUILD_NUM=$(sed -n 's/.*CURRENT_PROJECT_VERSION = \([0-9]*\);.*/\1/p' "$PROJECT/project.pbxproj" | head -1)
|
||||
VERSION=$(sed -n 's/.*MARKETING_VERSION = \([0-9.]*\);.*/\1/p' "$PROJECT/project.pbxproj" | head -1)
|
||||
echo "==> 发布 v$VERSION ($BUILD_NUM)"
|
||||
|
||||
echo "==> [1/3] Archive..."
|
||||
rm -rf "$ARCHIVE_PATH"
|
||||
xcodebuild archive \
|
||||
-project "$PROJECT" \
|
||||
-scheme "$SCHEME" \
|
||||
-configuration "$CONFIGURATION" \
|
||||
-destination 'generic/platform=iOS' \
|
||||
-archivePath "$ARCHIVE_PATH" \
|
||||
-allowProvisioningUpdates
|
||||
|
||||
echo "==> [2/3] 生成 ExportOptions.plist..."
|
||||
cat > "$EXPORT_PLIST" <<EOF
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||
<plist version="1.0">
|
||||
<dict>
|
||||
<key>method</key>
|
||||
<string>app-store-connect</string>
|
||||
<key>destination</key>
|
||||
<string>upload</string>
|
||||
<key>teamID</key>
|
||||
<string>$TEAM_ID</string>
|
||||
<key>uploadSymbols</key>
|
||||
<true/>
|
||||
<key>manageAppVersionAndBuildNumber</key>
|
||||
<false/>
|
||||
</dict>
|
||||
</plist>
|
||||
EOF
|
||||
|
||||
echo "==> [3/3] Export 并上传 App Store Connect..."
|
||||
rm -rf "$EXPORT_PATH"
|
||||
xcodebuild -exportArchive \
|
||||
-archivePath "$ARCHIVE_PATH" \
|
||||
-exportOptionsPlist "$EXPORT_PLIST" \
|
||||
-exportPath "$EXPORT_PATH" \
|
||||
-allowProvisioningUpdates
|
||||
|
||||
echo ""
|
||||
echo "✅ v$VERSION ($BUILD_NUM) 已上传。App Store Connect 处理完成后(约 5-15 分钟)即可在 TestFlight 分发。"
|
||||
echo " https://appstoreconnect.apple.com/apps"
|
||||
53
scripts/upload-qwen3vl.sh
Normal file
@@ -0,0 +1,53 @@
|
||||
#!/usr/bin/env bash
|
||||
# 把本地 Models/Qwen3-VL-4B-Instruct-4bit/ 的 14 个文件上传到模型分发服务器,
|
||||
# 使 App 的「模型管理 · 下载」能拉到新 VL 模型(否则用户点下载会 404)。
|
||||
#
|
||||
# 服务器:Caddy(file_server browse),web 根 = /srv/models,SSH = root@101.132.124.52。
|
||||
# App 下载 URL 形如:https://file.myv0.com/Qwen3-VL-4B-Instruct-4bit/<file>
|
||||
# → openresty(终止 HTTPS)回源到 Caddy :80(root /srv/models)。
|
||||
# → 所以远端目标目录 = /srv/models/Qwen3-VL-4B-Instruct-4bit/。
|
||||
#
|
||||
# 认证:已用 ssh-copy-id 装好本机公钥,走免密 key;脚本内不含任何密码。
|
||||
# 用法: bash scripts/upload-qwen3vl.sh
|
||||
set -euo pipefail
|
||||
|
||||
LOCAL_DIR="/Users/xuhuayong/apps/康康/Models/Qwen3-VL-4B-Instruct-4bit"
|
||||
SSH_HOST="root@101.132.124.52"
|
||||
REMOTE_ROOT="/srv/models"
|
||||
REMOTE_SUBDIR="Qwen3-VL-4B-Instruct-4bit"
|
||||
REMOTE_DIR="$REMOTE_ROOT/$REMOTE_SUBDIR"
|
||||
|
||||
# 上传前本地完整性自检(逐字节,14 文件全 SKIP 才算齐)。
|
||||
bash "$(dirname "$0")/fetch-qwen3vl.sh" >/dev/null || { echo "本地文件不完整,先跑 fetch-qwen3vl.sh 修复再上传"; exit 1; }
|
||||
echo "本地 14 文件校验通过,开始上传 → $SSH_HOST:$REMOTE_DIR/"
|
||||
|
||||
ssh -o ConnectTimeout=20 "$SSH_HOST" "mkdir -p '$REMOTE_DIR'"
|
||||
|
||||
# rsync 断点续传(-P=--partial --progress),--inplace 适合大文件。
|
||||
# 注意:macOS 自带 rsync 2.6.9 不支持 --info=progress2,用 -P 即可。
|
||||
rsync -avP --inplace \
|
||||
-e "ssh -o ConnectTimeout=20" \
|
||||
"$LOCAL_DIR/" "$SSH_HOST:$REMOTE_DIR/"
|
||||
|
||||
echo "✅ rsync 上传完成,开始远端校验..."
|
||||
|
||||
# 远端逐文件大小核对(与本地 ModelManifest 的 14 文件一致)。
|
||||
ssh "$SSH_HOST" "cd '$REMOTE_DIR' && ls -la && echo '--- 总大小 ---' && du -sh ."
|
||||
|
||||
cat <<'TIP'
|
||||
──────────────────────────────────────────────
|
||||
上传完成。建议再从公网验证一次(应全部 HTTP 200,content-length 与本地一致):
|
||||
|
||||
for f in config.json model.safetensors model.safetensors.index.json \
|
||||
tokenizer.json tokenizer_config.json vocab.json merges.txt \
|
||||
special_tokens_map.json added_tokens.json generation_config.json \
|
||||
chat_template.json chat_template.jinja preprocessor_config.json \
|
||||
video_preprocessor_config.json; do
|
||||
curl -sI "https://file.myv0.com/Qwen3-VL-4B-Instruct-4bit/$f" \
|
||||
| awk -v F="$f" '/^HTTP/{c=$2} tolower($1)=="content-length:"{s=$2} END{printf "%-32s %s %s\n",F,c,s}'
|
||||
done
|
||||
|
||||
旧模型 Qwen2.5-VL-3B 仍在服务器上;确认新版可用后再删旧目录:
|
||||
ssh root@101.132.124.52 'rm -rf /srv/models/Qwen2.5-VL-3B-Instruct-4bit'
|
||||
──────────────────────────────────────────────
|
||||
TIP
|
||||
@@ -199,11 +199,14 @@
|
||||
};
|
||||
};
|
||||
buildConfigurationList = 5E463CF42FC403BB0089145B /* Build configuration list for PBXProject "康康" */;
|
||||
developmentRegion = en;
|
||||
developmentRegion = "zh-Hans";
|
||||
hasScannedForEncodings = 0;
|
||||
knownRegions = (
|
||||
en,
|
||||
Base,
|
||||
"zh-Hans",
|
||||
ja,
|
||||
ko,
|
||||
);
|
||||
mainGroup = 5E463CF02FC403BB0089145B;
|
||||
minimizedProjectReferenceProxies = 1;
|
||||
@@ -405,14 +408,23 @@
|
||||
buildSettings = {
|
||||
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
||||
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
|
||||
CODE_SIGN_ENTITLEMENTS = "康康/康康.entitlements";
|
||||
CODE_SIGN_STYLE = Automatic;
|
||||
CURRENT_PROJECT_VERSION = 1;
|
||||
CURRENT_PROJECT_VERSION = 5;
|
||||
DEVELOPMENT_TEAM = F2C8C774FG;
|
||||
ENABLE_APP_SANDBOX = YES;
|
||||
ENABLE_HARDENED_RUNTIME = YES;
|
||||
ENABLE_PREVIEWS = YES;
|
||||
ENABLE_USER_SELECTED_FILES = readonly;
|
||||
GENERATE_INFOPLIST_FILE = YES;
|
||||
INFOPLIST_KEY_CFBundleDisplayName = "康康";
|
||||
INFOPLIST_KEY_ITSAppUsesNonExemptEncryption = NO;
|
||||
INFOPLIST_KEY_NSCameraUsageDescription = "康康需要使用相机来扫描你的体检/化验报告。识别全程在本地完成,图片不会上传。";
|
||||
INFOPLIST_KEY_NSFaceIDUsageDescription = "用于解锁你的健康档案,数据始终保留在本机。";
|
||||
INFOPLIST_KEY_NSHealthShareUsageDescription = "康康会读取 Apple 健康中的生日、性别、身高和血型,用于本地填充个人资料,不会上传。";
|
||||
INFOPLIST_KEY_NSHealthUpdateUsageDescription = "康康不会写入 Apple 健康数据。此说明用于满足 HealthKit 权限校验,你的健康资料只保留在本机。";
|
||||
INFOPLIST_KEY_NSPhotoLibraryAddUsageDescription = "康康会把识别后的报告原图加密保存到 App 沙盒,不会写入你的相册。";
|
||||
INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "康康需要读取你已有的体检/化验报告照片用于本地识别,不会上传。";
|
||||
"INFOPLIST_KEY_UIApplicationSceneManifest_Generation[sdk=iphoneos*]" = YES;
|
||||
"INFOPLIST_KEY_UIApplicationSceneManifest_Generation[sdk=iphonesimulator*]" = YES;
|
||||
"INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents[sdk=iphoneos*]" = YES;
|
||||
@@ -423,24 +435,24 @@
|
||||
"INFOPLIST_KEY_UIStatusBarStyle[sdk=iphonesimulator*]" = UIStatusBarStyleDefault;
|
||||
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
|
||||
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 26.0;
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 17.0;
|
||||
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
|
||||
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
|
||||
MACOSX_DEPLOYMENT_TARGET = 26.0;
|
||||
MARKETING_VERSION = 1.0;
|
||||
PRODUCT_BUNDLE_IDENTIFIER = "kangkang.--";
|
||||
PRODUCT_BUNDLE_IDENTIFIER = com.xuhuayong.kangkang;
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
REGISTER_APP_GROUPS = YES;
|
||||
SDKROOT = auto;
|
||||
STRING_CATALOG_GENERATE_SYMBOLS = YES;
|
||||
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx xros xrsimulator";
|
||||
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
|
||||
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES;
|
||||
SWIFT_APPROACHABLE_CONCURRENCY = YES;
|
||||
SWIFT_DEFAULT_ACTOR_ISOLATION = MainActor;
|
||||
SWIFT_EMIT_LOC_STRINGS = YES;
|
||||
SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY = YES;
|
||||
SWIFT_VERSION = 5.0;
|
||||
TARGETED_DEVICE_FAMILY = "1,2,7";
|
||||
TARGETED_DEVICE_FAMILY = "1,2";
|
||||
XROS_DEPLOYMENT_TARGET = 26.0;
|
||||
};
|
||||
name = Debug;
|
||||
@@ -450,14 +462,23 @@
|
||||
buildSettings = {
|
||||
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
||||
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
|
||||
CODE_SIGN_ENTITLEMENTS = "康康/康康.entitlements";
|
||||
CODE_SIGN_STYLE = Automatic;
|
||||
CURRENT_PROJECT_VERSION = 1;
|
||||
CURRENT_PROJECT_VERSION = 5;
|
||||
DEVELOPMENT_TEAM = F2C8C774FG;
|
||||
ENABLE_APP_SANDBOX = YES;
|
||||
ENABLE_HARDENED_RUNTIME = YES;
|
||||
ENABLE_PREVIEWS = YES;
|
||||
ENABLE_USER_SELECTED_FILES = readonly;
|
||||
GENERATE_INFOPLIST_FILE = YES;
|
||||
INFOPLIST_KEY_CFBundleDisplayName = "康康";
|
||||
INFOPLIST_KEY_ITSAppUsesNonExemptEncryption = NO;
|
||||
INFOPLIST_KEY_NSCameraUsageDescription = "康康需要使用相机来扫描你的体检/化验报告。识别全程在本地完成,图片不会上传。";
|
||||
INFOPLIST_KEY_NSFaceIDUsageDescription = "用于解锁你的健康档案,数据始终保留在本机。";
|
||||
INFOPLIST_KEY_NSHealthShareUsageDescription = "康康会读取 Apple 健康中的生日、性别、身高和血型,用于本地填充个人资料,不会上传。";
|
||||
INFOPLIST_KEY_NSHealthUpdateUsageDescription = "康康不会写入 Apple 健康数据。此说明用于满足 HealthKit 权限校验,你的健康资料只保留在本机。";
|
||||
INFOPLIST_KEY_NSPhotoLibraryAddUsageDescription = "康康会把识别后的报告原图加密保存到 App 沙盒,不会写入你的相册。";
|
||||
INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "康康需要读取你已有的体检/化验报告照片用于本地识别,不会上传。";
|
||||
"INFOPLIST_KEY_UIApplicationSceneManifest_Generation[sdk=iphoneos*]" = YES;
|
||||
"INFOPLIST_KEY_UIApplicationSceneManifest_Generation[sdk=iphonesimulator*]" = YES;
|
||||
"INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents[sdk=iphoneos*]" = YES;
|
||||
@@ -468,24 +489,24 @@
|
||||
"INFOPLIST_KEY_UIStatusBarStyle[sdk=iphonesimulator*]" = UIStatusBarStyleDefault;
|
||||
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
|
||||
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 26.0;
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 17.0;
|
||||
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
|
||||
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
|
||||
MACOSX_DEPLOYMENT_TARGET = 26.0;
|
||||
MARKETING_VERSION = 1.0;
|
||||
PRODUCT_BUNDLE_IDENTIFIER = "kangkang.--";
|
||||
PRODUCT_BUNDLE_IDENTIFIER = com.xuhuayong.kangkang;
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
REGISTER_APP_GROUPS = YES;
|
||||
SDKROOT = auto;
|
||||
STRING_CATALOG_GENERATE_SYMBOLS = YES;
|
||||
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx xros xrsimulator";
|
||||
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
|
||||
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES;
|
||||
SWIFT_APPROACHABLE_CONCURRENCY = YES;
|
||||
SWIFT_DEFAULT_ACTOR_ISOLATION = MainActor;
|
||||
SWIFT_EMIT_LOC_STRINGS = YES;
|
||||
SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY = YES;
|
||||
SWIFT_VERSION = 5.0;
|
||||
TARGETED_DEVICE_FAMILY = "1,2,7";
|
||||
TARGETED_DEVICE_FAMILY = "1,2";
|
||||
XROS_DEPLOYMENT_TARGET = 26.0;
|
||||
};
|
||||
name = Release;
|
||||
@@ -495,23 +516,23 @@
|
||||
buildSettings = {
|
||||
BUNDLE_LOADER = "$(TEST_HOST)";
|
||||
CODE_SIGN_STYLE = Automatic;
|
||||
CURRENT_PROJECT_VERSION = 1;
|
||||
CURRENT_PROJECT_VERSION = 5;
|
||||
DEVELOPMENT_TEAM = F2C8C774FG;
|
||||
GENERATE_INFOPLIST_FILE = YES;
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 26.0;
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 17.0;
|
||||
MACOSX_DEPLOYMENT_TARGET = 26.0;
|
||||
MARKETING_VERSION = 1.0;
|
||||
PRODUCT_BUNDLE_IDENTIFIER = "kangkang.--Tests";
|
||||
PRODUCT_BUNDLE_IDENTIFIER = com.xuhuayong.kangkang.Tests;
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
SDKROOT = auto;
|
||||
STRING_CATALOG_GENERATE_SYMBOLS = NO;
|
||||
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx xros xrsimulator";
|
||||
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
|
||||
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES;
|
||||
SWIFT_APPROACHABLE_CONCURRENCY = YES;
|
||||
SWIFT_EMIT_LOC_STRINGS = NO;
|
||||
SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY = YES;
|
||||
SWIFT_VERSION = 5.0;
|
||||
TARGETED_DEVICE_FAMILY = "1,2,7";
|
||||
TARGETED_DEVICE_FAMILY = "1,2";
|
||||
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/康康.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/康康";
|
||||
XROS_DEPLOYMENT_TARGET = 26.0;
|
||||
};
|
||||
@@ -522,23 +543,23 @@
|
||||
buildSettings = {
|
||||
BUNDLE_LOADER = "$(TEST_HOST)";
|
||||
CODE_SIGN_STYLE = Automatic;
|
||||
CURRENT_PROJECT_VERSION = 1;
|
||||
CURRENT_PROJECT_VERSION = 5;
|
||||
DEVELOPMENT_TEAM = F2C8C774FG;
|
||||
GENERATE_INFOPLIST_FILE = YES;
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 26.0;
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 17.0;
|
||||
MACOSX_DEPLOYMENT_TARGET = 26.0;
|
||||
MARKETING_VERSION = 1.0;
|
||||
PRODUCT_BUNDLE_IDENTIFIER = "kangkang.--Tests";
|
||||
PRODUCT_BUNDLE_IDENTIFIER = com.xuhuayong.kangkang.Tests;
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
SDKROOT = auto;
|
||||
STRING_CATALOG_GENERATE_SYMBOLS = NO;
|
||||
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx xros xrsimulator";
|
||||
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
|
||||
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES;
|
||||
SWIFT_APPROACHABLE_CONCURRENCY = YES;
|
||||
SWIFT_EMIT_LOC_STRINGS = NO;
|
||||
SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY = YES;
|
||||
SWIFT_VERSION = 5.0;
|
||||
TARGETED_DEVICE_FAMILY = "1,2,7";
|
||||
TARGETED_DEVICE_FAMILY = "1,2";
|
||||
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/康康.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/康康";
|
||||
XROS_DEPLOYMENT_TARGET = 26.0;
|
||||
};
|
||||
@@ -548,23 +569,23 @@
|
||||
isa = XCBuildConfiguration;
|
||||
buildSettings = {
|
||||
CODE_SIGN_STYLE = Automatic;
|
||||
CURRENT_PROJECT_VERSION = 1;
|
||||
CURRENT_PROJECT_VERSION = 5;
|
||||
DEVELOPMENT_TEAM = F2C8C774FG;
|
||||
GENERATE_INFOPLIST_FILE = YES;
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 26.0;
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 17.0;
|
||||
MACOSX_DEPLOYMENT_TARGET = 26.0;
|
||||
MARKETING_VERSION = 1.0;
|
||||
PRODUCT_BUNDLE_IDENTIFIER = "kangkang.--UITests";
|
||||
PRODUCT_BUNDLE_IDENTIFIER = com.xuhuayong.kangkang.UITests;
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
SDKROOT = auto;
|
||||
STRING_CATALOG_GENERATE_SYMBOLS = NO;
|
||||
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx xros xrsimulator";
|
||||
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
|
||||
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES;
|
||||
SWIFT_APPROACHABLE_CONCURRENCY = YES;
|
||||
SWIFT_EMIT_LOC_STRINGS = NO;
|
||||
SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY = YES;
|
||||
SWIFT_VERSION = 5.0;
|
||||
TARGETED_DEVICE_FAMILY = "1,2,7";
|
||||
TARGETED_DEVICE_FAMILY = "1,2";
|
||||
TEST_TARGET_NAME = "康康";
|
||||
XROS_DEPLOYMENT_TARGET = 26.0;
|
||||
};
|
||||
@@ -574,23 +595,23 @@
|
||||
isa = XCBuildConfiguration;
|
||||
buildSettings = {
|
||||
CODE_SIGN_STYLE = Automatic;
|
||||
CURRENT_PROJECT_VERSION = 1;
|
||||
CURRENT_PROJECT_VERSION = 5;
|
||||
DEVELOPMENT_TEAM = F2C8C774FG;
|
||||
GENERATE_INFOPLIST_FILE = YES;
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 26.0;
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 17.0;
|
||||
MACOSX_DEPLOYMENT_TARGET = 26.0;
|
||||
MARKETING_VERSION = 1.0;
|
||||
PRODUCT_BUNDLE_IDENTIFIER = "kangkang.--UITests";
|
||||
PRODUCT_BUNDLE_IDENTIFIER = com.xuhuayong.kangkang.UITests;
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
SDKROOT = auto;
|
||||
STRING_CATALOG_GENERATE_SYMBOLS = NO;
|
||||
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx xros xrsimulator";
|
||||
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
|
||||
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES;
|
||||
SWIFT_APPROACHABLE_CONCURRENCY = YES;
|
||||
SWIFT_EMIT_LOC_STRINGS = NO;
|
||||
SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY = YES;
|
||||
SWIFT_VERSION = 5.0;
|
||||
TARGETED_DEVICE_FAMILY = "1,2,7";
|
||||
TARGETED_DEVICE_FAMILY = "1,2";
|
||||
TEST_TARGET_NAME = "康康";
|
||||
XROS_DEPLOYMENT_TARGET = 26.0;
|
||||
};
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import Foundation
|
||||
import MLX
|
||||
|
||||
enum AIRuntimeError: Error, LocalizedError {
|
||||
case notReady
|
||||
@@ -7,9 +8,9 @@ enum AIRuntimeError: Error, LocalizedError {
|
||||
|
||||
var errorDescription: String? {
|
||||
switch self {
|
||||
case .notReady: return "AI 模型尚未准备好"
|
||||
case .modelLoadFailed(let m): return "模型加载失败:\(m)"
|
||||
case .inferenceFailed(let m): return "推理失败:\(m)"
|
||||
case .notReady: return String(appLoc: "AI 模型尚未准备好")
|
||||
case .modelLoadFailed(let m): return String(appLoc: "模型加载失败:\(m)")
|
||||
case .inferenceFailed(let m): return String(appLoc: "推理失败:\(m)")
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -31,27 +32,80 @@ actor AIRuntime {
|
||||
private var llmSession: LLMSession?
|
||||
private var vlSession: VLSession?
|
||||
|
||||
// MARK: - 串行推理闸门(§3.1 OOM 防护的真正落地)
|
||||
//
|
||||
// actor 只串行化「方法入口」,但 generate() 同步返回流、真正解码在内部 Task;
|
||||
// analyzeReport 也在 await 期间让出 actor。若不加闸门,LLM 流正在解码时触发 VL,
|
||||
// 两个模型会同时在 GPU 上解码 → 冲过单 App 内存上限被 jetsam 杀
|
||||
//(MEMORY 记录的「in-flight 流并发窄口」)。
|
||||
//
|
||||
// 这里用 actor 内信号量(count = 1):所有「会占显存的重活」(解码 + 模型加载)
|
||||
// 进入前先 await acquireGate(),结束后 releaseGate()。actor 串行执行保证
|
||||
// gateBusy / gateWaiters 的读写天然无并发。
|
||||
private var gateBusy = false
|
||||
private var gateWaiters: [CheckedContinuation<Void, Never>] = []
|
||||
|
||||
private func acquireGate() async {
|
||||
if !gateBusy {
|
||||
gateBusy = true
|
||||
return
|
||||
}
|
||||
await withCheckedContinuation { (cont: CheckedContinuation<Void, Never>) in
|
||||
gateWaiters.append(cont)
|
||||
}
|
||||
// 被 releaseGate 唤醒时即已持有闸门(gateBusy 保持 true)。
|
||||
}
|
||||
|
||||
private func releaseGate() {
|
||||
if gateWaiters.isEmpty {
|
||||
gateBusy = false
|
||||
} else {
|
||||
// 把闸门直接交给队首等待者,gateBusy 维持 true,不留空窗。
|
||||
let next = gateWaiters.removeFirst()
|
||||
next.resume()
|
||||
}
|
||||
}
|
||||
|
||||
private init() {}
|
||||
|
||||
/// App 启动时调用一次:给 MLX 的 GPU 缓冲池设上限,避免 reuse cache 在大模型常驻之上
|
||||
/// 继续膨胀、把峰值推过单 App 内存上限。仅真机生效(模拟器走 CPU,且部分 Metal 路径会 abort)。
|
||||
/// 与 increased-memory-limit entitlement + LLM/VL 互斥卸载配合,三管齐下防 jetsam OOM。
|
||||
nonisolated static func configureMLXMemory() {
|
||||
#if !targetEnvironment(simulator)
|
||||
// 256MB cache 上限:够复用、不至于在 3GB 模型之上再囤几百 MB 空闲缓冲。
|
||||
MLX.GPU.set(cacheLimit: 256 * 1024 * 1024)
|
||||
#endif
|
||||
}
|
||||
|
||||
/// 加载模型。首次调用会真正加载,后续幂等。
|
||||
func prepare() async throws {
|
||||
switch status {
|
||||
case .ready:
|
||||
return
|
||||
case .loading:
|
||||
// 已有其他调用方在加载;本次 prepare 直接返回,
|
||||
// 调用方需稍后 await prepare() 再判 status,或自行轮询 / 显示加载 UI。
|
||||
// W3 引入 prepare 队列时优化。
|
||||
return
|
||||
case .error, .notReady:
|
||||
break
|
||||
// 已有其他调用方在加载时,轮询等其结束再判定结果。
|
||||
// 不能像旧实现那样裸 return:那会让调用方误以为已 ready,随后 generate 的
|
||||
// `guard status == .ready` 失败 → 用户撞上「假错误屏」(模型其实正常加载中)。
|
||||
while status == .loading {
|
||||
try await Task.sleep(nanoseconds: 80_000_000)
|
||||
}
|
||||
if status == .ready { return }
|
||||
|
||||
guard ModelStore.shared.isReady(.llm) else {
|
||||
// 用 isComplete(逐文件字节校验)而非 isReady(只看 config.json):config.json 最小最先下完,
|
||||
// 半下载时 isReady 仍 true 会让加载在残缺 safetensors 上崩溃。与 ModelDownloadService 的
|
||||
// 完成判据保持一致(它也用 isComplete)。
|
||||
guard ModelStore.shared.isComplete(for: .llm) else {
|
||||
status = .error("LLM 模型未就绪")
|
||||
throw AIRuntimeError.notReady
|
||||
}
|
||||
|
||||
// 进闸门:等所有在跑的推理(可能是 VL 解码)结束,再卸 VL + 载 LLM,
|
||||
// 避免「VL 解码 + LLM 加载」内存峰值叠加 OOM。
|
||||
await acquireGate()
|
||||
defer { releaseGate() }
|
||||
// 拿到闸门后复查:排队期间可能已被别的调用方加载好,避免重复 load。
|
||||
if status == .ready { return }
|
||||
|
||||
// OOM 闸门(§3.1):LLM(~1GB)与 VL(~3GB)不可同时常驻,叠加会冲过单 App 内存上限被 jetsam 杀。
|
||||
unloadVL()
|
||||
|
||||
status = .loading
|
||||
do {
|
||||
let session = try await LLMSession.load(
|
||||
@@ -73,15 +127,20 @@ actor AIRuntime {
|
||||
let snapshotSession = llmSession
|
||||
|
||||
return AsyncThrowingStream { continuation in
|
||||
Task {
|
||||
let task = Task {
|
||||
guard snapshotStatus == .ready, let session = snapshotSession else {
|
||||
continuation.finish(throwing: AIRuntimeError.notReady)
|
||||
return
|
||||
}
|
||||
// 进闸门:保证本次 LLM 解码与任何 VL 解码 / 模型加载串行,绝不并发占显存。
|
||||
await self.acquireGate()
|
||||
do {
|
||||
// session.generate 跨 actor 边界,需要 await
|
||||
let stream = await session.generate(prompt: prompt, maxTokens: maxTokens)
|
||||
for try await chunk in stream {
|
||||
// 消费者(UI)提前关闭/取消时,下面的 checkCancellation 让本 Task 尽快退出,
|
||||
// 连带丢弃 session 流并触发其 onTermination,停止底层 MLX 解码,不空耗 GPU。
|
||||
try Task.checkCancellation()
|
||||
// Task 闭包在 generate() 内启动,继承 AIRuntime 的 actor 隔离;
|
||||
// 调用同 actor 的 recordRate 不需要 await
|
||||
self.recordRate(chunk.decodeRate)
|
||||
@@ -91,7 +150,12 @@ actor AIRuntime {
|
||||
} catch {
|
||||
continuation.finish(throwing: AIRuntimeError.inferenceFailed("\(error)"))
|
||||
}
|
||||
// 正常结束 / 异常 / 取消(checkCancellation 抛出后被上面 catch 吞掉)都会走到这,
|
||||
// 闸门一定释放,不会死锁后续推理。
|
||||
self.releaseGate()
|
||||
}
|
||||
// 消费者取消/流终止时取消内部 Task(与 LLMSession / HealthExportService 一致)。
|
||||
continuation.onTermination = { _ in task.cancel() }
|
||||
}
|
||||
}
|
||||
|
||||
@@ -103,18 +167,26 @@ actor AIRuntime {
|
||||
|
||||
/// 加载 VL 模型。幂等,首调真正 load。
|
||||
func prepareVL() async throws {
|
||||
switch vlStatus {
|
||||
case .ready, .loading:
|
||||
return
|
||||
case .error, .notReady:
|
||||
break
|
||||
while vlStatus == .loading {
|
||||
try await Task.sleep(nanoseconds: 80_000_000)
|
||||
}
|
||||
if vlStatus == .ready { return }
|
||||
|
||||
guard ModelStore.shared.isReady(.vl) else {
|
||||
// 同 prepare():用 isComplete 排除半下载(避免在残缺权重上崩溃),与下载服务判据一致。
|
||||
guard ModelStore.shared.isComplete(for: .vl) else {
|
||||
vlStatus = .error("VL 模型未就绪")
|
||||
throw AIRuntimeError.notReady
|
||||
}
|
||||
|
||||
// 进闸门:等所有在跑的推理(可能是 LLM 文本流)结束,再卸 LLM + 载 VL。
|
||||
// —— 这正是「异常项快拍识别时 App 自动退出」的主因防护。
|
||||
await acquireGate()
|
||||
defer { releaseGate() }
|
||||
if vlStatus == .ready { return }
|
||||
|
||||
// OOM 闸门(§3.1):加载 VL(~3GB)前先卸 LLM(~1GB),否则两者常驻叠加冲过内存上限被 jetsam 杀。
|
||||
unloadLLM()
|
||||
|
||||
vlStatus = .loading
|
||||
do {
|
||||
let session = try await VLSession.load(
|
||||
@@ -128,15 +200,36 @@ actor AIRuntime {
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - 卸载(OOM 闸门)
|
||||
|
||||
/// 卸载 LLM,释放 ModelContainer 引用并清 MLX 显存缓存。幂等。
|
||||
/// 注:只在持有推理闸门时调用(prepareVL 内),此刻不会有 LLM 流在解码,卸载即时生效。
|
||||
private func unloadLLM() {
|
||||
guard llmSession != nil else { return }
|
||||
llmSession = nil
|
||||
status = .notReady
|
||||
MLX.GPU.clearCache()
|
||||
}
|
||||
|
||||
/// 卸载 VL,释放 ModelContainer 引用并清 MLX 显存缓存。幂等。
|
||||
private func unloadVL() {
|
||||
guard vlSession != nil else { return }
|
||||
vlSession = nil
|
||||
vlStatus = .notReady
|
||||
MLX.GPU.clearCache()
|
||||
}
|
||||
|
||||
/// 图像 → JSON 字符串(由 VLPrompts.reportExtraction 引导)。
|
||||
/// 调用方负责解析 + 失败回退(§3.2)。
|
||||
/// AIRuntime 是 actor,本调用与 LLM.generate() 自然串行,不会 OOM。
|
||||
/// 推理闸门保证本调用与 LLM.generate() 的解码串行,不会同时占显存 OOM。
|
||||
func analyzeReport(imageURLs: [URL],
|
||||
prompt: String,
|
||||
maxTokens: Int = 512) async throws -> String {
|
||||
guard vlStatus == .ready, let session = vlSession else {
|
||||
throw AIRuntimeError.notReady
|
||||
}
|
||||
await acquireGate()
|
||||
defer { releaseGate() }
|
||||
do {
|
||||
return try await session.analyze(
|
||||
imageURLs: imageURLs,
|
||||
|
||||
@@ -7,9 +7,9 @@ enum DownloadError: Error, LocalizedError {
|
||||
var errorDescription: String? {
|
||||
switch self {
|
||||
case .badStatus(let code):
|
||||
return "下载失败(HTTP \(code))"
|
||||
return String(appLoc: "下载失败(HTTP \(code))")
|
||||
case .sizeMismatch(let expected, let got):
|
||||
return "文件大小校验失败(预期 \(expected),实际 \(got))"
|
||||
return String(appLoc: "文件大小校验失败(预期 \(expected),实际 \(got))")
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -74,12 +74,12 @@ final class FileDownloader: NSObject, URLSessionDataDelegate, @unchecked Sendabl
|
||||
let fileHandle = try FileHandle(forWritingTo: part)
|
||||
try fileHandle.seekToEnd()
|
||||
|
||||
lock.lock()
|
||||
self.handle = fileHandle
|
||||
self.written = offset
|
||||
self.onProgress = onProgress
|
||||
self.responseError = nil
|
||||
lock.unlock()
|
||||
lock.withLock {
|
||||
self.handle = fileHandle
|
||||
self.written = offset
|
||||
self.onProgress = onProgress
|
||||
self.responseError = nil
|
||||
}
|
||||
|
||||
var request = URLRequest(url: url)
|
||||
if offset > 0 {
|
||||
|
||||
@@ -10,7 +10,7 @@ struct ModelFile: Equatable, Sendable {
|
||||
/// 只列加载必需的功能文件,排除 README.md / .gitattributes(省下载)。
|
||||
/// 字节数与服务器素材逐一核对一致,见
|
||||
/// docs/superpowers/specs/2026-05-29-model-download-design.md 附录 A。
|
||||
enum ModelManifest {
|
||||
nonisolated enum ModelManifest {
|
||||
/// 自建 Caddy 静态服务(用户自建 HTTPS 反代)。
|
||||
/// 备选纯 IP(需 App 端 ATS 例外): http://101.132.124.52:5244/
|
||||
static let baseURL = URL(string: "https://file.myv0.com/")!
|
||||
@@ -30,18 +30,27 @@ enum ModelManifest {
|
||||
ModelFile(path: "added_tokens.json", bytes: 707),
|
||||
]
|
||||
case .vl:
|
||||
// Qwen3-VL-4B-Instruct-4bit:字节数取自 mlx-community 仓库实际 blob 大小
|
||||
// (HF API blobs=true,2026-05 核对),用于总进度计算与下载后大小校验。
|
||||
// 策略:完整镜像仓库的全部运行文件(仅排除 README.md / .gitattributes),
|
||||
// 与标准 mlx-vlm 加载环境保持一致,避免漏文件导致 VLMModelFactory 加载失败。
|
||||
// 同时带两份 chat_template(.json 旧约定 + .jinja 新约定)与 video 预处理配置,
|
||||
// 以兼容不同版本 swift-transformers / Qwen3VLProcessor 的读取路径。
|
||||
return [
|
||||
ModelFile(path: "config.json", bytes: 1_659),
|
||||
ModelFile(path: "model.safetensors", bytes: 3_073_720_461),
|
||||
ModelFile(path: "model.safetensors.index.json", bytes: 108_307),
|
||||
ModelFile(path: "tokenizer.json", bytes: 11_421_896),
|
||||
ModelFile(path: "tokenizer_config.json", bytes: 7_256),
|
||||
ModelFile(path: "config.json", bytes: 7_137),
|
||||
ModelFile(path: "model.safetensors", bytes: 3_093_767_283),
|
||||
ModelFile(path: "model.safetensors.index.json", bytes: 64_742),
|
||||
ModelFile(path: "tokenizer.json", bytes: 11_422_654),
|
||||
ModelFile(path: "tokenizer_config.json", bytes: 5_445),
|
||||
ModelFile(path: "vocab.json", bytes: 2_776_833),
|
||||
ModelFile(path: "merges.txt", bytes: 1_671_853),
|
||||
ModelFile(path: "special_tokens_map.json", bytes: 613),
|
||||
ModelFile(path: "added_tokens.json", bytes: 605),
|
||||
ModelFile(path: "chat_template.json", bytes: 1_050),
|
||||
ModelFile(path: "preprocessor_config.json", bytes: 350),
|
||||
ModelFile(path: "added_tokens.json", bytes: 707),
|
||||
ModelFile(path: "generation_config.json", bytes: 269),
|
||||
ModelFile(path: "chat_template.json", bytes: 5_502),
|
||||
ModelFile(path: "chat_template.jinja", bytes: 5_292),
|
||||
ModelFile(path: "preprocessor_config.json", bytes: 782),
|
||||
ModelFile(path: "video_preprocessor_config.json", bytes: 817),
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,12 +3,12 @@ import Foundation
|
||||
nonisolated enum ModelKind: String, CaseIterable {
|
||||
/// 与 HuggingFace mlx-community 仓库名一一对应,也是沙盒 Models/ 下的子目录名。
|
||||
case llm = "Qwen3-1.7B-4bit"
|
||||
case vl = "Qwen2.5-VL-3B-Instruct-4bit"
|
||||
case vl = "Qwen3-VL-4B-Instruct-4bit"
|
||||
|
||||
var displayName: String {
|
||||
switch self {
|
||||
case .llm: return "Qwen3-1.7B"
|
||||
case .vl: return "Qwen2.5-VL-3B"
|
||||
case .vl: return "Qwen3-VL-4B"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -132,7 +132,7 @@ enum ModelStoreError: Error, LocalizedError {
|
||||
var errorDescription: String? {
|
||||
switch self {
|
||||
case .missingConfig:
|
||||
return "所选文件夹缺少 config.json,不是有效的模型目录"
|
||||
return String(appLoc: "所选文件夹缺少 config.json,不是有效的模型目录")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
79
康康/AI/Prompts/DiaryAssistPrompts.swift
Normal file
@@ -0,0 +1,79 @@
|
||||
import Foundation
|
||||
|
||||
/// 「健康记录」写入时,让 LLM 从医生问诊角度提 3-4 个追问。
|
||||
/// 输出严格 JSON,每个 question 带 dim(问诊维度)+ q(展示)+ fill(可一键追加的模板)。
|
||||
///
|
||||
/// 为什么要 `dim`(对齐 2026-05-30 prompt 优化):
|
||||
/// 1.7B 模型对「不要重复」这类否定指令遵循很差,且先验会把每轮问题都拉向同一簇症状。
|
||||
/// 改成「从固定维度清单里挑,每条标注 dim,跨轮排除已覆盖维度」这种正向结构约束后,
|
||||
/// 去重从「字面比对」升级为「按维度结构去重」,轮内扎堆和轮间换皮重复都能压住。
|
||||
enum DiaryAssistPrompts {
|
||||
|
||||
/// 固定问诊维度清单。模型每条问题必须正好归属其中一个;UI 累积已覆盖维度回传下一轮。
|
||||
/// 顺序即展示/示例顺序,改动需同步 few-shot。
|
||||
static let dimensions: [String] = [
|
||||
"起病诱因", "症状性质", "伴随症状", "加重缓解",
|
||||
"持续频率", "既往家族史", "用药过敏", "生活方式",
|
||||
]
|
||||
|
||||
/// - content: 患者当前全文。
|
||||
/// - coveredDimensions: 之前各轮已经问过(或记录里已写明)的维度名,本轮必须避开。
|
||||
/// 第一轮传空数组。
|
||||
static func suggest(content: String, coveredDimensions: [String] = []) -> String {
|
||||
let covered = coveredDimensions.filter { !$0.isEmpty }
|
||||
let coveredSet = Set(covered)
|
||||
let allowed = dimensions.filter { !coveredSet.contains($0) }
|
||||
let allowedLine = allowed.isEmpty ? "(已基本问全)" : allowed.joined(separator: "、")
|
||||
// 正向约束:1.7B 对「只能从这些里挑」比对「严禁选这些」遵循更好。
|
||||
let scopeRule = covered.isEmpty
|
||||
? ""
|
||||
: "\n- 已问过的维度【不要再问】:\(covered.joined(separator: "、"))。本轮只能从这些还没问的维度里挑:\(allowedLine)。"
|
||||
|
||||
return """
|
||||
你是社区医生的小助手。患者写了一段身体状态的健康记录,信息可能不够完整。
|
||||
请从医生问诊角度提出 3-4 个最值得追问的问题,帮患者把这条记录补全。
|
||||
|
||||
【问诊维度清单】每个问题必须正好归属其中一个,并用 dim 标注:
|
||||
1. 起病诱因 —— 何时开始、有无诱因
|
||||
2. 症状性质 —— 部位、性质、程度
|
||||
3. 伴随症状 —— 是否伴随其他不适
|
||||
4. 加重缓解 —— 什么情况下加重或缓解
|
||||
5. 持续频率 —— 持续多久、多频繁、是否反复发作
|
||||
6. 既往家族史 —— 以前是否有类似、家族相关史
|
||||
7. 用药过敏 —— 在服药物、过敏史
|
||||
8. 生活方式 —— 睡眠、饮食、运动习惯、压力
|
||||
|
||||
硬性规则:
|
||||
- 本轮每个问题必须来自【不同】维度,严禁两条落在同一维度(例如不能两条都问"伴随症状")。\(scopeRule)
|
||||
- 只问【最新记录】里还没写明的事。方括号 `[xxx]` 表示该话题已被提出、只是细节待填,【不要】再作为新问题重复它。
|
||||
- 不给诊断、不给用药建议、不写「建议就医」。
|
||||
- q ≤ 20 字,像真人医生在问;fill 是采纳后追加到原文的中文补充句,可含方括号占位符如 [时间] [部位]。
|
||||
- 至少 3 条,最多 4 条。
|
||||
|
||||
只输出严格 JSON,不要解释、不要 markdown 围栏、不要 <think> 标签。结构:
|
||||
{"questions":[{"dim":"<清单里的一个维度名>","q":"<问题>","fill":"<补充句模板>"}]}
|
||||
|
||||
示例 1(第一轮,记录:头痛了一上午):
|
||||
{"questions":[
|
||||
{"dim":"起病诱因","q":"具体什么时候开始的?","fill":"症状从 [时间] 开始,"},
|
||||
{"dim":"症状性质","q":"是哪种性质的头痛?","fill":"部位/性质是 [部位/胀痛/刺痛],"},
|
||||
{"dim":"伴随症状","q":"还伴有其他不适吗?","fill":"还伴有 [症状],"},
|
||||
{"dim":"生活方式","q":"最近睡眠和压力怎么样?","fill":"近期睡眠 [小时]、压力 [情况],"}
|
||||
]}
|
||||
|
||||
示例 2(后续轮,已覆盖维度:起病诱因、症状性质、伴随症状):
|
||||
{"questions":[
|
||||
{"dim":"加重缓解","q":"做什么会加重或缓解?","fill":"[活动/休息] 时会 [加重/缓解],"},
|
||||
{"dim":"持续频率","q":"这种情况反复或持续多久了?","fill":"已持续/反复 [时长/频率],"},
|
||||
{"dim":"既往家族史","q":"以前有过类似情况吗?","fill":"既往类似 [有/无,频率],"}
|
||||
]}
|
||||
|
||||
现在输出 JSON。
|
||||
本轮可选维度:\(allowedLine)
|
||||
【最新记录】:
|
||||
\(content)
|
||||
|
||||
Output: /no_think
|
||||
"""
|
||||
}
|
||||
}
|
||||
185
康康/AI/Prompts/HealthExportPrompts.swift
Normal file
@@ -0,0 +1,185 @@
|
||||
import Foundation
|
||||
|
||||
/// 「导出身体档案」用到的两个 LLM prompt:
|
||||
/// 1. `intentExtraction` —— 抽取时间窗 + 指标/症状关键词,只输出 JSON
|
||||
/// 2. `reportGeneration` —— 拼真实数据后生成给医生看的 Markdown
|
||||
///
|
||||
/// 解析逻辑见 `HealthExportService`(§3.2 失败回退红线:
|
||||
/// 抽不出 JSON → 用 30 天 + 空关键词兜底,流程不中断)。
|
||||
enum HealthExportPrompts {
|
||||
|
||||
// MARK: - 意图抽取
|
||||
|
||||
/// `intentExtraction(userPrompt:)` 把用户原话拼到模板末尾。
|
||||
/// 期望输出形如:
|
||||
/// ```json
|
||||
/// {"time_range_days":30,
|
||||
/// "keywords":["体温","血压"],
|
||||
/// "symptom_keywords":["感冒","咳嗽"],
|
||||
/// "intent":"cold_consult",
|
||||
/// "intent_label_cn":"感冒就诊"}
|
||||
/// ```
|
||||
static func intentExtraction(userPrompt: String) -> String {
|
||||
"""
|
||||
你是健康数据助手。读用户的请求,只输出严格 JSON,不要解释、不要 markdown 围栏、不要任何前后缀文字。
|
||||
|
||||
字段说明(全部必填):
|
||||
{
|
||||
"time_range_days": int, // 回溯天数,默认 30,最大 365
|
||||
"keywords": [string], // 指标关键词(中文,如「血压」「血糖」「体温」「肝功」),无则 []
|
||||
"symptom_keywords": [string], // 症状关键词,无则 []
|
||||
"intent": string, // 英文 snake_case 标签,如 "cold_consult"
|
||||
"intent_label_cn": string // 中文短语,会作为报告标题副题,如 "感冒就诊"
|
||||
}
|
||||
|
||||
规则:
|
||||
- 时间未指定 → 30
|
||||
- 「最近一个月」→ 30,「最近三个月」→ 90,「最近半年」→ 180
|
||||
- 关键词要中文,常见健康指标 / 症状词
|
||||
- intent 简短,4-25 字符,小写下划线
|
||||
|
||||
示例 1:
|
||||
User: 我感冒3天了,要把最近一个月的健康情况给医生看
|
||||
Output: {"time_range_days":30,"keywords":["体温","血压","脉搏"],"symptom_keywords":["感冒","咳嗽","咽喉痛","发烧"],"intent":"cold_consult","intent_label_cn":"感冒就诊"}
|
||||
|
||||
示例 2:
|
||||
User: 我最近血糖好像不稳,把上次体检前后的化验单整理一下
|
||||
Output: {"time_range_days":90,"keywords":["血糖","糖化血红蛋白","胰岛素"],"symptom_keywords":[],"intent":"glucose_review","intent_label_cn":"血糖复查"}
|
||||
|
||||
现在请输出 JSON:
|
||||
User: \(userPrompt)
|
||||
Output: /no_think
|
||||
"""
|
||||
}
|
||||
|
||||
// MARK: - 报告生成
|
||||
|
||||
/// `reportGeneration(userPrompt:intentLabelCN:dataJSON:)` 拼好后流式生成 Markdown。
|
||||
static func reportGeneration(userPrompt: String,
|
||||
intentLabelCN: String,
|
||||
dataJSON: String) -> String {
|
||||
let labelLine = intentLabelCN.isEmpty
|
||||
? "# 就诊摘要"
|
||||
: "# 就诊摘要 — \(intentLabelCN)"
|
||||
return """
|
||||
你是健康数据整理员。任务是把下面【真实数据】(JSON)里**已经存在**的内容,
|
||||
原样整理成一份给社区医生看的就诊摘要。这是**抽取 / 搬运**任务,不是创作。
|
||||
|
||||
【最重要的铁律 —— 违反即失败】
|
||||
- 只能使用【真实数据】JSON 里**真实出现过**的内容。
|
||||
- 严禁编造或推测任何数字、日期、症状、药物、检查结果、诊断,哪怕看起来很合理。
|
||||
- JSON 里没有的信息,对应小节一律写「无记录」,不要补全、不要举例、不要套用常见病例模板。
|
||||
- 数值必须原样照搬(含单位与参考范围);status 为 high/low/abnormal 的指标前加 ⚠️。
|
||||
- 「主诉」「患者疑问」可参考【患者原话】,但不得加入原话与数据里都没有的症状。
|
||||
|
||||
输出格式:
|
||||
- 严格 Markdown,标题用 # / ##,不要 markdown 围栏,不要输出 JSON,不写「数据」二字。
|
||||
- 不给诊断意见、用药建议或「建议就医」。全文中文,简洁,医生 30 秒能扫完。
|
||||
- 严格按以下 6 段(顺序与标题固定):
|
||||
\(labelLine)
|
||||
## 主诉
|
||||
## 患者背景
|
||||
## 近期症状(按时间倒序)
|
||||
## 关键指标(异常项优先)
|
||||
## 在服药与过敏
|
||||
## 患者疑问
|
||||
|
||||
—— 格式示例(只示范「无记录」与数值写法,内容请勿照抄)——
|
||||
真实数据:{"profile":{},"symptoms":[],"indicators":[{"name":"体温","value":"38.5","unit":"℃","range":"36-37.2","status":"high","date":"2026-05-01"}],"reports":[],"diaries":[],"time_window":{"from":"2026-04-02","to":"2026-05-02"}}
|
||||
输出:
|
||||
# 就诊摘要 — 近期健康摘要
|
||||
## 主诉
|
||||
无记录
|
||||
## 患者背景
|
||||
无记录
|
||||
## 近期症状(按时间倒序)
|
||||
无记录
|
||||
## 关键指标(异常项优先)
|
||||
⚠️ 体温 38.5 ℃(参考 36-37.2,2026-05-01)
|
||||
## 在服药与过敏
|
||||
无记录
|
||||
## 患者疑问
|
||||
无记录
|
||||
—— 示例结束(以上咳嗽/体温等仅示范格式,切勿出现在你的输出里)——
|
||||
|
||||
现在,严格根据下面这份【真实数据】生成;数据里没有的就写「无记录」,**禁止编造**:
|
||||
|
||||
【真实数据】:
|
||||
\(dataJSON)
|
||||
|
||||
【患者原话】:\(userPrompt)
|
||||
|
||||
再次强调:只整理上面【真实数据】里真实出现过的内容,禁止编造任何数字/日期/症状/药物。
|
||||
直接输出 Markdown,不要思考过程,不要 <think> 标签:
|
||||
/no_think
|
||||
"""
|
||||
}
|
||||
|
||||
// MARK: - 多轮导出对话
|
||||
|
||||
/// 多轮导出页里,用户每次提问时用这个 prompt 回答。
|
||||
/// 输入上下文限定为本地指标 + 健康日记,回答只做解释/归纳,不持久化。
|
||||
static func dialogueAnswer(latestQuestion: String,
|
||||
transcript: String,
|
||||
dataJSON: String) -> String {
|
||||
"""
|
||||
你是康康的本地健康档案助手。请根据【本地健康记录】回答用户最新问题。
|
||||
|
||||
铁律:
|
||||
- 只能使用【本地健康记录】和【多轮对话】里已有的信息。
|
||||
- 禁止诊断、禁止用药/剂量建议、禁止急诊判断。
|
||||
- 数据里没有的信息,直接说「记录里没有」,不要编造。
|
||||
- 重点围绕指标和健康日记做大白话解释,回答要短,最多 5 条要点。
|
||||
- 如果用户的目标是给医生看,可以提示稍后点击「生成整理报告」。
|
||||
|
||||
【本地健康记录】:
|
||||
\(dataJSON)
|
||||
|
||||
【多轮对话】:
|
||||
\(transcript.isEmpty ? "无" : transcript)
|
||||
|
||||
【用户最新问题】:
|
||||
\(latestQuestion)
|
||||
|
||||
直接输出中文回答,不要 Markdown 标题,不要 <think>:
|
||||
/no_think
|
||||
"""
|
||||
}
|
||||
|
||||
/// 对话结束后,把整段交流整理成一份给医生看的 Markdown 报告。
|
||||
static func dialogueReportGeneration(transcript: String,
|
||||
dataJSON: String) -> String {
|
||||
"""
|
||||
你是健康数据整理员。请把【多轮对话】和【本地健康记录】整理成一份给医生看的摘要报告。
|
||||
这是抽取 / 搬运任务,不是医疗诊断。
|
||||
|
||||
铁律:
|
||||
- 只能使用【本地健康记录】和【多轮对话】里真实出现的信息。
|
||||
- 禁止编造数字、日期、症状、药物、检查结果、诊断。
|
||||
- 禁止给诊断意见、用药建议、剂量建议或急诊判断。
|
||||
- JSON 里没有的信息,对应小节写「无记录」。
|
||||
- 指标 status 为 high/low/abnormal 的项目前加 ⚠️。
|
||||
|
||||
输出要求:
|
||||
- 严格 Markdown,不要 markdown 围栏,不要输出 JSON。
|
||||
- 中文,简洁,医生 30 秒能扫完。
|
||||
- 严格按以下段落:
|
||||
# 就诊摘要
|
||||
## 本次想解决的问题
|
||||
## 相关健康日记
|
||||
## 相关指标
|
||||
## 已知背景
|
||||
## 患者关心的问题
|
||||
## 可带给医生确认的要点
|
||||
|
||||
【本地健康记录】:
|
||||
\(dataJSON)
|
||||
|
||||
【多轮对话】:
|
||||
\(transcript.isEmpty ? "无" : transcript)
|
||||
|
||||
直接输出 Markdown,不要思考过程,不要 <think>:
|
||||
/no_think
|
||||
"""
|
||||
}
|
||||
}
|
||||
@@ -1,6 +1,6 @@
|
||||
import Foundation
|
||||
|
||||
/// VL 模型(Qwen2.5-VL)用于体检 / 化验单识别的 prompt 模板。
|
||||
/// VL 模型(Qwen3-VL)用于体检 / 化验单识别的 prompt 模板。
|
||||
/// 输出契约:严格 JSON,无任何解释文字、markdown 围栏或前后缀。
|
||||
/// 解析失败 → CaptureService 回退到手动录入(§3.2 失败回退红线)。
|
||||
enum VLPrompts {
|
||||
@@ -20,16 +20,30 @@ enum VLPrompts {
|
||||
/// "value": "3.84",
|
||||
/// "unit": "mmol/L",
|
||||
/// "range": "< 3.40",
|
||||
/// "status": "high|low|normal"
|
||||
/// "status": "high|low|normal",
|
||||
/// "source_page": 1,
|
||||
/// "source_box": [0.18, 0.42, 0.68, 0.49]
|
||||
/// }
|
||||
/// ]
|
||||
/// }
|
||||
/// ```
|
||||
/// `kind` 字段省略 —— UI 由 indicators 数量决定走 A2(单项)或 B3(多项)。
|
||||
|
||||
static let reportExtraction: String = #"""
|
||||
/// VL 模型不知"今天"是哪天,且 few-shot 示例里写死了日期,
|
||||
/// 必须把当天日期显式注入 prompt,模型在无报告日期时才会用对正确的回退值。
|
||||
static func reportExtraction(today: Date = .now) -> String {
|
||||
let f = DateFormatter()
|
||||
f.locale = Locale(identifier: "en_US_POSIX")
|
||||
f.dateFormat = "yyyy-MM-dd"
|
||||
let todayStr = f.string(from: today)
|
||||
return reportExtractionTemplate.replacingOccurrences(of: "{{TODAY}}", with: todayStr)
|
||||
}
|
||||
|
||||
private static let reportExtractionTemplate: String = #"""
|
||||
你是一个医学体检报告识别助手。请只输出一段合法 JSON,不要解释、不要 markdown 围栏、不要任何前后缀文字。
|
||||
|
||||
今天的日期是 {{TODAY}}。
|
||||
|
||||
JSON schema(严格):
|
||||
{
|
||||
"title": string,
|
||||
@@ -44,7 +58,9 @@ JSON schema(严格):
|
||||
"value": string,
|
||||
"unit": string,
|
||||
"range": string,
|
||||
"status": "high" | "low" | "normal"
|
||||
"status": "high" | "low" | "normal",
|
||||
"source_page": number,
|
||||
"source_box": [number, number, number, number]
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -52,20 +68,135 @@ JSON schema(严格):
|
||||
规则:
|
||||
- status 根据 value 与 range 自己判断:value > range 上限 → "high",< 下限 → "low",否则 → "normal"。
|
||||
- range 字段保留原文(如 "< 3.40"、"3.9 - 6.1"、"0 - 5"),不要解析成区间对象。
|
||||
- 无法识别的字段填空字符串(institution / summary)或合理默认值(report_date 用今天)。
|
||||
- 不要发明指标。看不清的整行跳过。
|
||||
- 无法识别的字段填空字符串(institution / summary)。
|
||||
- report_date 必须从图片中识别;实在看不清就填上面给出的「今天」({{TODAY}})。下面示例里的日期只是格式参考,不要直接抄。
|
||||
- 不要发明指标。数值看不清的整行跳过;但**没有参考范围不是跳过的理由**,结论页叙述式文字(如「总胆红素: 23.0(μmol/L)↑」)同样要提取,range 填 "",status 按箭头/「偏高」等标记判断。
|
||||
- 化验单一般 type = "lab",体检套餐 = "checkup"。
|
||||
- source_page 是该指标所在图片页码,从 1 开始。
|
||||
- source_box 是该指标整行在该页图片里的归一化矩形 [x,y,width,height],左上角为 (0,0),右下角为 (1,1)。尽量框住指标名、数值、单位、参考范围和异常标记所在整行;不确定位置时填 [0,0,0,0]。
|
||||
|
||||
示例 1(化验单 · 单项):
|
||||
输入: 一张化验单照片,只能看清「低密度脂蛋白 3.84 mmol/L 参考 <3.40」
|
||||
输出:
|
||||
{"title":"低密度脂蛋白单项","type":"lab","report_date":"2026-05-25","institution":"","page_count":1,"summary":"","indicators":[{"name":"低密度脂蛋白","value":"3.84","unit":"mmol/L","range":"< 3.40","status":"high"}]}
|
||||
{"title":"低密度脂蛋白单项","type":"lab","report_date":"2026-05-25","institution":"","page_count":1,"summary":"","indicators":[{"name":"低密度脂蛋白","value":"3.84","unit":"mmol/L","range":"< 3.40","status":"high","source_page":1,"source_box":[0.18,0.42,0.68,0.08]}]}
|
||||
|
||||
示例 2(体检 · 多项):
|
||||
输入: 一份春季体检,3 项可读
|
||||
输出:
|
||||
{"title":"春季年度体检","type":"checkup","report_date":"2026-04-12","institution":"协和医院","page_count":1,"summary":"血脂偏高、其他正常","indicators":[{"name":"低密度脂蛋白","value":"3.84","unit":"mmol/L","range":"< 3.40","status":"high"},{"name":"谷丙转氨酶","value":"32","unit":"U/L","range":"9 - 50","status":"normal"},{"name":"空腹血糖","value":"5.2","unit":"mmol/L","range":"3.9 - 6.1","status":"normal"}]}
|
||||
{"title":"春季年度体检","type":"checkup","report_date":"2026-04-12","institution":"协和医院","page_count":1,"summary":"血脂偏高、其他正常","indicators":[{"name":"低密度脂蛋白","value":"3.84","unit":"mmol/L","range":"< 3.40","status":"high","source_page":1,"source_box":[0.12,0.31,0.76,0.07]},{"name":"谷丙转氨酶","value":"32","unit":"U/L","range":"9 - 50","status":"normal","source_page":1,"source_box":[0.12,0.39,0.76,0.07]},{"name":"空腹血糖","value":"5.2","unit":"mmol/L","range":"3.9 - 6.1","status":"normal","source_page":1,"source_box":[0.12,0.47,0.76,0.07]}]}
|
||||
|
||||
现在请识别图片并输出 JSON:
|
||||
"""#
|
||||
|
||||
// MARK: - 局部小框识别(异常项快拍)
|
||||
|
||||
/// 异常项快拍专用:输入是报告/化验单的**局部照片**(常常只有一两行指标)。
|
||||
/// 只要 indicators 数组,不要报告标题/机构/日期等元信息 —— 这条路径只存数值,不建 Report。
|
||||
static func regionExtraction(today: Date = .now) -> String {
|
||||
let f = DateFormatter()
|
||||
f.locale = Locale(identifier: "en_US_POSIX")
|
||||
f.dateFormat = "yyyy-MM-dd"
|
||||
let todayStr = f.string(from: today)
|
||||
return regionExtractionTemplate.replacingOccurrences(of: "{{TODAY}}", with: todayStr)
|
||||
}
|
||||
|
||||
private static let regionExtractionTemplate: String = #"""
|
||||
你是一个医学化验单识别助手。下面给你的是一张化验单/体检报告的**局部照片**,通常只框住了一两行指标。
|
||||
照片内容可能是表格行,也可能是**结论页的叙述式文字**(如「九、检验:(1)总胆红素(TB): 23.0(μmol/L)↑」),两种都要提取。
|
||||
请只输出一段合法 JSON,不要解释、不要 markdown 围栏、不要任何前后缀文字。
|
||||
|
||||
今天的日期是 {{TODAY}}。
|
||||
|
||||
JSON schema(严格):
|
||||
{
|
||||
"indicators": [
|
||||
{
|
||||
"name": string,
|
||||
"value": string,
|
||||
"unit": string,
|
||||
"range": string,
|
||||
"status": "high" | "low" | "normal"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
规则:
|
||||
- 凡是「指标名 + 数值」清楚可读的,都要提取——**没有参考范围不是跳过的理由**。只有数值本身看不清才跳过,绝不发明指标。
|
||||
- status 判断优先级:① 文字旁的箭头或标记(↑/H/偏高 → "high",↓/L/偏低 → "low")最优先;② 没有标记时再用 value 与 range 比较;③ 都没有 → "normal"。
|
||||
- range 字段保留原文(如 "< 3.40"、"3.9 - 6.1"、"0 - 5"),不要解析成区间对象;照片里没有参考范围就填 ""。
|
||||
- 识别不出单位/范围就填空字符串,不要编造。
|
||||
- name 用规范指标名;如果同一行重复出现指标名(如「总胆红素(TB): 总胆红素: 23.0」),只取一次。
|
||||
- 不要输出 title / institution / date / summary 等任何报告级字段,只输出 indicators 数组。
|
||||
|
||||
示例 1(表格单行):
|
||||
输入: 局部照片,清楚可读「低密度脂蛋白 3.84 mmol/L 参考 <3.40 ↑」
|
||||
输出:
|
||||
{"indicators":[{"name":"低密度脂蛋白","value":"3.84","unit":"mmol/L","range":"< 3.40","status":"high"}]}
|
||||
|
||||
示例 2(表格两行):
|
||||
输入: 局部照片,清楚可读「尿酸 486 μmol/L 208-428」与「空腹血糖 5.2 mmol/L 3.9-6.1」
|
||||
输出:
|
||||
{"indicators":[{"name":"尿酸","value":"486","unit":"μmol/L","range":"208 - 428","status":"high"},{"name":"空腹血糖","value":"5.2","unit":"mmol/L","range":"3.9 - 6.1","status":"normal"}]}
|
||||
|
||||
示例 3(结论页叙述式 · 无参考范围,只有箭头):
|
||||
输入: 局部照片,体检结论文字「九、检验: (1)总胆红素(TB): 总胆红素: 23.0(μmol/L)↑」,周围还有其他结论文字
|
||||
输出:
|
||||
{"indicators":[{"name":"总胆红素","value":"23.0","unit":"μmol/L","range":"","status":"high"}]}
|
||||
|
||||
现在请识别这张局部照片并输出 JSON:
|
||||
"""#
|
||||
|
||||
// MARK: - OCR 文本 → 指标(LLM 解析,非 VL)
|
||||
|
||||
/// 「拍照识别」新链路:先用 Vision OCR 把化验单读成纯文本,再用 Qwen3-1.7B 从文本结构化抽指标。
|
||||
/// 比让 3B VL 直接读密集小字稳得多。输入是 OCR 文本(可能有错字/错位/噪声)。
|
||||
static func indicatorsFromText(_ ocrText: String, today: Date = .now) -> String {
|
||||
let f = DateFormatter()
|
||||
f.locale = Locale(identifier: "en_US_POSIX")
|
||||
f.dateFormat = "yyyy-MM-dd"
|
||||
let todayStr = f.string(from: today)
|
||||
return indicatorsFromTextTemplate
|
||||
.replacingOccurrences(of: "{{TODAY}}", with: todayStr)
|
||||
.replacingOccurrences(of: "{{OCR_TEXT}}", with: ocrText)
|
||||
}
|
||||
|
||||
private static let indicatorsFromTextTemplate: String = #"""
|
||||
你是医学化验单/体检报告的结构化助手。下面是对一张报告做 OCR 得到的纯文本,可能有错字、错位、多余符号或换行混乱。
|
||||
请从中提取所有「指标名 + 数值」,只输出一段合法 JSON,不要解释、不要 markdown 围栏、不要任何前后缀文字。
|
||||
|
||||
今天的日期是 {{TODAY}}。
|
||||
|
||||
JSON schema(严格):
|
||||
{
|
||||
"indicators": [
|
||||
{
|
||||
"name": string,
|
||||
"value": string,
|
||||
"unit": string,
|
||||
"range": string,
|
||||
"status": "high" | "low" | "normal"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
规则:
|
||||
- 只提取「有明确数值」的检验/体检指标;页眉、医院名、医生签名、采样时间、栏目标题、OCR 噪声一律忽略。
|
||||
- status 判断优先级:① 文本里的箭头/标记(↑/H/偏高 → "high",↓/L/偏低 → "low")最优先;② 没有标记时用 value 与 range 比较;③ 都没有 → "normal"。
|
||||
- range 保留原文(如 "3.9 - 6.1"、"< 3.40"、"208 - 428");OCR 把破折号写成 "--" / "~" 都归一成 " - ";没有参考范围就填 ""。
|
||||
- 单位识别不出就填 "",不要编造;不要发明指标;同一指标只输出一次。
|
||||
- name 用规范中文指标名(行内重复的去掉,英文缩写括注可保留)。
|
||||
- 数值明显是 OCR 乱码(字母混入数字)且无法判断的,跳过该行。
|
||||
|
||||
示例 OCR 文本:
|
||||
淋巴细胞数 3.0 1.8 -- 6.3 X10^9/L
|
||||
尿酸 486 208-428 μmol/L
|
||||
总胆红素(TB): 23.0 (μmol/L) ↑
|
||||
对应输出:
|
||||
{"indicators":[{"name":"淋巴细胞数","value":"3.0","unit":"X10^9/L","range":"1.8 - 6.3","status":"normal"},{"name":"尿酸","value":"486","unit":"μmol/L","range":"208 - 428","status":"high"},{"name":"总胆红素","value":"23.0","unit":"μmol/L","range":"","status":"high"}]}
|
||||
|
||||
现在请解析下面这段 OCR 文本,只输出 JSON。/no_think
|
||||
|
||||
OCR 文本:
|
||||
{{OCR_TEXT}}
|
||||
"""#
|
||||
}
|
||||
|
||||
@@ -3,7 +3,7 @@ import MLX
|
||||
import MLXVLM
|
||||
import MLXLMCommon
|
||||
|
||||
/// 封装 MLX VL 模型(Qwen2.5-VL)的图像 → 文本推理。
|
||||
/// 封装 MLX VL 模型(Qwen3-VL)的图像 → 文本推理。
|
||||
/// 与 LLMSession 同款 actor 隔离,串行化由上游 AIRuntime 统一保证。
|
||||
actor VLSession {
|
||||
let container: ModelContainer
|
||||
|
||||
64
康康/App/FontScale.swift
Normal file
@@ -0,0 +1,64 @@
|
||||
import SwiftUI
|
||||
|
||||
/// 全局字体放大档位。面向视力不佳 / 老年用户:放大整个 App 的字号。
|
||||
/// 倍率作用于所有走 `Font.tjScaled` / `Font.tjTitle` 等的字体(即全 App 固定字号)。
|
||||
enum FontScale: String, CaseIterable, Identifiable {
|
||||
case standard, large, extraLarge, huge
|
||||
|
||||
var id: String { rawValue }
|
||||
|
||||
/// 字号倍率。超大档位有限,避免密集布局严重溢出。
|
||||
var multiplier: CGFloat {
|
||||
switch self {
|
||||
case .standard: return 1.0
|
||||
case .large: return 1.2
|
||||
case .extraLarge: return 1.4
|
||||
case .huge: return 1.6
|
||||
}
|
||||
}
|
||||
|
||||
var label: String {
|
||||
switch self {
|
||||
case .standard: return String(appLoc: "标准")
|
||||
case .large: return String(appLoc: "大")
|
||||
case .extraLarge: return String(appLoc: "特大")
|
||||
case .huge: return String(appLoc: "超大")
|
||||
}
|
||||
}
|
||||
|
||||
var detail: String {
|
||||
switch self {
|
||||
case .standard: return String(appLoc: "默认字号")
|
||||
case .large: return String(appLoc: "字号放大 20%")
|
||||
case .extraLarge: return String(appLoc: "字号放大 40%")
|
||||
case .huge: return String(appLoc: "字号放大 60%")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// 全 App 单例。持久化字体档位;切换后由根视图 `.id` 触发整树重建即时生效(同语言切换机制)。
|
||||
@Observable
|
||||
final class FontScaleManager {
|
||||
static let shared = FontScaleManager()
|
||||
|
||||
private let storageKey = "appFontScale"
|
||||
|
||||
private(set) var scale: FontScale
|
||||
|
||||
private init() {
|
||||
let saved = UserDefaults.standard.string(forKey: storageKey)
|
||||
scale = FontScale(rawValue: saved ?? "") ?? .standard
|
||||
appFontScale = scale.multiplier
|
||||
}
|
||||
|
||||
func set(_ newScale: FontScale) {
|
||||
guard newScale != scale else { return }
|
||||
scale = newScale
|
||||
UserDefaults.standard.set(newScale.rawValue, forKey: storageKey)
|
||||
appFontScale = newScale.multiplier
|
||||
}
|
||||
}
|
||||
|
||||
/// nonisolated 快照:`Font.tjScaled` 是 static func,在任意上下文按值读取倍率。
|
||||
/// 只由 `FontScaleManager`(MainActor)写入;读为快照,无竞态影响(同 Localization 的 appLocBundle 模式)。
|
||||
nonisolated(unsafe) var appFontScale: CGFloat = 1.0
|
||||
@@ -3,6 +3,14 @@ import SwiftData
|
||||
|
||||
@main
|
||||
struct KangkangApp: App {
|
||||
@State private var lang = LanguageManager.shared
|
||||
@State private var fontScale = FontScaleManager.shared
|
||||
|
||||
init() {
|
||||
// 启动即给 MLX 显存缓存设上限,配合 entitlement + LLM/VL 互斥卸载防 jetsam OOM。
|
||||
AIRuntime.configureMLXMemory()
|
||||
}
|
||||
|
||||
var sharedModelContainer: ModelContainer = {
|
||||
let schema = Schema([
|
||||
Indicator.self,
|
||||
@@ -15,31 +23,85 @@ struct KangkangApp: App {
|
||||
MetricReminder.self,
|
||||
CustomMonitorMetric.self,
|
||||
HealthExport.self,
|
||||
CustomReminder.self,
|
||||
])
|
||||
let config = ModelConfiguration(schema: schema, isStoredInMemoryOnly: false)
|
||||
// 建库后给 store 文件补 .completeUnlessOpen 保护(§6),两条创建路径共用。
|
||||
func makeContainer() throws -> ModelContainer {
|
||||
let container = try ModelContainer(for: schema, configurations: [config])
|
||||
KangkangApp.protectStore(at: config.url)
|
||||
return container
|
||||
}
|
||||
do {
|
||||
return try ModelContainer(for: schema, configurations: [config])
|
||||
return try makeContainer()
|
||||
} catch {
|
||||
// Demo 阶段 schema 仍在演进:旧 store 与新 schema 不兼容且无正式迁移时,
|
||||
// 自动迁移会失败导致启动崩溃。这里重置本地 store 重建(测试数据可丢)。
|
||||
// ⚠️ 生产环境必须改为正式的 SwiftData 迁移方案,不能静默删数据。
|
||||
print("⚠️ ModelContainer 创建失败,重置本地 store 重建: \(error)")
|
||||
let fm = FileManager.default
|
||||
let storePath = config.url.path
|
||||
for path in [storePath, storePath + "-wal", storePath + "-shm"] {
|
||||
try? fm.removeItem(atPath: path)
|
||||
}
|
||||
// Demo 阶段 schema 仍在演进:某次改动若超出 SwiftData 自动轻量迁移能力
|
||||
// (最常见:给已存在的 @Model 新增「非可选且无内联默认值」的属性),自动迁移会抛错。
|
||||
// 这里不再静默删库,而是把旧 store 连同 -wal/-shm 整体挪到带时间戳的备份目录后重建——
|
||||
// 既保证 App 能启动,又让旧数据可手动恢复(挪不动才降级为删除)。
|
||||
// ⚠️ 正式发布前仍应改为 VersionedSchema + SchemaMigrationPlan 的正式迁移。
|
||||
// 注:新增 @Model 属性请一律给「可选」或「内联默认值」,即可走轻量迁移、不触发本兜底。
|
||||
print("⚠️ ModelContainer 创建失败,备份旧 store 后重建: \(error)")
|
||||
KangkangApp.backupIncompatibleStore(at: config.url)
|
||||
do {
|
||||
return try ModelContainer(for: schema, configurations: [config])
|
||||
return try makeContainer()
|
||||
} catch {
|
||||
fatalError("Could not create ModelContainer even after reset: \(error)")
|
||||
fatalError("Could not create ModelContainer even after store reset: \(error)")
|
||||
}
|
||||
}
|
||||
}()
|
||||
|
||||
/// 给 SwiftData store(含 `-wal`/`-shm`)补 `.completeUnlessOpen` 文件保护:
|
||||
/// 设备锁屏时静态加密,但已打开的库仍可读写——对运行中的 SQLite 安全,
|
||||
/// 不用 `.complete` 以免锁屏时后台/Live Activity 访问 store 崩溃。对应 CLAUDE.md §6。
|
||||
/// (默认未指定保护类时 iOS 仅给 CompleteUntilFirstUserAuthentication,这里升级一档。)
|
||||
private static func protectStore(at storeURL: URL) {
|
||||
let fm = FileManager.default
|
||||
for suffix in ["", "-wal", "-shm"] {
|
||||
let path = storeURL.path + suffix
|
||||
guard fm.fileExists(atPath: path) else { continue }
|
||||
try? fm.setAttributes([.protectionKey: FileProtectionType.completeUnlessOpen],
|
||||
ofItemAtPath: path)
|
||||
}
|
||||
}
|
||||
|
||||
/// 把与新 schema 不兼容的旧 store(含 `-wal` / `-shm`)挪到
|
||||
/// `Application Support/StoreBackups/<时间戳>/`,而不是直接删除。
|
||||
/// 既清出路径让新库能建起来,又把旧数据留作可手动恢复的备份;挪不动时才降级为删除。
|
||||
private static func backupIncompatibleStore(at storeURL: URL) {
|
||||
let fm = FileManager.default
|
||||
let fmt = DateFormatter()
|
||||
fmt.locale = Locale(identifier: "en_US_POSIX")
|
||||
fmt.dateFormat = "yyyyMMdd-HHmmss"
|
||||
let stamp = fmt.string(from: Date())
|
||||
let backupDir = storeURL.deletingLastPathComponent()
|
||||
.appendingPathComponent("StoreBackups/\(stamp)", isDirectory: true)
|
||||
try? fm.createDirectory(at: backupDir, withIntermediateDirectories: true)
|
||||
// 备份副本同样要加密(否则等于把全量健康数据明文留在低保护目录)。
|
||||
try? fm.setAttributes([.protectionKey: FileProtectionType.completeUnlessOpen],
|
||||
ofItemAtPath: backupDir.path)
|
||||
for suffix in ["", "-wal", "-shm"] {
|
||||
let src = URL(fileURLWithPath: storeURL.path + suffix)
|
||||
guard fm.fileExists(atPath: src.path) else { continue }
|
||||
let dst = backupDir.appendingPathComponent(src.lastPathComponent)
|
||||
do {
|
||||
try fm.moveItem(at: src, to: dst)
|
||||
try? fm.setAttributes([.protectionKey: FileProtectionType.completeUnlessOpen],
|
||||
ofItemAtPath: dst.path)
|
||||
} catch {
|
||||
try? fm.removeItem(at: src) // 挪不动就删,至少保证能启动
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
var body: some Scene {
|
||||
WindowGroup {
|
||||
RootView()
|
||||
AppLockContainer {
|
||||
RootView()
|
||||
.environment(\.locale, lang.locale)
|
||||
// 语言 / 字体档位切换 → 整树重建,即时生效(固定字号经 tjScaled 读新倍率)。
|
||||
.id("\(lang.current.rawValue)-\(fontScale.scale.rawValue)")
|
||||
}
|
||||
}
|
||||
.modelContainer(sharedModelContainer)
|
||||
}
|
||||
|
||||
152
康康/App/Localization.swift
Normal file
@@ -0,0 +1,152 @@
|
||||
import SwiftUI
|
||||
import ObjectiveC
|
||||
|
||||
/// App 支持的界面语言。`system` = 跟随系统;其余对应 .lproj / String Catalog 语言。
|
||||
enum AppLanguage: String, CaseIterable, Identifiable {
|
||||
case system
|
||||
case zhHans = "zh-Hans"
|
||||
case en
|
||||
case ja
|
||||
case ko
|
||||
|
||||
var id: String { rawValue }
|
||||
|
||||
/// 选择器里展示的名字。各语言用其**本族语**显示(行业惯例,不本地化),仅「跟随系统」随 App 语言。
|
||||
var displayName: String {
|
||||
switch self {
|
||||
case .system: return String(appLoc: "跟随系统")
|
||||
case .zhHans: return "简体中文"
|
||||
case .en: return "English"
|
||||
case .ja: return "日本語"
|
||||
case .ko: return "한국어"
|
||||
}
|
||||
}
|
||||
|
||||
/// nil = 跟随系统;否则为 .lproj / Locale 标识。
|
||||
var localeIdentifier: String? {
|
||||
self == .system ? nil : rawValue
|
||||
}
|
||||
|
||||
/// 语言选择器图标。各语言用本族语代表字区分(中 / A / あ / 가),
|
||||
/// 「跟随系统」非具体语言,用地球符号。代表字与 `displayName` 一样不本地化。
|
||||
enum PickerIcon: Equatable {
|
||||
case symbol(String) // SF Symbol 名
|
||||
case glyph(String) // 本族语代表字
|
||||
}
|
||||
|
||||
var pickerIcon: PickerIcon {
|
||||
switch self {
|
||||
case .system: return .symbol("globe")
|
||||
case .zhHans: return .glyph("中")
|
||||
case .en: return .glyph("A")
|
||||
case .ja: return .glyph("あ")
|
||||
case .ko: return .glyph("가")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// 全 App 单例。负责:持久化选择、维护当前语言的 lproj bundle 与 locale。
|
||||
/// - `Text("…")` 走根视图注入的环境 `\.locale`(+ Bundle 重定向)即时切换;
|
||||
/// - `String(appLoc:)` 显式绑定本管理器的 bundle/locale,不受 `.current` 限制,同样即时切换。
|
||||
/// 切换后由根视图 `.id(current)` 触发整树重建,无需重启。
|
||||
@Observable
|
||||
final class LanguageManager {
|
||||
static let shared = LanguageManager()
|
||||
|
||||
private let storageKey = "appLanguage"
|
||||
|
||||
private(set) var current: AppLanguage
|
||||
/// 当前语言对应的 .lproj bundle(system 或缺失时为 .main)。缓存,切换时更新。
|
||||
private(set) var lprojBundle: Bundle = .main
|
||||
/// 当前解析后的 locale(system 时为 .autoupdatingCurrent)。
|
||||
private(set) var resolvedLocale: Locale = .autoupdatingCurrent
|
||||
|
||||
/// 供 SwiftUI 环境使用(日期/数字格式化 + Text 语言)。
|
||||
var locale: Locale { resolvedLocale }
|
||||
|
||||
private init() {
|
||||
let saved = UserDefaults.standard.string(forKey: storageKey)
|
||||
current = AppLanguage(rawValue: saved ?? "") ?? .system
|
||||
apply()
|
||||
}
|
||||
|
||||
func set(_ language: AppLanguage) {
|
||||
guard language != current else { return }
|
||||
current = language
|
||||
UserDefaults.standard.set(language.rawValue, forKey: storageKey)
|
||||
// 同步 AppleLanguages:保证下次冷启动解析正确,并与系统「设置 → App → 语言」一致。
|
||||
if let id = language.localeIdentifier {
|
||||
UserDefaults.standard.set([id], forKey: "AppleLanguages")
|
||||
} else {
|
||||
UserDefaults.standard.removeObject(forKey: "AppleLanguages")
|
||||
}
|
||||
apply()
|
||||
}
|
||||
|
||||
private func apply() {
|
||||
if let id = current.localeIdentifier {
|
||||
resolvedLocale = Locale(identifier: id)
|
||||
if let path = Bundle.main.path(forResource: id, ofType: "lproj"),
|
||||
let b = Bundle(path: path) {
|
||||
lprojBundle = b
|
||||
} else {
|
||||
lprojBundle = .main
|
||||
}
|
||||
} else {
|
||||
resolvedLocale = .autoupdatingCurrent
|
||||
lprojBundle = .main
|
||||
}
|
||||
Bundle.redirectMain(to: current.localeIdentifier)
|
||||
// 同步 nonisolated 快照,供 String(appLoc:) 在非 MainActor 上下文读取。
|
||||
appLocBundle = lprojBundle
|
||||
appLocLocale = resolvedLocale
|
||||
}
|
||||
}
|
||||
|
||||
/// nonisolated 快照:`String(appLoc:)` 可能在非 MainActor 上下文被调用
|
||||
/// (LocalizedError.errorDescription、nonisolated 枚举 label、static 解析器…)。
|
||||
/// 只由 `LanguageManager.apply()`(MainActor)写入,切换语言时刷新;读为快照,无竞态影响。
|
||||
nonisolated(unsafe) private var appLocBundle: Bundle = .main
|
||||
nonisolated(unsafe) private var appLocLocale: Locale = .autoupdatingCurrent
|
||||
|
||||
extension String {
|
||||
/// 尊重「我的 · 语言」选择的本地化(可即时切换)。
|
||||
/// 等价 `String(localized:)`,但显式绑定当前所选语言的 bundle + locale,
|
||||
/// 因此不受 `Locale.current`(系统/启动时语言)限制。
|
||||
nonisolated init(appLoc key: String.LocalizationValue) {
|
||||
self = String(localized: key, bundle: appLocBundle, locale: appLocLocale)
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Bundle 运行时重定向(供 Text / NSLocalizedString 双保险)
|
||||
|
||||
/// 关联对象 key(需稳定地址,文件级全局即可)。
|
||||
private var redirectBundleKey: UInt8 = 0
|
||||
|
||||
/// 把 `Bundle.main` 的字符串查表重定向到指定语言的 .lproj。
|
||||
private final class LocalizedMainBundle: Bundle, @unchecked Sendable {
|
||||
override func localizedString(forKey key: String, value: String?, table tableName: String?) -> String {
|
||||
if let target = objc_getAssociatedObject(self, &redirectBundleKey) as? Bundle {
|
||||
return target.localizedString(forKey: key, value: value, table: tableName)
|
||||
}
|
||||
return super.localizedString(forKey: key, value: value, table: tableName)
|
||||
}
|
||||
}
|
||||
|
||||
extension Bundle {
|
||||
/// language == nil → 跟随系统(走默认解析)。
|
||||
static func redirectMain(to language: String?) {
|
||||
if !(Bundle.main is LocalizedMainBundle) {
|
||||
object_setClass(Bundle.main, LocalizedMainBundle.self)
|
||||
}
|
||||
let target: Bundle?
|
||||
if let language,
|
||||
let path = Bundle.main.path(forResource: language, ofType: "lproj"),
|
||||
let bundle = Bundle(path: path) {
|
||||
target = bundle
|
||||
} else {
|
||||
target = nil
|
||||
}
|
||||
objc_setAssociatedObject(Bundle.main, &redirectBundleKey, target, .OBJC_ASSOCIATION_RETAIN_NONATOMIC)
|
||||
}
|
||||
}
|
||||
|
After Width: | Height: | Size: 66 KiB |
|
After Width: | Height: | Size: 5.8 KiB |
|
After Width: | Height: | Size: 540 B |
|
After Width: | Height: | Size: 13 KiB |
|
After Width: | Height: | Size: 1.2 KiB |
|
After Width: | Height: | Size: 29 KiB |
|
After Width: | Height: | Size: 2.6 KiB |
|
After Width: | Height: | Size: 66 KiB |
|
After Width: | Height: | Size: 66 KiB |
|
Before Width: | Height: | Size: 66 KiB After Width: | Height: | Size: 511 KiB |
|
Before Width: | Height: | Size: 5.8 KiB After Width: | Height: | Size: 18 KiB |
|
Before Width: | Height: | Size: 540 B After Width: | Height: | Size: 990 B |
|
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 56 KiB |
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.8 KiB |
|
Before Width: | Height: | Size: 29 KiB After Width: | Height: | Size: 176 KiB |
|
Before Width: | Height: | Size: 2.6 KiB After Width: | Height: | Size: 5.5 KiB |
|
Before Width: | Height: | Size: 66 KiB After Width: | Height: | Size: 190 KiB |
|
Before Width: | Height: | Size: 66 KiB After Width: | Height: | Size: 68 KiB |
@@ -4,9 +4,9 @@ struct TjLockChip: View {
|
||||
var body: some View {
|
||||
HStack(spacing: 4) {
|
||||
Image(systemName: "lock.fill")
|
||||
.font(.system(size: 9, weight: .semibold))
|
||||
.font(.tjScaled( 9, weight: .semibold))
|
||||
Text("本地加密")
|
||||
.font(.system(size: 10))
|
||||
.font(.tjScaled( 10))
|
||||
.tracking(0.5)
|
||||
}
|
||||
.foregroundStyle(Tj.Palette.paper)
|
||||
@@ -44,7 +44,7 @@ struct TjBadge: View {
|
||||
var style: TjBadgeStyle = .neutral
|
||||
var body: some View {
|
||||
Text(text)
|
||||
.font(.system(size: 10, weight: .semibold))
|
||||
.font(.tjScaled( 10, weight: .semibold))
|
||||
.tracking(0.3)
|
||||
.foregroundStyle(style.fg)
|
||||
.padding(.horizontal, 7)
|
||||
@@ -66,7 +66,7 @@ struct TjPlaceholder: View {
|
||||
DiagonalStripes(spacing: 7, color: dark ? Color.white.opacity(0.04) : Color.black.opacity(0.05))
|
||||
.clipShape(RoundedRectangle(cornerRadius: radius, style: .continuous))
|
||||
Text(label)
|
||||
.font(.system(size: 11, design: .monospaced))
|
||||
.font(.tjScaled( 11, design: .monospaced))
|
||||
.tracking(0.5)
|
||||
.foregroundStyle(dark ? Color.white.opacity(0.5) : Tj.Palette.text3)
|
||||
.multilineTextAlignment(.center)
|
||||
@@ -101,7 +101,7 @@ struct TjPrimaryButton: ButtonStyle {
|
||||
|
||||
func makeBody(configuration: Configuration) -> some View {
|
||||
configuration.label
|
||||
.font(.system(size: fontSize, weight: .semibold))
|
||||
.font(.tjScaled( fontSize, weight: .semibold))
|
||||
.tracking(1)
|
||||
.foregroundStyle(Tj.Palette.paper)
|
||||
.padding(.horizontal, horizontalPadding)
|
||||
@@ -118,7 +118,7 @@ struct TjGhostButton: ButtonStyle {
|
||||
|
||||
func makeBody(configuration: Configuration) -> some View {
|
||||
configuration.label
|
||||
.font(.system(size: fontSize, weight: .semibold))
|
||||
.font(.tjScaled( fontSize, weight: .semibold))
|
||||
.tracking(1)
|
||||
.foregroundStyle(Tj.Palette.ink)
|
||||
.padding(.horizontal, horizontalPadding)
|
||||
|
||||
@@ -39,10 +39,18 @@ enum Tj {
|
||||
}
|
||||
|
||||
extension Font {
|
||||
static func tjTitle(_ size: CGFloat = 30) -> Font { .system(size: size, weight: .bold, design: .default) }
|
||||
static func tjH2(_ size: CGFloat = 18) -> Font { .system(size: size, weight: .bold, design: .default) }
|
||||
static func tjMono(_ size: CGFloat = 11) -> Font { .system(size: size, weight: .regular, design: .monospaced) }
|
||||
static func tjSerifBody(_ size: CGFloat = 17) -> Font { .system(size: size, weight: .regular, design: .default) }
|
||||
/// 全 App 字体的唯一缩放出口。按全局档位 `appFontScale` 放大字号(老年/视力辅助)。
|
||||
/// 所有固定字号都经 `.system(size:)` → 机械迁移为 `.tjScaled(` 走这里;改档位 + 根视图重建即全局生效。
|
||||
static func tjScaled(_ size: CGFloat,
|
||||
weight: Font.Weight = .regular,
|
||||
design: Font.Design = .default) -> Font {
|
||||
.system(size: size * appFontScale, weight: weight, design: design)
|
||||
}
|
||||
|
||||
static func tjTitle(_ size: CGFloat = 30) -> Font { .tjScaled(size, weight: .bold) }
|
||||
static func tjH2(_ size: CGFloat = 18) -> Font { .tjScaled(size, weight: .bold) }
|
||||
static func tjMono(_ size: CGFloat = 11) -> Font { .tjScaled(size, design: .monospaced) }
|
||||
static func tjSerifBody(_ size: CGFloat = 17) -> Font { .tjScaled(size) }
|
||||
}
|
||||
|
||||
extension View {
|
||||
|
||||
@@ -1,61 +0,0 @@
|
||||
import SwiftUI
|
||||
|
||||
private enum ArchiveStep: Hashable {
|
||||
case guide
|
||||
case scan
|
||||
case meta
|
||||
case progress
|
||||
case result
|
||||
}
|
||||
|
||||
struct ArchiveFlow: View {
|
||||
var onClose: () -> Void
|
||||
|
||||
@State private var step: ArchiveStep = .guide
|
||||
@State private var capturedPages: Int = 1
|
||||
@State private var totalPages: Int = 3
|
||||
|
||||
var body: some View {
|
||||
ZStack {
|
||||
switch step {
|
||||
case .guide:
|
||||
B1GuideView(
|
||||
onSingle: { withAnimation { totalPages = 1; step = .scan } },
|
||||
onMulti: { withAnimation { totalPages = 3; step = .scan } },
|
||||
onSkip: onClose
|
||||
)
|
||||
.transition(.opacity)
|
||||
|
||||
case .scan:
|
||||
B2ScanView(
|
||||
onShoot: { capturedPages = min(capturedPages + 1, totalPages) },
|
||||
onDone: { withAnimation { step = .meta } },
|
||||
onClose: onClose,
|
||||
page: capturedPages,
|
||||
total: totalPages
|
||||
)
|
||||
.transition(.opacity)
|
||||
|
||||
case .meta:
|
||||
B3MetaView(
|
||||
onAnalyze: { withAnimation { step = .progress } },
|
||||
onBack: { withAnimation { step = .scan } }
|
||||
)
|
||||
.transition(.opacity)
|
||||
|
||||
case .progress:
|
||||
B4ProgressView(onComplete: {
|
||||
withAnimation { step = .result }
|
||||
})
|
||||
.transition(.opacity)
|
||||
|
||||
case .result:
|
||||
B5ResultView(
|
||||
onSave: onClose,
|
||||
onBack: { withAnimation { step = .meta } }
|
||||
)
|
||||
.transition(.opacity)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -14,8 +14,23 @@ struct ArchiveListView: View {
|
||||
@Query(sort: \Symptom.startedAt, order: .reverse)
|
||||
private var symptoms: [Symptom]
|
||||
|
||||
@Query(sort: \HealthExport.createdAt, order: .reverse)
|
||||
private var exports: [HealthExport]
|
||||
|
||||
@Query(sort: \CustomReminder.updatedAt, order: .reverse)
|
||||
private var customReminders: [CustomReminder]
|
||||
|
||||
@Query(sort: \MetricReminder.updatedAt, order: .reverse)
|
||||
private var metricReminders: [MetricReminder]
|
||||
|
||||
/// 记录页内的 push 目的地。用单个 `navigationDestination(item:)` 驱动——
|
||||
/// 多个 `navigationDestination(isPresented:)` 并存时 SwiftUI 行为未定义(会误触发)。
|
||||
private enum Route: Hashable { case exports, reminders }
|
||||
|
||||
@State private var filter: TimelineKind? = nil
|
||||
@State private var endingSymptom: Symptom?
|
||||
@State private var selectedEntry: TimelineEntry?
|
||||
@State private var route: Route?
|
||||
|
||||
@MainActor
|
||||
private var allEntries: [TimelineEntry] {
|
||||
@@ -35,12 +50,30 @@ struct ArchiveListView: View {
|
||||
private var totalCount: Int { allEntries.count }
|
||||
|
||||
var body: some View {
|
||||
NavigationStack {
|
||||
content
|
||||
.navigationDestination(item: $route) { route in
|
||||
switch route {
|
||||
case .exports: HealthExportListView()
|
||||
case .reminders: RemindersListView()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private var content: some View {
|
||||
VStack(alignment: .leading, spacing: 0) {
|
||||
header
|
||||
.padding(.horizontal, 20)
|
||||
.padding(.top, 8)
|
||||
.padding(.bottom, 14)
|
||||
|
||||
if reminderTotal > 0 {
|
||||
reminderBoard
|
||||
.padding(.horizontal, 20)
|
||||
.padding(.bottom, 14)
|
||||
}
|
||||
|
||||
filterChips
|
||||
.padding(.bottom, 14)
|
||||
|
||||
@@ -71,12 +104,18 @@ struct ArchiveListView: View {
|
||||
.sheet(item: $endingSymptom) { sym in
|
||||
SymptomEndSheet(symptom: sym)
|
||||
}
|
||||
.sheet(item: $selectedEntry) { entry in
|
||||
if let d = detail(for: entry) {
|
||||
TimelineEntryDetailView(detail: d)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ViewBuilder
|
||||
private func rowView(for entry: TimelineEntry) -> some View {
|
||||
if entry.kind == .symptom, entry.isOngoing,
|
||||
let sym = symptoms.first(where: { "symptom-\($0.persistentModelID)" == entry.id }) {
|
||||
// 进行中症状:点 → 标记结束 sheet(沿用原交互)
|
||||
Button {
|
||||
endingSymptom = sym
|
||||
} label: {
|
||||
@@ -84,26 +123,119 @@ struct ArchiveListView: View {
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
} else {
|
||||
TimelineRow(entry: entry)
|
||||
// 其余条目(报告/指标/日记/已结束症状):点 → 只读详情
|
||||
Button {
|
||||
if detail(for: entry) != nil { selectedEntry = entry }
|
||||
} label: {
|
||||
TimelineRow(entry: entry)
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
}
|
||||
}
|
||||
|
||||
/// 把时间线条目反查回源记录。逻辑统一收敛到 `TimelineDetail.resolve`(主页/档案库共用)。
|
||||
private func detail(for entry: TimelineEntry) -> TimelineDetail? {
|
||||
TimelineDetail.resolve(for: entry,
|
||||
indicators: indicators, reports: reports,
|
||||
diaries: diaries, symptoms: symptoms)
|
||||
}
|
||||
|
||||
private var header: some View {
|
||||
HStack(alignment: .lastTextBaseline) {
|
||||
Text("记录")
|
||||
.font(.tjTitle(26))
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
Text(totalCount == 0 ? "" : "\(totalCount) 条")
|
||||
.font(.system(size: 12))
|
||||
Text(totalCount == 0 ? "" : String(appLoc: "\(totalCount) 条"))
|
||||
.font(.tjScaled( 12))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
Spacer()
|
||||
if !exports.isEmpty {
|
||||
Button { route = .exports } label: {
|
||||
HStack(spacing: 6) {
|
||||
Image(systemName: "clock.arrow.circlepath")
|
||||
.font(.tjScaled( 12, weight: .semibold))
|
||||
Text("导出历史")
|
||||
.font(.tjScaled( 13, weight: .semibold))
|
||||
}
|
||||
.foregroundStyle(Tj.Palette.paper)
|
||||
.padding(.horizontal, 12)
|
||||
.padding(.vertical, 7)
|
||||
.background(Capsule().fill(Tj.Palette.ink))
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - 提醒任务汇总卡
|
||||
|
||||
/// 两类提醒(自由 + 指标记录)合计,含已关闭。
|
||||
private var reminderTotal: Int { customReminders.count + metricReminders.count }
|
||||
private var reminderEnabledCount: Int {
|
||||
customReminders.filter(\.enabled).count + metricReminders.filter(\.enabled).count
|
||||
}
|
||||
|
||||
/// 按 updatedAt 倒序合并,取前 3 条标题做预览(标题是用户数据,不本地化)。
|
||||
private var reminderTitlePreview: [String] {
|
||||
let merged: [(title: String, at: Date)] =
|
||||
customReminders.map { ($0.title, $0.updatedAt) } +
|
||||
metricReminders.map { ($0.displayName, $0.updatedAt) }
|
||||
return merged.sorted { $0.at > $1.at }.prefix(3).map(\.title)
|
||||
}
|
||||
|
||||
private var reminderCountLabel: String {
|
||||
reminderEnabledCount == reminderTotal
|
||||
? String(appLoc: "\(reminderTotal) 个提醒任务")
|
||||
: String(appLoc: "\(reminderTotal) 个提醒任务 · \(reminderEnabledCount) 个开启中")
|
||||
}
|
||||
|
||||
private var reminderTitleLine: String {
|
||||
let joined = reminderTitlePreview.joined(separator: " · ")
|
||||
return reminderTotal > reminderTitlePreview.count ? joined + " …" : joined
|
||||
}
|
||||
|
||||
/// 点击进提醒中心(RemindersListView)统一管理;卡片本身只展示。
|
||||
private var reminderBoard: some View {
|
||||
Button { route = .reminders } label: {
|
||||
HStack(spacing: 12) {
|
||||
ZStack {
|
||||
Circle().fill(reminderEnabledCount > 0 ? Tj.Palette.amber.opacity(0.25) : Tj.Palette.sand2)
|
||||
Image(systemName: "bell.fill")
|
||||
.font(.tjScaled( 16))
|
||||
.foregroundStyle(reminderEnabledCount > 0 ? Tj.Palette.ink : Tj.Palette.text3)
|
||||
}
|
||||
.frame(width: 36, height: 36)
|
||||
|
||||
VStack(alignment: .leading, spacing: 2) {
|
||||
Text(reminderCountLabel)
|
||||
.font(.tjScaled( 15, weight: .semibold))
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
.lineLimit(1)
|
||||
if !reminderTitlePreview.isEmpty {
|
||||
Text(reminderTitleLine)
|
||||
.font(.tjScaled( 12))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
.lineLimit(1)
|
||||
}
|
||||
}
|
||||
|
||||
Spacer(minLength: 0)
|
||||
|
||||
Image(systemName: "chevron.right")
|
||||
.font(.tjScaled( 12, weight: .semibold))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
}
|
||||
.padding(14)
|
||||
.contentShape(Rectangle())
|
||||
.tjCard()
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
}
|
||||
|
||||
private var filterChips: some View {
|
||||
ScrollView(.horizontal, showsIndicators: false) {
|
||||
HStack(spacing: 8) {
|
||||
chip(label: "全部", selected: filter == nil) { filter = nil }
|
||||
chip(label: String(appLoc: "全部"), selected: filter == nil) { filter = nil }
|
||||
ForEach(TimelineKind.allCases) { kind in
|
||||
chip(label: kind.label, selected: filter == kind) {
|
||||
filter = filter == kind ? nil : kind
|
||||
@@ -117,7 +249,7 @@ struct ArchiveListView: View {
|
||||
private func chip(label: String, selected: Bool, action: @escaping () -> Void) -> some View {
|
||||
Button(action: action) {
|
||||
Text(label)
|
||||
.font(.system(size: 13, weight: selected ? .semibold : .regular))
|
||||
.font(.tjScaled( 13, weight: selected ? .semibold : .regular))
|
||||
.foregroundStyle(selected ? Tj.Palette.paper : Tj.Palette.text)
|
||||
.padding(.horizontal, 14)
|
||||
.padding(.vertical, 8)
|
||||
@@ -134,14 +266,14 @@ struct ArchiveListView: View {
|
||||
private func sectionHeader(_ section: DateSection, count: Int) -> some View {
|
||||
HStack {
|
||||
Text(section.label)
|
||||
.font(.system(size: 12, weight: .semibold))
|
||||
.font(.tjScaled( 12, weight: .semibold))
|
||||
.tracking(0.5)
|
||||
.foregroundStyle(Tj.Palette.text2)
|
||||
Rectangle()
|
||||
.fill(Tj.Palette.lineSoft)
|
||||
.frame(height: 1)
|
||||
Text("\(count)")
|
||||
.font(.system(size: 11, design: .monospaced))
|
||||
.font(.tjScaled( 11, design: .monospaced))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
}
|
||||
.padding(.horizontal, 20)
|
||||
@@ -152,10 +284,10 @@ struct ArchiveListView: View {
|
||||
private var emptyState: some View {
|
||||
VStack(spacing: 14) {
|
||||
Spacer()
|
||||
TjPlaceholder(label: "还没有任何记录\n点底部 + 号开始")
|
||||
TjPlaceholder(label: String(appLoc: "还没有任何记录\n点底部 + 号开始"))
|
||||
.frame(width: 240, height: 140)
|
||||
Text(filter == nil ? "记录会按时间归类显示" : "这个类别下没有记录")
|
||||
.font(.system(size: 13))
|
||||
Text(filter == nil ? String(appLoc: "记录会按时间归类显示") : String(appLoc: "这个类别下没有记录"))
|
||||
.font(.tjScaled( 13))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
Spacer()
|
||||
}
|
||||
@@ -166,6 +298,8 @@ struct ArchiveListView: View {
|
||||
#Preview {
|
||||
ArchiveListView()
|
||||
.modelContainer(for: [
|
||||
Indicator.self, Report.self, DiaryEntry.self, Symptom.self, Asset.self
|
||||
Indicator.self, Report.self, DiaryEntry.self, Symptom.self, Asset.self,
|
||||
HealthExport.self, ChatTurn.self, UserProfile.self,
|
||||
MetricReminder.self, CustomMonitorMetric.self
|
||||
], inMemory: true)
|
||||
}
|
||||
|
||||
@@ -1,131 +0,0 @@
|
||||
import SwiftUI
|
||||
|
||||
struct B1GuideView: View {
|
||||
var onSingle: () -> Void
|
||||
var onMulti: () -> Void
|
||||
var onSkip: () -> Void
|
||||
|
||||
var body: some View {
|
||||
VStack(spacing: 0) {
|
||||
HStack {
|
||||
Button(action: onSkip) {
|
||||
Image(systemName: "xmark")
|
||||
.font(.system(size: 18, weight: .semibold))
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
.frame(width: 36, height: 36)
|
||||
}
|
||||
Spacer()
|
||||
Button(action: onSkip) {
|
||||
Text("跳过")
|
||||
.font(.system(size: 12))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
.padding(8)
|
||||
}
|
||||
}
|
||||
.padding(.horizontal, 12)
|
||||
|
||||
VStack(alignment: .leading, spacing: 0) {
|
||||
ZStack {
|
||||
RoundedRectangle(cornerRadius: Tj.Radius.md, style: .continuous)
|
||||
.fill(Tj.Palette.ink)
|
||||
Image(systemName: "doc.text.fill")
|
||||
.font(.system(size: 26, weight: .medium))
|
||||
.foregroundStyle(Tj.Palette.paper)
|
||||
}
|
||||
.frame(width: 60, height: 60)
|
||||
.padding(.bottom, 18)
|
||||
|
||||
Text("归档一份\n关键报告")
|
||||
.font(.system(size: 30, weight: .bold))
|
||||
.lineSpacing(6)
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
.padding(.bottom, 12)
|
||||
|
||||
Text("推荐拍清晰的\(Text("整张图").underline()),多页报告可一次完成扫描。原图与解读全部本地加密保存,永不上传。")
|
||||
.font(.system(size: 13))
|
||||
.foregroundStyle(Tj.Palette.text2)
|
||||
.lineSpacing(6)
|
||||
.padding(.bottom, 26)
|
||||
|
||||
VStack(spacing: 12) {
|
||||
OptCard(title: "单张报告", sub: "一张图,几秒搞定", hint: "化验单 · 处方", badge: nil, action: onSingle)
|
||||
OptCard(title: "多页报告", sub: "像扫描文档一样翻页拍摄", hint: "体检报告 · 影像报告", badge: "推荐", action: onMulti)
|
||||
}
|
||||
|
||||
Spacer(minLength: 18)
|
||||
|
||||
HStack(alignment: .top, spacing: 10) {
|
||||
Image(systemName: "lock.fill")
|
||||
.font(.system(size: 12))
|
||||
.foregroundStyle(Tj.Palette.text2)
|
||||
.padding(.top, 2)
|
||||
Text("所有照片以 AES 加密存于本机沙盒。康康 服务端无法访问。")
|
||||
.font(.system(size: 11))
|
||||
.foregroundStyle(Tj.Palette.text2)
|
||||
.lineSpacing(4)
|
||||
.frame(maxWidth: .infinity, alignment: .leading)
|
||||
}
|
||||
.padding(12)
|
||||
.background(
|
||||
RoundedRectangle(cornerRadius: Tj.Radius.sm, style: .continuous)
|
||||
.fill(Tj.Palette.sand2)
|
||||
)
|
||||
}
|
||||
.padding(.horizontal, 24)
|
||||
.padding(.top, 20)
|
||||
.padding(.bottom, 20)
|
||||
}
|
||||
.background(Tj.Palette.sand.ignoresSafeArea())
|
||||
}
|
||||
}
|
||||
|
||||
private struct OptCard: View {
|
||||
let title: String
|
||||
let sub: String
|
||||
let hint: String
|
||||
let badge: String?
|
||||
let action: () -> Void
|
||||
|
||||
var body: some View {
|
||||
Button(action: action) {
|
||||
HStack(spacing: 14) {
|
||||
ZStack {
|
||||
RoundedRectangle(cornerRadius: Tj.Radius.sm, style: .continuous)
|
||||
.fill(Tj.Palette.sand2)
|
||||
Image(systemName: "doc.text")
|
||||
.font(.system(size: 18, weight: .regular))
|
||||
.foregroundStyle(Tj.Palette.ink)
|
||||
}
|
||||
.frame(width: 44, height: 44)
|
||||
VStack(alignment: .leading, spacing: 3) {
|
||||
HStack(spacing: 8) {
|
||||
Text(title)
|
||||
.font(.system(size: 15, weight: .semibold))
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
if let badge {
|
||||
TjBadge(text: badge, style: .ink)
|
||||
}
|
||||
}
|
||||
Text("\(sub) · \(hint)")
|
||||
.font(.system(size: 11))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
}
|
||||
Spacer()
|
||||
Image(systemName: "chevron.right")
|
||||
.font(.system(size: 14, weight: .medium))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
}
|
||||
.padding(16)
|
||||
.tjCard(bordered: true)
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
}
|
||||
}
|
||||
|
||||
#Preview {
|
||||
B1GuideView(
|
||||
onSingle: { print("单张报告") },
|
||||
onMulti: { print("多页报告") },
|
||||
onSkip: { print("跳过") }
|
||||
)
|
||||
}
|
||||
@@ -1,198 +0,0 @@
|
||||
import SwiftUI
|
||||
|
||||
struct B2ScanView: View {
|
||||
var onShoot: () -> Void
|
||||
var onDone: () -> Void
|
||||
var onClose: () -> Void
|
||||
var page: Int = 2
|
||||
var total: Int = 3
|
||||
|
||||
var body: some View {
|
||||
ZStack {
|
||||
Color(red: 0.04, green: 0.047, blue: 0.04).ignoresSafeArea()
|
||||
|
||||
mockPaper
|
||||
|
||||
DetectedEdge()
|
||||
.stroke(Color(red: 0.95, green: 0.78, blue: 0.45),
|
||||
style: StrokeStyle(lineWidth: 2, dash: [6, 4]))
|
||||
.opacity(0.95)
|
||||
.padding(.horizontal, 30)
|
||||
.padding(.top, 140)
|
||||
.padding(.bottom, 200)
|
||||
.allowsHitTesting(false)
|
||||
|
||||
VStack(spacing: 0) {
|
||||
topBar
|
||||
Spacer()
|
||||
detectedBadge
|
||||
Spacer()
|
||||
thumbnails
|
||||
bottomControls
|
||||
}
|
||||
}
|
||||
.preferredColorScheme(.dark)
|
||||
}
|
||||
|
||||
private var mockPaper: some View {
|
||||
VStack(spacing: 2) {
|
||||
Text("体 检 报 告 (第 \(page) 页)")
|
||||
.font(.system(size: 12, weight: .bold))
|
||||
.padding(.bottom, 4)
|
||||
ForEach(reportRows, id: \.0) { row in
|
||||
HStack {
|
||||
Text(row.0).frame(maxWidth: .infinity, alignment: .leading)
|
||||
Text(row.1)
|
||||
Text(row.2).foregroundStyle(Tj.Palette.text3)
|
||||
}
|
||||
.font(.system(size: 9, design: .monospaced))
|
||||
}
|
||||
}
|
||||
.padding(16)
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
.frame(maxWidth: .infinity)
|
||||
.background(Color(red: 0.97, green: 0.95, blue: 0.89).opacity(0.95))
|
||||
.clipShape(RoundedRectangle(cornerRadius: 4, style: .continuous))
|
||||
.rotation3DEffect(.degrees(8), axis: (x: 1, y: 0, z: 0))
|
||||
.rotationEffect(.degrees(-1))
|
||||
.shadow(color: .black.opacity(0.6), radius: 20, x: 0, y: 12)
|
||||
.padding(.horizontal, 40)
|
||||
.padding(.top, 160)
|
||||
.padding(.bottom, 220)
|
||||
}
|
||||
|
||||
private var reportRows: [(String, String, String)] {
|
||||
[
|
||||
("总胆固醇", "5.42", "3.10–5.18"),
|
||||
("甘油三酯", "1.78", "0.45–1.70"),
|
||||
("低密度脂蛋白", "3.84↑", "<3.40"),
|
||||
("高密度脂蛋白", "1.21", ">1.04"),
|
||||
("载脂蛋白 A1", "1.42", "1.00–1.60"),
|
||||
("载脂蛋白 B", "1.04", "0.55–1.05"),
|
||||
("谷丙转氨酶", "28", "9–50"),
|
||||
("谷草转氨酶", "24", "15–40"),
|
||||
("空腹血糖", "5.4", "3.9–6.1"),
|
||||
("糖化血红蛋白", "5.7", "4.0–6.0"),
|
||||
]
|
||||
}
|
||||
|
||||
private var topBar: some View {
|
||||
HStack {
|
||||
Button(action: onClose) {
|
||||
Image(systemName: "xmark")
|
||||
.font(.system(size: 18, weight: .semibold))
|
||||
.foregroundStyle(Color.white)
|
||||
.frame(width: 36, height: 36)
|
||||
}
|
||||
Spacer()
|
||||
HStack(spacing: 4) {
|
||||
Text("\(page)").font(.system(size: 12, design: .monospaced))
|
||||
Text(" / \(total) · 像扫描文档一样对准")
|
||||
.font(.system(size: 12))
|
||||
}
|
||||
.foregroundStyle(Color.white)
|
||||
.padding(.horizontal, 14)
|
||||
.padding(.vertical, 6)
|
||||
.background(Capsule().fill(Color(red: 0.08, green: 0.11, blue: 0.094).opacity(0.7)))
|
||||
Spacer()
|
||||
Color.clear.frame(width: 36, height: 36)
|
||||
}
|
||||
.padding(.horizontal, 6)
|
||||
.padding(.top, 50)
|
||||
}
|
||||
|
||||
private var detectedBadge: some View {
|
||||
Text("已识别边框 · 将自动透视校正")
|
||||
.font(.system(size: 10, weight: .semibold))
|
||||
.tracking(0.4)
|
||||
.foregroundStyle(Color(red: 0.10, green: 0.115, blue: 0.094))
|
||||
.padding(.horizontal, 8)
|
||||
.padding(.vertical, 3)
|
||||
.background(Capsule().fill(Color(red: 0.95, green: 0.78, blue: 0.45)))
|
||||
.padding(.top, 140)
|
||||
}
|
||||
|
||||
private var thumbnails: some View {
|
||||
HStack {
|
||||
PageThumbStack(index: 1)
|
||||
Spacer()
|
||||
Text("已拍 1 页")
|
||||
.font(.system(size: 11, design: .monospaced))
|
||||
.foregroundStyle(Color.white.opacity(0.7))
|
||||
}
|
||||
.padding(.horizontal, 18)
|
||||
.padding(.bottom, 24)
|
||||
}
|
||||
|
||||
private var bottomControls: some View {
|
||||
HStack {
|
||||
Color.clear.frame(width: 60, height: 60)
|
||||
Spacer()
|
||||
Button(action: onShoot) {
|
||||
ZStack {
|
||||
Circle().fill(Tj.Palette.paper)
|
||||
Circle().strokeBorder(Color.white.opacity(0.4), lineWidth: 4)
|
||||
}
|
||||
.frame(width: 72, height: 72)
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
Spacer()
|
||||
Button(action: onDone) {
|
||||
Text("完成")
|
||||
.font(.system(size: 14, weight: .semibold))
|
||||
.foregroundStyle(Tj.Palette.paper)
|
||||
.padding(.horizontal, 16)
|
||||
.padding(.vertical, 10)
|
||||
.background(Capsule().fill(Color.white.opacity(0.1)))
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
}
|
||||
.padding(.horizontal, 32)
|
||||
.padding(.bottom, 40)
|
||||
}
|
||||
}
|
||||
|
||||
private struct DetectedEdge: Shape {
|
||||
func path(in rect: CGRect) -> Path {
|
||||
var p = Path()
|
||||
let w = rect.width
|
||||
let h = rect.height
|
||||
p.move(to: CGPoint(x: w * 0.04, y: h * 0.05))
|
||||
p.addLine(to: CGPoint(x: w * 0.92, y: h * 0.02))
|
||||
p.addLine(to: CGPoint(x: w * 0.96, y: h * 0.96))
|
||||
p.addLine(to: CGPoint(x: 0, y: h * 1.0))
|
||||
p.closeSubpath()
|
||||
return p
|
||||
}
|
||||
}
|
||||
|
||||
struct PageThumbStack: View {
|
||||
let index: Int
|
||||
|
||||
var body: some View {
|
||||
ZStack {
|
||||
RoundedRectangle(cornerRadius: 4, style: .continuous)
|
||||
.fill(Color(red: 0.96, green: 0.93, blue: 0.87).opacity(0.7))
|
||||
.frame(width: 56, height: 76)
|
||||
.rotationEffect(.degrees(2))
|
||||
.offset(x: 4, y: 4)
|
||||
.shadow(color: .black.opacity(0.3), radius: 3, x: 0, y: 2)
|
||||
RoundedRectangle(cornerRadius: 4, style: .continuous)
|
||||
.fill(Color(red: 0.97, green: 0.95, blue: 0.89).opacity(0.85))
|
||||
.frame(width: 56, height: 76)
|
||||
.rotationEffect(.degrees(-1))
|
||||
.offset(x: 2, y: 2)
|
||||
.shadow(color: .black.opacity(0.3), radius: 3, x: 0, y: 2)
|
||||
RoundedRectangle(cornerRadius: 4, style: .continuous)
|
||||
.fill(Tj.Palette.paper)
|
||||
.frame(width: 56, height: 76)
|
||||
.overlay(
|
||||
Text("p.\(index)")
|
||||
.font(.system(size: 10, design: .monospaced))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
)
|
||||
.shadow(color: .black.opacity(0.4), radius: 4, x: 0, y: 2)
|
||||
}
|
||||
.frame(width: 64, height: 84, alignment: .topLeading)
|
||||
}
|
||||
}
|
||||
@@ -1,137 +0,0 @@
|
||||
import SwiftUI
|
||||
|
||||
struct B3MetaView: View {
|
||||
var onAnalyze: () -> Void
|
||||
var onBack: () -> Void
|
||||
|
||||
@State private var selectedType = 0
|
||||
private let types = ["体检报告", "化验单", "影像报告", "处方", "其他"]
|
||||
|
||||
var body: some View {
|
||||
VStack(spacing: 0) {
|
||||
header
|
||||
ScrollView(showsIndicators: false) {
|
||||
VStack(alignment: .leading, spacing: 0) {
|
||||
Text("报告类型")
|
||||
.font(.system(size: 11))
|
||||
.tracking(0.5)
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
.padding(.bottom, 8)
|
||||
|
||||
typeChips.padding(.bottom, 20)
|
||||
|
||||
FormRow(label: "报告日期", value: "2026 / 05 / 25", subtle: false)
|
||||
FormRow(label: "出具机构", value: "协和医院体检中心", subtle: true)
|
||||
FormRow(label: "备注", value: "春季年度体检", subtle: true)
|
||||
|
||||
Text("已拍页面(3 页)")
|
||||
.font(.system(size: 11))
|
||||
.tracking(0.5)
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
.padding(.top, 20)
|
||||
.padding(.bottom, 10)
|
||||
|
||||
HStack(spacing: 10) {
|
||||
ForEach(1...3, id: \.self) { n in
|
||||
PageCard(index: n)
|
||||
}
|
||||
}
|
||||
}
|
||||
.padding(.horizontal, 18)
|
||||
.padding(.bottom, 18)
|
||||
}
|
||||
|
||||
VStack(spacing: 8) {
|
||||
Button(action: onAnalyze) {
|
||||
Text("开始 AI 解读").frame(maxWidth: .infinity)
|
||||
}
|
||||
.buttonStyle(TjPrimaryButton())
|
||||
|
||||
Text("预计耗时 5–8 秒 · 端侧 SME2 加速")
|
||||
.font(.system(size: 11))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
}
|
||||
.padding(.horizontal, 18)
|
||||
.padding(.bottom, 14)
|
||||
}
|
||||
.background(Tj.Palette.sand.ignoresSafeArea())
|
||||
}
|
||||
|
||||
private var header: some View {
|
||||
HStack(spacing: 6) {
|
||||
Button(action: onBack) {
|
||||
Image(systemName: "chevron.left")
|
||||
.font(.system(size: 18, weight: .semibold))
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
.frame(width: 36, height: 36)
|
||||
}
|
||||
Text("归档信息")
|
||||
.font(.system(size: 15, weight: .semibold))
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
Spacer()
|
||||
}
|
||||
.padding(.horizontal, 12)
|
||||
.padding(.top, 4)
|
||||
.padding(.bottom, 8)
|
||||
}
|
||||
|
||||
private var typeChips: some View {
|
||||
let columns = [GridItem(.adaptive(minimum: 60, maximum: 200), spacing: 8)]
|
||||
return LazyVGrid(columns: columns, alignment: .leading, spacing: 8) {
|
||||
ForEach(Array(types.enumerated()), id: \.offset) { idx, t in
|
||||
Button { selectedType = idx } label: {
|
||||
Text(t)
|
||||
.font(.system(size: 12, weight: .medium))
|
||||
.foregroundStyle(idx == selectedType ? Tj.Palette.paper : Tj.Palette.text2)
|
||||
.padding(.horizontal, 12)
|
||||
.padding(.vertical, 6)
|
||||
.background(
|
||||
Capsule().fill(idx == selectedType ? Tj.Palette.ink : Tj.Palette.sand2)
|
||||
)
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private struct FormRow: View {
|
||||
let label: String
|
||||
let value: String
|
||||
let subtle: Bool
|
||||
|
||||
var body: some View {
|
||||
HStack {
|
||||
Text(label).font(.system(size: 13)).foregroundStyle(Tj.Palette.text2)
|
||||
Spacer()
|
||||
HStack(spacing: 6) {
|
||||
Text(value)
|
||||
.font(.system(size: 13))
|
||||
.foregroundStyle(subtle ? Tj.Palette.text3 : Tj.Palette.text)
|
||||
Image(systemName: "chevron.right")
|
||||
.font(.system(size: 11, weight: .medium))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
}
|
||||
}
|
||||
.padding(.vertical, 12)
|
||||
.overlay(alignment: .top) {
|
||||
Rectangle().fill(Tj.Palette.lineSoft).frame(height: 1)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private struct PageCard: View {
|
||||
let index: Int
|
||||
|
||||
var body: some View {
|
||||
ZStack {
|
||||
RoundedRectangle(cornerRadius: Tj.Radius.sm, style: .continuous)
|
||||
.fill(Tj.Palette.paper)
|
||||
.shadow(color: Color(red: 0.196, green: 0.157, blue: 0.098).opacity(0.06),
|
||||
radius: 2, x: 0, y: 1)
|
||||
TjPlaceholder(label: "p.\(index)", radius: 4)
|
||||
.padding(6)
|
||||
}
|
||||
.aspectRatio(0.72, contentMode: .fit)
|
||||
}
|
||||
}
|
||||
@@ -1,293 +0,0 @@
|
||||
import SwiftUI
|
||||
|
||||
struct B4ProgressView: View {
|
||||
var onComplete: () -> Void
|
||||
|
||||
@State private var step: Int = 1
|
||||
@State private var pulse = false
|
||||
@State private var glow = false
|
||||
@State private var rotate: Double = 0
|
||||
@State private var elapsed: Double = 0.2
|
||||
|
||||
private let lineLabels = [
|
||||
"正在本地识别第 1 / 3 页…",
|
||||
"正在本地识别第 2 / 3 页…",
|
||||
"正在本地识别第 3 / 3 页…",
|
||||
"提取指标 · 共 28 项",
|
||||
"生成整体摘要…",
|
||||
]
|
||||
|
||||
var body: some View {
|
||||
ZStack {
|
||||
backgroundGradient.ignoresSafeArea()
|
||||
|
||||
VStack(spacing: 0) {
|
||||
Spacer()
|
||||
chip.padding(.bottom, 36)
|
||||
|
||||
Text("本地 AI · 正在解读")
|
||||
.font(.system(size: 22, weight: .semibold))
|
||||
.tracking(1)
|
||||
.foregroundStyle(Color.white.opacity(0.95))
|
||||
.padding(.bottom, 6)
|
||||
|
||||
Text("QWEN2.5-VL · ON-DEVICE · SME2")
|
||||
.font(.system(size: 11, design: .monospaced))
|
||||
.tracking(0.5)
|
||||
.foregroundStyle(Color.white.opacity(0.55))
|
||||
.padding(.bottom, 30)
|
||||
|
||||
lineList
|
||||
.padding(.horizontal, 28)
|
||||
|
||||
speedBadge.padding(.top, 32)
|
||||
Spacer()
|
||||
|
||||
Text("本地处理中 · 不会上传任何内容")
|
||||
.font(.system(size: 10, design: .monospaced))
|
||||
.tracking(0.5)
|
||||
.foregroundStyle(Color.white.opacity(0.45))
|
||||
.padding(.bottom, 30)
|
||||
}
|
||||
.padding(.horizontal, 28)
|
||||
}
|
||||
.preferredColorScheme(.dark)
|
||||
.onAppear { startAnimations() }
|
||||
}
|
||||
|
||||
private var backgroundGradient: some View {
|
||||
RadialGradient(
|
||||
colors: [
|
||||
Color(red: 0.22, green: 0.21, blue: 0.18),
|
||||
Color(red: 0.13, green: 0.12, blue: 0.10),
|
||||
Color(red: 0.08, green: 0.075, blue: 0.06),
|
||||
],
|
||||
center: .init(x: 0.5, y: 0.3),
|
||||
startRadius: 60,
|
||||
endRadius: 700
|
||||
)
|
||||
}
|
||||
|
||||
private var chip: some View {
|
||||
ZStack {
|
||||
Circle()
|
||||
.fill(Color(red: 0.93, green: 0.75, blue: 0.40).opacity(glow ? 0.18 : 0.0))
|
||||
.frame(width: 176, height: 176)
|
||||
.blur(radius: 30)
|
||||
|
||||
Circle()
|
||||
.strokeBorder(Color.white.opacity(0.18),
|
||||
style: StrokeStyle(lineWidth: 1, dash: [4, 4]))
|
||||
.frame(width: 140, height: 140)
|
||||
.rotationEffect(.degrees(rotate))
|
||||
|
||||
RoundedRectangle(cornerRadius: 22, style: .continuous)
|
||||
.fill(
|
||||
LinearGradient(
|
||||
colors: [Color(red: 0.36, green: 0.34, blue: 0.30),
|
||||
Color(red: 0.22, green: 0.21, blue: 0.18)],
|
||||
startPoint: .topLeading, endPoint: .bottomTrailing
|
||||
)
|
||||
)
|
||||
.overlay(
|
||||
RoundedRectangle(cornerRadius: 22, style: .continuous)
|
||||
.strokeBorder(Color.white.opacity(0.10), lineWidth: 1)
|
||||
)
|
||||
.frame(width: 96, height: 96)
|
||||
.shadow(color: .black.opacity(0.4), radius: 20, x: 0, y: 12)
|
||||
.overlay(ChipGlyph())
|
||||
.overlay(alignment: .topTrailing) {
|
||||
Circle()
|
||||
.fill(Color(red: 0.95, green: 0.78, blue: 0.40))
|
||||
.frame(width: 6, height: 6)
|
||||
.opacity(pulse ? 1 : 0.35)
|
||||
.shadow(color: Color(red: 0.95, green: 0.78, blue: 0.40), radius: 6)
|
||||
.padding(10)
|
||||
}
|
||||
.scaleEffect(pulse ? 1.06 : 1.0)
|
||||
.opacity(pulse ? 0.92 : 1.0)
|
||||
}
|
||||
}
|
||||
|
||||
private var lineList: some View {
|
||||
VStack(alignment: .leading, spacing: 10) {
|
||||
ForEach(Array(lineLabels.enumerated()), id: \.offset) { idx, label in
|
||||
LineRow(
|
||||
text: label,
|
||||
done: step > idx + 1,
|
||||
active: step == idx + 1,
|
||||
isLast: idx == lineLabels.count - 1
|
||||
)
|
||||
.opacity(step >= idx + 1 ? 1 : 0)
|
||||
.offset(y: step >= idx + 1 ? 0 : 6)
|
||||
.animation(.easeOut(duration: 0.4).delay(Double(idx) * 0.05), value: step)
|
||||
}
|
||||
}
|
||||
.frame(maxWidth: .infinity, alignment: .leading)
|
||||
}
|
||||
|
||||
private var speedBadge: some View {
|
||||
Text(String(format: "已处理 %.1fs · 比云端快 4.2×", elapsed))
|
||||
.font(.system(size: 10, design: .monospaced))
|
||||
.tracking(0.6)
|
||||
.foregroundStyle(Color.white.opacity(0.75))
|
||||
.padding(.horizontal, 12)
|
||||
.padding(.vertical, 6)
|
||||
.background(Capsule().fill(Color.white.opacity(0.08)))
|
||||
}
|
||||
|
||||
private func startAnimations() {
|
||||
withAnimation(.easeInOut(duration: 2.0).repeatForever(autoreverses: true)) {
|
||||
pulse.toggle()
|
||||
}
|
||||
withAnimation(.easeInOut(duration: 2.4).repeatForever(autoreverses: true)) {
|
||||
glow.toggle()
|
||||
}
|
||||
withAnimation(.linear(duration: 14).repeatForever(autoreverses: false)) {
|
||||
rotate = 360
|
||||
}
|
||||
|
||||
Task {
|
||||
for _ in 0..<lineLabels.count {
|
||||
try? await Task.sleep(nanoseconds: 900_000_000)
|
||||
await MainActor.run {
|
||||
withAnimation { step += 1 }
|
||||
elapsed += 0.9
|
||||
}
|
||||
}
|
||||
try? await Task.sleep(nanoseconds: 600_000_000)
|
||||
await MainActor.run { onComplete() }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private struct LineRow: View {
|
||||
let text: String
|
||||
let done: Bool
|
||||
let active: Bool
|
||||
let isLast: Bool
|
||||
|
||||
@State private var dotPulse = false
|
||||
|
||||
var body: some View {
|
||||
HStack(spacing: 10) {
|
||||
ZStack {
|
||||
Circle()
|
||||
.fill(done
|
||||
? Color(red: 0.95, green: 0.78, blue: 0.40)
|
||||
: Color.white.opacity(0.12))
|
||||
if done {
|
||||
Image(systemName: "checkmark")
|
||||
.font(.system(size: 8, weight: .bold))
|
||||
.foregroundStyle(Color(red: 0.10, green: 0.115, blue: 0.094))
|
||||
}
|
||||
}
|
||||
.frame(width: 14, height: 14)
|
||||
|
||||
Text(text)
|
||||
.font(.system(size: 13))
|
||||
.foregroundStyle(done ? Color.white.opacity(0.95) : Color.white.opacity(0.45))
|
||||
|
||||
if active {
|
||||
Spacer()
|
||||
Text("···")
|
||||
.font(.system(size: 10, design: .monospaced))
|
||||
.foregroundStyle(Color.white.opacity(dotPulse ? 0.9 : 0.4))
|
||||
.onAppear {
|
||||
withAnimation(.easeInOut(duration: 1.0).repeatForever(autoreverses: true)) {
|
||||
dotPulse.toggle()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private struct ChipGlyph: View {
|
||||
var body: some View {
|
||||
ZStack {
|
||||
RoundedRectangle(cornerRadius: 5, style: .continuous)
|
||||
.strokeBorder(Color.white.opacity(0.8), lineWidth: 1.4)
|
||||
.frame(width: 28, height: 28)
|
||||
|
||||
RoundedRectangle(cornerRadius: 2, style: .continuous)
|
||||
.fill(Color(red: 0.95, green: 0.78, blue: 0.40).opacity(0.35))
|
||||
.overlay(
|
||||
RoundedRectangle(cornerRadius: 2, style: .continuous)
|
||||
.strokeBorder(Color(red: 0.95, green: 0.78, blue: 0.40), lineWidth: 1)
|
||||
)
|
||||
.frame(width: 16, height: 16)
|
||||
|
||||
innerCross
|
||||
outerPins
|
||||
}
|
||||
.frame(width: 56, height: 56)
|
||||
}
|
||||
|
||||
private var innerCross: some View {
|
||||
Canvas { ctx, size in
|
||||
let amber = Color(red: 0.95, green: 0.78, blue: 0.40)
|
||||
let stroke = GraphicsContext.Shading.color(amber)
|
||||
let cx = size.width / 2
|
||||
let cy = size.height / 2
|
||||
|
||||
let pairs: [(CGPoint, CGPoint)] = [
|
||||
(CGPoint(x: cx, y: cy - 8), CGPoint(x: cx, y: cy - 4)),
|
||||
(CGPoint(x: cx, y: cy + 4), CGPoint(x: cx, y: cy + 8)),
|
||||
(CGPoint(x: cx - 8, y: cy), CGPoint(x: cx - 4, y: cy)),
|
||||
(CGPoint(x: cx + 4, y: cy), CGPoint(x: cx + 8, y: cy)),
|
||||
]
|
||||
for (s, e) in pairs {
|
||||
var p = Path()
|
||||
p.move(to: s)
|
||||
p.addLine(to: e)
|
||||
ctx.stroke(p, with: stroke, style: StrokeStyle(lineWidth: 1, lineCap: .round))
|
||||
}
|
||||
}
|
||||
.frame(width: 56, height: 56)
|
||||
}
|
||||
|
||||
private var outerPins: some View {
|
||||
Canvas { ctx, size in
|
||||
let pinColor = GraphicsContext.Shading.color(Color.white.opacity(0.45))
|
||||
let cx = size.width / 2
|
||||
let cy = size.height / 2
|
||||
let halfChip: CGFloat = 14
|
||||
let outsideStart: CGFloat = 20
|
||||
let outsideEnd: CGFloat = 26
|
||||
|
||||
let positions: [CGFloat] = [-8, 0, 8]
|
||||
|
||||
for offset in positions {
|
||||
// top
|
||||
var p = Path()
|
||||
p.move(to: CGPoint(x: cx + offset, y: cy - outsideEnd))
|
||||
p.addLine(to: CGPoint(x: cx + offset, y: cy - halfChip))
|
||||
ctx.stroke(p, with: pinColor, style: StrokeStyle(lineWidth: 1, lineCap: .round))
|
||||
|
||||
// bottom
|
||||
p = Path()
|
||||
p.move(to: CGPoint(x: cx + offset, y: cy + halfChip))
|
||||
p.addLine(to: CGPoint(x: cx + offset, y: cy + outsideEnd))
|
||||
ctx.stroke(p, with: pinColor, style: StrokeStyle(lineWidth: 1, lineCap: .round))
|
||||
|
||||
// left
|
||||
p = Path()
|
||||
p.move(to: CGPoint(x: cx - outsideEnd, y: cy + offset))
|
||||
p.addLine(to: CGPoint(x: cx - halfChip, y: cy + offset))
|
||||
ctx.stroke(p, with: pinColor, style: StrokeStyle(lineWidth: 1, lineCap: .round))
|
||||
|
||||
// right
|
||||
p = Path()
|
||||
p.move(to: CGPoint(x: cx + halfChip, y: cy + offset))
|
||||
p.addLine(to: CGPoint(x: cx + outsideStart + 2, y: cy + offset))
|
||||
ctx.stroke(p, with: pinColor, style: StrokeStyle(lineWidth: 1, lineCap: .round))
|
||||
}
|
||||
}
|
||||
.frame(width: 56, height: 56)
|
||||
}
|
||||
}
|
||||
|
||||
#Preview {
|
||||
B4ProgressView(onComplete: {})
|
||||
}
|
||||
@@ -1,323 +0,0 @@
|
||||
import SwiftUI
|
||||
|
||||
struct B5IndicatorData {
|
||||
let name: String
|
||||
let value: String
|
||||
let unit: String
|
||||
let range: String
|
||||
let status: IndicatorStatus
|
||||
let note: String?
|
||||
}
|
||||
|
||||
struct B5ResultView: View {
|
||||
var onSave: () -> Void
|
||||
var onBack: () -> Void
|
||||
|
||||
@State private var expandedIndex: Int? = 0
|
||||
@State private var normalsExpanded = false
|
||||
|
||||
let abnormal: [B5IndicatorData] = [
|
||||
.init(name: "低密度脂蛋白胆固醇", value: "3.84", unit: "mmol/L", range: "< 3.40", status: .high,
|
||||
note: "超过参考上限 0.44。建议关注饮食结构,3 个月内复查。"),
|
||||
.init(name: "甘油三酯 TG", value: "1.78", unit: "mmol/L", range: "0.45–1.70", status: .high, note: nil),
|
||||
.init(name: "尿酸 UA", value: "428", unit: "μmol/L", range: "150–420", status: .high, note: nil),
|
||||
.init(name: "维生素 D", value: "18", unit: "ng/mL", range: "30–100", status: .low, note: nil),
|
||||
]
|
||||
let normalCount = 24
|
||||
|
||||
var body: some View {
|
||||
VStack(spacing: 0) {
|
||||
header
|
||||
|
||||
ScrollView(showsIndicators: false) {
|
||||
VStack(alignment: .leading, spacing: 0) {
|
||||
reportMeta.padding(.bottom, 16)
|
||||
summaryCard.padding(.bottom, 18)
|
||||
SectionLabel("异常项", count: abnormal.count, accent: .brick)
|
||||
.padding(.bottom, 10)
|
||||
VStack(spacing: 8) {
|
||||
ForEach(Array(abnormal.enumerated()), id: \.offset) { idx, it in
|
||||
IndicatorRow(item: it, expanded: expandedIndex == idx) {
|
||||
withAnimation { expandedIndex = (expandedIndex == idx) ? nil : idx }
|
||||
}
|
||||
}
|
||||
}
|
||||
.padding(.bottom, 18)
|
||||
|
||||
SectionLabel("正常项", count: normalCount, accent: .leaf)
|
||||
.padding(.bottom, 10)
|
||||
normalCollapsed
|
||||
}
|
||||
.padding(.horizontal, 18)
|
||||
.padding(.bottom, 16)
|
||||
}
|
||||
|
||||
HStack(spacing: 10) {
|
||||
Button(action: onSave) {
|
||||
Text("保存归档").frame(maxWidth: .infinity)
|
||||
}
|
||||
.buttonStyle(TjPrimaryButton())
|
||||
|
||||
Button { } label: {
|
||||
Image(systemName: "square.and.arrow.up")
|
||||
.font(.system(size: 16, weight: .semibold))
|
||||
}
|
||||
.buttonStyle(TjGhostButton(horizontalPadding: 16))
|
||||
}
|
||||
.padding(.horizontal, 18)
|
||||
.padding(.bottom, 14)
|
||||
.padding(.top, 10)
|
||||
}
|
||||
.background(Tj.Palette.sand.ignoresSafeArea())
|
||||
}
|
||||
|
||||
private var header: some View {
|
||||
HStack(spacing: 6) {
|
||||
Button(action: onBack) {
|
||||
Image(systemName: "chevron.left")
|
||||
.font(.system(size: 18, weight: .semibold))
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
.frame(width: 36, height: 36)
|
||||
}
|
||||
Spacer()
|
||||
Button { } label: {
|
||||
HStack(spacing: 4) {
|
||||
Image(systemName: "photo")
|
||||
Text("查看原图")
|
||||
}
|
||||
.font(.system(size: 12))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
.padding(8)
|
||||
}
|
||||
}
|
||||
.padding(.horizontal, 12)
|
||||
.padding(.top, 4)
|
||||
}
|
||||
|
||||
private var reportMeta: some View {
|
||||
VStack(alignment: .leading, spacing: 6) {
|
||||
HStack(spacing: 8) {
|
||||
TjBadge(text: "体检报告", style: .ink)
|
||||
Text("3 页")
|
||||
.font(.system(size: 11))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
Spacer()
|
||||
TjLockChip()
|
||||
}
|
||||
Text("2026 春季年度体检")
|
||||
.font(.system(size: 22, weight: .bold))
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
Text("2026 / 05 / 25 · 协和医院体检中心")
|
||||
.font(.system(size: 12))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
}
|
||||
}
|
||||
|
||||
private var summaryCard: some View {
|
||||
VStack(alignment: .leading, spacing: 0) {
|
||||
HStack(spacing: 10) {
|
||||
Text("整体摘记")
|
||||
.font(.system(size: 12, weight: .semibold))
|
||||
.tracking(0.3)
|
||||
.foregroundStyle(Tj.Palette.brick)
|
||||
.fixedSize()
|
||||
Rectangle().fill(Tj.Palette.line).frame(height: 1)
|
||||
Text("本机摘要")
|
||||
.font(.system(size: 11))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
.fixedSize()
|
||||
}
|
||||
.padding(.bottom, 12)
|
||||
|
||||
HStack(spacing: 14) {
|
||||
Stat(n: "28", label: "总项")
|
||||
Stat(n: "3", label: "偏高", tone: .brick)
|
||||
Stat(n: "1", label: "偏低", tone: .amber)
|
||||
Stat(n: "24", label: "正常", tone: .leaf)
|
||||
}
|
||||
.padding(.bottom, 14)
|
||||
|
||||
Text("本次共检测 28 项,\(Text("3 项偏高").fontWeight(.semibold).underline(color: Tj.Palette.brick))(血脂相关 2 项 + 尿酸)、\(Text("1 项偏低").fontWeight(.semibold).underline(color: Tj.Palette.amber))(维生素 D)。整体趋势提示代谢风险有所抬升,建议优化饮食并复查血脂。")
|
||||
.font(.system(size: 14))
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
.lineSpacing(6)
|
||||
.padding(.bottom, 12)
|
||||
|
||||
TjDashedDivider().padding(.bottom, 10)
|
||||
|
||||
Text("仅供参考,不构成医疗建议")
|
||||
.font(.system(size: 11))
|
||||
.italic()
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
}
|
||||
.padding(.leading, 20)
|
||||
.padding(.trailing, 20)
|
||||
.padding(.vertical, 20)
|
||||
.frame(maxWidth: .infinity, alignment: .leading)
|
||||
.background(
|
||||
Tj.Palette.paper
|
||||
.overlay(alignment: .leading) {
|
||||
Tj.Palette.brick.frame(width: 3)
|
||||
}
|
||||
)
|
||||
.clipShape(RoundedRectangle(cornerRadius: 2, style: .continuous))
|
||||
.shadow(color: Color(red: 0.196, green: 0.157, blue: 0.098).opacity(0.06), radius: 0, x: 0, y: 1)
|
||||
}
|
||||
|
||||
private var normalCollapsed: some View {
|
||||
Button { withAnimation { normalsExpanded.toggle() } } label: {
|
||||
HStack(spacing: 10) {
|
||||
TjBadge(text: "\(normalCount)", style: .leaf)
|
||||
Text("谷丙转氨酶、空腹血糖、糖化血红蛋白…")
|
||||
.font(.system(size: 13))
|
||||
.foregroundStyle(Tj.Palette.text2)
|
||||
.lineLimit(1)
|
||||
Spacer()
|
||||
Image(systemName: normalsExpanded ? "chevron.up" : "chevron.down")
|
||||
.font(.system(size: 12, weight: .medium))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
}
|
||||
.padding(.horizontal, 16)
|
||||
.padding(.vertical, 14)
|
||||
.tjCard(bordered: true)
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
}
|
||||
}
|
||||
|
||||
private struct Stat: View {
|
||||
let n: String
|
||||
let label: String
|
||||
var tone: Tone = .ink
|
||||
|
||||
enum Tone { case ink, brick, amber, leaf }
|
||||
|
||||
var color: Color {
|
||||
switch tone {
|
||||
case .ink: return Tj.Palette.text
|
||||
case .brick: return Tj.Palette.brick
|
||||
case .amber: return Color(red: 0.59, green: 0.45, blue: 0.27)
|
||||
case .leaf: return Tj.Palette.leaf
|
||||
}
|
||||
}
|
||||
|
||||
var body: some View {
|
||||
VStack(alignment: .leading, spacing: 4) {
|
||||
Text(n)
|
||||
.font(.system(size: 24, weight: .semibold))
|
||||
.foregroundStyle(color)
|
||||
Text(label)
|
||||
.font(.system(size: 10))
|
||||
.tracking(0.5)
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
}
|
||||
.frame(maxWidth: .infinity, alignment: .leading)
|
||||
}
|
||||
}
|
||||
|
||||
private struct SectionLabel: View {
|
||||
let title: String
|
||||
let count: Int
|
||||
let accent: AccentKind
|
||||
|
||||
enum AccentKind { case brick, leaf }
|
||||
|
||||
init(_ title: String, count: Int, accent: AccentKind) {
|
||||
self.title = title
|
||||
self.count = count
|
||||
self.accent = accent
|
||||
}
|
||||
|
||||
var body: some View {
|
||||
HStack(spacing: 8) {
|
||||
RoundedRectangle(cornerRadius: 2, style: .continuous)
|
||||
.fill(accent == .brick ? Tj.Palette.brick : Tj.Palette.leaf)
|
||||
.frame(width: 4, height: 14)
|
||||
Text(title).font(.system(size: 13, weight: .semibold)).foregroundStyle(Tj.Palette.text)
|
||||
Text("· \(count)").font(.system(size: 11)).foregroundStyle(Tj.Palette.text3)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private struct IndicatorRow: View {
|
||||
let item: B5IndicatorData
|
||||
let expanded: Bool
|
||||
let onTap: () -> Void
|
||||
|
||||
var statusBadge: TjBadgeStyle {
|
||||
switch item.status {
|
||||
case .high: return .brick
|
||||
case .low: return .amber
|
||||
case .normal: return .leaf
|
||||
}
|
||||
}
|
||||
var statusWord: String {
|
||||
switch item.status {
|
||||
case .high: return "偏高"
|
||||
case .low: return "偏低"
|
||||
case .normal: return "正常"
|
||||
}
|
||||
}
|
||||
var valueColor: Color {
|
||||
switch item.status {
|
||||
case .high: return Tj.Palette.brick
|
||||
case .low: return Color(red: 0.55, green: 0.45, blue: 0.32)
|
||||
case .normal: return Tj.Palette.text
|
||||
}
|
||||
}
|
||||
|
||||
var body: some View {
|
||||
Button(action: onTap) {
|
||||
VStack(alignment: .leading, spacing: 10) {
|
||||
HStack(alignment: .top, spacing: 12) {
|
||||
VStack(alignment: .leading, spacing: 4) {
|
||||
HStack(spacing: 8) {
|
||||
Text(item.name)
|
||||
.font(.system(size: 14, weight: .semibold))
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
.lineLimit(1)
|
||||
TjBadge(text: statusWord, style: statusBadge)
|
||||
}
|
||||
Text("范围 \(item.range) \(item.unit)")
|
||||
.font(.system(size: 11, design: .monospaced))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
}
|
||||
Spacer(minLength: 8)
|
||||
VStack(alignment: .trailing, spacing: 2) {
|
||||
Text(item.value)
|
||||
.font(.system(size: 22, weight: .semibold))
|
||||
.foregroundStyle(valueColor)
|
||||
Text(item.unit)
|
||||
.font(.system(size: 10, design: .monospaced))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
}
|
||||
}
|
||||
|
||||
if expanded, let note = item.note {
|
||||
TjDashedDivider()
|
||||
Text(note)
|
||||
.font(.system(size: 12))
|
||||
.foregroundStyle(Tj.Palette.text2)
|
||||
.lineSpacing(5)
|
||||
.frame(maxWidth: .infinity, alignment: .leading)
|
||||
}
|
||||
}
|
||||
.padding(.horizontal, 16)
|
||||
.padding(.vertical, 14)
|
||||
.background(
|
||||
RoundedRectangle(cornerRadius: Tj.Radius.md, style: .continuous)
|
||||
.fill(Tj.Palette.paper)
|
||||
)
|
||||
.overlay(
|
||||
RoundedRectangle(cornerRadius: Tj.Radius.md, style: .continuous)
|
||||
.strokeBorder(
|
||||
item.status != .normal
|
||||
? Color(red: 0.78, green: 0.68, blue: 0.48).opacity(0.5)
|
||||
: Tj.Palette.lineSoft,
|
||||
lineWidth: 1
|
||||
)
|
||||
)
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
}
|
||||
}
|
||||
190
康康/Features/Archive/HealthExportDetailView.swift
Normal file
@@ -0,0 +1,190 @@
|
||||
import SwiftUI
|
||||
import SwiftData
|
||||
|
||||
/// 单条「导出身体档案」详情。只读 Markdown + 复制 / 分享 / 删除。
|
||||
struct HealthExportDetailView: View {
|
||||
@Environment(\.modelContext) private var ctx
|
||||
@Environment(\.dismiss) private var dismiss
|
||||
|
||||
let export: HealthExport
|
||||
|
||||
@State private var copiedFlash: Bool = false
|
||||
@State private var showDeleteConfirm = false
|
||||
|
||||
var body: some View {
|
||||
VStack(spacing: 0) {
|
||||
header
|
||||
ScrollView {
|
||||
VStack(alignment: .leading, spacing: 16) {
|
||||
metaBar
|
||||
promptBlock
|
||||
MarkdownView(text: export.content)
|
||||
.padding(16)
|
||||
.frame(maxWidth: .infinity, alignment: .leading)
|
||||
.background(
|
||||
RoundedRectangle(cornerRadius: Tj.Radius.md, style: .continuous)
|
||||
.fill(Tj.Palette.paper)
|
||||
)
|
||||
.overlay(
|
||||
RoundedRectangle(cornerRadius: Tj.Radius.md, style: .continuous)
|
||||
.strokeBorder(Tj.Palette.lineSoft, lineWidth: 1)
|
||||
)
|
||||
}
|
||||
.padding(.horizontal, 20)
|
||||
.padding(.vertical, 16)
|
||||
}
|
||||
actionRow
|
||||
}
|
||||
.background(Tj.Palette.sand.ignoresSafeArea())
|
||||
.alert("永久删除这份导出?", isPresented: $showDeleteConfirm) {
|
||||
Button("删除", role: .destructive) {
|
||||
ctx.delete(export)
|
||||
try? ctx.save()
|
||||
dismiss()
|
||||
}
|
||||
Button("取消", role: .cancel) {}
|
||||
} message: {
|
||||
Text("删除后无法恢复。源记录(指标、症状等)不受影响。")
|
||||
}
|
||||
}
|
||||
|
||||
private var header: some View {
|
||||
HStack(alignment: .center, spacing: 12) {
|
||||
Button { dismiss() } label: {
|
||||
Image(systemName: "xmark")
|
||||
.font(.tjScaled( 16, weight: .semibold))
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
.frame(width: 32, height: 32)
|
||||
.background(Circle().fill(Tj.Palette.sand2))
|
||||
}
|
||||
VStack(alignment: .leading, spacing: 2) {
|
||||
Text("身体档案 · 历史导出")
|
||||
.font(.tjH2())
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
Text(Self.absoluteDate(export.createdAt))
|
||||
.font(.tjScaled( 11))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
}
|
||||
Spacer()
|
||||
TjLockChip()
|
||||
}
|
||||
.padding(.horizontal, 20)
|
||||
.padding(.vertical, 14)
|
||||
.background(Tj.Palette.sand)
|
||||
.overlay(alignment: .bottom) {
|
||||
Rectangle().fill(Tj.Palette.lineSoft).frame(height: 1)
|
||||
}
|
||||
}
|
||||
|
||||
private var metaBar: some View {
|
||||
HStack(spacing: 10) {
|
||||
TjBadge(text: export.modelTag, style: .neutral)
|
||||
if export.decodeRate > 0 {
|
||||
Text(String(format: "%.1f tok/s", export.decodeRate))
|
||||
.font(.tjScaled( 11, design: .monospaced))
|
||||
.foregroundStyle(Tj.Palette.leaf)
|
||||
}
|
||||
Spacer()
|
||||
if let from = export.inferredTimeFromDate, let to = export.inferredTimeToDate {
|
||||
Text("\(Self.shortDate(from)) — \(Self.shortDate(to))")
|
||||
.font(.tjScaled( 11, design: .monospaced))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private var promptBlock: some View {
|
||||
HStack(alignment: .top, spacing: 8) {
|
||||
Image(systemName: "quote.opening")
|
||||
.font(.tjScaled( 12))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
Text(export.prompt)
|
||||
.font(.tjScaled( 13))
|
||||
.foregroundStyle(Tj.Palette.text2)
|
||||
}
|
||||
.padding(12)
|
||||
.frame(maxWidth: .infinity, alignment: .leading)
|
||||
.background(
|
||||
RoundedRectangle(cornerRadius: Tj.Radius.sm, style: .continuous)
|
||||
.fill(Tj.Palette.sand2)
|
||||
)
|
||||
}
|
||||
|
||||
private var actionRow: some View {
|
||||
HStack(spacing: 10) {
|
||||
Button { copy() } label: {
|
||||
Label(copiedFlash ? "已复制" : "复制", systemImage: copiedFlash ? "checkmark" : "doc.on.doc")
|
||||
}
|
||||
.buttonStyle(TjGhostButton(height: 44, fontSize: 13, horizontalPadding: 14))
|
||||
|
||||
ShareLink(item: export.content) {
|
||||
Label("分享", systemImage: "square.and.arrow.up")
|
||||
.font(.tjScaled( 13, weight: .semibold))
|
||||
.tracking(1)
|
||||
.foregroundStyle(Tj.Palette.ink)
|
||||
.padding(.horizontal, 14)
|
||||
.frame(height: 44)
|
||||
.background(Capsule().strokeBorder(Tj.Palette.ink, lineWidth: 1))
|
||||
.contentShape(Capsule()) // 纯描边胶囊:内边距区也可点
|
||||
}
|
||||
|
||||
Spacer()
|
||||
|
||||
Button(role: .destructive) {
|
||||
showDeleteConfirm = true
|
||||
} label: {
|
||||
Image(systemName: "trash")
|
||||
.font(.tjScaled( 15, weight: .medium))
|
||||
.foregroundStyle(Tj.Palette.brick)
|
||||
.frame(width: 44, height: 44)
|
||||
.background(Circle().strokeBorder(Tj.Palette.brick.opacity(0.4), lineWidth: 1))
|
||||
}
|
||||
}
|
||||
.padding(.horizontal, 20)
|
||||
.padding(.vertical, 12)
|
||||
.background(Tj.Palette.paper)
|
||||
.overlay(alignment: .top) {
|
||||
Rectangle().fill(Tj.Palette.lineSoft).frame(height: 1)
|
||||
}
|
||||
}
|
||||
|
||||
private func copy() {
|
||||
UIPasteboard.general.string = export.content
|
||||
copiedFlash = true
|
||||
DispatchQueue.main.asyncAfter(deadline: .now() + 1.4) {
|
||||
copiedFlash = false
|
||||
}
|
||||
}
|
||||
|
||||
private static func absoluteDate(_ d: Date) -> String {
|
||||
d.formatted(.dateTime.year().month().day().hour().minute())
|
||||
}
|
||||
|
||||
private static func shortDate(_ d: Date) -> String {
|
||||
let f = DateFormatter()
|
||||
f.locale = Locale(identifier: "en_US_POSIX")
|
||||
f.dateFormat = "MM-dd"
|
||||
return f.string(from: d)
|
||||
}
|
||||
}
|
||||
|
||||
#Preview {
|
||||
let exp = HealthExport(
|
||||
prompt: "我感冒3天了,把最近一个月的健康情况给医生看",
|
||||
content: """
|
||||
# 就诊摘要 — 感冒就诊
|
||||
|
||||
## 主诉
|
||||
患者男,38 岁,感冒 3 天未愈。
|
||||
|
||||
## 患者背景
|
||||
- 高血压 2 年
|
||||
- 在服药:缬沙坦 80mg qd
|
||||
""",
|
||||
inferredTimeFromDate: Calendar.current.date(byAdding: .day, value: -30, to: .now),
|
||||
inferredTimeToDate: .now,
|
||||
inferredIntent: "cold_consult",
|
||||
decodeRate: 24.3
|
||||
)
|
||||
return HealthExportDetailView(export: exp)
|
||||
}
|
||||
137
康康/Features/Archive/HealthExportListView.swift
Normal file
@@ -0,0 +1,137 @@
|
||||
import SwiftUI
|
||||
import SwiftData
|
||||
|
||||
/// 「我的导出」全部历史列表。从 ArchiveListView 顶部 strip 的「查看全部」进入。
|
||||
struct HealthExportListView: View {
|
||||
@Environment(\.modelContext) private var ctx
|
||||
@Query(sort: \HealthExport.createdAt, order: .reverse)
|
||||
private var exports: [HealthExport]
|
||||
|
||||
@State private var selected: HealthExport?
|
||||
|
||||
var body: some View {
|
||||
VStack(alignment: .leading, spacing: 0) {
|
||||
header
|
||||
.padding(.horizontal, 20)
|
||||
.padding(.top, 8)
|
||||
.padding(.bottom, 14)
|
||||
|
||||
if exports.isEmpty {
|
||||
empty
|
||||
} else {
|
||||
ScrollView {
|
||||
LazyVStack(spacing: 12) {
|
||||
ForEach(exports) { exp in
|
||||
Button {
|
||||
selected = exp
|
||||
} label: {
|
||||
HealthExportRow(export: exp)
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
.contextMenu {
|
||||
Button(role: .destructive) {
|
||||
delete(exp)
|
||||
} label: {
|
||||
Label("删除", systemImage: "trash")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
.padding(.horizontal, 20)
|
||||
.padding(.bottom, 24)
|
||||
}
|
||||
}
|
||||
}
|
||||
.frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .topLeading)
|
||||
.background(Tj.Palette.sand.ignoresSafeArea())
|
||||
.navigationTitle("我的导出")
|
||||
.navigationBarTitleDisplayMode(.inline)
|
||||
.sheet(item: $selected) { exp in
|
||||
HealthExportDetailView(export: exp)
|
||||
}
|
||||
}
|
||||
|
||||
private var header: some View {
|
||||
HStack(alignment: .lastTextBaseline) {
|
||||
Text("我的导出")
|
||||
.font(.tjTitle(24))
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
Text(exports.isEmpty ? "" : String(appLoc: "\(exports.count) 份"))
|
||||
.font(.tjScaled( 12))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
Spacer()
|
||||
TjLockChip()
|
||||
}
|
||||
}
|
||||
|
||||
private var empty: some View {
|
||||
VStack(spacing: 12) {
|
||||
Spacer()
|
||||
TjPlaceholder(label: String(appLoc: "还没有导出过\n回到记录页右上角生成一份"))
|
||||
.frame(width: 240, height: 140)
|
||||
Spacer()
|
||||
}
|
||||
.frame(maxWidth: .infinity)
|
||||
}
|
||||
|
||||
private func delete(_ exp: HealthExport) {
|
||||
ctx.delete(exp)
|
||||
try? ctx.save()
|
||||
}
|
||||
}
|
||||
|
||||
/// 列表里一条行。
|
||||
struct HealthExportRow: View {
|
||||
let export: HealthExport
|
||||
|
||||
var body: some View {
|
||||
VStack(alignment: .leading, spacing: 6) {
|
||||
HStack(alignment: .top) {
|
||||
Text(export.promptPreview)
|
||||
.font(.tjScaled( 14, weight: .semibold))
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
.lineLimit(2)
|
||||
.multilineTextAlignment(.leading)
|
||||
Spacer()
|
||||
Image(systemName: "chevron.right")
|
||||
.font(.tjScaled( 12, weight: .medium))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
}
|
||||
HStack(spacing: 8) {
|
||||
Text(Self.relativeDate(export.createdAt))
|
||||
.font(.tjScaled( 11))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
if export.decodeRate > 0 {
|
||||
Text(String(format: "%.1f tok/s", export.decodeRate))
|
||||
.font(.tjScaled( 10, design: .monospaced))
|
||||
.foregroundStyle(Tj.Palette.leaf)
|
||||
}
|
||||
Spacer()
|
||||
if let label = export.inferredLabelCN ?? export.inferredIntent {
|
||||
TjBadge(text: label, style: .neutral)
|
||||
}
|
||||
}
|
||||
}
|
||||
.padding(14)
|
||||
.frame(maxWidth: .infinity, alignment: .leading)
|
||||
.tjCard()
|
||||
}
|
||||
|
||||
static func relativeDate(_ d: Date) -> String {
|
||||
let f = RelativeDateTimeFormatter()
|
||||
f.locale = Locale.current
|
||||
f.unitsStyle = .full
|
||||
return f.localizedString(for: d, relativeTo: .now)
|
||||
}
|
||||
}
|
||||
|
||||
#Preview {
|
||||
NavigationStack {
|
||||
HealthExportListView()
|
||||
}
|
||||
.modelContainer(for: [
|
||||
Indicator.self, Report.self, DiaryEntry.self, Asset.self,
|
||||
ChatTurn.self, Symptom.self, UserProfile.self,
|
||||
MetricReminder.self, CustomMonitorMetric.self, HealthExport.self
|
||||
], inMemory: true)
|
||||
}
|
||||
662
康康/Features/Archive/HealthExportSheet.swift
Normal file
@@ -0,0 +1,662 @@
|
||||
import SwiftUI
|
||||
import SwiftData
|
||||
|
||||
/// 「导出身体档案」全屏 sheet。
|
||||
/// 状态机:多轮问答 → running(retrieving → generating)→ completed / failed
|
||||
struct HealthExportSheet: View {
|
||||
@Environment(\.modelContext) private var ctx
|
||||
@Environment(\.dismiss) private var dismiss
|
||||
|
||||
/// 可选:从历史「重新生成」时传入(暂时未启用,W3 接)。
|
||||
let initialPrompt: String
|
||||
|
||||
@State private var turns: [HealthExportDialogueTurn] = []
|
||||
@State private var draftQuestion: String = ""
|
||||
@State private var phase: HealthExportService.Phase?
|
||||
@State private var content: String = ""
|
||||
@State private var rate: Double = 0
|
||||
@State private var task: Task<Void, Never>?
|
||||
@State private var error: Error?
|
||||
@State private var completed: Bool = false
|
||||
@State private var copiedFlash: Bool = false
|
||||
@State private var answeringTurnID: UUID?
|
||||
@FocusState private var questionFocused: Bool
|
||||
|
||||
init(initialPrompt: String = "") {
|
||||
self.initialPrompt = initialPrompt
|
||||
}
|
||||
|
||||
private var isGeneratingReport: Bool { phase != nil && !completed && error == nil }
|
||||
private var isAnswering: Bool { answeringTurnID != nil }
|
||||
private var canAsk: Bool {
|
||||
!isAnswering &&
|
||||
!isGeneratingReport &&
|
||||
!draftQuestion.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty
|
||||
}
|
||||
private var canGenerateReport: Bool {
|
||||
!isAnswering &&
|
||||
!isGeneratingReport &&
|
||||
turns.contains(where: { $0.role == .user && !$0.text.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty })
|
||||
}
|
||||
|
||||
var body: some View {
|
||||
VStack(spacing: 0) {
|
||||
header
|
||||
ScrollViewReader { proxy in
|
||||
ScrollView {
|
||||
VStack(alignment: .leading, spacing: 18) {
|
||||
introSection
|
||||
|
||||
ForEach(turns) { turn in
|
||||
dialogueBubble(turn)
|
||||
}
|
||||
|
||||
if isGeneratingReport { phaseIndicator }
|
||||
|
||||
if !content.isEmpty {
|
||||
reportCard
|
||||
}
|
||||
|
||||
if let err = error { errorRow(err) }
|
||||
Color.clear.frame(height: 1).id("bottom")
|
||||
}
|
||||
.padding(.horizontal, 20)
|
||||
.padding(.vertical, 16)
|
||||
}
|
||||
.onChange(of: content) { _, _ in
|
||||
withAnimation(.easeOut(duration: 0.12)) {
|
||||
proxy.scrollTo("bottom", anchor: .bottom)
|
||||
}
|
||||
}
|
||||
.onChange(of: turns) { _, _ in
|
||||
withAnimation(.easeOut(duration: 0.12)) {
|
||||
proxy.scrollTo("bottom", anchor: .bottom)
|
||||
}
|
||||
}
|
||||
}
|
||||
if completed {
|
||||
actionRow
|
||||
} else {
|
||||
composer
|
||||
}
|
||||
}
|
||||
.background(Tj.Palette.sand.ignoresSafeArea())
|
||||
.onAppear {
|
||||
if !initialPrompt.isEmpty, draftQuestion.isEmpty, turns.isEmpty {
|
||||
draftQuestion = initialPrompt
|
||||
}
|
||||
questionFocused = true
|
||||
}
|
||||
.onDisappear { task?.cancel() }
|
||||
}
|
||||
|
||||
// MARK: - Header
|
||||
|
||||
private var header: some View {
|
||||
HStack(alignment: .center, spacing: 12) {
|
||||
Button { close() } label: {
|
||||
Image(systemName: "xmark")
|
||||
.font(.tjScaled( 16, weight: .semibold))
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
.frame(width: 32, height: 32)
|
||||
.background(Circle().fill(Tj.Palette.sand2))
|
||||
}
|
||||
VStack(alignment: .leading, spacing: 2) {
|
||||
Text("身体档案")
|
||||
.font(.tjH2())
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
Text("先问清楚,再整理给医生")
|
||||
.font(.tjScaled( 11))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
}
|
||||
Spacer()
|
||||
TjLockChip()
|
||||
}
|
||||
.padding(.horizontal, 20)
|
||||
.padding(.vertical, 14)
|
||||
.background(Tj.Palette.sand)
|
||||
.overlay(alignment: .bottom) {
|
||||
Rectangle().fill(Tj.Palette.lineSoft).frame(height: 1)
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Dialogue
|
||||
|
||||
private var introSection: some View {
|
||||
VStack(alignment: .leading, spacing: 14) {
|
||||
Text("围绕你的指标和健康日记提问")
|
||||
.font(.tjScaled( 13, weight: .semibold))
|
||||
.foregroundStyle(Tj.Palette.text2)
|
||||
|
||||
VStack(alignment: .leading, spacing: 6) {
|
||||
Text("例:最近血压波动大吗?")
|
||||
.font(.tjScaled( 12))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
Text("例:把我最近头晕、睡眠和指标变化整理给医生")
|
||||
.font(.tjScaled( 12))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
}
|
||||
|
||||
Text("上下文:全部记录指标 + 健康日记 · 本地 RAG · 不上传任何数据")
|
||||
.font(.tjScaled( 11))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
}
|
||||
.padding(14)
|
||||
.frame(maxWidth: .infinity, alignment: .leading)
|
||||
.background(
|
||||
RoundedRectangle(cornerRadius: Tj.Radius.md, style: .continuous)
|
||||
.fill(Tj.Palette.paper)
|
||||
)
|
||||
.overlay(
|
||||
RoundedRectangle(cornerRadius: Tj.Radius.md, style: .continuous)
|
||||
.strokeBorder(Tj.Palette.lineSoft, lineWidth: 1)
|
||||
)
|
||||
}
|
||||
|
||||
private func dialogueBubble(_ turn: HealthExportDialogueTurn) -> some View {
|
||||
let isUser = turn.role == .user
|
||||
return HStack(alignment: .top, spacing: 8) {
|
||||
if isUser { Spacer(minLength: 44) }
|
||||
VStack(alignment: .leading, spacing: 6) {
|
||||
Text(turn.role.transcriptLabel)
|
||||
.font(.tjScaled( 11, weight: .semibold))
|
||||
.foregroundStyle(isUser ? Tj.Palette.paper.opacity(0.8) : Tj.Palette.text3)
|
||||
if turn.id == answeringTurnID && turn.text.isEmpty {
|
||||
HStack(spacing: 8) {
|
||||
ProgressView()
|
||||
Text("正在查看本地记录…")
|
||||
.font(.tjScaled( 13))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
}
|
||||
} else {
|
||||
Text(turn.text)
|
||||
.font(.tjScaled( 14))
|
||||
.lineSpacing(3)
|
||||
.foregroundStyle(isUser ? Tj.Palette.paper : Tj.Palette.text)
|
||||
.fixedSize(horizontal: false, vertical: true)
|
||||
}
|
||||
}
|
||||
.padding(12)
|
||||
.frame(maxWidth: 300, alignment: .leading)
|
||||
.background(
|
||||
RoundedRectangle(cornerRadius: Tj.Radius.md, style: .continuous)
|
||||
.fill(isUser ? Tj.Palette.ink : Tj.Palette.paper)
|
||||
)
|
||||
.overlay(
|
||||
RoundedRectangle(cornerRadius: Tj.Radius.md, style: .continuous)
|
||||
.strokeBorder(isUser ? Color.clear : Tj.Palette.lineSoft, lineWidth: 1)
|
||||
)
|
||||
if !isUser { Spacer(minLength: 44) }
|
||||
}
|
||||
}
|
||||
|
||||
private var reportCard: some View {
|
||||
VStack(alignment: .leading, spacing: 10) {
|
||||
Text("整理好的报告")
|
||||
.font(.tjScaled( 13, weight: .semibold))
|
||||
.foregroundStyle(Tj.Palette.text2)
|
||||
MarkdownView(text: content)
|
||||
}
|
||||
.padding(16)
|
||||
.frame(maxWidth: .infinity, alignment: .leading)
|
||||
.background(
|
||||
RoundedRectangle(cornerRadius: Tj.Radius.md, style: .continuous)
|
||||
.fill(Tj.Palette.paper)
|
||||
)
|
||||
.overlay(
|
||||
RoundedRectangle(cornerRadius: Tj.Radius.md, style: .continuous)
|
||||
.strokeBorder(Tj.Palette.lineSoft, lineWidth: 1)
|
||||
)
|
||||
}
|
||||
|
||||
// MARK: - Phase indicator
|
||||
|
||||
private var phaseIndicator: some View {
|
||||
VStack(alignment: .leading, spacing: 8) {
|
||||
HStack(spacing: 10) {
|
||||
phasePill(.extractingIntent)
|
||||
arrow
|
||||
phasePill(.retrieving)
|
||||
arrow
|
||||
phasePill(.generating)
|
||||
}
|
||||
if phase == .generating && rate > 0 {
|
||||
Text(String(format: String(appLoc: "本地推理 · %.1f tok/s"), rate))
|
||||
.font(.tjScaled( 11, design: .monospaced))
|
||||
.foregroundStyle(Tj.Palette.leaf)
|
||||
} else {
|
||||
Text(phase?.label ?? "")
|
||||
.font(.tjScaled( 11))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private func phasePill(_ p: HealthExportService.Phase) -> some View {
|
||||
let active = (p == phase)
|
||||
let done = phaseOrder(p) < phaseOrder(phase ?? .extractingIntent)
|
||||
let fill = active ? Tj.Palette.ink : (done ? Tj.Palette.leaf : Tj.Palette.sand2)
|
||||
let fg = (active || done) ? Tj.Palette.paper : Tj.Palette.text3
|
||||
return Text(p.label)
|
||||
.font(.tjScaled( 11, weight: active ? .semibold : .regular))
|
||||
.foregroundStyle(fg)
|
||||
.padding(.horizontal, 10)
|
||||
.padding(.vertical, 5)
|
||||
.background(Capsule().fill(fill))
|
||||
}
|
||||
|
||||
private var arrow: some View {
|
||||
Image(systemName: "chevron.right")
|
||||
.font(.tjScaled( 10, weight: .semibold))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
}
|
||||
|
||||
private func phaseOrder(_ p: HealthExportService.Phase) -> Int {
|
||||
switch p {
|
||||
case .extractingIntent: return 0
|
||||
case .retrieving: return 1
|
||||
case .generating: return 2
|
||||
case .completed: return 3
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Error
|
||||
|
||||
private func errorRow(_ err: Error) -> some View {
|
||||
VStack(alignment: .leading, spacing: 10) {
|
||||
HStack(spacing: 8) {
|
||||
Image(systemName: "exclamationmark.triangle.fill")
|
||||
.foregroundStyle(Tj.Palette.brick)
|
||||
Text(err.localizedDescription)
|
||||
.font(.tjScaled( 13))
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
}
|
||||
Button { reset() } label: { Text("返回修改") }
|
||||
.buttonStyle(TjGhostButton(height: 40, fontSize: 13))
|
||||
}
|
||||
.padding(14)
|
||||
.frame(maxWidth: .infinity, alignment: .leading)
|
||||
.background(
|
||||
RoundedRectangle(cornerRadius: Tj.Radius.sm, style: .continuous)
|
||||
.fill(Tj.Palette.brickSoft.opacity(0.6))
|
||||
)
|
||||
}
|
||||
|
||||
// MARK: - Action row (completed)
|
||||
|
||||
private var actionRow: some View {
|
||||
HStack(spacing: 10) {
|
||||
Button { copy() } label: {
|
||||
Label(copiedFlash ? "已复制" : "复制", systemImage: copiedFlash ? "checkmark" : "doc.on.doc")
|
||||
}
|
||||
.buttonStyle(TjGhostButton(height: 44, fontSize: 13, horizontalPadding: 14))
|
||||
|
||||
ShareLink(item: content) {
|
||||
Label("分享", systemImage: "square.and.arrow.up")
|
||||
.font(.tjScaled( 13, weight: .semibold))
|
||||
.tracking(1)
|
||||
.foregroundStyle(Tj.Palette.ink)
|
||||
.padding(.horizontal, 14)
|
||||
.frame(height: 44)
|
||||
.background(Capsule().strokeBorder(Tj.Palette.ink, lineWidth: 1))
|
||||
.contentShape(Capsule()) // 纯描边胶囊:内边距区也可点
|
||||
}
|
||||
|
||||
Spacer()
|
||||
Button { regenerate() } label: {
|
||||
Label("重新整理", systemImage: "arrow.clockwise")
|
||||
}
|
||||
.buttonStyle(TjPrimaryButton(height: 44, fontSize: 13, horizontalPadding: 16))
|
||||
}
|
||||
.padding(.horizontal, 20)
|
||||
.padding(.vertical, 12)
|
||||
.background(Tj.Palette.paper)
|
||||
.overlay(alignment: .top) {
|
||||
Rectangle().fill(Tj.Palette.lineSoft).frame(height: 1)
|
||||
}
|
||||
}
|
||||
|
||||
private var composer: some View {
|
||||
VStack(spacing: 10) {
|
||||
HStack(spacing: 8) {
|
||||
TextField("继续提问或补充情况…", text: $draftQuestion, axis: .vertical)
|
||||
.font(.tjScaled( 14))
|
||||
.lineLimit(1...4)
|
||||
.padding(.horizontal, 12)
|
||||
.padding(.vertical, 10)
|
||||
.background(
|
||||
RoundedRectangle(cornerRadius: Tj.Radius.md, style: .continuous)
|
||||
.fill(Tj.Palette.sand2)
|
||||
)
|
||||
.focused($questionFocused)
|
||||
.disabled(isAnswering || isGeneratingReport)
|
||||
|
||||
Button { sendQuestion() } label: {
|
||||
Image(systemName: "arrow.up")
|
||||
.font(.tjScaled( 15, weight: .bold))
|
||||
.foregroundStyle(Tj.Palette.paper)
|
||||
.frame(width: 40, height: 40)
|
||||
.background(Circle().fill(canAsk ? Tj.Palette.ink : Tj.Palette.line))
|
||||
}
|
||||
.disabled(!canAsk)
|
||||
.accessibilityLabel("发送问题")
|
||||
}
|
||||
|
||||
Button { startReportGeneration() } label: {
|
||||
Label("生成整理报告", systemImage: "doc.text.below.ecg")
|
||||
}
|
||||
.buttonStyle(TjPrimaryButton(height: 44, fontSize: 14))
|
||||
.disabled(!canGenerateReport)
|
||||
.opacity(canGenerateReport ? 1 : 0.45)
|
||||
}
|
||||
.padding(.horizontal, 20)
|
||||
.padding(.vertical, 12)
|
||||
.background(Tj.Palette.paper)
|
||||
.overlay(alignment: .top) {
|
||||
Rectangle().fill(Tj.Palette.lineSoft).frame(height: 1)
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Actions
|
||||
|
||||
private func sendQuestion() {
|
||||
let question = draftQuestion.trimmingCharacters(in: .whitespacesAndNewlines)
|
||||
guard !question.isEmpty, !isAnswering, !isGeneratingReport else { return }
|
||||
draftQuestion = ""
|
||||
questionFocused = false
|
||||
|
||||
let userTurn = HealthExportDialogueTurn.user(question)
|
||||
let assistantTurn = HealthExportDialogueTurn.assistant("")
|
||||
turns.append(userTurn)
|
||||
turns.append(assistantTurn)
|
||||
answeringTurnID = assistantTurn.id
|
||||
|
||||
let conversationForPrompt = turns.filter { $0.id != assistantTurn.id }
|
||||
let stream = HealthExportService.shared.answer(
|
||||
question: question,
|
||||
conversation: conversationForPrompt,
|
||||
in: ctx
|
||||
)
|
||||
task?.cancel()
|
||||
task = Task { @MainActor in
|
||||
do {
|
||||
for try await chunk in stream {
|
||||
appendToTurn(id: assistantTurn.id, text: chunk.text)
|
||||
if chunk.decodeRate > 0 { rate = chunk.decodeRate }
|
||||
}
|
||||
answeringTurnID = nil
|
||||
questionFocused = true
|
||||
} catch {
|
||||
answeringTurnID = nil
|
||||
appendToTurn(id: assistantTurn.id, text: error.localizedDescription)
|
||||
questionFocused = true
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private func appendToTurn(id: UUID, text: String) {
|
||||
guard let idx = turns.firstIndex(where: { $0.id == id }) else { return }
|
||||
turns[idx].text += text
|
||||
}
|
||||
|
||||
private func startReportGeneration() {
|
||||
guard canGenerateReport else { return }
|
||||
questionFocused = false
|
||||
content = ""
|
||||
rate = 0 // 重新生成时清零,避免旧 tok/s 残留显示
|
||||
error = nil
|
||||
completed = false
|
||||
phase = .retrieving
|
||||
|
||||
let stream = HealthExportService.shared.export(conversation: turns, in: ctx)
|
||||
task?.cancel()
|
||||
task = Task { @MainActor in
|
||||
do {
|
||||
for try await event in stream {
|
||||
switch event {
|
||||
case .phaseChanged(let ph):
|
||||
phase = ph
|
||||
case .token(let chunk):
|
||||
content += chunk.text
|
||||
if chunk.decodeRate > 0 { rate = chunk.decodeRate }
|
||||
case .completed:
|
||||
completed = true
|
||||
}
|
||||
}
|
||||
} catch {
|
||||
self.error = error
|
||||
self.phase = nil
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private func regenerate() {
|
||||
completed = false
|
||||
startReportGeneration()
|
||||
}
|
||||
|
||||
private func reset() {
|
||||
task?.cancel()
|
||||
task = nil
|
||||
phase = nil
|
||||
content = ""
|
||||
rate = 0
|
||||
error = nil
|
||||
completed = false
|
||||
answeringTurnID = nil
|
||||
questionFocused = true
|
||||
}
|
||||
|
||||
private func copy() {
|
||||
UIPasteboard.general.string = content
|
||||
copiedFlash = true
|
||||
DispatchQueue.main.asyncAfter(deadline: .now() + 1.4) {
|
||||
copiedFlash = false
|
||||
}
|
||||
}
|
||||
|
||||
private func close() {
|
||||
task?.cancel()
|
||||
dismiss()
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - 简易 Markdown 渲染(行级)
|
||||
|
||||
/// 极简 Markdown 渲染器,够给医生看的报告就行。
|
||||
/// 支持: `# 一级`、`## 二级`、`-` 列表、`**粗体**`(走 AttributedString 的 inline 解析)。
|
||||
/// 不支持表格、代码块、链接 —— 报告生成 prompt 也不会让 LLM 输出这些。
|
||||
struct MarkdownView: View {
|
||||
let text: String
|
||||
|
||||
var body: some View {
|
||||
let blocks = Self.parse(text)
|
||||
VStack(alignment: .leading, spacing: 10) {
|
||||
ForEach(Array(blocks.enumerated()), id: \.offset) { _, block in
|
||||
renderBlock(block)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ViewBuilder
|
||||
private func renderBlock(_ block: Block) -> some View {
|
||||
switch block {
|
||||
case .h1(let s):
|
||||
VStack(alignment: .leading, spacing: 8) {
|
||||
Text(inline(s))
|
||||
.font(.tjScaled( 22, weight: .bold))
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
.fixedSize(horizontal: false, vertical: true)
|
||||
Rectangle()
|
||||
.fill(Tj.Palette.ink)
|
||||
.frame(height: 1)
|
||||
.frame(maxWidth: .infinity)
|
||||
}
|
||||
.padding(.top, 2)
|
||||
.padding(.bottom, 4)
|
||||
|
||||
case .h2(let s):
|
||||
HStack(alignment: .center, spacing: 8) {
|
||||
RoundedRectangle(cornerRadius: 1.5, style: .continuous)
|
||||
.fill(Tj.Palette.brick)
|
||||
.frame(width: 3, height: 16)
|
||||
Text(inline(s))
|
||||
.font(.tjScaled( 16, weight: .semibold))
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
}
|
||||
.padding(.top, 10)
|
||||
.padding(.bottom, 2)
|
||||
|
||||
case .bullet(let s):
|
||||
if let abnormalText = Self.extractAbnormal(s) {
|
||||
HStack(alignment: .firstTextBaseline, spacing: 8) {
|
||||
Image(systemName: "exclamationmark.triangle.fill")
|
||||
.font(.tjScaled( 11))
|
||||
.foregroundStyle(Tj.Palette.brick)
|
||||
Text(inline(abnormalText))
|
||||
.font(.tjScaled( 14, weight: .medium))
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
.fixedSize(horizontal: false, vertical: true)
|
||||
Spacer(minLength: 0)
|
||||
}
|
||||
.padding(.horizontal, 10)
|
||||
.padding(.vertical, 7)
|
||||
.frame(maxWidth: .infinity, alignment: .leading)
|
||||
.background(
|
||||
RoundedRectangle(cornerRadius: 6, style: .continuous)
|
||||
.fill(Tj.Palette.brickSoft.opacity(0.55))
|
||||
)
|
||||
.overlay(alignment: .leading) {
|
||||
RoundedRectangle(cornerRadius: 1.5, style: .continuous)
|
||||
.fill(Tj.Palette.brick)
|
||||
.frame(width: 3)
|
||||
}
|
||||
} else {
|
||||
HStack(alignment: .firstTextBaseline, spacing: 10) {
|
||||
Circle()
|
||||
.fill(Tj.Palette.text3)
|
||||
.frame(width: 4, height: 4)
|
||||
.padding(.top, 6)
|
||||
Text(inline(s))
|
||||
.font(.tjScaled( 14))
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
.fixedSize(horizontal: false, vertical: true)
|
||||
}
|
||||
.padding(.leading, 2)
|
||||
}
|
||||
|
||||
case .body(let s):
|
||||
Text(inline(s))
|
||||
.font(.tjScaled( 14))
|
||||
.lineSpacing(3)
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
.fixedSize(horizontal: false, vertical: true)
|
||||
|
||||
case .gap:
|
||||
Spacer().frame(height: 4)
|
||||
}
|
||||
}
|
||||
|
||||
/// 如果 bullet 文本以 ⚠️ 或常见异常关键词开头,返回 strip 掉前缀后的纯文本。
|
||||
/// 否则返回 nil(表示不是异常项)。
|
||||
private static func extractAbnormal(_ s: String) -> String? {
|
||||
let trimmed = s.trimmingCharacters(in: .whitespaces)
|
||||
if trimmed.hasPrefix("⚠️") {
|
||||
return trimmed.replacingOccurrences(of: "⚠️", with: "")
|
||||
.trimmingCharacters(in: .whitespaces)
|
||||
}
|
||||
// 关键词兜底高亮,但排除否定语境(「无异常」「未见偏高」「没有偏低」等),
|
||||
// 否则正常结论会被误标红。判断:信号词前最近 4 字内出现否定词即视为否定。
|
||||
let negations = ["无", "未", "没"]
|
||||
let abnormalSignals = ["偏高", "偏低", "异常", "过高", "过低"]
|
||||
for sig in abnormalSignals {
|
||||
guard let r = trimmed.range(of: sig) else { continue }
|
||||
let window = String(trimmed[..<r.lowerBound].suffix(4))
|
||||
if negations.contains(where: { window.contains($0) }) { continue }
|
||||
return trimmed
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
private func inline(_ s: String) -> AttributedString {
|
||||
// **bold** / *italic* / [text](url) 走 AttributedString markdown 解析
|
||||
if let attr = try? AttributedString(
|
||||
markdown: s,
|
||||
options: .init(interpretedSyntax: .inlineOnlyPreservingWhitespace)
|
||||
) {
|
||||
return attr
|
||||
}
|
||||
return AttributedString(s)
|
||||
}
|
||||
|
||||
// MARK: - 行级解析
|
||||
|
||||
enum Block {
|
||||
case h1(String)
|
||||
case h2(String)
|
||||
case bullet(String)
|
||||
case body(String)
|
||||
case gap
|
||||
}
|
||||
|
||||
static func parse(_ raw: String) -> [Block] {
|
||||
var out: [Block] = []
|
||||
let lines = raw.replacingOccurrences(of: "\r\n", with: "\n").components(separatedBy: "\n")
|
||||
for line in lines {
|
||||
let t = line.trimmingCharacters(in: .whitespaces)
|
||||
if t.isEmpty {
|
||||
// 连续空行折叠成一个 gap
|
||||
if case .gap = out.last { continue }
|
||||
out.append(.gap)
|
||||
continue
|
||||
}
|
||||
if t.hasPrefix("# ") {
|
||||
out.append(.h1(String(t.dropFirst(2))))
|
||||
} else if t.hasPrefix("## ") {
|
||||
out.append(.h2(String(t.dropFirst(3))))
|
||||
} else if t.hasPrefix("### ") {
|
||||
out.append(.h2(String(t.dropFirst(4))))
|
||||
} else if t.hasPrefix("- ") || t.hasPrefix("* ") {
|
||||
out.append(.bullet(String(t.dropFirst(2))))
|
||||
} else {
|
||||
out.append(.body(t))
|
||||
}
|
||||
}
|
||||
return out
|
||||
}
|
||||
}
|
||||
|
||||
#Preview("HealthExportSheet · 空状态") {
|
||||
HealthExportSheet()
|
||||
.modelContainer(for: [
|
||||
Indicator.self, Report.self, DiaryEntry.self, Asset.self,
|
||||
ChatTurn.self, Symptom.self, UserProfile.self,
|
||||
MetricReminder.self, CustomMonitorMetric.self, HealthExport.self
|
||||
], inMemory: true)
|
||||
}
|
||||
|
||||
#Preview("MarkdownView · 演示") {
|
||||
ScrollView {
|
||||
MarkdownView(text: """
|
||||
# 就诊摘要 — 感冒就诊
|
||||
|
||||
## 主诉
|
||||
患者男,38 岁,感冒 3 天未愈,主诉鼻塞、咳嗽、低烧。
|
||||
|
||||
## 患者背景
|
||||
- 高血压 2 年
|
||||
- 在服药:**缬沙坦 80mg qd**
|
||||
- 过敏:青霉素
|
||||
|
||||
## 近期症状
|
||||
- 2026-05-24 感冒(进行中,severity 2):鼻塞、低烧
|
||||
- 2026-05-20 头痛(已结束)
|
||||
|
||||
## 关键指标
|
||||
- ⚠️ 收缩压 142 mmHg (参考 <140) — 2026-05-26
|
||||
- 体温 37.2 ℃ (参考 36-37) — 2026-05-25
|
||||
""")
|
||||
.padding()
|
||||
}
|
||||
.background(Tj.Palette.sand)
|
||||
}
|
||||
291
康康/Features/Calendar/CalendarOverviewView.swift
Normal file
@@ -0,0 +1,291 @@
|
||||
import SwiftUI
|
||||
import SwiftData
|
||||
|
||||
enum CalendarMode: String, CaseIterable, Identifiable {
|
||||
case month, year
|
||||
var id: String { rawValue }
|
||||
var label: String {
|
||||
switch self {
|
||||
case .month: return String(appLoc: "月")
|
||||
case .year: return String(appLoc: "年")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// 健康日历总览页。从主页 HomeCalendarCard 进入。
|
||||
/// 月/年切换 + 上下导航 + 图例 + 月视图下方当日详情。日历组件复用 CalendarMonthGrid / CalendarYearGrid。
|
||||
struct CalendarOverviewView: View {
|
||||
/// 进入时定位到的日期(从主页某天点入);nil → 今天。
|
||||
var initialDate: Date = .now
|
||||
/// fullScreenCover 形态下的关闭回调。
|
||||
var onClose: (() -> Void)?
|
||||
|
||||
@Query(sort: \Indicator.capturedAt, order: .reverse)
|
||||
private var indicators: [Indicator]
|
||||
|
||||
@Query(sort: \Report.reportDate, order: .reverse)
|
||||
private var reports: [Report]
|
||||
|
||||
@Query(sort: \DiaryEntry.createdAt, order: .reverse)
|
||||
private var diaries: [DiaryEntry]
|
||||
|
||||
@Query(sort: \Symptom.startedAt, order: .reverse)
|
||||
private var symptoms: [Symptom]
|
||||
|
||||
@State private var mode: CalendarMode = .month
|
||||
@State private var anchor: Date = .now
|
||||
@State private var selectedDate: Date = .now
|
||||
|
||||
private let calendar: Calendar = {
|
||||
var c = Calendar(identifier: .gregorian)
|
||||
c.firstWeekday = 2
|
||||
c.locale = Locale.current
|
||||
return c
|
||||
}()
|
||||
|
||||
@MainActor
|
||||
private var data: CalendarData {
|
||||
CalendarData.build(
|
||||
indicators: indicators,
|
||||
reports: reports,
|
||||
diaries: diaries,
|
||||
symptoms: symptoms
|
||||
)
|
||||
}
|
||||
|
||||
var body: some View {
|
||||
NavigationStack {
|
||||
ScrollView(showsIndicators: false) {
|
||||
VStack(alignment: .leading, spacing: 18) {
|
||||
modeSwitch.padding(.top, 4)
|
||||
anchorBar
|
||||
calendarBody
|
||||
legend
|
||||
if mode == .month {
|
||||
dayDetailInline
|
||||
}
|
||||
}
|
||||
.padding(.horizontal, 20)
|
||||
.padding(.bottom, 24)
|
||||
}
|
||||
.frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .topLeading)
|
||||
.background(Tj.Palette.sand.ignoresSafeArea())
|
||||
.navigationTitle(String(appLoc: "健康日历"))
|
||||
.navigationBarTitleDisplayMode(.inline)
|
||||
.toolbar {
|
||||
ToolbarItem(placement: .topBarLeading) {
|
||||
Button {
|
||||
withAnimation(.snappy(duration: 0.2)) {
|
||||
anchor = .now
|
||||
selectedDate = .now
|
||||
mode = .month
|
||||
}
|
||||
} label: {
|
||||
Text("回到今天")
|
||||
.font(.tjScaled( 13))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
}
|
||||
}
|
||||
ToolbarItem(placement: .topBarTrailing) {
|
||||
if let onClose {
|
||||
Button(action: onClose) {
|
||||
Text("完成")
|
||||
.font(.tjScaled( 15, weight: .semibold))
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
.onAppear {
|
||||
anchor = initialDate
|
||||
selectedDate = initialDate
|
||||
}
|
||||
}
|
||||
|
||||
private var dayDetailInline: some View {
|
||||
VStack(alignment: .leading, spacing: 0) {
|
||||
DayDetailContent(
|
||||
date: selectedDate,
|
||||
indicators: indicators,
|
||||
reports: reports,
|
||||
diaries: diaries,
|
||||
symptoms: symptoms,
|
||||
showHeader: true
|
||||
)
|
||||
.padding(14)
|
||||
}
|
||||
.frame(maxWidth: .infinity, alignment: .leading)
|
||||
.background(
|
||||
RoundedRectangle(cornerRadius: Tj.Radius.md, style: .continuous)
|
||||
.fill(Tj.Palette.paper)
|
||||
)
|
||||
.overlay(
|
||||
RoundedRectangle(cornerRadius: Tj.Radius.md, style: .continuous)
|
||||
.strokeBorder(Tj.Palette.lineSoft, lineWidth: 1)
|
||||
)
|
||||
.animation(.snappy(duration: 0.2), value: selectedDate)
|
||||
}
|
||||
|
||||
private var modeSwitch: some View {
|
||||
HStack(spacing: 0) {
|
||||
ForEach(CalendarMode.allCases) { m in
|
||||
Button {
|
||||
withAnimation(.spring(response: 0.3, dampingFraction: 0.8)) {
|
||||
mode = m
|
||||
}
|
||||
} label: {
|
||||
Text(m.label)
|
||||
.font(.tjScaled( 13, weight: mode == m ? .semibold : .regular))
|
||||
.foregroundStyle(mode == m ? Tj.Palette.paper : Tj.Palette.text)
|
||||
.frame(maxWidth: .infinity)
|
||||
.padding(.vertical, 9)
|
||||
.background(
|
||||
Capsule().fill(mode == m ? Tj.Palette.ink : Color.clear)
|
||||
)
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
}
|
||||
}
|
||||
.padding(3)
|
||||
.background(Capsule().fill(Tj.Palette.paper))
|
||||
.overlay(Capsule().strokeBorder(Tj.Palette.line, lineWidth: 1))
|
||||
.frame(maxWidth: 220)
|
||||
}
|
||||
|
||||
private var anchorBar: some View {
|
||||
HStack {
|
||||
Button { shiftAnchor(-1) } label: {
|
||||
Image(systemName: "chevron.left")
|
||||
.font(.tjScaled( 16, weight: .semibold))
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
.frame(width: 36, height: 36)
|
||||
.background(Circle().fill(Tj.Palette.paper))
|
||||
.overlay(Circle().strokeBorder(Tj.Palette.line, lineWidth: 1))
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
|
||||
Spacer()
|
||||
|
||||
Text(anchorTitle)
|
||||
.font(.tjH2())
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
.contentTransition(.numericText())
|
||||
.animation(.snappy, value: anchor)
|
||||
|
||||
Spacer()
|
||||
|
||||
Button { shiftAnchor(1) } label: {
|
||||
Image(systemName: "chevron.right")
|
||||
.font(.tjScaled( 16, weight: .semibold))
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
.frame(width: 36, height: 36)
|
||||
.background(Circle().fill(Tj.Palette.paper))
|
||||
.overlay(Circle().strokeBorder(Tj.Palette.line, lineWidth: 1))
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
.disabled(isAnchorAtFuture)
|
||||
.opacity(isAnchorAtFuture ? 0.4 : 1)
|
||||
}
|
||||
}
|
||||
|
||||
private var anchorTitle: String {
|
||||
let style: Date.FormatStyle = mode == .month
|
||||
? .dateTime.year().month()
|
||||
: .dateTime.year()
|
||||
return anchor.formatted(style)
|
||||
}
|
||||
|
||||
@ViewBuilder
|
||||
private var calendarBody: some View {
|
||||
switch mode {
|
||||
case .month:
|
||||
CalendarMonthGrid(monthAnchor: anchor, data: data, selectedDate: selectedDate) { day in
|
||||
withAnimation(.snappy(duration: 0.2)) {
|
||||
selectedDate = day
|
||||
}
|
||||
}
|
||||
.padding(14)
|
||||
.background(
|
||||
RoundedRectangle(cornerRadius: Tj.Radius.md, style: .continuous)
|
||||
.fill(Tj.Palette.paper)
|
||||
)
|
||||
.overlay(
|
||||
RoundedRectangle(cornerRadius: Tj.Radius.md, style: .continuous)
|
||||
.strokeBorder(Tj.Palette.lineSoft, lineWidth: 1)
|
||||
)
|
||||
case .year:
|
||||
CalendarYearGrid(
|
||||
year: calendar.component(.year, from: anchor),
|
||||
data: data
|
||||
) { tappedMonth in
|
||||
anchor = tappedMonth
|
||||
withAnimation(.spring(response: 0.3, dampingFraction: 0.8)) {
|
||||
mode = .month
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private var legend: some View {
|
||||
VStack(alignment: .leading, spacing: 8) {
|
||||
Text("图例")
|
||||
.font(.tjScaled( 11, weight: .semibold))
|
||||
.tracking(0.5)
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
HStack(spacing: 14) {
|
||||
legendItem(color: Tj.Palette.brick, label: String(appLoc: "指标异常"))
|
||||
legendItem(color: Tj.Palette.amber, label: String(appLoc: "症状持续中"))
|
||||
legendItem(color: Tj.Palette.ink2, label: String(appLoc: "报告归档"))
|
||||
legendItem(color: Tj.Palette.leaf, label: String(appLoc: "正常"))
|
||||
}
|
||||
}
|
||||
.padding(.top, 4)
|
||||
}
|
||||
|
||||
private func legendItem(color: Color, label: String) -> some View {
|
||||
HStack(spacing: 5) {
|
||||
RoundedRectangle(cornerRadius: 2, style: .continuous)
|
||||
.fill(color)
|
||||
.frame(width: 14, height: 6)
|
||||
Text(label)
|
||||
.font(.tjScaled( 11))
|
||||
.foregroundStyle(Tj.Palette.text2)
|
||||
}
|
||||
}
|
||||
|
||||
private var isAnchorAtFuture: Bool {
|
||||
switch mode {
|
||||
case .month:
|
||||
return calendar.isDate(anchor, equalTo: .now, toGranularity: .month) ||
|
||||
anchor > .now
|
||||
case .year:
|
||||
let nowYear = calendar.component(.year, from: .now)
|
||||
let anchorYear = calendar.component(.year, from: anchor)
|
||||
return anchorYear >= nowYear
|
||||
}
|
||||
}
|
||||
|
||||
private func shiftAnchor(_ delta: Int) {
|
||||
let component: Calendar.Component = (mode == .month) ? .month : .year
|
||||
if let next = calendar.date(byAdding: component, value: delta, to: anchor) {
|
||||
withAnimation(.snappy) {
|
||||
anchor = next
|
||||
if mode == .month {
|
||||
if calendar.isDate(next, equalTo: .now, toGranularity: .month) {
|
||||
selectedDate = .now
|
||||
} else if let first = calendar.dateInterval(of: .month, for: next)?.start {
|
||||
selectedDate = first
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#Preview {
|
||||
CalendarOverviewView(onClose: {})
|
||||
.modelContainer(for: [
|
||||
Indicator.self, Report.self, DiaryEntry.self, Symptom.self, Asset.self
|
||||
], inMemory: true)
|
||||
}
|
||||
@@ -10,6 +10,8 @@ struct CaptureReviewForm: View {
|
||||
let warning: String?
|
||||
let onSave: (ParsedReport) -> Void
|
||||
let onCancel: () -> Void
|
||||
/// 「重新识别」回调。assets 为空(写图失败)时传 nil,banner 上不显示该按钮。
|
||||
var onReanalyze: (() -> Void)? = nil
|
||||
|
||||
var body: some View {
|
||||
ScrollView {
|
||||
@@ -36,10 +38,22 @@ struct CaptureReviewForm: View {
|
||||
HStack(alignment: .top, spacing: 8) {
|
||||
Image(systemName: "exclamationmark.triangle.fill")
|
||||
.foregroundStyle(Tj.Palette.amber)
|
||||
Text(text)
|
||||
.font(.system(size: 12))
|
||||
.foregroundStyle(Tj.Palette.text2)
|
||||
.fixedSize(horizontal: false, vertical: true)
|
||||
VStack(alignment: .leading, spacing: 8) {
|
||||
Text(text)
|
||||
.font(.tjScaled( 12))
|
||||
.foregroundStyle(Tj.Palette.text2)
|
||||
.fixedSize(horizontal: false, vertical: true)
|
||||
if let onReanalyze {
|
||||
Button {
|
||||
onReanalyze()
|
||||
} label: {
|
||||
Label("重新识别", systemImage: "arrow.clockwise")
|
||||
.font(.tjScaled( 12, weight: .semibold))
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
.foregroundStyle(Tj.Palette.ink)
|
||||
}
|
||||
}
|
||||
Spacer(minLength: 0)
|
||||
}
|
||||
.padding(12)
|
||||
@@ -53,7 +67,7 @@ struct CaptureReviewForm: View {
|
||||
|
||||
private var pageThumbnails: some View {
|
||||
VStack(alignment: .leading, spacing: 8) {
|
||||
sectionLabel("已保存 \(assets.count) 页(端侧加密)")
|
||||
sectionLabel(String(appLoc: "已保存 \(assets.count) 页(端侧加密)"))
|
||||
ScrollView(.horizontal, showsIndicators: false) {
|
||||
HStack(spacing: 10) {
|
||||
ForEach(Array(assets.enumerated()), id: \.offset) { _, asset in
|
||||
@@ -78,13 +92,13 @@ struct CaptureReviewForm: View {
|
||||
|
||||
private var metaSection: some View {
|
||||
VStack(alignment: .leading, spacing: 12) {
|
||||
sectionLabel("基本信息")
|
||||
sectionLabel(String(appLoc: "基本信息"))
|
||||
VStack(spacing: 10) {
|
||||
labeledField("标题") {
|
||||
labeledField(String(appLoc: "标题")) {
|
||||
TextField("如:春季年度体检", text: $parsed.title)
|
||||
.textFieldStyle(.plain)
|
||||
}
|
||||
labeledField("类型") {
|
||||
labeledField(String(appLoc: "类型")) {
|
||||
Picker("", selection: $parsed.typeRaw) {
|
||||
ForEach(ReportType.allCases, id: \.rawValue) { t in
|
||||
Text(t.label).tag(t.rawValue)
|
||||
@@ -92,18 +106,18 @@ struct CaptureReviewForm: View {
|
||||
}
|
||||
.pickerStyle(.segmented)
|
||||
}
|
||||
labeledField("报告日期") {
|
||||
labeledField(String(appLoc: "报告日期")) {
|
||||
DatePicker("", selection: $parsed.reportDate,
|
||||
in: ...Date.now,
|
||||
displayedComponents: .date)
|
||||
.datePickerStyle(.compact)
|
||||
.labelsHidden()
|
||||
.environment(\.locale, Locale(identifier: "zh_CN"))
|
||||
.environment(\.locale, Locale.current)
|
||||
}
|
||||
labeledField("机构(可选)") {
|
||||
labeledField(String(appLoc: "机构(可选)")) {
|
||||
TextField("如:协和医院", text: $parsed.institution)
|
||||
}
|
||||
labeledField("摘要(可选)") {
|
||||
labeledField(String(appLoc: "摘要(可选)")) {
|
||||
TextField("一句话总结", text: $parsed.summary, axis: .vertical)
|
||||
.lineLimit(1...3)
|
||||
}
|
||||
@@ -117,7 +131,7 @@ struct CaptureReviewForm: View {
|
||||
private func labeledField<C: View>(_ label: String, @ViewBuilder content: () -> C) -> some View {
|
||||
VStack(alignment: .leading, spacing: 4) {
|
||||
Text(label)
|
||||
.font(.system(size: 11, weight: .medium))
|
||||
.font(.tjScaled( 11, weight: .medium))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
content()
|
||||
}
|
||||
@@ -128,7 +142,7 @@ struct CaptureReviewForm: View {
|
||||
private var indicatorSection: some View {
|
||||
VStack(alignment: .leading, spacing: 10) {
|
||||
HStack {
|
||||
sectionLabel("指标(\(parsed.indicators.count) 项)")
|
||||
sectionLabel(String(appLoc: "指标(\(parsed.indicators.count) 项)"))
|
||||
Spacer()
|
||||
Button {
|
||||
parsed.indicators.append(
|
||||
@@ -136,34 +150,34 @@ struct CaptureReviewForm: View {
|
||||
)
|
||||
} label: {
|
||||
Label("加一项", systemImage: "plus.circle")
|
||||
.font(.system(size: 12, weight: .medium))
|
||||
.font(.tjScaled( 12, weight: .medium))
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
.foregroundStyle(Tj.Palette.ink)
|
||||
}
|
||||
if parsed.indicators.isEmpty {
|
||||
Text("没有指标 — 点上方「加一项」补一行,或直接保存只存图片")
|
||||
.font(.system(size: 12))
|
||||
.font(.tjScaled( 12))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
.padding(.vertical, 8)
|
||||
} else {
|
||||
VStack(spacing: 10) {
|
||||
ForEach(parsed.indicators.indices, id: \.self) { idx in
|
||||
indicatorRow(idx)
|
||||
ForEach($parsed.indicators) { $indicator in
|
||||
indicatorRow($indicator)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private func indicatorRow(_ idx: Int) -> some View {
|
||||
let binding = $parsed.indicators[idx]
|
||||
private func indicatorRow(_ binding: Binding<ParsedReport.ParsedIndicator>) -> some View {
|
||||
let id = binding.wrappedValue.id
|
||||
return VStack(spacing: 8) {
|
||||
HStack(spacing: 8) {
|
||||
TextField("指标名", text: binding.name)
|
||||
.font(.system(size: 14, weight: .medium))
|
||||
.font(.tjScaled( 14, weight: .medium))
|
||||
Button(role: .destructive) {
|
||||
parsed.indicators.remove(at: idx)
|
||||
parsed.indicators.removeAll { $0.id == id }
|
||||
} label: {
|
||||
Image(systemName: "minus.circle.fill")
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
@@ -173,7 +187,7 @@ struct CaptureReviewForm: View {
|
||||
HStack(spacing: 8) {
|
||||
TextField("数值", text: binding.value)
|
||||
.keyboardType(.decimalPad)
|
||||
.font(.system(size: 14, weight: .semibold, design: .monospaced))
|
||||
.font(.tjScaled( 14, weight: .semibold, design: .monospaced))
|
||||
.frame(maxWidth: 90)
|
||||
TextField("单位", text: binding.unit)
|
||||
.frame(maxWidth: 80)
|
||||
@@ -233,7 +247,7 @@ struct CaptureReviewForm: View {
|
||||
|
||||
private func sectionLabel(_ t: String) -> some View {
|
||||
Text(t)
|
||||
.font(.system(size: 12, weight: .semibold))
|
||||
.font(.tjScaled( 12, weight: .semibold))
|
||||
.tracking(0.3)
|
||||
.foregroundStyle(Tj.Palette.text2)
|
||||
}
|
||||
|
||||
@@ -13,10 +13,10 @@ struct PhotoPickerSheet: View {
|
||||
var body: some View {
|
||||
VStack(spacing: 20) {
|
||||
Image(systemName: "photo.on.rectangle.angled")
|
||||
.font(.system(size: 56))
|
||||
.font(.tjScaled( 56))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
Text("模拟器没有摄像头,从相册选一张化验单/体检报告")
|
||||
.font(.system(size: 13))
|
||||
.font(.tjScaled( 13))
|
||||
.foregroundStyle(Tj.Palette.text2)
|
||||
.multilineTextAlignment(.center)
|
||||
|
||||
@@ -24,7 +24,7 @@ struct PhotoPickerSheet: View {
|
||||
maxSelectionCount: 5,
|
||||
matching: .images) {
|
||||
Text("从相册选 ≤5 张")
|
||||
.font(.system(size: 14, weight: .semibold))
|
||||
.font(.tjScaled( 14, weight: .semibold))
|
||||
.frame(maxWidth: .infinity)
|
||||
.padding(.vertical, 12)
|
||||
.background(Tj.Palette.ink)
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import SwiftUI
|
||||
import SwiftData
|
||||
import UIKit
|
||||
import Combine
|
||||
|
||||
/// 拍报告 → VL 识别 → 编辑 → 保存(图 + 结构化文本)
|
||||
/// 一条统一流程,替代原 A1-A3 / B1-B5 两套 mockup。
|
||||
@@ -16,11 +17,17 @@ struct UnifiedCaptureFlow: View {
|
||||
@Environment(\.modelContext) private var ctx
|
||||
let onClose: () -> Void
|
||||
|
||||
@AppStorage("hasSeenCaptureTip") private var hasSeenCaptureTip: Bool = false
|
||||
@State private var phase: Phase = .idle
|
||||
@State private var analyzeTask: Task<Void, Never>? = nil
|
||||
@State private var showTip: Bool = false
|
||||
|
||||
/// VL 单次推理超时(防止卡死);超时后 cancel 子任务,UI 走手动录入回退。
|
||||
private let analyzeTimeoutSeconds: Int = 30
|
||||
|
||||
enum Phase {
|
||||
case idle
|
||||
case analyzing(images: [UIImage])
|
||||
case analyzing(images: [UIImage], assets: [FileVault.SavedAsset]?)
|
||||
case editing(parsed: ParsedReport,
|
||||
assets: [FileVault.SavedAsset],
|
||||
warning: String?)
|
||||
@@ -32,20 +39,30 @@ struct UnifiedCaptureFlow: View {
|
||||
.background(Tj.Palette.sand.ignoresSafeArea())
|
||||
.toolbar {
|
||||
ToolbarItem(placement: .topBarLeading) {
|
||||
Button("取消") { onClose() }
|
||||
Button("取消") { cancelAll() }
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
}
|
||||
}
|
||||
.navigationTitle(phaseTitle)
|
||||
.navigationBarTitleDisplayMode(.inline)
|
||||
}
|
||||
.onAppear {
|
||||
if !hasSeenCaptureTip { showTip = true }
|
||||
}
|
||||
.sheet(isPresented: $showTip) {
|
||||
CaptureTipSheet(onDismiss: {
|
||||
hasSeenCaptureTip = true
|
||||
showTip = false
|
||||
})
|
||||
.presentationDetents([.medium])
|
||||
}
|
||||
}
|
||||
|
||||
private var phaseTitle: String {
|
||||
switch phase {
|
||||
case .idle: return "拍摄报告"
|
||||
case .analyzing: return "本地识别中…"
|
||||
case .editing: return "核对识别结果"
|
||||
case .idle: return String(appLoc: "拍摄报告")
|
||||
case .analyzing: return String(appLoc: "本地识别中…")
|
||||
case .editing: return String(appLoc: "核对识别结果")
|
||||
}
|
||||
}
|
||||
|
||||
@@ -54,21 +71,57 @@ struct UnifiedCaptureFlow: View {
|
||||
switch phase {
|
||||
case .idle:
|
||||
captureEntry
|
||||
case .analyzing(let images):
|
||||
AnalyzingView(images: images)
|
||||
case .analyzing(let images, _):
|
||||
AnalyzingView(
|
||||
images: images,
|
||||
timeoutSeconds: analyzeTimeoutSeconds,
|
||||
onCancel: {
|
||||
analyzeTask?.cancel()
|
||||
analyzeTask = nil
|
||||
phase = .idle
|
||||
}
|
||||
)
|
||||
case .editing(let parsed, let assets, let warning):
|
||||
CaptureReviewForm(
|
||||
parsed: parsed,
|
||||
assets: assets,
|
||||
warning: warning,
|
||||
onSave: { final in saveAll(parsed: final, assets: assets) },
|
||||
onCancel: onClose
|
||||
onCancel: cancelAll,
|
||||
onReanalyze: assets.isEmpty ? nil : { reanalyze(assets: assets) }
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - 取消统一入口
|
||||
|
||||
/// 取消推理 + 清理未保存到 SwiftData 的 Vault 孤儿图片,再关闭 sheet。
|
||||
/// 工具栏「取消」与编辑表单底部「取消(图片不保留)」都走这里,
|
||||
/// 保证「图片不保留」的隐私承诺(§6)真的成立,且 Vault 不被孤儿图片堆爆。
|
||||
/// 仅清理 .analyzing/.editing 阶段的 assets;.idle 时还没写图,无需清理。
|
||||
private func cancelAll() {
|
||||
analyzeTask?.cancel()
|
||||
analyzeTask = nil
|
||||
switch phase {
|
||||
case .idle:
|
||||
break
|
||||
case .analyzing(_, let maybeAssets):
|
||||
if let assets = maybeAssets { removeOrphans(assets) }
|
||||
case .editing(_, let assets, _):
|
||||
removeOrphans(assets)
|
||||
}
|
||||
onClose()
|
||||
}
|
||||
|
||||
private func removeOrphans(_ assets: [FileVault.SavedAsset]) {
|
||||
for a in assets {
|
||||
try? FileVault.shared.remove(relativePath: a.relativePath)
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - 入口:相机 / 相册
|
||||
|
||||
@ViewBuilder
|
||||
private var captureEntry: some View {
|
||||
#if targetEnvironment(simulator)
|
||||
PhotoPickerSheet(
|
||||
@@ -95,54 +148,124 @@ struct UnifiedCaptureFlow: View {
|
||||
|
||||
private func startAnalyze(images: [UIImage]) {
|
||||
guard !images.isEmpty else { onClose(); return }
|
||||
phase = .analyzing(images: images)
|
||||
Task {
|
||||
do {
|
||||
let result = try await CaptureService.shared.analyze(images: images)
|
||||
await MainActor.run {
|
||||
phase = .editing(
|
||||
parsed: result.parsed,
|
||||
assets: result.assets,
|
||||
warning: result.parsed.isEmpty
|
||||
? "识别没有读出指标,请手动补充"
|
||||
: nil
|
||||
)
|
||||
}
|
||||
} catch let CaptureError.parseFailed(msg) {
|
||||
// 解析失败:仍然展示编辑表单,只是 indicators 为空,assets 已保存
|
||||
await fallbackToManual(images: images, msg: "VL 输出无法解析:\(msg)")
|
||||
} catch let CaptureError.inferenceFailed(msg) {
|
||||
await fallbackToManual(images: images, msg: "推理失败:\(msg)")
|
||||
} catch let CaptureError.modelNotReady {
|
||||
await fallbackToManual(images: images, msg: "VL 模型未就绪,先手动录入")
|
||||
} catch CaptureError.writeAssetFailed {
|
||||
analyzeTask?.cancel()
|
||||
phase = .analyzing(images: images, assets: nil)
|
||||
let timeout = analyzeTimeoutSeconds
|
||||
analyzeTask = Task {
|
||||
// Step 1: 先把图写进 Vault。
|
||||
// 在 UI 这一层写,而不是塞进 CaptureService.analyze —— 这样取消/失败回退时,
|
||||
// assets 已经在 phase 里,cancelAll 能清理孤儿,editingFallback 也不必再补写。
|
||||
let assets = images.compactMap { try? FileVault.shared.writeJPEG($0) }
|
||||
// 极端情况:用户在写图过程中按了「取消」,View 已 dismiss、cancelAll 看到的
|
||||
// phase 还是 .analyzing(_, nil),清不到这批刚写完的图 — 这里手动收尾。
|
||||
if Task.isCancelled {
|
||||
for a in assets { try? FileVault.shared.remove(relativePath: a.relativePath) }
|
||||
return
|
||||
}
|
||||
guard !assets.isEmpty else {
|
||||
await MainActor.run {
|
||||
phase = .editing(
|
||||
parsed: .empty(),
|
||||
assets: [],
|
||||
warning: "图片保存失败,手动录入并保留文本"
|
||||
warning: String(appLoc: "图片保存失败,手动录入并保留文本")
|
||||
)
|
||||
}
|
||||
return
|
||||
}
|
||||
// 把 assets 暴露给 phase,使工具栏「取消」也能找到孤儿清理。
|
||||
await MainActor.run {
|
||||
if case .analyzing(let imgs, _) = phase {
|
||||
phase = .analyzing(images: imgs, assets: assets)
|
||||
}
|
||||
}
|
||||
|
||||
// Step 2: VL 推理(timeout 哨兵到点 cancel 父任务,VLSession 在下一个 token break)。
|
||||
let watchdog = Task {
|
||||
try? await Task.sleep(for: .seconds(timeout))
|
||||
analyzeTask?.cancel()
|
||||
}
|
||||
defer { watchdog.cancel() }
|
||||
|
||||
do {
|
||||
let parsed = try await CaptureService.shared.reanalyze(assets: assets)
|
||||
if Task.isCancelled {
|
||||
await editingFallback(assets: assets,
|
||||
msg: String(appLoc: "识别超时(>\(timeout)s),先手动录入"))
|
||||
return
|
||||
}
|
||||
await MainActor.run {
|
||||
phase = .editing(
|
||||
parsed: parsed,
|
||||
assets: assets,
|
||||
warning: parsed.isEmpty ? String(appLoc: "识别没有读出指标,请手动补充") : nil
|
||||
)
|
||||
}
|
||||
} catch let CaptureError.parseFailed(msg) {
|
||||
await editingFallback(assets: assets, msg: String(appLoc: "VL 输出无法解析:\(msg)"))
|
||||
} catch let CaptureError.inferenceFailed(msg) {
|
||||
await editingFallback(assets: assets,
|
||||
msg: Task.isCancelled
|
||||
? String(appLoc: "识别超时(>\(timeout)s),先手动录入")
|
||||
: String(appLoc: "推理失败:\(msg)"))
|
||||
} catch CaptureError.modelNotReady {
|
||||
await editingFallback(assets: assets, msg: String(appLoc: "VL 模型未就绪,先手动录入"))
|
||||
} catch {
|
||||
await fallbackToManual(images: images, msg: "未知错误:\(error.localizedDescription)")
|
||||
await editingFallback(assets: assets,
|
||||
msg: String(appLoc: "未知错误:\(error.localizedDescription)"))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private func fallbackToManual(images: [UIImage], msg: String) async {
|
||||
// 即便 VL 失败,图片应当已经写入了 Vault(在 CaptureService.analyze 第 1 步)。
|
||||
// 但若是 writeAsset 之前的失败(modelNotReady / inferenceFailed),
|
||||
// 这里再补一次写,保证图不丢。
|
||||
var assets: [FileVault.SavedAsset] = []
|
||||
for img in images {
|
||||
if let a = try? FileVault.shared.writeJPEG(img) { assets.append(a) }
|
||||
/// 「重新识别」:复用已存 assets,不再写图,只重跑 VL。
|
||||
private func reanalyze(assets: [FileVault.SavedAsset]) {
|
||||
analyzeTask?.cancel()
|
||||
// 这里没有原始 UIImage,AnalyzingView 显示首张缩略图即可
|
||||
let thumbnails: [UIImage] = assets.compactMap {
|
||||
try? FileVault.shared.loadImage(relativePath: $0.relativePath)
|
||||
}
|
||||
phase = .analyzing(images: thumbnails, assets: assets)
|
||||
let timeout = analyzeTimeoutSeconds
|
||||
analyzeTask = Task {
|
||||
let watchdog = Task {
|
||||
try? await Task.sleep(for: .seconds(timeout))
|
||||
analyzeTask?.cancel()
|
||||
}
|
||||
defer { watchdog.cancel() }
|
||||
|
||||
do {
|
||||
let parsed = try await CaptureService.shared.reanalyze(assets: assets)
|
||||
if Task.isCancelled {
|
||||
await editingFallback(assets: assets,
|
||||
msg: String(appLoc: "识别超时(>\(timeout)s),保留旧编辑"))
|
||||
return
|
||||
}
|
||||
await MainActor.run {
|
||||
phase = .editing(
|
||||
parsed: parsed,
|
||||
assets: assets,
|
||||
warning: parsed.isEmpty ? String(appLoc: "重新识别没有读出新指标") : nil
|
||||
)
|
||||
}
|
||||
} catch CaptureError.modelNotReady {
|
||||
await editingFallback(assets: assets, msg: String(appLoc: "VL 模型未就绪"))
|
||||
} catch let CaptureError.parseFailed(msg) {
|
||||
await editingFallback(assets: assets, msg: String(appLoc: "VL 输出无法解析:\(msg)"))
|
||||
} catch let CaptureError.inferenceFailed(msg) {
|
||||
await editingFallback(assets: assets,
|
||||
msg: Task.isCancelled
|
||||
? String(appLoc: "识别超时(>\(timeout)s)")
|
||||
: String(appLoc: "推理失败:\(msg)"))
|
||||
} catch {
|
||||
await editingFallback(assets: assets,
|
||||
msg: String(appLoc: "未知错误:\(error.localizedDescription)"))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// reanalyze 失败时回到 editing,保留 assets 但清空 parsed。
|
||||
private func editingFallback(assets: [FileVault.SavedAsset], msg: String) async {
|
||||
await MainActor.run {
|
||||
phase = .editing(
|
||||
parsed: .empty(),
|
||||
assets: assets,
|
||||
warning: msg
|
||||
)
|
||||
phase = .editing(parsed: .empty(), assets: assets, warning: msg)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -151,7 +274,7 @@ struct UnifiedCaptureFlow: View {
|
||||
private func saveAll(parsed final: ParsedReport,
|
||||
assets: [FileVault.SavedAsset]) {
|
||||
let report = Report(
|
||||
title: final.title.isEmpty ? "拍摄识别" : final.title,
|
||||
title: final.title.isEmpty ? String(appLoc: "拍摄识别") : final.title,
|
||||
type: ReportType(rawValue: final.typeRaw) ?? .other,
|
||||
reportDate: final.reportDate,
|
||||
institution: final.institution.isEmpty ? nil : final.institution,
|
||||
@@ -176,7 +299,13 @@ struct UnifiedCaptureFlow: View {
|
||||
range: ind.range,
|
||||
status: ind.status,
|
||||
capturedAt: final.reportDate,
|
||||
report: report
|
||||
report: report,
|
||||
source: .report,
|
||||
sourcePageIndex: ind.sourcePageIndex,
|
||||
sourceBoxX: ind.sourceBoxX,
|
||||
sourceBoxY: ind.sourceBoxY,
|
||||
sourceBoxWidth: ind.sourceBoxWidth,
|
||||
sourceBoxHeight: ind.sourceBoxHeight
|
||||
)
|
||||
ctx.insert(i)
|
||||
}
|
||||
@@ -190,6 +319,11 @@ struct UnifiedCaptureFlow: View {
|
||||
|
||||
private struct AnalyzingView: View {
|
||||
let images: [UIImage]
|
||||
let timeoutSeconds: Int
|
||||
let onCancel: () -> Void
|
||||
|
||||
@State private var elapsed: Int = 0
|
||||
private let tick = Timer.publish(every: 1, on: .main, in: .common).autoconnect()
|
||||
|
||||
var body: some View {
|
||||
VStack(spacing: 20) {
|
||||
@@ -216,13 +350,72 @@ private struct AnalyzingView: View {
|
||||
Text("本地识别中")
|
||||
.font(.tjH2())
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
Text("\(images.count) 页 · 100% 本地推理")
|
||||
.font(.system(size: 12))
|
||||
Text("\(images.count) 页 · 100% 本地推理 · 已用 \(elapsed)s")
|
||||
.font(.tjScaled( 12))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
if elapsed >= timeoutSeconds - 5 {
|
||||
Text("快超时了,>\(timeoutSeconds)s 会自动转为手动录入")
|
||||
.font(.tjScaled( 11))
|
||||
.foregroundStyle(Tj.Palette.amber)
|
||||
}
|
||||
}
|
||||
Button("取消识别 · 改为手动录入", action: onCancel)
|
||||
.font(.tjScaled( 13, weight: .medium))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
.padding(.top, 4)
|
||||
Spacer()
|
||||
}
|
||||
.padding(.horizontal, 20)
|
||||
.frame(maxWidth: .infinity, maxHeight: .infinity)
|
||||
.onReceive(tick) { _ in elapsed += 1 }
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - 一次性使用提示
|
||||
|
||||
private struct CaptureTipSheet: View {
|
||||
let onDismiss: () -> Void
|
||||
|
||||
var body: some View {
|
||||
VStack(alignment: .leading, spacing: 16) {
|
||||
HStack(spacing: 10) {
|
||||
Image(systemName: "doc.viewfinder")
|
||||
.font(.tjScaled( 28))
|
||||
.foregroundStyle(Tj.Palette.ink)
|
||||
Text("拍报告的小贴士")
|
||||
.font(.tjH2())
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
}
|
||||
VStack(alignment: .leading, spacing: 12) {
|
||||
tip(String(appLoc: "纸张铺平,避免反光、阴影"))
|
||||
tip(String(appLoc: "整页入框,避免裁切到指标"))
|
||||
tip(String(appLoc: "多页报告可连拍,系统自动透视校正"))
|
||||
tip(String(appLoc: "识别全程在本地,图片不会上传"))
|
||||
}
|
||||
Spacer()
|
||||
Button {
|
||||
onDismiss()
|
||||
} label: {
|
||||
Text("我知道了,开始拍")
|
||||
.frame(maxWidth: .infinity)
|
||||
}
|
||||
.buttonStyle(TjPrimaryButton())
|
||||
}
|
||||
.padding(24)
|
||||
.frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .topLeading)
|
||||
.background(Tj.Palette.sand.ignoresSafeArea())
|
||||
}
|
||||
|
||||
private func tip(_ text: String) -> some View {
|
||||
HStack(alignment: .top, spacing: 10) {
|
||||
Image(systemName: "checkmark.circle.fill")
|
||||
.foregroundStyle(Tj.Palette.leaf)
|
||||
.padding(.top, 2)
|
||||
Text(text)
|
||||
.font(.tjSerifBody())
|
||||
.foregroundStyle(Tj.Palette.text2)
|
||||
.fixedSize(horizontal: false, vertical: true)
|
||||
Spacer()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,10 @@
|
||||
import SwiftUI
|
||||
import SwiftData
|
||||
|
||||
/// 「健康记录」录入 sheet。
|
||||
/// 主体仍是 DiaryEntry @Model;UI/文案改为面向健康记录,并加 AI 辅助区:
|
||||
/// 让 Qwen3 从医生问诊角度提 3-4 个追问,用户可一键将「补充模板」追加到输入框。
|
||||
/// 支持多轮——每轮把已问过的 q 传给 LLM 要求别重复;已采纳的 row 灰色 + ✓ 标记。
|
||||
struct DiaryQuickSheet: View {
|
||||
@Environment(\.modelContext) private var ctx
|
||||
@Environment(\.dismiss) private var dismiss
|
||||
@@ -8,9 +12,41 @@ struct DiaryQuickSheet: View {
|
||||
@State private var content: String = ""
|
||||
@State private var createdAt: Date = .now
|
||||
|
||||
private var canSubmit: Bool {
|
||||
/// AI 辅助状态
|
||||
enum AssistPhase {
|
||||
case idle // 从未生成
|
||||
case loading // 正在 LLM 调用
|
||||
case ready // 有结果显示,等待下一轮 / 采纳 / 重试
|
||||
case failed(Error) // 最近一次失败
|
||||
}
|
||||
@State private var phase: AssistPhase = .idle
|
||||
@State private var questions: [DiaryAssistService.Question] = []
|
||||
@State private var lastRate: Double = 0
|
||||
@State private var currentRound: Int = 0
|
||||
/// 累积已覆盖的问诊维度(question.dim),回传下一轮 prompt 用于按维度去重。
|
||||
@State private var coveredDims: Set<String> = []
|
||||
@State private var suggestTask: Task<Void, Never>?
|
||||
/// 当前正在「就地填空」的 question id;nil = 没有展开的填空面板。
|
||||
@State private var fillingId: UUID?
|
||||
/// 当前填空面板各占位槽的输入值,长度 = 该模板占位数。
|
||||
@State private var fillValues: [String] = []
|
||||
/// 上一轮「再问一轮」没问出任何新维度(全被去重)时为 true,提示用户已覆盖主要维度。
|
||||
@State private var exhaustedNote = false
|
||||
/// sheet detent。默认 large,确保建议面板有足够展示空间。
|
||||
/// 仍保留 medium,用户可手动下拉收回为半屏(纯写文本时更轻量)。
|
||||
@State private var detent: PresentationDetent = .large
|
||||
@FocusState private var contentFocused: Bool
|
||||
|
||||
private var hasContent: Bool {
|
||||
!content.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty
|
||||
}
|
||||
private var hasQuestions: Bool { !questions.isEmpty }
|
||||
private var isLoading: Bool {
|
||||
if case .loading = phase { return true }
|
||||
return false
|
||||
}
|
||||
private var canRequestSuggest: Bool { hasContent && !isLoading }
|
||||
private var canSubmit: Bool { hasContent }
|
||||
|
||||
var body: some View {
|
||||
VStack(spacing: 0) {
|
||||
@@ -21,44 +57,71 @@ struct DiaryQuickSheet: View {
|
||||
.padding(.bottom, 14)
|
||||
|
||||
HStack {
|
||||
Text("写日记")
|
||||
.font(.tjH2())
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
VStack(alignment: .leading, spacing: 2) {
|
||||
Text("健康记录")
|
||||
.font(.tjH2())
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
Text("记录身体状态 · 可让 AI 多轮辅助查漏补缺")
|
||||
.font(.tjScaled( 11))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
}
|
||||
Spacer()
|
||||
Text("本机保存")
|
||||
.font(.system(size: 12))
|
||||
.font(.tjScaled( 12))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
}
|
||||
.padding(.horizontal, 20)
|
||||
.padding(.bottom, 16)
|
||||
.padding(.bottom, 14)
|
||||
|
||||
VStack(alignment: .leading, spacing: 16) {
|
||||
VStack(alignment: .leading, spacing: 8) {
|
||||
sectionLabel("内容")
|
||||
TextField("今天怎么样?", text: $content, axis: .vertical)
|
||||
.lineLimit(4...10)
|
||||
.padding(.horizontal, 14)
|
||||
.padding(.vertical, 12)
|
||||
.background(
|
||||
RoundedRectangle(cornerRadius: Tj.Radius.sm, style: .continuous)
|
||||
.fill(Tj.Palette.paper)
|
||||
)
|
||||
.overlay(
|
||||
RoundedRectangle(cornerRadius: Tj.Radius.sm, style: .continuous)
|
||||
.strokeBorder(Tj.Palette.line, lineWidth: 1)
|
||||
)
|
||||
ScrollViewReader { proxy in
|
||||
ScrollView(showsIndicators: false) {
|
||||
VStack(alignment: .leading, spacing: 16) {
|
||||
VStack(alignment: .leading, spacing: 8) {
|
||||
sectionLabel(String(appLoc: "内容"))
|
||||
TextField("今天身体怎么样?吃了什么药、有什么感觉?",
|
||||
text: $content, axis: .vertical)
|
||||
.lineLimit(3...8)
|
||||
.focused($contentFocused)
|
||||
.onChange(of: content) { _, _ in exhaustedNote = false }
|
||||
.padding(.horizontal, 14)
|
||||
.padding(.vertical, 12)
|
||||
.background(
|
||||
RoundedRectangle(cornerRadius: Tj.Radius.sm, style: .continuous)
|
||||
.fill(Tj.Palette.paper)
|
||||
)
|
||||
.overlay(
|
||||
RoundedRectangle(cornerRadius: Tj.Radius.sm, style: .continuous)
|
||||
.strokeBorder(Tj.Palette.line, lineWidth: 1)
|
||||
)
|
||||
}
|
||||
|
||||
assistSection
|
||||
|
||||
VStack(alignment: .leading, spacing: 8) {
|
||||
sectionLabel(String(appLoc: "时间"))
|
||||
DatePicker("", selection: $createdAt, in: ...Date.now)
|
||||
.datePickerStyle(.compact)
|
||||
.labelsHidden()
|
||||
}
|
||||
// 底部锚点,新一轮 question 进来后自动滚到这里
|
||||
Color.clear.frame(height: 1).id("assist-bottom")
|
||||
}
|
||||
.padding(.horizontal, 20)
|
||||
.padding(.bottom, 6)
|
||||
}
|
||||
|
||||
VStack(alignment: .leading, spacing: 8) {
|
||||
sectionLabel("时间")
|
||||
DatePicker("", selection: $createdAt, in: ...Date.now)
|
||||
.datePickerStyle(.compact)
|
||||
.labelsHidden()
|
||||
.scrollDismissesKeyboard(.interactively)
|
||||
.onChange(of: questions.count) { old, new in
|
||||
guard new > old else { return }
|
||||
// 滚到新一轮的 round divider(让用户先看到「第 N 轮」的标签,
|
||||
// 再依次看到这一轮的 questions)
|
||||
let roundId = "round-\(questions[old].round)"
|
||||
DispatchQueue.main.asyncAfter(deadline: .now() + 0.05) {
|
||||
withAnimation(.easeOut(duration: 0.25)) {
|
||||
proxy.scrollTo(roundId, anchor: .top)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
.padding(.horizontal, 20)
|
||||
|
||||
Spacer(minLength: 12)
|
||||
|
||||
HStack(spacing: 12) {
|
||||
Button("取消") { dismiss() }
|
||||
@@ -76,19 +139,423 @@ struct DiaryQuickSheet: View {
|
||||
.clipShape(RoundedRectangle(cornerRadius: Tj.Radius.xl, style: .continuous))
|
||||
.ignoresSafeArea(edges: .bottom)
|
||||
)
|
||||
.presentationDetents([.medium, .large])
|
||||
.presentationDetents([.medium, .large], selection: $detent)
|
||||
.presentationDragIndicator(.hidden)
|
||||
.presentationBackground(Tj.Palette.sand)
|
||||
.presentationCornerRadius(Tj.Radius.xl)
|
||||
.onDisappear { suggestTask?.cancel() }
|
||||
}
|
||||
|
||||
// MARK: - AI 辅助区
|
||||
|
||||
@ViewBuilder
|
||||
private var assistSection: some View {
|
||||
VStack(alignment: .leading, spacing: 10) {
|
||||
// section header
|
||||
HStack(spacing: 6) {
|
||||
Image(systemName: "sparkles")
|
||||
.font(.tjScaled( 11, weight: .semibold))
|
||||
.foregroundStyle(Tj.Palette.brick)
|
||||
sectionLabel(String(appLoc: "AI 辅助 · 医生角度查漏补缺"))
|
||||
Spacer()
|
||||
if hasQuestions {
|
||||
Text("\(questions.count) 个建议")
|
||||
.font(.tjScaled( 10, design: .monospaced))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
}
|
||||
if lastRate > 0 {
|
||||
Text(String(format: "%.1f tok/s", lastRate))
|
||||
.font(.tjScaled( 10, design: .monospaced))
|
||||
.foregroundStyle(Tj.Palette.leaf)
|
||||
}
|
||||
}
|
||||
|
||||
// 累积的 questions 列表(多轮,带轮次分隔)
|
||||
if hasQuestions {
|
||||
VStack(spacing: 8) {
|
||||
ForEach(Array(questions.enumerated()), id: \.element.id) { idx, q in
|
||||
if idx == 0 || questions[idx - 1].round != q.round {
|
||||
roundDivider(round: q.round,
|
||||
count: questions.filter { $0.round == q.round }.count)
|
||||
.id("round-\(q.round)")
|
||||
}
|
||||
questionRow(index: roundLocalIndex(at: idx), question: q)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if exhaustedNote {
|
||||
HStack(spacing: 6) {
|
||||
Image(systemName: "checkmark.seal.fill")
|
||||
.font(.tjScaled( 11))
|
||||
.foregroundStyle(Tj.Palette.leaf)
|
||||
Text("已覆盖主要问诊维度;补充原文后可再追问")
|
||||
.font(.tjScaled( 11))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
Spacer(minLength: 0)
|
||||
}
|
||||
.padding(.vertical, 2)
|
||||
}
|
||||
|
||||
// 底部主操作按钮(状态机驱动)
|
||||
phaseFooter
|
||||
}
|
||||
}
|
||||
|
||||
@ViewBuilder
|
||||
private var phaseFooter: some View {
|
||||
switch phase {
|
||||
case .idle:
|
||||
assistPrimaryButton(
|
||||
icon: "sparkles",
|
||||
label: canRequestSuggest
|
||||
? String(appLoc: "让 AI 帮我想想还能记什么")
|
||||
: String(appLoc: "先写几个字,AI 来帮忙补充"),
|
||||
enabled: canRequestSuggest,
|
||||
action: requestSuggestions
|
||||
)
|
||||
|
||||
case .loading:
|
||||
HStack(spacing: 10) {
|
||||
ProgressView().controlSize(.small)
|
||||
Text("AI 思考中… 本地推理,通常 5-10 秒")
|
||||
.font(.tjScaled( 13))
|
||||
.foregroundStyle(Tj.Palette.text2)
|
||||
Spacer()
|
||||
Button("取消") { cancelSuggestions() }
|
||||
.font(.tjScaled( 12, weight: .semibold))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
}
|
||||
.padding(.vertical, 11)
|
||||
.padding(.horizontal, 12)
|
||||
.background(
|
||||
RoundedRectangle(cornerRadius: Tj.Radius.sm, style: .continuous)
|
||||
.fill(Tj.Palette.paper)
|
||||
)
|
||||
.overlay(
|
||||
RoundedRectangle(cornerRadius: Tj.Radius.sm, style: .continuous)
|
||||
.strokeBorder(Tj.Palette.lineSoft, lineWidth: 1)
|
||||
)
|
||||
|
||||
case .ready:
|
||||
assistPrimaryButton(
|
||||
icon: "arrow.clockwise",
|
||||
label: canRequestSuggest
|
||||
? String(appLoc: "再问一轮 · 让 AI 从新角度追问")
|
||||
: String(appLoc: "更新一下原文,再让 AI 继续追问"),
|
||||
enabled: canRequestSuggest,
|
||||
action: requestSuggestions
|
||||
)
|
||||
|
||||
case .failed(let err):
|
||||
VStack(alignment: .leading, spacing: 8) {
|
||||
HStack(spacing: 6) {
|
||||
Image(systemName: "exclamationmark.triangle.fill")
|
||||
.foregroundStyle(Tj.Palette.brick)
|
||||
Text(err.localizedDescription)
|
||||
.font(.tjScaled( 12))
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
Spacer()
|
||||
}
|
||||
Button { requestSuggestions() } label: {
|
||||
Text("重试")
|
||||
.font(.tjScaled( 12, weight: .semibold))
|
||||
.foregroundStyle(Tj.Palette.ink)
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
}
|
||||
.padding(10)
|
||||
.frame(maxWidth: .infinity, alignment: .leading)
|
||||
.background(
|
||||
RoundedRectangle(cornerRadius: Tj.Radius.sm, style: .continuous)
|
||||
.fill(Tj.Palette.brickSoft.opacity(0.5))
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
private func assistPrimaryButton(icon: String,
|
||||
label: String,
|
||||
enabled: Bool,
|
||||
action: @escaping () -> Void) -> some View {
|
||||
Button(action: action) {
|
||||
HStack(spacing: 8) {
|
||||
Image(systemName: icon)
|
||||
Text(label)
|
||||
}
|
||||
.font(.tjScaled( 13, weight: .semibold))
|
||||
.foregroundStyle(enabled ? Tj.Palette.ink : Tj.Palette.text3)
|
||||
.frame(maxWidth: .infinity)
|
||||
.padding(.vertical, 11)
|
||||
.background(
|
||||
RoundedRectangle(cornerRadius: Tj.Radius.sm, style: .continuous)
|
||||
.strokeBorder(
|
||||
enabled ? Tj.Palette.ink : Tj.Palette.line,
|
||||
style: StrokeStyle(lineWidth: 1, dash: enabled ? [] : [3, 3])
|
||||
)
|
||||
)
|
||||
// 纯描边背景、内部透明:补 contentShape 让整框可点(否则只有图标+文字本体能点)。
|
||||
.contentShape(Rectangle())
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
.disabled(!enabled)
|
||||
}
|
||||
|
||||
/// 给定整张 questions list 里 idx 位置的 question,返回它在自己 round 内的序号(1-based)。
|
||||
private func roundLocalIndex(at idx: Int) -> Int {
|
||||
let target = questions[idx].round
|
||||
var count = 0
|
||||
for i in 0...idx where questions[i].round == target {
|
||||
count += 1
|
||||
}
|
||||
return count
|
||||
}
|
||||
|
||||
/// 第 N 轮的分隔条 —— 让用户清楚下一轮 LLM 看到的是更新过的最新文本。
|
||||
private func roundDivider(round: Int, count: Int) -> some View {
|
||||
HStack(spacing: 8) {
|
||||
HStack(spacing: 6) {
|
||||
Image(systemName: round == 1 ? "1.circle.fill" : "arrow.triangle.2.circlepath")
|
||||
.font(.tjScaled( 11, weight: .semibold))
|
||||
.foregroundStyle(Tj.Palette.brick)
|
||||
Text(round == 1
|
||||
? String(appLoc: "第 1 轮 · \(count) 条")
|
||||
: String(appLoc: "第 \(round) 轮 · 基于你刚才更新的文本 · \(count) 条"))
|
||||
.font(.tjScaled( 11, weight: .semibold))
|
||||
.tracking(0.3)
|
||||
.foregroundStyle(Tj.Palette.text2)
|
||||
}
|
||||
Rectangle()
|
||||
.fill(Tj.Palette.line)
|
||||
.frame(height: 1)
|
||||
.mask(
|
||||
HStack(spacing: 3) {
|
||||
ForEach(0..<60, id: \.self) { _ in
|
||||
Rectangle().frame(width: 3, height: 1)
|
||||
}
|
||||
}
|
||||
)
|
||||
}
|
||||
.padding(.top, round == 1 ? 0 : 6)
|
||||
}
|
||||
|
||||
private func questionRow(index: Int, question: DiaryAssistService.Question) -> some View {
|
||||
let adopted = question.adopted
|
||||
let filling = fillingId == question.id
|
||||
return VStack(alignment: .leading, spacing: 6) {
|
||||
HStack(alignment: .top, spacing: 8) {
|
||||
Text("\(index).")
|
||||
.font(.tjScaled( 13, weight: .semibold, design: .monospaced))
|
||||
.foregroundStyle(adopted ? Tj.Palette.text3 : Tj.Palette.brick)
|
||||
Text(question.q)
|
||||
.font(.tjScaled( 13, weight: .medium))
|
||||
.foregroundStyle(adopted ? Tj.Palette.text3 : Tj.Palette.text)
|
||||
.strikethrough(adopted, color: Tj.Palette.text3)
|
||||
.fixedSize(horizontal: false, vertical: true)
|
||||
Spacer(minLength: 4)
|
||||
|
||||
if adopted {
|
||||
HStack(spacing: 4) {
|
||||
Image(systemName: "checkmark")
|
||||
.font(.tjScaled( 10, weight: .bold))
|
||||
Text("已采纳")
|
||||
.font(.tjScaled( 11, weight: .semibold))
|
||||
}
|
||||
.foregroundStyle(Tj.Palette.leaf)
|
||||
.padding(.horizontal, 8)
|
||||
.padding(.vertical, 5)
|
||||
.background(Capsule().fill(Tj.Palette.leafSoft))
|
||||
} else if !filling {
|
||||
Button { adopt(question) } label: {
|
||||
HStack(spacing: 4) {
|
||||
Image(systemName: "plus.circle.fill")
|
||||
.font(.tjScaled( 12))
|
||||
Text("采纳")
|
||||
.font(.tjScaled( 12, weight: .semibold))
|
||||
}
|
||||
.foregroundStyle(Tj.Palette.paper)
|
||||
.padding(.horizontal, 10)
|
||||
.padding(.vertical, 5)
|
||||
.background(Capsule().fill(Tj.Palette.ink))
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
}
|
||||
}
|
||||
if filling {
|
||||
QuestionFillPanel(
|
||||
template: question.fill,
|
||||
values: $fillValues,
|
||||
onCommit: { assembled in commitAdoption(question, text: assembled) },
|
||||
onCancel: { closeFill() }
|
||||
)
|
||||
} else if !question.fill.isEmpty && !adopted {
|
||||
HStack(alignment: .top, spacing: 4) {
|
||||
Text("将追加:")
|
||||
.font(.tjScaled( 11))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
Text(question.fill)
|
||||
.font(.tjScaled( 11))
|
||||
.foregroundStyle(Tj.Palette.text2)
|
||||
.fixedSize(horizontal: false, vertical: true)
|
||||
}
|
||||
.padding(.leading, 22)
|
||||
}
|
||||
}
|
||||
.padding(10)
|
||||
.frame(maxWidth: .infinity, alignment: .leading)
|
||||
.background(
|
||||
RoundedRectangle(cornerRadius: Tj.Radius.sm, style: .continuous)
|
||||
.fill(adopted ? Tj.Palette.sand2 : Tj.Palette.paper)
|
||||
)
|
||||
.overlay(
|
||||
RoundedRectangle(cornerRadius: Tj.Radius.sm, style: .continuous)
|
||||
.strokeBorder(Tj.Palette.lineSoft, lineWidth: 1)
|
||||
)
|
||||
}
|
||||
|
||||
// MARK: - Actions
|
||||
|
||||
private func sectionLabel(_ text: String) -> some View {
|
||||
Text(text)
|
||||
.font(.system(size: 12, weight: .semibold))
|
||||
.font(.tjScaled( 12, weight: .semibold))
|
||||
.tracking(0.3)
|
||||
.foregroundStyle(Tj.Palette.text2)
|
||||
}
|
||||
|
||||
/// 触发一轮 AI 辅助。把已覆盖的问诊维度(coveredDims)传给 LLM,
|
||||
/// 要求本轮避开这些维度,从结构上压住跨轮换皮重复。
|
||||
private func requestSuggestions() {
|
||||
suggestTask?.cancel()
|
||||
let snapshotContent = content.trimmingCharacters(in: .whitespacesAndNewlines)
|
||||
let covered = Array(coveredDims)
|
||||
// 1. 主动收起键盘 —— 否则建议面板被键盘吃掉一半
|
||||
contentFocused = false
|
||||
// 2. 确保 sheet 在 large(用户可能下拉到 medium 又触发 AI)
|
||||
if detent != .large {
|
||||
withAnimation(.snappy(duration: 0.25)) {
|
||||
detent = .large
|
||||
}
|
||||
}
|
||||
exhaustedNote = false
|
||||
phase = .loading
|
||||
suggestTask = Task { @MainActor in
|
||||
do {
|
||||
let result = try await DiaryAssistService.shared.suggest(
|
||||
content: snapshotContent,
|
||||
coveredDimensions: covered
|
||||
)
|
||||
if Task.isCancelled { return }
|
||||
// 客户端硬去重(不依赖 1.7B 听话):
|
||||
// ① 维度已在往轮覆盖 → 丢;② 本轮内维度重复 → 丢;③ 文本与已有近似 → 丢。
|
||||
let coveredSnapshot = coveredDims
|
||||
var acceptedNorms = questions.map { Self.normalize($0.q) }
|
||||
var batchDims = Set<String>()
|
||||
let nextRound = currentRound + 1
|
||||
let fresh = result.questions.compactMap { q -> DiaryAssistService.Question? in
|
||||
let dim = q.dim.trimmingCharacters(in: .whitespacesAndNewlines)
|
||||
let norm = Self.normalize(q.q)
|
||||
if !dim.isEmpty, coveredSnapshot.contains(dim) { return nil }
|
||||
if !dim.isEmpty, batchDims.contains(dim) { return nil }
|
||||
if acceptedNorms.contains(where: { Self.isSimilar($0, norm) }) { return nil }
|
||||
if !dim.isEmpty { batchDims.insert(dim) }
|
||||
acceptedNorms.append(norm)
|
||||
var stamped = q
|
||||
stamped.round = nextRound
|
||||
return stamped
|
||||
}
|
||||
withAnimation(.snappy(duration: 0.2)) {
|
||||
if fresh.isEmpty {
|
||||
exhaustedNote = true // 这轮没问出任何新维度
|
||||
} else {
|
||||
questions.append(contentsOf: fresh)
|
||||
for q in fresh where !q.dim.isEmpty { coveredDims.insert(q.dim) }
|
||||
currentRound = nextRound
|
||||
exhaustedNote = false
|
||||
}
|
||||
lastRate = result.decodeRate
|
||||
phase = .ready
|
||||
}
|
||||
} catch is CancellationError {
|
||||
if !Task.isCancelled {
|
||||
phase = hasQuestions ? .ready : .idle
|
||||
}
|
||||
} catch {
|
||||
if !Task.isCancelled {
|
||||
phase = .failed(error)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// 简单归一化:去空白 + 折叠成统一形式,用于客户端去重比对。
|
||||
private static func normalize(_ s: String) -> String {
|
||||
s.trimmingCharacters(in: .whitespacesAndNewlines)
|
||||
.replacingOccurrences(of: " ", with: "")
|
||||
.replacingOccurrences(of: "?", with: "?")
|
||||
}
|
||||
|
||||
/// 近似判重:归一化后相等,或字符集 Jaccard ≥ 0.8(抓「会/下」这类换一两字的重复)。
|
||||
private static func isSimilar(_ a: String, _ b: String) -> Bool {
|
||||
if a == b { return true }
|
||||
let sa = Set(a), sb = Set(b)
|
||||
guard !sa.isEmpty, !sb.isEmpty else { return false }
|
||||
let inter = sa.intersection(sb).count
|
||||
let union = sa.union(sb).count
|
||||
return union > 0 && Double(inter) / Double(union) >= 0.8
|
||||
}
|
||||
|
||||
private func cancelSuggestions() {
|
||||
suggestTask?.cancel()
|
||||
phase = hasQuestions ? .ready : .idle
|
||||
}
|
||||
|
||||
/// 采纳:模板含 `[占位]` 时展开就地填空面板;无占位则直接把整句追加(并标记 adopted)。
|
||||
/// 已采纳的 q 不会从列表里消失;其维度已在生成时计入 coveredDims,下一轮 prompt 会避开。
|
||||
private func adopt(_ question: DiaryAssistService.Question) {
|
||||
guard !question.fill.isEmpty, DiaryFillTemplate.slotCount(question.fill) > 0 else {
|
||||
// 无占位:直接采纳整句(空 fill 时退回到追加问题本身)。
|
||||
commitAdoption(question, text: question.fill.isEmpty ? question.q : question.fill)
|
||||
return
|
||||
}
|
||||
withAnimation(.snappy(duration: 0.18)) {
|
||||
fillingId = question.id
|
||||
fillValues = Array(repeating: "", count: DiaryFillTemplate.slotCount(question.fill))
|
||||
}
|
||||
}
|
||||
|
||||
/// 关闭填空面板(取消)。
|
||||
private func closeFill() {
|
||||
withAnimation(.snappy(duration: 0.18)) {
|
||||
fillingId = nil
|
||||
fillValues = []
|
||||
}
|
||||
}
|
||||
|
||||
/// 提交采纳:把(填好的)整句追加到正文,标记 adopted,收起面板。
|
||||
private func commitAdoption(_ question: DiaryAssistService.Question, text: String) {
|
||||
if let idx = questions.firstIndex(where: { $0.id == question.id }) {
|
||||
withAnimation(.snappy(duration: 0.18)) {
|
||||
questions[idx].adopted = true
|
||||
}
|
||||
}
|
||||
appendToContent(text)
|
||||
fillingId = nil
|
||||
fillValues = []
|
||||
}
|
||||
|
||||
/// 把一段补充文本追加到正文末尾(自动补换行,空文本忽略)。
|
||||
private func appendToContent(_ text: String) {
|
||||
let toAppend = text.trimmingCharacters(in: .whitespacesAndNewlines)
|
||||
guard !toAppend.isEmpty else { return }
|
||||
let trimmed = content.trimmingCharacters(in: .whitespacesAndNewlines)
|
||||
if trimmed.isEmpty {
|
||||
content = toAppend
|
||||
} else if content.hasSuffix("\n") {
|
||||
content += toAppend
|
||||
} else {
|
||||
content += "\n" + toAppend
|
||||
}
|
||||
}
|
||||
|
||||
private func submit() {
|
||||
guard canSubmit else { return }
|
||||
let entry = DiaryEntry(
|
||||
@@ -100,3 +567,7 @@ struct DiaryQuickSheet: View {
|
||||
dismiss()
|
||||
}
|
||||
}
|
||||
|
||||
#Preview {
|
||||
DiaryQuickSheet()
|
||||
}
|
||||
|
||||
235
康康/Features/Diary/QuestionFillPanel.swift
Normal file
@@ -0,0 +1,235 @@
|
||||
import SwiftUI
|
||||
|
||||
/// AI 补充句模板(如「症状从 [时间] 开始,」)的一个片段:字面文本或待填占位槽。
|
||||
enum FillSegment: Equatable {
|
||||
case literal(String)
|
||||
/// `label` 为方括号内原文(如 "时间" / "活动/休息");
|
||||
/// `options` 为可一键填充的短词候选(`/` 分隔且都短时才有,否则空)。
|
||||
case slot(label: String, options: [String])
|
||||
}
|
||||
|
||||
/// 把 `fill` 模板解析成有序片段、组装回填好的句子。纯值逻辑,便于复用与单测。
|
||||
enum DiaryFillTemplate {
|
||||
|
||||
/// 解析模板为有序片段。无方括号时返回单个 `.literal`。
|
||||
static func parse(_ template: String) -> [FillSegment] {
|
||||
let chars = Array(template)
|
||||
var segs: [FillSegment] = []
|
||||
var i = 0
|
||||
var literalStart = 0
|
||||
func flushLiteral(upTo end: Int) {
|
||||
if end > literalStart { segs.append(.literal(String(chars[literalStart..<end]))) }
|
||||
}
|
||||
while i < chars.count {
|
||||
if chars[i] == "[",
|
||||
let close = (i + 1 ..< chars.count).first(where: { chars[$0] == "]" }) {
|
||||
flushLiteral(upTo: i)
|
||||
let inner = String(chars[(i + 1)..<close])
|
||||
segs.append(.slot(label: inner, options: options(from: inner)))
|
||||
i = close + 1
|
||||
literalStart = i
|
||||
} else {
|
||||
i += 1
|
||||
}
|
||||
}
|
||||
flushLiteral(upTo: chars.count)
|
||||
return segs
|
||||
}
|
||||
|
||||
/// 占位内 `/` 分隔、每段都短(≤5 字)、且 ≥2 段时,视为可点选的快填候选。
|
||||
private static func options(from inner: String) -> [String] {
|
||||
let tokens = inner.split(separator: "/")
|
||||
.map { $0.trimmingCharacters(in: .whitespaces) }
|
||||
.filter { !$0.isEmpty }
|
||||
guard tokens.count >= 2, tokens.allSatisfy({ $0.count <= 5 }) else { return [] }
|
||||
return tokens
|
||||
}
|
||||
|
||||
/// 模板里的占位槽数量。
|
||||
static func slotCount(_ template: String) -> Int {
|
||||
parse(template).reduce(0) { acc, seg in
|
||||
if case .slot = seg { return acc + 1 }
|
||||
return acc
|
||||
}
|
||||
}
|
||||
|
||||
/// 用 `values` 填充各槽组装成句:已填用输入值,留空回退为方括号内原文(去方括号,读起来仍自然)。
|
||||
static func assemble(_ template: String, values: [String]) -> String {
|
||||
var out = ""
|
||||
var idx = 0
|
||||
for seg in parse(template) {
|
||||
switch seg {
|
||||
case .literal(let t):
|
||||
out += t
|
||||
case .slot(let label, _):
|
||||
let v = idx < values.count
|
||||
? values[idx].trimmingCharacters(in: .whitespacesAndNewlines) : ""
|
||||
out += v.isEmpty ? label : v
|
||||
idx += 1
|
||||
}
|
||||
}
|
||||
return out
|
||||
}
|
||||
}
|
||||
|
||||
/// 「采纳即就地填空」面板:每个 `[占位]` 一个输入框 + 快填 chip,顶部实时预览整句,
|
||||
/// 底部「加入记录 / 取消」。确认时回传**填好的、无方括号**的整句。
|
||||
struct QuestionFillPanel: View {
|
||||
let template: String
|
||||
@Binding var values: [String]
|
||||
let onCommit: (String) -> Void
|
||||
let onCancel: () -> Void
|
||||
|
||||
private var segments: [FillSegment] { DiaryFillTemplate.parse(template) }
|
||||
|
||||
/// 抽出占位槽 + 其在 values 里的下标。
|
||||
private var slots: [(index: Int, label: String, options: [String])] {
|
||||
var result: [(Int, String, [String])] = []
|
||||
var i = 0
|
||||
for seg in segments {
|
||||
if case let .slot(label, options) = seg {
|
||||
result.append((i, label, options))
|
||||
i += 1
|
||||
}
|
||||
}
|
||||
return result
|
||||
}
|
||||
|
||||
var body: some View {
|
||||
VStack(alignment: .leading, spacing: 10) {
|
||||
// 实时预览:已填值高亮,未填槽浅色下划线提示。
|
||||
previewText
|
||||
.font(.tjScaled( 13))
|
||||
.fixedSize(horizontal: false, vertical: true)
|
||||
.frame(maxWidth: .infinity, alignment: .leading)
|
||||
.padding(10)
|
||||
.background(
|
||||
RoundedRectangle(cornerRadius: Tj.Radius.sm, style: .continuous)
|
||||
.fill(Tj.Palette.sand2)
|
||||
)
|
||||
|
||||
ForEach(slots, id: \.index) { slot in
|
||||
slotEditor(index: slot.index, label: slot.label, options: slot.options)
|
||||
}
|
||||
|
||||
HStack(spacing: 8) {
|
||||
Button(action: onCancel) {
|
||||
Text("取消")
|
||||
.font(.tjScaled( 13, weight: .semibold))
|
||||
.foregroundStyle(Tj.Palette.text2)
|
||||
.frame(maxWidth: .infinity)
|
||||
.padding(.vertical, 9)
|
||||
.background(
|
||||
RoundedRectangle(cornerRadius: Tj.Radius.sm, style: .continuous)
|
||||
.strokeBorder(Tj.Palette.line, lineWidth: 1)
|
||||
)
|
||||
// 背景仅描边、内部透明:.plain 按钮的命中区会只剩文字本身,
|
||||
// 中间透明区点不到。补 contentShape 让整框可点。
|
||||
.contentShape(Rectangle())
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
|
||||
Button {
|
||||
onCommit(DiaryFillTemplate.assemble(template, values: values))
|
||||
} label: {
|
||||
HStack(spacing: 5) {
|
||||
Image(systemName: "text.append")
|
||||
.font(.tjScaled( 12, weight: .semibold))
|
||||
Text("加入记录")
|
||||
.font(.tjScaled( 13, weight: .semibold))
|
||||
}
|
||||
.foregroundStyle(Tj.Palette.paper)
|
||||
.frame(maxWidth: .infinity)
|
||||
.padding(.vertical, 9)
|
||||
.background(
|
||||
RoundedRectangle(cornerRadius: Tj.Radius.sm, style: .continuous)
|
||||
.fill(Tj.Palette.ink)
|
||||
)
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
}
|
||||
}
|
||||
.padding(.leading, 22)
|
||||
.padding(.top, 2)
|
||||
}
|
||||
|
||||
// MARK: - 子部件
|
||||
|
||||
/// 预览整句:literal 用正文色,已填值用 brick 加粗,未填槽用浅色下划线。
|
||||
private var previewText: Text {
|
||||
var result = Text("")
|
||||
var idx = 0
|
||||
for seg in segments {
|
||||
switch seg {
|
||||
case .literal(let t):
|
||||
result = result + Text(t).foregroundStyle(Tj.Palette.text)
|
||||
case .slot(let label, _):
|
||||
let v = idx < values.count
|
||||
? values[idx].trimmingCharacters(in: .whitespacesAndNewlines) : ""
|
||||
if v.isEmpty {
|
||||
result = result + Text(label).foregroundStyle(Tj.Palette.text3).underline()
|
||||
} else {
|
||||
result = result + Text(v).foregroundStyle(Tj.Palette.brick).fontWeight(.semibold)
|
||||
}
|
||||
idx += 1
|
||||
}
|
||||
}
|
||||
return result
|
||||
}
|
||||
|
||||
private func slotEditor(index: Int, label: String, options: [String]) -> some View {
|
||||
VStack(alignment: .leading, spacing: 6) {
|
||||
Text(label)
|
||||
.font(.tjScaled( 11, weight: .semibold))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
|
||||
if !options.isEmpty {
|
||||
HStack(spacing: 6) {
|
||||
ForEach(options, id: \.self) { opt in
|
||||
let picked = bindingValue(index) == opt
|
||||
Button { values[index] = opt } label: {
|
||||
Text(opt)
|
||||
.font(.tjScaled( 12, weight: picked ? .semibold : .regular))
|
||||
.foregroundStyle(picked ? Tj.Palette.paper : Tj.Palette.text)
|
||||
.padding(.horizontal, 10)
|
||||
.padding(.vertical, 5)
|
||||
.background(
|
||||
Capsule().fill(picked ? Tj.Palette.ink : Tj.Palette.paper)
|
||||
)
|
||||
.overlay(
|
||||
Capsule().strokeBorder(Tj.Palette.line,
|
||||
lineWidth: picked ? 0 : 1)
|
||||
)
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
}
|
||||
Spacer(minLength: 0)
|
||||
}
|
||||
}
|
||||
|
||||
TextField(String(appLoc: "填写\(label)"), text: binding(index))
|
||||
.font(.tjScaled( 13))
|
||||
.padding(.horizontal, 12)
|
||||
.padding(.vertical, 9)
|
||||
.background(
|
||||
RoundedRectangle(cornerRadius: Tj.Radius.sm, style: .continuous)
|
||||
.fill(Tj.Palette.paper)
|
||||
)
|
||||
.overlay(
|
||||
RoundedRectangle(cornerRadius: Tj.Radius.sm, style: .continuous)
|
||||
.strokeBorder(Tj.Palette.line, lineWidth: 1)
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
private func bindingValue(_ i: Int) -> String {
|
||||
i < values.count ? values[i] : ""
|
||||
}
|
||||
|
||||
private func binding(_ i: Int) -> Binding<String> {
|
||||
Binding(
|
||||
get: { i < values.count ? values[i] : "" },
|
||||
set: { if i < values.count { values[i] = $0 } }
|
||||
)
|
||||
}
|
||||
}
|
||||
176
康康/Features/Home/HomeCalendarCard.swift
Normal file
@@ -0,0 +1,176 @@
|
||||
import SwiftUI
|
||||
import SwiftData
|
||||
|
||||
/// 主页「健康日历」卡:当前一周横条 + 本月记录摘要。
|
||||
/// 点整卡或某一天 → 打开 CalendarOverviewView 看月/年总览。自包含 @Query(对齐 TodayRemindersCard)。
|
||||
struct HomeCalendarCard: View {
|
||||
@Query(sort: \Indicator.capturedAt, order: .reverse)
|
||||
private var indicators: [Indicator]
|
||||
|
||||
@Query(sort: \Report.reportDate, order: .reverse)
|
||||
private var reports: [Report]
|
||||
|
||||
@Query(sort: \DiaryEntry.createdAt, order: .reverse)
|
||||
private var diaries: [DiaryEntry]
|
||||
|
||||
@Query(sort: \Symptom.startedAt, order: .reverse)
|
||||
private var symptoms: [Symptom]
|
||||
|
||||
/// 打开总览时定位的日期(nil = 不展示)。
|
||||
@State private var openDay: SelectedDay?
|
||||
|
||||
private let calendar: Calendar = {
|
||||
var c = Calendar(identifier: .gregorian)
|
||||
c.firstWeekday = 2
|
||||
c.locale = Locale.current
|
||||
return c
|
||||
}()
|
||||
|
||||
@MainActor
|
||||
private var data: CalendarData {
|
||||
CalendarData.build(
|
||||
indicators: indicators,
|
||||
reports: reports,
|
||||
diaries: diaries,
|
||||
symptoms: symptoms
|
||||
)
|
||||
}
|
||||
|
||||
/// 本周一 → 本周日。
|
||||
private var weekDays: [Date] {
|
||||
let today = calendar.startOfDay(for: .now)
|
||||
let weekdayIndex = (calendar.component(.weekday, from: today) - calendar.firstWeekday + 7) % 7
|
||||
guard let monday = calendar.date(byAdding: .day, value: -weekdayIndex, to: today) else {
|
||||
return []
|
||||
}
|
||||
return (0..<7).compactMap { calendar.date(byAdding: .day, value: $0, to: monday) }
|
||||
}
|
||||
|
||||
/// 本月有记录的天数(指标/报告/日记/症状任一)。
|
||||
private var daysWithRecordsThisMonth: Int {
|
||||
guard let interval = calendar.dateInterval(of: .month, for: .now) else { return 0 }
|
||||
let count = calendar.range(of: .day, in: .month, for: .now)?.count ?? 30
|
||||
var n = 0
|
||||
for i in 0..<count {
|
||||
guard let d = calendar.date(byAdding: .day, value: i, to: interval.start) else { continue }
|
||||
if data.marks(for: d, calendar: calendar).hasAnyEvent ||
|
||||
!data.ranges(touching: d, calendar: calendar).isEmpty {
|
||||
n += 1
|
||||
}
|
||||
}
|
||||
return n
|
||||
}
|
||||
|
||||
var body: some View {
|
||||
VStack(alignment: .leading, spacing: 12) {
|
||||
header
|
||||
weekStrip
|
||||
}
|
||||
.padding(14)
|
||||
.frame(maxWidth: .infinity, alignment: .leading)
|
||||
.tjCard(bordered: true)
|
||||
.padding(.bottom, 18)
|
||||
.contentShape(Rectangle())
|
||||
.onTapGesture { openDay = SelectedDay(date: .now) }
|
||||
.fullScreenCover(item: $openDay) { day in
|
||||
CalendarOverviewView(initialDate: day.date, onClose: { openDay = nil })
|
||||
}
|
||||
}
|
||||
|
||||
private var header: some View {
|
||||
HStack(alignment: .firstTextBaseline) {
|
||||
Text("健康日历")
|
||||
.font(.tjH2())
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
Spacer()
|
||||
HStack(spacing: 3) {
|
||||
Text(summaryLine)
|
||||
.font(.tjScaled( 12))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
Image(systemName: "chevron.right")
|
||||
.font(.tjScaled( 11, weight: .semibold))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private var summaryLine: String {
|
||||
let n = daysWithRecordsThisMonth
|
||||
return n > 0 ? String(appLoc: "本月 \(n) 天有记录") : String(appLoc: "本月暂无记录")
|
||||
}
|
||||
|
||||
private var weekStrip: some View {
|
||||
HStack(spacing: 6) {
|
||||
ForEach(weekDays, id: \.self) { day in
|
||||
dayCell(day)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private func dayCell(_ day: Date) -> some View {
|
||||
let marks = data.marks(for: day, calendar: calendar)
|
||||
let ranges = data.ranges(touching: day, calendar: calendar)
|
||||
let isToday = calendar.isDateInToday(day)
|
||||
let hasSymptom = !ranges.isEmpty
|
||||
|
||||
return Button {
|
||||
openDay = SelectedDay(date: day)
|
||||
} label: {
|
||||
VStack(spacing: 5) {
|
||||
Text(weekdayLabel(day))
|
||||
.font(.tjScaled( 10, weight: .medium))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
ZStack {
|
||||
RoundedRectangle(cornerRadius: 9, style: .continuous)
|
||||
.fill(cellFill(isToday: isToday, hasSymptom: hasSymptom))
|
||||
if isToday {
|
||||
RoundedRectangle(cornerRadius: 9, style: .continuous)
|
||||
.strokeBorder(Tj.Palette.ink, lineWidth: 1.2)
|
||||
}
|
||||
Text("\(calendar.component(.day, from: day))")
|
||||
.font(.tjScaled( 14, weight: isToday ? .bold : .regular))
|
||||
.foregroundStyle(isToday ? Tj.Palette.ink : Tj.Palette.text)
|
||||
}
|
||||
.frame(height: 38)
|
||||
marksDots(marks)
|
||||
.frame(height: 5)
|
||||
}
|
||||
.frame(maxWidth: .infinity)
|
||||
.contentShape(Rectangle())
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
}
|
||||
|
||||
@ViewBuilder
|
||||
private func marksDots(_ marks: DayMarks) -> some View {
|
||||
HStack(spacing: 2) {
|
||||
if marks.abnormalCount > 0 {
|
||||
dot(Tj.Palette.brick)
|
||||
} else if marks.normalCount > 0 {
|
||||
dot(Tj.Palette.leaf)
|
||||
}
|
||||
if marks.reportCount > 0 { dot(Tj.Palette.ink2) }
|
||||
if marks.diaryCount > 0 { dot(Tj.Palette.text3.opacity(0.7)) }
|
||||
}
|
||||
}
|
||||
|
||||
private func dot(_ color: Color) -> some View {
|
||||
Circle().fill(color).frame(width: 4, height: 4)
|
||||
}
|
||||
|
||||
private func cellFill(isToday: Bool, hasSymptom: Bool) -> Color {
|
||||
if hasSymptom { return Tj.Palette.amber.opacity(0.18) }
|
||||
if isToday { return Tj.Palette.sand2 }
|
||||
return Tj.Palette.sand2.opacity(0.5)
|
||||
}
|
||||
|
||||
private func weekdayLabel(_ day: Date) -> String {
|
||||
let labels = [
|
||||
String(appLoc: "一"), String(appLoc: "二"), String(appLoc: "三"),
|
||||
String(appLoc: "四"), String(appLoc: "五"), String(appLoc: "六"),
|
||||
String(appLoc: "日")
|
||||
]
|
||||
let idx = (calendar.component(.weekday, from: day) - calendar.firstWeekday + 7) % 7
|
||||
return labels[idx]
|
||||
}
|
||||
}
|
||||
@@ -16,6 +16,9 @@ struct HomeView: View {
|
||||
@Query(sort: \Symptom.startedAt, order: .reverse)
|
||||
private var symptoms: [Symptom]
|
||||
|
||||
/// 点「最近记录」某行 → 打开只读详情 sheet(与档案库 C1 同款交互)。
|
||||
@State private var selectedEntry: TimelineEntry?
|
||||
|
||||
@MainActor
|
||||
private var recentEntries: [TimelineEntry] {
|
||||
let all =
|
||||
@@ -37,6 +40,10 @@ struct HomeView: View {
|
||||
.padding(.top, 4)
|
||||
.padding(.bottom, 18)
|
||||
|
||||
HomeCalendarCard()
|
||||
|
||||
TodayRemindersCard()
|
||||
|
||||
OngoingSymptomsCard()
|
||||
.padding(.bottom, 18)
|
||||
|
||||
@@ -49,13 +56,22 @@ struct HomeView: View {
|
||||
.padding(.bottom, 20)
|
||||
}
|
||||
.background(Tj.Palette.sand.ignoresSafeArea())
|
||||
.sheet(item: $selectedEntry) { entry in
|
||||
if let d = TimelineDetail.resolve(
|
||||
for: entry,
|
||||
indicators: indicators, reports: reports,
|
||||
diaries: diaries, symptoms: symptoms
|
||||
) {
|
||||
TimelineEntryDetailView(detail: d)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private var greeting: some View {
|
||||
HStack(alignment: .top) {
|
||||
VStack(alignment: .leading, spacing: 4) {
|
||||
Text(todayLine)
|
||||
.font(.system(size: 12))
|
||||
.font(.tjScaled( 12))
|
||||
.tracking(1)
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
Text(greetingWord)
|
||||
@@ -69,17 +85,17 @@ struct HomeView: View {
|
||||
}
|
||||
|
||||
private var todayLine: String {
|
||||
let f = DateFormatter()
|
||||
f.locale = Locale(identifier: "zh_CN")
|
||||
f.dateFormat = "M 月 d 日 · EEE"
|
||||
return f.string(from: Date())
|
||||
let now = Date()
|
||||
let day = now.formatted(.dateTime.month().day())
|
||||
let weekday = now.formatted(.dateTime.weekday(.abbreviated))
|
||||
return "\(day) · \(weekday)"
|
||||
}
|
||||
|
||||
private var greetingWord: String {
|
||||
switch Calendar.current.component(.hour, from: Date()) {
|
||||
case 5..<12: return "早安"
|
||||
case 12..<18: return "下午好"
|
||||
default: return "晚上好"
|
||||
case 5..<12: return String(appLoc: "早安")
|
||||
case 12..<18: return String(appLoc: "下午好")
|
||||
default: return String(appLoc: "晚上好")
|
||||
}
|
||||
}
|
||||
|
||||
@@ -90,7 +106,7 @@ struct HomeView: View {
|
||||
Spacer()
|
||||
Button(action: onTapArchive) {
|
||||
Text("全部 ›")
|
||||
.font(.system(size: 12))
|
||||
.font(.tjScaled( 12))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
@@ -103,12 +119,23 @@ struct HomeView: View {
|
||||
ForEach(recentGrouped, id: \.section) { group in
|
||||
VStack(alignment: .leading, spacing: 8) {
|
||||
Text(group.section.label)
|
||||
.font(.system(size: 11, weight: .semibold))
|
||||
.font(.tjScaled( 11, weight: .semibold))
|
||||
.tracking(0.5)
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
VStack(spacing: 10) {
|
||||
ForEach(group.items) { entry in
|
||||
TimelineRow(entry: entry)
|
||||
Button {
|
||||
if TimelineDetail.resolve(
|
||||
for: entry,
|
||||
indicators: indicators, reports: reports,
|
||||
diaries: diaries, symptoms: symptoms
|
||||
) != nil {
|
||||
selectedEntry = entry
|
||||
}
|
||||
} label: {
|
||||
TimelineRow(entry: entry)
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -121,7 +148,7 @@ struct HomeView: View {
|
||||
private var emptyRecent: some View {
|
||||
HStack {
|
||||
Text("还没有任何记录,点底部 + 号开始第一条")
|
||||
.font(.system(size: 13))
|
||||
.font(.tjScaled( 13))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
Spacer()
|
||||
}
|
||||
@@ -136,19 +163,19 @@ struct HomeView: View {
|
||||
|
||||
Button(action: onTapArchive) {
|
||||
HStack(spacing: 14) {
|
||||
TjPlaceholder(label: "档案 · \(reports.count)")
|
||||
TjPlaceholder(label: String(appLoc: "档案 · \(reports.count)"))
|
||||
.frame(width: 56, height: 56)
|
||||
VStack(alignment: .leading, spacing: 2) {
|
||||
Text("我的报告档案")
|
||||
.font(.system(size: 14, weight: .semibold))
|
||||
.font(.tjScaled( 14, weight: .semibold))
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
Text("\(reports.count) 份 · \(indicators.count) 项指标 · 端侧加密")
|
||||
.font(.system(size: 11))
|
||||
.font(.tjScaled( 11))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
}
|
||||
Spacer()
|
||||
Image(systemName: "chevron.right")
|
||||
.font(.system(size: 14, weight: .medium))
|
||||
.font(.tjScaled( 14, weight: .medium))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
}
|
||||
.padding(14)
|
||||
|
||||
@@ -34,12 +34,12 @@ struct RecentItemRow: View {
|
||||
|
||||
VStack(alignment: .leading, spacing: 2) {
|
||||
Text("\(date) · \(type)")
|
||||
.font(.system(size: 11))
|
||||
.font(.tjScaled( 11))
|
||||
.tracking(0.3)
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
.lineLimit(1)
|
||||
Text(name)
|
||||
.font(.system(size: 14, weight: .medium))
|
||||
.font(.tjScaled( 14, weight: .medium))
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
.lineLimit(1)
|
||||
.truncationMode(.tail)
|
||||
@@ -47,7 +47,7 @@ struct RecentItemRow: View {
|
||||
Spacer(minLength: 8)
|
||||
if let value {
|
||||
Text(value)
|
||||
.font(.system(size: 12, weight: .semibold, design: .monospaced))
|
||||
.font(.tjScaled( 12, weight: .semibold, design: .monospaced))
|
||||
.foregroundStyle(status.valueColor)
|
||||
.lineLimit(1)
|
||||
.fixedSize()
|
||||
|
||||
118
康康/Features/Home/TodayRemindersCard.swift
Normal file
@@ -0,0 +1,118 @@
|
||||
import SwiftUI
|
||||
import SwiftData
|
||||
import Combine
|
||||
|
||||
/// 主页「今日提醒」卡:汇总今天会触发的自由提醒(CustomReminder)+ 指标提醒(MetricReminder),
|
||||
/// 按时间升序展示;已过点的行淡化(只表示「时间已过」,不代表已完成——本期不追踪打卡)。
|
||||
/// 今天没有任何提醒 → 整卡隐藏(返回 EmptyView,与「持续中症状」卡同款)。
|
||||
/// 卡内只读;点右上「全部 ›」打开提醒中心(RemindersListView)管理。
|
||||
struct TodayRemindersCard: View {
|
||||
@Query(sort: \CustomReminder.updatedAt, order: .reverse)
|
||||
private var customReminders: [CustomReminder]
|
||||
@Query(sort: \MetricReminder.updatedAt, order: .reverse)
|
||||
private var metricReminders: [MetricReminder]
|
||||
|
||||
@State private var showingCenter = false
|
||||
/// 每分钟自走一次,用于刷新「今天」判定与「已过点」淡化(与 OngoingSymptomsCard 同款)。
|
||||
@State private var tick: Date = .now
|
||||
private let timer = Timer.publish(every: 60, on: .main, in: .common).autoconnect()
|
||||
|
||||
/// 今天会触发的提醒,自由提醒 + 指标提醒合并成统一行模型,按时间升序。
|
||||
private var items: [TodayItem] {
|
||||
let cal = Calendar.current
|
||||
var arr: [TodayItem] = []
|
||||
for r in customReminders where r.occurs(on: tick, calendar: cal) {
|
||||
arr.append(TodayItem(id: "c-\(r.id.uuidString)",
|
||||
hour: r.hour, minute: r.minute, title: r.title))
|
||||
}
|
||||
for r in metricReminders where r.occurs(on: tick, calendar: cal) {
|
||||
arr.append(TodayItem(id: "m-\(r.metricId)",
|
||||
hour: r.hour, minute: r.minute, title: r.displayName))
|
||||
}
|
||||
return arr.sorted { ($0.hour, $0.minute) < ($1.hour, $1.minute) }
|
||||
}
|
||||
|
||||
var body: some View {
|
||||
let rows = items
|
||||
if rows.isEmpty {
|
||||
EmptyView()
|
||||
} else {
|
||||
VStack(alignment: .leading, spacing: 10) {
|
||||
header(count: rows.count)
|
||||
VStack(spacing: 8) {
|
||||
ForEach(rows) { row($0) }
|
||||
}
|
||||
}
|
||||
.padding(.bottom, 18)
|
||||
.onReceive(timer) { now in tick = now }
|
||||
.sheet(isPresented: $showingCenter) {
|
||||
// 列表页依赖外层 NavigationStack 提供标题栏;sheet 形态补「完成」按钮。
|
||||
NavigationStack { RemindersListView(presentedAsSheet: true) }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private func header(count: Int) -> some View {
|
||||
HStack(spacing: 8) {
|
||||
Circle()
|
||||
.fill(Tj.Palette.amber)
|
||||
.frame(width: 7, height: 7)
|
||||
Text("今日提醒")
|
||||
.font(.tjH2())
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
Text("\(count) 项")
|
||||
.font(.tjScaled( 12))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
Spacer()
|
||||
Button { showingCenter = true } label: {
|
||||
Text("全部 ›")
|
||||
.font(.tjScaled( 12))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
}
|
||||
}
|
||||
|
||||
private func row(_ item: TodayItem) -> some View {
|
||||
let isPast = item.isPast(now: tick)
|
||||
return HStack(spacing: 12) {
|
||||
Text(item.timeLabel)
|
||||
.font(.tjScaled( 14, weight: .semibold).monospacedDigit())
|
||||
.foregroundStyle(isPast ? Tj.Palette.text3 : Tj.Palette.ink)
|
||||
.frame(width: 46, alignment: .leading)
|
||||
Image(systemName: "bell.fill")
|
||||
.font(.tjScaled( 12))
|
||||
.foregroundStyle(isPast ? Tj.Palette.text3 : Tj.Palette.amber)
|
||||
Text(item.title)
|
||||
.font(.tjScaled( 15, weight: .medium))
|
||||
.foregroundStyle(isPast ? Tj.Palette.text3 : Tj.Palette.text)
|
||||
.lineLimit(1)
|
||||
Spacer(minLength: 0)
|
||||
}
|
||||
.padding(.horizontal, 14)
|
||||
.padding(.vertical, 12)
|
||||
.background(
|
||||
RoundedRectangle(cornerRadius: Tj.Radius.sm, style: .continuous)
|
||||
.fill(Tj.Palette.paper)
|
||||
)
|
||||
.shadow(color: Color(red: 0.196, green: 0.157, blue: 0.098).opacity(0.04),
|
||||
radius: 2, x: 0, y: 1)
|
||||
}
|
||||
}
|
||||
|
||||
/// 「今日提醒」行的统一展示模型(自由提醒与指标提醒共用)。
|
||||
private struct TodayItem: Identifiable {
|
||||
let id: String
|
||||
let hour: Int
|
||||
let minute: Int
|
||||
let title: String
|
||||
|
||||
var timeLabel: String { String(format: "%02d:%02d", hour, minute) }
|
||||
|
||||
/// 该提醒的时分是否早于此刻(同一天内「已过点」)。
|
||||
func isPast(now: Date) -> Bool {
|
||||
let c = Calendar.current.dateComponents([.hour, .minute], from: now)
|
||||
let nowMinutes = (c.hour ?? 0) * 60 + (c.minute ?? 0)
|
||||
return hour * 60 + minute < nowMinutes
|
||||
}
|
||||
}
|
||||
@@ -21,8 +21,8 @@ enum CustomMetricNameConflict: Equatable {
|
||||
var warningText: String {
|
||||
switch self {
|
||||
case .none: return ""
|
||||
case .builtin(let n): return "「\(n)」是内置指标的名字 — 录入 grid 里会出现两个同名块"
|
||||
case .existingCustom(let n):return "已经有一个叫「\(n)」的自定义指标"
|
||||
case .builtin(let n): return String(appLoc: "「\(n)」是内置指标的名字 — 录入 grid 里会出现两个同名块")
|
||||
case .existingCustom(let n):return String(appLoc: "已经有一个叫「\(n)」的自定义指标")
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -125,7 +125,7 @@ struct CustomMetricEditor: View {
|
||||
Spacer()
|
||||
if existing == nil {
|
||||
Text("保存后会出现在录入选项里")
|
||||
.font(.system(size: 11))
|
||||
.font(.tjScaled( 11))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
}
|
||||
}
|
||||
@@ -133,7 +133,7 @@ struct CustomMetricEditor: View {
|
||||
|
||||
private var nameSection: some View {
|
||||
VStack(alignment: .leading, spacing: 8) {
|
||||
sectionLabel("名称")
|
||||
sectionLabel(String(appLoc: "名称"))
|
||||
TextField("例如:腰围 / 步数 / 睡眠时长", text: $name)
|
||||
.padding(.horizontal, 14).padding(.vertical, 12)
|
||||
.background(fieldBg)
|
||||
@@ -147,10 +147,10 @@ struct CustomMetricEditor: View {
|
||||
if nameConflict != .none {
|
||||
HStack(spacing: 6) {
|
||||
Image(systemName: "exclamationmark.triangle.fill")
|
||||
.font(.system(size: 11))
|
||||
.font(.tjScaled( 11))
|
||||
.foregroundStyle(Tj.Palette.amber)
|
||||
Text(nameConflict.warningText)
|
||||
.font(.system(size: 11))
|
||||
.font(.tjScaled( 11))
|
||||
.foregroundStyle(Tj.Palette.amber)
|
||||
.fixedSize(horizontal: false, vertical: true)
|
||||
Spacer(minLength: 0)
|
||||
@@ -161,7 +161,7 @@ struct CustomMetricEditor: View {
|
||||
|
||||
private var unitSection: some View {
|
||||
VStack(alignment: .leading, spacing: 8) {
|
||||
sectionLabel("单位(可选)")
|
||||
sectionLabel(String(appLoc: "单位(可选)"))
|
||||
TextField("例如:cm / 步 / 小时", text: $unit)
|
||||
.autocorrectionDisabled()
|
||||
.padding(.horizontal, 14).padding(.vertical, 12)
|
||||
@@ -172,26 +172,26 @@ struct CustomMetricEditor: View {
|
||||
private var rangeRow: some View {
|
||||
VStack(alignment: .leading, spacing: 8) {
|
||||
HStack {
|
||||
sectionLabel("参考范围(可选)")
|
||||
sectionLabel(String(appLoc: "参考范围(可选)"))
|
||||
Spacer()
|
||||
Text("用于自动判定 正常/偏高/偏低")
|
||||
.font(.system(size: 10))
|
||||
.font(.tjScaled( 10))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
}
|
||||
HStack(spacing: 12) {
|
||||
rangeField(label: "下限", value: $lower, placeholder: "70")
|
||||
rangeField(label: String(appLoc: "下限"), value: $lower, placeholder: "70")
|
||||
Text("—").foregroundStyle(Tj.Palette.text3)
|
||||
rangeField(label: "上限", value: $upper, placeholder: "90")
|
||||
rangeField(label: String(appLoc: "上限"), value: $upper, placeholder: "90")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private func rangeField(label: String, value: Binding<String>, placeholder: String) -> some View {
|
||||
VStack(alignment: .leading, spacing: 4) {
|
||||
Text(label).font(.system(size: 11)).foregroundStyle(Tj.Palette.text3)
|
||||
Text(label).font(.tjScaled( 11)).foregroundStyle(Tj.Palette.text3)
|
||||
TextField(placeholder, text: value)
|
||||
.keyboardType(.decimalPad)
|
||||
.font(.system(size: 16, weight: .medium, design: .monospaced))
|
||||
.font(.tjScaled( 16, weight: .medium, design: .monospaced))
|
||||
.padding(.horizontal, 12).padding(.vertical, 10)
|
||||
.background(fieldBg).overlay(fieldBorder)
|
||||
}
|
||||
@@ -199,7 +199,7 @@ struct CustomMetricEditor: View {
|
||||
|
||||
private var iconSection: some View {
|
||||
VStack(alignment: .leading, spacing: 8) {
|
||||
sectionLabel("图标")
|
||||
sectionLabel(String(appLoc: "图标"))
|
||||
LazyVGrid(columns: Array(repeating: GridItem(.flexible(), spacing: 8), count: 4),
|
||||
spacing: 8) {
|
||||
ForEach(customMetricIconChoices, id: \.self) { sf in
|
||||
@@ -207,7 +207,7 @@ struct CustomMetricEditor: View {
|
||||
icon = sf
|
||||
} label: {
|
||||
Image(systemName: sf)
|
||||
.font(.system(size: 20, weight: .medium))
|
||||
.font(.tjScaled( 20, weight: .medium))
|
||||
.foregroundStyle(icon == sf ? Tj.Palette.paper : Tj.Palette.ink)
|
||||
.frame(maxWidth: .infinity, minHeight: 44)
|
||||
.background(
|
||||
@@ -239,7 +239,7 @@ struct CustomMetricEditor: View {
|
||||
Image(systemName: "trash")
|
||||
Text("删除这项自定义指标")
|
||||
}
|
||||
.font(.system(size: 13, weight: .semibold))
|
||||
.font(.tjScaled( 13, weight: .semibold))
|
||||
.foregroundStyle(Tj.Palette.brick)
|
||||
.frame(maxWidth: .infinity)
|
||||
.padding(.vertical, 12)
|
||||
@@ -282,7 +282,7 @@ struct CustomMetricEditor: View {
|
||||
.strokeBorder(Tj.Palette.line, lineWidth: 1)
|
||||
}
|
||||
private func sectionLabel(_ t: String) -> some View {
|
||||
Text(t).font(.system(size: 12, weight: .semibold)).tracking(0.3)
|
||||
Text(t).font(.tjScaled( 12, weight: .semibold)).tracking(0.3)
|
||||
.foregroundStyle(Tj.Palette.text2)
|
||||
}
|
||||
|
||||
|
||||
@@ -27,6 +27,10 @@ private let labPresets: [IndicatorPreset] = [
|
||||
/// 无 seriesKey,不进 Trends。
|
||||
/// 3. **自由输入** — name/value/unit/range 全自己填,status 手动选。
|
||||
struct IndicatorQuickSheet: View {
|
||||
/// 「拍照识别」入口回调。由 RootView 注入:关闭本表单 → 打开 QuickRegionCaptureFlow(相机→VL→存)。
|
||||
/// nil 时(如 Preview)不显示拍照按钮。
|
||||
var onRequestCamera: (() -> Void)? = nil
|
||||
|
||||
@Environment(\.modelContext) private var ctx
|
||||
@Environment(\.dismiss) private var dismiss
|
||||
@Query private var profiles: [UserProfile]
|
||||
@@ -103,6 +107,7 @@ struct IndicatorQuickSheet: View {
|
||||
|
||||
ScrollView(showsIndicators: false) {
|
||||
VStack(alignment: .leading, spacing: 20) {
|
||||
cameraEntrySection
|
||||
monitorGridSection
|
||||
labPresetSection
|
||||
Divider().padding(.vertical, 4)
|
||||
@@ -161,17 +166,73 @@ struct IndicatorQuickSheet: View {
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
Spacer()
|
||||
Text("本地处理 · 永不上传")
|
||||
.font(.system(size: 12))
|
||||
.font(.tjScaled( 12))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
}
|
||||
.padding(.horizontal, 20)
|
||||
.padding(.bottom, 16)
|
||||
}
|
||||
|
||||
/// 顶部「拍照识别」入口:并入原「异常项快拍」。点后由 RootView 切到相机 VL 流程。
|
||||
@ViewBuilder
|
||||
private var cameraEntrySection: some View {
|
||||
if let onRequestCamera {
|
||||
VStack(alignment: .leading, spacing: 10) {
|
||||
Button {
|
||||
onRequestCamera()
|
||||
} label: {
|
||||
HStack(spacing: 12) {
|
||||
ZStack {
|
||||
RoundedRectangle(cornerRadius: Tj.Radius.sm, style: .continuous)
|
||||
.fill(Tj.Palette.brick)
|
||||
Image(systemName: "camera.fill")
|
||||
.font(.tjScaled(18, weight: .medium))
|
||||
.foregroundStyle(Tj.Palette.paper)
|
||||
}
|
||||
.frame(width: 44, height: 44)
|
||||
|
||||
VStack(alignment: .leading, spacing: 2) {
|
||||
Text("拍照识别")
|
||||
.font(.tjScaled(15, weight: .semibold))
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
Text("拍化验单,VL 自动读出数值")
|
||||
.font(.tjScaled(12))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
}
|
||||
Spacer()
|
||||
Image(systemName: "chevron.right")
|
||||
.font(.tjScaled(14, weight: .medium))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
}
|
||||
.padding(14)
|
||||
.frame(maxWidth: .infinity)
|
||||
.tjCard(bordered: true)
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
|
||||
HStack(spacing: 8) {
|
||||
line
|
||||
Text("或手动填写")
|
||||
.font(.tjScaled(11))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
.fixedSize()
|
||||
line
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private var line: some View {
|
||||
Rectangle()
|
||||
.fill(Tj.Palette.lineSoft)
|
||||
.frame(height: 1)
|
||||
.frame(maxWidth: .infinity)
|
||||
}
|
||||
|
||||
private var monitorGridSection: some View {
|
||||
VStack(alignment: .leading, spacing: 8) {
|
||||
HStack {
|
||||
sectionLabel("长期监测(进趋势)")
|
||||
sectionLabel(String(appLoc: "长期监测(进趋势)"))
|
||||
Spacer()
|
||||
if !hiddenSet.isEmpty {
|
||||
hiddenCountChip
|
||||
@@ -217,18 +278,18 @@ struct IndicatorQuickSheet: View {
|
||||
} label: {
|
||||
HStack(spacing: 10) {
|
||||
Image(systemName: cm.icon)
|
||||
.font(.system(size: 18, weight: .medium))
|
||||
.font(.tjScaled( 18, weight: .medium))
|
||||
.foregroundStyle(selected ? Tj.Palette.paper : Tj.Palette.ink)
|
||||
.frame(width: 32, height: 32)
|
||||
.background(Circle().fill(selected ? Tj.Palette.ink : Tj.Palette.leafSoft))
|
||||
|
||||
VStack(alignment: .leading, spacing: 1) {
|
||||
Text(cm.name)
|
||||
.font(.system(size: 14, weight: selected ? .semibold : .medium))
|
||||
.font(.tjScaled( 14, weight: selected ? .semibold : .medium))
|
||||
.foregroundStyle(selected ? Tj.Palette.paper : Tj.Palette.text)
|
||||
.lineLimit(1)
|
||||
Text("自定义")
|
||||
.font(.system(size: 9, design: .monospaced))
|
||||
.font(.tjScaled( 9, design: .monospaced))
|
||||
.foregroundStyle(selected ? Tj.Palette.paper.opacity(0.7) : Tj.Palette.text3)
|
||||
}
|
||||
Spacer()
|
||||
@@ -246,13 +307,10 @@ struct IndicatorQuickSheet: View {
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
.contextMenu {
|
||||
// 单一入口:进编辑器既能改也能删(编辑器内含删除按钮)。
|
||||
// 旧实现两项 action 完全相同,第二项却标红 trash「编辑/删除」,看似直接删除实则打开编辑器,误导。
|
||||
Button { editingCustom = CustomMetricEditTarget(metric: cm) } label: {
|
||||
Label("编辑", systemImage: "pencil")
|
||||
}
|
||||
Button(role: .destructive) {
|
||||
editingCustom = CustomMetricEditTarget(metric: cm)
|
||||
} label: {
|
||||
Label("编辑/删除", systemImage: "trash")
|
||||
Label("编辑 / 删除", systemImage: "pencil")
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -263,14 +321,14 @@ struct IndicatorQuickSheet: View {
|
||||
} label: {
|
||||
HStack(spacing: 10) {
|
||||
Image(systemName: "plus")
|
||||
.font(.system(size: 18, weight: .semibold))
|
||||
.font(.tjScaled( 18, weight: .semibold))
|
||||
.foregroundStyle(Tj.Palette.text2)
|
||||
.frame(width: 32, height: 32)
|
||||
.background(
|
||||
Circle().strokeBorder(Tj.Palette.line, lineWidth: 1, antialiased: true)
|
||||
)
|
||||
Text("自定义")
|
||||
.font(.system(size: 14, weight: .medium))
|
||||
.font(.tjScaled( 14, weight: .medium))
|
||||
.foregroundStyle(Tj.Palette.text2)
|
||||
Spacer()
|
||||
}
|
||||
@@ -296,13 +354,13 @@ struct IndicatorQuickSheet: View {
|
||||
} label: {
|
||||
HStack(spacing: 10) {
|
||||
Image(systemName: m.icon)
|
||||
.font(.system(size: 18, weight: .medium))
|
||||
.font(.tjScaled( 18, weight: .medium))
|
||||
.foregroundStyle(selected ? Tj.Palette.paper : Tj.Palette.ink)
|
||||
.frame(width: 32, height: 32)
|
||||
.background(Circle().fill(selected ? Tj.Palette.ink : Tj.Palette.amber.opacity(0.25)))
|
||||
|
||||
Text(m.displayName)
|
||||
.font(.system(size: 14, weight: selected ? .semibold : .medium))
|
||||
.font(.tjScaled( 14, weight: selected ? .semibold : .medium))
|
||||
.foregroundStyle(selected ? Tj.Palette.paper : Tj.Palette.text)
|
||||
Spacer()
|
||||
}
|
||||
@@ -329,7 +387,7 @@ struct IndicatorQuickSheet: View {
|
||||
|
||||
private var labPresetSection: some View {
|
||||
VStack(alignment: .leading, spacing: 8) {
|
||||
sectionLabel("化验项快捷(不进趋势)")
|
||||
sectionLabel(String(appLoc: "化验项快捷(不进趋势)"))
|
||||
ScrollView(.horizontal, showsIndicators: false) {
|
||||
HStack(spacing: 8) {
|
||||
ForEach(labPresets) { p in
|
||||
@@ -345,14 +403,14 @@ struct IndicatorQuickSheet: View {
|
||||
private var bpFieldSection: some View {
|
||||
VStack(alignment: .leading, spacing: 12) {
|
||||
HStack {
|
||||
sectionLabel("收缩 / 舒张")
|
||||
sectionLabel(String(appLoc: "收缩 / 舒张"))
|
||||
Spacer()
|
||||
bpRangeHint
|
||||
}
|
||||
HStack(spacing: 12) {
|
||||
bpField(label: "收缩压", value: $systolic, placeholder: "120")
|
||||
Text("/").font(.system(size: 22, weight: .light)).foregroundStyle(Tj.Palette.text3)
|
||||
bpField(label: "舒张压", value: $diastolic, placeholder: "80")
|
||||
bpField(label: String(appLoc: "收缩压"), value: $systolic, placeholder: "120")
|
||||
Text("/").font(.tjScaled( 22, weight: .light)).foregroundStyle(Tj.Palette.text3)
|
||||
bpField(label: String(appLoc: "舒张压"), value: $diastolic, placeholder: "80")
|
||||
Text("mmHg").foregroundStyle(Tj.Palette.text3)
|
||||
}
|
||||
bpStatusChips
|
||||
@@ -361,10 +419,10 @@ struct IndicatorQuickSheet: View {
|
||||
|
||||
private func bpField(label: String, value: Binding<String>, placeholder: String) -> some View {
|
||||
VStack(alignment: .leading, spacing: 4) {
|
||||
Text(label).font(.system(size: 11)).foregroundStyle(Tj.Palette.text3)
|
||||
Text(label).font(.tjScaled( 11)).foregroundStyle(Tj.Palette.text3)
|
||||
TextField(placeholder, text: value)
|
||||
.keyboardType(.decimalPad)
|
||||
.font(.system(size: 20, weight: .semibold, design: .monospaced))
|
||||
.font(.tjScaled( 20, weight: .semibold, design: .monospaced))
|
||||
.multilineTextAlignment(.center)
|
||||
.padding(.vertical, 10)
|
||||
.frame(width: 90)
|
||||
@@ -383,11 +441,11 @@ struct IndicatorQuickSheet: View {
|
||||
let rangeText = "\(formatRange(sysRange)) / \(formatRange(diasRange))"
|
||||
return HStack(spacing: 4) {
|
||||
Text(rangeText)
|
||||
.font(.system(size: 11, design: .monospaced))
|
||||
.font(.tjScaled( 11, design: .monospaced))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
if personalized, let age = profile?.age {
|
||||
Text("· 按\(age)岁调整")
|
||||
.font(.system(size: 10))
|
||||
.font(.tjScaled( 10))
|
||||
.foregroundStyle(Tj.Palette.amber)
|
||||
}
|
||||
}
|
||||
@@ -396,10 +454,10 @@ struct IndicatorQuickSheet: View {
|
||||
private var bpStatusChips: some View {
|
||||
HStack(spacing: 8) {
|
||||
if let s = computedBPStatus(.systolic) {
|
||||
statusBadge("收缩 " + s.label, color: s.color)
|
||||
statusBadge(String(appLoc: "收缩 ") + s.label, color: s.color)
|
||||
}
|
||||
if let s = computedBPStatus(.diastolic) {
|
||||
statusBadge("舒张 " + s.label, color: s.color)
|
||||
statusBadge(String(appLoc: "舒张 ") + s.label, color: s.color)
|
||||
}
|
||||
Spacer()
|
||||
}
|
||||
@@ -407,7 +465,7 @@ struct IndicatorQuickSheet: View {
|
||||
|
||||
private var nameSection: some View {
|
||||
VStack(alignment: .leading, spacing: 8) {
|
||||
sectionLabel("指标名")
|
||||
sectionLabel(String(appLoc: "指标名"))
|
||||
TextField("例如:血红蛋白", text: $name)
|
||||
.textInputAutocapitalization(.never)
|
||||
.padding(.horizontal, 14)
|
||||
@@ -427,17 +485,17 @@ struct IndicatorQuickSheet: View {
|
||||
private var valueRow: some View {
|
||||
HStack(alignment: .top, spacing: 12) {
|
||||
VStack(alignment: .leading, spacing: 8) {
|
||||
sectionLabel("数值")
|
||||
sectionLabel(String(appLoc: "数值"))
|
||||
TextField(monitorFieldPlaceholder, text: $value)
|
||||
.keyboardType(.decimalPad)
|
||||
.font(.system(size: 18, weight: .semibold, design: .monospaced))
|
||||
.font(.tjScaled( 18, weight: .semibold, design: .monospaced))
|
||||
.padding(.horizontal, 14)
|
||||
.padding(.vertical, 12)
|
||||
.background(fieldBg)
|
||||
.overlay(fieldBorder)
|
||||
}
|
||||
VStack(alignment: .leading, spacing: 8) {
|
||||
sectionLabel("单位")
|
||||
sectionLabel(String(appLoc: "单位"))
|
||||
TextField("mmol/L", text: $unit)
|
||||
.textInputAutocapitalization(.never)
|
||||
.autocorrectionDisabled()
|
||||
@@ -455,7 +513,7 @@ struct IndicatorQuickSheet: View {
|
||||
private var rangeSection: some View {
|
||||
VStack(alignment: .leading, spacing: 8) {
|
||||
HStack {
|
||||
sectionLabel("参考范围")
|
||||
sectionLabel(String(appLoc: "参考范围"))
|
||||
Spacer()
|
||||
if let m = selectedMonitor, m != .bloodPressure {
|
||||
monitorRangeHint(m)
|
||||
@@ -478,7 +536,7 @@ struct IndicatorQuickSheet: View {
|
||||
return HStack(spacing: 4) {
|
||||
if personalized, let age = profile?.age {
|
||||
Text("按\(age)岁调整")
|
||||
.font(.system(size: 10))
|
||||
.font(.tjScaled( 10))
|
||||
.foregroundStyle(Tj.Palette.amber)
|
||||
}
|
||||
}
|
||||
@@ -486,11 +544,11 @@ struct IndicatorQuickSheet: View {
|
||||
|
||||
private var statusSection: some View {
|
||||
VStack(alignment: .leading, spacing: 8) {
|
||||
sectionLabel("状态")
|
||||
sectionLabel(String(appLoc: "状态"))
|
||||
HStack(spacing: 8) {
|
||||
statusChip(.normal, label: "正常", color: Tj.Palette.leaf)
|
||||
statusChip(.high, label: "偏高 ↑", color: Tj.Palette.brick)
|
||||
statusChip(.low, label: "偏低 ↓", color: Tj.Palette.amber)
|
||||
statusChip(.normal, label: String(appLoc: "正常"), color: Tj.Palette.leaf)
|
||||
statusChip(.high, label: String(appLoc: "偏高 ↑"), color: Tj.Palette.brick)
|
||||
statusChip(.low, label: String(appLoc: "偏低 ↓"), color: Tj.Palette.amber)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -498,12 +556,12 @@ struct IndicatorQuickSheet: View {
|
||||
private var autoStatusHint: some View {
|
||||
let auto = computedSingleStatus
|
||||
return HStack(spacing: 8) {
|
||||
sectionLabel("状态(按数值自动判)")
|
||||
sectionLabel(String(appLoc: "状态(按数值自动判)"))
|
||||
if let s = auto {
|
||||
statusBadge(s.label, color: s.color)
|
||||
} else {
|
||||
Text("待输入")
|
||||
.font(.system(size: 12))
|
||||
.font(.tjScaled( 12))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
}
|
||||
}
|
||||
@@ -511,7 +569,7 @@ struct IndicatorQuickSheet: View {
|
||||
|
||||
private var timeSection: some View {
|
||||
VStack(alignment: .leading, spacing: 8) {
|
||||
sectionLabel("测量时间")
|
||||
sectionLabel(String(appLoc: "测量时间"))
|
||||
DatePicker("", selection: $capturedAt, in: ...Date.now)
|
||||
.datePickerStyle(.compact)
|
||||
.labelsHidden()
|
||||
@@ -520,7 +578,7 @@ struct IndicatorQuickSheet: View {
|
||||
|
||||
private var noteSection: some View {
|
||||
VStack(alignment: .leading, spacing: 8) {
|
||||
sectionLabel("备注(可选)")
|
||||
sectionLabel(String(appLoc: "备注(可选)"))
|
||||
TextField("例如:空腹采血", text: $note, axis: .vertical)
|
||||
.lineLimit(1...3)
|
||||
.padding(.horizontal, 14)
|
||||
@@ -535,7 +593,7 @@ struct IndicatorQuickSheet: View {
|
||||
private var reminderSection: some View {
|
||||
VStack(alignment: .leading, spacing: 10) {
|
||||
HStack {
|
||||
sectionLabel("周期提醒")
|
||||
sectionLabel(String(appLoc: "周期提醒"))
|
||||
Spacer()
|
||||
Toggle("", isOn: $reminderEnabled)
|
||||
.labelsHidden()
|
||||
@@ -549,7 +607,7 @@ struct IndicatorQuickSheet: View {
|
||||
VStack(alignment: .leading, spacing: 12) {
|
||||
HStack {
|
||||
Text("时间")
|
||||
.font(.system(size: 13))
|
||||
.font(.tjScaled( 13))
|
||||
.foregroundStyle(Tj.Palette.text2)
|
||||
Spacer()
|
||||
DatePicker("", selection: $reminderTime,
|
||||
@@ -561,22 +619,22 @@ struct IndicatorQuickSheet: View {
|
||||
VStack(alignment: .leading, spacing: 6) {
|
||||
HStack {
|
||||
Text("频率")
|
||||
.font(.system(size: 13))
|
||||
.font(.tjScaled( 13))
|
||||
.foregroundStyle(Tj.Palette.text2)
|
||||
Spacer()
|
||||
Text(reminderFrequencyLabel)
|
||||
.font(.system(size: 12))
|
||||
.font(.tjScaled( 12))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
}
|
||||
weekdayPickerRow
|
||||
HStack(spacing: 8) {
|
||||
quickFreqChip("每天") {
|
||||
quickFreqChip(String(appLoc: "每天")) {
|
||||
reminderWeekdays = Set(1...7)
|
||||
}
|
||||
quickFreqChip("工作日") {
|
||||
quickFreqChip(String(appLoc: "工作日")) {
|
||||
reminderWeekdays = Set([2, 3, 4, 5, 6])
|
||||
}
|
||||
quickFreqChip("周末") {
|
||||
quickFreqChip(String(appLoc: "周末")) {
|
||||
reminderWeekdays = Set([1, 7])
|
||||
}
|
||||
}
|
||||
@@ -584,11 +642,11 @@ struct IndicatorQuickSheet: View {
|
||||
|
||||
if notifAuthBlocked {
|
||||
Text("⚠️ 通知权限已关闭,去「设置 → 康康 → 通知」打开")
|
||||
.font(.system(size: 11))
|
||||
.font(.tjScaled( 11))
|
||||
.foregroundStyle(Tj.Palette.brick)
|
||||
} else {
|
||||
Text("本机提醒 · 不发任何数据")
|
||||
.font(.system(size: 11))
|
||||
.font(.tjScaled( 11))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
}
|
||||
}
|
||||
@@ -600,15 +658,23 @@ struct IndicatorQuickSheet: View {
|
||||
}
|
||||
|
||||
private var reminderFrequencyLabel: String {
|
||||
if reminderWeekdays.count == 7 { return "每天" }
|
||||
if reminderWeekdays.isEmpty { return "未选" }
|
||||
let names = ["日", "一", "二", "三", "四", "五", "六"]
|
||||
if reminderWeekdays.count == 7 { return String(appLoc: "每天") }
|
||||
if reminderWeekdays.isEmpty { return String(appLoc: "未选") }
|
||||
let names = [
|
||||
String(appLoc: "日"), String(appLoc: "一"), String(appLoc: "二"),
|
||||
String(appLoc: "三"), String(appLoc: "四"), String(appLoc: "五"),
|
||||
String(appLoc: "六"),
|
||||
]
|
||||
let sorted = reminderWeekdays.sorted()
|
||||
return "每周 " + sorted.map { names[$0 - 1] }.joined()
|
||||
return String(appLoc: "每周 ") + sorted.map { names[$0 - 1] }.joined()
|
||||
}
|
||||
|
||||
private var weekdayPickerRow: some View {
|
||||
let names = ["一", "二", "三", "四", "五", "六", "日"]
|
||||
let names = [
|
||||
String(appLoc: "一"), String(appLoc: "二"), String(appLoc: "三"),
|
||||
String(appLoc: "四"), String(appLoc: "五"), String(appLoc: "六"),
|
||||
String(appLoc: "日"),
|
||||
]
|
||||
let weekdayValues = [2, 3, 4, 5, 6, 7, 1] // 周一到周日(Apple Calendar 编号)
|
||||
return HStack(spacing: 6) {
|
||||
ForEach(Array(weekdayValues.enumerated()), id: \.offset) { idx, w in
|
||||
@@ -620,7 +686,7 @@ struct IndicatorQuickSheet: View {
|
||||
}
|
||||
} label: {
|
||||
Text(names[idx])
|
||||
.font(.system(size: 13,
|
||||
.font(.tjScaled( 13,
|
||||
weight: reminderWeekdays.contains(w) ? .semibold : .regular))
|
||||
.foregroundStyle(reminderWeekdays.contains(w) ? Tj.Palette.paper : Tj.Palette.text)
|
||||
.frame(maxWidth: .infinity, minHeight: 32)
|
||||
@@ -642,7 +708,7 @@ struct IndicatorQuickSheet: View {
|
||||
private func quickFreqChip(_ label: String, action: @escaping () -> Void) -> some View {
|
||||
Button(action: action) {
|
||||
Text(label)
|
||||
.font(.system(size: 11))
|
||||
.font(.tjScaled( 11))
|
||||
.foregroundStyle(Tj.Palette.text2)
|
||||
.padding(.horizontal, 10)
|
||||
.padding(.vertical, 4)
|
||||
@@ -750,7 +816,7 @@ struct IndicatorQuickSheet: View {
|
||||
|
||||
private func sectionLabel(_ text: String) -> some View {
|
||||
Text(text)
|
||||
.font(.system(size: 12, weight: .semibold))
|
||||
.font(.tjScaled( 12, weight: .semibold))
|
||||
.tracking(0.3)
|
||||
.foregroundStyle(Tj.Palette.text2)
|
||||
}
|
||||
@@ -758,7 +824,7 @@ struct IndicatorQuickSheet: View {
|
||||
private func chip(_ label: String, selected: Bool, action: @escaping () -> Void) -> some View {
|
||||
Button(action: action) {
|
||||
Text(label)
|
||||
.font(.system(size: 13, weight: selected ? .semibold : .regular))
|
||||
.font(.tjScaled( 13, weight: selected ? .semibold : .regular))
|
||||
.foregroundStyle(selected ? Tj.Palette.paper : Tj.Palette.text)
|
||||
.padding(.horizontal, 14)
|
||||
.padding(.vertical, 8)
|
||||
@@ -774,7 +840,7 @@ struct IndicatorQuickSheet: View {
|
||||
manualStatus = value
|
||||
} label: {
|
||||
Text(label)
|
||||
.font(.system(size: 13, weight: selected ? .semibold : .regular))
|
||||
.font(.tjScaled( 13, weight: selected ? .semibold : .regular))
|
||||
.foregroundStyle(selected ? Tj.Palette.paper : color)
|
||||
.padding(.horizontal, 14)
|
||||
.padding(.vertical, 8)
|
||||
@@ -787,7 +853,7 @@ struct IndicatorQuickSheet: View {
|
||||
|
||||
private func statusBadge(_ label: String, color: Color) -> some View {
|
||||
Text(label)
|
||||
.font(.system(size: 11, weight: .semibold))
|
||||
.font(.tjScaled( 11, weight: .semibold))
|
||||
.foregroundStyle(color)
|
||||
.padding(.horizontal, 10)
|
||||
.padding(.vertical, 4)
|
||||
@@ -827,9 +893,9 @@ struct IndicatorQuickSheet: View {
|
||||
} label: {
|
||||
HStack(spacing: 3) {
|
||||
Text("已隐藏 \(hiddenSet.count)")
|
||||
.font(.system(size: 11, weight: .medium))
|
||||
.font(.tjScaled( 11, weight: .medium))
|
||||
Image(systemName: "chevron.right")
|
||||
.font(.system(size: 9, weight: .semibold))
|
||||
.font(.tjScaled( 9, weight: .semibold))
|
||||
}
|
||||
.foregroundStyle(Tj.Palette.text2)
|
||||
.padding(.horizontal, 10)
|
||||
@@ -1074,9 +1140,9 @@ struct IndicatorQuickSheet: View {
|
||||
private extension IndicatorStatus {
|
||||
var label: String {
|
||||
switch self {
|
||||
case .normal: return "正常"
|
||||
case .high: return "偏高 ↑"
|
||||
case .low: return "偏低 ↓"
|
||||
case .normal: return String(appLoc: "正常")
|
||||
case .high: return String(appLoc: "偏高 ↑")
|
||||
case .low: return String(appLoc: "偏低 ↓")
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1116,7 +1182,7 @@ private struct HiddenMonitorRestoreSheet: View {
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
Spacer()
|
||||
Button("完成") { dismiss() }
|
||||
.font(.system(size: 14))
|
||||
.font(.tjScaled( 14))
|
||||
.foregroundStyle(Tj.Palette.ink)
|
||||
}
|
||||
.padding(.horizontal, 20)
|
||||
@@ -1141,13 +1207,13 @@ private struct HiddenMonitorRestoreSheet: View {
|
||||
private func row(_ m: MonitorMetric) -> some View {
|
||||
HStack(spacing: 12) {
|
||||
Image(systemName: m.icon)
|
||||
.font(.system(size: 16, weight: .medium))
|
||||
.font(.tjScaled( 16, weight: .medium))
|
||||
.foregroundStyle(Tj.Palette.ink)
|
||||
.frame(width: 32, height: 32)
|
||||
.background(Circle().fill(Tj.Palette.amber.opacity(0.25)))
|
||||
|
||||
Text(m.displayName)
|
||||
.font(.system(size: 15, weight: .medium))
|
||||
.font(.tjScaled( 15, weight: .medium))
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
|
||||
Spacer()
|
||||
@@ -1155,7 +1221,7 @@ private struct HiddenMonitorRestoreSheet: View {
|
||||
Button("显示") {
|
||||
onRestore(m)
|
||||
}
|
||||
.font(.system(size: 13, weight: .semibold))
|
||||
.font(.tjScaled( 13, weight: .semibold))
|
||||
.foregroundStyle(Tj.Palette.paper)
|
||||
.padding(.horizontal, 14)
|
||||
.padding(.vertical, 6)
|
||||
|
||||
@@ -2,6 +2,7 @@ import SwiftUI
|
||||
|
||||
/// 「我的 · 关于」——本软件基本介绍、使用注意与免责声明。
|
||||
/// 纯静态阅读页,不调任何 Service / AIRuntime,复用现有 DesignSystem token。
|
||||
/// 文案按 App Store 上架合规口径撰写:避免绝对化用语、精确区分本地/联网行为、强化医疗免责。
|
||||
struct AboutView: View {
|
||||
/// 真实读取 Bundle 版本号,避免硬编码与实际发版脱节。
|
||||
private var versionText: String {
|
||||
@@ -19,52 +20,66 @@ struct AboutView: View {
|
||||
VStack(spacing: 16) {
|
||||
header
|
||||
|
||||
section(icon: "sparkles", title: "这是什么") {
|
||||
section(icon: "sparkles", title: String(appLoc: "这是什么")) {
|
||||
paragraph(
|
||||
"康康是一款以本地优先为设计原则的个人健康影像档案工具。" +
|
||||
"你可以拍下体检报告、化验单和影像资料,图片与数据默认保存在本机;" +
|
||||
"设备上的 AI 模型会尝试把专业指标转述为通俗说明,帮你记录并回顾自己的健康变化。"
|
||||
String(appLoc: "康康是一款以本地优先为设计原则的个人健康随记工具。") +
|
||||
String(appLoc: "你可以拍下体检报告、化验单和影像资料,图片与数据默认保存在本机;") +
|
||||
String(appLoc: "设备上的 AI 模型会尝试把专业指标转述为通俗说明,帮你记录并回顾自己的健康变化。")
|
||||
)
|
||||
}
|
||||
|
||||
section(icon: "checklist", title: "主要功能") {
|
||||
bullet("拍照归档:拍体检 / 化验报告,尝试识别为结构化指标并存档")
|
||||
bullet("通俗解读:设备本地 AI 把指标与趋势转述为易懂的说明")
|
||||
bullet("长期趋势:关注的指标可生成折线图和简要解读")
|
||||
bullet("本地问答:基于你自己的档案问答,引用可点击回链到原记录")
|
||||
bullet("隐私优先:健康数据不上传、无需注册账号")
|
||||
section(icon: "checklist", title: String(appLoc: "主要功能")) {
|
||||
bullet(String(appLoc: "拍照归档:拍体检 / 化验报告,尝试识别为结构化指标并存档"))
|
||||
bullet(String(appLoc: "通俗解读:设备本地 AI 把指标与趋势转述为易懂的说明"))
|
||||
bullet(String(appLoc: "长期趋势:关注的指标可生成折线图和简要解读"))
|
||||
bullet(String(appLoc: "本地问答:基于你自己的档案问答,引用可点击回链到原记录"))
|
||||
bullet(String(appLoc: "隐私优先:健康数据不上传、无需注册账号"))
|
||||
}
|
||||
|
||||
section(icon: "lock.shield", title: "隐私保护") {
|
||||
bullet("AI 推理在设备本地完成;除下载 AI 模型外,App 不会主动上传你的健康数据。")
|
||||
bullet("原图与数据库采用系统级文件加密,随设备锁屏受到保护。")
|
||||
bullet("支持删除记录,数据将从本机移除;数据保存在本机,不依赖云端备份。")
|
||||
bullet("可选开启 Face ID 启动锁,进一步保护隐私。")
|
||||
section(icon: "iphone", title: String(appLoc: "设备要求"), tint: Tj.Palette.leaf) {
|
||||
bullet(String(appLoc: "系统:iOS 17 或更新版本。"))
|
||||
bullet(String(appLoc: "本地 AI 功能(拍照识别、解读、问答)需要约 8GB 内存,") +
|
||||
String(appLoc: "推荐 iPhone 15 Pro / Pro Max 及之后发布的机型(含 iPhone 16 系列)。"))
|
||||
bullet(String(appLoc: "在内存较小的旧机型上,App 仍可用于手动记录、归档与查看,") +
|
||||
String(appLoc: "但本地 AI 相关功能可能无法运行。"))
|
||||
}
|
||||
|
||||
section(icon: "exclamationmark.triangle", title: "使用注意", tint: Tj.Palette.amber) {
|
||||
bullet("本地 AI 模型体积较大(约 3GB),首次使用需联网下载,建议在 Wi-Fi 环境进行;" +
|
||||
"模型未就绪时 App 仍可使用,AI 功能会提示前往下载。")
|
||||
bullet("AI 识别与解读可能出现错误或遗漏:拍照得到的数值、单位、参考范围请务必与原始报告核对," +
|
||||
"并以原始报告 / 化验单为准。")
|
||||
bullet("AI 解读基于通用健康知识生成,并不掌握你完整的病史与个体情况,仅供日常记录参考。")
|
||||
bullet("数据保存在本设备:卸载 App 或删除数据后可能无法恢复,重要资料请自行留存原件。")
|
||||
section(icon: "lock.shield", title: String(appLoc: "隐私保护")) {
|
||||
bullet(String(appLoc: "AI 推理在设备本地完成;除下载 AI 模型外,App 不会主动上传你的健康数据。"))
|
||||
bullet(String(appLoc: "原图与数据库采用系统级文件加密,随设备锁屏受到保护。"))
|
||||
bullet(String(appLoc: "支持删除记录,数据将从本机移除;数据保存在本机,不依赖云端备份。"))
|
||||
bullet(String(appLoc: "可选开启 Face ID 启动锁,进一步保护隐私。"))
|
||||
}
|
||||
|
||||
section(icon: "hand.raised", title: "免责声明", tint: Tj.Palette.brick) {
|
||||
bullet("康康是一款健康信息记录与参考工具,并非医疗器械,不提供医疗诊断、用药或剂量建议、急诊判断等医疗服务。")
|
||||
bullet("App 内所有 AI 生成的解读、趋势分析与问答内容仅供信息参考," +
|
||||
"不构成医疗建议,也不能替代执业医师、药师或其他专业人员的面诊、检查与意见。")
|
||||
bullet("任何健康决策(是否就医、用药、调整治疗方案等)请咨询专业医疗人员,并以其意见为准。")
|
||||
bullet("如出现身体不适或紧急情况,请及时就医或拨打当地急救电话,请勿依赖本 App 进行判断。")
|
||||
bullet("在适用法律允许的范围内,因使用本 App 或依赖其中内容所产生的后果,由使用者自行承担。")
|
||||
section(icon: "exclamationmark.triangle", title: String(appLoc: "使用注意"), tint: Tj.Palette.amber) {
|
||||
bullet(String(appLoc: "本地 AI 模型体积较大(约 4GB),首次使用需联网下载,建议在 Wi-Fi 环境进行;") +
|
||||
String(appLoc: "模型未就绪时 App 仍可使用,AI 功能会提示前往下载。"))
|
||||
bullet(String(appLoc: "AI 识别与解读可能出现错误或遗漏:拍照得到的数值、单位、参考范围请务必与原始报告核对,") +
|
||||
String(appLoc: "并以原始报告 / 化验单为准。"))
|
||||
bullet(String(appLoc: "AI 解读基于通用健康知识生成,并不掌握你完整的病史与个体情况,仅供日常记录参考。"))
|
||||
bullet(String(appLoc: "数据保存在本设备:卸载 App 或删除数据后可能无法恢复,重要资料请自行留存原件。"))
|
||||
}
|
||||
|
||||
section(icon: "hand.raised", title: String(appLoc: "免责声明"), tint: Tj.Palette.brick) {
|
||||
bullet(String(appLoc: "康康是一款健康信息记录与参考工具,并非医疗器械,不提供医疗诊断、用药或剂量建议、急诊判断等医疗服务。"))
|
||||
bullet(String(appLoc: "App 内所有 AI 生成的解读、趋势分析与问答内容仅供信息参考,") +
|
||||
String(appLoc: "不构成医疗建议,也不能替代执业医师、药师或其他专业人员的面诊、检查与意见。"))
|
||||
bullet(String(appLoc: "任何健康决策(是否就医、用药、调整治疗方案等)请咨询专业医疗人员,并以其意见为准。"))
|
||||
bullet(String(appLoc: "如出现身体不适或紧急情况,请及时就医或拨打当地急救电话,请勿依赖本 App 进行判断。"))
|
||||
bullet(String(appLoc: "在适用法律允许的范围内,因使用本 App 或依赖其中内容所产生的后果,由使用者自行承担。"))
|
||||
}
|
||||
|
||||
Text("康康 · 本地优先的健康档案 · \(versionText)")
|
||||
.font(.system(size: 12))
|
||||
.font(.tjScaled( 12))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
.padding(.top, 4)
|
||||
|
||||
Text("本 App 仅供健康信息记录与参考,不能替代专业医疗意见。")
|
||||
.font(.tjScaled( 11))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
.multilineTextAlignment(.center)
|
||||
.fixedSize(horizontal: false, vertical: true)
|
||||
|
||||
Spacer(minLength: 32)
|
||||
}
|
||||
.padding(.horizontal, 16)
|
||||
@@ -83,7 +98,7 @@ struct AboutView: View {
|
||||
RoundedRectangle(cornerRadius: Tj.Radius.md, style: .continuous)
|
||||
.fill(Tj.Palette.sand2)
|
||||
Image(systemName: "heart.text.square.fill")
|
||||
.font(.system(size: 34))
|
||||
.font(.tjScaled( 34))
|
||||
.foregroundStyle(Tj.Palette.brick)
|
||||
}
|
||||
.frame(width: 72, height: 72)
|
||||
@@ -92,8 +107,8 @@ struct AboutView: View {
|
||||
.font(.tjH2())
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
|
||||
Text("本地优先的个人健康影像档案")
|
||||
.font(.system(size: 13))
|
||||
Text("本地优先的个人健康随记")
|
||||
.font(.tjScaled( 13))
|
||||
.foregroundStyle(Tj.Palette.text2)
|
||||
|
||||
Text(versionText)
|
||||
@@ -118,10 +133,10 @@ struct AboutView: View {
|
||||
VStack(alignment: .leading, spacing: 10) {
|
||||
HStack(spacing: 8) {
|
||||
Image(systemName: icon)
|
||||
.font(.system(size: 15, weight: .semibold))
|
||||
.font(.tjScaled( 15, weight: .semibold))
|
||||
.foregroundStyle(tint)
|
||||
Text(title)
|
||||
.font(.system(size: 16, weight: .semibold))
|
||||
.font(.tjScaled( 16, weight: .semibold))
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
}
|
||||
content()
|
||||
@@ -133,7 +148,7 @@ struct AboutView: View {
|
||||
|
||||
@ViewBuilder private func paragraph(_ text: String) -> some View {
|
||||
Text(text)
|
||||
.font(.system(size: 14))
|
||||
.font(.tjScaled( 14))
|
||||
.foregroundStyle(Tj.Palette.text2)
|
||||
.lineSpacing(5)
|
||||
.fixedSize(horizontal: false, vertical: true)
|
||||
@@ -146,7 +161,7 @@ struct AboutView: View {
|
||||
.frame(width: 5, height: 5)
|
||||
.padding(.top, 7)
|
||||
Text(text)
|
||||
.font(.system(size: 14))
|
||||
.font(.tjScaled( 14))
|
||||
.foregroundStyle(Tj.Palette.text2)
|
||||
.lineSpacing(5)
|
||||
.fixedSize(horizontal: false, vertical: true)
|
||||
|
||||
@@ -41,7 +41,7 @@ struct CustomMetricsListView: View {
|
||||
editingTarget = CustomMetricEditTarget(metric: nil)
|
||||
} label: {
|
||||
Image(systemName: "plus")
|
||||
.font(.system(size: 16, weight: .semibold))
|
||||
.font(.tjScaled( 16, weight: .semibold))
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -57,7 +57,7 @@ struct CustomMetricsListView: View {
|
||||
Image(systemName: "info.circle.fill")
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
Text("自定义指标会出现在「+ 指标记录 → 长期监测」的 grid 里,可设提醒、进趋势")
|
||||
.font(.system(size: 12))
|
||||
.font(.tjScaled( 12))
|
||||
.foregroundStyle(Tj.Palette.text2)
|
||||
.fixedSize(horizontal: false, vertical: true)
|
||||
Spacer(minLength: 0)
|
||||
@@ -72,10 +72,10 @@ struct CustomMetricsListView: View {
|
||||
private var emptyState: some View {
|
||||
VStack(spacing: 14) {
|
||||
Spacer(minLength: 40)
|
||||
TjPlaceholder(label: "还没有自定义指标")
|
||||
TjPlaceholder(label: String(appLoc: "还没有自定义指标"))
|
||||
.frame(width: 220, height: 130)
|
||||
Text("右上角 + 新建一个")
|
||||
.font(.system(size: 12))
|
||||
.font(.tjScaled( 12))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
Spacer()
|
||||
}
|
||||
@@ -88,28 +88,28 @@ struct CustomMetricsListView: View {
|
||||
ZStack {
|
||||
Circle().fill(Tj.Palette.leafSoft)
|
||||
Image(systemName: m.icon)
|
||||
.font(.system(size: 17, weight: .medium))
|
||||
.font(.tjScaled( 17, weight: .medium))
|
||||
.foregroundStyle(Tj.Palette.ink)
|
||||
}
|
||||
.frame(width: 40, height: 40)
|
||||
|
||||
VStack(alignment: .leading, spacing: 3) {
|
||||
Text(m.name)
|
||||
.font(.system(size: 15, weight: .semibold))
|
||||
.font(.tjScaled( 15, weight: .semibold))
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
.lineLimit(1)
|
||||
HStack(spacing: 6) {
|
||||
if !m.unit.isEmpty {
|
||||
Text(m.unit)
|
||||
.font(.system(size: 11, design: .monospaced))
|
||||
.font(.tjScaled( 11, design: .monospaced))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
}
|
||||
if !m.rangeText.isEmpty {
|
||||
Text("·")
|
||||
.font(.system(size: 11))
|
||||
.font(.tjScaled( 11))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
Text(m.rangeText)
|
||||
.font(.system(size: 11, design: .monospaced))
|
||||
.font(.tjScaled( 11, design: .monospaced))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
}
|
||||
}
|
||||
@@ -118,11 +118,11 @@ struct CustomMetricsListView: View {
|
||||
Spacer(minLength: 8)
|
||||
|
||||
VStack(alignment: .trailing, spacing: 2) {
|
||||
Text(count == 0 ? "未使用" : "用 \(count) 次")
|
||||
.font(.system(size: 11, weight: count > 0 ? .semibold : .regular))
|
||||
Text(count == 0 ? String(appLoc: "未使用") : String(appLoc: "用 \(count) 次"))
|
||||
.font(.tjScaled( 11, weight: count > 0 ? .semibold : .regular))
|
||||
.foregroundStyle(count > 0 ? Tj.Palette.ink : Tj.Palette.text3)
|
||||
Image(systemName: "chevron.right")
|
||||
.font(.system(size: 11, weight: .medium))
|
||||
.font(.tjScaled( 11, weight: .medium))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
}
|
||||
}
|
||||
|
||||
300
康康/Features/Me/CustomReminderEditSheet.swift
Normal file
@@ -0,0 +1,300 @@
|
||||
import SwiftUI
|
||||
import SwiftData
|
||||
|
||||
/// 自由周期提醒的创建 / 编辑表单。
|
||||
/// `reminder == nil` 为新建;否则为编辑(多一个删除按钮)。
|
||||
/// 本地 @State 暂存,保存时才写 SwiftData + 调度通知;取消即丢弃。
|
||||
struct CustomReminderEditSheet: View {
|
||||
@Environment(\.modelContext) private var ctx
|
||||
@Environment(\.dismiss) private var dismiss
|
||||
|
||||
/// nil = 新建模式。
|
||||
let reminder: CustomReminder?
|
||||
|
||||
@State private var title = ""
|
||||
@State private var note = ""
|
||||
@State private var pickedTime: Date = .now
|
||||
@State private var frequency: CustomReminder.Frequency = .daily
|
||||
@State private var weekdays: Set<Int> = Set(1...7)
|
||||
@State private var dayOfMonth = 1
|
||||
@State private var month = 1
|
||||
@State private var hydrated = false
|
||||
@State private var showAuthDeniedAlert = false
|
||||
|
||||
/// 常用时间快捷预设(时, 分):早 / 午 / 傍晚 / 睡前。
|
||||
private let timePresets: [(h: Int, m: Int)] = [(8, 0), (12, 0), (18, 0), (22, 0)]
|
||||
|
||||
init(reminder: CustomReminder? = nil) {
|
||||
self.reminder = reminder
|
||||
}
|
||||
|
||||
private var isEditing: Bool { reminder != nil }
|
||||
private var trimmedTitle: String {
|
||||
title.trimmingCharacters(in: .whitespacesAndNewlines)
|
||||
}
|
||||
private var canSave: Bool {
|
||||
guard !trimmedTitle.isEmpty else { return false }
|
||||
if frequency == .weekly { return !weekdays.isEmpty }
|
||||
return true
|
||||
}
|
||||
|
||||
var body: some View {
|
||||
NavigationStack {
|
||||
Form {
|
||||
Section {
|
||||
TextField(String(appLoc: "做点什么?例:跑步5公里 / 吃2片护肝片"),
|
||||
text: $title, axis: .vertical)
|
||||
.lineLimit(1...3)
|
||||
TextField(String(appLoc: "备注(可选)"), text: $note, axis: .vertical)
|
||||
.lineLimit(1...3)
|
||||
.foregroundStyle(Tj.Palette.text2)
|
||||
}
|
||||
|
||||
Section {
|
||||
Picker(String(appLoc: "重复"), selection: $frequency) {
|
||||
Text(String(appLoc: "每日")).tag(CustomReminder.Frequency.daily)
|
||||
Text(String(appLoc: "每周")).tag(CustomReminder.Frequency.weekly)
|
||||
Text(String(appLoc: "每月")).tag(CustomReminder.Frequency.monthly)
|
||||
Text(String(appLoc: "每年")).tag(CustomReminder.Frequency.yearly)
|
||||
}
|
||||
.pickerStyle(.segmented)
|
||||
.listRowBackground(Color.clear)
|
||||
|
||||
frequencyDetail
|
||||
} header: {
|
||||
Text("重复")
|
||||
}
|
||||
|
||||
Section {
|
||||
timePresetRow
|
||||
DatePicker(String(appLoc: "时间"), selection: $pickedTime,
|
||||
displayedComponents: .hourAndMinute)
|
||||
} header: {
|
||||
Text("时间")
|
||||
}
|
||||
|
||||
if isEditing {
|
||||
Section {
|
||||
Button(role: .destructive) { deleteReminder() } label: {
|
||||
Label(String(appLoc: "删除提醒"), systemImage: "trash")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
.scrollContentBackground(.hidden)
|
||||
.background(Tj.Palette.sand.ignoresSafeArea())
|
||||
.navigationTitle(isEditing ? String(appLoc: "编辑提醒") : String(appLoc: "新建提醒"))
|
||||
.navigationBarTitleDisplayMode(.inline)
|
||||
.toolbar {
|
||||
ToolbarItem(placement: .topBarLeading) {
|
||||
Button(String(appLoc: "取消")) { dismiss() }
|
||||
}
|
||||
ToolbarItem(placement: .topBarTrailing) {
|
||||
Button(String(appLoc: "保存")) { save() }
|
||||
.fontWeight(.semibold)
|
||||
.disabled(!canSave)
|
||||
}
|
||||
}
|
||||
.onAppear(perform: hydrate)
|
||||
.onChange(of: month) { _, newMonth in
|
||||
// 切月份后,把超出该月最大天数的「日」收回(避免「2月31日」这种永不触发的组合)。
|
||||
let maxD = Self.daysInMonth(newMonth)
|
||||
if dayOfMonth > maxD { dayOfMonth = maxD }
|
||||
}
|
||||
.alert(String(appLoc: "通知未开启"), isPresented: $showAuthDeniedAlert) {
|
||||
Button(String(appLoc: "好")) { dismiss() }
|
||||
} message: {
|
||||
Text("提醒已保存,但系统通知权限未开启,到点不会弹出。请在「设置 · 通知 · 康康」中允许。")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - 频率子控件
|
||||
|
||||
@ViewBuilder
|
||||
private var frequencyDetail: some View {
|
||||
switch frequency {
|
||||
case .daily:
|
||||
EmptyView()
|
||||
case .weekly:
|
||||
weekdayRow
|
||||
case .monthly:
|
||||
Picker(String(appLoc: "日期"), selection: $dayOfMonth) {
|
||||
ForEach(1...31, id: \.self) { d in
|
||||
Text(String(appLoc: "\(d)日")).tag(d)
|
||||
}
|
||||
}
|
||||
if dayOfMonth >= 29 { skipHint }
|
||||
case .yearly:
|
||||
Picker(String(appLoc: "月份"), selection: $month) {
|
||||
ForEach(1...12, id: \.self) { mo in
|
||||
Text(String(appLoc: "\(mo)月")).tag(mo)
|
||||
}
|
||||
}
|
||||
Picker(String(appLoc: "日期"), selection: $dayOfMonth) {
|
||||
ForEach(1...Self.daysInMonth(month), id: \.self) { d in
|
||||
Text(String(appLoc: "\(d)日")).tag(d)
|
||||
}
|
||||
}
|
||||
if month == 2 && dayOfMonth == 29 { skipHint } // 仅闰年的 2/29
|
||||
}
|
||||
}
|
||||
|
||||
private var skipHint: some View {
|
||||
Text(String(appLoc: "部分月份无此日,该月将跳过"))
|
||||
.font(.tjScaled( 11))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
}
|
||||
|
||||
/// 某月最大天数(2 月取 29,允许设闰年 2/29)。
|
||||
private static func daysInMonth(_ month: Int) -> Int {
|
||||
switch month {
|
||||
case 2: return 29
|
||||
case 4, 6, 9, 11: return 30
|
||||
default: return 31
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - 时间快捷预设
|
||||
|
||||
private var timePresetRow: some View {
|
||||
let cal = Calendar.current
|
||||
let curH = cal.component(.hour, from: pickedTime)
|
||||
let curM = cal.component(.minute, from: pickedTime)
|
||||
return HStack(spacing: 8) {
|
||||
ForEach(Array(timePresets.enumerated()), id: \.offset) { _, preset in
|
||||
let on = curH == preset.h && curM == preset.m
|
||||
Button {
|
||||
pickedTime = cal.date(bySettingHour: preset.h, minute: preset.m,
|
||||
second: 0, of: pickedTime) ?? pickedTime
|
||||
} label: {
|
||||
Text(String(format: "%d:%02d", preset.h, preset.m))
|
||||
.font(.tjScaled( 13, weight: on ? .semibold : .regular))
|
||||
.foregroundStyle(on ? Tj.Palette.paper : Tj.Palette.text)
|
||||
.frame(maxWidth: .infinity, minHeight: 30)
|
||||
.background(
|
||||
RoundedRectangle(cornerRadius: 8, style: .continuous)
|
||||
.fill(on ? Tj.Palette.ink : Tj.Palette.paper)
|
||||
)
|
||||
.overlay(
|
||||
RoundedRectangle(cornerRadius: 8, style: .continuous)
|
||||
.strokeBorder(Tj.Palette.line, lineWidth: on ? 0 : 1)
|
||||
)
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
}
|
||||
}
|
||||
.listRowBackground(Color.clear)
|
||||
}
|
||||
|
||||
// MARK: - 周几选择(与 RemindersListView 同款)
|
||||
|
||||
private var weekdayRow: some View {
|
||||
let names = [
|
||||
String(appLoc: "一"), String(appLoc: "二"), String(appLoc: "三"),
|
||||
String(appLoc: "四"), String(appLoc: "五"), String(appLoc: "六"),
|
||||
String(appLoc: "日"),
|
||||
]
|
||||
let values = [2, 3, 4, 5, 6, 7, 1]
|
||||
return HStack(spacing: 6) {
|
||||
ForEach(Array(values.enumerated()), id: \.offset) { idx, w in
|
||||
let on = weekdays.contains(w)
|
||||
Button {
|
||||
if on { weekdays.remove(w) } else { weekdays.insert(w) }
|
||||
} label: {
|
||||
Text(names[idx])
|
||||
.font(.tjScaled( 13, weight: on ? .semibold : .regular))
|
||||
.foregroundStyle(on ? Tj.Palette.paper : Tj.Palette.text)
|
||||
.frame(maxWidth: .infinity, minHeight: 30)
|
||||
.background(
|
||||
RoundedRectangle(cornerRadius: 8, style: .continuous)
|
||||
.fill(on ? Tj.Palette.ink : Tj.Palette.paper)
|
||||
)
|
||||
.overlay(
|
||||
RoundedRectangle(cornerRadius: 8, style: .continuous)
|
||||
.strokeBorder(Tj.Palette.line, lineWidth: on ? 0 : 1)
|
||||
)
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
}
|
||||
}
|
||||
.listRowBackground(Color.clear)
|
||||
}
|
||||
|
||||
// MARK: - 数据
|
||||
|
||||
private func hydrate() {
|
||||
guard !hydrated else { return }
|
||||
hydrated = true
|
||||
if let r = reminder {
|
||||
title = r.title
|
||||
note = r.note
|
||||
frequency = r.frequency
|
||||
weekdays = Set(r.weekdays)
|
||||
dayOfMonth = r.dayOfMonth
|
||||
month = r.month
|
||||
pickedTime = Calendar.current.date(
|
||||
bySettingHour: r.hour, minute: r.minute, second: 0, of: .now
|
||||
) ?? .now
|
||||
}
|
||||
}
|
||||
|
||||
private func save() {
|
||||
guard canSave else { return }
|
||||
let cal = Calendar.current
|
||||
let hour = cal.component(.hour, from: pickedTime)
|
||||
let minute = cal.component(.minute, from: pickedTime)
|
||||
let sortedDays = weekdays.sorted()
|
||||
|
||||
let target: CustomReminder
|
||||
if let r = reminder {
|
||||
r.title = trimmedTitle
|
||||
r.note = note.trimmingCharacters(in: .whitespacesAndNewlines)
|
||||
r.hour = hour
|
||||
r.minute = minute
|
||||
r.weekdays = sortedDays
|
||||
r.frequency = frequency
|
||||
r.dayOfMonth = dayOfMonth
|
||||
r.month = month
|
||||
r.updatedAt = .now
|
||||
target = r
|
||||
} else {
|
||||
let new = CustomReminder(
|
||||
title: trimmedTitle,
|
||||
note: note.trimmingCharacters(in: .whitespacesAndNewlines),
|
||||
hour: hour,
|
||||
minute: minute,
|
||||
weekdays: sortedDays,
|
||||
frequency: frequency,
|
||||
dayOfMonth: dayOfMonth,
|
||||
month: month
|
||||
)
|
||||
ctx.insert(new)
|
||||
target = new
|
||||
}
|
||||
try? ctx.save()
|
||||
|
||||
Task { @MainActor in
|
||||
let state = await ReminderService.requestAuthorization()
|
||||
await ReminderService.sync(target)
|
||||
if state == .denied {
|
||||
showAuthDeniedAlert = true
|
||||
} else {
|
||||
dismiss()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private func deleteReminder() {
|
||||
guard let r = reminder else { return }
|
||||
ReminderService.cancel(customId: r.id)
|
||||
ctx.delete(r)
|
||||
try? ctx.save()
|
||||
dismiss()
|
||||
}
|
||||
}
|
||||
|
||||
#Preview("新建") {
|
||||
CustomReminderEditSheet()
|
||||
.modelContainer(for: [CustomReminder.self], inMemory: true)
|
||||
}
|
||||
81
康康/Features/Me/FontSettingsView.swift
Normal file
@@ -0,0 +1,81 @@
|
||||
import SwiftUI
|
||||
|
||||
/// 「我的 · 字体大小」选择页。面向视力不佳 / 老年用户:放大整个 App 字号。
|
||||
/// 选中即时生效(整树重建为新档位,无需重启,同语言切换机制)。
|
||||
/// 每行用各自档位渲染示例字,便于直接比较大小后再选。
|
||||
struct FontSettingsView: View {
|
||||
@State private var manager = FontScaleManager.shared
|
||||
|
||||
/// 示例字基准字号(行内按各档位倍率独立渲染,不随当前全局档位变化,保证可对比)。
|
||||
private let sampleBase: CGFloat = 17
|
||||
|
||||
var body: some View {
|
||||
ScrollView {
|
||||
VStack(spacing: 10) {
|
||||
ForEach(FontScale.allCases) { option in
|
||||
row(option)
|
||||
}
|
||||
|
||||
Text("放大后整个 App 的文字立即变大,无需重启。设置会被记住。")
|
||||
.font(.tjScaled(12))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
.frame(maxWidth: .infinity, alignment: .leading)
|
||||
.padding(.horizontal, 4)
|
||||
.padding(.top, 6)
|
||||
}
|
||||
.padding(.horizontal, 16)
|
||||
.padding(.vertical, 20)
|
||||
}
|
||||
.background(Tj.Palette.sand.ignoresSafeArea())
|
||||
.navigationTitle("字体大小")
|
||||
.navigationBarTitleDisplayMode(.inline)
|
||||
}
|
||||
|
||||
private func row(_ option: FontScale) -> some View {
|
||||
let selected = manager.scale == option
|
||||
return Button {
|
||||
manager.set(option)
|
||||
} label: {
|
||||
HStack(spacing: 14) {
|
||||
VStack(alignment: .leading, spacing: 4) {
|
||||
HStack(spacing: 8) {
|
||||
Text(option.label)
|
||||
.font(.system(size: 15, weight: selected ? .semibold : .regular))
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
Text(option.detail)
|
||||
.font(.system(size: 11))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
}
|
||||
// 示例字:按本档位倍率渲染,直接预览效果。
|
||||
Text("健康档案 Aa 123")
|
||||
.font(.system(size: sampleBase * option.multiplier, weight: .medium))
|
||||
.foregroundStyle(Tj.Palette.text2)
|
||||
.lineLimit(1)
|
||||
.minimumScaleFactor(0.5)
|
||||
}
|
||||
|
||||
Spacer(minLength: 8)
|
||||
|
||||
ZStack {
|
||||
Circle()
|
||||
.strokeBorder(selected ? Tj.Palette.ink : Tj.Palette.line, lineWidth: selected ? 0 : 1.5)
|
||||
.background(Circle().fill(selected ? Tj.Palette.ink : Color.clear))
|
||||
.frame(width: 24, height: 24)
|
||||
if selected {
|
||||
Image(systemName: "checkmark")
|
||||
.font(.system(size: 12, weight: .bold))
|
||||
.foregroundStyle(Tj.Palette.paper)
|
||||
}
|
||||
}
|
||||
}
|
||||
.padding(14)
|
||||
.frame(maxWidth: .infinity, alignment: .leading)
|
||||
.tjCard()
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
}
|
||||
}
|
||||
|
||||
#Preview {
|
||||
NavigationStack { FontSettingsView() }
|
||||
}
|
||||
79
康康/Features/Me/LanguageSettingsView.swift
Normal file
@@ -0,0 +1,79 @@
|
||||
import SwiftUI
|
||||
|
||||
/// 「我的 · 语言」选择页。选中即时生效(整个 App 重建为所选语言,无需重启)。
|
||||
struct LanguageSettingsView: View {
|
||||
@State private var lang = LanguageManager.shared
|
||||
|
||||
var body: some View {
|
||||
ScrollView {
|
||||
VStack(spacing: 10) {
|
||||
ForEach(AppLanguage.allCases) { option in
|
||||
row(option)
|
||||
}
|
||||
|
||||
Text("切换后整个 App 立即生效,无需重启。")
|
||||
.font(.tjScaled( 12))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
.frame(maxWidth: .infinity, alignment: .leading)
|
||||
.padding(.horizontal, 4)
|
||||
.padding(.top, 6)
|
||||
}
|
||||
.padding(.horizontal, 16)
|
||||
.padding(.vertical, 20)
|
||||
}
|
||||
.background(Tj.Palette.sand.ignoresSafeArea())
|
||||
.navigationTitle("语言")
|
||||
.navigationBarTitleDisplayMode(.inline)
|
||||
}
|
||||
|
||||
private func row(_ option: AppLanguage) -> some View {
|
||||
let selected = lang.current == option
|
||||
return Button {
|
||||
// 切换会触发根视图 .id 重建 → 当前导航栈回到「我的」根,整树换语言。
|
||||
lang.set(option)
|
||||
} label: {
|
||||
HStack(spacing: 12) {
|
||||
ZStack {
|
||||
Circle().fill(selected ? Tj.Palette.amber.opacity(0.25) : Tj.Palette.sand2)
|
||||
icon(option, selected: selected)
|
||||
}
|
||||
.frame(width: 40, height: 40)
|
||||
|
||||
Text(option.displayName)
|
||||
.font(.tjScaled( 15, weight: selected ? .semibold : .regular))
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
|
||||
Spacer()
|
||||
|
||||
if selected {
|
||||
Image(systemName: "checkmark")
|
||||
.font(.tjScaled( 14, weight: .semibold))
|
||||
.foregroundStyle(Tj.Palette.ink)
|
||||
}
|
||||
}
|
||||
.padding(14)
|
||||
.tjCard()
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
}
|
||||
|
||||
/// 每个语言的个性化图标:本族语代表字(中/A/あ/가),跟随系统用地球符号。
|
||||
@ViewBuilder
|
||||
private func icon(_ option: AppLanguage, selected: Bool) -> some View {
|
||||
let fg = selected ? Tj.Palette.ink : Tj.Palette.text2
|
||||
switch option.pickerIcon {
|
||||
case .symbol(let name):
|
||||
Image(systemName: name)
|
||||
.font(.tjScaled( 16))
|
||||
.foregroundStyle(fg)
|
||||
case .glyph(let g):
|
||||
Text(verbatim: g)
|
||||
.font(.tjScaled( 17, weight: .semibold))
|
||||
.foregroundStyle(fg)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#Preview {
|
||||
NavigationStack { LanguageSettingsView() }
|
||||
}
|
||||
@@ -4,13 +4,16 @@ import SwiftData
|
||||
struct MeView: View {
|
||||
@Environment(\.modelContext) private var ctx
|
||||
@Query private var profiles: [UserProfile]
|
||||
@Query private var reminders: [MetricReminder]
|
||||
@Query private var customMetrics: [CustomMonitorMetric]
|
||||
|
||||
@State private var downloadService = ModelDownloadService.shared
|
||||
@State private var appLock = AppLock.shared
|
||||
@State private var lang = LanguageManager.shared
|
||||
@State private var fontScale = FontScaleManager.shared
|
||||
// key 必须与 AppLock.enabledKey 一致。
|
||||
@AppStorage("faceIDLockEnabled") private var lockEnabled = false
|
||||
|
||||
private var profile: UserProfile? { profiles.first }
|
||||
private var enabledReminderCount: Int { reminders.filter(\.enabled).count }
|
||||
|
||||
/// 真实读取 Bundle 版本号,与「关于」页保持一致。
|
||||
private var appVersionText: String {
|
||||
@@ -22,17 +25,25 @@ struct MeView: View {
|
||||
NavigationStack {
|
||||
ScrollView {
|
||||
VStack(spacing: 12) {
|
||||
HStack {
|
||||
Text("我的")
|
||||
.font(.tjTitle())
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
Spacer()
|
||||
}
|
||||
.padding(.top, 4)
|
||||
.padding(.bottom, 6)
|
||||
|
||||
profileCard
|
||||
remindersCard
|
||||
customMetricsCard
|
||||
modelManagementCard
|
||||
settingsCard(title: "Face ID 启动锁",
|
||||
detail: "关闭",
|
||||
icon: "faceid")
|
||||
languageCard
|
||||
fontScaleCard
|
||||
faceIDCard
|
||||
NavigationLink {
|
||||
AboutView()
|
||||
} label: {
|
||||
settingsCard(title: "关于",
|
||||
settingsCard(title: String(appLoc: "关于"),
|
||||
detail: appVersionText,
|
||||
icon: "info.circle")
|
||||
}
|
||||
@@ -42,13 +53,14 @@ struct MeView: View {
|
||||
.padding(.vertical, 20)
|
||||
}
|
||||
.background(Tj.Palette.sand.ignoresSafeArea())
|
||||
.navigationTitle("我的")
|
||||
.navigationBarTitleDisplayMode(.large)
|
||||
// 标题改用内容文字渲染(与 主页/记录/趋势 一致),不走 .navigationTitle:
|
||||
// 大标题导航栏在真机状态栏区域会露出系统白底,破坏全 App 的沙色背景。
|
||||
.onAppear {
|
||||
if profiles.isEmpty {
|
||||
_ = UserProfileStore.loadOrCreate(in: ctx)
|
||||
}
|
||||
downloadService.refreshStates()
|
||||
appLock.refreshAvailability()
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -64,23 +76,23 @@ struct MeView: View {
|
||||
Circle()
|
||||
.fill(Tj.Palette.amber.opacity(0.25))
|
||||
Image(systemName: "person.crop.circle.fill")
|
||||
.font(.system(size: 22))
|
||||
.font(.tjScaled( 22))
|
||||
.foregroundStyle(Tj.Palette.ink)
|
||||
}
|
||||
.frame(width: 44, height: 44)
|
||||
|
||||
VStack(alignment: .leading, spacing: 2) {
|
||||
Text("个人资料")
|
||||
.font(.system(size: 15, weight: .semibold))
|
||||
.font(.tjScaled( 15, weight: .semibold))
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
Text(profileLine)
|
||||
.font(.system(size: 12))
|
||||
.font(.tjScaled( 12))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
.lineLimit(1)
|
||||
}
|
||||
Spacer()
|
||||
Image(systemName: "chevron.right")
|
||||
.font(.system(size: 13, weight: .medium))
|
||||
.font(.tjScaled( 13, weight: .medium))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
}
|
||||
.padding(14)
|
||||
@@ -89,46 +101,6 @@ struct MeView: View {
|
||||
.buttonStyle(.plain)
|
||||
}
|
||||
|
||||
private var remindersCard: some View {
|
||||
NavigationLink {
|
||||
RemindersListView()
|
||||
} label: {
|
||||
HStack(spacing: 12) {
|
||||
ZStack {
|
||||
Circle()
|
||||
.fill(enabledReminderCount > 0 ? Tj.Palette.amber.opacity(0.25) : Tj.Palette.sand2)
|
||||
Image(systemName: "bell.fill")
|
||||
.font(.system(size: 18))
|
||||
.foregroundStyle(enabledReminderCount > 0 ? Tj.Palette.ink : Tj.Palette.text2)
|
||||
}
|
||||
.frame(width: 44, height: 44)
|
||||
|
||||
VStack(alignment: .leading, spacing: 2) {
|
||||
Text("记录提醒")
|
||||
.font(.system(size: 15, weight: .semibold))
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
Text(reminderLine)
|
||||
.font(.system(size: 12))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
.lineLimit(1)
|
||||
}
|
||||
Spacer()
|
||||
Image(systemName: "chevron.right")
|
||||
.font(.system(size: 13, weight: .medium))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
}
|
||||
.padding(14)
|
||||
.tjCard()
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
}
|
||||
|
||||
private var reminderLine: String {
|
||||
if reminders.isEmpty { return "尚未设置" }
|
||||
if enabledReminderCount == 0 { return "全部已关闭(\(reminders.count) 条)" }
|
||||
return "\(enabledReminderCount) 项启用"
|
||||
}
|
||||
|
||||
private var customMetricsCard: some View {
|
||||
NavigationLink {
|
||||
CustomMetricsListView()
|
||||
@@ -138,23 +110,23 @@ struct MeView: View {
|
||||
Circle()
|
||||
.fill(customMetrics.isEmpty ? Tj.Palette.sand2 : Tj.Palette.leafSoft)
|
||||
Image(systemName: "slider.horizontal.3")
|
||||
.font(.system(size: 18))
|
||||
.font(.tjScaled( 18))
|
||||
.foregroundStyle(customMetrics.isEmpty ? Tj.Palette.text2 : Tj.Palette.ink)
|
||||
}
|
||||
.frame(width: 44, height: 44)
|
||||
|
||||
VStack(alignment: .leading, spacing: 2) {
|
||||
Text("自定义指标")
|
||||
.font(.system(size: 15, weight: .semibold))
|
||||
.font(.tjScaled( 15, weight: .semibold))
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
Text(customMetricsLine)
|
||||
.font(.system(size: 12))
|
||||
.font(.tjScaled( 12))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
.lineLimit(1)
|
||||
}
|
||||
Spacer()
|
||||
Image(systemName: "chevron.right")
|
||||
.font(.system(size: 13, weight: .medium))
|
||||
.font(.tjScaled( 13, weight: .medium))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
}
|
||||
.padding(14)
|
||||
@@ -164,25 +136,95 @@ struct MeView: View {
|
||||
}
|
||||
|
||||
private var customMetricsLine: String {
|
||||
if customMetrics.isEmpty { return "添加你自己的长期监测项" }
|
||||
return "\(customMetrics.count) 项"
|
||||
if customMetrics.isEmpty { return String(appLoc: "添加你自己的长期监测项") }
|
||||
return String(appLoc: "\(customMetrics.count) 项")
|
||||
}
|
||||
|
||||
private var modelManagementCard: some View {
|
||||
NavigationLink {
|
||||
ModelManagementView()
|
||||
} label: {
|
||||
settingsCard(title: "模型管理", detail: modelDetail, icon: "cpu")
|
||||
settingsCard(title: String(appLoc: "模型管理"), detail: modelDetail, icon: "cpu")
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
}
|
||||
|
||||
private var modelDetail: String {
|
||||
let states = downloadService.states
|
||||
if ModelKind.allCases.allSatisfy({ states[$0]?.phase == .ready }) { return "已就绪" }
|
||||
if downloadService.isAnyDownloading { return "下载中…" }
|
||||
if ModelKind.allCases.allSatisfy({ states[$0]?.phase == .ready }) { return String(appLoc: "已就绪") }
|
||||
if downloadService.isAnyDownloading { return String(appLoc: "下载中…") }
|
||||
let readyCount = ModelKind.allCases.filter { states[$0]?.phase == .ready }.count
|
||||
return readyCount == 0 ? "未下载" : "\(readyCount)/\(ModelKind.allCases.count) 就绪"
|
||||
return readyCount == 0 ? String(appLoc: "未下载") : String(appLoc: "\(readyCount)/\(ModelKind.allCases.count) 就绪")
|
||||
}
|
||||
|
||||
private var languageCard: some View {
|
||||
NavigationLink {
|
||||
LanguageSettingsView()
|
||||
} label: {
|
||||
settingsCard(title: String(appLoc: "语言"),
|
||||
detail: lang.current.displayName,
|
||||
icon: "character.bubble")
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
}
|
||||
|
||||
private var fontScaleCard: some View {
|
||||
NavigationLink {
|
||||
FontSettingsView()
|
||||
} label: {
|
||||
settingsCard(title: String(appLoc: "字体大小"),
|
||||
detail: fontScale.scale.label,
|
||||
icon: "textformat.size")
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
}
|
||||
|
||||
// MARK: - Face ID 启动锁(可交互 Toggle 卡)
|
||||
|
||||
private var faceIDCard: some View {
|
||||
HStack(spacing: 12) {
|
||||
ZStack {
|
||||
Circle().fill(lockEnabled ? Tj.Palette.amber.opacity(0.25) : Tj.Palette.sand2)
|
||||
Image(systemName: "faceid")
|
||||
.font(.tjScaled( 18))
|
||||
.foregroundStyle(lockEnabled ? Tj.Palette.ink : Tj.Palette.text2)
|
||||
}
|
||||
.frame(width: 44, height: 44)
|
||||
|
||||
VStack(alignment: .leading, spacing: 2) {
|
||||
Text("Face ID 启动锁")
|
||||
.font(.tjScaled( 15, weight: .medium))
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
Text(faceIDLine)
|
||||
.font(.tjScaled( 12))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
}
|
||||
Spacer()
|
||||
Toggle("", isOn: faceIDBinding)
|
||||
.labelsHidden()
|
||||
.disabled(!appLock.biometryAvailable)
|
||||
}
|
||||
.padding(14)
|
||||
.tjCard()
|
||||
}
|
||||
|
||||
private var faceIDLine: String {
|
||||
if !appLock.biometryAvailable { return String(appLoc: "本设备未设置 Face ID 或密码") }
|
||||
return lockEnabled ? String(appLoc: "已开启 · \(appLock.biometryLabel)") : String(appLoc: "关闭")
|
||||
}
|
||||
|
||||
/// 打开 → 先认证一次,成功才置 enabled(失败则开关弹回);关闭 → 直接关。
|
||||
private var faceIDBinding: Binding<Bool> {
|
||||
Binding(
|
||||
get: { lockEnabled },
|
||||
set: { newValue in
|
||||
if newValue {
|
||||
Task { await appLock.enableWithAuth() }
|
||||
} else {
|
||||
appLock.disable()
|
||||
}
|
||||
}
|
||||
)
|
||||
}
|
||||
|
||||
private func settingsCard(title: String, detail: String, icon: String) -> some View {
|
||||
@@ -190,20 +232,20 @@ struct MeView: View {
|
||||
ZStack {
|
||||
Circle().fill(Tj.Palette.sand2)
|
||||
Image(systemName: icon)
|
||||
.font(.system(size: 18))
|
||||
.font(.tjScaled( 18))
|
||||
.foregroundStyle(Tj.Palette.text2)
|
||||
}
|
||||
.frame(width: 44, height: 44)
|
||||
|
||||
Text(title)
|
||||
.font(.system(size: 15, weight: .medium))
|
||||
.font(.tjScaled( 15, weight: .medium))
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
Spacer()
|
||||
Text(detail)
|
||||
.font(.system(size: 12))
|
||||
.font(.tjScaled( 12))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
Image(systemName: "chevron.right")
|
||||
.font(.system(size: 13, weight: .medium))
|
||||
.font(.tjScaled( 13, weight: .medium))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
}
|
||||
.padding(14)
|
||||
@@ -212,7 +254,7 @@ struct MeView: View {
|
||||
|
||||
private var profileLine: String {
|
||||
guard let p = profile, p.hasAnyBasics else {
|
||||
return "点这里完善你的资料"
|
||||
return String(appLoc: "点这里完善你的资料")
|
||||
}
|
||||
return p.summaryLine
|
||||
}
|
||||
|
||||
@@ -43,7 +43,7 @@ struct ModelManagementView: View {
|
||||
|
||||
if let importError {
|
||||
Text(importError)
|
||||
.font(.system(size: 12))
|
||||
.font(.tjScaled( 12))
|
||||
.foregroundStyle(Tj.Palette.brick)
|
||||
.frame(maxWidth: .infinity, alignment: .leading)
|
||||
}
|
||||
@@ -86,10 +86,10 @@ struct ModelManagementView: View {
|
||||
HStack(alignment: .top) {
|
||||
VStack(alignment: .leading, spacing: 3) {
|
||||
Text(kind.displayName)
|
||||
.font(.system(size: 15, weight: .semibold))
|
||||
.font(.tjScaled( 15, weight: .semibold))
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
Text(subtitle(kind))
|
||||
.font(.system(size: 12))
|
||||
.font(.tjScaled( 12))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
}
|
||||
Spacer()
|
||||
@@ -104,17 +104,17 @@ struct ModelManagementView: View {
|
||||
Spacer()
|
||||
Text(speedText(state))
|
||||
}
|
||||
.font(.system(size: 11, design: .monospaced))
|
||||
.font(.tjScaled( 11, design: .monospaced))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
} else {
|
||||
HStack {
|
||||
Text(formatBytes(ModelManifest.totalBytes(for: kind)))
|
||||
.font(.system(size: 11, design: .monospaced))
|
||||
.font(.tjScaled( 11, design: .monospaced))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
Spacer()
|
||||
if case .failed(let message) = state.phase {
|
||||
Text(message)
|
||||
.font(.system(size: 11))
|
||||
.font(.tjScaled( 11))
|
||||
.foregroundStyle(Tj.Palette.brick)
|
||||
.lineLimit(1)
|
||||
}
|
||||
@@ -132,11 +132,11 @@ struct ModelManagementView: View {
|
||||
|
||||
private func statusBadge(_ phase: DownloadPhase) -> some View {
|
||||
switch phase {
|
||||
case .idle: return TjBadge(text: "待下载", style: .neutral)
|
||||
case .downloading: return TjBadge(text: "下载中", style: .amber)
|
||||
case .verifying: return TjBadge(text: "校验中", style: .amber)
|
||||
case .ready: return TjBadge(text: "已就绪", style: .leaf)
|
||||
case .failed: return TjBadge(text: "失败 · 重试", style: .brick)
|
||||
case .idle: return TjBadge(text: String(appLoc: "待下载"), style: .neutral)
|
||||
case .downloading: return TjBadge(text: String(appLoc: "下载中"), style: .amber)
|
||||
case .verifying: return TjBadge(text: String(appLoc: "校验中"), style: .amber)
|
||||
case .ready: return TjBadge(text: String(appLoc: "已就绪"), style: .leaf)
|
||||
case .failed: return TjBadge(text: String(appLoc: "失败 · 重试"), style: .brick)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -156,7 +156,7 @@ struct ModelManagementView: View {
|
||||
Image(systemName: "checkmark.seal.fill")
|
||||
Text("两个模型都已就绪")
|
||||
}
|
||||
.font(.system(size: 13, weight: .semibold))
|
||||
.font(.tjScaled( 13, weight: .semibold))
|
||||
.foregroundStyle(Tj.Palette.leaf)
|
||||
.frame(maxWidth: .infinity)
|
||||
.padding(.vertical, 6)
|
||||
@@ -183,7 +183,7 @@ struct ModelManagementView: View {
|
||||
VStack(spacing: 8) {
|
||||
TjLockChip()
|
||||
Text("100% 本地推理 · 模型仅需下载一次")
|
||||
.font(.system(size: 11))
|
||||
.font(.tjScaled( 11))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
}
|
||||
.frame(maxWidth: .infinity)
|
||||
@@ -199,13 +199,14 @@ struct ModelManagementView: View {
|
||||
|
||||
let name = folder.lastPathComponent
|
||||
guard let kind = ModelKind.allCases.first(where: { $0.rawValue == name }) else {
|
||||
importError = "请选择名为 Qwen3-1.7B-4bit 或 Qwen2.5-VL-3B-Instruct-4bit 的文件夹"
|
||||
let names = ModelKind.allCases.map(\.rawValue).joined(separator: " 或 ")
|
||||
importError = String(appLoc: "请选择名为 \(names) 的文件夹")
|
||||
return
|
||||
}
|
||||
try service.importModel(kind, from: folder)
|
||||
importError = nil
|
||||
} catch {
|
||||
importError = "导入失败:\(error.localizedDescription)"
|
||||
importError = String(appLoc: "导入失败:\(error.localizedDescription)")
|
||||
}
|
||||
}
|
||||
|
||||
@@ -217,8 +218,8 @@ struct ModelManagementView: View {
|
||||
|
||||
private func subtitle(_ kind: ModelKind) -> String {
|
||||
switch kind {
|
||||
case .llm: return "文本解读 · 趋势 / 问答"
|
||||
case .vl: return "拍照识别报告 → 结构化指标"
|
||||
case .llm: return String(appLoc: "文本解读 · 趋势 / 问答")
|
||||
case .vl: return String(appLoc: "拍照识别报告 → 结构化指标")
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -12,11 +12,11 @@ struct ModelSelfTestView: View {
|
||||
|
||||
var label: String {
|
||||
switch self {
|
||||
case .idle: return "未开始"
|
||||
case .loading: return "加载模型…"
|
||||
case .running: return "推理中…"
|
||||
case .done: return "完成 ✓"
|
||||
case .failed(let m): return "失败:\(m)"
|
||||
case .idle: return String(appLoc: "未开始")
|
||||
case .loading: return String(appLoc: "加载模型…")
|
||||
case .running: return String(appLoc: "推理中…")
|
||||
case .done: return String(appLoc: "完成 ✓")
|
||||
case .failed(let m): return String(appLoc: "失败:\(m)")
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -37,11 +37,11 @@ struct ModelSelfTestView: View {
|
||||
VStack(alignment: .leading, spacing: 16) {
|
||||
VStack(alignment: .leading, spacing: 6) {
|
||||
Text("测试 PROMPT")
|
||||
.font(.system(size: 11, weight: .semibold))
|
||||
.font(.tjScaled( 11, weight: .semibold))
|
||||
.tracking(0.5)
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
Text(prompt)
|
||||
.font(.system(size: 14))
|
||||
.font(.tjScaled( 14))
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
}
|
||||
.padding(14)
|
||||
@@ -50,13 +50,13 @@ struct ModelSelfTestView: View {
|
||||
|
||||
HStack {
|
||||
Text(phase.label)
|
||||
.font(.system(size: 13, weight: .medium))
|
||||
.font(.tjScaled( 13, weight: .medium))
|
||||
.foregroundStyle(statusColor)
|
||||
.lineLimit(1)
|
||||
Spacer()
|
||||
if rate > 0 {
|
||||
Text(String(format: "%.1f tok/s", rate))
|
||||
.font(.system(size: 12, design: .monospaced))
|
||||
.font(.tjScaled( 12, design: .monospaced))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,27 +3,51 @@ import SwiftData
|
||||
|
||||
struct RemindersListView: View {
|
||||
@Environment(\.modelContext) private var ctx
|
||||
@Environment(\.dismiss) private var dismiss
|
||||
@Query(sort: \CustomReminder.updatedAt, order: .reverse)
|
||||
private var customReminders: [CustomReminder]
|
||||
@Query(sort: \MetricReminder.updatedAt, order: .reverse)
|
||||
private var reminders: [MetricReminder]
|
||||
|
||||
/// 以 sheet 形态呈现(从「新建」入口进入)时补一个「完成」按钮关闭;
|
||||
/// push 形态有系统返回,默认 false。
|
||||
var presentedAsSheet = false
|
||||
|
||||
@State private var editingId: String?
|
||||
@State private var creatingNew = false
|
||||
@State private var editingCustom: CustomReminder?
|
||||
|
||||
private var isEmpty: Bool { customReminders.isEmpty && reminders.isEmpty }
|
||||
|
||||
var body: some View {
|
||||
ScrollView {
|
||||
VStack(alignment: .leading, spacing: 12) {
|
||||
header
|
||||
if reminders.isEmpty {
|
||||
createButton
|
||||
|
||||
if isEmpty {
|
||||
emptyState
|
||||
} else {
|
||||
ForEach(reminders) { r in
|
||||
ReminderRow(
|
||||
ForEach(customReminders) { r in
|
||||
CustomReminderRow(
|
||||
reminder: r,
|
||||
isEditing: editingId == r.metricId,
|
||||
onTapEdit: { toggleEdit(r.metricId) },
|
||||
onChange: { Task { await sync(r) } },
|
||||
onDelete: { delete(r) }
|
||||
onTapEdit: { editingCustom = r },
|
||||
onToggle: { Task { await syncCustom(r) } }
|
||||
)
|
||||
}
|
||||
|
||||
if !reminders.isEmpty {
|
||||
sectionLabel(String(appLoc: "指标记录提醒"))
|
||||
ForEach(reminders) { r in
|
||||
ReminderRow(
|
||||
reminder: r,
|
||||
isEditing: editingId == r.metricId,
|
||||
onTapEdit: { toggleEdit(r.metricId) },
|
||||
onChange: { Task { await sync(r) } },
|
||||
onDelete: { delete(r) }
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
.padding(.horizontal, 16)
|
||||
@@ -31,33 +55,65 @@ struct RemindersListView: View {
|
||||
.padding(.bottom, 32)
|
||||
}
|
||||
.background(Tj.Palette.sand.ignoresSafeArea())
|
||||
.navigationTitle("记录提醒")
|
||||
.navigationTitle("提醒")
|
||||
.navigationBarTitleDisplayMode(.inline)
|
||||
.toolbar {
|
||||
if presentedAsSheet {
|
||||
ToolbarItem(placement: .topBarTrailing) {
|
||||
Button(String(appLoc: "完成")) { dismiss() }
|
||||
}
|
||||
}
|
||||
}
|
||||
.sheet(isPresented: $creatingNew) {
|
||||
CustomReminderEditSheet()
|
||||
}
|
||||
.sheet(item: $editingCustom) { r in
|
||||
CustomReminderEditSheet(reminder: r)
|
||||
}
|
||||
}
|
||||
|
||||
private var header: some View {
|
||||
VStack(alignment: .leading, spacing: 4) {
|
||||
Text("\(enabledCount) / \(reminders.count) 项启用")
|
||||
.font(.system(size: 12))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
Text("提醒在录入「指标记录 · 长期监测」时开启")
|
||||
.font(.system(size: 12))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
Text("新建提醒,或在记录指标时开启")
|
||||
.font(.tjScaled( 12))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
.frame(maxWidth: .infinity, alignment: .leading)
|
||||
}
|
||||
|
||||
private var createButton: some View {
|
||||
Button { creatingNew = true } label: {
|
||||
Label(String(appLoc: "新建提醒"), systemImage: "plus")
|
||||
.frame(maxWidth: .infinity)
|
||||
}
|
||||
.frame(maxWidth: .infinity, alignment: .leading)
|
||||
.buttonStyle(TjPrimaryButton(height: 46, fontSize: 14))
|
||||
}
|
||||
|
||||
private func sectionLabel(_ text: String) -> some View {
|
||||
Text(text)
|
||||
.font(.tjScaled( 12, weight: .semibold))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
.frame(maxWidth: .infinity, alignment: .leading)
|
||||
.padding(.top, 8)
|
||||
}
|
||||
|
||||
private var emptyState: some View {
|
||||
VStack(spacing: 12) {
|
||||
Spacer(minLength: 40)
|
||||
TjPlaceholder(label: "还没有记录提醒\n去「+ 指标记录」录入时打开")
|
||||
TjPlaceholder(label: String(appLoc: "还没有提醒,点上方新建"))
|
||||
.frame(width: 240, height: 140)
|
||||
Spacer()
|
||||
}
|
||||
.frame(maxWidth: .infinity)
|
||||
}
|
||||
|
||||
private var enabledCount: Int { reminders.filter(\.enabled).count }
|
||||
// MARK: - 自由提醒
|
||||
|
||||
private func syncCustom(_ r: CustomReminder) async {
|
||||
r.updatedAt = .now
|
||||
try? ctx.save()
|
||||
await ReminderService.sync(r)
|
||||
}
|
||||
|
||||
// MARK: - 指标提醒(沿用原逻辑)
|
||||
|
||||
private func toggleEdit(_ id: String) {
|
||||
editingId = (editingId == id) ? nil : id
|
||||
@@ -76,6 +132,63 @@ struct RemindersListView: View {
|
||||
}
|
||||
}
|
||||
|
||||
/// 自由提醒行:点空白区进编辑 sheet;行上 Toggle 控开关。
|
||||
private struct CustomReminderRow: View {
|
||||
@Bindable var reminder: CustomReminder
|
||||
let onTapEdit: () -> Void
|
||||
let onToggle: () -> Void
|
||||
|
||||
var body: some View {
|
||||
HStack(spacing: 12) {
|
||||
Button(action: onTapEdit) {
|
||||
HStack(spacing: 12) {
|
||||
ZStack {
|
||||
Circle()
|
||||
.fill(reminder.enabled ? Tj.Palette.amber.opacity(0.25) : Tj.Palette.sand2)
|
||||
Image(systemName: "bell.fill")
|
||||
.font(.tjScaled( 16))
|
||||
.foregroundStyle(reminder.enabled ? Tj.Palette.ink : Tj.Palette.text3)
|
||||
}
|
||||
.frame(width: 36, height: 36)
|
||||
|
||||
VStack(alignment: .leading, spacing: 2) {
|
||||
Text(reminder.title)
|
||||
.font(.tjScaled( 15, weight: .semibold))
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
.lineLimit(1)
|
||||
Text("\(reminder.timeLabel) · \(reminder.frequencyLabel)")
|
||||
.font(.tjScaled( 12))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
}
|
||||
Spacer(minLength: 0)
|
||||
}
|
||||
.contentShape(Rectangle())
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
|
||||
Toggle("", isOn: $reminder.enabled)
|
||||
.labelsHidden()
|
||||
.tint(Tj.Palette.ink)
|
||||
.onChange(of: reminder.enabled) { _, _ in onToggle() }
|
||||
|
||||
// 与指标提醒行的 28×28 展开按钮等宽,保证两类行的 Toggle 纵向对齐。
|
||||
Image(systemName: "chevron.right")
|
||||
.font(.tjScaled( 12, weight: .semibold))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
.frame(width: 28, height: 28)
|
||||
}
|
||||
.padding(14)
|
||||
.background(
|
||||
RoundedRectangle(cornerRadius: Tj.Radius.md, style: .continuous)
|
||||
.fill(Tj.Palette.paper)
|
||||
)
|
||||
.overlay(
|
||||
RoundedRectangle(cornerRadius: Tj.Radius.md, style: .continuous)
|
||||
.strokeBorder(Tj.Palette.lineSoft, lineWidth: 1)
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
private struct ReminderRow: View {
|
||||
@Bindable var reminder: MetricReminder
|
||||
let isEditing: Bool
|
||||
@@ -110,17 +223,17 @@ private struct ReminderRow: View {
|
||||
Circle()
|
||||
.fill(reminder.enabled ? Tj.Palette.amber.opacity(0.25) : Tj.Palette.sand2)
|
||||
Image(systemName: "bell.fill")
|
||||
.font(.system(size: 16))
|
||||
.font(.tjScaled( 16))
|
||||
.foregroundStyle(reminder.enabled ? Tj.Palette.ink : Tj.Palette.text3)
|
||||
}
|
||||
.frame(width: 36, height: 36)
|
||||
|
||||
VStack(alignment: .leading, spacing: 2) {
|
||||
Text(reminder.displayName)
|
||||
.font(.system(size: 15, weight: .semibold))
|
||||
.font(.tjScaled( 15, weight: .semibold))
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
Text("\(reminder.timeLabel) · \(reminder.frequencyLabel)")
|
||||
.font(.system(size: 12))
|
||||
.font(.tjScaled( 12))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
}
|
||||
|
||||
@@ -135,7 +248,7 @@ private struct ReminderRow: View {
|
||||
onTapEdit()
|
||||
} label: {
|
||||
Image(systemName: isEditing ? "chevron.up" : "chevron.down")
|
||||
.font(.system(size: 12, weight: .semibold))
|
||||
.font(.tjScaled( 12, weight: .semibold))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
.frame(width: 28, height: 28)
|
||||
}
|
||||
@@ -146,7 +259,7 @@ private struct ReminderRow: View {
|
||||
private var editingPanel: some View {
|
||||
VStack(alignment: .leading, spacing: 12) {
|
||||
HStack {
|
||||
Text("时间").font(.system(size: 13)).foregroundStyle(Tj.Palette.text2)
|
||||
Text("时间").font(.tjScaled( 13)).foregroundStyle(Tj.Palette.text2)
|
||||
Spacer()
|
||||
DatePicker("", selection: $pickedTime, displayedComponents: .hourAndMinute)
|
||||
.datePickerStyle(.compact)
|
||||
@@ -165,7 +278,7 @@ private struct ReminderRow: View {
|
||||
onDelete()
|
||||
} label: {
|
||||
Label("删除提醒", systemImage: "trash")
|
||||
.font(.system(size: 12, weight: .semibold))
|
||||
.font(.tjScaled( 12, weight: .semibold))
|
||||
.foregroundStyle(Tj.Palette.brick)
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
@@ -182,7 +295,11 @@ private struct ReminderRow: View {
|
||||
}
|
||||
|
||||
private var weekdayRow: some View {
|
||||
let names = ["一", "二", "三", "四", "五", "六", "日"]
|
||||
let names = [
|
||||
String(appLoc: "一"), String(appLoc: "二"), String(appLoc: "三"),
|
||||
String(appLoc: "四"), String(appLoc: "五"), String(appLoc: "六"),
|
||||
String(appLoc: "日"),
|
||||
]
|
||||
let weekdayValues = [2, 3, 4, 5, 6, 7, 1]
|
||||
return HStack(spacing: 6) {
|
||||
ForEach(Array(weekdayValues.enumerated()), id: \.offset) { idx, w in
|
||||
@@ -193,7 +310,7 @@ private struct ReminderRow: View {
|
||||
onChange()
|
||||
} label: {
|
||||
Text(names[idx])
|
||||
.font(.system(size: 13,
|
||||
.font(.tjScaled( 13,
|
||||
weight: reminder.weekdays.contains(w) ? .semibold : .regular))
|
||||
.foregroundStyle(reminder.weekdays.contains(w) ? Tj.Palette.paper : Tj.Palette.text)
|
||||
.frame(maxWidth: .infinity, minHeight: 30)
|
||||
@@ -217,5 +334,5 @@ private struct ReminderRow: View {
|
||||
NavigationStack {
|
||||
RemindersListView()
|
||||
}
|
||||
.modelContainer(for: [MetricReminder.self], inMemory: true)
|
||||
.modelContainer(for: [MetricReminder.self, CustomReminder.self], inMemory: true)
|
||||
}
|
||||
|
||||
@@ -19,12 +19,12 @@ enum MonitorMetric: String, CaseIterable, Identifiable {
|
||||
|
||||
var displayName: String {
|
||||
switch self {
|
||||
case .bloodPressure: return "血压"
|
||||
case .fastingGlucose: return "空腹血糖"
|
||||
case .postprandialGlucose: return "餐后血糖"
|
||||
case .temperature: return "体温"
|
||||
case .heartRate: return "心率"
|
||||
case .spo2: return "血氧"
|
||||
case .bloodPressure: return String(appLoc: "血压")
|
||||
case .fastingGlucose: return String(appLoc: "空腹血糖")
|
||||
case .postprandialGlucose: return String(appLoc: "餐后血糖")
|
||||
case .temperature: return String(appLoc: "体温")
|
||||
case .heartRate: return String(appLoc: "心率")
|
||||
case .spo2: return String(appLoc: "血氧")
|
||||
}
|
||||
}
|
||||
|
||||
@@ -45,43 +45,43 @@ enum MonitorMetric: String, CaseIterable, Identifiable {
|
||||
case .bloodPressure:
|
||||
return [
|
||||
Field(seriesKey: "bp.systolic",
|
||||
label: "收缩压",
|
||||
label: String(appLoc: "收缩压"),
|
||||
unit: "mmHg",
|
||||
placeholder: "120",
|
||||
baseRange: 90...140),
|
||||
Field(seriesKey: "bp.diastolic",
|
||||
label: "舒张压",
|
||||
label: String(appLoc: "舒张压"),
|
||||
unit: "mmHg",
|
||||
placeholder: "80",
|
||||
baseRange: 60...90),
|
||||
]
|
||||
case .fastingGlucose:
|
||||
return [Field(seriesKey: "glucose.fasting",
|
||||
label: "空腹血糖",
|
||||
label: String(appLoc: "空腹血糖"),
|
||||
unit: "mmol/L",
|
||||
placeholder: "5.0",
|
||||
baseRange: 3.9...6.1)]
|
||||
case .postprandialGlucose:
|
||||
return [Field(seriesKey: "glucose.postprandial",
|
||||
label: "餐后 2h",
|
||||
label: String(appLoc: "餐后 2h"),
|
||||
unit: "mmol/L",
|
||||
placeholder: "6.5",
|
||||
baseRange: 0...7.8)]
|
||||
case .temperature:
|
||||
return [Field(seriesKey: "temperature",
|
||||
label: "体温",
|
||||
label: String(appLoc: "体温"),
|
||||
unit: "°C",
|
||||
placeholder: "36.5",
|
||||
baseRange: 36.0...37.2)]
|
||||
case .heartRate:
|
||||
return [Field(seriesKey: "heart_rate",
|
||||
label: "心率",
|
||||
label: String(appLoc: "心率"),
|
||||
unit: "bpm",
|
||||
placeholder: "72",
|
||||
baseRange: 60...100)]
|
||||
case .spo2:
|
||||
return [Field(seriesKey: "spo2",
|
||||
label: "血氧",
|
||||
label: String(appLoc: "血氧"),
|
||||
unit: "%",
|
||||
placeholder: "98",
|
||||
baseRange: 95...100)]
|
||||
@@ -101,7 +101,7 @@ extension MonitorMetric {
|
||||
|
||||
/// 给 IndicatorRecordSheet 显示在数值旁的「90-140 mmHg」字样。
|
||||
func rangeText(_ range: ClosedRange<Double>?) -> String {
|
||||
guard let r = range else { return "无参考范围" }
|
||||
guard let r = range else { return String(appLoc: "无参考范围") }
|
||||
let lower = format(r.lowerBound)
|
||||
let upper = format(r.upperBound)
|
||||
// 餐后血糖 baseRange 是 0...7.8,显示成「<7.8」
|
||||
|
||||
@@ -17,28 +17,78 @@ struct ProfileEditView: View {
|
||||
}
|
||||
}
|
||||
|
||||
/// 实际表单。`@Bindable` 让 SwiftData @Model 的字段可以 `$profile.xxx` 双向绑定。
|
||||
/// 实际表单。
|
||||
///
|
||||
/// 性能要点(为什么拆成一堆小 Row 子视图):
|
||||
/// SwiftData `@Model` 走 Observation,谁读了某个属性谁才会因它变化而失效。
|
||||
/// 早期这页把所有字段塞进一个 `body`,任何一次按键(包括「添加过敏/用药」输入框,
|
||||
/// 它们的 `@State` 当时也挂在父视图上)都会重算整个 `body`,顺带把年份选择器里
|
||||
/// 126 个 `Text(year)` 全部重建一遍 → 输入卡顿。
|
||||
///
|
||||
/// 现在的写法:
|
||||
/// - `ProfileEditForm.body` 不读任何 `profile.*`、不持有随打字变化的 `@State`,
|
||||
/// 所以编辑过程中它整体不再重算,只是组合一批子视图。
|
||||
/// - 每个 Row / Section 子视图只读自己那一个字段,Observation 把失效范围收到单行。
|
||||
/// - 各「添加条目」输入框的 `@State` 下沉进各自的 Section 子视图,敲字只重算那一节。
|
||||
/// - 年份用「点开展开 .wheel 滚轮」,折叠时不构建 126 项,展开时由原生
|
||||
/// UIPickerView 虚拟化承载,秒开。
|
||||
private struct ProfileEditForm: View {
|
||||
@Environment(\.modelContext) private var ctx
|
||||
@Bindable var profile: UserProfile
|
||||
|
||||
@State private var newAllergy = ""
|
||||
@State private var newFamilyEntry = ""
|
||||
@State private var newMedication = ""
|
||||
@State private var newCustomCondition = ""
|
||||
|
||||
private static let chronicPresets = [
|
||||
"高血压", "糖尿病", "冠心病", "高血脂",
|
||||
"甲状腺疾病", "哮喘", "慢性肾病", "抑郁/焦虑",
|
||||
]
|
||||
@State private var healthImportDraft: HealthProfileImportDraft?
|
||||
@State private var healthImportError: String?
|
||||
@State private var isImportingHealthProfile = false
|
||||
|
||||
var body: some View {
|
||||
Form {
|
||||
basicsSection
|
||||
chronicSection
|
||||
allergySection
|
||||
familySection
|
||||
medicationSection
|
||||
Section {
|
||||
Button {
|
||||
importHealthProfile()
|
||||
} label: {
|
||||
HStack(spacing: 10) {
|
||||
if isImportingHealthProfile {
|
||||
ProgressView()
|
||||
} else {
|
||||
Image(systemName: "heart.text.square")
|
||||
.foregroundStyle(Tj.Palette.ink)
|
||||
}
|
||||
VStack(alignment: .leading, spacing: 2) {
|
||||
Text("从 Apple 健康导入")
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
Text("只读取生日、性别、身高、血型")
|
||||
.font(.tjScaled( 12))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
}
|
||||
}
|
||||
}
|
||||
.disabled(isImportingHealthProfile)
|
||||
.accessibilityElement(children: .combine)
|
||||
.accessibilityLabel("从 Apple 健康导入")
|
||||
.accessibilityHint("读取生日、性别、身高和血型,确认后填入个人资料")
|
||||
} footer: {
|
||||
Text("导入前会先显示预览,确认后才覆盖个人资料。")
|
||||
}
|
||||
|
||||
Section {
|
||||
BirthYearRow(profile: profile)
|
||||
SexRow(profile: profile)
|
||||
HeightRow(profile: profile)
|
||||
WeightRow(profile: profile)
|
||||
BloodTypeRow(profile: profile)
|
||||
} header: {
|
||||
Text("基本")
|
||||
} footer: {
|
||||
BMIFooter(profile: profile)
|
||||
}
|
||||
|
||||
ChronicSection(profile: profile)
|
||||
|
||||
StringListSection(title: String(appLoc: "过敏史"), placeholder: String(appLoc: "如:青霉素"),
|
||||
items: $profile.allergies)
|
||||
StringListSection(title: String(appLoc: "家族史"), placeholder: String(appLoc: "如:母亲 高血压"),
|
||||
items: $profile.familyHistory)
|
||||
StringListSection(title: String(appLoc: "当前用药"), placeholder: String(appLoc: "如:缬沙坦 80mg qd"),
|
||||
items: $profile.currentMedications)
|
||||
}
|
||||
.navigationTitle("个人资料")
|
||||
.navigationBarTitleDisplayMode(.inline)
|
||||
@@ -48,49 +98,160 @@ private struct ProfileEditForm: View {
|
||||
profile.updatedAt = .now
|
||||
try? ctx.save()
|
||||
}
|
||||
.sheet(item: $healthImportDraft) { draft in
|
||||
HealthProfileImportPreviewSheet(
|
||||
draft: draft,
|
||||
profile: profile
|
||||
) {
|
||||
draft.apply(to: profile)
|
||||
try? ctx.save()
|
||||
healthImportDraft = nil
|
||||
}
|
||||
}
|
||||
.alert("无法导入 Apple 健康资料", isPresented: Binding(
|
||||
get: { healthImportError != nil },
|
||||
set: { if !$0 { healthImportError = nil } }
|
||||
)) {
|
||||
Button("好", role: .cancel) { healthImportError = nil }
|
||||
} message: {
|
||||
Text(healthImportError ?? "")
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - 基本
|
||||
private func importHealthProfile() {
|
||||
guard !isImportingHealthProfile else { return }
|
||||
isImportingHealthProfile = true
|
||||
healthImportError = nil
|
||||
Task {
|
||||
do {
|
||||
healthImportDraft = try await HealthProfileImportService.shared.fetchDraft()
|
||||
} catch {
|
||||
healthImportError = error.localizedDescription
|
||||
}
|
||||
isImportingHealthProfile = false
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private var basicsSection: some View {
|
||||
Section {
|
||||
birthYearPicker
|
||||
sexPicker
|
||||
heightRow
|
||||
weightRow
|
||||
bloodTypePicker
|
||||
} header: {
|
||||
Text("基本")
|
||||
} footer: {
|
||||
if let bmi = profile.bmi {
|
||||
Text("BMI: \(String(format: "%.1f", bmi)) \(bmiLabel(bmi))")
|
||||
.font(.system(size: 11))
|
||||
private struct HealthProfileImportPreviewSheet: View {
|
||||
@Environment(\.dismiss) private var dismiss
|
||||
let draft: HealthProfileImportDraft
|
||||
let profile: UserProfile
|
||||
let onApply: () -> Void
|
||||
|
||||
private var preview: HealthProfileImportPreview {
|
||||
HealthProfileImportPreview(draft: draft, current: profile)
|
||||
}
|
||||
|
||||
var body: some View {
|
||||
NavigationStack {
|
||||
List {
|
||||
Section {
|
||||
ForEach(preview.fields, id: \.title) { field in
|
||||
HStack(alignment: .firstTextBaseline) {
|
||||
Text(field.title)
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
Spacer(minLength: 12)
|
||||
VStack(alignment: .trailing, spacing: 4) {
|
||||
Text(field.imported ?? "未读取到")
|
||||
.foregroundStyle(field.imported == nil ? Tj.Palette.text3 : Tj.Palette.text)
|
||||
Text("当前: \(field.current)")
|
||||
.font(.tjScaled( 11))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
}
|
||||
}
|
||||
}
|
||||
} footer: {
|
||||
Text("未读取到的字段不会修改。")
|
||||
}
|
||||
}
|
||||
.navigationTitle("确认导入")
|
||||
.navigationBarTitleDisplayMode(.inline)
|
||||
.scrollContentBackground(.hidden)
|
||||
.background(Tj.Palette.sand.ignoresSafeArea())
|
||||
.toolbar {
|
||||
ToolbarItem(placement: .cancellationAction) {
|
||||
Button("取消") { dismiss() }
|
||||
}
|
||||
ToolbarItem(placement: .confirmationAction) {
|
||||
Button("导入") {
|
||||
onApply()
|
||||
dismiss()
|
||||
}
|
||||
.fontWeight(.semibold)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private func bmiLabel(_ bmi: Double) -> String {
|
||||
switch bmi {
|
||||
case ..<18.5: return "(偏瘦)"
|
||||
case ..<24: return "(正常)"
|
||||
case ..<28: return "(超重)"
|
||||
default: return "(肥胖)"
|
||||
}
|
||||
// MARK: - 基本:逐行子视图(各自只读一个字段,失效互不牵连)
|
||||
|
||||
/// 出生年份:点击行展开 `.wheel` 滚轮,折叠时只是一行文字 —— 不构建 126 项列表。
|
||||
private struct BirthYearRow: View {
|
||||
@Bindable var profile: UserProfile
|
||||
@State private var expanded = false
|
||||
|
||||
private var currentYear: Int {
|
||||
Calendar.current.component(.year, from: .now)
|
||||
}
|
||||
|
||||
private var birthYearPicker: some View {
|
||||
Picker("出生年份", selection: Binding(
|
||||
/// 年份倒序数组。本行仅在 birthYear / expanded 变化时重算,与其他字段编辑解耦;
|
||||
/// 且 `years` 只在滚轮展开(body 实际读它)时才被遍历构建。
|
||||
private var years: [Int] {
|
||||
Array((1900...currentYear).reversed())
|
||||
}
|
||||
|
||||
private var selectedLabel: String {
|
||||
if let y = profile.birthYear {
|
||||
let age = currentYear - y
|
||||
return age >= 0 ? "\(y)(\(age)\(String(appLoc: "岁")))" : String(y)
|
||||
}
|
||||
return String(appLoc: "未设置")
|
||||
}
|
||||
|
||||
private var yearBinding: Binding<Int> {
|
||||
Binding(
|
||||
get: { profile.birthYear ?? 0 },
|
||||
set: { profile.birthYear = $0 == 0 ? nil : $0 }
|
||||
)) {
|
||||
Text("未设置").tag(0)
|
||||
ForEach((1900...currentYear).reversed(), id: \.self) { year in
|
||||
Text(String(year)).tag(year)
|
||||
}
|
||||
}
|
||||
)
|
||||
}
|
||||
|
||||
private var sexPicker: some View {
|
||||
var body: some View {
|
||||
Button {
|
||||
withAnimation(.easeInOut(duration: 0.2)) { expanded.toggle() }
|
||||
} label: {
|
||||
HStack {
|
||||
Text("出生年份").foregroundStyle(Tj.Palette.text)
|
||||
Spacer()
|
||||
Text(selectedLabel)
|
||||
.foregroundStyle(profile.birthYear == nil ? Tj.Palette.text3 : Tj.Palette.text2)
|
||||
Image(systemName: "chevron.right")
|
||||
.font(.tjScaled( 12, weight: .semibold))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
.rotationEffect(.degrees(expanded ? 90 : 0))
|
||||
}
|
||||
.contentShape(Rectangle())
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
|
||||
if expanded {
|
||||
Picker("出生年份", selection: yearBinding) {
|
||||
Text("未设置").tag(0)
|
||||
ForEach(years, id: \.self) { year in
|
||||
Text(String(year)).tag(year)
|
||||
}
|
||||
}
|
||||
.pickerStyle(.wheel)
|
||||
.frame(maxHeight: 140)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private struct SexRow: View {
|
||||
@Bindable var profile: UserProfile
|
||||
|
||||
var body: some View {
|
||||
Picker("性别", selection: Binding(
|
||||
get: { profile.sex },
|
||||
set: { profile.sex = $0 }
|
||||
@@ -101,8 +262,15 @@ private struct ProfileEditForm: View {
|
||||
}
|
||||
.pickerStyle(.segmented)
|
||||
}
|
||||
}
|
||||
|
||||
private var heightRow: some View {
|
||||
/// 身高:数值输入逻辑不变,只把整行变成可点聚焦区 —— 原先只有右侧 80pt 的输入框
|
||||
/// 本体能点中,标签与中间空白点了不聚焦,所以显得「不灵敏」。
|
||||
private struct HeightRow: View {
|
||||
@Bindable var profile: UserProfile
|
||||
@FocusState private var focused: Bool
|
||||
|
||||
var body: some View {
|
||||
HStack {
|
||||
Text("身高")
|
||||
Spacer()
|
||||
@@ -110,11 +278,19 @@ private struct ProfileEditForm: View {
|
||||
.keyboardType(.numberPad)
|
||||
.multilineTextAlignment(.trailing)
|
||||
.frame(width: 80)
|
||||
.focused($focused)
|
||||
Text("cm").foregroundStyle(Tj.Palette.text3)
|
||||
}
|
||||
.contentShape(Rectangle())
|
||||
.onTapGesture { focused = true }
|
||||
}
|
||||
}
|
||||
|
||||
private var weightRow: some View {
|
||||
private struct WeightRow: View {
|
||||
@Bindable var profile: UserProfile
|
||||
@FocusState private var focused: Bool
|
||||
|
||||
var body: some View {
|
||||
HStack {
|
||||
Text("体重")
|
||||
Spacer()
|
||||
@@ -122,11 +298,18 @@ private struct ProfileEditForm: View {
|
||||
.keyboardType(.decimalPad)
|
||||
.multilineTextAlignment(.trailing)
|
||||
.frame(width: 80)
|
||||
.focused($focused)
|
||||
Text("kg").foregroundStyle(Tj.Palette.text3)
|
||||
}
|
||||
.contentShape(Rectangle())
|
||||
.onTapGesture { focused = true }
|
||||
}
|
||||
}
|
||||
|
||||
private var bloodTypePicker: some View {
|
||||
private struct BloodTypeRow: View {
|
||||
@Bindable var profile: UserProfile
|
||||
|
||||
var body: some View {
|
||||
Picker("血型", selection: $profile.bloodTypeRaw) {
|
||||
Text("不知道").tag("")
|
||||
Text("A 型").tag("A")
|
||||
@@ -135,19 +318,51 @@ private struct ProfileEditForm: View {
|
||||
Text("O 型").tag("O")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - 慢病
|
||||
/// BMI 页脚:只读 heightCM + weightKG,只有这两项变化时才重算。
|
||||
private struct BMIFooter: View {
|
||||
@Bindable var profile: UserProfile
|
||||
|
||||
private var chronicSection: some View {
|
||||
var body: some View {
|
||||
if let bmi = profile.bmi {
|
||||
Text("BMI: \(String(format: "%.1f", bmi)) \(label(bmi))")
|
||||
.font(.tjScaled( 11))
|
||||
}
|
||||
}
|
||||
|
||||
private func label(_ bmi: Double) -> String {
|
||||
switch bmi {
|
||||
case ..<18.5: return String(appLoc: "(偏瘦)")
|
||||
case ..<24: return String(appLoc: "(正常)")
|
||||
case ..<28: return String(appLoc: "(超重)")
|
||||
default: return String(appLoc: "(肥胖)")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - 慢病
|
||||
|
||||
private struct ChronicSection: View {
|
||||
@Bindable var profile: UserProfile
|
||||
@State private var newCustomCondition = ""
|
||||
|
||||
/// 计算属性形式:每次按当前语言解析,语言切换即时更新(不可用 static/let 缓存)。
|
||||
private var presets: [String] {
|
||||
[String(appLoc: "高血压"), String(appLoc: "糖尿病"), String(appLoc: "冠心病"), String(appLoc: "高血脂"),
|
||||
String(appLoc: "甲状腺疾病"), String(appLoc: "哮喘"), String(appLoc: "慢性肾病"), String(appLoc: "抑郁/焦虑")]
|
||||
}
|
||||
|
||||
var body: some View {
|
||||
Section {
|
||||
FlexibleChipGrid {
|
||||
ForEach(Self.chronicPresets, id: \.self) { name in
|
||||
ForEach(presets, id: \.self) { name in
|
||||
chip(label: name,
|
||||
selected: profile.chronicConditions.contains(name)) {
|
||||
toggleCondition(name)
|
||||
toggle(name)
|
||||
}
|
||||
}
|
||||
ForEach(profile.chronicConditions.filter { !Self.chronicPresets.contains($0) },
|
||||
ForEach(profile.chronicConditions.filter { !presets.contains($0) },
|
||||
id: \.self) { name in
|
||||
chip(label: name, selected: true) {
|
||||
profile.chronicConditions.removeAll { $0 == name }
|
||||
@@ -171,60 +386,18 @@ private struct ProfileEditForm: View {
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - 过敏 / 家族史 / 用药
|
||||
|
||||
private var allergySection: some View {
|
||||
listSection(title: "过敏史", placeholder: "如:青霉素",
|
||||
items: $profile.allergies, newInput: $newAllergy)
|
||||
}
|
||||
|
||||
private var familySection: some View {
|
||||
listSection(title: "家族史", placeholder: "如:母亲 高血压",
|
||||
items: $profile.familyHistory, newInput: $newFamilyEntry)
|
||||
}
|
||||
|
||||
private var medicationSection: some View {
|
||||
listSection(title: "当前用药", placeholder: "如:缬沙坦 80mg qd",
|
||||
items: $profile.currentMedications, newInput: $newMedication)
|
||||
}
|
||||
|
||||
private func listSection(title: String, placeholder: String,
|
||||
items: Binding<[String]>,
|
||||
newInput: Binding<String>) -> some View {
|
||||
Section(title) {
|
||||
ForEach(items.wrappedValue, id: \.self) { item in
|
||||
HStack {
|
||||
Text(item)
|
||||
Spacer()
|
||||
Button(role: .destructive) {
|
||||
items.wrappedValue.removeAll { $0 == item }
|
||||
} label: {
|
||||
Image(systemName: "minus.circle")
|
||||
.foregroundStyle(Tj.Palette.brick)
|
||||
}
|
||||
.buttonStyle(.borderless)
|
||||
}
|
||||
}
|
||||
HStack {
|
||||
TextField(placeholder, text: newInput)
|
||||
Button("加") {
|
||||
let trimmed = newInput.wrappedValue.trimmingCharacters(in: .whitespaces)
|
||||
guard !trimmed.isEmpty,
|
||||
!items.wrappedValue.contains(trimmed) else { return }
|
||||
items.wrappedValue.append(trimmed)
|
||||
newInput.wrappedValue = ""
|
||||
}
|
||||
.disabled(newInput.wrappedValue.trimmingCharacters(in: .whitespaces).isEmpty)
|
||||
}
|
||||
private func toggle(_ name: String) {
|
||||
if profile.chronicConditions.contains(name) {
|
||||
profile.chronicConditions.removeAll { $0 == name }
|
||||
} else {
|
||||
profile.chronicConditions.append(name)
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - helpers
|
||||
|
||||
private func chip(label: String, selected: Bool, action: @escaping () -> Void) -> some View {
|
||||
Button(action: action) {
|
||||
Text(label)
|
||||
.font(.system(size: 13, weight: selected ? .semibold : .regular))
|
||||
.font(.tjScaled( 13, weight: selected ? .semibold : .regular))
|
||||
.foregroundStyle(selected ? Tj.Palette.paper : Tj.Palette.text)
|
||||
.padding(.horizontal, 12)
|
||||
.padding(.vertical, 6)
|
||||
@@ -233,21 +406,47 @@ private struct ProfileEditForm: View {
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
}
|
||||
}
|
||||
|
||||
private func toggleCondition(_ name: String) {
|
||||
if profile.chronicConditions.contains(name) {
|
||||
profile.chronicConditions.removeAll { $0 == name }
|
||||
} else {
|
||||
profile.chronicConditions.append(name)
|
||||
// MARK: - 过敏 / 家族史 / 用药(每节自带 @State,敲字只重算本节)
|
||||
|
||||
private struct StringListSection: View {
|
||||
let title: String
|
||||
let placeholder: String
|
||||
@Binding var items: [String]
|
||||
@State private var newInput = ""
|
||||
|
||||
var body: some View {
|
||||
Section(title) {
|
||||
ForEach(items, id: \.self) { item in
|
||||
HStack {
|
||||
Text(item)
|
||||
Spacer()
|
||||
Button(role: .destructive) {
|
||||
items.removeAll { $0 == item }
|
||||
} label: {
|
||||
Image(systemName: "minus.circle")
|
||||
.foregroundStyle(Tj.Palette.brick)
|
||||
}
|
||||
.buttonStyle(.borderless)
|
||||
}
|
||||
}
|
||||
HStack {
|
||||
TextField(placeholder, text: $newInput)
|
||||
Button("加") {
|
||||
let trimmed = newInput.trimmingCharacters(in: .whitespaces)
|
||||
guard !trimmed.isEmpty, !items.contains(trimmed) else { return }
|
||||
items.append(trimmed)
|
||||
newInput = ""
|
||||
}
|
||||
.disabled(newInput.trimmingCharacters(in: .whitespaces).isEmpty)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private var currentYear: Int {
|
||||
Calendar.current.component(.year, from: .now)
|
||||
}
|
||||
}
|
||||
|
||||
/// 简化版 chip 流式布局——SwiftUI 没有原生 Wrap,用 Layout 协议自实现。
|
||||
// MARK: - 流式 chip 布局(SwiftUI 无原生 Wrap,用 Layout 协议自实现)
|
||||
|
||||
struct FlexibleChipGrid<Content: View>: View {
|
||||
@ViewBuilder let content: () -> Content
|
||||
|
||||
|
||||
@@ -1,159 +0,0 @@
|
||||
import SwiftUI
|
||||
|
||||
#if canImport(UIKit)
|
||||
import UIKit
|
||||
#endif
|
||||
|
||||
struct A1ViewfinderView: View {
|
||||
var onShoot: () -> Void
|
||||
var onClose: () -> Void
|
||||
|
||||
@State private var dotPulse = false
|
||||
|
||||
var body: some View {
|
||||
GeometryReader { geometry in
|
||||
ZStack {
|
||||
Color(red: 0.04, green: 0.047, blue: 0.04).ignoresSafeArea()
|
||||
|
||||
mockCameraPreview(screenHeight: geometry.size.height)
|
||||
|
||||
VStack {
|
||||
HStack {
|
||||
Button(action: onClose) {
|
||||
Image(systemName: "xmark")
|
||||
.font(.system(size: 18, weight: .semibold))
|
||||
.foregroundStyle(Color.white)
|
||||
.frame(width: 36, height: 36)
|
||||
}
|
||||
Spacer()
|
||||
}
|
||||
.padding(.horizontal, 6)
|
||||
.padding(.top, 50)
|
||||
|
||||
topHint
|
||||
|
||||
Spacer()
|
||||
}
|
||||
|
||||
SmartFramer()
|
||||
.allowsHitTesting(false)
|
||||
.ignoresSafeArea()
|
||||
|
||||
identifiedPill
|
||||
.padding(.top, geometry.size.height * 0.62 - 20)
|
||||
|
||||
VStack {
|
||||
Spacer()
|
||||
bottomControls
|
||||
}
|
||||
}
|
||||
}
|
||||
#if os(iOS)
|
||||
.statusBarHidden(false)
|
||||
#endif
|
||||
.preferredColorScheme(.dark)
|
||||
}
|
||||
|
||||
private func mockCameraPreview(screenHeight: CGFloat) -> some View {
|
||||
RadialGradient(
|
||||
colors: [Color.white.opacity(0.05), Color.clear],
|
||||
center: .init(x: 0.5, y: 0.3),
|
||||
startRadius: 20,
|
||||
endRadius: 400
|
||||
)
|
||||
.overlay(alignment: .center) {
|
||||
VStack(alignment: .leading, spacing: 6) {
|
||||
Text("总胆固醇 TC 5.42 mmol/L").opacity(0.65)
|
||||
Text("甘油三酯 TG 1.78 mmol/L").opacity(0.65)
|
||||
Text("低密度脂蛋白 3.84 mmol/L ↑").fontWeight(.semibold).opacity(1)
|
||||
Text("高密度脂蛋白 1.21 mmol/L").opacity(0.65)
|
||||
Text("载脂蛋白 A1 1.42 g/L").opacity(0.45)
|
||||
Text("载脂蛋白 B 1.04 g/L").opacity(0.45)
|
||||
}
|
||||
.font(.system(size: 11, design: .monospaced))
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
.padding(.vertical, 20)
|
||||
.padding(.horizontal, 18)
|
||||
.frame(maxWidth: .infinity, alignment: .leading)
|
||||
.background(Color(red: 0.96, green: 0.93, blue: 0.87).opacity(0.92))
|
||||
.clipShape(RoundedRectangle(cornerRadius: 4, style: .continuous))
|
||||
.rotationEffect(.degrees(-1.2))
|
||||
.shadow(color: .black.opacity(0.45), radius: 15, x: 0, y: 12)
|
||||
.padding(.horizontal, 24)
|
||||
.padding(.vertical, screenHeight * 0.20)
|
||||
}
|
||||
}
|
||||
|
||||
private var topHint: some View {
|
||||
Text("对准异常的那一行就好 · 不用拍整张")
|
||||
.font(.system(size: 12))
|
||||
.tracking(0.5)
|
||||
.foregroundStyle(Color.white.opacity(0.92))
|
||||
.padding(.horizontal, 14)
|
||||
.padding(.vertical, 7)
|
||||
.background(Capsule().fill(Color(red: 0.08, green: 0.11, blue: 0.094).opacity(0.7)))
|
||||
.padding(.top, 6)
|
||||
}
|
||||
|
||||
private var identifiedPill: some View {
|
||||
HStack(spacing: 6) {
|
||||
Circle()
|
||||
.fill(Tj.Palette.paper)
|
||||
.frame(width: 6, height: 6)
|
||||
.opacity(dotPulse ? 1 : 0.35)
|
||||
Text("AI 已识别到 1 项指标")
|
||||
.font(.system(size: 11))
|
||||
.tracking(0.5)
|
||||
}
|
||||
.foregroundStyle(Tj.Palette.paper)
|
||||
.padding(.horizontal, 10)
|
||||
.padding(.vertical, 4)
|
||||
.background(Capsule().fill(Color(red: 0.37, green: 0.47, blue: 0.31).opacity(0.85)))
|
||||
.onAppear {
|
||||
withAnimation(.easeInOut(duration: 2.2).repeatForever(autoreverses: true)) {
|
||||
dotPulse.toggle()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private var bottomControls: some View {
|
||||
HStack {
|
||||
CircleIconButton(icon: "bolt.fill", size: 44) { }
|
||||
Spacer()
|
||||
Button(action: onShoot) {
|
||||
ZStack {
|
||||
Circle().fill(Tj.Palette.ink)
|
||||
Circle().strokeBorder(Tj.Palette.paper, lineWidth: 4)
|
||||
}
|
||||
.frame(width: 72, height: 72)
|
||||
.overlay(
|
||||
Circle().strokeBorder(Color.white.opacity(0.2), lineWidth: 1)
|
||||
.frame(width: 76, height: 76)
|
||||
)
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
Spacer()
|
||||
CircleIconButton(icon: "photo.on.rectangle", size: 44) { }
|
||||
}
|
||||
.padding(.horizontal, 32)
|
||||
.padding(.bottom, 40)
|
||||
}
|
||||
}
|
||||
|
||||
private struct CircleIconButton: View {
|
||||
let icon: String
|
||||
let size: CGFloat
|
||||
let action: () -> Void
|
||||
var body: some View {
|
||||
Button(action: action) {
|
||||
ZStack {
|
||||
Circle().fill(Color.white.opacity(0.12))
|
||||
Image(systemName: icon)
|
||||
.font(.system(size: 18, weight: .medium))
|
||||
.foregroundStyle(Tj.Palette.paper)
|
||||
}
|
||||
.frame(width: size, height: size)
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
}
|
||||
}
|
||||
@@ -1,180 +0,0 @@
|
||||
import SwiftUI
|
||||
|
||||
struct A2ConfirmView: View {
|
||||
var onSave: () -> Void
|
||||
var onNext: () -> Void
|
||||
var onBack: () -> Void
|
||||
|
||||
@State private var expanded = false
|
||||
|
||||
var body: some View {
|
||||
VStack(spacing: 0) {
|
||||
header
|
||||
ScrollView(showsIndicators: false) {
|
||||
VStack(alignment: .leading, spacing: 0) {
|
||||
croppedPhoto.padding(.bottom, 14)
|
||||
resultCard.padding(.bottom, 16)
|
||||
actions
|
||||
}
|
||||
.padding(.horizontal, 18)
|
||||
.padding(.bottom, 18)
|
||||
}
|
||||
}
|
||||
.background(Tj.Palette.sand.ignoresSafeArea())
|
||||
}
|
||||
|
||||
private var header: some View {
|
||||
HStack(spacing: 6) {
|
||||
Button(action: onBack) {
|
||||
Image(systemName: "chevron.left")
|
||||
.font(.system(size: 18, weight: .semibold))
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
.frame(width: 36, height: 36)
|
||||
}
|
||||
Text("核对识别结果")
|
||||
.font(.system(size: 15, weight: .semibold))
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
Spacer()
|
||||
Text("识别用时 0.4s · 本地")
|
||||
.font(.system(size: 10, design: .monospaced))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
.padding(.horizontal, 8)
|
||||
.padding(.vertical, 4)
|
||||
.background(Capsule().fill(Tj.Palette.sand2))
|
||||
}
|
||||
.padding(.horizontal, 12)
|
||||
.padding(.top, 4)
|
||||
.padding(.bottom, 8)
|
||||
}
|
||||
|
||||
private var croppedPhoto: some View {
|
||||
ZStack(alignment: .topTrailing) {
|
||||
Text("低密度脂蛋白 3.84 mmol/L ↑")
|
||||
.font(.system(size: 13, design: .monospaced))
|
||||
.fontWeight(.semibold)
|
||||
.tracking(0.3)
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
.padding(.vertical, 14)
|
||||
.padding(.horizontal, 16)
|
||||
.frame(maxWidth: .infinity, alignment: .leading)
|
||||
.background(Color(red: 0.96, green: 0.93, blue: 0.87).opacity(0.92))
|
||||
.clipShape(RoundedRectangle(cornerRadius: Tj.Radius.md, style: .continuous))
|
||||
.shadow(color: Color(red: 0.196, green: 0.157, blue: 0.098).opacity(0.06),
|
||||
radius: 2, x: 0, y: 1)
|
||||
Text("已裁剪")
|
||||
.font(.system(size: 9))
|
||||
.tracking(0.5)
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
.padding(.top, 8)
|
||||
.padding(.trailing, 10)
|
||||
}
|
||||
}
|
||||
|
||||
private var resultCard: some View {
|
||||
VStack(alignment: .leading, spacing: 14) {
|
||||
HStack(alignment: .top) {
|
||||
VStack(alignment: .leading, spacing: 4) {
|
||||
Text("指标名 · 可编辑")
|
||||
.font(.system(size: 11))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
Text("低密度脂蛋白胆固醇")
|
||||
.font(.system(size: 19, weight: .semibold))
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
Text("LDL-C")
|
||||
.font(.system(size: 12))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
}
|
||||
Spacer()
|
||||
TjBadge(text: "偏高", style: .brick)
|
||||
}
|
||||
|
||||
HStack(spacing: 12) {
|
||||
FieldBox(label: "数值") {
|
||||
HStack(alignment: .firstTextBaseline, spacing: 4) {
|
||||
Text("3.84")
|
||||
.font(.system(size: 30, weight: .semibold))
|
||||
.foregroundStyle(Tj.Palette.brick)
|
||||
Text("mmol/L")
|
||||
.font(.system(size: 11, design: .monospaced))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
}
|
||||
}
|
||||
FieldBox(label: "参考范围") {
|
||||
HStack(alignment: .firstTextBaseline, spacing: 4) {
|
||||
Text("< 3.40")
|
||||
.font(.system(size: 14, design: .monospaced))
|
||||
.foregroundStyle(Tj.Palette.text2)
|
||||
Text("mmol/L")
|
||||
.font(.system(size: 11, design: .monospaced))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Button { withAnimation { expanded.toggle() } } label: {
|
||||
HStack(alignment: .top, spacing: 10) {
|
||||
RoundedRectangle(cornerRadius: 2, style: .continuous)
|
||||
.fill(Tj.Palette.brick)
|
||||
.frame(width: 4)
|
||||
Text(expanded
|
||||
? "超过参考上限 0.44,属轻度偏高。建议关注饮食结构(减少动物脂肪摄入),3 个月内复查。若家族有心血管病史,可与医生沟通是否需要药物干预。"
|
||||
: "超过参考上限 0.44,属轻度偏高。点击展开详细解读 ›")
|
||||
.font(.system(size: 12))
|
||||
.foregroundStyle(Tj.Palette.text2)
|
||||
.lineSpacing(5)
|
||||
.multilineTextAlignment(.leading)
|
||||
.frame(maxWidth: .infinity, alignment: .leading)
|
||||
}
|
||||
.padding(12)
|
||||
.background(
|
||||
RoundedRectangle(cornerRadius: Tj.Radius.sm, style: .continuous)
|
||||
.fill(Tj.Palette.sand)
|
||||
)
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
}
|
||||
.padding(18)
|
||||
.tjCard()
|
||||
}
|
||||
|
||||
private var actions: some View {
|
||||
VStack(spacing: 10) {
|
||||
Button(action: onSave) {
|
||||
Text("保存到记录")
|
||||
.frame(maxWidth: .infinity)
|
||||
}
|
||||
.buttonStyle(TjPrimaryButton())
|
||||
|
||||
Button(action: onNext) {
|
||||
HStack(spacing: 8) {
|
||||
Image(systemName: "camera.fill").font(.system(size: 14))
|
||||
Text("继续拍下一项")
|
||||
}
|
||||
.frame(maxWidth: .infinity)
|
||||
}
|
||||
.buttonStyle(TjGhostButton())
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private struct FieldBox<Content: View>: View {
|
||||
let label: String
|
||||
@ViewBuilder var content: Content
|
||||
|
||||
var body: some View {
|
||||
VStack(alignment: .leading, spacing: 4) {
|
||||
Text(label)
|
||||
.font(.system(size: 10))
|
||||
.tracking(0.5)
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
content
|
||||
}
|
||||
.frame(maxWidth: .infinity, alignment: .leading)
|
||||
.padding(.vertical, 10)
|
||||
.padding(.horizontal, 12)
|
||||
.overlay(
|
||||
RoundedRectangle(cornerRadius: Tj.Radius.sm, style: .continuous)
|
||||
.strokeBorder(Tj.Palette.lineSoft, lineWidth: 1)
|
||||
)
|
||||
}
|
||||
}
|
||||
@@ -1,124 +0,0 @@
|
||||
import SwiftUI
|
||||
|
||||
struct A3BatchItem {
|
||||
let name: String
|
||||
let value: String
|
||||
let unit: String
|
||||
let range: String
|
||||
let status: IndicatorStatus
|
||||
}
|
||||
|
||||
struct A3BatchView: View {
|
||||
var onAddMore: () -> Void
|
||||
var onFinish: () -> Void
|
||||
var onBack: () -> Void
|
||||
|
||||
let items: [A3BatchItem] = [
|
||||
.init(name: "低密度脂蛋白胆固醇", value: "3.84", unit: "mmol/L", range: "< 3.40", status: .high),
|
||||
.init(name: "甘油三酯 TG", value: "1.78", unit: "mmol/L", range: "< 1.70", status: .high),
|
||||
.init(name: "空腹血糖 GLU", value: "5.4", unit: "mmol/L", range: "3.9–6.1", status: .normal),
|
||||
]
|
||||
|
||||
var body: some View {
|
||||
VStack(spacing: 0) {
|
||||
header
|
||||
ScrollView(showsIndicators: false) {
|
||||
VStack(spacing: 10) {
|
||||
ForEach(Array(items.enumerated()), id: \.offset) { idx, it in
|
||||
BatchRow(index: idx + 1, item: it)
|
||||
}
|
||||
addRow
|
||||
}
|
||||
.padding(.horizontal, 16)
|
||||
.padding(.bottom, 16)
|
||||
}
|
||||
HStack(spacing: 10) {
|
||||
Button {
|
||||
onFinish()
|
||||
} label: {
|
||||
Text("全部保存(\(items.count))").frame(maxWidth: .infinity)
|
||||
}
|
||||
.buttonStyle(TjPrimaryButton())
|
||||
}
|
||||
.padding(.horizontal, 16)
|
||||
.padding(.bottom, 14)
|
||||
}
|
||||
.background(Tj.Palette.sand.ignoresSafeArea())
|
||||
}
|
||||
|
||||
private var header: some View {
|
||||
HStack(spacing: 6) {
|
||||
Button(action: onBack) {
|
||||
Image(systemName: "chevron.left")
|
||||
.font(.system(size: 18, weight: .semibold))
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
.frame(width: 36, height: 36)
|
||||
}
|
||||
VStack(alignment: .leading, spacing: 2) {
|
||||
Text("本次已记录 \(items.count) 项")
|
||||
.font(.system(size: 15, weight: .semibold))
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
Text("核对后一次保存")
|
||||
.font(.system(size: 11))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
}
|
||||
Spacer()
|
||||
Text("· · ·")
|
||||
.font(.system(size: 14, design: .monospaced))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
.padding(.trailing, 12)
|
||||
}
|
||||
.padding(.horizontal, 12)
|
||||
.padding(.top, 4)
|
||||
.padding(.bottom, 12)
|
||||
}
|
||||
|
||||
private var addRow: some View {
|
||||
Button(action: onAddMore) {
|
||||
HStack(spacing: 8) {
|
||||
Image(systemName: "camera").font(.system(size: 14))
|
||||
Text("再拍一项")
|
||||
.font(.system(size: 13))
|
||||
}
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
.frame(maxWidth: .infinity)
|
||||
.padding(.vertical, 14)
|
||||
.overlay(
|
||||
RoundedRectangle(cornerRadius: Tj.Radius.md, style: .continuous)
|
||||
.strokeBorder(Tj.Palette.line, style: StrokeStyle(lineWidth: 1.5, dash: [4, 4]))
|
||||
)
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
}
|
||||
}
|
||||
|
||||
private struct BatchRow: View {
|
||||
let index: Int
|
||||
let item: A3BatchItem
|
||||
|
||||
var body: some View {
|
||||
HStack(spacing: 12) {
|
||||
TjPlaceholder(label: "#\(index)")
|
||||
.frame(width: 60, height: 44)
|
||||
VStack(alignment: .leading, spacing: 2) {
|
||||
Text(item.name)
|
||||
.font(.system(size: 13, weight: .semibold))
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
.lineLimit(1)
|
||||
Text("范围 \(item.range) \(item.unit)")
|
||||
.font(.system(size: 11))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
}
|
||||
Spacer(minLength: 8)
|
||||
VStack(alignment: .trailing, spacing: 2) {
|
||||
Text(item.value)
|
||||
.font(.system(size: 17, weight: .semibold))
|
||||
.foregroundStyle(item.status == .high ? Tj.Palette.brick : Tj.Palette.text)
|
||||
TjBadge(text: item.status == .high ? "偏高" : "正常",
|
||||
style: item.status == .high ? .brick : .leaf)
|
||||
}
|
||||
}
|
||||
.padding(12)
|
||||
.tjCard()
|
||||
}
|
||||
}
|
||||
@@ -1,60 +0,0 @@
|
||||
import SwiftUI
|
||||
|
||||
private enum QuickStep: Hashable {
|
||||
case viewfinder
|
||||
case confirm
|
||||
case batch
|
||||
}
|
||||
|
||||
struct QuickCaptureFlow: View {
|
||||
var onClose: () -> Void
|
||||
|
||||
@State private var step: QuickStep = .viewfinder
|
||||
@State private var snapCount = 0
|
||||
|
||||
var body: some View {
|
||||
ZStack {
|
||||
switch step {
|
||||
case .viewfinder:
|
||||
A1ViewfinderView(
|
||||
onShoot: {
|
||||
snapCount += 1
|
||||
withAnimation(.easeInOut(duration: 0.25)) { step = .confirm }
|
||||
},
|
||||
onClose: onClose
|
||||
)
|
||||
.transition(.opacity)
|
||||
|
||||
case .confirm:
|
||||
A2ConfirmView(
|
||||
onSave: {
|
||||
if snapCount >= 2 {
|
||||
withAnimation { step = .batch }
|
||||
} else {
|
||||
onClose()
|
||||
}
|
||||
},
|
||||
onNext: {
|
||||
withAnimation { step = .viewfinder }
|
||||
},
|
||||
onBack: {
|
||||
withAnimation { step = .viewfinder }
|
||||
}
|
||||
)
|
||||
.transition(.opacity)
|
||||
|
||||
case .batch:
|
||||
A3BatchView(
|
||||
onAddMore: {
|
||||
withAnimation { step = .viewfinder }
|
||||
},
|
||||
onFinish: onClose,
|
||||
onBack: {
|
||||
withAnimation { step = .confirm }
|
||||
}
|
||||
)
|
||||
.transition(.opacity)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
166
康康/Features/Quick/QuickRegionCaptureFlow.swift
Normal file
@@ -0,0 +1,166 @@
|
||||
import SwiftUI
|
||||
import SwiftData
|
||||
import UIKit
|
||||
|
||||
/// 异常项快拍 · 统一流程。
|
||||
/// 整幅单拍(真机)/ 相册(模拟器)→ 静态图手动框选 → 框内 OCR+LLM 抽指标 → 核对 → 存独立 Indicator。
|
||||
///
|
||||
/// 状态机:
|
||||
/// ```
|
||||
/// idle(相机/相册) → adjust(静态图框选,可反复识别) → confirm(核对) → save → dismiss
|
||||
/// confirm → 重拍 → idle
|
||||
/// ```
|
||||
/// 识别失败/超时不卡死:停在 adjust 提示挪框重试,或直接进 confirm 手动补(§3.2 失败回退红线)。
|
||||
struct QuickRegionCaptureFlow: View {
|
||||
@Environment(\.modelContext) private var ctx
|
||||
let onClose: () -> Void
|
||||
|
||||
@State private var phase: Phase = .idle
|
||||
|
||||
enum Phase {
|
||||
case idle
|
||||
case adjust(image: UIImage)
|
||||
case confirm(image: UIImage?, items: [QuickRegionItem], warning: String?)
|
||||
}
|
||||
|
||||
var body: some View {
|
||||
content
|
||||
.background(Tj.Palette.sand.ignoresSafeArea())
|
||||
}
|
||||
|
||||
@ViewBuilder
|
||||
private var content: some View {
|
||||
switch phase {
|
||||
case .idle:
|
||||
captureEntry
|
||||
.ignoresSafeArea()
|
||||
|
||||
case .adjust(let image):
|
||||
RegionAdjustView(
|
||||
image: image,
|
||||
recognize: { await recognizeRegion($0) },
|
||||
onProceed: { items in
|
||||
phase = .confirm(image: image, items: items, warning: nil)
|
||||
},
|
||||
onRetake: { phase = .idle },
|
||||
onCancel: { onClose() }
|
||||
)
|
||||
.ignoresSafeArea()
|
||||
|
||||
case .confirm(let image, let items, let warning):
|
||||
NavigationStack {
|
||||
QuickRegionConfirmView(
|
||||
image: image,
|
||||
items: items,
|
||||
warning: warning,
|
||||
onSave: { finalItems, capturedAt in save(items: finalItems, capturedAt: capturedAt) },
|
||||
onCancel: { onClose() },
|
||||
onRetake: { phase = .idle }
|
||||
)
|
||||
.navigationTitle(String(appLoc: "核对异常项"))
|
||||
.navigationBarTitleDisplayMode(.inline)
|
||||
.toolbar {
|
||||
ToolbarItem(placement: .topBarLeading) {
|
||||
Button("取消") { onClose() }
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - 入口:整幅单拍(真机)/ 相册(模拟器或无相机)
|
||||
|
||||
@ViewBuilder
|
||||
private var captureEntry: some View {
|
||||
#if targetEnvironment(simulator)
|
||||
PhotoPickerSheet(
|
||||
onFinish: { handlePicked($0) },
|
||||
onCancel: onClose
|
||||
)
|
||||
#else
|
||||
SingleShotCameraView(
|
||||
onCapture: { phase = .adjust(image: $0) },
|
||||
onCancel: onClose
|
||||
)
|
||||
#endif
|
||||
}
|
||||
|
||||
/// 拍/选回来:取首张进框选;无图则关闭(「只能拍一张」=只用第一张)。
|
||||
private func handlePicked(_ images: [UIImage]) {
|
||||
if let first = images.first {
|
||||
phase = .adjust(image: first)
|
||||
} else {
|
||||
onClose()
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - 识别(框内子图 → OCR → LLM)
|
||||
|
||||
/// 对已裁好的框内子图跑识别。失败/超时返回提示文案,绝不抛出(由 RegionAdjustView 展示)。
|
||||
/// 链路:Vision 端侧 OCR 取文本 → Qwen3-1.7B 结构化抽指标(对齐 indicator-capture-ocr-llm)。
|
||||
private func recognizeRegion(_ image: UIImage) async -> (items: [QuickRegionItem], warning: String?) {
|
||||
do {
|
||||
let text = try await OCRService.recognizeText(in: image)
|
||||
if Task.isCancelled { return ([], nil) } // 超时:文案由调用方给
|
||||
let trimmed = text.trimmingCharacters(in: .whitespacesAndNewlines)
|
||||
#if DEBUG
|
||||
print("🔤 [OCR · region] recognized text:\n\(trimmed)\n--- end OCR ---")
|
||||
#endif
|
||||
if trimmed.isEmpty {
|
||||
return ([], String(appLoc: "没识别到文字,挪一下框再试"))
|
||||
}
|
||||
let parsed = try await CaptureService.shared.recognizeIndicators(fromOCRText: trimmed)
|
||||
if Task.isCancelled { return ([], nil) }
|
||||
let items = Self.buildItems(from: parsed)
|
||||
return (items, items.isEmpty ? String(appLoc: "没读出指标,挪一下框再试") : nil)
|
||||
} catch CaptureError.modelNotReady {
|
||||
return ([], String(appLoc: "AI 模型未就绪,手动补充"))
|
||||
} catch let CaptureError.parseFailed(msg) {
|
||||
return ([], String(appLoc: "解析失败:\(msg)"))
|
||||
} catch let CaptureError.inferenceFailed(msg) {
|
||||
return ([], Task.isCancelled ? nil : String(appLoc: "识别失败:\(msg)"))
|
||||
} catch {
|
||||
return ([], Task.isCancelled ? nil : String(appLoc: "未知错误:\(error.localizedDescription)"))
|
||||
}
|
||||
}
|
||||
|
||||
/// LLM 结果 → 可编辑行,异常项(high/low)置顶、默认勾选。
|
||||
private static func buildItems(from parsed: [ParsedReport.ParsedIndicator]) -> [QuickRegionItem] {
|
||||
let mapped = parsed.map {
|
||||
QuickRegionItem(name: $0.name, value: $0.value, unit: $0.unit,
|
||||
range: $0.range, status: $0.status, include: true)
|
||||
}
|
||||
return mapped.enumerated().sorted { a, b in
|
||||
let aAbn = a.element.status != .normal
|
||||
let bAbn = b.element.status != .normal
|
||||
if aAbn != bAbn { return aAbn && !bAbn }
|
||||
return a.offset < b.offset
|
||||
}.map { $0.element }
|
||||
}
|
||||
|
||||
// MARK: - 保存
|
||||
|
||||
/// 勾选项各存一条独立 Indicator(与「记录指标」自由输入一致):无 Report、无 Asset、无 seriesKey。
|
||||
private func save(items: [QuickRegionItem], capturedAt: Date) {
|
||||
let selected = items.filter {
|
||||
$0.include
|
||||
&& !$0.name.trimmingCharacters(in: .whitespaces).isEmpty
|
||||
&& !$0.value.trimmingCharacters(in: .whitespaces).isEmpty
|
||||
}
|
||||
for item in selected {
|
||||
let indicator = Indicator(
|
||||
name: item.name.trimmingCharacters(in: .whitespaces),
|
||||
value: item.value.trimmingCharacters(in: .whitespaces),
|
||||
unit: item.unit.trimmingCharacters(in: .whitespaces),
|
||||
range: item.range.trimmingCharacters(in: .whitespaces),
|
||||
status: item.status,
|
||||
capturedAt: capturedAt,
|
||||
source: .quickCapture
|
||||
)
|
||||
ctx.insert(indicator)
|
||||
}
|
||||
try? ctx.save()
|
||||
onClose()
|
||||
}
|
||||
}
|
||||
305
康康/Features/Quick/QuickRegionConfirmView.swift
Normal file
@@ -0,0 +1,305 @@
|
||||
import SwiftUI
|
||||
import UIKit
|
||||
|
||||
/// 异常项快拍 · 确认页。VL 识别结果逐项可编辑 + 勾选纳入,确认后只存数值(不留图)。
|
||||
/// 与「记录指标」自由输入落库一致 —— 每个勾选项 = 一条独立 Indicator。
|
||||
struct QuickRegionConfirmView: View {
|
||||
let image: UIImage?
|
||||
let warning: String?
|
||||
let onSave: ([QuickRegionItem], Date) -> Void
|
||||
let onCancel: () -> Void
|
||||
let onRetake: () -> Void
|
||||
|
||||
@State private var items: [QuickRegionItem]
|
||||
@State private var capturedAt: Date
|
||||
|
||||
init(image: UIImage?,
|
||||
items: [QuickRegionItem],
|
||||
warning: String?,
|
||||
capturedAt: Date = .now,
|
||||
onSave: @escaping ([QuickRegionItem], Date) -> Void,
|
||||
onCancel: @escaping () -> Void,
|
||||
onRetake: @escaping () -> Void) {
|
||||
self.image = image
|
||||
self.warning = warning
|
||||
self.onSave = onSave
|
||||
self.onCancel = onCancel
|
||||
self.onRetake = onRetake
|
||||
_items = State(initialValue: items)
|
||||
_capturedAt = State(initialValue: capturedAt)
|
||||
}
|
||||
|
||||
private var selectedCount: Int {
|
||||
items.filter { $0.include && !$0.name.trimmingCharacters(in: .whitespaces).isEmpty
|
||||
&& !$0.value.trimmingCharacters(in: .whitespaces).isEmpty }.count
|
||||
}
|
||||
|
||||
var body: some View {
|
||||
ScrollView {
|
||||
VStack(alignment: .leading, spacing: 18) {
|
||||
if let warning { warningBanner(warning) }
|
||||
if let image { thumbnailCard(image) }
|
||||
timeCard
|
||||
itemsCard
|
||||
}
|
||||
.padding(20)
|
||||
}
|
||||
.safeAreaInset(edge: .bottom) { bottomBar }
|
||||
.background(Tj.Palette.sand.ignoresSafeArea())
|
||||
}
|
||||
|
||||
// MARK: - 区块
|
||||
|
||||
private func warningBanner(_ text: String) -> some View {
|
||||
HStack(alignment: .top, spacing: 8) {
|
||||
Image(systemName: "exclamationmark.triangle.fill")
|
||||
.foregroundStyle(Tj.Palette.amber)
|
||||
Text(text)
|
||||
.font(.tjScaled( 13))
|
||||
.foregroundStyle(Tj.Palette.text2)
|
||||
Spacer()
|
||||
}
|
||||
.padding(12)
|
||||
.background(
|
||||
RoundedRectangle(cornerRadius: Tj.Radius.sm, style: .continuous)
|
||||
.fill(Tj.Palette.amber.opacity(0.12))
|
||||
)
|
||||
}
|
||||
|
||||
private func thumbnailCard(_ image: UIImage) -> some View {
|
||||
VStack(alignment: .leading, spacing: 10) {
|
||||
HStack {
|
||||
Text("拍到的局部")
|
||||
.font(.tjScaled( 13, weight: .semibold))
|
||||
.foregroundStyle(Tj.Palette.text2)
|
||||
Spacer()
|
||||
Text("仅核对用 · 不保存照片")
|
||||
.font(.tjScaled( 11))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
}
|
||||
Image(uiImage: image)
|
||||
.resizable()
|
||||
.scaledToFit()
|
||||
.frame(maxWidth: .infinity)
|
||||
.frame(maxHeight: 180)
|
||||
.clipShape(RoundedRectangle(cornerRadius: Tj.Radius.sm, style: .continuous))
|
||||
.overlay(
|
||||
RoundedRectangle(cornerRadius: Tj.Radius.sm, style: .continuous)
|
||||
.strokeBorder(Tj.Palette.line, lineWidth: 1)
|
||||
)
|
||||
Button {
|
||||
onRetake()
|
||||
} label: {
|
||||
Label("重拍", systemImage: "camera.rotate")
|
||||
.font(.tjScaled( 13, weight: .medium))
|
||||
.foregroundStyle(Tj.Palette.ink)
|
||||
}
|
||||
}
|
||||
.padding(16)
|
||||
.tjCard()
|
||||
}
|
||||
|
||||
private var timeCard: some View {
|
||||
VStack(alignment: .leading, spacing: 10) {
|
||||
Text("测量时间")
|
||||
.font(.tjScaled( 13, weight: .semibold))
|
||||
.foregroundStyle(Tj.Palette.text2)
|
||||
DatePicker("", selection: $capturedAt, in: ...Date.now)
|
||||
.datePickerStyle(.compact)
|
||||
.labelsHidden()
|
||||
}
|
||||
.padding(16)
|
||||
.tjCard()
|
||||
}
|
||||
|
||||
private var itemsCard: some View {
|
||||
VStack(alignment: .leading, spacing: 14) {
|
||||
HStack {
|
||||
Text("识别到的指标 (\(items.count))")
|
||||
.font(.tjScaled( 13, weight: .semibold))
|
||||
.foregroundStyle(Tj.Palette.text2)
|
||||
Spacer()
|
||||
Button {
|
||||
items.append(QuickRegionItem(name: "", value: "", unit: "", range: "",
|
||||
status: .high, include: true))
|
||||
} label: {
|
||||
Label("加一项", systemImage: "plus.circle.fill")
|
||||
.font(.tjScaled( 13, weight: .medium))
|
||||
.foregroundStyle(Tj.Palette.ink)
|
||||
}
|
||||
}
|
||||
|
||||
if items.isEmpty {
|
||||
Text("没有识别到指标,点「加一项」手动补充,或返回重拍")
|
||||
.font(.tjScaled( 13))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
.frame(maxWidth: .infinity, alignment: .center)
|
||||
.padding(.vertical, 20)
|
||||
} else {
|
||||
ForEach($items) { $item in
|
||||
itemRow($item)
|
||||
}
|
||||
}
|
||||
}
|
||||
.padding(16)
|
||||
.tjCard()
|
||||
}
|
||||
|
||||
private func itemRow(_ item: Binding<QuickRegionItem>) -> some View {
|
||||
let abnormal = item.wrappedValue.status != .normal
|
||||
return VStack(alignment: .leading, spacing: 8) {
|
||||
HStack(spacing: 10) {
|
||||
Button {
|
||||
item.wrappedValue.include.toggle()
|
||||
} label: {
|
||||
Image(systemName: item.wrappedValue.include ? "checkmark.circle.fill" : "circle")
|
||||
.font(.tjScaled( 20))
|
||||
.foregroundStyle(item.wrappedValue.include ? Tj.Palette.ink : Tj.Palette.text3)
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
|
||||
TextField(String(appLoc: "指标名"), text: item.name)
|
||||
.font(.tjScaled( 15, weight: .medium))
|
||||
|
||||
if abnormal {
|
||||
Text(statusLabel(item.wrappedValue.status))
|
||||
.font(.tjScaled( 10, weight: .semibold))
|
||||
.foregroundStyle(statusColor(item.wrappedValue.status))
|
||||
.padding(.horizontal, 7).padding(.vertical, 3)
|
||||
.background(Capsule().fill(statusColor(item.wrappedValue.status).opacity(0.16)))
|
||||
}
|
||||
|
||||
Button {
|
||||
if let idx = items.firstIndex(where: { $0.id == item.wrappedValue.id }) {
|
||||
items.remove(at: idx)
|
||||
}
|
||||
} label: {
|
||||
Image(systemName: "trash")
|
||||
.font(.tjScaled( 14))
|
||||
.foregroundStyle(Tj.Palette.brick)
|
||||
}
|
||||
}
|
||||
HStack(spacing: 10) {
|
||||
fieldCol(String(appLoc: "数值"), item.value, width: 80, mono: true)
|
||||
fieldCol(String(appLoc: "单位"), item.unit, width: 80)
|
||||
fieldCol(String(appLoc: "范围"), item.range)
|
||||
}
|
||||
statusPicker(item)
|
||||
}
|
||||
.padding(12)
|
||||
.opacity(item.wrappedValue.include ? 1 : 0.5)
|
||||
.background(
|
||||
RoundedRectangle(cornerRadius: Tj.Radius.sm, style: .continuous)
|
||||
.fill(Tj.Palette.paper)
|
||||
)
|
||||
.overlay(
|
||||
RoundedRectangle(cornerRadius: Tj.Radius.sm, style: .continuous)
|
||||
.strokeBorder(abnormal ? statusColor(item.wrappedValue.status).opacity(0.6) : Tj.Palette.line,
|
||||
lineWidth: abnormal ? 1.5 : 1)
|
||||
)
|
||||
}
|
||||
|
||||
private func fieldCol(_ label: String, _ text: Binding<String>, width: CGFloat? = nil,
|
||||
mono: Bool = false) -> some View {
|
||||
VStack(alignment: .leading, spacing: 4) {
|
||||
Text(label)
|
||||
.font(.tjScaled( 11))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
TextField("", text: text)
|
||||
.font(.tjScaled( 14, weight: mono ? .semibold : .regular,
|
||||
design: mono ? .monospaced : .default))
|
||||
.keyboardType(mono ? .decimalPad : .default)
|
||||
.textInputAutocapitalization(.never)
|
||||
.autocorrectionDisabled()
|
||||
.padding(.horizontal, 10)
|
||||
.padding(.vertical, 8)
|
||||
.background(
|
||||
RoundedRectangle(cornerRadius: Tj.Radius.sm, style: .continuous)
|
||||
.fill(Tj.Palette.sand)
|
||||
)
|
||||
.overlay(
|
||||
RoundedRectangle(cornerRadius: Tj.Radius.sm, style: .continuous)
|
||||
.strokeBorder(Tj.Palette.line, lineWidth: 1)
|
||||
)
|
||||
.frame(width: width)
|
||||
}
|
||||
.frame(maxWidth: width == nil ? .infinity : nil, alignment: .leading)
|
||||
}
|
||||
|
||||
private func statusPicker(_ item: Binding<QuickRegionItem>) -> some View {
|
||||
HStack(spacing: 8) {
|
||||
ForEach(IndicatorStatus.allCases, id: \.self) { st in
|
||||
let selected = item.wrappedValue.status == st
|
||||
Button {
|
||||
item.wrappedValue.status = st
|
||||
} label: {
|
||||
Text(statusLabel(st))
|
||||
.font(.tjScaled( 12, weight: selected ? .semibold : .regular))
|
||||
.foregroundStyle(selected ? Tj.Palette.paper : Tj.Palette.text2)
|
||||
.padding(.horizontal, 12)
|
||||
.padding(.vertical, 6)
|
||||
.background(Capsule().fill(selected ? statusColor(st) : Tj.Palette.paper))
|
||||
.overlay(Capsule().strokeBorder(Tj.Palette.line, lineWidth: selected ? 0 : 1))
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
}
|
||||
Spacer()
|
||||
}
|
||||
}
|
||||
|
||||
private func statusLabel(_ s: IndicatorStatus) -> String {
|
||||
switch s {
|
||||
case .normal: return String(appLoc: "正常")
|
||||
case .high: return String(appLoc: "偏高 ↑")
|
||||
case .low: return String(appLoc: "偏低 ↓")
|
||||
}
|
||||
}
|
||||
|
||||
private func statusColor(_ s: IndicatorStatus) -> Color {
|
||||
switch s {
|
||||
case .normal: return Tj.Palette.leaf
|
||||
case .high: return Tj.Palette.brick
|
||||
case .low: return Tj.Palette.amber
|
||||
}
|
||||
}
|
||||
|
||||
private var bottomBar: some View {
|
||||
HStack(spacing: 12) {
|
||||
Button(action: onCancel) {
|
||||
Text("取消")
|
||||
.frame(maxWidth: .infinity)
|
||||
}
|
||||
.buttonStyle(TjGhostButton())
|
||||
|
||||
Button {
|
||||
onSave(items, capturedAt)
|
||||
} label: {
|
||||
Text(selectedCount > 0 ? "\(String(appLoc: "保存到记录"))(\(selectedCount))"
|
||||
: String(appLoc: "保存到记录"))
|
||||
.frame(maxWidth: .infinity)
|
||||
}
|
||||
.buttonStyle(TjPrimaryButton())
|
||||
.disabled(selectedCount == 0)
|
||||
.opacity(selectedCount == 0 ? 0.4 : 1)
|
||||
}
|
||||
.padding(.horizontal, 20)
|
||||
.padding(.vertical, 14)
|
||||
.background(
|
||||
Tj.Palette.sand
|
||||
.overlay(alignment: .top) {
|
||||
Rectangle().fill(Tj.Palette.lineSoft).frame(height: 1)
|
||||
}
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
/// 确认页可编辑行模型。`include` 控制是否落库(异常项默认勾选,正常项也默认勾选但可取消)。
|
||||
struct QuickRegionItem: Identifiable {
|
||||
let id = UUID()
|
||||
var name: String
|
||||
var value: String
|
||||
var unit: String
|
||||
var range: String
|
||||
var status: IndicatorStatus
|
||||
var include: Bool
|
||||
}
|
||||
261
康康/Features/Quick/RegionAdjustView.swift
Normal file
@@ -0,0 +1,261 @@
|
||||
import SwiftUI
|
||||
import AVFoundation
|
||||
import UIKit
|
||||
|
||||
/// 异常项快拍 · 静态图框选识别。
|
||||
/// 拍/选一张后,在静态照片上手动拖动 + 缩放一个方框,点「识别」只对框内做 OCR+LLM。
|
||||
/// 可反复挪框重识别,满意后进入核对页;0 项也能进核对手动补(失败回退红线)。
|
||||
struct RegionAdjustView: View {
|
||||
let image: UIImage
|
||||
/// 对裁好的子图跑 OCR+LLM,返回(识别项, 提示文案?)。几何裁剪由本视图负责。
|
||||
let recognize: (UIImage) async -> (items: [QuickRegionItem], warning: String?)
|
||||
let onProceed: ([QuickRegionItem]) -> Void
|
||||
let onRetake: () -> Void
|
||||
let onCancel: () -> Void
|
||||
|
||||
/// 单次识别超时(秒)。超时取消并提示挪框重试。
|
||||
let timeoutSeconds: Int = 60
|
||||
|
||||
@State private var box: CGRect = .zero
|
||||
@State private var fittedRect: CGRect = .zero
|
||||
@State private var boxInited = false
|
||||
@State private var dragStartBox: CGRect? = nil
|
||||
@State private var resizeStartBox: CGRect? = nil
|
||||
|
||||
@State private var isRecognizing = false
|
||||
@State private var items: [QuickRegionItem] = []
|
||||
@State private var statusText: String? = nil
|
||||
@State private var recognizeTask: Task<Void, Never>? = nil
|
||||
|
||||
private let handleSize: CGFloat = 30
|
||||
private let minBox: CGFloat = 56
|
||||
|
||||
var body: some View {
|
||||
VStack(spacing: 0) {
|
||||
topBar
|
||||
canvas
|
||||
controls
|
||||
}
|
||||
.background(Color.black.ignoresSafeArea())
|
||||
}
|
||||
|
||||
// MARK: - 顶栏
|
||||
|
||||
private var topBar: some View {
|
||||
HStack {
|
||||
Button {
|
||||
recognizeTask?.cancel()
|
||||
onCancel()
|
||||
} label: {
|
||||
Text("取消")
|
||||
.font(.tjScaled( 16, weight: .medium))
|
||||
.foregroundStyle(.white)
|
||||
}
|
||||
Spacer()
|
||||
Text("框住异常指标")
|
||||
.font(.tjScaled( 16, weight: .semibold))
|
||||
.foregroundStyle(.white)
|
||||
Spacer()
|
||||
Button {
|
||||
recognizeTask?.cancel()
|
||||
onRetake()
|
||||
} label: {
|
||||
Text("重拍")
|
||||
.font(.tjScaled( 16, weight: .medium))
|
||||
.foregroundStyle(.white)
|
||||
}
|
||||
}
|
||||
.padding(.horizontal, 18)
|
||||
.padding(.vertical, 12)
|
||||
.background(Color.black)
|
||||
}
|
||||
|
||||
// MARK: - 图 + 选框
|
||||
|
||||
private var canvas: some View {
|
||||
GeometryReader { proxy in
|
||||
let fitted = AVMakeRect(
|
||||
aspectRatio: image.size == .zero ? CGSize(width: 1, height: 1) : image.size,
|
||||
insideRect: CGRect(origin: .zero, size: proxy.size)
|
||||
)
|
||||
ZStack {
|
||||
Color.black
|
||||
|
||||
Image(uiImage: image)
|
||||
.resizable()
|
||||
.scaledToFit()
|
||||
.frame(width: proxy.size.width, height: proxy.size.height)
|
||||
|
||||
// 框外压暗,突出框内
|
||||
Canvas { ctx, size in
|
||||
var path = Path(CGRect(origin: .zero, size: size))
|
||||
path.addPath(Path(roundedRect: box, cornerRadius: 10))
|
||||
ctx.fill(path, with: .color(.black.opacity(0.5)), style: FillStyle(eoFill: true))
|
||||
}
|
||||
.allowsHitTesting(false)
|
||||
|
||||
// 选框边框 + 拖动
|
||||
RoundedRectangle(cornerRadius: 10, style: .continuous)
|
||||
.strokeBorder(Color.white, style: StrokeStyle(lineWidth: 2, dash: [7, 5]))
|
||||
.frame(width: max(box.width, 1), height: max(box.height, 1))
|
||||
.position(x: box.midX, y: box.midY)
|
||||
.contentShape(Rectangle())
|
||||
.gesture(moveGesture(in: fitted))
|
||||
|
||||
// 右下角缩放手柄
|
||||
Circle()
|
||||
.fill(.white)
|
||||
.frame(width: handleSize, height: handleSize)
|
||||
.overlay(
|
||||
Image(systemName: "arrow.down.right")
|
||||
.font(.system(size: 12, weight: .bold))
|
||||
.foregroundStyle(.black)
|
||||
)
|
||||
.position(x: box.maxX, y: box.maxY)
|
||||
.gesture(resizeGesture(in: fitted))
|
||||
}
|
||||
.onAppear {
|
||||
fittedRect = fitted
|
||||
if !boxInited {
|
||||
box = defaultBox(in: fitted)
|
||||
boxInited = true
|
||||
}
|
||||
}
|
||||
.onChange(of: proxy.size) { _, _ in
|
||||
fittedRect = fitted
|
||||
box = clampSize(clampOrigin(box, in: fitted), in: fitted)
|
||||
}
|
||||
}
|
||||
.frame(maxWidth: .infinity, maxHeight: .infinity)
|
||||
.background(Color.black)
|
||||
}
|
||||
|
||||
// MARK: - 底部控件
|
||||
|
||||
private var controls: some View {
|
||||
VStack(spacing: 12) {
|
||||
Text(statusText ?? String(appLoc: "拖动方框对准要识别的指标,可拖右下角缩放"))
|
||||
.font(.tjScaled( 13))
|
||||
.foregroundStyle(.white.opacity(0.85))
|
||||
.multilineTextAlignment(.center)
|
||||
.frame(maxWidth: .infinity)
|
||||
.frame(minHeight: 34)
|
||||
|
||||
Button {
|
||||
runRecognize()
|
||||
} label: {
|
||||
HStack(spacing: 8) {
|
||||
if isRecognizing { ProgressView().tint(.black) }
|
||||
Text(isRecognizing ? String(appLoc: "本地识别中…") : String(appLoc: "识别框内指标"))
|
||||
.font(.tjScaled( 16, weight: .semibold))
|
||||
}
|
||||
.frame(maxWidth: .infinity)
|
||||
.padding(.vertical, 14)
|
||||
.background(Capsule().fill(.white))
|
||||
.foregroundStyle(.black)
|
||||
}
|
||||
.disabled(isRecognizing)
|
||||
|
||||
Button {
|
||||
recognizeTask?.cancel()
|
||||
onProceed(items)
|
||||
} label: {
|
||||
Text(items.isEmpty
|
||||
? String(appLoc: "跳过 · 手动录入")
|
||||
: String(appLoc: "进入核对(\(items.count))"))
|
||||
.font(.tjScaled( 15, weight: .medium))
|
||||
.foregroundStyle(.white)
|
||||
.frame(maxWidth: .infinity)
|
||||
.padding(.vertical, 10)
|
||||
.background(Capsule().strokeBorder(.white.opacity(0.6), lineWidth: 1))
|
||||
}
|
||||
.disabled(isRecognizing)
|
||||
}
|
||||
.padding(.horizontal, 20)
|
||||
.padding(.top, 14)
|
||||
.padding(.bottom, 28)
|
||||
.background(Color.black)
|
||||
}
|
||||
|
||||
// MARK: - 选框默认值 / 夹紧
|
||||
|
||||
private func defaultBox(in fitted: CGRect) -> CGRect {
|
||||
guard fitted.width > 0, fitted.height > 0 else { return .zero }
|
||||
let w = fitted.width * 0.8
|
||||
let h = min(fitted.height * 0.3, max(minBox, fitted.height * 0.18))
|
||||
let x = fitted.minX + (fitted.width - w) / 2
|
||||
let y = fitted.minY + (fitted.height - h) / 2
|
||||
return CGRect(x: x, y: y, width: w, height: h)
|
||||
}
|
||||
|
||||
/// 移动时夹紧原点(尺寸不变),保证框不超出图片显示区。
|
||||
private func clampOrigin(_ b: CGRect, in fitted: CGRect) -> CGRect {
|
||||
guard fitted.width > 0 else { return b }
|
||||
let w = min(b.width, fitted.width)
|
||||
let h = min(b.height, fitted.height)
|
||||
let x = min(max(b.minX, fitted.minX), fitted.maxX - w)
|
||||
let y = min(max(b.minY, fitted.minY), fitted.maxY - h)
|
||||
return CGRect(x: x, y: y, width: w, height: h)
|
||||
}
|
||||
|
||||
/// 缩放时夹紧尺寸,保证不超出图片显示区。
|
||||
private func clampSize(_ b: CGRect, in fitted: CGRect) -> CGRect {
|
||||
guard fitted.width > 0 else { return b }
|
||||
let w = max(minBox, min(b.width, fitted.maxX - b.minX))
|
||||
let h = max(minBox, min(b.height, fitted.maxY - b.minY))
|
||||
return CGRect(x: b.minX, y: b.minY, width: w, height: h)
|
||||
}
|
||||
|
||||
private func moveGesture(in fitted: CGRect) -> some Gesture {
|
||||
DragGesture()
|
||||
.onChanged { v in
|
||||
if dragStartBox == nil { dragStartBox = box }
|
||||
let start = dragStartBox ?? box
|
||||
let moved = start.offsetBy(dx: v.translation.width, dy: v.translation.height)
|
||||
box = clampOrigin(moved, in: fitted)
|
||||
}
|
||||
.onEnded { _ in dragStartBox = nil }
|
||||
}
|
||||
|
||||
private func resizeGesture(in fitted: CGRect) -> some Gesture {
|
||||
DragGesture()
|
||||
.onChanged { v in
|
||||
if resizeStartBox == nil { resizeStartBox = box }
|
||||
let start = resizeStartBox ?? box
|
||||
let grown = CGRect(
|
||||
x: start.minX, y: start.minY,
|
||||
width: start.width + v.translation.width,
|
||||
height: start.height + v.translation.height
|
||||
)
|
||||
box = clampSize(grown, in: fitted)
|
||||
}
|
||||
.onEnded { _ in resizeStartBox = nil }
|
||||
}
|
||||
|
||||
// MARK: - 识别
|
||||
|
||||
private func runRecognize() {
|
||||
guard !isRecognizing, fittedRect.width > 1, box.width > 1, box.height > 1 else { return }
|
||||
let cropped = RegionImageCropper.cropAspectFit(image, box: box, imageFrame: fittedRect)
|
||||
recognizeTask?.cancel()
|
||||
isRecognizing = true
|
||||
statusText = String(appLoc: "本地识别中…")
|
||||
recognizeTask = Task {
|
||||
let watchdog = Task {
|
||||
try? await Task.sleep(for: .seconds(timeoutSeconds))
|
||||
recognizeTask?.cancel()
|
||||
}
|
||||
defer { watchdog.cancel() }
|
||||
|
||||
let result = await recognize(cropped)
|
||||
isRecognizing = false
|
||||
if Task.isCancelled {
|
||||
statusText = String(appLoc: "识别超时,挪一下框再试或手动补充")
|
||||
return
|
||||
}
|
||||
items = result.items
|
||||
statusText = result.warning
|
||||
?? String(appLoc: "识别到 \(result.items.count) 项,可继续挪框或进入核对")
|
||||
}
|
||||
}
|
||||
}
|
||||
366
康康/Features/Quick/RegionCameraView.swift
Normal file
@@ -0,0 +1,366 @@
|
||||
import SwiftUI
|
||||
import AVFoundation
|
||||
import UIKit
|
||||
import Combine
|
||||
|
||||
/// 异常项快拍 · 整幅单拍相机。
|
||||
/// 全屏实时预览 + 一个快门 → 返回**整幅** upright UIImage(不裁剪)。
|
||||
/// 拍完后由 `RegionAdjustView` 在静态图上手动框选识别区域。
|
||||
/// 只在真机可用(模拟器无相机,`QuickRegionCaptureFlow` 退化到 PhotoPicker)。
|
||||
struct SingleShotCameraView: View {
|
||||
let onCapture: (UIImage) -> Void
|
||||
let onCancel: () -> Void
|
||||
|
||||
@StateObject private var controller = RegionCameraController()
|
||||
@State private var authState: AuthState = .checking
|
||||
@State private var isCapturing = false
|
||||
@State private var flash = false
|
||||
|
||||
enum AuthState { case checking, authorized, denied }
|
||||
|
||||
var body: some View {
|
||||
ZStack {
|
||||
Color.black.ignoresSafeArea()
|
||||
|
||||
switch authState {
|
||||
case .checking:
|
||||
ProgressView().tint(.white)
|
||||
case .denied:
|
||||
deniedView
|
||||
case .authorized:
|
||||
RegionCameraPreview(controller: controller, cropsToBox: false)
|
||||
.ignoresSafeArea()
|
||||
controlsOverlay
|
||||
}
|
||||
|
||||
if flash {
|
||||
Color.white.ignoresSafeArea().transition(.opacity)
|
||||
}
|
||||
}
|
||||
.task { await resolveAuth() }
|
||||
}
|
||||
|
||||
private var controlsOverlay: some View {
|
||||
VStack {
|
||||
HStack {
|
||||
Button {
|
||||
onCancel()
|
||||
} label: {
|
||||
Text("取消")
|
||||
.font(.tjScaled( 16, weight: .medium))
|
||||
.foregroundStyle(.white)
|
||||
.padding(.horizontal, 14)
|
||||
.padding(.vertical, 8)
|
||||
.background(Capsule().fill(.black.opacity(0.35)))
|
||||
}
|
||||
Spacer()
|
||||
}
|
||||
.padding(.horizontal, 18)
|
||||
.padding(.top, 8)
|
||||
|
||||
Spacer()
|
||||
|
||||
Text("拍一张含异常指标的照片 · 拍完再框选")
|
||||
.font(.tjScaled( 13, weight: .medium))
|
||||
.foregroundStyle(.white)
|
||||
.padding(.horizontal, 12)
|
||||
.padding(.vertical, 6)
|
||||
.background(Capsule().fill(.black.opacity(0.4)))
|
||||
.padding(.bottom, 14)
|
||||
|
||||
shutterButton
|
||||
.padding(.bottom, 36)
|
||||
}
|
||||
}
|
||||
|
||||
private var shutterButton: some View {
|
||||
Button {
|
||||
capture()
|
||||
} label: {
|
||||
ZStack {
|
||||
Circle().fill(.white).frame(width: 72, height: 72)
|
||||
Circle().strokeBorder(.white.opacity(0.6), lineWidth: 3).frame(width: 84, height: 84)
|
||||
if isCapturing {
|
||||
ProgressView().tint(.black)
|
||||
}
|
||||
}
|
||||
}
|
||||
.disabled(isCapturing)
|
||||
.accessibilityLabel("拍摄照片")
|
||||
}
|
||||
|
||||
private var deniedView: some View {
|
||||
VStack(spacing: 16) {
|
||||
Image(systemName: "camera.fill")
|
||||
.font(.tjScaled( 40))
|
||||
.foregroundStyle(.white.opacity(0.8))
|
||||
Text("相机权限未开启")
|
||||
.font(.tjH2())
|
||||
.foregroundStyle(.white)
|
||||
Text("异常项快拍需要相机。去「设置 → 康康 → 相机」打开后再回来。")
|
||||
.font(.tjScaled( 13))
|
||||
.foregroundStyle(.white.opacity(0.7))
|
||||
.multilineTextAlignment(.center)
|
||||
.padding(.horizontal, 36)
|
||||
HStack(spacing: 12) {
|
||||
Button("取消") { onCancel() }
|
||||
.font(.tjScaled( 15))
|
||||
.foregroundStyle(.white)
|
||||
.padding(.horizontal, 18).padding(.vertical, 10)
|
||||
.background(Capsule().strokeBorder(.white.opacity(0.5), lineWidth: 1))
|
||||
Button("去设置") {
|
||||
if let url = URL(string: UIApplication.openSettingsURLString) {
|
||||
UIApplication.shared.open(url)
|
||||
}
|
||||
}
|
||||
.font(.tjScaled( 15, weight: .semibold))
|
||||
.foregroundStyle(.black)
|
||||
.padding(.horizontal, 18).padding(.vertical, 10)
|
||||
.background(Capsule().fill(.white))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private func capture() {
|
||||
guard !isCapturing else { return }
|
||||
isCapturing = true
|
||||
withAnimation(.easeOut(duration: 0.08)) { flash = true }
|
||||
controller.capture { image in
|
||||
withAnimation(.easeIn(duration: 0.15)) { flash = false }
|
||||
isCapturing = false
|
||||
guard let image else { return }
|
||||
onCapture(image)
|
||||
}
|
||||
}
|
||||
|
||||
private func resolveAuth() async {
|
||||
switch AVCaptureDevice.authorizationStatus(for: .video) {
|
||||
case .authorized:
|
||||
authState = .authorized
|
||||
case .notDetermined:
|
||||
let granted = await AVCaptureDevice.requestAccess(for: .video)
|
||||
authState = granted ? .authorized : .denied
|
||||
default:
|
||||
authState = .denied
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - AVFoundation 桥接
|
||||
|
||||
/// SwiftUI 持有,作为快门触发的句柄(weak 指向真正的 UIView)。
|
||||
final class RegionCameraController: ObservableObject {
|
||||
weak var view: RegionPreviewUIView?
|
||||
func capture(_ completion: @escaping (UIImage?) -> Void) {
|
||||
guard let view else { completion(nil); return }
|
||||
view.capture(completion: completion)
|
||||
}
|
||||
}
|
||||
|
||||
struct RegionCameraPreview: UIViewRepresentable {
|
||||
let controller: RegionCameraController
|
||||
/// 是否在拍摄后裁到居中小框。整幅单拍传 false(返回整图)。
|
||||
var cropsToBox: Bool = false
|
||||
|
||||
func makeUIView(context: Context) -> RegionPreviewUIView {
|
||||
let v = RegionPreviewUIView()
|
||||
v.cropsToBox = cropsToBox
|
||||
controller.view = v
|
||||
return v
|
||||
}
|
||||
|
||||
func updateUIView(_ uiView: RegionPreviewUIView, context: Context) {}
|
||||
|
||||
static func dismantleUIView(_ uiView: RegionPreviewUIView, coordinator: ()) {
|
||||
uiView.stop()
|
||||
}
|
||||
}
|
||||
|
||||
/// 实时预览 + 单张拍摄。`cropsToBox` 为真时按居中小框裁剪,否则返回整幅 upright 图。
|
||||
final class RegionPreviewUIView: UIView, AVCapturePhotoCaptureDelegate {
|
||||
var cropsToBox = false
|
||||
|
||||
private let session = AVCaptureSession()
|
||||
private let output = AVCapturePhotoOutput()
|
||||
private var previewLayer: AVCaptureVideoPreviewLayer?
|
||||
private var setupDone = false
|
||||
private var captureCompletion: ((UIImage?) -> Void)?
|
||||
|
||||
override func didMoveToWindow() {
|
||||
super.didMoveToWindow()
|
||||
guard !setupDone, window != nil else { return }
|
||||
setupDone = true
|
||||
configure()
|
||||
}
|
||||
|
||||
private func configure() {
|
||||
session.beginConfiguration()
|
||||
session.sessionPreset = .photo
|
||||
guard let device = AVCaptureDevice.default(.builtInWideAngleCamera, for: .video, position: .back),
|
||||
let input = try? AVCaptureDeviceInput(device: device),
|
||||
session.canAddInput(input) else {
|
||||
session.commitConfiguration()
|
||||
return
|
||||
}
|
||||
session.addInput(input)
|
||||
if session.canAddOutput(output) { session.addOutput(output) }
|
||||
session.commitConfiguration()
|
||||
|
||||
let preview = AVCaptureVideoPreviewLayer(session: session)
|
||||
preview.videoGravity = .resizeAspectFill
|
||||
preview.frame = bounds
|
||||
layer.addSublayer(preview)
|
||||
self.previewLayer = preview
|
||||
applyPortrait(preview.connection)
|
||||
|
||||
DispatchQueue.global(qos: .userInitiated).async { [weak self] in
|
||||
self?.session.startRunning()
|
||||
}
|
||||
}
|
||||
|
||||
/// 锁竖屏(iOS 17+ 用 videoRotationAngle,避免 videoOrientation 弃用告警)。
|
||||
private func applyPortrait(_ connection: AVCaptureConnection?) {
|
||||
guard let connection else { return }
|
||||
if connection.isVideoRotationAngleSupported(90) {
|
||||
connection.videoRotationAngle = 90
|
||||
}
|
||||
}
|
||||
|
||||
override func layoutSubviews() {
|
||||
super.layoutSubviews()
|
||||
previewLayer?.frame = bounds
|
||||
}
|
||||
|
||||
func capture(completion: @escaping (UIImage?) -> Void) {
|
||||
guard session.isRunning else { completion(nil); return }
|
||||
captureCompletion = completion
|
||||
applyPortrait(output.connection(with: .video))
|
||||
output.capturePhoto(with: AVCapturePhotoSettings(), delegate: self)
|
||||
}
|
||||
|
||||
func stop() {
|
||||
guard session.isRunning else { return }
|
||||
DispatchQueue.global(qos: .userInitiated).async { [weak self] in
|
||||
self?.session.stopRunning()
|
||||
}
|
||||
}
|
||||
|
||||
func photoOutput(_ output: AVCapturePhotoOutput,
|
||||
didFinishProcessingPhoto photo: AVCapturePhoto,
|
||||
error: Error?) {
|
||||
let completion = captureCompletion
|
||||
captureCompletion = nil
|
||||
// 代理回调在 AVFoundation 私有队列,SwiftUI 状态更新必须切回主线程。
|
||||
let deliver: (UIImage?) -> Void = { result in
|
||||
DispatchQueue.main.async { completion?(result) }
|
||||
}
|
||||
guard error == nil,
|
||||
let data = photo.fileDataRepresentation(),
|
||||
let image = UIImage(data: data) else {
|
||||
deliver(nil)
|
||||
return
|
||||
}
|
||||
let upright = image.normalizedUp()
|
||||
// 整幅单拍:直接返回整图,框选在静态图阶段做。
|
||||
guard cropsToBox, previewLayer != nil else {
|
||||
deliver(upright)
|
||||
return
|
||||
}
|
||||
DispatchQueue.main.async {
|
||||
let viewSize = self.bounds.size
|
||||
let box = RegionFraming.box(in: viewSize)
|
||||
let cropped = RegionImageCropper.crop(upright, box: box, viewSize: viewSize)
|
||||
completion?(cropped)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - 小框几何(旧 fill 裁剪路径保留,供 cropsToBox 用)
|
||||
|
||||
enum RegionFraming {
|
||||
/// 居中、略高于中心的小框。宽 84% 屏宽,高取 160 与 28% 屏高的较小值。
|
||||
static func box(in size: CGSize) -> CGRect {
|
||||
guard size.width > 0, size.height > 0 else { return .zero }
|
||||
let w = size.width * 0.84
|
||||
let h = min(160, size.height * 0.28)
|
||||
let x = (size.width - w) / 2
|
||||
let y = (size.height - h) / 2 - size.height * 0.06
|
||||
return CGRect(x: x, y: y, width: w, height: h)
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - 裁剪纯函数
|
||||
|
||||
enum RegionImageCropper {
|
||||
/// 把屏上小框(view 点坐标)按 `.resizeAspectFill` 反算到 `.up` 照片的像素裁剪 rect。
|
||||
/// 前提:预览以 aspect-fill 铺满 viewSize,照片与预览同源、同为竖屏方向。
|
||||
/// 单边越界自动夹紧。仅 cropsToBox 实时相机路径用。
|
||||
static func cropRect(photoPixelSize p: CGSize, box: CGRect, in viewSize: CGSize) -> CGRect {
|
||||
guard p.width > 0, p.height > 0, viewSize.width > 0, viewSize.height > 0 else { return .zero }
|
||||
let scale = max(viewSize.width / p.width, viewSize.height / p.height)
|
||||
let scaledW = p.width * scale
|
||||
let scaledH = p.height * scale
|
||||
let ox = (viewSize.width - scaledW) / 2
|
||||
let oy = (viewSize.height - scaledH) / 2
|
||||
var x = (box.minX - ox) / scale
|
||||
var y = (box.minY - oy) / scale
|
||||
var w = box.width / scale
|
||||
var h = box.height / scale
|
||||
x = max(0, min(p.width, x))
|
||||
y = max(0, min(p.height, y))
|
||||
w = max(0, min(p.width - x, w))
|
||||
h = max(0, min(p.height - y, h))
|
||||
return CGRect(x: x, y: y, width: w, height: h).integral
|
||||
}
|
||||
|
||||
/// 按屏上小框裁 `.up` 照片(aspect-fill 路径);失败回退原图。
|
||||
static func crop(_ image: UIImage, box: CGRect, viewSize: CGSize) -> UIImage {
|
||||
guard let cg = image.cgImage else { return image }
|
||||
let rect = cropRect(photoPixelSize: CGSize(width: cg.width, height: cg.height),
|
||||
box: box, in: viewSize)
|
||||
guard rect.width >= 1, rect.height >= 1, let cropped = cg.cropping(to: rect) else { return image }
|
||||
return UIImage(cgImage: cropped, scale: image.scale, orientation: .up)
|
||||
}
|
||||
|
||||
/// aspect-FIT 版:静态图以 `.scaledToFit` 显示在 `imageFrame`(view 点坐标,通常用
|
||||
/// `AVMakeRect(aspectRatio:insideRect:)` 算得)内,把屏上选框反算到照片像素 rect。
|
||||
/// `RegionAdjustView` 框选识别用。越界自动夹紧。
|
||||
static func cropRectAspectFit(photoPixelSize p: CGSize, box: CGRect, imageFrame f: CGRect) -> CGRect {
|
||||
guard p.width > 0, p.height > 0, f.width > 0, f.height > 0 else { return .zero }
|
||||
// aspect-fit:照片完整显示在 imageFrame 内,缩放系数两轴一致。
|
||||
let scale = f.width / p.width
|
||||
guard scale > 0 else { return .zero }
|
||||
var x = (box.minX - f.minX) / scale
|
||||
var y = (box.minY - f.minY) / scale
|
||||
var w = box.width / scale
|
||||
var h = box.height / scale
|
||||
x = max(0, min(p.width, x))
|
||||
y = max(0, min(p.height, y))
|
||||
w = max(0, min(p.width - x, w))
|
||||
h = max(0, min(p.height - y, h))
|
||||
return CGRect(x: x, y: y, width: w, height: h).integral
|
||||
}
|
||||
|
||||
/// 按静态图上的选框(aspect-fit)裁子图;失败回退原图。
|
||||
static func cropAspectFit(_ image: UIImage, box: CGRect, imageFrame: CGRect) -> UIImage {
|
||||
let up = image.normalizedUp()
|
||||
guard let cg = up.cgImage else { return image }
|
||||
let rect = cropRectAspectFit(
|
||||
photoPixelSize: CGSize(width: cg.width, height: cg.height),
|
||||
box: box, imageFrame: imageFrame
|
||||
)
|
||||
guard rect.width >= 1, rect.height >= 1, let cropped = cg.cropping(to: rect) else { return up }
|
||||
return UIImage(cgImage: cropped, scale: up.scale, orientation: .up)
|
||||
}
|
||||
}
|
||||
|
||||
extension UIImage {
|
||||
/// 把 EXIF 方向 bake 进像素,返回 `.up` 方向图,便于按归一化 rect 直接裁 CGImage。
|
||||
func normalizedUp() -> UIImage {
|
||||
if imageOrientation == .up { return self }
|
||||
let format = UIGraphicsImageRendererFormat.default()
|
||||
format.scale = scale
|
||||
let renderer = UIGraphicsImageRenderer(size: size, format: format)
|
||||
return renderer.image { _ in draw(in: CGRect(origin: .zero, size: size)) }
|
||||
}
|
||||
}
|
||||
@@ -1,100 +0,0 @@
|
||||
import SwiftUI
|
||||
|
||||
struct SmartFramer: View {
|
||||
var radius: CGFloat = 10
|
||||
var height: CGFloat = 56
|
||||
@State private var breathing = false
|
||||
|
||||
var body: some View {
|
||||
GeometryReader { geo in
|
||||
ZStack {
|
||||
Color.black.opacity(0.32)
|
||||
.mask(
|
||||
Rectangle()
|
||||
.overlay(
|
||||
RoundedRectangle(cornerRadius: radius, style: .continuous)
|
||||
.frame(height: height)
|
||||
.padding(.horizontal, geo.size.width * 0.08)
|
||||
.blendMode(.destinationOut)
|
||||
)
|
||||
.compositingGroup()
|
||||
)
|
||||
|
||||
RoundedRectangle(cornerRadius: radius + 4, style: .continuous)
|
||||
.stroke(Color(red: 0.95, green: 0.78, blue: 0.45), lineWidth: 1.5)
|
||||
.shadow(color: Color(red: 0.95, green: 0.78, blue: 0.45).opacity(0.5), radius: 8)
|
||||
.frame(height: height + 8)
|
||||
.padding(.horizontal, geo.size.width * 0.08 - 4)
|
||||
.opacity(breathing ? 1 : 0.35)
|
||||
|
||||
cornerMarks(in: geo.size)
|
||||
}
|
||||
.frame(width: geo.size.width, height: geo.size.height)
|
||||
.onAppear {
|
||||
withAnimation(.easeInOut(duration: 2.2).repeatForever(autoreverses: true)) {
|
||||
breathing.toggle()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private func cornerMarks(in size: CGSize) -> some View {
|
||||
let inset = size.width * 0.08
|
||||
return ZStack {
|
||||
ForEach(Corner.allCases, id: \.self) { corner in
|
||||
CornerMark(corner: corner, radius: radius)
|
||||
.frame(width: 18, height: 18)
|
||||
.position(corner.position(in: size, inset: inset, frameHeight: height))
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private enum Corner: CaseIterable {
|
||||
case tl, tr, bl, br
|
||||
func position(in size: CGSize, inset: CGFloat, frameHeight: CGFloat) -> CGPoint {
|
||||
let centerY = size.height / 2
|
||||
let top = centerY - frameHeight / 2
|
||||
let bottom = centerY + frameHeight / 2
|
||||
switch self {
|
||||
case .tl: return CGPoint(x: inset, y: top)
|
||||
case .tr: return CGPoint(x: size.width - inset, y: top)
|
||||
case .bl: return CGPoint(x: inset, y: bottom)
|
||||
case .br: return CGPoint(x: size.width - inset, y: bottom)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private struct CornerMark: View {
|
||||
let corner: Corner
|
||||
let radius: CGFloat
|
||||
|
||||
var body: some View {
|
||||
Path { p in
|
||||
let r = min(radius, 8)
|
||||
switch corner {
|
||||
case .tl:
|
||||
p.move(to: CGPoint(x: 0, y: 18))
|
||||
p.addLine(to: CGPoint(x: 0, y: r))
|
||||
p.addQuadCurve(to: CGPoint(x: r, y: 0), control: CGPoint(x: 0, y: 0))
|
||||
p.addLine(to: CGPoint(x: 18, y: 0))
|
||||
case .tr:
|
||||
p.move(to: CGPoint(x: 0, y: 0))
|
||||
p.addLine(to: CGPoint(x: 18 - r, y: 0))
|
||||
p.addQuadCurve(to: CGPoint(x: 18, y: r), control: CGPoint(x: 18, y: 0))
|
||||
p.addLine(to: CGPoint(x: 18, y: 18))
|
||||
case .bl:
|
||||
p.move(to: CGPoint(x: 0, y: 0))
|
||||
p.addLine(to: CGPoint(x: 0, y: 18 - r))
|
||||
p.addQuadCurve(to: CGPoint(x: r, y: 18), control: CGPoint(x: 0, y: 18))
|
||||
p.addLine(to: CGPoint(x: 18, y: 18))
|
||||
case .br:
|
||||
p.move(to: CGPoint(x: 0, y: 18))
|
||||
p.addLine(to: CGPoint(x: 18 - r, y: 18))
|
||||
p.addQuadCurve(to: CGPoint(x: 18, y: 18 - r), control: CGPoint(x: 18, y: 18))
|
||||
p.addLine(to: CGPoint(x: 18, y: 0))
|
||||
}
|
||||
}
|
||||
.stroke(Tj.Palette.paper, style: StrokeStyle(lineWidth: 2.5, lineCap: .round))
|
||||
}
|
||||
}
|
||||
@@ -1,43 +1,55 @@
|
||||
import SwiftUI
|
||||
|
||||
enum RecordKind: String, Identifiable, CaseIterable {
|
||||
case quick, indicator, archive, diary, symptom
|
||||
case quick, indicator, healthExport, archive, diary, symptom, reminder
|
||||
var id: String { rawValue }
|
||||
|
||||
/// RecordSheet 列表的展示顺序(从上到下)。与 enum 声明序解耦,改顺序只动这里。
|
||||
/// 注:`.quick`(异常项快拍)已并入 `.indicator`(记录指标)内的「拍照识别」,不再单列。
|
||||
static let displayOrder: [RecordKind] = [.diary, .reminder, .symptom, .indicator, .healthExport, .archive]
|
||||
|
||||
var title: String {
|
||||
switch self {
|
||||
case .quick: return "异常项快拍"
|
||||
case .indicator: return "指标记录"
|
||||
case .archive: return "关键报告归档"
|
||||
case .diary: return "文字日记"
|
||||
case .symptom: return "症状开始"
|
||||
case .quick: return String(appLoc: "异常项快拍")
|
||||
case .indicator: return String(appLoc: "记录指标")
|
||||
case .healthExport: return String(appLoc: "身体档案")
|
||||
case .archive: return String(appLoc: "体检报告归档")
|
||||
case .diary: return String(appLoc: "健康日记")
|
||||
case .symptom: return String(appLoc: "记录症状")
|
||||
case .reminder: return String(appLoc: "开启一个提醒")
|
||||
}
|
||||
}
|
||||
var subtitle: String {
|
||||
switch self {
|
||||
case .quick: return "拍一张化验单,VL 自动识别"
|
||||
case .indicator: return "手动填一项指标(免拍照)"
|
||||
case .archive: return "完整保存整份报告(可多页)"
|
||||
case .diary: return "记录心情、用药、其他"
|
||||
case .symptom: return "开始一个持续症状,结束时再点结束"
|
||||
case .quick: return String(appLoc: "拍一张化验单,VL 自动识别")
|
||||
case .indicator: return String(appLoc: "手动填写,或拍照自动识别")
|
||||
case .healthExport: return String(appLoc: "多轮问答后生成给医生看的整理报告")
|
||||
case .archive: return String(appLoc: "完整保存整份报告(可多页)")
|
||||
case .diary: return String(appLoc: "记录身体状态、用药、感受 · 可让 AI 辅助")
|
||||
case .symptom: return String(appLoc: "开始一个持续症状,结束时再点结束")
|
||||
case .reminder: return String(appLoc: "管理用药、复查、监测的周期提醒")
|
||||
}
|
||||
}
|
||||
var icon: String {
|
||||
switch self {
|
||||
case .quick: return "camera.fill"
|
||||
case .indicator: return "number.square.fill"
|
||||
case .healthExport: return "doc.text.below.ecg"
|
||||
case .archive: return "doc.fill"
|
||||
case .diary: return "pencil"
|
||||
case .diary: return "heart.text.square"
|
||||
case .symptom: return "waveform.path.ecg"
|
||||
case .reminder: return "bell.badge"
|
||||
}
|
||||
}
|
||||
var accent: Color {
|
||||
switch self {
|
||||
case .quick: return Tj.Palette.brick
|
||||
case .indicator: return Tj.Palette.brick
|
||||
case .healthExport: return Tj.Palette.ink
|
||||
case .archive: return Tj.Palette.ink
|
||||
case .diary: return Tj.Palette.leaf
|
||||
case .symptom: return Tj.Palette.amber
|
||||
case .reminder: return Tj.Palette.leaf
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -59,13 +71,15 @@ struct RecordSheet: View {
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
Spacer()
|
||||
Text("本地处理 · 永不上传")
|
||||
.font(.system(size: 12))
|
||||
.font(.tjScaled( 12))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
}
|
||||
.padding(.bottom, 14)
|
||||
|
||||
VStack(spacing: 10) {
|
||||
ForEach(RecordKind.allCases) { kind in
|
||||
// ScrollView 包裹:6 个入口在小屏固定 detent 下可能溢出,滚动确保都能触达。
|
||||
ScrollView {
|
||||
VStack(spacing: 10) {
|
||||
ForEach(RecordKind.displayOrder) { kind in
|
||||
Button {
|
||||
onPick(kind)
|
||||
} label: {
|
||||
@@ -74,22 +88,22 @@ struct RecordSheet: View {
|
||||
RoundedRectangle(cornerRadius: Tj.Radius.sm, style: .continuous)
|
||||
.fill(kind.accent)
|
||||
Image(systemName: kind.icon)
|
||||
.font(.system(size: 18, weight: .medium))
|
||||
.font(.tjScaled( 18, weight: .medium))
|
||||
.foregroundStyle(Tj.Palette.paper)
|
||||
}
|
||||
.frame(width: 44, height: 44)
|
||||
|
||||
VStack(alignment: .leading, spacing: 2) {
|
||||
Text(kind.title)
|
||||
.font(.system(size: 15, weight: .semibold))
|
||||
.font(.tjScaled( 15, weight: .semibold))
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
Text(kind.subtitle)
|
||||
.font(.system(size: 12))
|
||||
.font(.tjScaled( 12))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
}
|
||||
Spacer()
|
||||
Image(systemName: "chevron.right")
|
||||
.font(.system(size: 14, weight: .medium))
|
||||
.font(.tjScaled( 14, weight: .medium))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
}
|
||||
.padding(16)
|
||||
@@ -97,8 +111,10 @@ struct RecordSheet: View {
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
}
|
||||
}
|
||||
.padding(.bottom, 22)
|
||||
}
|
||||
.padding(.bottom, 22)
|
||||
.scrollIndicators(.hidden)
|
||||
}
|
||||
.padding(.horizontal, 18)
|
||||
.background(
|
||||
|
||||
@@ -25,7 +25,7 @@ struct OngoingSymptomsCard: View {
|
||||
.font(.tjH2())
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
Text("\(ongoing.count) 个")
|
||||
.font(.system(size: 12))
|
||||
.font(.tjScaled( 12))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
Spacer()
|
||||
}
|
||||
@@ -51,12 +51,12 @@ struct OngoingSymptomsCard: View {
|
||||
VStack(alignment: .leading, spacing: 4) {
|
||||
HStack(spacing: 8) {
|
||||
Text(sym.name)
|
||||
.font(.system(size: 15, weight: .semibold))
|
||||
.font(.tjScaled( 15, weight: .semibold))
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
severityDot(sym.severity)
|
||||
}
|
||||
Text("已持续 \(formatDuration(interval))")
|
||||
.font(.system(size: 12))
|
||||
.font(.tjScaled( 12))
|
||||
.foregroundStyle(isLong ? Tj.Palette.brick : Tj.Palette.text3)
|
||||
}
|
||||
Spacer(minLength: 8)
|
||||
@@ -64,7 +64,7 @@ struct OngoingSymptomsCard: View {
|
||||
ending = sym
|
||||
} label: {
|
||||
Text("结束")
|
||||
.font(.system(size: 12, weight: .semibold))
|
||||
.font(.tjScaled( 12, weight: .semibold))
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
.padding(.horizontal, 12)
|
||||
.padding(.vertical, 6)
|
||||
|
||||
@@ -28,7 +28,7 @@ struct SymptomEndSheet: View {
|
||||
HStack {
|
||||
VStack(alignment: .leading, spacing: 4) {
|
||||
Text("结束症状")
|
||||
.font(.system(size: 12, weight: .semibold))
|
||||
.font(.tjScaled( 12, weight: .semibold))
|
||||
.tracking(0.3)
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
Text(symptom.name)
|
||||
@@ -40,16 +40,16 @@ struct SymptomEndSheet: View {
|
||||
|
||||
VStack(alignment: .leading, spacing: 6) {
|
||||
Text("开始于")
|
||||
.font(.system(size: 12))
|
||||
.font(.tjScaled( 12))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
Text(symptom.startedAt.formatted(date: .abbreviated, time: .shortened))
|
||||
.font(.system(size: 14, weight: .medium))
|
||||
.font(.tjScaled( 14, weight: .medium))
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
}
|
||||
|
||||
VStack(alignment: .leading, spacing: 8) {
|
||||
Text("结束时间")
|
||||
.font(.system(size: 12, weight: .semibold))
|
||||
.font(.tjScaled( 12, weight: .semibold))
|
||||
.tracking(0.3)
|
||||
.foregroundStyle(Tj.Palette.text2)
|
||||
DatePicker("", selection: $endedAt, in: lowerBound...Date.now)
|
||||
@@ -59,11 +59,11 @@ struct SymptomEndSheet: View {
|
||||
|
||||
HStack {
|
||||
Text("本次持续")
|
||||
.font(.system(size: 13))
|
||||
.font(.tjScaled( 13))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
Spacer()
|
||||
Text(durationLabel)
|
||||
.font(.system(size: 15, weight: .semibold, design: .monospaced))
|
||||
.font(.tjScaled( 15, weight: .semibold, design: .monospaced))
|
||||
.foregroundStyle(Tj.Palette.brick)
|
||||
}
|
||||
.padding(.horizontal, 14)
|
||||
|
||||
@@ -1,10 +1,11 @@
|
||||
import SwiftUI
|
||||
import SwiftData
|
||||
|
||||
private let symptomPresets: [String] = [
|
||||
"头痛", "咳嗽", "腹痛", "发烧",
|
||||
"恶心", "失眠", "疲劳", "关节痛"
|
||||
]
|
||||
/// 计算属性形式:每次取值按当前语言解析,语言切换后即时更新(不可用 static/let 缓存)。
|
||||
private func symptomPresets() -> [String] {
|
||||
[String(appLoc: "头痛"), String(appLoc: "咳嗽"), String(appLoc: "腹痛"), String(appLoc: "发烧"),
|
||||
String(appLoc: "恶心"), String(appLoc: "失眠"), String(appLoc: "疲劳"), String(appLoc: "关节痛")]
|
||||
}
|
||||
|
||||
struct SymptomStartSheet: View {
|
||||
@Environment(\.modelContext) private var ctx
|
||||
@@ -68,7 +69,7 @@ struct SymptomStartSheet: View {
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
Spacer()
|
||||
Text("结束时再来点结束")
|
||||
.font(.system(size: 12))
|
||||
.font(.tjScaled( 12))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
}
|
||||
.padding(.horizontal, 20)
|
||||
@@ -77,10 +78,10 @@ struct SymptomStartSheet: View {
|
||||
|
||||
private var presetSection: some View {
|
||||
VStack(alignment: .leading, spacing: 8) {
|
||||
sectionLabel("常见症状")
|
||||
sectionLabel(String(appLoc: "常见症状"))
|
||||
ScrollView(.horizontal, showsIndicators: false) {
|
||||
HStack(spacing: 8) {
|
||||
ForEach(symptomPresets, id: \.self) { item in
|
||||
ForEach(symptomPresets(), id: \.self) { item in
|
||||
chip(item, selected: name == item) {
|
||||
name = item
|
||||
customName = ""
|
||||
@@ -93,7 +94,7 @@ struct SymptomStartSheet: View {
|
||||
|
||||
private var customSection: some View {
|
||||
VStack(alignment: .leading, spacing: 8) {
|
||||
sectionLabel("或者自己写")
|
||||
sectionLabel(String(appLoc: "或者自己写"))
|
||||
TextField("例如:眼皮跳", text: $customName)
|
||||
.textInputAutocapitalization(.never)
|
||||
.padding(.horizontal, 14)
|
||||
@@ -116,7 +117,7 @@ struct SymptomStartSheet: View {
|
||||
|
||||
private var timeSection: some View {
|
||||
VStack(alignment: .leading, spacing: 8) {
|
||||
sectionLabel("开始时间")
|
||||
sectionLabel(String(appLoc: "开始时间"))
|
||||
DatePicker("", selection: $startedAt, in: ...Date.now)
|
||||
.datePickerStyle(.compact)
|
||||
.labelsHidden()
|
||||
@@ -126,25 +127,25 @@ struct SymptomStartSheet: View {
|
||||
private var severitySection: some View {
|
||||
VStack(alignment: .leading, spacing: 8) {
|
||||
HStack {
|
||||
sectionLabel("强度")
|
||||
sectionLabel(String(appLoc: "强度"))
|
||||
Spacer()
|
||||
Text("\(Int(severity)) / 5")
|
||||
.font(.system(size: 13, weight: .semibold, design: .monospaced))
|
||||
.font(.tjScaled( 13, weight: .semibold, design: .monospaced))
|
||||
.foregroundStyle(severityColor)
|
||||
}
|
||||
Slider(value: $severity, in: 1...5, step: 1)
|
||||
.tint(severityColor)
|
||||
HStack {
|
||||
Text("轻微").font(.system(size: 11)).foregroundStyle(Tj.Palette.text3)
|
||||
Text("轻微").font(.tjScaled( 11)).foregroundStyle(Tj.Palette.text3)
|
||||
Spacer()
|
||||
Text("剧烈").font(.system(size: 11)).foregroundStyle(Tj.Palette.text3)
|
||||
Text("剧烈").font(.tjScaled( 11)).foregroundStyle(Tj.Palette.text3)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private var noteSection: some View {
|
||||
VStack(alignment: .leading, spacing: 8) {
|
||||
sectionLabel("备注(可选)")
|
||||
sectionLabel(String(appLoc: "备注(可选)"))
|
||||
TextField("位置、可能诱因…", text: $note, axis: .vertical)
|
||||
.lineLimit(2...4)
|
||||
.padding(.horizontal, 14)
|
||||
@@ -189,7 +190,7 @@ struct SymptomStartSheet: View {
|
||||
|
||||
private func sectionLabel(_ text: String) -> some View {
|
||||
Text(text)
|
||||
.font(.system(size: 12, weight: .semibold))
|
||||
.font(.tjScaled( 12, weight: .semibold))
|
||||
.tracking(0.3)
|
||||
.foregroundStyle(Tj.Palette.text2)
|
||||
}
|
||||
@@ -197,7 +198,7 @@ struct SymptomStartSheet: View {
|
||||
private func chip(_ label: String, selected: Bool, action: @escaping () -> Void) -> some View {
|
||||
Button(action: action) {
|
||||
Text(label)
|
||||
.font(.system(size: 13, weight: selected ? .semibold : .regular))
|
||||
.font(.tjScaled( 13, weight: selected ? .semibold : .regular))
|
||||
.foregroundStyle(selected ? Tj.Palette.paper : Tj.Palette.text)
|
||||
.padding(.horizontal, 14)
|
||||
.padding(.vertical, 8)
|
||||
|
||||
@@ -9,11 +9,11 @@ nonisolated enum DateSection: Hashable {
|
||||
|
||||
var label: String {
|
||||
switch self {
|
||||
case .today: return "今天"
|
||||
case .yesterday: return "昨天"
|
||||
case .thisWeek: return "本周"
|
||||
case .thisMonth: return "本月"
|
||||
case .year(let y): return "\(y) 年"
|
||||
case .today: return String(appLoc: "今天")
|
||||
case .yesterday: return String(appLoc: "昨天")
|
||||
case .thisWeek: return String(appLoc: "本周")
|
||||
case .thisMonth: return String(appLoc: "本月")
|
||||
case .year(let y): return String(appLoc: "\(y) 年")
|
||||
}
|
||||
}
|
||||
|
||||
@@ -68,10 +68,10 @@ func formatDuration(_ interval: TimeInterval) -> String {
|
||||
let hours = (totalMinutes % (60 * 24)) / 60
|
||||
let minutes = totalMinutes % 60
|
||||
|
||||
if days > 0 && hours > 0 { return "\(days) 天 \(hours) 小时" }
|
||||
if days > 0 { return "\(days) 天" }
|
||||
if hours > 0 && minutes > 0 { return "\(hours) 小时 \(minutes) 分" }
|
||||
if hours > 0 { return "\(hours) 小时" }
|
||||
if minutes > 0 { return "\(minutes) 分钟" }
|
||||
return "刚刚"
|
||||
if days > 0 && hours > 0 { return String(appLoc: "\(days) 天 \(hours) 小时") }
|
||||
if days > 0 { return String(appLoc: "\(days) 天") }
|
||||
if hours > 0 && minutes > 0 { return String(appLoc: "\(hours) 小时 \(minutes) 分") }
|
||||
if hours > 0 { return String(appLoc: "\(hours) 小时") }
|
||||
if minutes > 0 { return String(appLoc: "\(minutes) 分钟") }
|
||||
return String(appLoc: "刚刚")
|
||||
}
|
||||
|
||||
@@ -8,10 +8,10 @@ enum TimelineKind: String, CaseIterable, Identifiable {
|
||||
|
||||
var label: String {
|
||||
switch self {
|
||||
case .indicator: return "指标"
|
||||
case .report: return "报告"
|
||||
case .symptom: return "症状"
|
||||
case .diary: return "日记"
|
||||
case .indicator: return String(appLoc: "指标")
|
||||
case .report: return String(appLoc: "报告")
|
||||
case .symptom: return String(appLoc: "症状")
|
||||
case .diary: return String(appLoc: "日记")
|
||||
}
|
||||
}
|
||||
|
||||
@@ -86,39 +86,59 @@ struct TimelineEntry: Identifiable, Hashable {
|
||||
|
||||
private static func mergedBP(systolic sys: Indicator, diastolic dia: Indicator) -> TimelineEntry {
|
||||
let abnormal = sys.status != .normal || dia.status != .normal
|
||||
// 方向箭头按实际 status 给:两值同向才标 ↑/↓;一高一低只标红不给方向
|
||||
// (旧实现异常一律 ↑,低血压 85/55 会错误显示 ↑)。
|
||||
let arrow: String
|
||||
switch (sys.status, dia.status) {
|
||||
case (.high, .high), (.high, .normal), (.normal, .high): arrow = " ↑"
|
||||
case (.low, .low), (.low, .normal), (.normal, .low): arrow = " ↓"
|
||||
default: arrow = ""
|
||||
}
|
||||
return TimelineEntry(
|
||||
id: "bp-\(sys.persistentModelID)-\(dia.persistentModelID)",
|
||||
kind: .indicator,
|
||||
date: sys.capturedAt,
|
||||
title: "血压",
|
||||
subtitle: "长期监测",
|
||||
trailing: "\(sys.value)/\(dia.value) mmHg" + (abnormal ? " ↑" : ""),
|
||||
title: String(appLoc: "血压"),
|
||||
subtitle: String(appLoc: "长期监测"),
|
||||
trailing: "\(sys.value)/\(dia.value) mmHg" + arrow,
|
||||
trailingIsAlert: abnormal,
|
||||
isOngoing: false
|
||||
)
|
||||
}
|
||||
|
||||
static func from(report r: Report) -> TimelineEntry {
|
||||
let abnormal = r.indicators.filter { $0.status != .normal }.count
|
||||
let highCount = r.indicators.filter { $0.status == .high }.count
|
||||
let lowCount = r.indicators.filter { $0.status == .low }.count
|
||||
return TimelineEntry(
|
||||
id: "report-\(r.persistentModelID)",
|
||||
kind: .report,
|
||||
date: r.reportDate,
|
||||
title: r.title,
|
||||
subtitle: "\(r.type.label) · 共 \(r.pageCount) 页",
|
||||
trailing: abnormal > 0 ? "\(abnormal) 项偏高" : nil,
|
||||
trailingIsAlert: abnormal > 0,
|
||||
subtitle: "\(r.type.label) · " + String(appLoc: "共 \(r.pageCount) 页"),
|
||||
trailing: abnormalSummary(high: highCount, low: lowCount),
|
||||
trailingIsAlert: highCount + lowCount > 0,
|
||||
isOngoing: false
|
||||
)
|
||||
}
|
||||
|
||||
/// 异常计数 → trailing 文案。只高→「N 项偏高」、只低→「N 项偏低」、混合→「N 项异常」、无→nil。
|
||||
/// 旧实现一律写「N 项偏高」,只含偏低指标的报告会显示与事实相反的结论(demo 翻车点)。
|
||||
static func abnormalSummary(high: Int, low: Int) -> String? {
|
||||
switch (high, low) {
|
||||
case (0, 0): return nil
|
||||
case (let h, 0): return String(appLoc: "\(h) 项偏高")
|
||||
case (0, let l): return String(appLoc: "\(l) 项偏低")
|
||||
case (let h, let l): return String(appLoc: "\(h + l) 项异常")
|
||||
}
|
||||
}
|
||||
|
||||
static func from(diary d: DiaryEntry) -> TimelineEntry {
|
||||
TimelineEntry(
|
||||
id: "diary-\(d.persistentModelID)",
|
||||
kind: .diary,
|
||||
date: d.createdAt,
|
||||
title: d.content.firstLine(),
|
||||
subtitle: "文字日记",
|
||||
subtitle: String(appLoc: "文字日记"),
|
||||
trailing: nil,
|
||||
trailingIsAlert: false,
|
||||
isOngoing: false
|
||||
@@ -131,11 +151,11 @@ struct TimelineEntry: Identifiable, Hashable {
|
||||
let subtitle: String
|
||||
let trailing: String?
|
||||
if ongoing {
|
||||
subtitle = "症状 · 持续中"
|
||||
trailing = "持续 \(formatDuration(s.duration))"
|
||||
subtitle = String(appLoc: "症状 · 持续中")
|
||||
trailing = String(appLoc: "持续 \(formatDuration(s.duration))")
|
||||
} else {
|
||||
subtitle = "症状 · 已结束"
|
||||
trailing = "持续 \(formatDuration(s.duration))"
|
||||
subtitle = String(appLoc: "症状 · 已结束")
|
||||
trailing = String(appLoc: "持续 \(formatDuration(s.duration))")
|
||||
}
|
||||
return TimelineEntry(
|
||||
id: "symptom-\(s.persistentModelID)",
|
||||
@@ -151,9 +171,9 @@ struct TimelineEntry: Identifiable, Hashable {
|
||||
|
||||
private static func typeSubtitle(for i: Indicator) -> String {
|
||||
if let report = i.report {
|
||||
return "指标 · \(report.title)"
|
||||
return String(appLoc: "指标 · \(report.title)")
|
||||
}
|
||||
return "异常项快拍"
|
||||
return i.source.label
|
||||
}
|
||||
|
||||
private static func indicatorValue(_ i: Indicator) -> String {
|
||||
@@ -175,6 +195,6 @@ private extension String {
|
||||
let s = String(line)
|
||||
return s.count > 40 ? String(s.prefix(40)) + "…" : s
|
||||
}
|
||||
return trimmed.isEmpty ? "(空日记)" : trimmed
|
||||
return trimmed.isEmpty ? String(appLoc: "(空日记)") : trimmed
|
||||
}
|
||||
}
|
||||
|
||||
560
康康/Features/Timeline/TimelineEntryDetailView.swift
Normal file
@@ -0,0 +1,560 @@
|
||||
import SwiftUI
|
||||
import SwiftData
|
||||
|
||||
/// 时间线条目反查到的源记录,驱动只读详情 sheet。
|
||||
/// 注:报告详情这里是 W2 轻量只读版;W4 的 C2 `ReportDetailView`(三 Tab + 对比上次)另建,
|
||||
/// 届时把时间线报告行改路由到 C2 即可,本类型不与之冲突。
|
||||
enum TimelineDetail {
|
||||
case indicator(Indicator)
|
||||
case bloodPressure(sys: Indicator, dia: Indicator?)
|
||||
case report(Report)
|
||||
case diary(DiaryEntry)
|
||||
case symptom(Symptom)
|
||||
|
||||
/// 把时间线条目反查回源记录(id 形如 `<kind>-<persistentModelID>` / `bp-<sysID>-<diaID>`)。
|
||||
/// 主页「最近记录」与档案库 C1 共用同一套反查,避免逻辑重复。无法定位源记录时返回 nil。
|
||||
static func resolve(for entry: TimelineEntry,
|
||||
indicators: [Indicator],
|
||||
reports: [Report],
|
||||
diaries: [DiaryEntry],
|
||||
symptoms: [Symptom]) -> TimelineDetail? {
|
||||
switch entry.kind {
|
||||
case .report:
|
||||
return reports.first { "report-\($0.persistentModelID)" == entry.id }
|
||||
.map(TimelineDetail.report)
|
||||
case .diary:
|
||||
return diaries.first { "diary-\($0.persistentModelID)" == entry.id }
|
||||
.map(TimelineDetail.diary)
|
||||
case .symptom:
|
||||
return symptoms.first { "symptom-\($0.persistentModelID)" == entry.id }
|
||||
.map(TimelineDetail.symptom)
|
||||
case .indicator:
|
||||
if let i = indicators.first(where: { "indicator-\($0.persistentModelID)" == entry.id }) {
|
||||
return .indicator(i)
|
||||
}
|
||||
// 合并血压条目:bp-<sysID>-<diaID>
|
||||
if entry.id.hasPrefix("bp-"),
|
||||
let sys = indicators.first(where: { entry.id.hasPrefix("bp-\($0.persistentModelID)-") }) {
|
||||
// 用 id 里编码的 diaID 精确反查,不再用 ±5s 时间窗近似匹配
|
||||
//(后者在同日多次量血压时会把详情配到错误的舒张读数)。
|
||||
let dia = indicators.first { entry.id.hasSuffix("-\($0.persistentModelID)") }
|
||||
return .bloodPressure(sys: sys, dia: dia)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// 时间线条目的只读详情:展示该记录的完整字段。各类型一屏看完,不可编辑。
|
||||
struct TimelineEntryDetailView: View {
|
||||
@Environment(\.dismiss) private var dismiss
|
||||
@Environment(\.modelContext) private var ctx
|
||||
let detail: TimelineDetail
|
||||
|
||||
@State private var showDeleteConfirm = false
|
||||
@State private var evidenceTarget: Indicator?
|
||||
|
||||
var body: some View {
|
||||
VStack(spacing: 0) {
|
||||
header
|
||||
ScrollView {
|
||||
VStack(alignment: .leading, spacing: 16) {
|
||||
bodyContent
|
||||
deleteButton
|
||||
}
|
||||
.padding(.horizontal, 20)
|
||||
.padding(.vertical, 16)
|
||||
.frame(maxWidth: .infinity, alignment: .leading)
|
||||
}
|
||||
}
|
||||
.background(Tj.Palette.sand.ignoresSafeArea())
|
||||
.presentationDetents([.medium, .large])
|
||||
.presentationDragIndicator(.visible)
|
||||
.presentationBackground(Tj.Palette.sand)
|
||||
.presentationCornerRadius(Tj.Radius.xl)
|
||||
.alert(String(appLoc: "永久删除这条记录?"), isPresented: $showDeleteConfirm) {
|
||||
Button(String(appLoc: "删除"), role: .destructive) { performDelete() }
|
||||
Button(String(appLoc: "取消"), role: .cancel) { }
|
||||
} message: {
|
||||
Text("删除后无法恢复。")
|
||||
}
|
||||
.sheet(item: $evidenceTarget) { indicator in
|
||||
if let report = indicator.report {
|
||||
EvidenceImagePreview(report: report, indicator: indicator)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - 删除(永久:SwiftData 硬删 + Vault 原图 unlink,见 CLAUDE.md §6)
|
||||
|
||||
private var deleteButton: some View {
|
||||
Button(role: .destructive) { showDeleteConfirm = true } label: {
|
||||
Label(String(appLoc: "永久删除"), systemImage: "trash")
|
||||
.font(.tjScaled( 12, weight: .medium))
|
||||
.foregroundStyle(Tj.Palette.brick.opacity(0.8))
|
||||
.padding(.horizontal, 14)
|
||||
.padding(.vertical, 8)
|
||||
.background(
|
||||
RoundedRectangle(cornerRadius: Tj.Radius.md, style: .continuous)
|
||||
.strokeBorder(Tj.Palette.brick.opacity(0.3), lineWidth: 1)
|
||||
)
|
||||
// 纯描边按钮:补 contentShape 让整框可点(否则中间透明区点不到)。
|
||||
.contentShape(Rectangle())
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
.padding(.top, 8)
|
||||
}
|
||||
|
||||
private func performDelete() {
|
||||
switch detail {
|
||||
case .indicator(let i):
|
||||
deleteIndicator(i)
|
||||
case .bloodPressure(let sys, let dia):
|
||||
deleteIndicator(sys)
|
||||
if let dia { deleteIndicator(dia) }
|
||||
case .report(let r):
|
||||
// cascade 只删 Asset/Indicator 记录,Vault 里的 JPEG 要手动 unlink。
|
||||
var paths = Set(r.assets.map(\.relativePath))
|
||||
paths.formUnion(r.indicators.compactMap { $0.asset?.relativePath })
|
||||
for p in paths { try? FileVault.shared.remove(relativePath: p) }
|
||||
ctx.delete(r)
|
||||
case .diary(let d):
|
||||
ctx.delete(d)
|
||||
case .symptom(let s):
|
||||
ctx.delete(s)
|
||||
}
|
||||
try? ctx.save()
|
||||
dismiss()
|
||||
}
|
||||
|
||||
/// 删一条指标:先 unlink 其原图文件 + Asset 记录(关系默认 nullify,不会自动级联),再删指标本身。
|
||||
private func deleteIndicator(_ i: Indicator) {
|
||||
if let asset = i.asset {
|
||||
try? FileVault.shared.remove(relativePath: asset.relativePath)
|
||||
ctx.delete(asset)
|
||||
}
|
||||
ctx.delete(i)
|
||||
}
|
||||
|
||||
// MARK: - Header
|
||||
|
||||
private var header: some View {
|
||||
HStack(spacing: 12) {
|
||||
Button { dismiss() } label: {
|
||||
Image(systemName: "xmark")
|
||||
.font(.tjScaled( 16, weight: .semibold))
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
.frame(width: 32, height: 32)
|
||||
.background(Circle().fill(Tj.Palette.sand2))
|
||||
}
|
||||
Text(titleText)
|
||||
.font(.tjH2())
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
Spacer()
|
||||
TjLockChip()
|
||||
}
|
||||
.padding(.horizontal, 20)
|
||||
.padding(.vertical, 14)
|
||||
.background(Tj.Palette.sand)
|
||||
.overlay(alignment: .bottom) {
|
||||
Rectangle().fill(Tj.Palette.lineSoft).frame(height: 1)
|
||||
}
|
||||
}
|
||||
|
||||
private var titleText: String {
|
||||
switch detail {
|
||||
case .indicator: return String(appLoc: "指标详情")
|
||||
case .bloodPressure: return String(appLoc: "血压详情")
|
||||
case .report: return String(appLoc: "报告详情")
|
||||
case .diary: return String(appLoc: "日记详情")
|
||||
case .symptom: return String(appLoc: "症状详情")
|
||||
}
|
||||
}
|
||||
|
||||
@ViewBuilder
|
||||
private var bodyContent: some View {
|
||||
switch detail {
|
||||
case .indicator(let i): indicatorBody(i)
|
||||
case .bloodPressure(let s, let d): bpBody(sys: s, dia: d)
|
||||
case .report(let r): reportBody(r)
|
||||
case .diary(let d): diaryBody(d)
|
||||
case .symptom(let s): symptomBody(s)
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - 指标
|
||||
|
||||
private func indicatorBody(_ i: Indicator) -> some View {
|
||||
card {
|
||||
HStack(alignment: .firstTextBaseline) {
|
||||
Text(i.name).font(.tjH2()).foregroundStyle(Tj.Palette.text)
|
||||
Spacer()
|
||||
statusChip(i.status)
|
||||
}
|
||||
HStack(alignment: .firstTextBaseline, spacing: 4) {
|
||||
Text(i.value)
|
||||
.font(.tjScaled( 30, weight: .bold, design: .rounded))
|
||||
.foregroundStyle(i.status == .normal ? Tj.Palette.text : Tj.Palette.brick)
|
||||
if !i.unit.isEmpty {
|
||||
Text(i.unit).font(.tjScaled( 14)).foregroundStyle(Tj.Palette.text3)
|
||||
}
|
||||
}
|
||||
divider
|
||||
if !i.range.isEmpty { field(String(appLoc: "参考范围"), i.range) }
|
||||
field(String(appLoc: "记录时间"), Self.dateTimeText(i.capturedAt))
|
||||
field(String(appLoc: "来源"), i.report?.title ?? i.source.label)
|
||||
if let report = i.report {
|
||||
evidenceButton(for: i, assets: report.assets)
|
||||
}
|
||||
if let note = i.note, !note.isEmpty { field(String(appLoc: "备注"), note) }
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - 血压(合并条目)
|
||||
|
||||
private func bpBody(sys: Indicator, dia: Indicator?) -> some View {
|
||||
let combined: IndicatorStatus = sys.status != .normal
|
||||
? sys.status
|
||||
: (dia?.status ?? .normal)
|
||||
return card {
|
||||
HStack(alignment: .firstTextBaseline) {
|
||||
Text(String(appLoc: "血压")).font(.tjH2()).foregroundStyle(Tj.Palette.text)
|
||||
Spacer()
|
||||
statusChip(combined)
|
||||
}
|
||||
HStack(alignment: .firstTextBaseline, spacing: 4) {
|
||||
Text("\(sys.value)/\(dia?.value ?? "—")")
|
||||
.font(.tjScaled( 30, weight: .bold, design: .rounded))
|
||||
.foregroundStyle(combined == .normal ? Tj.Palette.text : Tj.Palette.brick)
|
||||
Text("mmHg").font(.tjScaled( 14)).foregroundStyle(Tj.Palette.text3)
|
||||
}
|
||||
divider
|
||||
if !sys.range.isEmpty { field(String(appLoc: "参考范围"), sys.range) }
|
||||
field(String(appLoc: "记录时间"), Self.dateTimeText(sys.capturedAt))
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - 报告
|
||||
|
||||
private func reportBody(_ r: Report) -> some View {
|
||||
let sorted = r.indicators.sorted {
|
||||
($0.status == .normal ? 1 : 0) < ($1.status == .normal ? 1 : 0)
|
||||
}
|
||||
return VStack(alignment: .leading, spacing: 16) {
|
||||
card {
|
||||
Text(r.title).font(.tjH2()).foregroundStyle(Tj.Palette.text)
|
||||
HStack(spacing: 8) {
|
||||
TjBadge(text: r.type.label, style: .neutral)
|
||||
Text(Self.dateText(r.reportDate))
|
||||
.font(.tjScaled( 12)).foregroundStyle(Tj.Palette.text3)
|
||||
if !r.assets.isEmpty {
|
||||
Text(String(appLoc: "原图\(r.assets.count)张"))
|
||||
.font(.tjScaled( 12)).foregroundStyle(Tj.Palette.text3)
|
||||
}
|
||||
}
|
||||
if let inst = r.institution, !inst.isEmpty {
|
||||
field(String(appLoc: "机构"), inst)
|
||||
}
|
||||
}
|
||||
|
||||
if let sum = r.summary, !sum.isEmpty {
|
||||
card {
|
||||
Text(String(appLoc: "摘要"))
|
||||
.font(.tjScaled( 12, weight: .semibold)).foregroundStyle(Tj.Palette.text2)
|
||||
Text(sum).font(.tjScaled( 14)).foregroundStyle(Tj.Palette.text)
|
||||
.fixedSize(horizontal: false, vertical: true)
|
||||
}
|
||||
}
|
||||
|
||||
if !r.indicators.isEmpty {
|
||||
card {
|
||||
Text(String(appLoc: "指标"))
|
||||
.font(.tjScaled( 12, weight: .semibold)).foregroundStyle(Tj.Palette.text2)
|
||||
ForEach(sorted) { ind in
|
||||
VStack(alignment: .leading, spacing: 6) {
|
||||
HStack {
|
||||
Text(ind.name).font(.tjScaled( 14)).foregroundStyle(Tj.Palette.text)
|
||||
Spacer(minLength: 8)
|
||||
Text(ind.unit.isEmpty ? ind.value : "\(ind.value) \(ind.unit)")
|
||||
.font(.tjScaled( 13, design: .monospaced))
|
||||
.foregroundStyle(ind.status == .normal ? Tj.Palette.text2 : Tj.Palette.brick)
|
||||
statusChip(ind.status)
|
||||
}
|
||||
evidenceButton(for: ind, assets: r.assets)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if let note = r.note, !note.isEmpty {
|
||||
card { field(String(appLoc: "备注"), note) }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - 日记
|
||||
|
||||
private func diaryBody(_ d: DiaryEntry) -> some View {
|
||||
VStack(alignment: .leading, spacing: 16) {
|
||||
card {
|
||||
Text(Self.dateTimeText(d.createdAt))
|
||||
.font(.tjScaled( 12)).foregroundStyle(Tj.Palette.text3)
|
||||
Text(d.content)
|
||||
.font(.tjScaled( 15))
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
.textSelection(.enabled)
|
||||
.frame(maxWidth: .infinity, alignment: .leading)
|
||||
.fixedSize(horizontal: false, vertical: true)
|
||||
if !d.tags.isEmpty {
|
||||
field(String(appLoc: "标签"), d.tags.map { "#\($0)" }.joined(separator: " "))
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - 症状
|
||||
|
||||
private func symptomBody(_ s: Symptom) -> some View {
|
||||
card {
|
||||
HStack(alignment: .firstTextBaseline) {
|
||||
Text(s.name).font(.tjH2()).foregroundStyle(Tj.Palette.text)
|
||||
Spacer()
|
||||
if s.isOngoing {
|
||||
Text(String(appLoc: "进行中"))
|
||||
.font(.tjScaled( 12, weight: .semibold))
|
||||
.foregroundStyle(Tj.Palette.brick)
|
||||
.padding(.horizontal, 8).padding(.vertical, 4)
|
||||
.background(Capsule().fill(Tj.Palette.brick.opacity(0.14)))
|
||||
}
|
||||
}
|
||||
divider
|
||||
field(String(appLoc: "程度"), "\(s.severity) / 5")
|
||||
field(String(appLoc: "开始"), Self.dateTimeText(s.startedAt))
|
||||
field(String(appLoc: "结束"), s.endedAt.map(Self.dateTimeText) ?? String(appLoc: "进行中"))
|
||||
field(String(appLoc: "持续"), formatDuration(s.duration))
|
||||
if let note = s.note, !note.isEmpty { field(String(appLoc: "备注"), note) }
|
||||
if !s.tags.isEmpty {
|
||||
field(String(appLoc: "标签"), s.tags.map { "#\($0)" }.joined(separator: " "))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - 复用件
|
||||
|
||||
@ViewBuilder
|
||||
private func card<Content: View>(@ViewBuilder content: () -> Content) -> some View {
|
||||
VStack(alignment: .leading, spacing: 10) { content() }
|
||||
.padding(14)
|
||||
.frame(maxWidth: .infinity, alignment: .leading)
|
||||
.background(
|
||||
RoundedRectangle(cornerRadius: Tj.Radius.md, style: .continuous)
|
||||
.fill(Tj.Palette.paper)
|
||||
)
|
||||
.overlay(
|
||||
RoundedRectangle(cornerRadius: Tj.Radius.md, style: .continuous)
|
||||
.strokeBorder(Tj.Palette.lineSoft, lineWidth: 1)
|
||||
)
|
||||
}
|
||||
|
||||
private func field(_ label: String, _ value: String) -> some View {
|
||||
HStack(alignment: .top, spacing: 12) {
|
||||
Text(label).font(.tjScaled( 13)).foregroundStyle(Tj.Palette.text3)
|
||||
Spacer(minLength: 12)
|
||||
Text(value)
|
||||
.font(.tjScaled( 14, weight: .medium))
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
.multilineTextAlignment(.trailing)
|
||||
.fixedSize(horizontal: false, vertical: true)
|
||||
}
|
||||
}
|
||||
|
||||
@ViewBuilder
|
||||
private func evidenceButton(for indicator: Indicator, assets: [Asset]) -> some View {
|
||||
if indicator.hasEvidenceBox,
|
||||
let page = indicator.sourcePageIndex,
|
||||
assets.indices.contains(page) {
|
||||
Button {
|
||||
evidenceTarget = indicator
|
||||
} label: {
|
||||
Label(String(appLoc: "查看原图位置"), systemImage: "viewfinder")
|
||||
.font(.tjScaled( 12, weight: .semibold))
|
||||
.foregroundStyle(Tj.Palette.ink)
|
||||
.padding(.horizontal, 10)
|
||||
.padding(.vertical, 6)
|
||||
.background(Capsule().fill(Tj.Palette.leaf.opacity(0.14)))
|
||||
.contentShape(Rectangle())
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
}
|
||||
}
|
||||
|
||||
private var divider: some View {
|
||||
Rectangle().fill(Tj.Palette.lineSoft).frame(height: 1)
|
||||
}
|
||||
|
||||
private func statusChip(_ s: IndicatorStatus) -> some View {
|
||||
let text: String
|
||||
let color: Color
|
||||
let arrow: String
|
||||
switch s {
|
||||
case .high: text = String(appLoc: "偏高"); color = Tj.Palette.brick; arrow = "↑"
|
||||
case .low: text = String(appLoc: "偏低"); color = Tj.Palette.brick; arrow = "↓"
|
||||
case .normal: text = String(appLoc: "正常"); color = Tj.Palette.leaf; arrow = ""
|
||||
}
|
||||
return HStack(spacing: 3) {
|
||||
if !arrow.isEmpty { Text(arrow).font(.tjScaled( 11, weight: .bold)) }
|
||||
Text(text).font(.tjScaled( 12, weight: .semibold))
|
||||
}
|
||||
.foregroundStyle(color)
|
||||
.padding(.horizontal, 8)
|
||||
.padding(.vertical, 4)
|
||||
.background(Capsule().fill(color.opacity(0.14)))
|
||||
}
|
||||
|
||||
private nonisolated static func dateTimeText(_ d: Date) -> String {
|
||||
d.formatted(.dateTime.year().month().day().hour().minute())
|
||||
}
|
||||
|
||||
private nonisolated static func dateText(_ d: Date) -> String {
|
||||
d.formatted(.dateTime.year().month().day())
|
||||
}
|
||||
}
|
||||
|
||||
private struct EvidenceImagePreview: View {
|
||||
@Environment(\.dismiss) private var dismiss
|
||||
let report: Report
|
||||
let indicator: Indicator
|
||||
|
||||
@State private var selection: Int
|
||||
|
||||
init(report: Report, indicator: Indicator) {
|
||||
self.report = report
|
||||
self.indicator = indicator
|
||||
let page = indicator.sourcePageIndex ?? 0
|
||||
_selection = State(initialValue: min(max(page, 0), max(report.assets.count - 1, 0)))
|
||||
}
|
||||
|
||||
var body: some View {
|
||||
VStack(spacing: 0) {
|
||||
HStack(spacing: 12) {
|
||||
Button { dismiss() } label: {
|
||||
Image(systemName: "xmark")
|
||||
.font(.tjScaled( 16, weight: .semibold))
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
.frame(width: 32, height: 32)
|
||||
.background(Circle().fill(Tj.Palette.sand2))
|
||||
}
|
||||
VStack(alignment: .leading, spacing: 2) {
|
||||
Text(indicator.name)
|
||||
.font(.tjScaled( 16, weight: .semibold))
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
Text("第 \(selection + 1) 页 · 原图证据")
|
||||
.font(.tjScaled( 12))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
}
|
||||
Spacer()
|
||||
}
|
||||
.padding(.horizontal, 20)
|
||||
.padding(.vertical, 14)
|
||||
.background(Tj.Palette.sand)
|
||||
.overlay(alignment: .bottom) {
|
||||
Rectangle().fill(Tj.Palette.lineSoft).frame(height: 1)
|
||||
}
|
||||
|
||||
TabView(selection: $selection) {
|
||||
ForEach(Array(report.assets.enumerated()), id: \.offset) { index, asset in
|
||||
EvidenceImagePage(
|
||||
asset: asset,
|
||||
highlight: index == indicator.sourcePageIndex ? indicator.evidenceRect : nil
|
||||
)
|
||||
.tag(index)
|
||||
.padding(16)
|
||||
}
|
||||
}
|
||||
.tabViewStyle(.page(indexDisplayMode: report.assets.count > 1 ? .automatic : .never))
|
||||
}
|
||||
.background(Tj.Palette.sand.ignoresSafeArea())
|
||||
.presentationDetents([.large])
|
||||
.presentationDragIndicator(.visible)
|
||||
.presentationBackground(Tj.Palette.sand)
|
||||
}
|
||||
}
|
||||
|
||||
private struct EvidenceImagePage: View {
|
||||
let asset: Asset
|
||||
let highlight: CGRect?
|
||||
|
||||
private var image: UIImage? {
|
||||
try? FileVault.shared.loadImage(relativePath: asset.relativePath)
|
||||
}
|
||||
|
||||
var body: some View {
|
||||
GeometryReader { geo in
|
||||
if let image {
|
||||
ZStack {
|
||||
Image(uiImage: image)
|
||||
.resizable()
|
||||
.scaledToFit()
|
||||
.frame(width: geo.size.width, height: geo.size.height)
|
||||
if let highlight {
|
||||
EvidenceHighlightOverlay(imageSize: image.size, normalizedRect: highlight)
|
||||
}
|
||||
}
|
||||
.frame(width: geo.size.width, height: geo.size.height)
|
||||
.background(Tj.Palette.paper)
|
||||
.clipShape(RoundedRectangle(cornerRadius: Tj.Radius.md, style: .continuous))
|
||||
.overlay(
|
||||
RoundedRectangle(cornerRadius: Tj.Radius.md, style: .continuous)
|
||||
.strokeBorder(Tj.Palette.lineSoft, lineWidth: 1)
|
||||
)
|
||||
} else {
|
||||
TjPlaceholder(label: String(appLoc: "原图无法读取"))
|
||||
.frame(width: geo.size.width, height: geo.size.height)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private struct EvidenceHighlightOverlay: View {
|
||||
let imageSize: CGSize
|
||||
let normalizedRect: CGRect
|
||||
|
||||
var body: some View {
|
||||
GeometryReader { geo in
|
||||
let fitted = fittedRect(imageSize: imageSize, containerSize: geo.size)
|
||||
let rect = CGRect(
|
||||
x: fitted.minX + normalizedRect.minX * fitted.width,
|
||||
y: fitted.minY + normalizedRect.minY * fitted.height,
|
||||
width: normalizedRect.width * fitted.width,
|
||||
height: normalizedRect.height * fitted.height
|
||||
)
|
||||
RoundedRectangle(cornerRadius: 4, style: .continuous)
|
||||
.fill(Tj.Palette.brick.opacity(0.16))
|
||||
.overlay(
|
||||
RoundedRectangle(cornerRadius: 4, style: .continuous)
|
||||
.stroke(Tj.Palette.brick, lineWidth: 2)
|
||||
)
|
||||
.frame(width: rect.width, height: rect.height)
|
||||
.position(x: rect.midX, y: rect.midY)
|
||||
.shadow(color: Tj.Palette.brick.opacity(0.24), radius: 8, y: 2)
|
||||
}
|
||||
.allowsHitTesting(false)
|
||||
}
|
||||
|
||||
private func fittedRect(imageSize: CGSize, containerSize: CGSize) -> CGRect {
|
||||
guard imageSize.width > 0,
|
||||
imageSize.height > 0,
|
||||
containerSize.width > 0,
|
||||
containerSize.height > 0 else {
|
||||
return .zero
|
||||
}
|
||||
let scale = min(containerSize.width / imageSize.width, containerSize.height / imageSize.height)
|
||||
let size = CGSize(width: imageSize.width * scale, height: imageSize.height * scale)
|
||||
return CGRect(
|
||||
x: (containerSize.width - size.width) / 2,
|
||||
y: (containerSize.height - size.height) / 2,
|
||||
width: size.width,
|
||||
height: size.height
|
||||
)
|
||||
}
|
||||
}
|
||||
@@ -9,7 +9,7 @@ struct TimelineRow: View {
|
||||
RoundedRectangle(cornerRadius: 8, style: .continuous)
|
||||
.fill(entry.kind.accent.opacity(0.12))
|
||||
Image(systemName: entry.kind.icon)
|
||||
.font(.system(size: 14, weight: .semibold))
|
||||
.font(.tjScaled( 14, weight: .semibold))
|
||||
.foregroundStyle(entry.kind.accent)
|
||||
}
|
||||
.frame(width: 36, height: 36)
|
||||
@@ -25,12 +25,12 @@ struct TimelineRow: View {
|
||||
|
||||
VStack(alignment: .leading, spacing: 2) {
|
||||
Text("\(entry.date.timelineLabel) · \(entry.subtitle)")
|
||||
.font(.system(size: 11))
|
||||
.font(.tjScaled( 11))
|
||||
.tracking(0.3)
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
.lineLimit(1)
|
||||
Text(entry.title)
|
||||
.font(.system(size: 14, weight: .medium))
|
||||
.font(.tjScaled( 14, weight: .medium))
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
.lineLimit(1)
|
||||
.truncationMode(.tail)
|
||||
@@ -38,7 +38,7 @@ struct TimelineRow: View {
|
||||
Spacer(minLength: 8)
|
||||
if let trailing = entry.trailing {
|
||||
Text(trailing)
|
||||
.font(.system(size: 12, weight: .semibold, design: .monospaced))
|
||||
.font(.tjScaled( 12, weight: .semibold, design: .monospaced))
|
||||
.foregroundStyle(entry.trailingIsAlert ? Tj.Palette.brick : Tj.Palette.text2)
|
||||
.lineLimit(1)
|
||||
.fixedSize()
|
||||
@@ -56,18 +56,12 @@ extension Date {
|
||||
return self.formatted(date: .omitted, time: .shortened)
|
||||
}
|
||||
if cal.isDateInYesterday(self) {
|
||||
return "昨天 " + self.formatted(date: .omitted, time: .shortened)
|
||||
return String(appLoc: "昨天") + " " + self.formatted(date: .omitted, time: .shortened)
|
||||
}
|
||||
let now = Date.now
|
||||
if cal.isDate(self, equalTo: now, toGranularity: .year) {
|
||||
let f = DateFormatter()
|
||||
f.locale = Locale(identifier: "zh_CN")
|
||||
f.dateFormat = "M 月 d 日"
|
||||
return f.string(from: self)
|
||||
return self.formatted(.dateTime.month().day())
|
||||
}
|
||||
let f = DateFormatter()
|
||||
f.locale = Locale(identifier: "zh_CN")
|
||||
f.dateFormat = "yyyy 年 M 月 d 日"
|
||||
return f.string(from: self)
|
||||
return self.formatted(.dateTime.year().month().day())
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,16 +3,31 @@ import SwiftUI
|
||||
struct CalendarMonthGrid: View {
|
||||
let monthAnchor: Date
|
||||
let data: CalendarData
|
||||
let selectedDate: Date?
|
||||
let onTapDay: (Date) -> Void
|
||||
|
||||
init(monthAnchor: Date,
|
||||
data: CalendarData,
|
||||
selectedDate: Date? = nil,
|
||||
onTapDay: @escaping (Date) -> Void) {
|
||||
self.monthAnchor = monthAnchor
|
||||
self.data = data
|
||||
self.selectedDate = selectedDate
|
||||
self.onTapDay = onTapDay
|
||||
}
|
||||
|
||||
private let calendar: Calendar = {
|
||||
var c = Calendar(identifier: .gregorian)
|
||||
c.firstWeekday = 2 // 周一开始
|
||||
c.locale = Locale(identifier: "zh_CN")
|
||||
c.locale = Locale.current
|
||||
return c
|
||||
}()
|
||||
|
||||
private let weekdayLabels = ["一", "二", "三", "四", "五", "六", "日"]
|
||||
private let weekdayLabels = [
|
||||
String(appLoc: "一"), String(appLoc: "二"), String(appLoc: "三"),
|
||||
String(appLoc: "四"), String(appLoc: "五"), String(appLoc: "六"),
|
||||
String(appLoc: "日")
|
||||
]
|
||||
private let columns = Array(repeating: GridItem(.flexible(), spacing: 4), count: 7)
|
||||
|
||||
private var days: [DayCell] {
|
||||
@@ -51,7 +66,7 @@ struct CalendarMonthGrid: View {
|
||||
HStack(spacing: 4) {
|
||||
ForEach(weekdayLabels, id: \.self) { w in
|
||||
Text(w)
|
||||
.font(.system(size: 11, weight: .medium))
|
||||
.font(.tjScaled( 11, weight: .medium))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
.frame(maxWidth: .infinity)
|
||||
}
|
||||
@@ -64,6 +79,9 @@ struct CalendarMonthGrid: View {
|
||||
ranges: data.ranges(touching: cell.date, calendar: calendar),
|
||||
marks: data.marks(for: cell.date, calendar: calendar),
|
||||
isToday: calendar.isDateInToday(cell.date),
|
||||
isSelected: selectedDate.map {
|
||||
calendar.isDate(cell.date, inSameDayAs: $0)
|
||||
} ?? false,
|
||||
calendar: calendar
|
||||
)
|
||||
.onTapGesture { onTapDay(cell.date) }
|
||||
@@ -84,6 +102,7 @@ private struct DayCellView: View {
|
||||
let ranges: [SymptomRange]
|
||||
let marks: DayMarks
|
||||
let isToday: Bool
|
||||
let isSelected: Bool
|
||||
let calendar: Calendar
|
||||
|
||||
private var dayNumber: Int {
|
||||
@@ -92,14 +111,20 @@ private struct DayCellView: View {
|
||||
|
||||
var body: some View {
|
||||
ZStack(alignment: .top) {
|
||||
// 背景:今天高亮
|
||||
// 背景层:selected > today
|
||||
RoundedRectangle(cornerRadius: 6, style: .continuous)
|
||||
.fill(isToday ? Tj.Palette.sand2 : Color.clear)
|
||||
.fill(backgroundFill)
|
||||
|
||||
// 选中描边
|
||||
if isSelected {
|
||||
RoundedRectangle(cornerRadius: 6, style: .continuous)
|
||||
.strokeBorder(Tj.Palette.brick, lineWidth: 1.5)
|
||||
}
|
||||
|
||||
VStack(spacing: 2) {
|
||||
Text("\(dayNumber)")
|
||||
.font(.system(size: 13,
|
||||
weight: isToday ? .bold : .regular,
|
||||
.font(.tjScaled( 13,
|
||||
weight: (isToday || isSelected) ? .bold : .regular,
|
||||
design: .default))
|
||||
.foregroundStyle(textColor)
|
||||
.padding(.top, 4)
|
||||
@@ -112,7 +137,7 @@ private struct DayCellView: View {
|
||||
}
|
||||
if ranges.count > 2 {
|
||||
Text("+\(ranges.count - 2)")
|
||||
.font(.system(size: 7, design: .monospaced))
|
||||
.font(.tjScaled( 7, design: .monospaced))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
}
|
||||
}
|
||||
@@ -145,10 +170,17 @@ private struct DayCellView: View {
|
||||
|
||||
private var textColor: Color {
|
||||
if !cell.inCurrentMonth { return Tj.Palette.text3.opacity(0.5) }
|
||||
if isSelected { return Tj.Palette.brick }
|
||||
if isToday { return Tj.Palette.ink }
|
||||
return Tj.Palette.text
|
||||
}
|
||||
|
||||
private var backgroundFill: Color {
|
||||
if isSelected { return Tj.Palette.brickSoft.opacity(0.5) }
|
||||
if isToday { return Tj.Palette.sand2 }
|
||||
return .clear
|
||||
}
|
||||
|
||||
private func symptomBar(_ range: SymptomRange) -> some View {
|
||||
let pos = range.position(cell.date, calendar: calendar)
|
||||
let leadingRadius: CGFloat = (pos == .start || pos == .single) ? 3 : 0
|
||||
|
||||
@@ -8,7 +8,7 @@ struct CalendarYearGrid: View {
|
||||
private let calendar: Calendar = {
|
||||
var c = Calendar(identifier: .gregorian)
|
||||
c.firstWeekday = 2
|
||||
c.locale = Locale(identifier: "zh_CN")
|
||||
c.locale = Locale.current
|
||||
return c
|
||||
}()
|
||||
|
||||
@@ -42,15 +42,13 @@ private struct MiniMonth: View {
|
||||
let calendar: Calendar
|
||||
|
||||
private var monthLabel: String {
|
||||
let f = DateFormatter()
|
||||
f.locale = Locale(identifier: "zh_CN")
|
||||
f.dateFormat = "M 月"
|
||||
return f.string(from: anchor)
|
||||
anchor.formatted(.dateTime.month())
|
||||
}
|
||||
|
||||
private var days: [Date] {
|
||||
guard let interval = calendar.dateInterval(of: .month, for: anchor) else { return [] }
|
||||
let count = calendar.dateComponents([.day], from: interval.start, to: interval.end).day ?? 30
|
||||
// 用 range(of:.day,in:.month) 求当月天数,避免按秒差折算在 DST 切换月份偏 1 天。
|
||||
let count = calendar.range(of: .day, in: .month, for: anchor)?.count ?? 30
|
||||
return (0..<count).compactMap { calendar.date(byAdding: .day, value: $0, to: interval.start) }
|
||||
}
|
||||
|
||||
@@ -64,7 +62,7 @@ private struct MiniMonth: View {
|
||||
var body: some View {
|
||||
VStack(alignment: .leading, spacing: 6) {
|
||||
Text(monthLabel)
|
||||
.font(.system(size: 12, weight: .semibold))
|
||||
.font(.tjScaled( 12, weight: .semibold))
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
|
||||
LazyVGrid(columns: microColumns, spacing: 2) {
|
||||
|
||||
@@ -6,38 +6,37 @@ struct SelectedDay: Identifiable, Hashable {
|
||||
var id: TimeInterval { date.timeIntervalSince1970 }
|
||||
}
|
||||
|
||||
struct DayDetailSheet: View {
|
||||
@Environment(\.modelContext) private var ctx
|
||||
@Environment(\.dismiss) private var dismiss
|
||||
// MARK: - DayDetailContent(可 inline 或入 sheet)
|
||||
|
||||
/// 选中日详情的核心渲染。无 sheet 外壳,可同时被 TrendsView inline 使用,也能被 sheet 包。
|
||||
struct DayDetailContent: View {
|
||||
let date: Date
|
||||
let indicators: [Indicator]
|
||||
let reports: [Report]
|
||||
let diaries: [DiaryEntry]
|
||||
let symptoms: [Symptom]
|
||||
/// 是否显示日期 header(inline 时通常自带 header,sheet 模式让 DayDetailSheet 自己画)
|
||||
var showHeader: Bool = true
|
||||
|
||||
@State private var endingSymptom: Symptom?
|
||||
|
||||
private let calendar: Calendar = {
|
||||
var c = Calendar(identifier: .gregorian)
|
||||
c.locale = Locale(identifier: "zh_CN")
|
||||
c.locale = Locale.current
|
||||
return c
|
||||
}()
|
||||
|
||||
// MARK: - 当日数据筛选
|
||||
// MARK: 当日筛选
|
||||
|
||||
private var dayIndicators: [Indicator] {
|
||||
indicators.filter { calendar.isDate($0.capturedAt, inSameDayAs: date) }
|
||||
}
|
||||
|
||||
private var dayReports: [Report] {
|
||||
reports.filter { calendar.isDate($0.reportDate, inSameDayAs: date) }
|
||||
}
|
||||
|
||||
private var dayDiaries: [DiaryEntry] {
|
||||
diaries.filter { calendar.isDate($0.createdAt, inSameDayAs: date) }
|
||||
}
|
||||
|
||||
private var daySymptoms: [(symptom: Symptom, state: SymptomDayState)] {
|
||||
symptoms.compactMap { s in
|
||||
let start = calendar.startOfDay(for: s.startedAt)
|
||||
@@ -52,133 +51,88 @@ struct DayDetailSheet: View {
|
||||
return (s, state)
|
||||
}
|
||||
}
|
||||
|
||||
private var totalCount: Int {
|
||||
dayIndicators.count + dayReports.count + dayDiaries.count + daySymptoms.count
|
||||
}
|
||||
|
||||
// MARK: - body
|
||||
|
||||
var body: some View {
|
||||
VStack(spacing: 0) {
|
||||
Capsule()
|
||||
.fill(Tj.Palette.line)
|
||||
.frame(width: 40, height: 4)
|
||||
.padding(.top, 10)
|
||||
.padding(.bottom, 14)
|
||||
|
||||
header
|
||||
.padding(.horizontal, 20)
|
||||
.padding(.bottom, 12)
|
||||
|
||||
VStack(alignment: .leading, spacing: 14) {
|
||||
if showHeader { header }
|
||||
if totalCount == 0 {
|
||||
emptyState
|
||||
} else {
|
||||
ScrollView(showsIndicators: false) {
|
||||
VStack(alignment: .leading, spacing: 18) {
|
||||
if !daySymptoms.isEmpty {
|
||||
section("症状", count: daySymptoms.count) {
|
||||
VStack(spacing: 8) {
|
||||
ForEach(daySymptoms, id: \.symptom.id) { item in
|
||||
symptomRow(item.symptom, state: item.state)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if !dayIndicators.isEmpty {
|
||||
section("指标", count: dayIndicators.count) {
|
||||
VStack(spacing: 8) {
|
||||
ForEach(dayIndicators) { i in
|
||||
indicatorRow(i)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if !dayReports.isEmpty {
|
||||
section("报告", count: dayReports.count) {
|
||||
VStack(spacing: 8) {
|
||||
ForEach(dayReports) { r in
|
||||
reportRow(r)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if !dayDiaries.isEmpty {
|
||||
section("日记", count: dayDiaries.count) {
|
||||
VStack(spacing: 8) {
|
||||
ForEach(dayDiaries) { d in
|
||||
diaryRow(d)
|
||||
}
|
||||
}
|
||||
if !daySymptoms.isEmpty {
|
||||
section(String(appLoc: "症状"), count: daySymptoms.count) {
|
||||
VStack(spacing: 8) {
|
||||
ForEach(daySymptoms, id: \.symptom.id) { item in
|
||||
symptomRow(item.symptom, state: item.state)
|
||||
}
|
||||
}
|
||||
}
|
||||
.padding(.horizontal, 20)
|
||||
.padding(.bottom, 24)
|
||||
}
|
||||
if !dayIndicators.isEmpty {
|
||||
section(String(appLoc: "指标"), count: dayIndicators.count) {
|
||||
VStack(spacing: 8) {
|
||||
ForEach(dayIndicators) { i in indicatorRow(i) }
|
||||
}
|
||||
}
|
||||
}
|
||||
if !dayReports.isEmpty {
|
||||
section(String(appLoc: "报告"), count: dayReports.count) {
|
||||
VStack(spacing: 8) {
|
||||
ForEach(dayReports) { r in reportRow(r) }
|
||||
}
|
||||
}
|
||||
}
|
||||
if !dayDiaries.isEmpty {
|
||||
section(String(appLoc: "日记"), count: dayDiaries.count) {
|
||||
VStack(spacing: 8) {
|
||||
ForEach(dayDiaries) { d in diaryRow(d) }
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
.background(
|
||||
Tj.Palette.sand
|
||||
.clipShape(RoundedRectangle(cornerRadius: Tj.Radius.xl, style: .continuous))
|
||||
.ignoresSafeArea(edges: .bottom)
|
||||
)
|
||||
.presentationDetents([.medium, .large])
|
||||
.presentationDragIndicator(.hidden)
|
||||
.presentationBackground(Tj.Palette.sand)
|
||||
.presentationCornerRadius(Tj.Radius.xl)
|
||||
.sheet(item: $endingSymptom) { sym in
|
||||
SymptomEndSheet(symptom: sym)
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - header
|
||||
// MARK: header
|
||||
|
||||
private var header: some View {
|
||||
HStack(alignment: .firstTextBaseline) {
|
||||
VStack(alignment: .leading, spacing: 4) {
|
||||
Text(dateLine)
|
||||
.font(.system(size: 12, weight: .semibold))
|
||||
.font(.tjScaled( 12, weight: .semibold))
|
||||
.tracking(0.5)
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
Text(dayLabel)
|
||||
.font(.tjTitle(28))
|
||||
.font(.tjTitle(22))
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
}
|
||||
Spacer()
|
||||
if totalCount > 0 {
|
||||
Text("\(totalCount) 条")
|
||||
.font(.system(size: 12, design: .monospaced))
|
||||
.font(.tjScaled( 12, design: .monospaced))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private var dateLine: String {
|
||||
let f = DateFormatter()
|
||||
f.locale = Locale(identifier: "zh_CN")
|
||||
f.dateFormat = "yyyy 年"
|
||||
return f.string(from: date) + " · " + weekdayLabel
|
||||
date.formatted(.dateTime.year()) + " · " + weekdayLabel
|
||||
}
|
||||
|
||||
private var dayLabel: String {
|
||||
let f = DateFormatter()
|
||||
f.locale = Locale(identifier: "zh_CN")
|
||||
f.dateFormat = "M 月 d 日"
|
||||
return f.string(from: date)
|
||||
date.formatted(.dateTime.month().day())
|
||||
}
|
||||
|
||||
private var weekdayLabel: String {
|
||||
let f = DateFormatter()
|
||||
f.locale = Locale(identifier: "zh_CN")
|
||||
f.dateFormat = "EEEE"
|
||||
return f.string(from: date)
|
||||
date.formatted(.dateTime.weekday(.wide))
|
||||
}
|
||||
|
||||
// MARK: - section
|
||||
// MARK: section helper
|
||||
|
||||
private func section<Content: View>(_ title: String,
|
||||
count: Int,
|
||||
@@ -186,11 +140,11 @@ struct DayDetailSheet: View {
|
||||
VStack(alignment: .leading, spacing: 10) {
|
||||
HStack {
|
||||
Text(title)
|
||||
.font(.system(size: 13, weight: .semibold))
|
||||
.font(.tjScaled( 13, weight: .semibold))
|
||||
.tracking(0.3)
|
||||
.foregroundStyle(Tj.Palette.text2)
|
||||
Text("\(count)")
|
||||
.font(.system(size: 11, design: .monospaced))
|
||||
.font(.tjScaled( 11, design: .monospaced))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
Spacer()
|
||||
}
|
||||
@@ -198,33 +152,36 @@ struct DayDetailSheet: View {
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - rows
|
||||
// MARK: rows
|
||||
|
||||
private func symptomRow(_ s: Symptom, state: SymptomDayState) -> some View {
|
||||
HStack(spacing: 12) {
|
||||
Capsule()
|
||||
.fill(severityColor(s.severity))
|
||||
.frame(width: 4, height: 36)
|
||||
|
||||
VStack(alignment: .leading, spacing: 3) {
|
||||
HStack(spacing: 6) {
|
||||
Text(s.name)
|
||||
.font(.system(size: 15, weight: .semibold))
|
||||
.font(.tjScaled( 15, weight: .semibold))
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
stateBadge(state, isOngoing: s.isOngoing)
|
||||
Text(state.badge)
|
||||
.font(.tjScaled( 10, weight: .semibold))
|
||||
.foregroundStyle(state.badgeFg)
|
||||
.padding(.horizontal, 6)
|
||||
.padding(.vertical, 2)
|
||||
.background(Capsule().fill(state.badgeBg))
|
||||
}
|
||||
Text("\(state.subtitle) · 持续 \(formatDuration(s.duration))")
|
||||
.font(.system(size: 11))
|
||||
.font(.tjScaled( 11))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
}
|
||||
Spacer(minLength: 6)
|
||||
|
||||
if s.isOngoing {
|
||||
Button {
|
||||
endingSymptom = s
|
||||
} label: {
|
||||
Text("结束")
|
||||
.font(.system(size: 12, weight: .semibold))
|
||||
.font(.tjScaled( 12, weight: .semibold))
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
.padding(.horizontal, 12)
|
||||
.padding(.vertical, 6)
|
||||
@@ -237,41 +194,30 @@ struct DayDetailSheet: View {
|
||||
.tjCard(bordered: true)
|
||||
}
|
||||
|
||||
private func stateBadge(_ state: SymptomDayState, isOngoing: Bool) -> some View {
|
||||
Text(state.badge)
|
||||
.font(.system(size: 10, weight: .semibold))
|
||||
.foregroundStyle(state.badgeFg)
|
||||
.padding(.horizontal, 6)
|
||||
.padding(.vertical, 2)
|
||||
.background(Capsule().fill(state.badgeBg))
|
||||
}
|
||||
|
||||
private func indicatorRow(_ i: Indicator) -> some View {
|
||||
HStack(spacing: 12) {
|
||||
ZStack {
|
||||
RoundedRectangle(cornerRadius: 8, style: .continuous)
|
||||
.fill(indicatorAccent(i).opacity(0.12))
|
||||
Image(systemName: "drop.fill")
|
||||
.font(.system(size: 13, weight: .semibold))
|
||||
.font(.tjScaled( 13, weight: .semibold))
|
||||
.foregroundStyle(indicatorAccent(i))
|
||||
}
|
||||
.frame(width: 32, height: 32)
|
||||
|
||||
VStack(alignment: .leading, spacing: 2) {
|
||||
Text(i.name)
|
||||
.font(.system(size: 14, weight: .medium))
|
||||
.font(.tjScaled( 14, weight: .medium))
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
.lineLimit(1)
|
||||
if !i.range.isEmpty {
|
||||
Text("参考 \(i.range)")
|
||||
.font(.system(size: 11))
|
||||
.font(.tjScaled( 11))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
}
|
||||
}
|
||||
Spacer(minLength: 6)
|
||||
|
||||
Text("\(i.value) \(i.unit)\(arrow(i))")
|
||||
.font(.system(size: 13, weight: .semibold, design: .monospaced))
|
||||
.font(.tjScaled( 13, weight: .semibold, design: .monospaced))
|
||||
.foregroundStyle(i.status == .normal ? Tj.Palette.text2 : Tj.Palette.brick)
|
||||
.lineLimit(1)
|
||||
.fixedSize()
|
||||
@@ -281,30 +227,31 @@ struct DayDetailSheet: View {
|
||||
}
|
||||
|
||||
private func reportRow(_ r: Report) -> some View {
|
||||
let abnormal = r.indicators.filter { $0.status != .normal }.count
|
||||
let highCount = r.indicators.filter { $0.status == .high }.count
|
||||
let lowCount = r.indicators.filter { $0.status == .low }.count
|
||||
let summary = TimelineEntry.abnormalSummary(high: highCount, low: lowCount)
|
||||
return HStack(spacing: 12) {
|
||||
ZStack {
|
||||
RoundedRectangle(cornerRadius: 8, style: .continuous)
|
||||
.fill(Tj.Palette.ink2.opacity(0.12))
|
||||
Image(systemName: "doc.fill")
|
||||
.font(.system(size: 13, weight: .semibold))
|
||||
.font(.tjScaled( 13, weight: .semibold))
|
||||
.foregroundStyle(Tj.Palette.ink2)
|
||||
}
|
||||
.frame(width: 32, height: 32)
|
||||
|
||||
VStack(alignment: .leading, spacing: 2) {
|
||||
Text(r.title)
|
||||
.font(.system(size: 14, weight: .medium))
|
||||
.font(.tjScaled( 14, weight: .medium))
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
.lineLimit(1)
|
||||
Text("\(r.type.label) · 共 \(r.pageCount) 页")
|
||||
.font(.system(size: 11))
|
||||
.font(.tjScaled( 11))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
}
|
||||
Spacer(minLength: 6)
|
||||
if abnormal > 0 {
|
||||
Text("\(abnormal) 项偏高")
|
||||
.font(.system(size: 11, weight: .semibold, design: .monospaced))
|
||||
if let summary {
|
||||
Text(summary)
|
||||
.font(.tjScaled( 11, weight: .semibold, design: .monospaced))
|
||||
.foregroundStyle(Tj.Palette.brick)
|
||||
}
|
||||
}
|
||||
@@ -316,7 +263,7 @@ struct DayDetailSheet: View {
|
||||
VStack(alignment: .leading, spacing: 6) {
|
||||
HStack {
|
||||
Text(d.createdAt.formatted(date: .omitted, time: .shortened))
|
||||
.font(.system(size: 11, design: .monospaced))
|
||||
.font(.tjScaled( 11, design: .monospaced))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
Spacer()
|
||||
}
|
||||
@@ -331,23 +278,19 @@ struct DayDetailSheet: View {
|
||||
.tjCard(bordered: true)
|
||||
}
|
||||
|
||||
// MARK: - empty
|
||||
|
||||
private var emptyState: some View {
|
||||
VStack(spacing: 12) {
|
||||
Spacer(minLength: 16)
|
||||
TjPlaceholder(label: "这一天还没有记录")
|
||||
.frame(width: 220, height: 120)
|
||||
VStack(spacing: 8) {
|
||||
TjPlaceholder(label: String(appLoc: "这一天还没有记录"))
|
||||
.frame(height: 90)
|
||||
.frame(maxWidth: 240)
|
||||
Text("点底部 + 号可以补一条")
|
||||
.font(.system(size: 12))
|
||||
.font(.tjScaled( 11))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
Spacer()
|
||||
}
|
||||
.padding(.vertical, 12)
|
||||
.frame(maxWidth: .infinity)
|
||||
}
|
||||
|
||||
// MARK: - utils
|
||||
|
||||
private func severityColor(_ value: Int) -> Color {
|
||||
switch value {
|
||||
case 1, 2: return Tj.Palette.leaf
|
||||
@@ -369,22 +312,65 @@ struct DayDetailSheet: View {
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Sheet wrapper(保留;现在 TrendsView 走 inline,但其他入口可能用)
|
||||
|
||||
struct DayDetailSheet: View {
|
||||
let date: Date
|
||||
let indicators: [Indicator]
|
||||
let reports: [Report]
|
||||
let diaries: [DiaryEntry]
|
||||
let symptoms: [Symptom]
|
||||
|
||||
var body: some View {
|
||||
VStack(spacing: 0) {
|
||||
Capsule()
|
||||
.fill(Tj.Palette.line)
|
||||
.frame(width: 40, height: 4)
|
||||
.padding(.top, 10)
|
||||
.padding(.bottom, 14)
|
||||
ScrollView(showsIndicators: false) {
|
||||
DayDetailContent(
|
||||
date: date,
|
||||
indicators: indicators,
|
||||
reports: reports,
|
||||
diaries: diaries,
|
||||
symptoms: symptoms,
|
||||
showHeader: true
|
||||
)
|
||||
.padding(.horizontal, 20)
|
||||
.padding(.bottom, 24)
|
||||
}
|
||||
}
|
||||
.background(
|
||||
Tj.Palette.sand
|
||||
.clipShape(RoundedRectangle(cornerRadius: Tj.Radius.xl, style: .continuous))
|
||||
.ignoresSafeArea(edges: .bottom)
|
||||
)
|
||||
.presentationDetents([.medium, .large])
|
||||
.presentationDragIndicator(.hidden)
|
||||
.presentationBackground(Tj.Palette.sand)
|
||||
.presentationCornerRadius(Tj.Radius.xl)
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - SymptomDayState
|
||||
|
||||
enum SymptomDayState {
|
||||
case startedToday, ongoing, endedToday
|
||||
|
||||
var subtitle: String {
|
||||
switch self {
|
||||
case .startedToday: return "今天开始"
|
||||
case .ongoing: return "进行中"
|
||||
case .endedToday: return "今天结束"
|
||||
case .startedToday: return String(appLoc: "今天开始")
|
||||
case .ongoing: return String(appLoc: "进行中")
|
||||
case .endedToday: return String(appLoc: "今天结束")
|
||||
}
|
||||
}
|
||||
|
||||
var badge: String {
|
||||
switch self {
|
||||
case .startedToday: return "开始"
|
||||
case .ongoing: return "持续"
|
||||
case .endedToday: return "结束"
|
||||
case .startedToday: return String(appLoc: "开始")
|
||||
case .ongoing: return String(appLoc: "持续")
|
||||
case .endedToday: return String(appLoc: "结束")
|
||||
}
|
||||
}
|
||||
|
||||
|
||||