fix(camera): btn refreshPhoto
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m23s
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m23s
This commit is contained in:
parent
ef5e6d9017
commit
5c05df26cf
1 changed files with 48 additions and 28 deletions
|
|
@ -1413,13 +1413,13 @@ watch(notificationCounter, () => {
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div v-if="cameraIsOn">
|
<div v-if="cameraIsOn && img == null">
|
||||||
<div
|
<div
|
||||||
v-if="$q.screen.gt.xs"
|
v-if="$q.screen.gt.xs"
|
||||||
class="absolute-bottom-right q-ma-md"
|
class="absolute-bottom-right q-ma-md"
|
||||||
>
|
>
|
||||||
<q-btn
|
<q-btn
|
||||||
v-if="availableCameras.length > 1 && img == null"
|
v-if="availableCameras.length > 1"
|
||||||
round
|
round
|
||||||
push
|
push
|
||||||
icon="flip_camera_ios"
|
icon="flip_camera_ios"
|
||||||
|
|
@ -1429,7 +1429,6 @@ watch(notificationCounter, () => {
|
||||||
@click="switchCamera"
|
@click="switchCamera"
|
||||||
/>
|
/>
|
||||||
<q-btn
|
<q-btn
|
||||||
v-if="img == null"
|
|
||||||
round
|
round
|
||||||
push
|
push
|
||||||
icon="photo_camera"
|
icon="photo_camera"
|
||||||
|
|
@ -1437,8 +1436,41 @@ watch(notificationCounter, () => {
|
||||||
color="positive"
|
color="positive"
|
||||||
@click="capturePhoto"
|
@click="capturePhoto"
|
||||||
/>
|
/>
|
||||||
|
</div>
|
||||||
|
<div v-else>
|
||||||
|
<div
|
||||||
|
class="absolute-bottom text-subtitle2 text-center q-py-sm"
|
||||||
|
style="background: #00000021"
|
||||||
|
>
|
||||||
|
<q-btn
|
||||||
|
v-if="availableCameras.length > 1"
|
||||||
|
round
|
||||||
|
icon="flip_camera_ios"
|
||||||
|
size="16px"
|
||||||
|
style="background: #424242; color: white"
|
||||||
|
@click="switchCamera"
|
||||||
|
unelevated
|
||||||
|
class="q-mr-xs"
|
||||||
|
/>
|
||||||
|
<q-btn
|
||||||
|
round
|
||||||
|
icon="photo_camera"
|
||||||
|
size="18px"
|
||||||
|
style="background: #263238; color: white"
|
||||||
|
@click="capturePhoto"
|
||||||
|
unelevated
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Refresh button - shows when photo is captured regardless of camera state -->
|
||||||
|
<div v-if="img != null && !useNativePhotoCapture">
|
||||||
|
<div
|
||||||
|
v-if="$q.screen.gt.xs"
|
||||||
|
class="absolute-bottom-right q-ma-md"
|
||||||
|
>
|
||||||
<q-btn
|
<q-btn
|
||||||
v-else
|
|
||||||
round
|
round
|
||||||
push
|
push
|
||||||
icon="refresh"
|
icon="refresh"
|
||||||
|
|
@ -1453,31 +1485,12 @@ watch(notificationCounter, () => {
|
||||||
style="background: #00000021"
|
style="background: #00000021"
|
||||||
>
|
>
|
||||||
<q-btn
|
<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"
|
|
||||||
icon="photo_camera"
|
|
||||||
size="18px"
|
|
||||||
style="background: #263238; color: white"
|
|
||||||
@click="capturePhoto"
|
|
||||||
unelevated
|
|
||||||
/>
|
|
||||||
<q-btn
|
|
||||||
v-else
|
|
||||||
round
|
round
|
||||||
icon="refresh"
|
icon="refresh"
|
||||||
size="18px"
|
size="18px"
|
||||||
style="background: #263238; color: white"
|
style="background: #263238; color: white"
|
||||||
@click="refreshPhoto"
|
@click="refreshPhoto"
|
||||||
|
unelevated
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -1549,13 +1562,13 @@ watch(notificationCounter, () => {
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div v-if="cameraIsOn">
|
<div v-if="cameraIsOn && img == null">
|
||||||
<div
|
<div
|
||||||
class="absolute-bottom text-subtitle2 text-center q-py-sm"
|
class="absolute-bottom text-subtitle2 text-center q-py-sm"
|
||||||
style="background: #00000021"
|
style="background: #00000021"
|
||||||
>
|
>
|
||||||
<q-btn
|
<q-btn
|
||||||
v-if="availableCameras.length > 1 && img == null"
|
v-if="availableCameras.length > 1"
|
||||||
round
|
round
|
||||||
icon="flip_camera_ios"
|
icon="flip_camera_ios"
|
||||||
size="16px"
|
size="16px"
|
||||||
|
|
@ -1566,15 +1579,22 @@ watch(notificationCounter, () => {
|
||||||
/>
|
/>
|
||||||
<q-btn
|
<q-btn
|
||||||
round
|
round
|
||||||
v-if="img == null"
|
|
||||||
icon="photo_camera"
|
icon="photo_camera"
|
||||||
size="18px"
|
size="18px"
|
||||||
style="background: #263238; color: white"
|
style="background: #263238; color: white"
|
||||||
@click="capturePhoto"
|
@click="capturePhoto"
|
||||||
unelevated
|
unelevated
|
||||||
/>
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Refresh button - shows when photo is captured regardless of camera state -->
|
||||||
|
<div v-if="img != null && !useNativePhotoCapture">
|
||||||
|
<div
|
||||||
|
class="absolute-bottom text-subtitle2 text-center q-py-sm"
|
||||||
|
style="background: #00000021"
|
||||||
|
>
|
||||||
<q-btn
|
<q-btn
|
||||||
v-else
|
|
||||||
round
|
round
|
||||||
icon="refresh"
|
icon="refresh"
|
||||||
size="18px"
|
size="18px"
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue