```
feat(AI): 统一多模态模型架构,整合文本和视觉推理路径 - 将文本生成和VL(图→文)功能合并到单一的Qwen3.5-4B多模态MNN模型 - 移除独立的Qwen3-VL-4B模型依赖,MLX VL改为使用.llm的多模态模型 - 更新ModelKind枚举,新增userFacing集合用于面向用户展示 - MNN后端现在同时支持文本和视觉任务,模拟器回退到MLX refactor(models): 模型管理和界面调整以适应新的多模态架构 - 更新模型管理界面,只显示统一的Qwen3.5-4B(MNN)模型给用户 - 修改就绪状态检查逻辑,使用ModelKind.userFacing替代allCases - 更新模型文件清单,从Qwen3.5-2B升级到Qwen3.5-4B-4bit - 调整模型管理页面UI,突出MNN+SME2端侧加速功能 feat(camera): 添加拍照识别引擎切换功能 - 实现双路径拍照识别:Apple Vision OCR + 文本模型 和 Qwen3-VL直接识别 - 添加预处理逻辑,优化Qwen3-VL对窄长区域图片的识别效果 - 在模型管理页面添加拍照识别引擎选择组件 - 提供用户界面选项,在两种识别方式间切换 style(ui): 优化输入框样式和颜色主题一致性 - 为指标快速表单添加浅色主题偏好 - 统一所有文本输入框的颜色样式(theme) - 创建EntryInputField组件,替换原有的单行输入+按钮模式 - 实现聊天框风格的条目输入,支持多行自适应和圆形发送按钮 fix(build): 修正Xcode项目配置中的重复框架搜索路径 - 清理project.pbxproj中重复的FRAMEWORK_SEARCH_PATHS配置 - 重新排列Swift桥接头文件配置确保正确引用 - 修复因路径配置重复导致的编译警告问题 test: 增加区域图片预处理和模型清单测试覆盖 - 添加RegionImageCropper.prepareForQwenVL的单元测试 - 验证宽而矮图片的放大和填充逻辑 - 更新ModelManifestTests中的字节数预期值以匹配新模型 - 修正OCRService中VNRecognizedTextObservation类型的处理 ```
This commit is contained in:
@@ -152,10 +152,10 @@ struct MeView: View {
|
||||
|
||||
private var modelDetail: String {
|
||||
let states = downloadService.states
|
||||
if ModelKind.allCases.allSatisfy({ states[$0]?.phase == .ready }) { return String(appLoc: "已就绪") }
|
||||
if ModelKind.userFacing.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 ? String(appLoc: "未下载") : String(appLoc: "\(readyCount)/\(ModelKind.allCases.count) 就绪")
|
||||
let readyCount = ModelKind.userFacing.filter { states[$0]?.phase == .ready }.count
|
||||
return readyCount == 0 ? String(appLoc: "未下载") : String(appLoc: "\(readyCount)/\(ModelKind.userFacing.count) 就绪")
|
||||
}
|
||||
|
||||
private var inferenceEngineCard: some View {
|
||||
|
||||
@@ -10,25 +10,29 @@ struct ModelManagementView: View {
|
||||
@State private var showCellularConfirm = false
|
||||
@State private var showImporter = false
|
||||
@State private var importError: String?
|
||||
@AppStorage(QuickRegionRecognitionEngine.storageKey)
|
||||
private var quickRegionEngineRaw = QuickRegionRecognitionEngine.defaultValue.rawValue
|
||||
|
||||
private let monitor = NWPathMonitor()
|
||||
private let monitorQueue = DispatchQueue(label: "kk.netmonitor")
|
||||
|
||||
private var allReady: Bool {
|
||||
ModelKind.allCases.allSatisfy { service.states[$0]?.phase == .ready }
|
||||
ModelKind.userFacing.allSatisfy { service.states[$0]?.phase == .ready }
|
||||
}
|
||||
|
||||
var body: some View {
|
||||
ScrollView {
|
||||
VStack(spacing: 14) {
|
||||
ForEach(ModelKind.allCases, id: \.self) { kind in
|
||||
ForEach(ModelKind.userFacing, id: \.self) { kind in
|
||||
modelCard(kind)
|
||||
}
|
||||
|
||||
recognitionEngineCard
|
||||
|
||||
actionButtons
|
||||
.padding(.top, 4)
|
||||
|
||||
if service.states[.llm]?.phase == .ready {
|
||||
if service.states[.mnnLLM]?.phase == .ready {
|
||||
NavigationLink {
|
||||
ModelSelfTestView()
|
||||
} label: {
|
||||
@@ -76,6 +80,46 @@ struct ModelManagementView: View {
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - 拍照识别引擎
|
||||
|
||||
private var selectedRecognitionEngine: QuickRegionRecognitionEngine {
|
||||
QuickRegionRecognitionEngine(storedValue: quickRegionEngineRaw)
|
||||
}
|
||||
|
||||
private var recognitionEngineCard: some View {
|
||||
VStack(alignment: .leading, spacing: 12) {
|
||||
HStack(alignment: .top, spacing: 10) {
|
||||
ZStack {
|
||||
Circle().fill(Tj.Palette.sand2)
|
||||
Image(systemName: "camera.metering.center.weighted")
|
||||
.font(.tjScaled( 18))
|
||||
.foregroundStyle(Tj.Palette.text2)
|
||||
}
|
||||
.frame(width: 38, height: 38)
|
||||
|
||||
VStack(alignment: .leading, spacing: 3) {
|
||||
Text("异常项拍照识别")
|
||||
.font(.tjScaled( 15, weight: .semibold))
|
||||
.foregroundStyle(Tj.Palette.text)
|
||||
Text(selectedRecognitionEngine.detail)
|
||||
.font(.tjScaled( 12))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
}
|
||||
Spacer()
|
||||
}
|
||||
|
||||
Picker("异常项拍照识别", selection: $quickRegionEngineRaw) {
|
||||
ForEach(QuickRegionRecognitionEngine.allCases) { engine in
|
||||
Text(engine.title).tag(engine.rawValue)
|
||||
}
|
||||
}
|
||||
.pickerStyle(.segmented)
|
||||
}
|
||||
.padding(14)
|
||||
.frame(maxWidth: .infinity, alignment: .leading)
|
||||
.tjCard()
|
||||
}
|
||||
|
||||
// MARK: - 模型卡片
|
||||
|
||||
private func modelCard(_ kind: ModelKind) -> some View {
|
||||
@@ -146,7 +190,7 @@ struct ModelManagementView: View {
|
||||
private var actionButtons: some View {
|
||||
if service.isAnyDownloading {
|
||||
Button {
|
||||
for kind in ModelKind.allCases { service.cancel(kind) }
|
||||
for kind in ModelKind.userFacing { service.cancel(kind) }
|
||||
} label: {
|
||||
Text("暂停下载").frame(maxWidth: .infinity)
|
||||
}
|
||||
@@ -154,7 +198,7 @@ struct ModelManagementView: View {
|
||||
} else if allReady {
|
||||
HStack(spacing: 6) {
|
||||
Image(systemName: "checkmark.seal.fill")
|
||||
Text("两个模型都已就绪")
|
||||
Text("Qwen3.5-4B 已就绪")
|
||||
}
|
||||
.font(.tjScaled( 13, weight: .semibold))
|
||||
.foregroundStyle(Tj.Palette.leaf)
|
||||
@@ -198,8 +242,8 @@ struct ModelManagementView: View {
|
||||
defer { if scoped { folder.stopAccessingSecurityScopedResource() } }
|
||||
|
||||
let name = folder.lastPathComponent
|
||||
guard let kind = ModelKind.allCases.first(where: { $0.rawValue == name }) else {
|
||||
let names = ModelKind.allCases.map(\.rawValue).joined(separator: " 或 ")
|
||||
guard let kind = ModelKind.userFacing.first(where: { $0.rawValue == name }) else {
|
||||
let names = ModelKind.userFacing.map(\.rawValue).joined(separator: " 或 ")
|
||||
importError = String(appLoc: "请选择名为 \(names) 的文件夹")
|
||||
return
|
||||
}
|
||||
@@ -213,14 +257,14 @@ struct ModelManagementView: View {
|
||||
// MARK: - 辅助
|
||||
|
||||
private var totalAllBytes: Int {
|
||||
ModelKind.allCases.reduce(0) { $0 + ModelManifest.totalBytes(for: $1) }
|
||||
ModelKind.userFacing.reduce(0) { $0 + ModelManifest.totalBytes(for: $1) }
|
||||
}
|
||||
|
||||
private func subtitle(_ kind: ModelKind) -> String {
|
||||
switch kind {
|
||||
case .llm: return String(appLoc: "文本解读 · 趋势 / 问答(MLX 兜底)")
|
||||
case .vl: return String(appLoc: "拍照识别报告 → 结构化指标")
|
||||
case .mnnLLM: return String(appLoc: "文本解读 · MNN + SME2 端侧加速")
|
||||
case .mnnLLM: return String(appLoc: "文本解读 + 拍照识别 · MNN + SME2 端侧加速")
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user