Skip to content

D
DoorLock
Commit a01869c1 by 朱建香
Options

20171220

parent 1df4b733
Showing with 20 additions and 14 deletions
dev/src/view/device/v_index.js
......@@ -507,14 +507,30 @@ function loopGetLockInfo(self, delay, timeout){
catch (error) {
console.log(error);
}
let newNotifyTime = moment(data.notify_time).unix();
let newAlarmTime = moment(data.alarm_time).unix();
let newOpenTime = moment(data.open_time).unix();
let newNotifyTime = null;
let newAlarmTime = null;
let newOpenTime = null;
if(data.open_time != null){
newOpenTime = moment(data.open_time).unix();
}
if(data.alarm_time != null){
newAlarmTime = moment(data.alarm_time).unix();
}
if(data.notify_time != null){
newNotifyTime = moment(data.notify_time).unix();
}
console.log(openTime);
console.log(newOpenTime);
if(notifyTime != newNotifyTime || alarmTime != newAlarmTime || openTime != newOpenTime){
console.log(alarmTime);
console.log(newAlarmTime);
console.log(notifyTime);
console.log(newNotifyTime);
if(openTime != newOpenTime || alarmTime != newAlarmTime || notifyTime != newNotifyTime){
console.log("innnnnnn");
return true;
}
......@@ -621,15 +637,8 @@ async function getRecordTime(self, data){
let newNotifyTime = moment(data.notify_time).unix();
let newAlarmTime = moment(data.alarm_time).unix();
let newOpenTime = moment(data.open_time).unix();
// console.log("newNotifyTime:"+newNotifyTime.format('YYYY-MM-DD hh:mm:ss'));
// console.log("newAlarmTime:"+newAlarmTime.format('YYYY-MM-DD hh:mm:ss'));
// console.log("newOpenTime:"+newOpenTime.format('YYYY-MM-DD hh:mm:ss'));
// console.log("notifyTime:"+moment(self.notifyTime,moment.ISO_8601).format('YYYY-MM-DD hh:mm:ss'));
// console.log("alarmTime:"+moment(self.alarmTime,moment.ISO_8601).format('YYYY-MM-DD hh:mm:ss'));
// console.log("openTime:"+moment(self.openTime,moment.ISO_8601).format('YYYY-MM-DD hh:mm:ss'));
let now = moment(new Date(), "YYYY-MM-DD hh:mm:ss").unix();
if(self.notifyTime){
// console.log("notifyTime"+newNotifyTime.diff(self.notifyTime, 'seconds'));
if(newNotifyTime != null && newNotifyTime - self.notifyTime > 0){
self.securityAlarmFlag = true;
self.notifyTime = newNotifyTime;
......@@ -637,7 +646,6 @@ async function getRecordTime(self, data){
self.securityAlarmFlag = false;
}
}else{
// console.log("notifyTime"+now.diff(newNotifyTime, 'hours'));
if(newNotifyTime != null && now - newNotifyTime < 3600){
self.securityAlarmFlag = true;
self.notifyTime = newNotifyTime;
......@@ -646,7 +654,6 @@ async function getRecordTime(self, data){
}
}
if(self.alarmTime){
// console.log("Alarm"+newAlarmTime.diff(self.alarmTime, 'seconds'));
if(newAlarmTime != null && newAlarmTime - self.alarmTime > 0){
self.hijackAlarmFlag = true;
self.alarmTime = newAlarmTime;
......@@ -654,7 +661,6 @@ async function getRecordTime(self, data){
self.hijackAlarmFlag = false;
}
}else{
// console.log("Alarm"+now.diff(newAlarmTime, 'hours'));
if(newAlarmTime != null && now - newAlarmTime < 3600){
self.hijackAlarmFlag = true;
self.alarmTime = newAlarmTime;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment