Compare commits

..

No commits in common. "dev" and "v1.1.29" have entirely different histories.
dev ... v1.1.29

2 changed files with 50 additions and 94 deletions

View file

@ -163,19 +163,8 @@ function reattachAndResizeMap(retry = 0) {
mapView.value.container = activeContainer mapView.value.container = activeContainer
} }
// resize() method
try {
if (typeof mapView.value.resize === 'function') {
mapView.value.resize() mapView.value.resize()
}
} catch (error) {
console.warn('Map resize failed:', error)
}
if (typeof mapView.value.requestRender === 'function') {
mapView.value.requestRender?.() mapView.value.requestRender?.()
}
mapView.value mapView.value
.goTo( .goTo(
{ {
@ -296,11 +285,7 @@ async function initializeMap() {
geometry: userPoint, geometry: userPoint,
symbol: userSymbol, symbol: userSymbol,
}) })
// graphics
if (mapView.value && mapView.value.graphics && !mapView.value.destroyed) {
mapView.value.graphics.add(userGraphic) mapView.value.graphics.add(userGraphic)
}
// Get POI place server . // Get POI place server .
// await axios // await axios
// .get( // .get(
@ -396,22 +381,12 @@ async function initializeMap() {
geometry: poiPoint, geometry: poiPoint,
symbol: poiSymbol, symbol: poiSymbol,
}) })
// graphics goTo
if (mapView.value && !mapView.value.destroyed) {
if (mapView.value.graphics) {
mapView.value.graphics.add(poiGraphic) mapView.value.graphics.add(poiGraphic)
}
// POI // POI
if (typeof mapView.value.goTo === 'function') {
mapView.value.goTo({ mapView.value.goTo({
target: [userPoint, poiPoint], target: [userPoint, poiPoint],
zoom: zoomMap.value, zoom: zoomMap.value,
}).catch(() => {
// Ignore goTo errors
}) })
}
}
updateLocation(latitude, longitude, poiPlaceName.value) updateLocation(latitude, longitude, poiPlaceName.value)
}) })

View file

@ -638,18 +638,19 @@ async function fetchCheckStatus() {
/** inQueue เป็น true */ /** inQueue เป็น true */
isDisabledCheckTime.value = true isDisabledCheckTime.value = true
msgCheckTime.value = 'ระบบกำลังประมวลผล' msgCheckTime.value = 'ระบบกำลังประมวลผล'
// if (intervalId.value === undefined) { if (intervalId.value === undefined) {
// intervalId.value = setInterval(async () => { intervalId.value = setInterval(async () => {
// try { try {
// await fetchCheckStatus() await fetchCheckStatus()
// } catch (error) { } catch (error) {
// console.error('Error in interval fetchCheckStatus:', error) console.error('Error in interval fetchCheckStatus:', error)
// // interval error // interval error
// stopChecking() stopChecking()
// } }
// }, 3000) }, 3000)
// console.log('startChecking called, intervalId:', intervalId.value) console.log('startChecking called, intervalId:', intervalId.value)
// } }
// hideLoader()
} else { } else {
/** inQueue เป็น false */ /** inQueue เป็น false */
isDisabledCheckTime.value = false isDisabledCheckTime.value = false
@ -1413,13 +1414,13 @@ watch(notificationCounter, () => {
</div> </div>
</div> </div>
<div v-if="cameraIsOn && img == null"> <div v-if="cameraIsOn">
<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" v-if="availableCameras.length > 1 && img == null"
round round
push push
icon="flip_camera_ios" icon="flip_camera_ios"
@ -1429,6 +1430,7 @@ watch(notificationCounter, () => {
@click="switchCamera" @click="switchCamera"
/> />
<q-btn <q-btn
v-if="img == null"
round round
push push
icon="photo_camera" icon="photo_camera"
@ -1436,41 +1438,8 @@ 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"
@ -1485,12 +1454,31 @@ 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>
@ -1562,13 +1550,13 @@ watch(notificationCounter, () => {
</div> </div>
</div> </div>
<div v-if="cameraIsOn && img == null"> <div v-if="cameraIsOn">
<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" v-if="availableCameras.length > 1 && img == null"
round round
icon="flip_camera_ios" icon="flip_camera_ios"
size="16px" size="16px"
@ -1579,22 +1567,15 @@ 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"