From 603cb36a5123e46656b06a5deb8d7ac7ff81307f Mon Sep 17 00:00:00 2001
From: 554325746@qq.com <554325746@qq.com>
Date: 星期三, 25 十二月 2019 08:48:51 +0800
Subject: [PATCH] a
---
app/src/main/java/com/basic/security/manager/DeviceManager.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/app/src/main/java/com/basic/security/manager/DeviceManager.java b/app/src/main/java/com/basic/security/manager/DeviceManager.java
index 93341d8..679036a 100644
--- a/app/src/main/java/com/basic/security/manager/DeviceManager.java
+++ b/app/src/main/java/com/basic/security/manager/DeviceManager.java
@@ -5,6 +5,7 @@
import com.basic.security.base.BaseApplication;
import com.basic.security.model.Device;
import com.basic.security.model.ModelAdapter;
+import com.basic.security.model.Sync;
import com.basic.security.utils.Constants;
import com.basic.security.utils.IpUtils;
@@ -58,7 +59,7 @@
public static String getDeviceId() {
if (1 == 1) {
- return Constants.deviceId;
+ return Constants.deviceId();
}
if (Constants.isOutdoor) {
return "outdoor1";
@@ -117,15 +118,16 @@
}
public static void initDevice() {
- device = DeviceManager.findById(Device.tableName, IdManager.getId(Device.tableName));
+ device = DeviceManager.findById(Device.tableName, Device.tableName);
if (device == null) {
- device = new ModelAdapter(IdManager.getId(Device.tableName));
+ device = new ModelAdapter(Device.tableName);
device.setString("device_id", DeviceManager.getDeviceId());
device.setString("ip", IpUtils.getIpAddress(BaseApplication.getApplication()));
device.setString("name", DeviceManager.getDeviceId());
device.setString("open_door_time", "5");
device.setString("no_face_delay", "10");
device.setString("table", "device");
+ device.setString(Sync.needSync, Constants.FALSE);
saveDevice(device);
}
}
--
Gitblit v1.8.0