From 7033f5e7079d49aa10606fa8ad75d2300d6d97bc Mon Sep 17 00:00:00 2001
From: zlzw <583819556@qq.com>
Date: Thu, 22 Sep 2022 16:33:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=80=E5=A4=84=E7=A9=BA?=
 =?UTF-8?q?=E6=8C=87=E9=92=88=E9=94=99=E8=AF=AF=20=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E4=BC=98=E5=8C=96=E7=89=88=E6=9C=AC=EF=BC=9A?=
 =?UTF-8?q?=E7=9B=B4=E6=92=AD=E9=97=B4=E6=BB=91=E5=8A=A83=E5=88=86?=
 =?UTF-8?q?=E9=92=9F=EF=BC=8C=E5=86=85=E5=AD=98=E5=8D=A0=E7=94=A8=EF=BC=9A?=
 =?UTF-8?q?3G=20=E2=86=92=201.5G?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/yunbao/common/glide/ImgLoader.java   | 7 +++++--
 .../src/main/java/com/yunbao/common/utils/VersionUtil.java | 4 ++--
 config.gradle                                              | 4 ++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/common/src/main/java/com/yunbao/common/glide/ImgLoader.java b/common/src/main/java/com/yunbao/common/glide/ImgLoader.java
index 02c5da4a2..c814e227c 100644
--- a/common/src/main/java/com/yunbao/common/glide/ImgLoader.java
+++ b/common/src/main/java/com/yunbao/common/glide/ImgLoader.java
@@ -272,8 +272,9 @@ public class ImgLoader {
                 @Override
                 public void onLoadFailed(@Nullable Drawable errorDrawable) {
                     super.onLoadFailed(errorDrawable);
-                    if (callback != null)
+                    if (callback != null) {
                         callback.onLoadFailed();
+                    }
                 }
 
                 @Override
@@ -302,7 +303,9 @@ public class ImgLoader {
 
             @Override
             public void onLoadCleared(@Nullable Drawable placeholder) {
-
+                if (callback != null) {
+                    callback.onLoadFailed();
+                }
             }
         });
     }
diff --git a/common/src/main/java/com/yunbao/common/utils/VersionUtil.java b/common/src/main/java/com/yunbao/common/utils/VersionUtil.java
index 4fd871b6a..96bcdce19 100644
--- a/common/src/main/java/com/yunbao/common/utils/VersionUtil.java
+++ b/common/src/main/java/com/yunbao/common/utils/VersionUtil.java
@@ -158,8 +158,8 @@ public class VersionUtil {
                 } else {
                     ToastUtil.show(R.string.version_download_url_error);
                 }
-            } else if (CommonAppConfig.IS_GOOGLE_PLAY == true) {
-                if (configBean.getGoogle_isup().equals("0")) {
+            } else if (CommonAppConfig.IS_GOOGLE_PLAY) {
+                if (configBean.getGoogle_isup() != null && configBean.getGoogle_isup().equals("0")) {
                     Log.e("tagg", "111111");
                     DialogUitl.Builder builder = new DialogUitl.Builder(context);
                     builder.setTitle(WordUtil.getString(R.string.version_update))
diff --git a/config.gradle b/config.gradle
index f9e5da19d..b70c34e06 100644
--- a/config.gradle
+++ b/config.gradle
@@ -10,9 +10,9 @@ ext {
     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",