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/BaseSettingManager.java | 16 +++++++---------
1 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/app/src/main/java/com/basic/security/manager/BaseSettingManager.java b/app/src/main/java/com/basic/security/manager/BaseSettingManager.java
index 0ce74b7..45e1289 100644
--- a/app/src/main/java/com/basic/security/manager/BaseSettingManager.java
+++ b/app/src/main/java/com/basic/security/manager/BaseSettingManager.java
@@ -5,6 +5,7 @@
import com.basic.security.activity.MainActivity;
import com.basic.security.model.BaseSetting;
import com.basic.security.model.ModelAdapter;
+import com.basic.security.model.Sync;
import com.basic.security.utils.Constants;
import com.basic.security.utils.socket.outdoor.OutdoorSendIpSocketClientFromBaseSetting;
@@ -15,14 +16,14 @@
public static ModelAdapter baseSetting = new ModelAdapter();
public static void initBaseSetting() {
- baseSetting = findById("base_setting", IdManager.getId(com.basic.security.model.BaseSetting.tableName));
+ baseSetting = findById("base_setting", com.basic.security.model.BaseSetting.tableName);
if (baseSetting == null) {
- baseSetting = new ModelAdapter(IdManager.getId(com.basic.security.model.BaseSetting.tableName));
+ baseSetting = new ModelAdapter(com.basic.security.model.BaseSetting.tableName);
baseSetting.setString(BaseSetting.auto_mode, "1");
baseSetting.setString(BaseSetting.auto_idcard_verify, "1");
if (Constants.isOutdoor) {
baseSetting.setString(BaseSetting.indoor_device_id, "indoor1");
- baseSetting.setString(BaseSetting.indoor_device_ip, "192.168.1.138");
+ baseSetting.setString(BaseSetting.indoor_device_ip, "192.168.222.103");
}
//鑷姩娉ㄥ唽妯″紡 1鏄紝0鍚�
baseSetting.setString("auto_mode", "0");
@@ -49,7 +50,7 @@
//韬唤璇侀獙璇�1鏄紝0鍚�
baseSetting.setString("admin_idcard_verify", "0");
//韬唤璇侀獙璇�,鎵嬫満鍙锋槸鍚﹀繀濉� 1鏄紝0鍚�
- baseSetting.setString("admin_idcard_verify_phone", "1");
+ baseSetting.setString("admin_idcard_verify_phone", "0");
//绠＄悊鍛樼櫥鍏ュ悗鍑犲垎閽熻嚜鍔ㄩ��鍑�
baseSetting.setString("edit_setting", "1");
//鍑犵杩斿洖棣栭〉
@@ -77,6 +78,7 @@
baseSetting.setString(com.basic.security.model.BaseSetting.open_door_password_enable, Constants.FALSE);
baseSetting.setString(com.basic.security.model.BaseSetting.reboot_hour, "0");
baseSetting.setString(com.basic.security.model.BaseSetting.reboot_hour_enable, Constants.TRUE);
+ baseSetting.setString(Sync.needSync, Constants.FALSE);
BaseManager.save(baseSetting);
}
}
@@ -432,17 +434,13 @@
openDoorDuration = 10;
}
} catch (Exception e) {
- System.out.println(e.getMessage());
+ System1.out.println(e.getMessage());
}
return openDoorDuration;
}
public static List<ModelAdapter> findBaseSettingList(String sql) {
return findList(sql);
- }
-
- public static void deleteBaseSetting(ModelAdapter modelAdapter) {
- delete(modelAdapter);
}
public static String getOpenDoorPassword() {
--
Gitblit v1.8.0