From d7b4444e3ee9970b4406b54cce1daf7140a7db7d Mon Sep 17 00:00:00 2001 From: kunfei Date: Sat, 26 Oct 2019 16:29:52 +0800 Subject: [PATCH] up --- .../main/java/io/legado/app/ui/explore/ExploreShowActivity.kt | 4 ++++ .../main/java/io/legado/app/ui/widget/anima/RotateLoading.kt | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/io/legado/app/ui/explore/ExploreShowActivity.kt b/app/src/main/java/io/legado/app/ui/explore/ExploreShowActivity.kt index 3535b8e4b..2cb9c2647 100644 --- a/app/src/main/java/io/legado/app/ui/explore/ExploreShowActivity.kt +++ b/app/src/main/java/io/legado/app/ui/explore/ExploreShowActivity.kt @@ -12,6 +12,7 @@ import io.legado.app.base.VMBaseActivity import io.legado.app.data.entities.SearchBook import io.legado.app.ui.book.info.BookInfoActivity import io.legado.app.utils.getViewModel +import io.legado.app.utils.visible import kotlinx.android.synthetic.main.activity_explore_show.* import kotlinx.android.synthetic.main.view_load_more.view.* import org.jetbrains.anko.startActivity @@ -66,14 +67,17 @@ class ExploreShowActivity : VMBaseActivity(R.layout.activi hasMore = false loadMoreView.rotate_loading.hide(View.INVISIBLE) loadMoreView.tv_text.text = "空" + loadMoreView.tv_text.visible() } else if (books.isEmpty()) { hasMore = false loadMoreView.rotate_loading.hide(View.INVISIBLE) loadMoreView.tv_text.text = "我是有底线的" + loadMoreView.tv_text.visible() } else if (adapter.getItems().contains(books.first()) && adapter.getItems().contains(books.last())) { hasMore = false loadMoreView.rotate_loading.hide(View.INVISIBLE) loadMoreView.tv_text.text = "我是有底线的" + loadMoreView.tv_text.visible() } else { adapter.addItems(books) } diff --git a/app/src/main/java/io/legado/app/ui/widget/anima/RotateLoading.kt b/app/src/main/java/io/legado/app/ui/widget/anima/RotateLoading.kt index 73b94c880..96b94c66b 100644 --- a/app/src/main/java/io/legado/app/ui/widget/anima/RotateLoading.kt +++ b/app/src/main/java/io/legado/app/ui/widget/anima/RotateLoading.kt @@ -189,7 +189,7 @@ class RotateLoading : View { } private fun stopInternal(visibility: Int = GONE) { - stopAnimator() + stopAnimator(visibility) invalidate() }