Files
Commilitia-Drop/ios/CDrop/Sources/ScannerView.swift
T
admin 7f6e35908c iOS 界面字体回退系统原生 + iPad 适配 + 登录列宽
- 移除自定义 UI 字体,界面统一系统原生:删 BrandFonts.swift(Orbit/Maple woff2 运行期 CTFontManager 注册 + UIKit 外观代理)+ AppDelegate 的 register 调用 + CDropApp 全局 .environment(\.font, .oBody);9 视图 .font(.o语义) → .font(.语义) 系统语义(日志 LogView 消息行本就 .caption.monospaced() 原生等宽);删 Sources/Fonts/(Orbit/Maple woff2 ~20MB)。仅留品牌字标 Fredoka(logo Wordmark),Justfile ios-fonts 改 Fredoka-only、.gitignore 收窄、新增 Shared/Fonts/README.md
- iPad 适配:RootView TabView 加 .tabViewStyle(.sidebarAdaptable)(iPad 常规宽度侧边栏 / iPhone 底部标签栏)+ ConversationView 消息线程 maxWidth 680 居中;project.yml 补方向键 UISupportedInterfaceOrientations(iPhone 竖 + 横)/ ~ipad(全 4 向),消除 iPad 多任务方向构建告警
- 登录页内容约束 maxWidth 420 居中,避免 iPad 宽屏主登录按钮 / 二维码区横向拉满(iPhone 不受影响)
- 文档:ios/PLAN.md §11.2 改系统原生字体 + 新增 §13 iPad;ios/PARITY.md 字体分叉条目回退 + 导航条目加 iPad + 2026-07-07 漂移行
- 已装 iPhone 15 Pro C + iPad Pro 13" M4 双端、用户确认
2026-07-07 20:49:06 +08:00

166 lines
5.5 KiB
Swift
Raw Blame History

This file contains ambiguous Unicode characters
This file contains Unicode characters that might be confused with other characters. If you think that this is intentional, you can safely ignore this warning. Use the Escape button to reveal them.
import AVFoundation
import SwiftUI
import VisionKit
// #8/link?r=&c=
// requestId / code VisionKit DataScannerViewController UI
// AVFoundation isSupported
struct ScanSheet: View
{
// (requestId, code)
let onScanned: (String, String) -> Void
@Environment(\.dismiss) private var dismiss
// niltrue/false /
@State private var authorized: Bool?
@State private var invalid = false
var body: some View
{
NavigationStack
{
content
.navigationTitle(t("ios.scan.title"))
.navigationBarTitleDisplayMode(.inline)
.toolbar
{
ToolbarItem(placement: .topBarLeading)
{
Button(t("common.cancel")) { dismiss() }
}
}
}
.task { await requestCamera() }
}
@ViewBuilder
private var content: some View
{
if authorized == nil
{
ProgressView()
}
else if authorized == true, DataScannerViewController.isSupported
{
scanner
}
else
{
ContentUnavailableView(t("ios.scan.cameraDenied"), systemImage: "camera.fill")
}
}
private var scanner: some View
{
ZStack(alignment: .bottom)
{
LoginScannerView(onScan: handleScan)
VStack(spacing: 8)
{
if invalid
{
Text(t("ios.scan.invalid"))
.font(.callout)
.padding(.vertical, 8)
.padding(.horizontal, 14)
.background(.red.opacity(0.85), in: Capsule())
.foregroundStyle(.white)
}
Text(t("ios.scan.hint"))
.font(.footnote)
.multilineTextAlignment(.center)
.padding(.vertical, 8)
.padding(.horizontal, 14)
.background(.black.opacity(0.5), in: Capsule())
.foregroundStyle(.white)
}
.padding(.bottom, 40)
}
.ignoresSafeArea(edges: .bottom)
}
private func requestCamera() async
{
switch AVCaptureDevice.authorizationStatus(for: .video)
{
case .authorized:
authorized = true
case .notDetermined:
authorized = await AVCaptureDevice.requestAccess(for: .video)
default:
authorized = false
}
}
//
private func handleScan(_ raw: String)
{
guard let parsed = parseLinkApprovalUrl(raw) else
{
invalid = true
return
}
onScanned(parsed.requestId, parsed.code)
dismiss()
}
}
// /link?r=&c= /link r/c origin r/c
// 404 web net/qr.ts
private func parseLinkApprovalUrl(_ raw: String) -> (requestId: String, code: String)?
{
guard let comp = URLComponents(string: raw), comp.path == "/link" else { return nil }
let items = comp.queryItems ?? []
guard let r = items.first(where: { $0.name == "r" })?.value, !r.isEmpty,
let c = items.first(where: { $0.name == "c" })?.value, !c.isEmpty
else { return nil }
return (r, c)
}
// DataScannerViewController SwiftUI QR done
private struct LoginScannerView: UIViewControllerRepresentable
{
let onScan: (String) -> Void
func makeUIViewController(context: Context) -> DataScannerViewController
{
let scanner = DataScannerViewController(
recognizedDataTypes: [ .barcode(symbologies: [ .qr ]) ],
qualityLevel: .balanced,
isHighFrameRateTrackingEnabled: false,
isHighlightingEnabled: true)
scanner.delegate = context.coordinator
return scanner
}
func updateUIViewController(_ vc: DataScannerViewController, context: Context)
{
try? vc.startScanning()
}
func makeCoordinator() -> Coordinator { Coordinator(onScan: onScan) }
final class Coordinator: NSObject, DataScannerViewControllerDelegate
{
private let onScan: (String) -> Void
private var done = false
init(onScan: @escaping (String) -> Void) { self.onScan = onScan }
func dataScanner(_ scanner: DataScannerViewController,
didAdd addedItems: [RecognizedItem],
allItems: [RecognizedItem])
{
guard !done else { return }
for item in addedItems
{
if case let .barcode(barcode) = item, let str = barcode.payloadStringValue
{
done = true
onScan(str)
return
}
}
}
}
}