Fix stream 2
This commit is contained in:
1 parent
47d67156b7
commit
89e65067c4
2 files changed
+4
-8
No files matched your search
@@ -137,7 +137,7 @@ def start_recount():
|
|||||||
|
|
||||||
return jsonify({
|
return jsonify({
|
||||||
"success": True,
|
"success": True,
|
||||||
"stream_url": f"{GO2RTC_URL}/api/stream.mjpeg?src={STREAM_NAME}",
|
"stream_url": f"{RECOUNT_API_URL}/api/live-video",
|
||||||
"file": Path(mp4_path).name,
|
"file": Path(mp4_path).name,
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|||||||
@@ -363,7 +363,7 @@
|
|||||||
<div class="counter-card recount">
|
<div class="counter-card recount">
|
||||||
<div class="counter-val" id="recount-count">--</div>
|
<div class="counter-val" id="recount-count">--</div>
|
||||||
<div class="counter-label">Objects Recounted</div>
|
<div class="counter-label">Objects Recounted</div>
|
||||||
<div class="counter-sub">Batch #<span id="recount-batch">--</span> · <span id="recount-time">--</span></div>
|
<div class="counter-sub"><span id="recount-time">--</span></div>
|
||||||
<div class="counter-status disconnected" id="recount-status">
|
<div class="counter-status disconnected" id="recount-status">
|
||||||
waiting...
|
waiting...
|
||||||
</div>
|
</div>
|
||||||
@@ -517,8 +517,8 @@ async function loadBatchResult(filePath) {
|
|||||||
}
|
}
|
||||||
batchResultLoaded = true;
|
batchResultLoaded = true;
|
||||||
document.getElementById('live-title').innerHTML = '◉ Batch Result';
|
document.getElementById('live-title').innerHTML = '◉ Batch Result';
|
||||||
document.getElementById('live-count').textContent = data.count.toLocaleString();
|
document.getElementById('live-count').textContent = '#' + data.batch_number;
|
||||||
document.getElementById('live-label').textContent = 'Batch #' + data.batch_number;
|
document.getElementById('live-label').textContent = data.count.toLocaleString() + ' objects';
|
||||||
document.getElementById('live-batch').textContent = data.batch_number;
|
document.getElementById('live-batch').textContent = data.batch_number;
|
||||||
document.getElementById('live-time').textContent = data.date;
|
document.getElementById('live-time').textContent = data.date;
|
||||||
var startStr = data.start_time ? new Date(data.start_time).toLocaleTimeString('en-US', {hour12: false, hour:'2-digit', minute:'2-digit'}) : '--';
|
var startStr = data.start_time ? new Date(data.start_time).toLocaleTimeString('en-US', {hour12: false, hour:'2-digit', minute:'2-digit'}) : '--';
|
||||||
@@ -626,7 +626,6 @@ async function stopRecount() {
|
|||||||
|
|
||||||
async function loadRecountProgress() {
|
async function loadRecountProgress() {
|
||||||
const countEl = document.getElementById('recount-count');
|
const countEl = document.getElementById('recount-count');
|
||||||
const batchEl = document.getElementById('recount-batch');
|
|
||||||
const timeEl = document.getElementById('recount-time');
|
const timeEl = document.getElementById('recount-time');
|
||||||
const statusEl = document.getElementById('recount-status');
|
const statusEl = document.getElementById('recount-status');
|
||||||
try {
|
try {
|
||||||
@@ -634,14 +633,12 @@ async function loadRecountProgress() {
|
|||||||
const data = await res.json();
|
const data = await res.json();
|
||||||
if (!data.success) {
|
if (!data.success) {
|
||||||
countEl.textContent = '--';
|
countEl.textContent = '--';
|
||||||
batchEl.textContent = '--';
|
|
||||||
timeEl.textContent = data.error || 'unreachable';
|
timeEl.textContent = data.error || 'unreachable';
|
||||||
statusEl.className = 'counter-status disconnected';
|
statusEl.className = 'counter-status disconnected';
|
||||||
statusEl.textContent = 'no connection';
|
statusEl.textContent = 'no connection';
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
countEl.textContent = data.count.toLocaleString();
|
countEl.textContent = data.count.toLocaleString();
|
||||||
batchEl.textContent = data.batch_number || '--';
|
|
||||||
if (data.last_detection_time) {
|
if (data.last_detection_time) {
|
||||||
const d = new Date(data.last_detection_time);
|
const d = new Date(data.last_detection_time);
|
||||||
timeEl.textContent = d.toLocaleTimeString('en-US', { hour12: false, hour: '2-digit', minute: '2-digit', second: '2-digit' });
|
timeEl.textContent = d.toLocaleTimeString('en-US', { hour12: false, hour: '2-digit', minute: '2-digit', second: '2-digit' });
|
||||||
@@ -652,7 +649,6 @@ async function loadRecountProgress() {
|
|||||||
statusEl.textContent = 'connected';
|
statusEl.textContent = 'connected';
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
countEl.textContent = '--';
|
countEl.textContent = '--';
|
||||||
batchEl.textContent = '--';
|
|
||||||
timeEl.textContent = 'unreachable';
|
timeEl.textContent = 'unreachable';
|
||||||
statusEl.className = 'counter-status disconnected';
|
statusEl.className = 'counter-status disconnected';
|
||||||
statusEl.textContent = 'no connection';
|
statusEl.textContent = 'no connection';
|
||||||
|
|||||||
Reference in new issue
Block a user