yutou/pandorapan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
zlzw 2023-01-06 15:53:27 +08:00
commit 8c0a23d39a
3 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/src/main/java/com/yunbao/common/manager/APKManager.java
View File

@ -1,7 +1,6 @@
package com.yunbao.common.manager; package com.yunbao.common.manager;
import android.content.Context; import android.content.Context;
import android.text.TextUtils;
import com.yunbao.common.CommonAppContext; import com.yunbao.common.CommonAppContext;
import com.yunbao.common.manager.base.BaseCacheManager; import com.yunbao.common.manager.base.BaseCacheManager;
@ -52,7 +51,8 @@ public class APKManager extends BaseCacheManager {
} }
public boolean getApkVerNew() { public boolean getApkVerNew() {
return TextUtils.equals(VersionUtil.getVersion(), getString(APK_VER));
return VersionUtil.isLatest(getString(APK_VER));
} }
public void setAPKIsUp(int apkIsUp) { public void setAPKIsUp(int apkIsUp) {

13
common/src/main/java/com/yunbao/common/views/APKUpdateCustomPopup.java
View File

@ -86,12 +86,17 @@ public class APKUpdateCustomPopup extends CenterPopupView {
ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.dialog_close), new ViewClicksAntiShake.ViewClicksCallBack() { ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.dialog_close), new ViewClicksAntiShake.ViewClicksCallBack() {
@Override @Override
public void onViewClicks() { public void onViewClicks() {
if (CommonAppConfig.IS_GOOGLE_PLAY && APKManager.get().getAPKGoogleIsUp() != 1) { if (mInside){
dismiss();
}
if (!CommonAppConfig.IS_GOOGLE_PLAY && APKManager.get().getApkIsUp() != 1) {
dismiss(); dismiss();
}else {
if (CommonAppConfig.IS_GOOGLE_PLAY && APKManager.get().getAPKGoogleIsUp() != 1) {
dismiss();
}
if (!CommonAppConfig.IS_GOOGLE_PLAY && APKManager.get().getApkIsUp() != 1) {
dismiss();
}
} }
} }
} }
); );

10
config.gradle
View File

@ -1,18 +1,18 @@
ext { ext {
android = [ android = [
compileSdkVersion: 31, compileSdkVersion: 31,
buildToolsVersion: "28.0.3", buildToolsVersion: "29.0.2",
minSdkVersion : 21, minSdkVersion : 21,
targetSdkVersion : 31, targetSdkVersion : 31,
versionCode : 402, versionCode : 402,
versionName : "6.4.6" versionName : "6.4.7"
] ]
manifestPlaceholders = [ manifestPlaceholders = [
//正式 //正式
// serverHost : "https://napi.yaoulive.com", serverHost : "https://napi.yaoulive.com",
// //
serverHost : "https://ceshi.yaoulive.com", // serverHost : "https://ceshi.yaoulive.com",
//腾讯地图 //腾讯地图
txMapAppKey : "EOZBZ-ASLCU-4XPV3-BDCHZ-4E3Q7-H4BWB", txMapAppKey : "EOZBZ-ASLCU-4XPV3-BDCHZ-4E3Q7-H4BWB",
@ -25,7 +25,7 @@ ext {
baiduAppSecretKey: "nEVSgmuGpU0pjPr6VleEGGAl0hzGW52S", baiduAppSecretKey: "nEVSgmuGpU0pjPr6VleEGGAl0hzGW52S",
// true表示谷歌支付 false // true表示谷歌支付 false
isGooglePlay : true, isGooglePlay : false,
//是否上报异常日志 //是否上报异常日志
isUploadLog : false isUploadLog : false
] ]