| 优化异常信息展示

+ 优化下拉刷新/上拉加载动画
- 去除过度下拉刷新彩蛋

README.md

@@ -83,7 +83,7 @@ implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.0'
 // 支持自动下拉刷新和缺省页的, 可选, 刷新头和上拉加载参考SmartRefreshLayout
 implementation 'com.github.liangjingkanji:BRV:1.2.1'
 
-implementation 'com.github.liangjingkanji:Net:2.1.4'
+implementation 'com.github.liangjingkanji:Net:2.1.5'
 ```
 
 

build.gradle

@@ -5,7 +5,7 @@ buildscript {
 
     ext {
         kotlin_version = '1.3.61'
-        brv_version = '1.2.11'
+        brv_version = '1.2.12'
         coroutine_version = '1.3.0'
         glide_version = '4.9.0'
     }

kalle/src/main/java/com/yanzhenjie/kalle/connect/http/ConnectInterceptor.java

@@ -113,7 +113,7 @@ class ConnectInterceptor implements Interceptor {
      */
     private Connection connect(Request request) throws NetException {
         if (!mNetwork.isAvailable())
-            throw new NetworkError(request, "Network Unavailable: ");
+            throw new NetworkError(request, "Network Unavailable");
 
         try {
             Headers headers = request.headers();
@@ -124,15 +124,15 @@ class ConnectInterceptor implements Interceptor {
             headers.set(KEY_HOST, uri.getHost());
             return mFactory.connect(request);
         } catch (URISyntaxException e) {
-            throw new URLError(request, "The url syntax error: ", e);
+            throw new URLError(request, "The url syntax error", e);
         } catch (MalformedURLException e) {
-            throw new URLError(request, "The url is malformed: ", e);
+            throw new URLError(request, "The url is malformed", e);
         } catch (UnknownHostException e) {
-            throw new HostError(request, "Hostname can not be resolved: ", e);
+            throw new HostError(request, "Hostname can not be resolved", e);
         } catch (SocketTimeoutException e) {
-            throw new ConnectTimeoutError(request, "Connect time out: ", e);
+            throw new ConnectTimeoutError(request, "Connect time out", e);
         } catch (Exception e) {
-            throw new ConnectException(request, "An unknown exception: ", e);
+            throw new ConnectException(request, "An unknown exception", e);
         }
     }
 
@@ -142,7 +142,7 @@ class ConnectInterceptor implements Interceptor {
             request.body().writeTo(IOUtils.toBufferedOutputStream(stream));
             IOUtils.closeQuietly(stream);
         } catch (Exception e) {
-            throw new WriteException(request, null, e);
+            throw new WriteException(request, e);
         }
     }
 
@@ -159,9 +159,9 @@ class ConnectInterceptor implements Interceptor {
             ResponseBody body = new StreamBody(contentType, mConnection.getInputStream());
             return Response.newBuilder().code(code).headers(headers).body(body).build();
         } catch (SocketTimeoutException e) {
-            throw new ReadTimeoutError(request, "Read data time out: ", e);
+            throw new ReadTimeoutError(request, "Read data time out", e);
         } catch (Exception e) {
-            throw new ReadException(request, null, e);
+            throw new ReadException(request, e);
         }
     }
 

kalle/src/main/java/com/yanzhenjie/kalle/download/BasicWorker.java

@@ -90,7 +90,7 @@ public abstract class BasicWorker<T extends Download> implements Callable<String
             }
 
             if (!mPolicy.allowDownload(code, comeHeaders)) {
-                throw new DownloadError(code, comeHeaders, mDownload.request(), "The download policy prohibits the program from continuing to download: ");
+                throw new DownloadError(code, comeHeaders, mDownload.request(), "The download policy prohibits the program from continuing to download");
             }
 
             File file = new File(mDirectory, mFileName);

kalle/src/main/java/com/yanzhenjie/kalle/exception/ConnectException.kt

@@ -22,6 +22,6 @@ import com.yanzhenjie.kalle.Request
  */
 open class ConnectException(
     request: Request,
-    message: String? = null,
+    message: String = "",
     cause: Throwable? = null
 ) : NetException(request, message, cause)

kalle/src/main/java/com/yanzhenjie/kalle/exception/ConnectTimeoutError.kt

@@ -22,6 +22,6 @@ import com.yanzhenjie.kalle.Request
  */
 class ConnectTimeoutError(
     request: Request,
-    message: String? = null,
+    message: String = "",
     cause: Throwable? = null
 ) : NetException(request, message, cause)

kalle/src/main/java/com/yanzhenjie/kalle/exception/DownloadError.kt

@@ -25,5 +25,5 @@ class DownloadError(
     code: Int,
     headers: Headers,
     request: Request,
-    message: String? = null
+    message: String = ""
 ) : NetException(request, message)

kalle/src/main/java/com/yanzhenjie/kalle/exception/HostError.kt

@@ -22,6 +22,6 @@ import com.yanzhenjie.kalle.Request
  */
 class HostError(
     request: Request,
-    message: String? = null,
+    message: String = "",
     cause: Throwable? = null
 ) : NetException(request, message, cause)

kalle/src/main/java/com/yanzhenjie/kalle/exception/NetException.kt

@@ -13,6 +13,6 @@ import java.io.IOException
 
 open class NetException(
     val request: Request,
-    message: String? = null,
+    message: String = "",
     cause: Throwable? = null
-) : IOException(message + request.location(), cause)
+) : IOException("$message [${request.location()}]", cause)

kalle/src/main/java/com/yanzhenjie/kalle/exception/NetworkError.kt

@@ -22,5 +22,5 @@ import com.yanzhenjie.kalle.Request
  */
 class NetworkError(
     request: Request,
-    message: String? = null
+    message: String = ""
 ) : NetException(request, message)

kalle/src/main/java/com/yanzhenjie/kalle/exception/NoCacheError.kt

@@ -22,5 +22,5 @@ import com.yanzhenjie.kalle.Request
  */
 class NoCacheError(
     request: Request,
-    message: String? = null
+    message: String = ""
 ) : NetException(request, message)

kalle/src/main/java/com/yanzhenjie/kalle/exception/ParseError.kt

@@ -22,6 +22,6 @@ import com.yanzhenjie.kalle.Request
  */
 class ParseError(
     request: Request,
-    message: String? = null,
+    message: String = "",
     cause: Throwable? = null
 ) : NetException(request, message, cause)

kalle/src/main/java/com/yanzhenjie/kalle/exception/ReadException.kt

@@ -22,6 +22,5 @@ import com.yanzhenjie.kalle.Request
  */
 open class ReadException(
     request: Request,
-    message: String? = null,
     cause: Throwable? = null
-) : NetException(request, message, cause)
+) : NetException(request, cause = cause)

kalle/src/main/java/com/yanzhenjie/kalle/exception/ReadTimeoutError.kt

@@ -22,6 +22,6 @@ import com.yanzhenjie.kalle.Request
  */
 class ReadTimeoutError(
     request: Request,
-    message: String? = null,
+    message: String = "",
     cause: Throwable? = null
 ) : NetException(request, message, cause)

kalle/src/main/java/com/yanzhenjie/kalle/exception/URLError.kt

@@ -22,6 +22,6 @@ import com.yanzhenjie.kalle.Request
  */
 class URLError(
     request: Request,
-    message: String? = null,
+    message: String = "",
     cause: Throwable? = null
 ) : NetException(request, message, cause)

kalle/src/main/java/com/yanzhenjie/kalle/exception/WriteException.kt

@@ -22,6 +22,5 @@ import com.yanzhenjie.kalle.Request
  */
 class WriteException constructor(
     request: Request,
-    message: String? = null,
     cause: Throwable? = null
-) : NetException(request, message, cause)
+) : NetException(request, cause = cause)

kalle/src/main/java/com/yanzhenjie/kalle/simple/BasicWorker.java

@@ -134,7 +134,7 @@ abstract class BasicWorker<T extends SimpleRequest, Succeed, Failed>
                 if (cache != null) {
                     return buildResponse(cache.getCode(), cache.getHeaders(), cache.getBody());
                 }
-                throw new NoCacheError(mRequest.request(), "No cache found: ");
+                throw new NoCacheError(mRequest.request(), "No cache found");
             }
             case READ_CACHE_NO_THEN_NETWORK:
             case READ_CACHE_NO_THEN_HTTP: {
@@ -293,14 +293,14 @@ abstract class BasicWorker<T extends SimpleRequest, Succeed, Failed>
             mConverter.convert(mSucceed, mFailed, mRequest.request(), response, result);
 
             if (result.getSuccess() == null && result.getFailure() == null) {
-                throw new ParseError(mRequest.request(), mConverter.getClass().getName() + " does not process result: ", null);
+                throw new ParseError(mRequest.request(), mConverter.getClass().getName() + " does not process result", null);
             }
 
             return result;
         } catch (NetException e) {
             throw e;
         } catch (Exception e) {
-            throw new ParseError(mRequest.request(), "An exception occurred while parsing the data: ", e);
+            throw new ParseError(mRequest.request(), "An exception occurred while parsing the data", e);
         }
     }
 }