From b556312773cca9fbd2642a224190412fbfb8e641 Mon Sep 17 00:00:00 2001 From: gaozl Date: Tue, 16 Dec 2025 10:07:52 +0800 Subject: [PATCH] fix: ci --- app/build.gradle | 2 +- app/src/main/java/qianmu/container/app/MyApplication.java | 5 +++-- app/src/main/java/qianmu/container/data/PowerData.java | 6 +++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index ded64f9..0b8b5d4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -13,7 +13,7 @@ android { minSdkVersion 22 targetSdkVersion 30 versionCode 6 - versionName "V2.0.7.42" + versionName "V2.0.7.43" // 7.0.2.35 接口加密 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/app/src/main/java/qianmu/container/app/MyApplication.java b/app/src/main/java/qianmu/container/app/MyApplication.java index fa85a16..7ace48d 100644 --- a/app/src/main/java/qianmu/container/app/MyApplication.java +++ b/app/src/main/java/qianmu/container/app/MyApplication.java @@ -126,7 +126,8 @@ public class MyApplication extends Application { @Override public void error(String errorCode,String errorInfo) { - LoggerUtil.d("DUILiteSDKInit: ", "授权失败, errorcode: "+errorCode+",errorInfo:"+errorInfo); + LoggerUtil.d("DUILiteSDKInit: ", "授权失败, 重启APP"); + restartApp(); } }); } @@ -230,7 +231,7 @@ public class MyApplication extends Application { stopService(new Intent(this, MusicService.class));// 背景音乐 } try { - Thread.sleep(1000); + Thread.sleep(5000); } catch (InterruptedException e) { e.printStackTrace(); } diff --git a/app/src/main/java/qianmu/container/data/PowerData.java b/app/src/main/java/qianmu/container/data/PowerData.java index b1a5c9a..869c988 100644 --- a/app/src/main/java/qianmu/container/data/PowerData.java +++ b/app/src/main/java/qianmu/container/data/PowerData.java @@ -138,7 +138,6 @@ public class PowerData extends BaseData { } String dataJson = getDataJson(NAME, POWER_INFO, "{}"); - // Log.e("tag","设置的定时开关机"+dataJson); if(newTimeInfo.equals(dataJson)){ if(Constant.androidBoardType.equals("ys") && "".equals(isSetOver)){ // 亿盛有时候设置开机时间不成功 MyManager manager = MyManager.getInstance(MyApplication.getInstance()); @@ -158,7 +157,9 @@ public class PowerData extends BaseData { LoggerUtil.e("设置1开机时间:", onTime); isSetOver = "over"; }else{ - newTimeInfo=""; + if(!bootTime.isEmpty()){ + newTimeInfo=""; + } } } return; @@ -171,7 +172,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() {