From b7305db85e84dcab2f3caf0b9b4cf49b917efbd6 Mon Sep 17 00:00:00 2001 From: gedoor Date: Tue, 24 Aug 2021 09:43:29 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=99=BB=E5=BD=95ui?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/legado/app/ui/book/login/SourceLoginActivity.kt | 2 +- .../app/ui/book/source/edit/BookSourceEditActivity.kt | 8 +++++++- app/src/main/res/layout/activity_source_login.xml | 6 +----- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/io/legado/app/ui/book/login/SourceLoginActivity.kt b/app/src/main/java/io/legado/app/ui/book/login/SourceLoginActivity.kt index 3e2e8834a..78ff2d837 100644 --- a/app/src/main/java/io/legado/app/ui/book/login/SourceLoginActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/login/SourceLoginActivity.kt @@ -25,7 +25,7 @@ class SourceLoginActivity : BaseActivity() { private fun initView(bookSource: BookSource) { if (bookSource.loginUi.isNullOrEmpty()) { supportFragmentManager.beginTransaction() - .replace(R.id.fragment, WebViewLoginFragment()) + .replace(R.id.fl_fragment, WebViewLoginFragment()) .commit() } else { RuleUiLoginDialog().show(supportFragmentManager, "ruleUiLogin") diff --git a/app/src/main/java/io/legado/app/ui/book/source/edit/BookSourceEditActivity.kt b/app/src/main/java/io/legado/app/ui/book/source/edit/BookSourceEditActivity.kt index ecc0f61fa..aa02e1448 100644 --- a/app/src/main/java/io/legado/app/ui/book/source/edit/BookSourceEditActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/source/edit/BookSourceEditActivity.kt @@ -198,7 +198,13 @@ class BookSourceEditActivity : add(EditEntity("bookSourceGroup", source?.bookSourceGroup, R.string.source_group)) add(EditEntity("bookSourceComment", source?.bookSourceComment, R.string.comment)) add(EditEntity("loginUrl", source?.loginUrl, R.string.login_url)) - add(EditEntity("loginUi", GSON.toJson(source?.loginUi), R.string.login_ui)) + add( + EditEntity( + "loginUi", + source?.loginUi?.let { GSON.toJson(source.loginUi) }, + R.string.login_ui + ) + ) add(EditEntity("loginCheckJs", source?.loginCheckJs, R.string.login_check_js)) add(EditEntity("bookUrlPattern", source?.bookUrlPattern, R.string.book_url_pattern)) add(EditEntity("header", source?.header, R.string.source_http_header)) diff --git a/app/src/main/res/layout/activity_source_login.xml b/app/src/main/res/layout/activity_source_login.xml index 20ef0c3dc..365277d30 100644 --- a/app/src/main/res/layout/activity_source_login.xml +++ b/app/src/main/res/layout/activity_source_login.xml @@ -1,12 +1,8 @@ - - \ No newline at end of file