From 718f6437c705b5b17d7577dc999272b3acb8904d Mon Sep 17 00:00:00 2001 From: tongtongstudio Date: Mon, 9 Mar 2026 17:44:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 20 +++---- .../xwad/os/activity/home/HomeViewModel.java | 60 +++++++++---------- .../xwad/os/activity/main/MainViewModel.java | 60 +++++++++---------- .../xwad/os/activity/user/UserViewModel.java | 60 +++++++++---------- .../usercenter/device/DeviceViewModel.java | 60 +++++++++---------- .../xwad/os/network/NetInterfaceManager.java | 1 + build.gradle | 6 +- settings.gradle | 2 +- 8 files changed, 134 insertions(+), 135 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 8b41c97..4814bb1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,7 +1,7 @@ apply plugin: 'com.android.application' def appName() { - return "XwadOS" + return "XwadOSLenovo" } def releaseTime() { @@ -16,8 +16,8 @@ android { minSdkVersion 23 targetSdkVersion 29 - versionCode 24 - versionName "1.2.3" + versionCode 1 + versionName "1.0.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -59,6 +59,10 @@ android { exclude 'META-INF/LICENSE.txt' exclude 'META-INF/NOTICE.txt' } + + manifestPlaceholders = [ + AMAP_KEY: "db082446a68db8e3ffdc8277313c2e6a" + ] } externalNativeBuild { @@ -85,10 +89,7 @@ android { minifyEnabled false //Zipalign优化 zipAlignEnabled true - buildConfigField "String", "platform", '"tuixin"' - manifestPlaceholders = [ - AMAP_KEY: "9c9fabf3934df224e927b2f9fbc51064" - ] + buildConfigField "String", "platform", '"lenovo"' signingConfig signingConfigs.tuixin applicationVariants.all { variant -> variant.outputs.each { output -> @@ -109,10 +110,7 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' //签名 signingConfig signingConfigs.tuixin - buildConfigField "String", "platform", '"tuixin"' - manifestPlaceholders = [ - AMAP_KEY: "9c9fabf3934df224e927b2f9fbc51064" - ] + buildConfigField "String", "platform", '"lenovo"' // 将release版本的包名重命名，加上版本及日期 applicationVariants.all { variant -> variant.outputs.each { output -> diff --git a/app/src/main/java/com/xwad/os/activity/home/HomeViewModel.java b/app/src/main/java/com/xwad/os/activity/home/HomeViewModel.java index 2fcbe6a..0a8a62e 100644 --- a/app/src/main/java/com/xwad/os/activity/home/HomeViewModel.java +++ b/app/src/main/java/com/xwad/os/activity/home/HomeViewModel.java @@ -129,36 +129,36 @@ public class HomeViewModel extends BaseViewModel mAppUpdateInfoData = new MutableLiveData<>(); public void checkUpdate() { - NetInterfaceManager.getInstance().getCheckUpdateObservable(BuildConfig.APPLICATION_ID) - .compose(RxLifecycle.bindUntilEvent(getLifecycle(), ActivityEvent.DESTROY)) - .subscribe(new Observer>() { - @Override - public void onSubscribe(@NonNull Disposable d) { - Log.e("checkUpdate", "onSubscribe: "); - } - - @Override - public void onNext(@NonNull BaseResponse appUpdateInfoBaseResponse) { - Log.e("checkUpdate", "onNext: " + appUpdateInfoBaseResponse); - if (appUpdateInfoBaseResponse.code == 200) { - AppUpdateInfo appUpdateInfo = appUpdateInfoBaseResponse.data; - mAppUpdateInfoData.setValue(appUpdateInfo); - } else { - mAppUpdateInfoData.setValue(null); - } - } - - @Override - public void onError(@NonNull Throwable e) { - Log.e("checkUpdate", "onError: "); - Toaster.show("网络连接失败"); - } - - @Override - public void onComplete() { - Log.e("checkUpdate", "onComplete: "); - } - }); +// NetInterfaceManager.getInstance().getCheckUpdateObservable(BuildConfig.APPLICATION_ID) +// .compose(RxLifecycle.bindUntilEvent(getLifecycle(), ActivityEvent.DESTROY)) +// .subscribe(new Observer>() { +// @Override +// public void onSubscribe(@NonNull Disposable d) { +// Log.e("checkUpdate", "onSubscribe: "); +// } +// +// @Override +// public void onNext(@NonNull BaseResponse appUpdateInfoBaseResponse) { +// Log.e("checkUpdate", "onNext: " + appUpdateInfoBaseResponse); +// if (appUpdateInfoBaseResponse.code == 200) { +// AppUpdateInfo appUpdateInfo = appUpdateInfoBaseResponse.data; +// mAppUpdateInfoData.setValue(appUpdateInfo); +// } else { +// mAppUpdateInfoData.setValue(null); +// } +// } +// +// @Override +// public void onError(@NonNull Throwable e) { +// Log.e("checkUpdate", "onError: " + e.getMessage()); +//// Toaster.show("网络连接失败"); +// } +// +// @Override +// public void onComplete() { +// Log.e("checkUpdate", "onComplete: "); +// } +// }); } @Deprecated diff --git a/app/src/main/java/com/xwad/os/activity/main/MainViewModel.java b/app/src/main/java/com/xwad/os/activity/main/MainViewModel.java index 165ae30..e115a41 100644 --- a/app/src/main/java/com/xwad/os/activity/main/MainViewModel.java +++ b/app/src/main/java/com/xwad/os/activity/main/MainViewModel.java @@ -125,36 +125,36 @@ public class MainViewModel extends BaseViewModel mAppUpdateInfoData = new MutableLiveData<>(); public void checkUpdate() { - NetInterfaceManager.getInstance().getCheckUpdateObservable(BuildConfig.APPLICATION_ID) - .compose(RxLifecycle.bindUntilEvent(getLifecycle(), ActivityEvent.DESTROY)) - .subscribe(new Observer>() { - @Override - public void onSubscribe(@NonNull Disposable d) { - Log.e("checkUpdate", "onSubscribe: "); - } - - @Override - public void onNext(@NonNull BaseResponse appUpdateInfoBaseResponse) { - Log.e("checkUpdate", "onNext: " + appUpdateInfoBaseResponse); - if (appUpdateInfoBaseResponse.code == 200) { - AppUpdateInfo appUpdateInfo = appUpdateInfoBaseResponse.data; - mAppUpdateInfoData.setValue(appUpdateInfo); - } else { - mAppUpdateInfoData.setValue(null); - } - } - - @Override - public void onError(@NonNull Throwable e) { - Log.e("checkUpdate", "onError: "); - Toaster.show("网络连接失败"); - } - - @Override - public void onComplete() { - Log.e("checkUpdate", "onComplete: "); - } - }); +// NetInterfaceManager.getInstance().getCheckUpdateObservable(BuildConfig.APPLICATION_ID) +// .compose(RxLifecycle.bindUntilEvent(getLifecycle(), ActivityEvent.DESTROY)) +// .subscribe(new Observer>() { +// @Override +// public void onSubscribe(@NonNull Disposable d) { +// Log.e("checkUpdate", "onSubscribe: "); +// } +// +// @Override +// public void onNext(@NonNull BaseResponse appUpdateInfoBaseResponse) { +// Log.e("checkUpdate", "onNext: " + appUpdateInfoBaseResponse); +// if (appUpdateInfoBaseResponse.code == 200) { +// AppUpdateInfo appUpdateInfo = appUpdateInfoBaseResponse.data; +// mAppUpdateInfoData.setValue(appUpdateInfo); +// } else { +// mAppUpdateInfoData.setValue(null); +// } +// } +// +// @Override +// public void onError(@NonNull Throwable e) { +// Log.e("checkUpdate", "onError: " + e.getMessage()); +//// Toaster.show("网络连接失败"); +// } +// +// @Override +// public void onComplete() { +// Log.e("checkUpdate", "onComplete: "); +// } +// }); } @Deprecated diff --git a/app/src/main/java/com/xwad/os/activity/user/UserViewModel.java b/app/src/main/java/com/xwad/os/activity/user/UserViewModel.java index abcfc28..9d56fac 100644 --- a/app/src/main/java/com/xwad/os/activity/user/UserViewModel.java +++ b/app/src/main/java/com/xwad/os/activity/user/UserViewModel.java @@ -71,36 +71,36 @@ public class UserViewModel extends BaseViewModel mAppUpdateInfoData = new MutableLiveData<>(); public void checkUpdate() { - NetInterfaceManager.getInstance().getCheckUpdateObservable(BuildConfig.APPLICATION_ID) - .compose(RxLifecycle.bindUntilEvent(getLifecycle(), ActivityEvent.DESTROY)) - .subscribe(new Observer>() { - @Override - public void onSubscribe(@NonNull Disposable d) { - Log.e("checkUpdate", "onSubscribe: "); - } - - @Override - public void onNext(@NonNull BaseResponse appUpdateInfoBaseResponse) { - Log.e("checkUpdate", "onNext: " + appUpdateInfoBaseResponse); - if (appUpdateInfoBaseResponse.code == 200) { - AppUpdateInfo appUpdateInfo = appUpdateInfoBaseResponse.data; - mAppUpdateInfoData.setValue(appUpdateInfo); - } else { - mAppUpdateInfoData.setValue(null); - } - } - - @Override - public void onError(@NonNull Throwable e) { - Log.e("checkUpdate", "onError: "); - Toaster.show("网络连接失败"); - } - - @Override - public void onComplete() { - Log.e("checkUpdate", "onComplete: "); - } - }); +// NetInterfaceManager.getInstance().getCheckUpdateObservable(BuildConfig.APPLICATION_ID) +// .compose(RxLifecycle.bindUntilEvent(getLifecycle(), ActivityEvent.DESTROY)) +// .subscribe(new Observer>() { +// @Override +// public void onSubscribe(@NonNull Disposable d) { +// Log.e("checkUpdate", "onSubscribe: "); +// } +// +// @Override +// public void onNext(@NonNull BaseResponse appUpdateInfoBaseResponse) { +// Log.e("checkUpdate", "onNext: " + appUpdateInfoBaseResponse); +// if (appUpdateInfoBaseResponse.code == 200) { +// AppUpdateInfo appUpdateInfo = appUpdateInfoBaseResponse.data; +// mAppUpdateInfoData.setValue(appUpdateInfo); +// } else { +// mAppUpdateInfoData.setValue(null); +// } +// } +// +// @Override +// public void onError(@NonNull Throwable e) { +// Log.e("checkUpdate", "onError: " + e.getMessage()); +//// Toaster.show("网络连接失败"); +// } +// +// @Override +// public void onComplete() { +// Log.e("checkUpdate", "onComplete: "); +// } +// }); } public MutableLiveData mSuccessfulData = new MutableLiveData<>(); diff --git a/app/src/main/java/com/xwad/os/fragment/usercenter/device/DeviceViewModel.java b/app/src/main/java/com/xwad/os/fragment/usercenter/device/DeviceViewModel.java index 76bceee..466d7c4 100644 --- a/app/src/main/java/com/xwad/os/fragment/usercenter/device/DeviceViewModel.java +++ b/app/src/main/java/com/xwad/os/fragment/usercenter/device/DeviceViewModel.java @@ -34,35 +34,35 @@ public class DeviceViewModel extends BaseViewModel mAppUpdateInfoData = new MutableLiveData<>(); public void checkUpdate() { - NetInterfaceManager.getInstance().getCheckUpdateObservable(BuildConfig.APPLICATION_ID) - .compose(RxLifecycle.bindUntilEvent(getLifecycle(), FragmentEvent.DESTROY)) - .subscribe(new Observer>() { - @Override - public void onSubscribe(@NonNull Disposable d) { - Log.e("checkUpdate", "onSubscribe: "); - } - - @Override - public void onNext(@NonNull BaseResponse appUpdateInfoBaseResponse) { - Log.e("checkUpdate", "onNext: " + appUpdateInfoBaseResponse); - if (appUpdateInfoBaseResponse.code == 200) { - AppUpdateInfo appUpdateInfo = appUpdateInfoBaseResponse.data; - mAppUpdateInfoData.setValue(appUpdateInfo); - } else { - mAppUpdateInfoData.setValue(null); - } - } - - @Override - public void onError(@NonNull Throwable e) { - Log.e("checkUpdate", "onError: "); - Toaster.show("网络连接失败"); - } - - @Override - public void onComplete() { - Log.e("checkUpdate", "onComplete: "); - } - }); +// NetInterfaceManager.getInstance().getCheckUpdateObservable(BuildConfig.APPLICATION_ID) +// .compose(RxLifecycle.bindUntilEvent(getLifecycle(), FragmentEvent.DESTROY)) +// .subscribe(new Observer>() { +// @Override +// public void onSubscribe(@NonNull Disposable d) { +// Log.e("checkUpdate", "onSubscribe: "); +// } +// +// @Override +// public void onNext(@NonNull BaseResponse appUpdateInfoBaseResponse) { +// Log.e("checkUpdate", "onNext: " + appUpdateInfoBaseResponse); +// if (appUpdateInfoBaseResponse.code == 200) { +// AppUpdateInfo appUpdateInfo = appUpdateInfoBaseResponse.data; +// mAppUpdateInfoData.setValue(appUpdateInfo); +// } else { +// mAppUpdateInfoData.setValue(null); +// } +// } +// +// @Override +// public void onError(@NonNull Throwable e) { +// Log.e("checkUpdate", "onError: " + e.getMessage()); +//// Toaster.show("网络连接失败"); +// } +// +// @Override +// public void onComplete() { +// Log.e("checkUpdate", "onComplete: "); +// } +// }); } } diff --git a/app/src/main/java/com/xwad/os/network/NetInterfaceManager.java b/app/src/main/java/com/xwad/os/network/NetInterfaceManager.java index a0fb998..2520757 100644 --- a/app/src/main/java/com/xwad/os/network/NetInterfaceManager.java +++ b/app/src/main/java/com/xwad/os/network/NetInterfaceManager.java @@ -243,6 +243,7 @@ public class NetInterfaceManager { * @param pkg * @return */ + @Deprecated public Observable> getCheckUpdateObservable(String pkg) { return mUiuiosRetrofit.create(CheckUpdateApi.class) .checkUpdate(pkg) diff --git a/build.gradle b/build.gradle index 273241b..6f98d77 100644 --- a/build.gradle +++ b/build.gradle @@ -44,6 +44,6 @@ allprojects { } } -task clean(type: Delete) { - delete rootProject.buildDir -} +//task clean(type: Delete) { +// delete rootProject.buildDir +//} diff --git a/settings.gradle b/settings.gradle index cf2eaba..d762fe8 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1,2 @@ include ':app', ':niceimageview', ':FlycoTabLayoutZ_Lib', ':verification-view', ':PhotoPreview' -rootProject.name='九学王6_5桌面Lenovo' \ No newline at end of file +rootProject.name='学王365Lenovo' \ No newline at end of file