From 23093a5168a3a30b442435681de16782be8e6757 Mon Sep 17 00:00:00 2001
From: itgaojian <itgaojian@163.com>
Date: Fri, 7 Jul 2023 11:29:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E5=B8=831.0.6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                       |  9 +++++++++
 app/release/output-metadata.json                |  4 ++--
 .../baselib/utils/ExceptionHandler.java         | 17 ++++++++++++-----
 build.gradle                                    |  4 ++--
 4 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 3de0973..c65ec85 100644
--- a/README.md
+++ b/README.md
@@ -40,4 +40,13 @@
 
 ```
 1.辖区人口添加人口类型筛选条件
+```
+
+### 2023-7-7 (1.0.6)
+
+```
+1.数据统计
+2.Icon替换
+3.升级方式改变 通知栏->Dialog
+
 ```
\ No newline at end of file
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
index a57be37..d482420 100644
--- a/app/release/output-metadata.json
+++ b/app/release/output-metadata.json
@@ -10,8 +10,8 @@
     {
       "type": "SINGLE",
       "filters": [],
-      "versionCode": 6,
-      "versionName": "1.0.5",
+      "versionCode": 7,
+      "versionName": "1.0.6",
       "outputFile": "app-release.apk"
     }
   ]
diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/utils/ExceptionHandler.java b/baselib/src/main/java/com/tenlionsoft/baselib/utils/ExceptionHandler.java
index 0e0f947..e562290 100755
--- a/baselib/src/main/java/com/tenlionsoft/baselib/utils/ExceptionHandler.java
+++ b/baselib/src/main/java/com/tenlionsoft/baselib/utils/ExceptionHandler.java
@@ -23,20 +23,27 @@ public class ExceptionHandler {
     public static void handleException(Throwable throwable) {
         if (throwable instanceof HttpException) {
             HttpException ex = (HttpException) throwable;
+            ex.printStackTrace();
             try {
                 String errBody = ex.response().errorBody().string();
+                LogUtils.e(ex.getMessage());
+                LogUtils.e(errBody);
                 if (!TextUtils.isEmpty(errBody)) {
                     ErrorBean errorBean = new Gson().fromJson(errBody, ErrorBean.class);
                     if (!TextUtils.isEmpty(errorBean.getMsg())) {
-                        ToastUtils.show(errorBean.getMsg());
+                        ToastUtils.show(errorBean.getMsg() + "(" + errorBean.getCode() + ")");
                     } else if (!TextUtils.isEmpty(errorBean.getMessage())) {
-                        ToastUtils.show(errorBean.getMessage());
+                        ToastUtils.show(errorBean.getMessage() + "(" + errorBean.getCode() + ")");
+                    } else if (errBody.contains("404")) {
+                        ToastUtils.show("无法连接到服务器,请检查网络连接后再试(404)");
+                    } else if (errBody.contains("500")) {
+                        ToastUtils.show("服务器发生错误(500)");
                     } else {
-                        ToastUtils.show("网络错误,请稍后重试");
+                        ToastUtils.show("服务器发生错误");
                     }
                 }
             } catch (Exception e1) {
-                ToastUtils.show("网络错误,请稍后重试");
+                ToastUtils.show("网络错误,请稍后重试(500)");
                 e1.printStackTrace();
             }
         } else if (throwable instanceof JsonParseException) {
@@ -44,7 +51,7 @@ public class ExceptionHandler {
         } else if (throwable instanceof SocketTimeoutException) {
             ToastUtils.show("网络连接超时");
         } else {
-            ToastUtils.show("网络错误,请稍后重试");
+            ToastUtils.show("服务器发生错误(500)");
         }
     }
 
diff --git a/build.gradle b/build.gradle
index 6adaebc..be1135c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -55,8 +55,8 @@ ext {
     gCompileSdkVersion = 30
     gMinSdkVersion = 21
     gTargetSdkVersion = 30
-    gVersionCode = 6
-    gVersionName = '1.0.5'
+    gVersionCode = 7
+    gVersionName = '1.0.6'
     gBuildToolsVersion = "29.0.2"
 //    gVersionCode=26
 //    gVersionName='1.3.0'