From e6a8bdd23d6f5cb46ac650285829573280edcdf6 Mon Sep 17 00:00:00 2001
From: 554325746@qq.com <554325746@qq.com>
Date: 星期一, 15 七月 2019 16:51:11 +0800
Subject: [PATCH] a
---
app/src/main/java/com/basic/security/manager/AlarmManager.java | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/app/src/main/java/com/basic/security/manager/AlarmManager.java b/app/src/main/java/com/basic/security/manager/AlarmManager.java
index a918c4b..e25eb0b 100644
--- a/app/src/main/java/com/basic/security/manager/AlarmManager.java
+++ b/app/src/main/java/com/basic/security/manager/AlarmManager.java
@@ -4,6 +4,7 @@
import com.basic.security.dao.DatabaseManager;
import com.basic.security.dao.SqliteManager;
+import com.basic.security.model.Alarm;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
@@ -99,10 +100,21 @@
} else {
sqliteAlarmList.addAll(dbSqliteAlarmList);
}
+ long keepStartTime = SettingManager.getKeepStartTime();
for (Map<String, String> alarm : sqliteAlarmList) {
String alarmVideo = alarm.get("alarmVideo");
String alarmPicture = alarm.get("alarmPicture");
String alarmLargePicture = alarm.get("alarmLargePicture");
+ String alarmTimeStr = alarm.get(Alarm.alarmTime);
+ long alarmTime = new Date().getTime();
+ if (alarmTimeStr != null && alarmTimeStr.length() > "yyyy-MM-dd HH:mm:ss".length()) {
+ alarmTimeStr = alarmTimeStr.substring(0, "yyyy-MM-dd HH:mm:ss".length());
+ }
+ try {
+ alarmTime = sdf.parse(alarmTimeStr).getTime();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
if (alarmVideo != null && alarmVideo.startsWith("http:")) {
alarm.put("alarmVideoValid", "true");
@@ -119,6 +131,11 @@
} else {
alarm.put("alarmLargePictureValid", "false");
}
+ if (alarmTime < keepStartTime ) {
+ alarm.put("canClose", "true");
+ } else {
+ alarm.put("canClose", "false");
+ }
}
return sqliteAlarmList;
}
--
Gitblit v1.8.0