Merge remote-tracking branch 'origin/master'

common/src/main/java/com/yunbao/common/manager/APKManager.java

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

common/src/main/java/com/yunbao/common/views/APKUpdateCustomPopup.java

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

config.gradle

@@ -1,18 +1,18 @@
 ext {
     android = [
             compileSdkVersion: 31,
-            buildToolsVersion: "28.0.3",
+            buildToolsVersion: "29.0.2",
             minSdkVersion    : 21,
             targetSdkVersion : 31,
             versionCode      : 402,
-            versionName      : "6.4.6"
+            versionName      : "6.4.7"
     ]
     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",
@@ -25,7 +25,7 @@ ext {
             baiduAppSecretKey: "nEVSgmuGpU0pjPr6VleEGGAl0hzGW52S",
 
 //            true表示谷歌支付 false
-            isGooglePlay     :  true,
+            isGooglePlay     :  false,
             //是否上报异常日志
             isUploadLog      :  false
     ]