From 0635981a2925e860304a28fc2202b3d2ce3519d0 Mon Sep 17 00:00:00 2001
From: gaozl <gaozl@1000mu.com>
Date: Wed, 4 Feb 2026 09:41:31 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=92=8C=E4=B9=89=E5=A4=A7=E9=81=93?=
 =?UTF-8?q?=E5=AE=9A=E5=88=B6wifi=E5=BB=B6=E6=97=B6=E9=87=8D=E5=90=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                                     |  2 +-
 .../main/java/qianmu/container/data/PowerData.java   | 12 ++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 9337a8c..d76bf22 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -12,7 +12,7 @@ android {
         minSdkVersion 22
         targetSdkVersion 30
         versionCode 6
-        versionName "V2.0.8.13"
+        versionName "V2.0.8.14"
         // 2.0.8.2   修改网络连接证书设置、定时开关机设置
         // 2.0.8.3   获取mac修改
         // V2.0.8.5   同屏优化
diff --git a/app/src/main/java/qianmu/container/data/PowerData.java b/app/src/main/java/qianmu/container/data/PowerData.java
index da03109..1f8f204 100644
--- a/app/src/main/java/qianmu/container/data/PowerData.java
+++ b/app/src/main/java/qianmu/container/data/PowerData.java
@@ -34,6 +34,7 @@ public class PowerData extends BaseData {
     public static final String NAME = "heart_beat_data";
     public static final String POWER_INFO = "power_info";
     public static String newTimeInfo ="";
+    private static int countTime=0;
     private static String isSetOver="";   // 开关机是否设置成功
 
     public static void savePowerList(Object value) {
@@ -52,6 +53,15 @@ public class PowerData extends BaseData {
     }
 
     public static void updatePowerOnOrOffTime() {
+        //countTime++;
+        //Calendar cal= Calendar.getInstance();
+        //String format = new SimpleDateFormat("yyyy-MM-dd").format(cal.getTime());
+        //和义大道wifi 连接延时
+//        if(!DeviceData.getDeviceInfo(DeviceData.DEVICE_RESTART_TIME).equals(format) && countTime == 6){
+//            LoggerUtil.e("pingNet()", "第一次开机后5分钟，重启软件");
+//            DeviceData.saveDeviceInfo((DeviceData.DEVICE_RESTART_TIME),format);
+//            MyApplication.getInstance().restartApp();
+//        }
         try {
             String parameter = "";//关机
             String bootTime = "";//开机
@@ -175,7 +185,6 @@ public class PowerData extends BaseData {
             String format = new SimpleDateFormat("yyyy-MM-dd").format(cal.getTime());
 
             if(!DeviceData.getDeviceInfo(DeviceData.DEVICE_RESTART_TIME).equals(format)){
-
                 DeviceData.pingNet(null, null, new QuerySuccessListener() {
                     @Override
                     public void onSuccess() {
@@ -187,7 +196,6 @@ public class PowerData extends BaseData {
                         LoggerUtil.e("pingNet()", "开机检测网络异常，重启设备");
                         DeviceData.saveDeviceInfo((DeviceData.DEVICE_RESTART_TIME),format);
                         SignWayUtil.reboot();
-
                     }
                 } );
             }