Compare commits

...

5 commits
v1.0.9 ... dev

Author SHA1 Message Date
202318c169 fix switch camara 2026-04-17 16:26:39 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
e1962d79bb fix: switchCamera
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m51s
2026-04-17 15:19:31 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
d4ae2f56a0 feat: camera switch button
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m34s
2026-04-17 11:00:18 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
a45c1cae90 Merge branch 'develop' of https://github.com/Frappet/bma-ehr-checkin into develop
All checks were successful
Build & Deploy on Dev / build (push) Successful in 3m3s
2026-04-01 13:48:38 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
8240a0b3c5 fix: hasScrolledToBottom 2026-04-01 13:48:31 +07:00
2 changed files with 93 additions and 6 deletions

View file

@ -108,6 +108,7 @@ const checkIfScrollable = () => {
transition-show="slide-up"
transition-hide="slide-down"
:maximized="$q.screen.lt.sm"
@show="checkIfScrollable"
>
<q-card class="privacy-card" style="max-width: 560px; max-height: 95vh">
<!-- Header -->

View file

@ -187,6 +187,9 @@ const cameraIsOn = ref<boolean>(false)
const img = ref<any>(undefined)
const photoWidth = ref<number>(350)
const photoHeight = ref<number>(350)
const availableCameras = ref<any[]>([])
const currentCameraIndex = ref<number>(0)
const currentCameraType = ref<'front' | 'back' | 'unknown'>('unknown')
const intervalId = ref<number | undefined>(undefined) // interval
@ -302,6 +305,16 @@ async function stopChecking() {
}
}
function identifyCameraType(label: string): 'front' | 'back' | 'unknown' {
const lowerLabel = label.toLowerCase()
if (lowerLabel.includes('front') || lowerLabel.includes('user') || lowerLabel.includes('face')) {
return 'front'
} else if (lowerLabel.includes('back') || lowerLabel.includes('environment') || lowerLabel.includes('rear')) {
return 'back'
}
return 'unknown'
}
/** function เปิดกล้อง*/
async function openCamera() {
// privacy
@ -315,7 +328,11 @@ async function openCamera() {
await camera.value?.stop()
} else {
await camera.value?.start()
await changeCamera() // start()
const devices: any = await camera.value?.devices(['videoinput'])
if (devices) {
availableCameras.value = devices
await changeCamera()
}
}
cameraIsOn.value = !cameraIsOn.value
} else {
@ -329,10 +346,59 @@ async function openCamera() {
}
/** change camera device*/
async function changeCamera() {
const devices: any = await camera.value?.devices(['videoinput'])
const device = await devices[0]
camera.value?.changeCamera(device.deviceId)
async function changeCamera(targetCameraType?: 'front' | 'back') {
try {
const devices: any = await camera.value?.devices(['videoinput'])
if (!devices || devices.length === 0) {
console.warn('No cameras found')
return
}
availableCameras.value = devices
if (devices.length === 1 || !targetCameraType) {
const device = devices[0]
await camera.value?.changeCamera(device.deviceId)
currentCameraIndex.value = 0
currentCameraType.value = identifyCameraType(device.label || '')
return
}
const matchingCameras = devices.filter((device: any) =>
identifyCameraType(device.label || '') === targetCameraType
)
if (matchingCameras.length > 0) {
const targetDevice = matchingCameras[0]
await camera.value?.changeCamera(targetDevice.deviceId)
currentCameraIndex.value = devices.indexOf(targetDevice)
currentCameraType.value = targetCameraType
} else {
const nextIndex = (currentCameraIndex.value + 1) % devices.length
const nextDevice = devices[nextIndex]
await camera.value?.changeCamera(nextDevice.deviceId)
currentCameraIndex.value = nextIndex
currentCameraType.value = identifyCameraType(nextDevice.label || '')
}
} catch (error) {
console.error('Error switching camera:', error)
}
}
/** switch camera device*/
async function switchCamera() {
if (availableCameras.value.length <= 1) {
return
}
// 2 ()
const targetIndex = currentCameraIndex.value === 0 ? 1 : 0
const targetDevice = availableCameras.value[targetIndex]
await camera.value?.changeCamera(targetDevice.deviceId)
currentCameraIndex.value = targetIndex
currentCameraType.value = identifyCameraType(targetDevice.label || '')
}
/** function ถ่ายรูป*/
@ -759,6 +825,16 @@ watch(
v-if="$q.screen.gt.xs"
class="absolute-bottom-right q-ma-md"
>
<q-btn
v-if="availableCameras.length > 1 && img == null"
round
push
icon="flip_camera_ios"
size="sm"
color="secondary"
class="q-mr-sm"
@click="switchCamera"
/>
<q-btn
v-if="img == null"
round
@ -783,6 +859,16 @@ watch(
class="absolute-bottom text-subtitle2 text-center q-py-sm"
style="background: #00000021"
>
<q-btn
v-if="availableCameras.length > 1 && img == null"
round
icon="flip_camera_ios"
size="16px"
style="background: #424242; color: white"
@click="switchCamera"
unelevated
class="q-mr-xs"
/>
<q-btn
round
v-if="img == null"
@ -1283,4 +1369,4 @@ watch(
rgba(2, 169, 152, 1) 100%
);
}
</style>
</style>