diff --git a/app/build.gradle b/app/build.gradle index 8c9135c..4dc4bc1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -18,8 +18,8 @@ android { defaultConfig { applicationId "com.aoleyun.sn" - versionCode 236 - versionName "1.6.0904" + versionCode 238 + versionName "1.6.0908" //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 6037a40..a96fff6 100644 --- a/app/src/main/java/com/aoleyun/sn/network/NetInterfaceManager.java +++ b/app/src/main/java/com/aoleyun/sn/network/NetInterfaceManager.java @@ -540,7 +540,7 @@ public class NetInterfaceManager { public Observable>> getForceDownloadObservable() { return withCache(schedule(getAppDownloadApi().getForceDownloadApi(HTTP_KEY, Utils.getSerial(mContext))), UrlAddress.GET_FORCE_INSTALL_LIST, - 10 * CACHE_EXPIRE_ONE_MINUTE); + 5 * CACHE_EXPIRE_ONE_MINUTE); } public Observable>> getGroupForceDownloadObservable() { diff --git a/app/src/main/java/com/aoleyun/sn/push/PushManager.java b/app/src/main/java/com/aoleyun/sn/push/PushManager.java index 81a497e..f7e1b7a 100644 --- a/app/src/main/java/com/aoleyun/sn/push/PushManager.java +++ b/app/src/main/java/com/aoleyun/sn/push/PushManager.java @@ -317,10 +317,13 @@ public class PushManager { Utils.doMasterClear(mContext); Aria.download(this).removeAllTask(true); mMMKV.clearAll(); + JgyUtils.getInstance().deleteOtherApp(); JgyUtils.getInstance().cleanAoleAppCache(); JgyUtils.getInstance().wakeUpAoleyunAPP(); NetInterfaceManager.getInstance().getPushAndPubAppTag(); NetInterfaceManager.clearAllCache(); + Settings.System.putString(mContext.getContentResolver(), CommonConfig.AOLE_ACTION_FORCE_APP, ""); + Settings.System.putString(mContext.getContentResolver(), CommonConfig.AOLE_ACTION_APP_FORBID, ""); sendRefreshBroadcast(mContext); break; case MSG_INSTALL: diff --git a/app/src/main/java/com/aoleyun/sn/service/main/MainService.java b/app/src/main/java/com/aoleyun/sn/service/main/MainService.java index 4d0674a..0825928 100644 --- a/app/src/main/java/com/aoleyun/sn/service/main/MainService.java +++ b/app/src/main/java/com/aoleyun/sn/service/main/MainService.java @@ -471,7 +471,7 @@ public class MainService extends BaseService implements NetworkUtils.OnNetworkSt .subscribe(killObserver); Observable.create(networkSubscribe) - .throttleFirst(1, TimeUnit.HOURS) + .throttleFirst(5, TimeUnit.MINUTES) .subscribe(networkObserver); JgyUtils.getInstance().checkAoleyunApp(); 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 b6e4f8b..0ca5175 100644 --- a/app/src/main/java/com/aoleyun/sn/utils/JgyUtils.java +++ b/app/src/main/java/com/aoleyun/sn/utils/JgyUtils.java @@ -1494,6 +1494,10 @@ public class JgyUtils { if ("G23".equals(Build.MODEL)) { pkgSet.addAll(ApkUtils.zhengwu); } + if ("G11NW".equals(Build.MODEL)) { + pkgSet.add("com.copilot"); + pkgSet.add("com.xty22"); + } if (JgyUtils.getInstance().checkAppPlatform() == JgyUtils.G11Platform) { pkgSet.addAll(ApkUtils.G11Pkgs); }