From 29084167ba9665bbd419d6ce41f86998a3d67664 Mon Sep 17 00:00:00 2001
From: lambert <lambert@sinokru.com>
Date: Tue, 3 Sep 2019 11:52:39 +0800
Subject: [PATCH] .

---
 .../com/heyongrui/youju/WelcomeActivity.java   |  4 +++-
 .../java/com/heyongrui/base/rxbus/RxBus.java   |  2 ++
 .../heyongrui/base/utils/UpdateCheckUtil.java  | 18 ++++++++++++++++--
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/heyongrui/youju/WelcomeActivity.java b/app/src/main/java/com/heyongrui/youju/WelcomeActivity.java
index 3a501e6..4b8bf89 100644
--- a/app/src/main/java/com/heyongrui/youju/WelcomeActivity.java
+++ b/app/src/main/java/com/heyongrui/youju/WelcomeActivity.java
@@ -92,7 +92,9 @@ private void loadLocalCover() {//加载本地封面图
     private void startMainActivity() {//开始缩放动画
         rxManager.add(Observable.timer(1000, TimeUnit.MILLISECONDS)
                 .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(aLong -> startAnim()));
+                .subscribe(aLong -> startAnim(), throwable -> {
+                    throwable.printStackTrace();
+                }));
     }
 
     private void startDownloadCover() {//随机下载封面图
diff --git a/base/src/main/java/com/heyongrui/base/rxbus/RxBus.java b/base/src/main/java/com/heyongrui/base/rxbus/RxBus.java
index f6c6047..3039881 100644
--- a/base/src/main/java/com/heyongrui/base/rxbus/RxBus.java
+++ b/base/src/main/java/com/heyongrui/base/rxbus/RxBus.java
@@ -143,6 +143,8 @@ public void accept(RxBusEvent rxBusEvent) throws Exception {
                                     e.printStackTrace();
                                 }
                             }
+                        }, throwable -> {
+                            throwable.printStackTrace();
                         });
 
                 subscriptions.add(subscription);
diff --git a/base/src/main/java/com/heyongrui/base/utils/UpdateCheckUtil.java b/base/src/main/java/com/heyongrui/base/utils/UpdateCheckUtil.java
index 2a9c07e..d53fbe4 100644
--- a/base/src/main/java/com/heyongrui/base/utils/UpdateCheckUtil.java
+++ b/base/src/main/java/com/heyongrui/base/utils/UpdateCheckUtil.java
@@ -79,8 +79,14 @@ public void checkUpdate(@NonNull String updateCheckUrl, @NonNull String authorit
             catLoadingDialog.show();
             //构建网络请求
             mCompositeDisposable.add(Observable.just(updateCheckUrl).map(requestUrl -> {
-                Request request = new Request.Builder().url(requestUrl).build();
-                return client.newCall(request).execute();
+                Response execute = null;
+                try {
+                    Request request = new Request.Builder().url(requestUrl).build();
+                    execute = client.newCall(request).execute();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+                return execute;
             }).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(response -> {
                 //网络请求返回结果解析
                 if (catLoadingDialog != null && catLoadingDialog.isShowing()) {
@@ -114,8 +120,16 @@ public void checkUpdate(@NonNull String updateCheckUrl, @NonNull String authorit
                         ToastUtils.showShort(R.string.update_error);
                     }
                 } else {
+                    if (catLoadingDialog != null && catLoadingDialog.isShowing()) {
+                        catLoadingDialog.dismiss();
+                    }
                     ToastUtils.showShort(R.string.update_error);
                 }
+            }, throwable -> {
+                if (catLoadingDialog != null && catLoadingDialog.isShowing()) {
+                    catLoadingDialog.dismiss();
+                }
+                ToastUtils.showShort(R.string.update_error);
             }));
         } catch (Exception e) {
             e.printStackTrace();