diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 245a82c..7d7ec2e 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/app/src/main/java/qianmu/container/data/PowerData.java b/app/src/main/java/qianmu/container/data/PowerData.java index b1a5c9a..aec8469 100644 --- a/app/src/main/java/qianmu/container/data/PowerData.java +++ b/app/src/main/java/qianmu/container/data/PowerData.java @@ -158,7 +158,9 @@ public class PowerData extends BaseData { LoggerUtil.e("设置1开机时间:", onTime); isSetOver = "over"; }else{ - newTimeInfo=""; + if(!bootTime.isEmpty()){ + newTimeInfo=""; + } } } return; diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e513033..fb84ac2 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2,7 +2,7 @@ deb3f3ab MGRjYzQwZjExMTI4YjA3MzZmZTdjZjVm daf84ac85c24e300a517c7ef96744b25 - Android容器 + 八麦容器 设备注册状态: 商场编号: 容器类型