diff --git a/app/src/main/java/com/aoleyun/sn/adapter/AppUpdateAdapter.java b/app/src/main/java/com/aoleyun/sn/adapter/AppUpdateAdapter.java index c39911f..10e8918 100644 --- a/app/src/main/java/com/aoleyun/sn/adapter/AppUpdateAdapter.java +++ b/app/src/main/java/com/aoleyun/sn/adapter/AppUpdateAdapter.java @@ -68,6 +68,9 @@ public class AppUpdateAdapter extends RecyclerView.Adapter> learningDesktopObservable = NetInterfaceManager.getInstance() .getUpdateApi().getUpdate(PackageNames.LEARNING_DESKTOP, JGYUtils.getInstance().checkAppPlatform()); + Observable> ailogUpdateObservable = NetInterfaceManager.getInstance() + .getUpdateApi().getUpdate(PackageNames.AILOG, JGYUtils.getInstance().checkAppPlatform()); + Observable.zip(infoUpdateObservable, storeUpdateObservable, desktopUpdateObservable, - notifyUpdateObservable, browserUpdateObservable, - new Function5, BaseResponse, BaseResponse, BaseResponse, BaseResponse, List>() { + notifyUpdateObservable, browserUpdateObservable,ailogUpdateObservable, + new Function6, BaseResponse, BaseResponse, + BaseResponse, BaseResponse,BaseResponse, + List>() { @Override public List apply (BaseResponse appUpdateInfoBaseResponse, BaseResponse appUpdateInfoBaseResponse2, BaseResponse appUpdateInfoBaseResponse3, - BaseResponse appUpdateInfoBaseResponse4, BaseResponse appUpdateInfoBaseResponse5) throws Throwable { + BaseResponse appUpdateInfoBaseResponse4, BaseResponse appUpdateInfoBaseResponse5, BaseResponse appUpdateInfoBaseResponse6) throws Throwable { List appUpdateInfos = new ArrayList<>(); if (appUpdateInfoBaseResponse.code == OK) { appUpdateInfos.add(appUpdateInfoBaseResponse.data); @@ -907,6 +913,9 @@ public class NetInterfaceManager { if (appUpdateInfoBaseResponse5.code == OK) { appUpdateInfos.add(appUpdateInfoBaseResponse5.data); } + if (appUpdateInfoBaseResponse6.code == OK) { + appUpdateInfos.add(appUpdateInfoBaseResponse6.data); + } return appUpdateInfos; } }) @@ -963,16 +972,22 @@ public class NetInterfaceManager { .getUpdateApi().getUpdate(PackageNames.NOTIFICATIONS, JGYUtils.getInstance().checkAppPlatform()); Observable> browserUpdateObservable = NetInterfaceManager.getInstance() .getUpdateApi().getUpdate(PackageNames.BROWSER, JGYUtils.getInstance().checkAppPlatform()); + Observable> ailogUpdateObservable = NetInterfaceManager.getInstance() + .getUpdateApi().getUpdate(PackageNames.AILOG, JGYUtils.getInstance().checkAppPlatform()); String desktop = mMMKV.decodeString(CommonConfig.DEFAULT_DESKTOP_PACKAGE); Observable> learningDesktopObservable = NetInterfaceManager.getInstance() .getUpdateApi().getUpdate(desktop, JGYUtils.getInstance().checkAppPlatform()); + Observable.zip(infoUpdateObservable, storeUpdateObservable, desktopUpdateObservable, - notifyUpdateObservable, browserUpdateObservable, learningDesktopObservable, - new Function6, BaseResponse, BaseResponse, BaseResponse, BaseResponse, BaseResponse, List>() { + notifyUpdateObservable, browserUpdateObservable, learningDesktopObservable,ailogUpdateObservable, + new Function7, BaseResponse, BaseResponse, BaseResponse, + BaseResponse, BaseResponse, BaseResponse, List>() { @Override public List apply (BaseResponse appUpdateInfoBaseResponse, BaseResponse appUpdateInfoBaseResponse2, BaseResponse appUpdateInfoBaseResponse3, - BaseResponse appUpdateInfoBaseResponse4, BaseResponse appUpdateInfoBaseResponse5, BaseResponse appUpdateInfoBaseResponse6) throws Throwable { + BaseResponse appUpdateInfoBaseResponse4, BaseResponse appUpdateInfoBaseResponse5, BaseResponse appUpdateInfoBaseResponse6, + BaseResponse appUpdateInfoBaseResponse7 + ) throws Throwable { List appUpdateInfos = new ArrayList<>(); if (appUpdateInfoBaseResponse.code == OK) { appUpdateInfos.add(appUpdateInfoBaseResponse.data); @@ -992,6 +1007,9 @@ public class NetInterfaceManager { if (appUpdateInfoBaseResponse6.code == OK) { appUpdateInfos.add(appUpdateInfoBaseResponse6.data); } + if (appUpdateInfoBaseResponse7.code == OK) { + appUpdateInfos.add(appUpdateInfoBaseResponse7.data); + } return appUpdateInfos; } }) 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 cb5fd3d..a0d46cf 100644 --- a/app/src/main/java/com/aoleyun/sn/utils/ApkUtils.java +++ b/app/src/main/java/com/aoleyun/sn/utils/ApkUtils.java @@ -68,6 +68,7 @@ public class ApkUtils { this.add("com.aoleyun.sn"); this.add("com.aoleyun.info"); this.add("com.aoleyun.os"); + this.add("com.aoleyun.ailog"); this.add("com.aoleyun.browser"); this.add("com.uiui.filecloud"); this.add("com.gl.dwlauncher"); diff --git a/app/src/main/res/drawable-hdpi/com_aoleyun_ailog.png b/app/src/main/res/drawable-hdpi/com_aoleyun_ailog.png new file mode 100644 index 0000000..13c274c Binary files /dev/null and b/app/src/main/res/drawable-hdpi/com_aoleyun_ailog.png differ