Skip to content

修复横屏时扫码需要竖着扫的问题 #239

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

修复横屏时扫码需要竖着扫的问题 #239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c233213
修复横屏时扫码需要竖着扫的问题
Jul 20, 2022
d4ee58c
优化相机获取，选择可持续聚焦的相机
Jul 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 13 additions & 7 deletions LBXScan/LBXZXing/LBXZXCapture.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,12 +224,14 @@ - (int)front {
}

- (BOOL)hasFront {
NSArray *devices = [AVCaptureDevice devicesWithMediaType:AVMediaTypeVideo];
AVCaptureDeviceDiscoverySession *session = [AVCaptureDeviceDiscoverySession discoverySessionWithDeviceTypes:@[AVCaptureDeviceTypeBuiltInWideAngleCamera] mediaType:AVMediaTypeVideo position:AVCaptureDevicePositionFront];
NSArray *devices = session.devices;
return [devices count] > 1;
}

- (BOOL)hasBack {
NSArray *devices = [AVCaptureDevice devicesWithMediaType:AVMediaTypeVideo];
AVCaptureDeviceDiscoverySession *session = [AVCaptureDeviceDiscoverySession discoverySessionWithDeviceTypes:@[AVCaptureDeviceTypeBuiltInWideAngleCamera] mediaType:AVMediaTypeVideo position:AVCaptureDevicePositionBack];
NSArray *devices = session.devices;
return [devices count] > 0;
}

Expand Down Expand Up @@ -553,9 +555,14 @@ - (AVCaptureDevice *)device {
}

AVCaptureDevice *zxd = nil;

NSArray *devices = [AVCaptureDevice devicesWithMediaType:AVMediaTypeVideo];

NSArray *devices = nil;
if (@available(iOS 13.0, *)) {
AVCaptureDeviceDiscoverySession *session = [AVCaptureDeviceDiscoverySession discoverySessionWithDeviceTypes:@[AVCaptureDeviceTypeBuiltInUltraWideCamera, AVCaptureDeviceTypeBuiltInWideAngleCamera] mediaType:AVMediaTypeVideo position:AVCaptureDevicePositionUnspecified];
devices = session.devices;
} else {
AVCaptureDeviceDiscoverySession *session = [AVCaptureDeviceDiscoverySession discoverySessionWithDeviceTypes:@[AVCaptureDeviceTypeBuiltInWideAngleCamera] mediaType:AVMediaTypeVideo position:AVCaptureDevicePositionUnspecified];
devices = session.devices;
}
if ([devices count] > 0) {
if (self.captureDeviceIndex == -1) {
AVCaptureDevicePosition position = AVCaptureDevicePositionBack;
Expand All @@ -565,7 +572,7 @@ - (AVCaptureDevice *)device {

for (unsigned int i = 0; i < [devices count]; ++i) {
AVCaptureDevice *dev = [devices objectAtIndex:i];
if (dev.position == position) {
if (dev.position == position && [dev isFocusModeSupported:AVCaptureFocusModeContinuousAutoFocus]) {
self.captureDeviceIndex = i;
zxd = dev;
break;
Expand All @@ -577,7 +584,6 @@ - (AVCaptureDevice *)device {
zxd = [devices objectAtIndex:self.captureDeviceIndex];
}
}

if (!zxd) {
zxd = [AVCaptureDevice defaultDeviceWithMediaType:AVMediaTypeVideo];
}
Expand Down
13 changes: 13 additions & 0 deletions LBXScan/LBXZXing/ZXingWrapper.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,19 @@ - (void)setOrientation:(NSInteger)orientation

AVCaptureVideoPreviewLayer * preview = (AVCaptureVideoPreviewLayer*)self.capture.layer;
preview.connection.videoOrientation = self.orientation;

switch (self.orientation) {
case AVCaptureVideoOrientationPortrait:
case AVCaptureVideoOrientationPortraitUpsideDown:
self.capture.rotation = 90.0f;
break;
case AVCaptureVideoOrientationLandscapeLeft:
case AVCaptureVideoOrientationLandscapeRight:
self.capture.rotation = 0.0f;
break;
default:
break;
}
}

- (void)setVideoLayerframe:(CGRect)videoLayerframe
Expand Down