diff --git a/app/src/main/java/io/legado/app/model/ReadBook.kt b/app/src/main/java/io/legado/app/model/ReadBook.kt index e360c7e2a..dabde4bc8 100644 --- a/app/src/main/java/io/legado/app/model/ReadBook.kt +++ b/app/src/main/java/io/legado/app/model/ReadBook.kt @@ -73,6 +73,7 @@ object ReadBook : CoroutineScope by MainScope() { } fun resetData(book: Book) { + ReadAloud.stop(appCtx) ReadBook.book = book readRecord.bookName = book.name readRecord.readTime = appDb.readRecordDao.getReadTime(book.name) ?: 0 diff --git a/app/src/main/java/io/legado/app/ui/main/MainActivity.kt b/app/src/main/java/io/legado/app/ui/main/MainActivity.kt index 5b735c57d..feaf38e49 100644 --- a/app/src/main/java/io/legado/app/ui/main/MainActivity.kt +++ b/app/src/main/java/io/legado/app/ui/main/MainActivity.kt @@ -396,14 +396,9 @@ class MainActivity : VMBaseActivity(), private inner class PageChangeCallback : ViewPager.SimpleOnPageChangeListener() { override fun onPageSelected(position: Int) { - val oldPosition = pagePosition pagePosition = position binding.bottomNavigationView.menu .getItem(realPositions[position]).isChecked = true - val callback1 = fragmentMap[getFragmentId(position)] as? Callback - val callback2 = fragmentMap[getFragmentId(oldPosition)] as? Callback - callback1?.onActive() - callback2?.onInactive() } } @@ -453,12 +448,4 @@ class MainActivity : VMBaseActivity(), } - interface Callback { - - fun onActive() - - fun onInactive() - - } - } \ No newline at end of file diff --git a/app/src/main/java/io/legado/app/ui/main/explore/ExploreFragment.kt b/app/src/main/java/io/legado/app/ui/main/explore/ExploreFragment.kt index a54deb085..161201a69 100644 --- a/app/src/main/java/io/legado/app/ui/main/explore/ExploreFragment.kt +++ b/app/src/main/java/io/legado/app/ui/main/explore/ExploreFragment.kt @@ -25,7 +25,6 @@ import io.legado.app.ui.book.explore.ExploreShowActivity import io.legado.app.ui.book.search.SearchActivity import io.legado.app.ui.book.search.SearchScope import io.legado.app.ui.book.source.edit.BookSourceEditActivity -import io.legado.app.ui.main.MainActivity import io.legado.app.ui.main.MainFragmentInterface import io.legado.app.utils.applyTint import io.legado.app.utils.cnCompare @@ -47,8 +46,7 @@ import kotlinx.coroutines.launch */ class ExploreFragment() : VMBaseFragment(R.layout.fragment_explore), MainFragmentInterface, - ExploreAdapter.CallBack, - MainActivity.Callback { + ExploreAdapter.CallBack { constructor(position: Int) : this() { val bundle = Bundle() @@ -69,7 +67,6 @@ class ExploreFragment() : VMBaseFragment(R.layout.fragment_exp private val groups = linkedSetOf() private var exploreFlowJob: Job? = null private var groupsMenu: SubMenu? = null - private var isActive = false private var searchKey: String? = null override fun onFragmentCreated(view: View, savedInstanceState: Bundle?) { @@ -234,19 +231,4 @@ class ExploreFragment() : VMBaseFragment(R.layout.fragment_exp } } - override fun onActive() { - isActive = true - upExploreData(searchKey) - } - - override fun onInactive() { - isActive = false - exploreFlowJob?.cancel() - } - - override fun onResume() { - super.onResume() - if (isActive) upExploreData(searchKey) - } - }