From decb5c5275ca0e0427bad9494d42b528d3285633 Mon Sep 17 00:00:00 2001 From: gedoor Date: Mon, 14 Dec 2020 16:33:10 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/io/legado/app/help/http/StrResponse.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/io/legado/app/help/http/StrResponse.kt b/app/src/main/java/io/legado/app/help/http/StrResponse.kt index 823a0ba30..3533bbd17 100644 --- a/app/src/main/java/io/legado/app/help/http/StrResponse.kt +++ b/app/src/main/java/io/legado/app/help/http/StrResponse.kt @@ -13,14 +13,14 @@ class StrResponse private constructor( val body: String?, val errorBody: ResponseBody? ) { - val raw get() = rawResponse + fun raw() = rawResponse val url: String get() { - raw.networkResponse?.let { + rawResponse.networkResponse?.let { return it.request.url.toString() } - return raw.request.url.toString() + return rawResponse.request.url.toString() } fun code(): Int { From 33f61d88c28bfa56d8d3a33a8f69cf6ef0f0fa53 Mon Sep 17 00:00:00 2001 From: gedoor Date: Mon, 14 Dec 2020 16:39:18 +0800 Subject: [PATCH 2/4] update updateLog.md --- app/src/main/assets/updateLog.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/src/main/assets/updateLog.md b/app/src/main/assets/updateLog.md index 7cf284b4d..751f4906d 100644 --- a/app/src/main/assets/updateLog.md +++ b/app/src/main/assets/updateLog.md @@ -3,6 +3,10 @@ * 关注合作公众号 **[小说拾遗]** 获取好看的小说。 * 旧版数据导入教程:先在旧版阅读(2.x)中进行备份,然后在新版阅读(3.x)【我的】->【备份与恢复】,选择【导入旧版本数据】。 +**2020/12/14** +* 修复bug +* 电池图标不允许改字体 + **2020/12/13** * 修复bug * 网络访问框架修改为RxHttp, 有bug及时反馈 From f59131aa0551f9fe2b2db1bff5f76a09b80324bb Mon Sep 17 00:00:00 2001 From: gedoor Date: Mon, 14 Dec 2020 16:41:11 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/legado/app/help/http/StrResponse.kt | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/io/legado/app/help/http/StrResponse.kt b/app/src/main/java/io/legado/app/help/http/StrResponse.kt index 3533bbd17..19255c47e 100644 --- a/app/src/main/java/io/legado/app/help/http/StrResponse.kt +++ b/app/src/main/java/io/legado/app/help/http/StrResponse.kt @@ -15,13 +15,12 @@ class StrResponse private constructor( ) { fun raw() = rawResponse - val url: String - get() { - rawResponse.networkResponse?.let { - return it.request.url.toString() - } - return rawResponse.request.url.toString() + fun url(): String { + rawResponse.networkResponse?.let { + return it.request.url.toString() } + return rawResponse.request.url.toString() + } fun code(): Int { return rawResponse.code @@ -35,8 +34,7 @@ class StrResponse private constructor( return rawResponse.headers } - val isSuccessful: Boolean - get() = rawResponse.isSuccessful + fun isSuccessful(): Boolean = rawResponse.isSuccessful fun errorBody(): ResponseBody? { return errorBody From 56bbe790978cee9ba57190efb89d6b2ee10ee268 Mon Sep 17 00:00:00 2001 From: gedoor Date: Mon, 14 Dec 2020 16:44:08 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/io/legado/app/model/webBook/WebBook.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/io/legado/app/model/webBook/WebBook.kt b/app/src/main/java/io/legado/app/model/webBook/WebBook.kt index 7a1c29a05..7b2235aab 100644 --- a/app/src/main/java/io/legado/app/model/webBook/WebBook.kt +++ b/app/src/main/java/io/legado/app/model/webBook/WebBook.kt @@ -52,7 +52,7 @@ class WebBook(val bookSource: BookSource) { res.body, bookSource, analyzeUrl, - res.url, + res.url(), variableBook, true ) @@ -83,7 +83,7 @@ class WebBook(val bookSource: BookSource) { res.body, bookSource, analyzeUrl, - res.url, + res.url(), variableBook, false )