From 427b71fabd42d72cc3e414f609b455c9c1fbd538 Mon Sep 17 00:00:00 2001 From: gedoor Date: Wed, 8 Sep 2021 20:10:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/assets/updateLog.md | 6 ++++++ .../io/legado/app/ui/book/info/BookInfoActivity.kt | 9 ++++----- .../legado/app/ui/rss/article/RssSortActivity.kt | 14 ++++++-------- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/app/src/main/assets/updateLog.md b/app/src/main/assets/updateLog.md index 56ca06009..d27f50682 100644 --- a/app/src/main/assets/updateLog.md +++ b/app/src/main/assets/updateLog.md @@ -12,6 +12,12 @@ * 漫画源看书显示乱码,**阅读与其他软件的源并不通用**,请导入阅读的支持的漫画源! * 关于最近版本有时候界面没有数据的问题是因为把LiveData组件换成了谷歌推荐的Flow组件导致的问题,正在查找解决办法 +**2021/09/08** + +1. 优化离线缓存 +2. 听书界面添加登录菜单,和拷贝播放url +3. + **2021/09/06** 1. 采用exoPlayer播放音频,支持更多格式 diff --git a/app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt b/app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt index 4218bb3e6..a9a95113d 100644 --- a/app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt @@ -84,7 +84,7 @@ class BookInfoActivity : } } private val infoEditResult = registerForActivityResult( - ActivityResultContracts.StartActivityForResult() + StartActivityForResult(BookInfoEditActivity::class.java) ) { if (it.resultCode == RESULT_OK) { viewModel.upEditBook() @@ -127,10 +127,9 @@ class BookInfoActivity : R.id.menu_edit -> { if (viewModel.inBookshelf) { viewModel.bookData.value?.let { - infoEditResult.launch( - Intent(this, BookInfoEditActivity::class.java) - .putExtra("bookUrl", it.bookUrl) - ) + infoEditResult.launch { + putExtra("bookUrl", it.bookUrl) + } } } else { toastOnUi(R.string.after_add_bookshelf) diff --git a/app/src/main/java/io/legado/app/ui/rss/article/RssSortActivity.kt b/app/src/main/java/io/legado/app/ui/rss/article/RssSortActivity.kt index dffc88a7c..8d8f2e36c 100644 --- a/app/src/main/java/io/legado/app/ui/rss/article/RssSortActivity.kt +++ b/app/src/main/java/io/legado/app/ui/rss/article/RssSortActivity.kt @@ -2,12 +2,10 @@ package io.legado.app.ui.rss.article -import android.content.Intent import android.os.Bundle import android.view.Menu import android.view.MenuItem import android.view.ViewGroup -import androidx.activity.result.contract.ActivityResultContracts import androidx.activity.viewModels import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentStatePagerAdapter @@ -15,6 +13,7 @@ import io.legado.app.R import io.legado.app.base.VMBaseActivity import io.legado.app.databinding.ActivityRssArtivlesBinding import io.legado.app.ui.rss.source.edit.RssSourceEditActivity +import io.legado.app.utils.StartActivityForResult import io.legado.app.utils.gone import io.legado.app.utils.viewbindingdelegate.viewBinding import io.legado.app.utils.visible @@ -26,8 +25,8 @@ class RssSortActivity : VMBaseActivity>() private val fragmentMap = hashMapOf() - private val upSourceResult = registerForActivityResult( - ActivityResultContracts.StartActivityForResult() + private val editSourceResult = registerForActivityResult( + StartActivityForResult(RssSourceEditActivity::class.java) ) { if (it.resultCode == RESULT_OK) { viewModel.initData(intent) { @@ -56,10 +55,9 @@ class RssSortActivity : VMBaseActivity viewModel.rssSource?.sourceUrl?.let { - upSourceResult.launch( - Intent(this, RssSourceEditActivity::class.java) - .putExtra("data", it) - ) + editSourceResult.launch { + putExtra("data", it) + } } R.id.menu_clear -> { viewModel.url?.let {