From cbdaa0559af3b8ae9c8cf8287d30916d5f81ee3c Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@iotlink.com>
Date: 星期四, 05 十一月 2020 13:56:16 +0800
Subject: [PATCH] 调整showlable
---
app/src/main/java/com/basic/security/dao/DatabaseManager.java | 37 ++++++++++++++++++++++++++++++++-----
1 files changed, 32 insertions(+), 5 deletions(-)
diff --git a/app/src/main/java/com/basic/security/dao/DatabaseManager.java b/app/src/main/java/com/basic/security/dao/DatabaseManager.java
index 918d5cd..85070ab 100644
--- a/app/src/main/java/com/basic/security/dao/DatabaseManager.java
+++ b/app/src/main/java/com/basic/security/dao/DatabaseManager.java
@@ -6,6 +6,7 @@
import android.util.Pair;
import com.basic.security.base.BaseApplication;
+import com.basic.security.model.Log;
import com.basic.security.model.Setting;
import com.basic.security.utils.Constants;
@@ -28,13 +29,14 @@
public static final Lock databaseExecSqlLock = new ReentrantLock();
public static Map<String, SQLiteDatabase> databaseMap = new HashMap<>();
public static Class[] tableClasses = new Class[] {
- Setting.class
+ Setting.class,
+ Log.class
};
- public static SQLiteDatabase getDatabase() {
+ public static SQLiteDatabase getDatabase() {//
return getDatabase(Constants.databaseName);
}
- public static void intiTables() {
+ public static void intiTables() {//
for (Class tableClass : tableClasses) {
String table = tableClass.getSimpleName();
Map<String, String> columns = new HashMap<>();
@@ -73,12 +75,37 @@
DatabaseManager.execSQL("CREATE TABLE IF NOT EXISTS alarm (\"matchPersonListStr\" TEXT, property TEXT, \"alarmLargePicture\" TEXT,\"alarmPerson\" TEXT,\"alarmPicture\" TEXT,\"alarmVideo\" TEXT,\"alarmTime\" TEXT,\"alarmAddress\" TEXT,\"alarmType\" TEXT,\"id\" TEXT, \"createTime\" TEXT, \"closeAlarm\" TEXT, \"mute\" TEXT, PRIMARY KEY(id))");
+ try {
+ DatabaseManager.execSQL("ALTER TABLE alarm ADD COLUMN imgKey text");
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ try {
+ DatabaseManager.execSQL("ALTER TABLE alarm ADD COLUMN indeviceid text");
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ try {
+ DatabaseManager.execSQL("ALTER TABLE alarm ADD COLUMN videoReqNum text");
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ try {
+ DatabaseManager.execSQL("ALTER TABLE alarm ADD COLUMN picDate text");
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ try {
+ DatabaseManager.execSQL("ALTER TABLE alarm ADD COLUMN alarmLevel text");
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
DatabaseManager.execSQL("CREATE UNIQUE INDEX IF NOT EXISTS idx_alarm ON alarm(id)");
// DatabaseManager.execSQL("CREATE TABLE IF NOT EXISTS setting (\"id\" TEXT, \"name\" TEXT, PRIMARY KEY(id))");
// DatabaseManager.execSQL("CREATE UNIQUE INDEX IF NOT EXISTS idx_setting ON setting (id)");
}
- public static SQLiteDatabase getDatabase(String databaseName) {
+ public static SQLiteDatabase getDatabase(String databaseName) {//
SQLiteDatabase database = databaseMap.get(databaseName);
try {
databaseLock.lock();
@@ -120,7 +147,7 @@
}
}
- private static void initTableColumnNames() {
+ private static void initTableColumnNames() {//
SQLiteDatabase mDataBase = DatabaseManager.getDatabase();
Cursor c = mDataBase.rawQuery("SELECT name FROM sqlite_master WHERE type='table'", null);
List<String> tableNameList = new ArrayList<>();
--
Gitblit v1.8.0