去掉更新
This commit is contained in:
@@ -1,7 +1,7 @@
|
|||||||
apply plugin: 'com.android.application'
|
apply plugin: 'com.android.application'
|
||||||
|
|
||||||
def appName() {
|
def appName() {
|
||||||
return "XwadOS"
|
return "XwadOSLenovo"
|
||||||
}
|
}
|
||||||
|
|
||||||
def releaseTime() {
|
def releaseTime() {
|
||||||
@@ -16,8 +16,8 @@ android {
|
|||||||
minSdkVersion 23
|
minSdkVersion 23
|
||||||
targetSdkVersion 29
|
targetSdkVersion 29
|
||||||
|
|
||||||
versionCode 24
|
versionCode 1
|
||||||
versionName "1.2.3"
|
versionName "1.0.0"
|
||||||
|
|
||||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||||
|
|
||||||
@@ -59,6 +59,10 @@ android {
|
|||||||
exclude 'META-INF/LICENSE.txt'
|
exclude 'META-INF/LICENSE.txt'
|
||||||
exclude 'META-INF/NOTICE.txt'
|
exclude 'META-INF/NOTICE.txt'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
manifestPlaceholders = [
|
||||||
|
AMAP_KEY: "db082446a68db8e3ffdc8277313c2e6a"
|
||||||
|
]
|
||||||
}
|
}
|
||||||
|
|
||||||
externalNativeBuild {
|
externalNativeBuild {
|
||||||
@@ -85,10 +89,7 @@ android {
|
|||||||
minifyEnabled false
|
minifyEnabled false
|
||||||
//Zipalign优化
|
//Zipalign优化
|
||||||
zipAlignEnabled true
|
zipAlignEnabled true
|
||||||
buildConfigField "String", "platform", '"tuixin"'
|
buildConfigField "String", "platform", '"lenovo"'
|
||||||
manifestPlaceholders = [
|
|
||||||
AMAP_KEY: "9c9fabf3934df224e927b2f9fbc51064"
|
|
||||||
]
|
|
||||||
signingConfig signingConfigs.tuixin
|
signingConfig signingConfigs.tuixin
|
||||||
applicationVariants.all { variant ->
|
applicationVariants.all { variant ->
|
||||||
variant.outputs.each { output ->
|
variant.outputs.each { output ->
|
||||||
@@ -109,10 +110,7 @@ android {
|
|||||||
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
|
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
|
||||||
//签名
|
//签名
|
||||||
signingConfig signingConfigs.tuixin
|
signingConfig signingConfigs.tuixin
|
||||||
buildConfigField "String", "platform", '"tuixin"'
|
buildConfigField "String", "platform", '"lenovo"'
|
||||||
manifestPlaceholders = [
|
|
||||||
AMAP_KEY: "9c9fabf3934df224e927b2f9fbc51064"
|
|
||||||
]
|
|
||||||
// 将release版本的包名重命名,加上版本及日期
|
// 将release版本的包名重命名,加上版本及日期
|
||||||
applicationVariants.all { variant ->
|
applicationVariants.all { variant ->
|
||||||
variant.outputs.each { output ->
|
variant.outputs.each { output ->
|
||||||
|
|||||||
@@ -129,36 +129,36 @@ public class HomeViewModel extends BaseViewModel<ActivityHomeBinding, ActivityEv
|
|||||||
public MutableLiveData<AppUpdateInfo> mAppUpdateInfoData = new MutableLiveData<>();
|
public MutableLiveData<AppUpdateInfo> mAppUpdateInfoData = new MutableLiveData<>();
|
||||||
|
|
||||||
public void checkUpdate() {
|
public void checkUpdate() {
|
||||||
NetInterfaceManager.getInstance().getCheckUpdateObservable(BuildConfig.APPLICATION_ID)
|
// NetInterfaceManager.getInstance().getCheckUpdateObservable(BuildConfig.APPLICATION_ID)
|
||||||
.compose(RxLifecycle.bindUntilEvent(getLifecycle(), ActivityEvent.DESTROY))
|
// .compose(RxLifecycle.bindUntilEvent(getLifecycle(), ActivityEvent.DESTROY))
|
||||||
.subscribe(new Observer<BaseResponse<AppUpdateInfo>>() {
|
// .subscribe(new Observer<BaseResponse<AppUpdateInfo>>() {
|
||||||
@Override
|
// @Override
|
||||||
public void onSubscribe(@NonNull Disposable d) {
|
// public void onSubscribe(@NonNull Disposable d) {
|
||||||
Log.e("checkUpdate", "onSubscribe: ");
|
// Log.e("checkUpdate", "onSubscribe: ");
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
public void onNext(@NonNull BaseResponse<AppUpdateInfo> appUpdateInfoBaseResponse) {
|
// public void onNext(@NonNull BaseResponse<AppUpdateInfo> appUpdateInfoBaseResponse) {
|
||||||
Log.e("checkUpdate", "onNext: " + appUpdateInfoBaseResponse);
|
// Log.e("checkUpdate", "onNext: " + appUpdateInfoBaseResponse);
|
||||||
if (appUpdateInfoBaseResponse.code == 200) {
|
// if (appUpdateInfoBaseResponse.code == 200) {
|
||||||
AppUpdateInfo appUpdateInfo = appUpdateInfoBaseResponse.data;
|
// AppUpdateInfo appUpdateInfo = appUpdateInfoBaseResponse.data;
|
||||||
mAppUpdateInfoData.setValue(appUpdateInfo);
|
// mAppUpdateInfoData.setValue(appUpdateInfo);
|
||||||
} else {
|
// } else {
|
||||||
mAppUpdateInfoData.setValue(null);
|
// mAppUpdateInfoData.setValue(null);
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
public void onError(@NonNull Throwable e) {
|
// public void onError(@NonNull Throwable e) {
|
||||||
Log.e("checkUpdate", "onError: ");
|
// Log.e("checkUpdate", "onError: " + e.getMessage());
|
||||||
Toaster.show("网络连接失败");
|
//// Toaster.show("网络连接失败");
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
public void onComplete() {
|
// public void onComplete() {
|
||||||
Log.e("checkUpdate", "onComplete: ");
|
// Log.e("checkUpdate", "onComplete: ");
|
||||||
}
|
// }
|
||||||
});
|
// });
|
||||||
}
|
}
|
||||||
|
|
||||||
@Deprecated
|
@Deprecated
|
||||||
|
|||||||
@@ -125,36 +125,36 @@ public class MainViewModel extends BaseViewModel<ActivityMainBinding, ActivityEv
|
|||||||
public MutableLiveData<AppUpdateInfo> mAppUpdateInfoData = new MutableLiveData<>();
|
public MutableLiveData<AppUpdateInfo> mAppUpdateInfoData = new MutableLiveData<>();
|
||||||
|
|
||||||
public void checkUpdate() {
|
public void checkUpdate() {
|
||||||
NetInterfaceManager.getInstance().getCheckUpdateObservable(BuildConfig.APPLICATION_ID)
|
// NetInterfaceManager.getInstance().getCheckUpdateObservable(BuildConfig.APPLICATION_ID)
|
||||||
.compose(RxLifecycle.bindUntilEvent(getLifecycle(), ActivityEvent.DESTROY))
|
// .compose(RxLifecycle.bindUntilEvent(getLifecycle(), ActivityEvent.DESTROY))
|
||||||
.subscribe(new Observer<BaseResponse<AppUpdateInfo>>() {
|
// .subscribe(new Observer<BaseResponse<AppUpdateInfo>>() {
|
||||||
@Override
|
// @Override
|
||||||
public void onSubscribe(@NonNull Disposable d) {
|
// public void onSubscribe(@NonNull Disposable d) {
|
||||||
Log.e("checkUpdate", "onSubscribe: ");
|
// Log.e("checkUpdate", "onSubscribe: ");
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
public void onNext(@NonNull BaseResponse<AppUpdateInfo> appUpdateInfoBaseResponse) {
|
// public void onNext(@NonNull BaseResponse<AppUpdateInfo> appUpdateInfoBaseResponse) {
|
||||||
Log.e("checkUpdate", "onNext: " + appUpdateInfoBaseResponse);
|
// Log.e("checkUpdate", "onNext: " + appUpdateInfoBaseResponse);
|
||||||
if (appUpdateInfoBaseResponse.code == 200) {
|
// if (appUpdateInfoBaseResponse.code == 200) {
|
||||||
AppUpdateInfo appUpdateInfo = appUpdateInfoBaseResponse.data;
|
// AppUpdateInfo appUpdateInfo = appUpdateInfoBaseResponse.data;
|
||||||
mAppUpdateInfoData.setValue(appUpdateInfo);
|
// mAppUpdateInfoData.setValue(appUpdateInfo);
|
||||||
} else {
|
// } else {
|
||||||
mAppUpdateInfoData.setValue(null);
|
// mAppUpdateInfoData.setValue(null);
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
public void onError(@NonNull Throwable e) {
|
// public void onError(@NonNull Throwable e) {
|
||||||
Log.e("checkUpdate", "onError: ");
|
// Log.e("checkUpdate", "onError: " + e.getMessage());
|
||||||
Toaster.show("网络连接失败");
|
//// Toaster.show("网络连接失败");
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
public void onComplete() {
|
// public void onComplete() {
|
||||||
Log.e("checkUpdate", "onComplete: ");
|
// Log.e("checkUpdate", "onComplete: ");
|
||||||
}
|
// }
|
||||||
});
|
// });
|
||||||
}
|
}
|
||||||
|
|
||||||
@Deprecated
|
@Deprecated
|
||||||
|
|||||||
@@ -71,36 +71,36 @@ public class UserViewModel extends BaseViewModel<ActivityUserBinding, ActivityEv
|
|||||||
public MutableLiveData<AppUpdateInfo> mAppUpdateInfoData = new MutableLiveData<>();
|
public MutableLiveData<AppUpdateInfo> mAppUpdateInfoData = new MutableLiveData<>();
|
||||||
|
|
||||||
public void checkUpdate() {
|
public void checkUpdate() {
|
||||||
NetInterfaceManager.getInstance().getCheckUpdateObservable(BuildConfig.APPLICATION_ID)
|
// NetInterfaceManager.getInstance().getCheckUpdateObservable(BuildConfig.APPLICATION_ID)
|
||||||
.compose(RxLifecycle.bindUntilEvent(getLifecycle(), ActivityEvent.DESTROY))
|
// .compose(RxLifecycle.bindUntilEvent(getLifecycle(), ActivityEvent.DESTROY))
|
||||||
.subscribe(new Observer<BaseResponse<AppUpdateInfo>>() {
|
// .subscribe(new Observer<BaseResponse<AppUpdateInfo>>() {
|
||||||
@Override
|
// @Override
|
||||||
public void onSubscribe(@NonNull Disposable d) {
|
// public void onSubscribe(@NonNull Disposable d) {
|
||||||
Log.e("checkUpdate", "onSubscribe: ");
|
// Log.e("checkUpdate", "onSubscribe: ");
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
public void onNext(@NonNull BaseResponse<AppUpdateInfo> appUpdateInfoBaseResponse) {
|
// public void onNext(@NonNull BaseResponse<AppUpdateInfo> appUpdateInfoBaseResponse) {
|
||||||
Log.e("checkUpdate", "onNext: " + appUpdateInfoBaseResponse);
|
// Log.e("checkUpdate", "onNext: " + appUpdateInfoBaseResponse);
|
||||||
if (appUpdateInfoBaseResponse.code == 200) {
|
// if (appUpdateInfoBaseResponse.code == 200) {
|
||||||
AppUpdateInfo appUpdateInfo = appUpdateInfoBaseResponse.data;
|
// AppUpdateInfo appUpdateInfo = appUpdateInfoBaseResponse.data;
|
||||||
mAppUpdateInfoData.setValue(appUpdateInfo);
|
// mAppUpdateInfoData.setValue(appUpdateInfo);
|
||||||
} else {
|
// } else {
|
||||||
mAppUpdateInfoData.setValue(null);
|
// mAppUpdateInfoData.setValue(null);
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
public void onError(@NonNull Throwable e) {
|
// public void onError(@NonNull Throwable e) {
|
||||||
Log.e("checkUpdate", "onError: ");
|
// Log.e("checkUpdate", "onError: " + e.getMessage());
|
||||||
Toaster.show("网络连接失败");
|
//// Toaster.show("网络连接失败");
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
public void onComplete() {
|
// public void onComplete() {
|
||||||
Log.e("checkUpdate", "onComplete: ");
|
// Log.e("checkUpdate", "onComplete: ");
|
||||||
}
|
// }
|
||||||
});
|
// });
|
||||||
}
|
}
|
||||||
|
|
||||||
public MutableLiveData<Boolean> mSuccessfulData = new MutableLiveData<>();
|
public MutableLiveData<Boolean> mSuccessfulData = new MutableLiveData<>();
|
||||||
|
|||||||
@@ -34,35 +34,35 @@ public class DeviceViewModel extends BaseViewModel<FragmentDeviceBinding, Fragme
|
|||||||
public MutableLiveData<AppUpdateInfo> mAppUpdateInfoData = new MutableLiveData<>();
|
public MutableLiveData<AppUpdateInfo> mAppUpdateInfoData = new MutableLiveData<>();
|
||||||
|
|
||||||
public void checkUpdate() {
|
public void checkUpdate() {
|
||||||
NetInterfaceManager.getInstance().getCheckUpdateObservable(BuildConfig.APPLICATION_ID)
|
// NetInterfaceManager.getInstance().getCheckUpdateObservable(BuildConfig.APPLICATION_ID)
|
||||||
.compose(RxLifecycle.bindUntilEvent(getLifecycle(), FragmentEvent.DESTROY))
|
// .compose(RxLifecycle.bindUntilEvent(getLifecycle(), FragmentEvent.DESTROY))
|
||||||
.subscribe(new Observer<BaseResponse<AppUpdateInfo>>() {
|
// .subscribe(new Observer<BaseResponse<AppUpdateInfo>>() {
|
||||||
@Override
|
// @Override
|
||||||
public void onSubscribe(@NonNull Disposable d) {
|
// public void onSubscribe(@NonNull Disposable d) {
|
||||||
Log.e("checkUpdate", "onSubscribe: ");
|
// Log.e("checkUpdate", "onSubscribe: ");
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
public void onNext(@NonNull BaseResponse<AppUpdateInfo> appUpdateInfoBaseResponse) {
|
// public void onNext(@NonNull BaseResponse<AppUpdateInfo> appUpdateInfoBaseResponse) {
|
||||||
Log.e("checkUpdate", "onNext: " + appUpdateInfoBaseResponse);
|
// Log.e("checkUpdate", "onNext: " + appUpdateInfoBaseResponse);
|
||||||
if (appUpdateInfoBaseResponse.code == 200) {
|
// if (appUpdateInfoBaseResponse.code == 200) {
|
||||||
AppUpdateInfo appUpdateInfo = appUpdateInfoBaseResponse.data;
|
// AppUpdateInfo appUpdateInfo = appUpdateInfoBaseResponse.data;
|
||||||
mAppUpdateInfoData.setValue(appUpdateInfo);
|
// mAppUpdateInfoData.setValue(appUpdateInfo);
|
||||||
} else {
|
// } else {
|
||||||
mAppUpdateInfoData.setValue(null);
|
// mAppUpdateInfoData.setValue(null);
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
public void onError(@NonNull Throwable e) {
|
// public void onError(@NonNull Throwable e) {
|
||||||
Log.e("checkUpdate", "onError: ");
|
// Log.e("checkUpdate", "onError: " + e.getMessage());
|
||||||
Toaster.show("网络连接失败");
|
//// Toaster.show("网络连接失败");
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
public void onComplete() {
|
// public void onComplete() {
|
||||||
Log.e("checkUpdate", "onComplete: ");
|
// Log.e("checkUpdate", "onComplete: ");
|
||||||
}
|
// }
|
||||||
});
|
// });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -243,6 +243,7 @@ public class NetInterfaceManager {
|
|||||||
* @param pkg
|
* @param pkg
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
|
@Deprecated
|
||||||
public Observable<BaseResponse<AppUpdateInfo>> getCheckUpdateObservable(String pkg) {
|
public Observable<BaseResponse<AppUpdateInfo>> getCheckUpdateObservable(String pkg) {
|
||||||
return mUiuiosRetrofit.create(CheckUpdateApi.class)
|
return mUiuiosRetrofit.create(CheckUpdateApi.class)
|
||||||
.checkUpdate(pkg)
|
.checkUpdate(pkg)
|
||||||
|
|||||||
@@ -44,6 +44,6 @@ allprojects {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
task clean(type: Delete) {
|
//task clean(type: Delete) {
|
||||||
delete rootProject.buildDir
|
// delete rootProject.buildDir
|
||||||
}
|
//}
|
||||||
|
|||||||
@@ -1,2 +1,2 @@
|
|||||||
include ':app', ':niceimageview', ':FlycoTabLayoutZ_Lib', ':verification-view', ':PhotoPreview'
|
include ':app', ':niceimageview', ':FlycoTabLayoutZ_Lib', ':verification-view', ':PhotoPreview'
|
||||||
rootProject.name='九学王6_5桌面Lenovo'
|
rootProject.name='学王365Lenovo'
|
||||||
Reference in New Issue
Block a user