From 7cde31a7b6f245c940dcbc40421ddda1d3137d5f Mon Sep 17 00:00:00 2001 From: Fanhuitong <981964879@qq.com> Date: Wed, 19 Apr 2023 10:36:22 +0800 Subject: [PATCH] =?UTF-8?q?version:m40se=202.9.6=20fix:=20update:=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 12 ++++++--- .../sn/activity/main/MainAPresenter.java | 13 +++++----- .../fuying/sn/desktop/RunningAppManager.java | 1 + .../com/fuying/sn/manager/ControlManager.java | 2 +- .../sn/network/NetInterfaceManager.java | 26 +++++++++---------- .../sn/receiver/APKinstallReceiver.java | 6 ++--- .../sn/service/main/MainSPresenter.java | 13 +++++----- .../com/fuying/sn/tpush/MessageReceiver.java | 4 +-- .../java/com/fuying/sn/utils/JGYUtils.java | 4 ++- 9 files changed, 45 insertions(+), 36 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index c326e44..de7b789 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -73,8 +73,8 @@ android { official { flavorDimensions "default" - versionCode 33 - versionName "2.9.3" + versionCode 36 + versionName "2.9.6" } } @@ -162,6 +162,9 @@ android { mtk11Debug.initWith(debug) mtk11Debug { + manifestPlaceholders = [ + AK: "7IubK1Ugeuxga4KKC5VQyjTeQlExsYZq" + ] buildConfigField "String", "platform", '"MTK"' versionNameSuffix "-debug" debuggable true @@ -170,12 +173,13 @@ android { mtk11Release.initWith(release) mtk11Release { + manifestPlaceholders = [ + AK: "7IubK1Ugeuxga4KKC5VQyjTeQlExsYZq" + ] buildConfigField "String", "platform", '"MTK"' signingConfig signingConfigs.mtkAndroid11 } - - teclastMTKDebug.initWith(debug) teclastMTKDebug { manifestPlaceholders = [ diff --git a/app/src/main/java/com/fuying/sn/activity/main/MainAPresenter.java b/app/src/main/java/com/fuying/sn/activity/main/MainAPresenter.java index 6998648..9ae6d43 100644 --- a/app/src/main/java/com/fuying/sn/activity/main/MainAPresenter.java +++ b/app/src/main/java/com/fuying/sn/activity/main/MainAPresenter.java @@ -119,12 +119,13 @@ public class MainAPresenter implements MainAContact.Presenter { @Override public void checkFXYUpdate() { - NetInterfaceManager.getInstance().checkFXYAppUpdate(true, getLifecycle(), new NetInterfaceManager.CompleteCallback() { - @Override - public void onComplete() { - mView.checkFXYUpdateFinish(); - } - }); +// NetInterfaceManager.getInstance().checkFXYAppUpdate(true, getLifecycle(), new NetInterfaceManager.CompleteCallback() { +// @Override +// public void onComplete() { +// mView.checkFXYUpdateFinish(); +// } +// }); + mView.checkFXYUpdateFinish(); } @Override diff --git a/app/src/main/java/com/fuying/sn/desktop/RunningAppManager.java b/app/src/main/java/com/fuying/sn/desktop/RunningAppManager.java index f618113..e8aa6ea 100644 --- a/app/src/main/java/com/fuying/sn/desktop/RunningAppManager.java +++ b/app/src/main/java/com/fuying/sn/desktop/RunningAppManager.java @@ -282,6 +282,7 @@ public class RunningAppManager { for (String pkg : appList) { if (JGYUtils.fuxiaoying.equals(pkg) || BuildConfig.APPLICATION_ID.equals(pkg) + || "com.android.settings".equals(pkg) ) { continue; } diff --git a/app/src/main/java/com/fuying/sn/manager/ControlManager.java b/app/src/main/java/com/fuying/sn/manager/ControlManager.java index 047a57b..ed2b048 100644 --- a/app/src/main/java/com/fuying/sn/manager/ControlManager.java +++ b/app/src/main/java/com/fuying/sn/manager/ControlManager.java @@ -892,7 +892,7 @@ public class ControlManager { } private void closeSettingsApp() { - JGYUtils.getInstance().killBackgroundProcesses("com.android.settings"); +// JGYUtils.getInstance().killBackgroundProcesses("com.android.settings"); } diff --git a/app/src/main/java/com/fuying/sn/network/NetInterfaceManager.java b/app/src/main/java/com/fuying/sn/network/NetInterfaceManager.java index 21fe441..7c57b2a 100644 --- a/app/src/main/java/com/fuying/sn/network/NetInterfaceManager.java +++ b/app/src/main/java/com/fuying/sn/network/NetInterfaceManager.java @@ -931,10 +931,10 @@ public class NetInterfaceManager { Observable.zip( getUpdateObservable(BuildConfig.APPLICATION_ID), getUpdateObservable(JGYUtils.PACKAGE_APPSTORE), - getUpdateObservable(JGYUtils.PACKAGE_OS), - getUpdateObservable(JGYUtils.PACKAGE_BROWSER), - getUpdateObservable(JGYUtils.Notifications), - (appInfoBaseResponse, appInfoBaseResponse2, appInfoBaseResponse3, appInfoBaseResponse4, appInfoBaseResponse5) -> { +// getUpdateObservable(JGYUtils.PACKAGE_OS), +// getUpdateObservable(JGYUtils.PACKAGE_BROWSER), +// getUpdateObservable(JGYUtils.Notifications), + (appInfoBaseResponse, appInfoBaseResponse2) -> { List appInfoList = new ArrayList<>(); if (appInfoBaseResponse.code == 200) { appInfoList.add(appInfoBaseResponse.data); @@ -942,15 +942,15 @@ public class NetInterfaceManager { if (appInfoBaseResponse2.code == 200) { appInfoList.add(appInfoBaseResponse2.data); } - if (appInfoBaseResponse3.code == 200) { - appInfoList.add(appInfoBaseResponse3.data); - } - if (appInfoBaseResponse4.code == 200) { - appInfoList.add(appInfoBaseResponse4.data); - } - if (appInfoBaseResponse5.code == 200) { - appInfoList.add(appInfoBaseResponse5.data); - } +// if (appInfoBaseResponse3.code == 200) { +// appInfoList.add(appInfoBaseResponse3.data); +// } +// if (appInfoBaseResponse4.code == 200) { +// appInfoList.add(appInfoBaseResponse4.data); +// } +// if (appInfoBaseResponse5.code == 200) { +// appInfoList.add(appInfoBaseResponse5.data); +// } return appInfoList; }) .compose(RxLifecycle.bindUntilEvent(lifecycle, ActivityEvent.DESTROY)) diff --git a/app/src/main/java/com/fuying/sn/receiver/APKinstallReceiver.java b/app/src/main/java/com/fuying/sn/receiver/APKinstallReceiver.java index 3d7592a..c69a7e6 100644 --- a/app/src/main/java/com/fuying/sn/receiver/APKinstallReceiver.java +++ b/app/src/main/java/com/fuying/sn/receiver/APKinstallReceiver.java @@ -102,11 +102,11 @@ public class APKinstallReceiver extends BroadcastReceiver { Log.e("sendAppInfo", "onNext: " + s); int isLogined = (int) SPUtils.get(mContext, CommonConfig.isLogined, 2); if (isLogined != 2) { - NetInterfaceManager.getInstance().getForceInstall(); - NetInterfaceManager.getInstance().getAppInside(); +// NetInterfaceManager.getInstance().getForceInstall(); +// NetInterfaceManager.getInstance().getAppInside(); } NetInterfaceManager.getInstance().SendAppInstallInfo(); - NetInterfaceManager.getInstance().getAppAndWhite(); +// NetInterfaceManager.getInstance().getAppAndWhite(); } @Override diff --git a/app/src/main/java/com/fuying/sn/service/main/MainSPresenter.java b/app/src/main/java/com/fuying/sn/service/main/MainSPresenter.java index 996ca97..e0a5924 100644 --- a/app/src/main/java/com/fuying/sn/service/main/MainSPresenter.java +++ b/app/src/main/java/com/fuying/sn/service/main/MainSPresenter.java @@ -91,12 +91,13 @@ public class MainSPresenter implements MainSContact.Presenter { @Override public void checkFXYUpdate() { - NetInterfaceManager.getInstance().checkFXYAppUpdate(true, getLifecycle(), new NetInterfaceManager.CompleteCallback() { - @Override - public void onComplete() { - mView.checkFXYUpdateFinish(); - } - }); +// NetInterfaceManager.getInstance().checkFXYAppUpdate(true, getLifecycle(), new NetInterfaceManager.CompleteCallback() { +// @Override +// public void onComplete() { +// mView.checkFXYUpdateFinish(); +// } +// }); + mView.checkFXYUpdateFinish(); } @Override diff --git a/app/src/main/java/com/fuying/sn/tpush/MessageReceiver.java b/app/src/main/java/com/fuying/sn/tpush/MessageReceiver.java index a230f93..9d50237 100644 --- a/app/src/main/java/com/fuying/sn/tpush/MessageReceiver.java +++ b/app/src/main/java/com/fuying/sn/tpush/MessageReceiver.java @@ -550,8 +550,8 @@ public class MessageReceiver extends XGPushBaseReceiver { break; case JIGUANG_FORCE_INSTALLAPK: ToastUtil.debugShow("收到推送消息: 强制安装应用"); - NetInterfaceManager.getInstance().getAllappPackage(); - NetInterfaceManager.getInstance().getOverallApp(); +// NetInterfaceManager.getInstance().getAllappPackage(); +// NetInterfaceManager.getInstance().getOverallApp(); intallApk(context, extras); break; case JIGUANG_FORCE_UNINSTALLAPK: diff --git a/app/src/main/java/com/fuying/sn/utils/JGYUtils.java b/app/src/main/java/com/fuying/sn/utils/JGYUtils.java index 5b29c65..761de17 100644 --- a/app/src/main/java/com/fuying/sn/utils/JGYUtils.java +++ b/app/src/main/java/com/fuying/sn/utils/JGYUtils.java @@ -524,7 +524,9 @@ public class JGYUtils { public static String getCustomVersion() { if (JGYUtils.getInstance().checkAppPlatform() == JGYUtils.ZhanruiPlatform - ||JGYUtils.getInstance().checkAppPlatform() == JGYUtils.M40sePlatform) { + ||JGYUtils.getInstance().checkAppPlatform() == JGYUtils.M40sePlatform + ||JGYUtils.getInstance().checkAppPlatform() == JGYUtils.T30ProPlatform + ) { return getProperty("ro.build.display.id", "获取失败"); } else { return getProperty("ro.custom.build.version", "获取失败");