修复登录ui

pull/1264/head
gedoor 4 years ago
parent 11237719ba
commit b7305db85e
  1. 2
      app/src/main/java/io/legado/app/ui/book/login/SourceLoginActivity.kt
  2. 8
      app/src/main/java/io/legado/app/ui/book/source/edit/BookSourceEditActivity.kt
  3. 6
      app/src/main/res/layout/activity_source_login.xml

@ -25,7 +25,7 @@ class SourceLoginActivity : BaseActivity<ActivitySourceLoginBinding>() {
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")

@ -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))

@ -1,12 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/fl_fragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<View
android:id="@+id/fragment"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</LinearLayout>
Loading…
Cancel
Save