```
feat: 添加拍药盒功能和语音直达入口 - 实现拍药盒扫描流程,支持本地OCR识别药品信息 - 在日记页面添加拍药盒和记症状的三选一入口 - 优化按钮点击区域,确保符合苹果HIG最小命中区标准 - 添加用药记录到时间线的独立分类显示 - 实现长按+号语音直达功能,支持语音意图分类跳转 - 更新项目配置文件,启用代码分析和死代码剥离选项 - 增加多项本地化字符串支持新功能 ```
This commit is contained in:
@@ -5,8 +5,15 @@ enum RecordKind: String, Identifiable, CaseIterable {
|
||||
var id: String { rawValue }
|
||||
|
||||
/// RecordSheet 列表的展示顺序(从上到下)。与 enum 声明序解耦,改顺序只动这里。
|
||||
/// 注:`.quick`(指标速记)已并入 `.indicator`(记录指标)内的「拍照识别」,不再单列。
|
||||
static let displayOrder: [RecordKind] = [.diary, .reminder, .symptom, .indicator, .healthExport, .archive]
|
||||
/// 注:`.quick`(指标速记)已并入 `.indicator`(记录指标)内的「拍照识别」;
|
||||
/// `.symptom`(记录症状)与拍药盒一起并入 `.diary`(健康日记)顶部三选一,不再单列。
|
||||
static let displayOrder: [RecordKind] = [.diary, .reminder, .indicator, .healthExport, .archive]
|
||||
|
||||
/// 健康日记行的功能提示 pill(代替 subtitle,让"症状/药盒在日记里"一眼可见)。
|
||||
/// 计算属性:每次按当前语言解析,语言切换即时更新(同 ProfileEditView 的 presets 约定)。
|
||||
static var diaryFeaturePills: [String] {
|
||||
[String(appLoc: "写日记"), String(appLoc: "拍药盒"), String(appLoc: "记症状")]
|
||||
}
|
||||
|
||||
var title: String {
|
||||
switch self {
|
||||
@@ -25,7 +32,7 @@ enum RecordKind: String, Identifiable, CaseIterable {
|
||||
case .indicator: return String(appLoc: "手动填写,或拍照自动识别")
|
||||
case .healthExport: return String(appLoc: "多轮问答后生成给医生看的整理报告")
|
||||
case .archive: return String(appLoc: "完整保存整份报告(可多页)")
|
||||
case .diary: return String(appLoc: "记录身体状态、用药、感受 · 可让 AI 辅助")
|
||||
case .diary: return String(appLoc: "写日记或拍药盒记录用药 · 可让 AI 辅助")
|
||||
case .symptom: return String(appLoc: "开始一个持续症状,结束时再点结束")
|
||||
case .reminder: return String(appLoc: "管理用药、复查、监测的周期提醒")
|
||||
}
|
||||
@@ -93,13 +100,27 @@ struct RecordSheet: View {
|
||||
}
|
||||
.frame(width: 44, height: 44)
|
||||
|
||||
VStack(alignment: .leading, spacing: 2) {
|
||||
VStack(alignment: .leading, spacing: 3) {
|
||||
Text(kind.title)
|
||||
.font(.tjScaled( 15, weight: .semibold))
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
Text(kind.subtitle)
|
||||
.font(.tjScaled( 12))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
if kind == .diary {
|
||||
// 醒目提示:症状/药盒已并入日记,用 pill 直接点名
|
||||
HStack(spacing: 5) {
|
||||
ForEach(RecordKind.diaryFeaturePills, id: \.self) { pill in
|
||||
Text(pill)
|
||||
.font(.tjScaled( 10, weight: .medium))
|
||||
.foregroundStyle(Tj.Palette.ink)
|
||||
.padding(.horizontal, 7)
|
||||
.padding(.vertical, 2)
|
||||
.background(Capsule().fill(Tj.Palette.sand2))
|
||||
}
|
||||
}
|
||||
} else {
|
||||
Text(kind.subtitle)
|
||||
.font(.tjScaled( 12))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
}
|
||||
}
|
||||
Spacer()
|
||||
Image(systemName: "chevron.right")
|
||||
@@ -111,6 +132,17 @@ struct RecordSheet: View {
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
}
|
||||
|
||||
// 语音直达提示:长按 + 即可说话,不用翻菜单
|
||||
HStack(spacing: 5) {
|
||||
Image(systemName: "mic.fill")
|
||||
.font(.tjScaled( 10))
|
||||
Text("下次试试长按 + ,直接说出想记的内容")
|
||||
.font(.tjScaled( 11))
|
||||
}
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
.frame(maxWidth: .infinity)
|
||||
.padding(.top, 6)
|
||||
}
|
||||
.padding(.bottom, 22)
|
||||
}
|
||||
|
||||
276
康康/Features/Record/VoiceCommandSheet.swift
Normal file
276
康康/Features/Record/VoiceCommandSheet.swift
Normal file
@@ -0,0 +1,276 @@
|
||||
import SwiftUI
|
||||
import UIKit
|
||||
|
||||
/// 「长按 + 语音直达」面板:开口说想记什么 → 端侧转写(SpeechDictationService)
|
||||
/// → LLM 意图分类(VoiceIntentService)→ 回调 RootView 打开对应新建入口。
|
||||
///
|
||||
/// 状态机:
|
||||
/// ```
|
||||
/// requesting(权限) → recording(实时字幕) → classifying → onResolve(intent) 关闭
|
||||
/// │ 拒绝 → denied │ 没听到/没听懂 → failed(再说一次 / 打开菜单)
|
||||
/// ```
|
||||
/// 全程本机:转写 requiresOnDeviceRecognition,分类走端侧 LLM。
|
||||
struct VoiceCommandSheet: View {
|
||||
/// 识别成功:RootView 负责关闭本 sheet 并路由。
|
||||
let onResolve: (VoiceIntent) -> Void
|
||||
/// 兜底:打开普通新建菜单(RecordSheet)。
|
||||
let onOpenMenu: () -> Void
|
||||
@Environment(\.dismiss) private var dismiss
|
||||
|
||||
enum Phase: Equatable {
|
||||
case requesting
|
||||
case denied
|
||||
case recording
|
||||
case classifying
|
||||
case failed(message: String)
|
||||
}
|
||||
|
||||
@State private var phase: Phase = .requesting
|
||||
@State private var transcript = ""
|
||||
@State private var seconds = 0
|
||||
/// @State 保证视图身份期内实例唯一(同 DiaryQuickSheet 的注释,防止重建后麦克风悬挂)。
|
||||
@State private var dictation = SpeechDictationService()
|
||||
@State private var ticker: Task<Void, Never>?
|
||||
|
||||
/// 录音超过 20s 自动结束:语音直达说的都是短句,长录是忘了点完成。
|
||||
private let maxSeconds = 20
|
||||
|
||||
var body: some View {
|
||||
VStack(spacing: 0) {
|
||||
Capsule()
|
||||
.fill(Tj.Palette.line)
|
||||
.frame(width: 40, height: 4)
|
||||
.padding(.top, 10)
|
||||
.padding(.bottom, 16)
|
||||
|
||||
HStack {
|
||||
VStack(alignment: .leading, spacing: 2) {
|
||||
Text("说出想记的内容")
|
||||
.font(.tjH2())
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
Text("比如:记一下血压 / 我头疼 / 拍个药盒")
|
||||
.font(.tjScaled( 11))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
}
|
||||
Spacer()
|
||||
Text("全程本机")
|
||||
.font(.tjScaled( 12))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
}
|
||||
.padding(.horizontal, 20)
|
||||
.padding(.bottom, 16)
|
||||
|
||||
content
|
||||
.frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top)
|
||||
.padding(.horizontal, 20)
|
||||
|
||||
buttons
|
||||
.padding(.horizontal, 20)
|
||||
.padding(.vertical, 14)
|
||||
}
|
||||
.background(
|
||||
Tj.Palette.sand
|
||||
.clipShape(RoundedRectangle(cornerRadius: Tj.Radius.xl, style: .continuous))
|
||||
.ignoresSafeArea(edges: .bottom)
|
||||
)
|
||||
.presentationDetents([.fraction(0.5)])
|
||||
.presentationDragIndicator(.hidden)
|
||||
.presentationBackground(Tj.Palette.sand)
|
||||
.presentationCornerRadius(Tj.Radius.xl)
|
||||
.task { await begin() }
|
||||
.onDisappear {
|
||||
ticker?.cancel()
|
||||
dictation.abort()
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - 分阶段内容
|
||||
|
||||
@ViewBuilder
|
||||
private var content: some View {
|
||||
switch phase {
|
||||
case .requesting:
|
||||
ProgressView().tint(Tj.Palette.ink)
|
||||
.frame(maxWidth: .infinity)
|
||||
.padding(.top, 30)
|
||||
|
||||
case .denied:
|
||||
VStack(spacing: 10) {
|
||||
Image(systemName: "mic.slash")
|
||||
.font(.tjScaled( 30))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
Text("需要麦克风与语音识别权限")
|
||||
.font(.tjScaled( 14, weight: .semibold))
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
Text("语音和文字都只在本机处理,不会上传。")
|
||||
.font(.tjScaled( 12))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
Button("前往设置") {
|
||||
if let url = URL(string: UIApplication.openSettingsURLString) {
|
||||
UIApplication.shared.open(url)
|
||||
}
|
||||
}
|
||||
.font(.tjScaled( 13, weight: .semibold))
|
||||
.foregroundStyle(Tj.Palette.ink)
|
||||
}
|
||||
.frame(maxWidth: .infinity)
|
||||
.padding(.top, 16)
|
||||
|
||||
case .recording:
|
||||
VStack(spacing: 14) {
|
||||
HStack(spacing: 8) {
|
||||
Circle()
|
||||
.fill(Tj.Palette.brick)
|
||||
.frame(width: 8, height: 8)
|
||||
Text("正在听 · \(seconds)s")
|
||||
.font(.tjScaled( 12, weight: .semibold))
|
||||
.foregroundStyle(Tj.Palette.brick)
|
||||
}
|
||||
transcriptBox(placeholder: String(appLoc: "请开口说话…"))
|
||||
}
|
||||
|
||||
case .classifying:
|
||||
VStack(spacing: 14) {
|
||||
HStack(spacing: 8) {
|
||||
ProgressView().tint(Tj.Palette.ink)
|
||||
Text("正在理解…")
|
||||
.font(.tjScaled( 12, weight: .semibold))
|
||||
.foregroundStyle(Tj.Palette.text2)
|
||||
}
|
||||
transcriptBox(placeholder: "")
|
||||
}
|
||||
|
||||
case .failed(let message):
|
||||
VStack(spacing: 10) {
|
||||
Image(systemName: "questionmark.bubble")
|
||||
.font(.tjScaled( 28))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
Text(message)
|
||||
.font(.tjScaled( 13))
|
||||
.foregroundStyle(Tj.Palette.text2)
|
||||
.multilineTextAlignment(.center)
|
||||
if !transcript.isEmpty {
|
||||
Text("“\(transcript)”")
|
||||
.font(.tjScaled( 12))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
.lineLimit(2)
|
||||
}
|
||||
}
|
||||
.frame(maxWidth: .infinity)
|
||||
.padding(.top, 12)
|
||||
}
|
||||
}
|
||||
|
||||
private func transcriptBox(placeholder: String) -> some View {
|
||||
ScrollView(showsIndicators: false) {
|
||||
Text(transcript.isEmpty ? placeholder : transcript)
|
||||
.font(.tjScaled( 15))
|
||||
.foregroundStyle(transcript.isEmpty ? Tj.Palette.text3 : Tj.Palette.text)
|
||||
.frame(maxWidth: .infinity, alignment: .leading)
|
||||
}
|
||||
.frame(minHeight: 64, maxHeight: 110)
|
||||
.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)
|
||||
)
|
||||
}
|
||||
|
||||
// MARK: - 底部按钮
|
||||
|
||||
@ViewBuilder
|
||||
private var buttons: some View {
|
||||
switch phase {
|
||||
case .recording:
|
||||
HStack(spacing: 12) {
|
||||
Button("取消") { dismiss() }
|
||||
.buttonStyle(TjGhostButton(height: 44, fontSize: 15, horizontalPadding: 18))
|
||||
Button("说完了") { finishRecording() }
|
||||
.buttonStyle(TjPrimaryButton(height: 44, fontSize: 15, horizontalPadding: 18))
|
||||
}
|
||||
case .failed:
|
||||
HStack(spacing: 12) {
|
||||
Button("打开新建菜单") { onOpenMenu() }
|
||||
.buttonStyle(TjGhostButton(height: 44, fontSize: 14, horizontalPadding: 14))
|
||||
Button("再说一次") { Task { await begin() } }
|
||||
.buttonStyle(TjPrimaryButton(height: 44, fontSize: 14, horizontalPadding: 18))
|
||||
}
|
||||
case .denied:
|
||||
Button("取消") { dismiss() }
|
||||
.buttonStyle(TjGhostButton(height: 44, fontSize: 15, horizontalPadding: 18))
|
||||
case .requesting, .classifying:
|
||||
Button("取消") { dismiss() }
|
||||
.buttonStyle(TjGhostButton(height: 44, fontSize: 15, horizontalPadding: 18))
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - 流程
|
||||
|
||||
private func begin() async {
|
||||
ticker?.cancel()
|
||||
transcript = ""
|
||||
seconds = 0
|
||||
guard SpeechDictationService.isAvailable else {
|
||||
phase = .failed(message: String(appLoc: "本机不支持端侧语音识别,试试下面的新建菜单"))
|
||||
return
|
||||
}
|
||||
phase = .requesting
|
||||
guard await dictation.requestAuthorization() else {
|
||||
phase = .denied
|
||||
return
|
||||
}
|
||||
do {
|
||||
try dictation.start { transcript = $0 }
|
||||
phase = .recording
|
||||
startTicker()
|
||||
} catch {
|
||||
phase = .failed(message: error.localizedDescription)
|
||||
}
|
||||
}
|
||||
|
||||
private func startTicker() {
|
||||
ticker = Task { @MainActor in
|
||||
while !Task.isCancelled {
|
||||
try? await Task.sleep(nanoseconds: 1_000_000_000)
|
||||
guard phase == .recording else { return }
|
||||
seconds += 1
|
||||
if seconds >= maxSeconds {
|
||||
finishRecording()
|
||||
return
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private func finishRecording() {
|
||||
guard phase == .recording else { return }
|
||||
ticker?.cancel()
|
||||
phase = .classifying
|
||||
Task {
|
||||
let text = await dictation.stop()
|
||||
transcript = text
|
||||
let trimmed = text.trimmingCharacters(in: .whitespacesAndNewlines)
|
||||
guard !trimmed.isEmpty else {
|
||||
phase = .failed(message: String(appLoc: "没听到内容,再试一次?"))
|
||||
return
|
||||
}
|
||||
if let intent = await VoiceIntentService.classify(trimmed) {
|
||||
onResolve(intent)
|
||||
} else {
|
||||
phase = .failed(message: String(appLoc: "没听懂想记什么,再说一次,或直接选菜单"))
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#Preview {
|
||||
Text("bg")
|
||||
.sheet(isPresented: .constant(true)) {
|
||||
VoiceCommandSheet(onResolve: { print($0) }, onOpenMenu: {})
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user