version:6.5 cube

fix:
update:修复没有写入强制安装应用
This commit is contained in:
2022-07-27 21:50:55 +08:00
parent 66787bb6a7
commit 275b7693fc
3 changed files with 12 additions and 3 deletions

View File

@@ -80,8 +80,8 @@ android {
//酷比魔方 //酷比魔方
cube { cube {
flavorDimensions "default" flavorDimensions "default"
versionCode 55 versionCode 57
versionName "6.3" versionName "6.5"
buildConfigField "String", "platform", '"ZhanRuiCube"' buildConfigField "String", "platform", '"ZhanRuiCube"'
} }

View File

@@ -134,6 +134,7 @@ import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
import io.reactivex.rxjava3.annotations.NonNull; import io.reactivex.rxjava3.annotations.NonNull;
@@ -879,6 +880,10 @@ public class NetInterfaceManager {
List<ForceDownloadData> forceDownloadDataList = gson.fromJson(jsonString, listType); List<ForceDownloadData> forceDownloadDataList = gson.fromJson(jsonString, listType);
if (forceDownloadDataList != null) { if (forceDownloadDataList != null) {
JGYUtils.getInstance().forceDownload(forceDownloadDataList); JGYUtils.getInstance().forceDownload(forceDownloadDataList);
List<String> 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(); callback.onComplete();
} }
@@ -917,6 +922,10 @@ public class NetInterfaceManager {
cacheHelper.put(UrlAddress.GET_FORCE_INSTALL_LIST, GsonUtils.toJsonString(forceDownloadData)); cacheHelper.put(UrlAddress.GET_FORCE_INSTALL_LIST, GsonUtils.toJsonString(forceDownloadData));
Aria.download(this).resumeAllTask(); Aria.download(this).resumeAllTask();
JGYUtils.getInstance().forceDownload(forceDownloadData); JGYUtils.getInstance().forceDownload(forceDownloadData);
List<String> 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) { } else if (forceDownloadBean.code == -200) {
cacheHelper.put(UrlAddress.GET_FORCE_INSTALL_LIST, ""); cacheHelper.put(UrlAddress.GET_FORCE_INSTALL_LIST, "");
boolean aole_force_app = Settings.System.putString(mContext.getContentResolver(), CommonConfig.AOLE_ACTION_FORCE_APP, "invalid"); boolean aole_force_app = Settings.System.putString(mContext.getContentResolver(), CommonConfig.AOLE_ACTION_FORCE_APP, "invalid");

View File

@@ -445,7 +445,7 @@ public class GuardService extends Service {
start.onstar(SystemClock.elapsedRealtime()); start.onstar(SystemClock.elapsedRealtime());
} }
writeLog2File("batteryInfo.txt", recordBatteryInfo(intent)); writeLog2File("batteryInfo.txt", recordBatteryInfo(intent));
dumpBatterystats(); // dumpBatterystats();
} else { } else {
if (Intent.ACTION_POWER_CONNECTED.equals(action)) { if (Intent.ACTION_POWER_CONNECTED.equals(action)) {
LogDBManager.getInstance().creatOtherLog(LogDBManager.LOG_EVENT_BATTERY, LogDBManager.getInstance().creatOtherLog(LogDBManager.LOG_EVENT_BATTERY,