From 3545328c1c33cb3dab12354493c0037a1d457d20 Mon Sep 17 00:00:00 2001
From: gaozl <gaozl@1000mu.com>
Date: Tue, 11 Nov 2025 14:35:10 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=BC=80=E5=85=B3=E6=9C=BA=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              |  2 +-
 .../activity/H5/UpdateFileActivity.java       |  4 +--
 .../java/qianmu/container/data/PowerData.java | 29 +++++++++++++++----
 .../qianmu/container/util/SignWayUtil.java    |  3 +-
 4 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index ffa3c01..ce45e37 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -12,7 +12,7 @@ android {
         minSdkVersion 22
         targetSdkVersion 30
         versionCode 6
-        versionName "V2.0.8.0"
+        versionName "V2.0.8.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'consumer-rules.pro'
diff --git a/app/src/main/java/qianmu/container/activity/H5/UpdateFileActivity.java b/app/src/main/java/qianmu/container/activity/H5/UpdateFileActivity.java
index 36e1226..8260e3c 100644
--- a/app/src/main/java/qianmu/container/activity/H5/UpdateFileActivity.java
+++ b/app/src/main/java/qianmu/container/activity/H5/UpdateFileActivity.java
@@ -272,8 +272,8 @@ public class UpdateFileActivity extends BaseActivity {
         LoggerUtil.e("UpdateFileActivity","setData()");
         //清除文件
         try {
-            LoggerUtil.e("剩余存储不足2G: ", String.valueOf(DeviceUtil.getSDAvailableSize() < 2000000000L));
-            if (DeviceUtil.getSDAvailableSize() < 2000000000L ) {
+            LoggerUtil.e("剩余存储不足4G: ", String.valueOf(DeviceUtil.getSDAvailableSize() < 4000000000L));
+            if (DeviceUtil.getSDAvailableSize() < 4000000000L ) {
                 File file = new File(StringUtil.strSplice(Constant.CACHE_PATH, "Files/"));
                 File file2 = new File(StringUtil.strSplice(Constant.CACHE_PATH, "iotFile/"));
                 DeviceUtil.recursionDeleteFile(file);
diff --git a/app/src/main/java/qianmu/container/data/PowerData.java b/app/src/main/java/qianmu/container/data/PowerData.java
index 46a6140..43481b5 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 String isSetOver="";   // 开关机是否设置成功
 
     public static void savePowerList(Object value) {
         saveDataJson(NAME, POWER_INFO, new Gson().toJson(value));
@@ -137,18 +138,34 @@ public class PowerData extends BaseData {
             }
 
             String dataJson = getDataJson(NAME, POWER_INFO, "{}");
+
             if(newTimeInfo.equals(dataJson)){
-                if(Constant.androidBoardType.equals("ys")){
+                if(Constant.androidBoardType.equals("ys") && "".equals(isSetOver)){  // 亿盛有时候设置开机时间不成功
                     MyManager manager = MyManager.getInstance(MyApplication.getInstance());
-                    boolean isset = manager.isSetPowerOnTime();
-                    if(!isset){
-                        LoggerUtil.e("开机时间设置：",String.valueOf(isset));
-                        newTimeInfo = "";
+                    String onTime = manager.getPowerOnTime();
+                    long currentLong = System.currentTimeMillis();//当前时间
+                    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd");
+                    String setTime = StringUtil.strSplice(dateFormat.format(currentLong), bootTime.replace(":",""));
+                    String setTime2 = StringUtil.strSplice(dateFormat.format(currentLong+24*60*60*1000), bootTime.replace(":",""));
+
+                    String s = TimeUtil.stampToDate(currentLong);
+                    long parameterLong = TimeUtil.pareTLong2(s + " " + parameter);//关机时间
+                    long bootLong = TimeUtil.pareTLong2(s + " " + bootTime);//开机时间
+                    if(parameterLong>bootLong && onTime.equals(setTime2)){
+                        LoggerUtil.e("设置2开机时间：", onTime);
+                        isSetOver = "over";
+                    }else if(parameterLong<bootLong && onTime.equals(setTime)){
+                        LoggerUtil.e("设置1开机时间：", onTime);
+                        isSetOver = "over";
+                    }else{
+                        newTimeInfo="";
                     }
                 }
                 return;
+            }else{
+                isSetOver = "";
             }
-            LoggerUtil.e("PowerData","定时开关机不同");
+            LoggerUtil.e("设置开关机时间：", dataJson);
             newTimeInfo=dataJson;
 
             //天津K11亿晟3288重启2次设备避免黑屏
diff --git a/app/src/main/java/qianmu/container/util/SignWayUtil.java b/app/src/main/java/qianmu/container/util/SignWayUtil.java
index f3ba25f..93a4c35 100644
--- a/app/src/main/java/qianmu/container/util/SignWayUtil.java
+++ b/app/src/main/java/qianmu/container/util/SignWayUtil.java
@@ -146,8 +146,7 @@ public class SignWayUtil {
                 EventBus.getDefault().post(messageEvent);
             }else if(Constant.androidBoardType.equals("huidu")){
                 HuiduTech helper = new HuiduTech(MyApplication.getInstance());
-//                helper.install(path);
-                helper.installAndStart(path,"qianmu.container","qianmu.container.activity.H5.UpdateFileActivity");
+                helper.install(path);
             }
         } catch (Throwable t) {
             LoggerUtil.e("silentInstallApk", StringUtil.getThrowableStr(t));