diff --git a/MyQrCode/ScannerView/ScannerView.swift b/MyQrCode/ScannerView/ScannerView.swift index 294cf02..7fc7bf7 100644 --- a/MyQrCode/ScannerView/ScannerView.swift +++ b/MyQrCode/ScannerView/ScannerView.swift @@ -9,7 +9,6 @@ import QRCode struct ScannerView: View { @StateObject private var scannerViewModel = ScannerViewModel() @State private var showPreviewPause = false - @State private var selectedScanningStyle: ScanningLineStyle = .modern @State private var screenOrientation = UIDevice.current.orientation @State private var previewLayer: AVCaptureVideoPreviewLayer? @State private var navigateToDetail = false @@ -31,7 +30,6 @@ struct ScannerView: View { // 扫描界面覆盖层 ScanningOverlayView( showPreviewPause: showPreviewPause, - selectedStyle: $selectedScanningStyle, detectedCodesCount: scannerViewModel.detectedCodes.count, onImageDecode: { showImagePicker = true } ) diff --git a/MyQrCode/ScannerView/ScanningOverlayView.swift b/MyQrCode/ScannerView/ScanningOverlayView.swift index 06af714..1036d95 100644 --- a/MyQrCode/ScannerView/ScanningOverlayView.swift +++ b/MyQrCode/ScannerView/ScanningOverlayView.swift @@ -4,7 +4,6 @@ import AudioToolbox // MARK: - 扫描界面覆盖层 struct ScanningOverlayView: View { let showPreviewPause: Bool - @Binding var selectedStyle: ScanningLineStyle let detectedCodesCount: Int let onImageDecode: () -> Void @@ -14,7 +13,7 @@ struct ScanningOverlayView: View { // 扫描线组件 if !showPreviewPause { - ScanningLineView(style: selectedStyle) + ScanningLineView(style: .modern) } // 提示文本 @@ -28,7 +27,6 @@ struct ScanningOverlayView: View { // 底部按钮区域 ScanningBottomButtonsView( showPreviewPause: showPreviewPause, - selectedStyle: $selectedStyle, onImageDecode: onImageDecode ) } @@ -70,16 +68,10 @@ struct ScanningInstructionView: View { // MARK: - 扫描底部按钮视图 struct ScanningBottomButtonsView: View { let showPreviewPause: Bool - @Binding var selectedStyle: ScanningLineStyle let onImageDecode: () -> Void var body: some View { VStack(spacing: 15) { - // 扫描线样式选择器 - if !showPreviewPause { - ScanningStyleSelectorView(selectedStyle: $selectedStyle) - } - // 图片解码按钮 if !showPreviewPause { Button(action: { @@ -98,10 +90,10 @@ struct ScanningBottomButtonsView: View { .padding(.vertical, 10) .background( RoundedRectangle(cornerRadius: 12) - .fill(Color.blue.opacity(0.8)) + .fill(Color.blue.opacity(0.3)) .overlay( RoundedRectangle(cornerRadius: 12) - .stroke(Color.blue, lineWidth: 1) + .stroke(Color.blue.opacity(0.6), lineWidth: 1) ) ) }