Compare commits

..

No commits in common. '7d1f2a811a882fde79d12767a6981129125f8efb' and '906be3335c49d190ab2991ad7fe69953073222ba' have entirely different histories.

@ -54,7 +54,7 @@ const showOfflineDialog = (objid: string) => {
connectAlarmReminder(() => {}); connectAlarmReminder(() => {});
onAlarmReminderOvertime((device) => { onAlarmReminderOvertime((device) => {
const objid = String(device?.monitorId ?? ''); const objid = String(device?.objid ?? '');
if (!objid) { if (!objid) {
return; return;
} }

@ -1,7 +1,7 @@
const websocketUrl = 'ws://119.45.202.115:7181/ws'; const websocketUrl = 'ws://119.45.202.115:7181/ws';
const deviceDataTime = {}; const deviceDataTime = {};
const overtime = 1000 * 60 * 10; const overtime = 1000 * 60 * 10;
const intervalTime = 1000 * 30; // const overtime = 1000;
let alarmReminderSocket = null; let alarmReminderSocket = null;
let overtimeTimer = null; let overtimeTimer = null;
let overtimeCallback = null; let overtimeCallback = null;
@ -34,7 +34,7 @@ const updateDeviceDataTime = (payload) => {
deviceDataTime[monitorId] = { deviceDataTime[monitorId] = {
objid: String(objid), objid: String(objid),
time: Date.now() + overtime time: Date.now()
}; };
}; };
@ -53,7 +53,7 @@ const startOvertimeTimer = () => {
Object.keys(deviceDataTime).forEach((monitorId) => { Object.keys(deviceDataTime).forEach((monitorId) => {
const item = deviceDataTime[monitorId]; const item = deviceDataTime[monitorId];
if (!item || now <= item.time) { if (!item || now - item.time <= overtime) {
return; return;
} }
@ -61,7 +61,7 @@ const startOvertimeTimer = () => {
monitorId, monitorId,
...item ...item
}); });
item.time = now + intervalTime; delete deviceDataTime[monitorId];
}); });
}, 1000); }, 1000);
}; };
@ -116,4 +116,4 @@ export const closeAlarmReminder = () => {
overtimeCallback = null; overtimeCallback = null;
}; };
export { websocketUrl, deviceDataTime, overtime, intervalTime }; export { websocketUrl, deviceDataTime, overtime };

Loading…
Cancel
Save