Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m17s
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m17s
This commit is contained in:
commit
e90c22cc9b
1 changed files with 16 additions and 13 deletions
|
|
@ -272,14 +272,23 @@ async function openCamera() {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// change camera device
|
if (!isPermissionCameraDenied.value) {
|
||||||
if (cameraIsOn.value) {
|
// change camera device
|
||||||
await camera.value?.stop()
|
if (cameraIsOn.value) {
|
||||||
|
await camera.value?.stop()
|
||||||
|
} else {
|
||||||
|
await camera.value?.start()
|
||||||
|
await changeCamera() // ต้องรอให้ start() เสร็จก่อน
|
||||||
|
}
|
||||||
|
cameraIsOn.value = !cameraIsOn.value
|
||||||
} else {
|
} else {
|
||||||
await camera.value?.start()
|
messageError(
|
||||||
await changeCamera() // ต้องรอให้ start() เสร็จก่อน
|
$q,
|
||||||
|
'',
|
||||||
|
'ไม่สามารถเข้าถึงกล้องได้ กรุณาอนุญาตการเข้าถึงกล้องในเบราว์เซอร์ของคุณ'
|
||||||
|
)
|
||||||
|
return
|
||||||
}
|
}
|
||||||
cameraIsOn.value = !cameraIsOn.value
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/** change camera device*/
|
/** change camera device*/
|
||||||
|
|
@ -542,7 +551,6 @@ async function requestCamera() {
|
||||||
try {
|
try {
|
||||||
await navigator.mediaDevices.getUserMedia({ video: true })
|
await navigator.mediaDevices.getUserMedia({ video: true })
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.error('ผู้ใช้ปฏิเสธการเข้าถึง หรือเกิดข้อผิดพลาด: ', err)
|
|
||||||
isPermissionCameraDenied.value = true
|
isPermissionCameraDenied.value = true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -671,12 +679,7 @@ watch(
|
||||||
<div
|
<div
|
||||||
v-if="!cameraIsOn && img == null"
|
v-if="!cameraIsOn && img == null"
|
||||||
class="preview-placeholder"
|
class="preview-placeholder"
|
||||||
@click="
|
@click="() => !isDisabledCheckTime && openCamera()"
|
||||||
() =>
|
|
||||||
!isDisabledCheckTime &&
|
|
||||||
!isPermissionCameraDenied &&
|
|
||||||
openCamera()
|
|
||||||
"
|
|
||||||
>
|
>
|
||||||
<div class="text-center">
|
<div class="text-center">
|
||||||
<q-icon
|
<q-icon
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue