tongtong/CubeAoleyunSN
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

version:huaruian 1.1.1

Browse Source 
fix:修复自动升级后不下载桌面和其他更新
update:增加bugly
This commit is contained in:
Fanhuitong
2023-08-31 17:13:08 +08:00
parent 03901123da
commit 51a125ce3f
18 changed files with 496 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/com/aoleyun/sn/utils/JGYUtils.java
View File

@@ -626,16 +626,16 @@ public class JGYUtils {
if (whiteList == null || whiteList.size() == 0) {
SPUtils.put(context, CommonConfig.AOLE_ACTION_NETWORK_ALLOW, "");
Settings.System.putString(contentResolver, CommonConfig.AOLE_ACTION_NETWORK_ALLOW, "");
// Settings.System.putString(contentResolver, CommonConfig.AOLE_ACTION_NETWORK_ALLOW, "");
} else {
String net_not = String.join(",", whiteList);
SPUtils.put(context, CommonConfig.AOLE_ACTION_NETWORK_ALLOW, net_not);
Log.e(TAG, "setAppNetwork: net_not = " + net_not);
List<String> filterList = whiteList.stream().filter(s -> !ApkUtils.isAvailable(context, s)).collect(Collectors.toList());
if (filterList.size() == 0) {
Settings.System.putString(contentResolver, CommonConfig.AOLE_ACTION_NETWORK_ALLOW, "");
// Settings.System.putString(contentResolver, CommonConfig.AOLE_ACTION_NETWORK_ALLOW, "");
} else {
Settings.System.putString(contentResolver, CommonConfig.AOLE_ACTION_NETWORK_ALLOW, String.join(",", filterList));
// Settings.System.putString(contentResolver, CommonConfig.AOLE_ACTION_NETWORK_ALLOW, String.join(",", filterList));
}
Log.e(TAG, "setAppNetwork: filterList = " + filterList);
}
@@ -658,9 +658,9 @@ public class JGYUtils {
List<String> whiteList = new ArrayList<>(Arrays.asList(whiteString.split(",")));
List<String> filterList = whiteList.stream().filter(s -> !ApkUtils.isAvailable(mContext, s)).collect(Collectors.toList());
if (filterList.size() == 0) {
Settings.System.putString(crv, CommonConfig.AOLE_ACTION_NETWORK_ALLOW, "");
// Settings.System.putString(crv, CommonConfig.AOLE_ACTION_NETWORK_ALLOW, "");
} else {
Settings.System.putString(crv, CommonConfig.AOLE_ACTION_NETWORK_ALLOW, String.join(",", filterList));
// Settings.System.putString(crv, CommonConfig.AOLE_ACTION_NETWORK_ALLOW, String.join(",", filterList));
}
Log.e(TAG, "updateNetworkWhiteList: " + filterList);
}

16
app/src/main/java/com/aoleyun/sn/utils/SysSettingUtils.java
View File

@@ -756,7 +756,7 @@ public class SysSettingUtils {
int state = 1;
try {
state = jsonObject.get("setting_browserInput").getAsInt();
Log.e(TAG, "setBrowserInput: " + state);
Log.e(TAG, "setBrowserInput: setting_browserInput = " + state);
String json = jsonObject.get("setting_browserInput").getAsString();
if (TextUtils.isEmpty(json)) {
state = 1;
@@ -771,6 +771,19 @@ public class SysSettingUtils {
} else {
Settings.System.putInt(context.getContentResolver(), "qch_Browser_input", 0);
}
try {
int is_browser_network;
if (TextUtils.isEmpty(jsonObject.get("is_browser_network").getAsString())) {
is_browser_network = 0;
} else {
is_browser_network = jsonObject.get("is_browser_network").getAsInt();
}
Log.e(TAG, "setBrowserInput: is_browser_network = " + is_browser_network);
Settings.Global.putInt(context.getContentResolver(), "is_browser_network", is_browser_network);
} catch (Exception e) {
Log.e(TAG, "setBrowserInput: e: " + e.getMessage());
}
}
/**
@@ -781,5 +794,6 @@ public class SysSettingUtils {
*/
private static void setBrowserInput(Context context, int state) {
Settings.System.putInt(context.getContentResolver(), "qch_Browser_input", 0);
Settings.Global.putInt(context.getContentResolver(), "is_browser_network", changeNum(state));
}
}