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",