From 275b7693fc7e1c451cf928e123eaf14e7aa96212 Mon Sep 17 00:00:00 2001 From: tongtongstudio Date: Wed, 27 Jul 2022 21:50:55 +0800 Subject: [PATCH] =?UTF-8?q?version:6.5=20cube=20fix:=20update:=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E6=B2=A1=E6=9C=89=E5=86=99=E5=85=A5=E5=BC=BA=E5=88=B6?= =?UTF-8?q?=E5=AE=89=E8=A3=85=E5=BA=94=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 4 ++-- .../java/com/aoleyun/sn/network/NetInterfaceManager.java | 9 +++++++++ .../main/java/com/aoleyun/sn/service/GuardService.java | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 01444a4..f7b00ad 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -80,8 +80,8 @@ android { //酷比魔方 cube { flavorDimensions "default" - versionCode 55 - versionName "6.3" + versionCode 57 + versionName "6.5" buildConfigField "String", "platform", '"ZhanRuiCube"' } diff --git a/app/src/main/java/com/aoleyun/sn/network/NetInterfaceManager.java b/app/src/main/java/com/aoleyun/sn/network/NetInterfaceManager.java index 54ce999..670670b 100644 --- a/app/src/main/java/com/aoleyun/sn/network/NetInterfaceManager.java +++ b/app/src/main/java/com/aoleyun/sn/network/NetInterfaceManager.java @@ -134,6 +134,7 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; import io.reactivex.rxjava3.annotations.NonNull; @@ -879,6 +880,10 @@ public class NetInterfaceManager { List forceDownloadDataList = gson.fromJson(jsonString, listType); if (forceDownloadDataList != null) { JGYUtils.getInstance().forceDownload(forceDownloadDataList); + List forceApp = forceDownloadDataList.stream().map(ForceDownloadData::getApp_package).collect(Collectors.toList()); + boolean aole_force_app = Settings.System.putString(mContext.getContentResolver(), CommonConfig.AOLE_ACTION_FORCE_APP, + String.join(",", forceApp)); + Log.e("getForceDownload", "aole_force_app:" + aole_force_app); } callback.onComplete(); } @@ -917,6 +922,10 @@ public class NetInterfaceManager { cacheHelper.put(UrlAddress.GET_FORCE_INSTALL_LIST, GsonUtils.toJsonString(forceDownloadData)); Aria.download(this).resumeAllTask(); JGYUtils.getInstance().forceDownload(forceDownloadData); + List forceApp = forceDownloadData.stream().map(ForceDownloadData::getApp_package).collect(Collectors.toList()); + boolean aole_force_app = Settings.System.putString(mContext.getContentResolver(), CommonConfig.AOLE_ACTION_FORCE_APP, + String.join(",", forceApp)); + Log.e("getForceDownload", "aole_force_app:" + aole_force_app); } else if (forceDownloadBean.code == -200) { cacheHelper.put(UrlAddress.GET_FORCE_INSTALL_LIST, ""); boolean aole_force_app = Settings.System.putString(mContext.getContentResolver(), CommonConfig.AOLE_ACTION_FORCE_APP, "invalid"); diff --git a/app/src/main/java/com/aoleyun/sn/service/GuardService.java b/app/src/main/java/com/aoleyun/sn/service/GuardService.java index 28570b9..d9bcda1 100644 --- a/app/src/main/java/com/aoleyun/sn/service/GuardService.java +++ b/app/src/main/java/com/aoleyun/sn/service/GuardService.java @@ -445,7 +445,7 @@ public class GuardService extends Service { start.onstar(SystemClock.elapsedRealtime()); } writeLog2File("batteryInfo.txt", recordBatteryInfo(intent)); - dumpBatterystats(); +// dumpBatterystats(); } else { if (Intent.ACTION_POWER_CONNECTED.equals(action)) { LogDBManager.getInstance().creatOtherLog(LogDBManager.LOG_EVENT_BATTERY,