diff --git a/app/build.gradle b/app/build.gradle index ec5f405..53de7f8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -29,8 +29,8 @@ android { defaultConfig { applicationId "com.aoleyun.sn" - versionCode 206 - versionName "1.6.0226" + versionCode 208 + versionName "1.6.0317" //There are no CERT files because If the mini sdk version is 23+, the AGP will ignore the V1 scheme signature. minSdkVersion 24 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 5993a97..38c1087 100644 --- a/app/src/main/java/com/aoleyun/sn/network/NetInterfaceManager.java +++ b/app/src/main/java/com/aoleyun/sn/network/NetInterfaceManager.java @@ -2019,7 +2019,7 @@ public class NetInterfaceManager { public void onNext(@NonNull BaseResponse> baseResponse) { Log.e("getAppIDControl", "onNext: " + baseResponse); // TODO: 2025/11/21 高木g104不需要id管控 - if ("G104".equals(Build.MODEL)) { + if ("G104".equals(Build.MODEL) || "HT01".equals(Build.MODEL)) { try { Settings.System.putString(mContext.getContentResolver(), CommonConfig.APP_VIEW_CLICK_DISABLED, null); CmdUtil.Result result = CmdUtil.execute(" settings delete system app_view_click_disabled"); 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 ee35c73..9b66481 100644 --- a/app/src/main/java/com/aoleyun/sn/service/GuardService.java +++ b/app/src/main/java/com/aoleyun/sn/service/GuardService.java @@ -97,7 +97,6 @@ import static android.os.BatteryManager.EXTRA_TECHNOLOGY; import static android.os.BatteryManager.EXTRA_TEMPERATURE; import static android.os.BatteryManager.EXTRA_VOLTAGE; - /** * 守护进程 双进程通讯 * @@ -222,13 +221,15 @@ public class GuardService extends Service { Observable.create(restSubscribe) .throttleFirst(1, TimeUnit.MINUTES) .subscribe(resetObserver); + + Aria.download(this).register(); + Aria.download(this).resumeAllTask(); + } @Override public int onStartCommand(Intent intent, int flags, int startId) { Log.e(TAG, "onStartCommand: "); - Aria.download(this).register(); - Aria.download(this).resumeAllTask(); // 绑定建立链接 bindService(new Intent(this, StepService.class), mServiceConnection, Context.BIND_IMPORTANT); return START_STICKY; diff --git a/app/src/main/java/com/aoleyun/sn/utils/ApkUtils.java b/app/src/main/java/com/aoleyun/sn/utils/ApkUtils.java index 02dbefe..07e2f62 100644 --- a/app/src/main/java/com/aoleyun/sn/utils/ApkUtils.java +++ b/app/src/main/java/com/aoleyun/sn/utils/ApkUtils.java @@ -26,7 +26,6 @@ import androidx.core.content.FileProvider; import com.aoleyun.sn.BuildConfig; import com.aoleyun.sn.bean.UploadAppInfo; import com.aoleyun.sn.comm.CommonConfig; -import com.aoleyun.sn.comm.JGYActions; import com.aoleyun.sn.comm.PackageNames; import com.aoleyun.sn.gson.GsonUtils; import com.aoleyun.sn.push.PushManager; @@ -47,12 +46,10 @@ import java.io.OutputStream; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.ArrayList; -import java.util.Arrays; import java.util.Enumeration; import java.util.HashSet; import java.util.List; import java.util.Set; -import java.util.function.Predicate; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; @@ -116,6 +113,7 @@ public class ApkUtils { this.add("com.aoleyunos.dop9"); this.add("com.aoleyunos.dop10"); this.add("com.schoolos.cmcc"); + this.add("com.aoleyunos.natuer"); // this.add("com.uiuios.jgy1"); // this.add("com.uiuios.jgy2"); // this.add("com.android.uiuios"); @@ -1397,6 +1395,7 @@ public class ApkUtils { this.add("com.uiui.speed"); this.add("com.books.wisdom"); this.add("com.schoolos.cmcc"); + this.add("com.aoleyunos.natuer"); }}; public static final HashSet G30_APP = new HashSet() {{ diff --git a/app/src/main/java/com/aoleyun/sn/utils/JgyUtils.java b/app/src/main/java/com/aoleyun/sn/utils/JgyUtils.java index 844776b..c870eb3 100644 --- a/app/src/main/java/com/aoleyun/sn/utils/JgyUtils.java +++ b/app/src/main/java/com/aoleyun/sn/utils/JgyUtils.java @@ -864,6 +864,7 @@ public class JgyUtils { this.add("com.aoleyunos.dop9"); this.add("com.aoleyunos.dop10"); this.add("com.schoolos.cmcc"); + this.add("com.aoleyunos.natuer"); }}; public void setAppNetwork(HashSet blackList, HashSet whiteList) { @@ -1456,6 +1457,7 @@ public class JgyUtils { this.add("com.aoleyunos.dop9"); this.add("com.aoleyunos.dop10"); this.add("com.schoolos.cmcc"); + this.add("com.aoleyunos.natuer"); this.add("com.aoleyun.info"); this.add("com.calculator.uiui"); this.add("com.notepad.uiui"); @@ -1581,6 +1583,7 @@ public class JgyUtils { if (data == null || data.size() <= 0) { return; } + Log.e(TAG, "forceDownload: data size = " + data.size()); List list = new ArrayList<>(); for (int i = 0; i < data.size(); i++) { ForceDownloadData forceDownloadData = data.get(i); @@ -1620,11 +1623,14 @@ public class JgyUtils { if (app_version_code > appVersionCode) { Log.e("forceDownload ", "download URL " + app_url); Utils.ariaDownload(mContext, app_url, jsonObject); + } else { + Log.e(TAG, "forceDownload: installed skip"); } } else { Log.e("forceDownload ", "download URL " + app_url); Utils.ariaDownload(mContext, app_url, jsonObject); } + startServices(mContext); } } @@ -1874,6 +1880,7 @@ public class JgyUtils { this.add("com.aoleyunos.dop9"); this.add("com.aoleyunos.dop10"); this.add("com.schoolos.cmcc"); + this.add("com.aoleyunos.natuer"); }}; HashSet aihuaAppList = new HashSet() {{ @@ -3138,14 +3145,25 @@ public class JgyUtils { Log.e(TAG, "wakeUpNotify: "); //启动通知 Intent bootIntent = new Intent(BootReceiver.BOOT_COMPLETED); + bootIntent.setPackage("com.aoleyun.info"); bootIntent.setComponent(new ComponentName(PACKAGE_NOTIFY, CLASS_NOTIFY)); mContext.sendBroadcast(bootIntent); + +// Intent intent = new Intent(); +// intent.setComponent(new ComponentName("com.aoleyun.info", "com.aoleyun.info.service.main.MainService")); +// intent.setPackage("com.aoleyun.info"); +//// intent.setClassName("com.aoleyun.info", "com.aoleyun.info.service.main.MainService"); +// try { +// mContext.startService(intent); +// } catch (Exception e) { +// Log.e(TAG, "wakeUpNotify: " + e.getMessage()); +// } } @Deprecated public void wakeUpAoleyunAPP() { -// wakeUpAppstore(); -// wakeUpNotify(); + wakeUpAppstore(); + wakeUpNotify(); } public static String getModel() { diff --git a/app/src/main/java/com/aoleyun/sn/utils/SysSettingUtils.java b/app/src/main/java/com/aoleyun/sn/utils/SysSettingUtils.java index d94dd31..8569763 100644 --- a/app/src/main/java/com/aoleyun/sn/utils/SysSettingUtils.java +++ b/app/src/main/java/com/aoleyun/sn/utils/SysSettingUtils.java @@ -1269,46 +1269,46 @@ public class SysSettingUtils { */ private static void setSettingsMenuShow(Context context, JsonObject jsonObject) { List menus = new ArrayList<>(); - // OTA升级管控 (默认允许) - int ota_upgrade_control = jsonObject.get("ota_upgrade_control").getAsInt(); - if (ota_upgrade_control == 0) { - menus.add("system_updates"); - } - // 生物识别和密码 (默认允许) - int biometric_and_password = jsonObject.get("biometric_and_password").getAsInt(); - if (biometric_and_password == 0) { - menus.add("biometrics_password"); - } +// // OTA升级管控 (默认允许) +// int ota_upgrade_control = jsonObject.get("ota_upgrade_control").getAsInt(); +// if (ota_upgrade_control == 0) { +// menus.add("system_updates"); +// } +// // 生物识别和密码 (默认允许) +// int biometric_and_password = jsonObject.get("biometric_and_password").getAsInt(); +// if (biometric_and_password == 0) { +// menus.add("biometrics_password"); +// } // 省电模式 (默认允许) int power_saving_mode = jsonObject.get("power_saving_mode").getAsInt(); if (power_saving_mode == 0) { menus.add("battery"); } - // 安全 (默认允许) - int security = jsonObject.get("security").getAsInt(); - if (security == 0) { - menus.add("security"); - } - // 大屏特色功能 (默认允许) - int large_screen_features = jsonObject.get("large_screen_features").getAsInt(); - if (large_screen_features == 0) { -// menus.add(""); - } - // 辅助功能 (默认允许) - int accessibility = jsonObject.get("accessibility").getAsInt(); - if (accessibility == 0) { - menus.add("accessibility"); - } - // 隐私 (默认允许) - int privacy = jsonObject.get("privacy").getAsInt(); - if (privacy == 0) { - menus.add("privacy"); - } - // 更多链接 (默认允许) - int more_links = jsonObject.get("more_links").getAsInt(); - if (more_links == 0) { - menus.add("more_connections"); - } +// // 安全 (默认允许) +// int security = jsonObject.get("security").getAsInt(); +// if (security == 0) { +// menus.add("security"); +// } +// // 大屏特色功能 (默认允许) +// int large_screen_features = jsonObject.get("large_screen_features").getAsInt(); +// if (large_screen_features == 0) { +//// menus.add(""); +// } +// // 辅助功能 (默认允许) +// int accessibility = jsonObject.get("accessibility").getAsInt(); +// if (accessibility == 0) { +// menus.add("accessibility"); +// } +// // 隐私 (默认允许) +// int privacy = jsonObject.get("privacy").getAsInt(); +// if (privacy == 0) { +// menus.add("privacy"); +// } +// // 更多链接 (默认允许) +// int more_links = jsonObject.get("more_links").getAsInt(); +// if (more_links == 0) { +// menus.add("more_connections"); +// } // 通知和状态栏 (默认允许) int notification_and_status_bar = jsonObject.get("notification_and_status_bar").getAsInt(); if (notification_and_status_bar == 0) { @@ -1319,46 +1319,47 @@ public class SysSettingUtils { if (app_management_general == 0) { menus.add("apps"); } - // 荣耀账号登录 (默认禁止) - int honor_account_login = jsonObject.get("honor_account_login").getAsInt(); - if (honor_account_login == 0) { - menus.add("honor_id"); - } - // 智慧互联 (默认禁止) - int smart_interconnect = jsonObject.get("smart_interconnect").getAsInt(); - if (smart_interconnect == 0) { - menus.add("super_device"); - } - // VPN管控 (默认禁止) - int vpn_control = jsonObject.get("vpn_control").getAsInt(); - if (vpn_control == 0) { - menus.add("vpn_settings"); - } - // 默认应用 (默认禁止) - int default_applications = jsonObject.get("default_applications").getAsInt(); - if (default_applications == 0) { -// menus.add(""); - } - // 应用分身 (默认禁止) - int app_cloning = jsonObject.get("app_cloning").getAsInt(); - if (app_cloning == 0) { - menus.add("apps_clone"); - } - // 应用启动管理 (默认禁止) - int app_startup_management = jsonObject.get("app_startup_management").getAsInt(); - if (app_startup_management == 0) { - menus.add("apps_startup_management"); - } +// // 荣耀账号登录 (默认禁止) +// int honor_account_login = jsonObject.get("honor_account_login").getAsInt(); +// if (honor_account_login == 0) { +// menus.add("honor_id"); +// } +// // 智慧互联 (默认禁止) +// int smart_interconnect = jsonObject.get("smart_interconnect").getAsInt(); +// if (smart_interconnect == 0) { +// menus.add("super_device"); +// } +// // VPN管控 (默认禁止) +// int vpn_control = jsonObject.get("vpn_control").getAsInt(); +// if (vpn_control == 0) { +// menus.add("vpn_settings"); +// } +// // 默认应用 (默认禁止) +// int default_applications = jsonObject.get("default_applications").getAsInt(); +// if (default_applications == 0) { +//// menus.add(""); +// } +// // 应用分身 (默认禁止) +// int app_cloning = jsonObject.get("app_cloning").getAsInt(); +// if (app_cloning == 0) { +// menus.add("apps_clone"); +// } +// // 应用启动管理 (默认禁止) +// int app_startup_management = jsonObject.get("app_startup_management").getAsInt(); +// if (app_startup_management == 0) { +// menus.add("apps_startup_management"); +// } // 应用管理 (默认禁止) - int app_management_control = jsonObject.get("app_management_control").getAsInt(); - if (app_management_control == 0) { - menus.add("apps_management"); - menus.add("apps_honor_tips"); - } -// Settings.System.putString(context.getContentResolver(), CommonConfig.AOLE_SETTINGS_DISALLOW, String.join(",", menus)); +// int app_management_control = jsonObject.get("app_management_control").getAsInt(); +// if (app_management_control == 0) { +// menus.add("apps_management"); +// menus.add("apps_honor_tips"); +// } + Log.e(TAG, "setSettingsMenuShow: " + menus); + Settings.System.putString(context.getContentResolver(), CommonConfig.AOLE_SETTINGS_DISALLOW, String.join(",", menus)); } private static void setSettingsMenuShow(Context context) { -// Settings.System.putString(context.getContentResolver(), CommonConfig.AOLE_SETTINGS_DISALLOW, ""); + Settings.System.putString(context.getContentResolver(), CommonConfig.AOLE_SETTINGS_DISALLOW, ""); } } diff --git a/app/src/main/java/com/aoleyun/sn/utils/URLUtils.java b/app/src/main/java/com/aoleyun/sn/utils/URLUtils.java index bfea513..5bdd663 100644 --- a/app/src/main/java/com/aoleyun/sn/utils/URLUtils.java +++ b/app/src/main/java/com/aoleyun/sn/utils/URLUtils.java @@ -56,6 +56,9 @@ public class URLUtils { } whiteIPList.removeIf(TextUtils::isEmpty); Log.e(TAG, "getBrowserWhiteList: " + "oldwhiteList is : " + oldwhiteList); + if (TextUtils.isEmpty(oldwhiteList)) { + return; + } HashSet URLList = new HashSet<>(Arrays.asList(oldwhiteList.trim().split(","))); URLList.removeIf(TextUtils::isEmpty); if (URLList.size() == 0 && whiteIPList.size() == 0) { diff --git a/app/src/main/java/com/aoleyun/sn/utils/Utils.java b/app/src/main/java/com/aoleyun/sn/utils/Utils.java index 678459b..5752be6 100644 --- a/app/src/main/java/com/aoleyun/sn/utils/Utils.java +++ b/app/src/main/java/com/aoleyun/sn/utils/Utils.java @@ -873,6 +873,9 @@ public class Utils { @SuppressLint({"MissingPermission", "HardwareIds"}) public static String getSn() { +// if (BuildConfig.DEBUG) { +// return "GMG1096250930004"; +// } String serial = "unknow"; try { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {//9.0+