tt/FLYSN
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

version:m40se 2.9.6

Browse Source 
fix:
update:接口优化
This commit is contained in:
Fanhuitong
2023-04-19 10:36:22 +08:00
parent b32037d123
commit 7cde31a7b6
9 changed files with 45 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/build.gradle
View File

@@ -73,8 +73,8 @@ android {
official { official {
flavorDimensions "default" flavorDimensions "default"
versionCode 33 versionCode 36
versionName "2.9.3" versionName "2.9.6"
} }
} }
@@ -162,6 +162,9 @@ android {
mtk11Debug.initWith(debug) mtk11Debug.initWith(debug)
mtk11Debug { mtk11Debug {
manifestPlaceholders = [
AK: "7IubK1Ugeuxga4KKC5VQyjTeQlExsYZq"
]
buildConfigField "String", "platform", '"MTK"' buildConfigField "String", "platform", '"MTK"'
versionNameSuffix "-debug" versionNameSuffix "-debug"
debuggable true debuggable true
@@ -170,12 +173,13 @@ android {
mtk11Release.initWith(release) mtk11Release.initWith(release)
mtk11Release { mtk11Release {
manifestPlaceholders = [
AK: "7IubK1Ugeuxga4KKC5VQyjTeQlExsYZq"
]
buildConfigField "String", "platform", '"MTK"' buildConfigField "String", "platform", '"MTK"'
signingConfig signingConfigs.mtkAndroid11 signingConfig signingConfigs.mtkAndroid11
} }
teclastMTKDebug.initWith(debug) teclastMTKDebug.initWith(debug)
teclastMTKDebug { teclastMTKDebug {
manifestPlaceholders = [ manifestPlaceholders = [

11
app/src/main/java/com/fuying/sn/activity/main/MainAPresenter.java
View File

@@ -119,13 +119,14 @@ public class MainAPresenter implements MainAContact.Presenter {
@Override @Override
public void checkFXYUpdate() { public void checkFXYUpdate() {
NetInterfaceManager.getInstance().checkFXYAppUpdate(true, getLifecycle(), new NetInterfaceManager.CompleteCallback() { // NetInterfaceManager.getInstance().checkFXYAppUpdate(true, getLifecycle(), new NetInterfaceManager.CompleteCallback() {
@Override // @Override
public void onComplete() { // public void onComplete() {
// mView.checkFXYUpdateFinish();
// }
// });
mView.checkFXYUpdateFinish(); mView.checkFXYUpdateFinish();
} }
});
}
@Override @Override
public void getOverallApp() { public void getOverallApp() {

1
app/src/main/java/com/fuying/sn/desktop/RunningAppManager.java
View File

@@ -282,6 +282,7 @@ public class RunningAppManager {
for (String pkg : appList) { for (String pkg : appList) {
if (JGYUtils.fuxiaoying.equals(pkg) if (JGYUtils.fuxiaoying.equals(pkg)
|| BuildConfig.APPLICATION_ID.equals(pkg) || BuildConfig.APPLICATION_ID.equals(pkg)
|| "com.android.settings".equals(pkg)
) { ) {
continue; continue;
} }

2
app/src/main/java/com/fuying/sn/manager/ControlManager.java
View File

@@ -892,7 +892,7 @@ public class ControlManager {
} }
private void closeSettingsApp() { private void closeSettingsApp() {
JGYUtils.getInstance().killBackgroundProcesses("com.android.settings"); // JGYUtils.getInstance().killBackgroundProcesses("com.android.settings");
} }

26
app/src/main/java/com/fuying/sn/network/NetInterfaceManager.java
View File

@@ -931,10 +931,10 @@ public class NetInterfaceManager {
Observable.zip( Observable.zip(
getUpdateObservable(BuildConfig.APPLICATION_ID), getUpdateObservable(BuildConfig.APPLICATION_ID),
getUpdateObservable(JGYUtils.PACKAGE_APPSTORE), getUpdateObservable(JGYUtils.PACKAGE_APPSTORE),
getUpdateObservable(JGYUtils.PACKAGE_OS), // getUpdateObservable(JGYUtils.PACKAGE_OS),
getUpdateObservable(JGYUtils.PACKAGE_BROWSER), // getUpdateObservable(JGYUtils.PACKAGE_BROWSER),
getUpdateObservable(JGYUtils.Notifications), // getUpdateObservable(JGYUtils.Notifications),
(appInfoBaseResponse, appInfoBaseResponse2, appInfoBaseResponse3, appInfoBaseResponse4, appInfoBaseResponse5) -> { (appInfoBaseResponse, appInfoBaseResponse2) -> {
List<AppInfo> appInfoList = new ArrayList<>(); List<AppInfo> appInfoList = new ArrayList<>();
if (appInfoBaseResponse.code == 200) { if (appInfoBaseResponse.code == 200) {
appInfoList.add(appInfoBaseResponse.data); appInfoList.add(appInfoBaseResponse.data);
@@ -942,15 +942,15 @@ public class NetInterfaceManager {
if (appInfoBaseResponse2.code == 200) { if (appInfoBaseResponse2.code == 200) {
appInfoList.add(appInfoBaseResponse2.data); appInfoList.add(appInfoBaseResponse2.data);
} }
if (appInfoBaseResponse3.code == 200) { // if (appInfoBaseResponse3.code == 200) {
appInfoList.add(appInfoBaseResponse3.data); // appInfoList.add(appInfoBaseResponse3.data);
} // }
if (appInfoBaseResponse4.code == 200) { // if (appInfoBaseResponse4.code == 200) {
appInfoList.add(appInfoBaseResponse4.data); // appInfoList.add(appInfoBaseResponse4.data);
} // }
if (appInfoBaseResponse5.code == 200) { // if (appInfoBaseResponse5.code == 200) {
appInfoList.add(appInfoBaseResponse5.data); // appInfoList.add(appInfoBaseResponse5.data);
} // }
return appInfoList; return appInfoList;
}) })
.compose(RxLifecycle.bindUntilEvent(lifecycle, ActivityEvent.DESTROY)) .compose(RxLifecycle.bindUntilEvent(lifecycle, ActivityEvent.DESTROY))

6
app/src/main/java/com/fuying/sn/receiver/APKinstallReceiver.java
View File

@@ -102,11 +102,11 @@ public class APKinstallReceiver extends BroadcastReceiver {
Log.e("sendAppInfo", "onNext: " + s); Log.e("sendAppInfo", "onNext: " + s);
int isLogined = (int) SPUtils.get(mContext, CommonConfig.isLogined, 2); int isLogined = (int) SPUtils.get(mContext, CommonConfig.isLogined, 2);
if (isLogined != 2) { if (isLogined != 2) {
NetInterfaceManager.getInstance().getForceInstall(); // NetInterfaceManager.getInstance().getForceInstall();
NetInterfaceManager.getInstance().getAppInside(); // NetInterfaceManager.getInstance().getAppInside();
} }
NetInterfaceManager.getInstance().SendAppInstallInfo(); NetInterfaceManager.getInstance().SendAppInstallInfo();
NetInterfaceManager.getInstance().getAppAndWhite(); // NetInterfaceManager.getInstance().getAppAndWhite();
} }
@Override @Override

11
app/src/main/java/com/fuying/sn/service/main/MainSPresenter.java
View File

@@ -91,13 +91,14 @@ public class MainSPresenter implements MainSContact.Presenter {
@Override @Override
public void checkFXYUpdate() { public void checkFXYUpdate() {
NetInterfaceManager.getInstance().checkFXYAppUpdate(true, getLifecycle(), new NetInterfaceManager.CompleteCallback() { // NetInterfaceManager.getInstance().checkFXYAppUpdate(true, getLifecycle(), new NetInterfaceManager.CompleteCallback() {
@Override // @Override
public void onComplete() { // public void onComplete() {
// mView.checkFXYUpdateFinish();
// }
// });
mView.checkFXYUpdateFinish(); mView.checkFXYUpdateFinish();
} }
});
}
@Override @Override
public void getOverallApp() { public void getOverallApp() {

4
app/src/main/java/com/fuying/sn/tpush/MessageReceiver.java
View File

@@ -550,8 +550,8 @@ public class MessageReceiver extends XGPushBaseReceiver {
break; break;
case JIGUANG_FORCE_INSTALLAPK: case JIGUANG_FORCE_INSTALLAPK:
ToastUtil.debugShow("收到推送消息: 强制安装应用"); ToastUtil.debugShow("收到推送消息: 强制安装应用");
NetInterfaceManager.getInstance().getAllappPackage(); // NetInterfaceManager.getInstance().getAllappPackage();
NetInterfaceManager.getInstance().getOverallApp(); // NetInterfaceManager.getInstance().getOverallApp();
intallApk(context, extras); intallApk(context, extras);
break; break;
case JIGUANG_FORCE_UNINSTALLAPK: case JIGUANG_FORCE_UNINSTALLAPK:

4
app/src/main/java/com/fuying/sn/utils/JGYUtils.java
View File

@@ -524,7 +524,9 @@ public class JGYUtils {
public static String getCustomVersion() { public static String getCustomVersion() {
if (JGYUtils.getInstance().checkAppPlatform() == JGYUtils.ZhanruiPlatform 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", "获取失败"); return getProperty("ro.build.display.id", "获取失败");
} else { } else {
return getProperty("ro.custom.build.version", "获取失败"); return getProperty("ro.custom.build.version", "获取失败");