diff --git a/src/main/java/a8k/db/AppSetting.java b/src/main/java/a8k/db/AppSetting.java index 5362b66..8c8dc07 100644 --- a/src/main/java/a8k/db/AppSetting.java +++ b/src/main/java/a8k/db/AppSetting.java @@ -6,6 +6,7 @@ import a8k.service.appsettings.base.AppSettingType; import com.fasterxml.jackson.annotation.JsonIgnore; import com.iflytop.uf.UfActiveRecord; import com.iflytop.uf.UfActiveRecordField; +import com.iflytop.uf.util.UfJsonHelper; import java.util.Arrays; @@ -174,7 +175,7 @@ public class AppSetting extends UfActiveRecord { option.type = AppSettingType.ENUM.name(); option.tab = currentBuildGroup.name(); option.name = name.name(); - option.valueEnumRange = Arrays.toString(valueEnumRange); + option.valueEnumRange = UfJsonHelper.objectToJson(valueEnumRange); option.value = value; option.priority = buildPriority++; option.save(); diff --git a/src/main/java/a8k/service/appsettings/AppSettingsMgr.java b/src/main/java/a8k/service/appsettings/AppSettingsMgr.java index 4e91714..1a96119 100644 --- a/src/main/java/a8k/service/appsettings/AppSettingsMgr.java +++ b/src/main/java/a8k/service/appsettings/AppSettingsMgr.java @@ -34,7 +34,7 @@ public class AppSettingsMgr { static final int setOptionVal = 5; } - static Integer settingPageVersion = 2; + static Integer settingPageVersion = 3; @PostConstruct diff --git a/src/main/java/a8k/service/appsettings/settingenum/AutoLogoutTime.java b/src/main/java/a8k/service/appsettings/settingenum/AutoLogoutTime.java index 80f1295..6ed0d88 100644 --- a/src/main/java/a8k/service/appsettings/settingenum/AutoLogoutTime.java +++ b/src/main/java/a8k/service/appsettings/settingenum/AutoLogoutTime.java @@ -2,10 +2,11 @@ package a8k.service.appsettings.settingenum; public enum AutoLogoutTime { T00_00, + T00_10, + T00_30, T01_00, T02_00, - T03_00, - T04_00, + T03_00 ; diff --git a/src/main/java/com/iflytop/a800/device/IdChipReader.java b/src/main/java/com/iflytop/a800/device/IdChipReader.java index d8d5a24..a420ec9 100644 --- a/src/main/java/com/iflytop/a800/device/IdChipReader.java +++ b/src/main/java/com/iflytop/a800/device/IdChipReader.java @@ -21,9 +21,9 @@ public class IdChipReader { // 事件处理 public void handleZCanCmderWebSocketEvent(Object ... args) { Integer eventId = (Integer)args[0]; - if ( 0x71C8 == eventId ) { // ID 卡插入 - UfMdbNotification.action("IdChipInsert"); - } +// if ( 0x71C8 == eventId ) { // ID 卡插入 +// UfMdbNotification.action("IdChipInsert"); +// } // if ( 0x71C9 == eventId ) { // ID 拔出 // UfMdbNotification.action("IdChipPullout"); // }