Skip to content
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

Jump to bottom

Develope #222

Open
wants to merge 13 commits into
base: develope
Choose a base branch
from
Open

Develope #222

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
1bd2cb1
update(编译错误)
abcmx-lbx Jan 17, 2019
694e6ec
demo删除么有使用的权限代码
abcmx-lbx Mar 22, 2019
83affbf
启用闪光灯时, 先判断设备是否支持闪光灯;
zhyizhou Aug 5, 2019
1017b9c
Merge pull request #193 from zhyizhou/master
MxABC Aug 5, 2019
5819946
Fixed bug #167
zhyizhou Aug 12, 2019
70dcab3
Merge pull request #195 from zhyizhou/master
MxABC Aug 12, 2019
a0b744d
Update to 2.3.1
zhyizhou Aug 13, 2019
c540f5d
Update to 2.3.1
zhyizhou Aug 13, 2019
763d0de
Merge pull request #196 from zhyizhou/master
MxABC Aug 13, 2019
0f57824
提交1
Sep 21, 2020
7ac19a8
提交2
Sep 21, 2020
d65e2eb
提交3
Sep 21, 2020
4b2a494
更新二维码和条形码同时可扫描
Sep 24, 2020
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
4 changes: 3 additions & 1 deletion LBXScan/LBXNative/LBXScanNative.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,9 @@ - (void)stopScan
- (void)setTorch:(BOOL)torch {

[self.input.device lockForConfiguration:nil];
self.input.device.torchMode = torch ? AVCaptureTorchModeOn : AVCaptureTorchModeOff;
if ([self.input.device hasTorch]) {
self.input.device.torchMode = torch ? AVCaptureTorchModeOn : AVCaptureTorchModeOff;
}
[self.input.device unlockForConfiguration];
}

Expand Down
10 changes: 6 additions & 4 deletions LBXScan/LBXZXing/LBXZXCapture.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,11 +177,13 @@ - (void)setMirror:(BOOL)mirror {
}

- (void)setTorch:(BOOL)torch {
_torch = torch;
_torch = torch;

[self.input.device lockForConfiguration:nil];
self.input.device.torchMode = self.torch ? AVCaptureTorchModeOn : AVCaptureTorchModeOff;
[self.input.device unlockForConfiguration];
[self.input.device lockForConfiguration:nil];
if ([self.input.device hasTorch]) {
self.input.device.torchMode = self.torch ? AVCaptureTorchModeOn : AVCaptureTorchModeOff;
}
[self.input.device unlockForConfiguration];
}

- (void)changeTorch
Expand Down