Ling0925
/
TiebaLite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 修复看图出现双重进度条

This commit is contained in:
HuanChengFly 2020-07-16 16:04:17 +08:00
parent d5590dabe0
commit 2ca8738ecc
2 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/com/huanchengfly/tieba/post/activities/PhotoViewActivity.kt
View File

@ -11,7 +11,6 @@ import android.os.Bundle
import android.os.Handler import android.os.Handler
import android.view.MenuItem import android.view.MenuItem
import android.view.View import android.view.View
import android.widget.ProgressBar
import android.widget.TextView import android.widget.TextView
import android.widget.Toast import android.widget.Toast
import androidx.appcompat.widget.Toolbar import androidx.appcompat.widget.Toolbar
@ -37,8 +36,6 @@ import retrofit2.Response
import java.util.* import java.util.*
class PhotoViewActivity : BaseActivity(), OnChangeBottomBarVisibilityListener, Toolbar.OnMenuItemClickListener { class PhotoViewActivity : BaseActivity(), OnChangeBottomBarVisibilityListener, Toolbar.OnMenuItemClickListener {
@BindView(R.id.progressBar)
lateinit var progressBar: ProgressBar
@BindView(R.id.counter) @BindView(R.id.counter)
lateinit var mCounter: TextView lateinit var mCounter: TextView
@BindView(R.id.bottom_app_bar) @BindView(R.id.bottom_app_bar)
@ -63,14 +60,12 @@ class PhotoViewActivity : BaseActivity(), OnChangeBottomBarVisibilityListener, T
private fun loadMore() { private fun loadMore() {
if (loadFinished) { if (loadFinished) {
progressBar.visibility = View.GONE
return return
} }
if (mLoading) { if (mLoading) {
return return
} }
mLoading = true mLoading = true
progressBar.visibility = View.VISIBLE
val lastBean = photoViewBeans[photoViewBeans.size - 1] val lastBean = photoViewBeans[photoViewBeans.size - 1]
getInstance().picPage( getInstance().picPage(
forumId!!, forumId!!,
@ -84,7 +79,6 @@ class PhotoViewActivity : BaseActivity(), OnChangeBottomBarVisibilityListener, T
override fun onResponse(call: Call<PicPageBean?>, response: Response<PicPageBean?>) { override fun onResponse(call: Call<PicPageBean?>, response: Response<PicPageBean?>) {
val data = response.body()!! val data = response.body()!!
mLoading = false mLoading = false
progressBar.visibility = View.GONE
amount = data.picAmount ?: "${photoViewBeans.size}" amount = data.picAmount ?: "${photoViewBeans.size}"
updateCounter(mViewPager.currentItem) updateCounter(mViewPager.currentItem)
val picBeans: MutableList<PicPageBean.PicBean> = ArrayList() val picBeans: MutableList<PicPageBean.PicBean> = ArrayList()
@ -121,7 +115,6 @@ class PhotoViewActivity : BaseActivity(), OnChangeBottomBarVisibilityListener, T
override fun onFailure(call: Call<PicPageBean?>, t: Throwable) { override fun onFailure(call: Call<PicPageBean?>, t: Throwable) {
mLoading = false mLoading = false
progressBar.visibility = View.GONE
} }
}) })
} }
@ -172,7 +165,6 @@ class PhotoViewActivity : BaseActivity(), OnChangeBottomBarVisibilityListener, T
} }
}) })
if (isFrs) { if (isFrs) {
progressBar.visibility = View.VISIBLE
loadFrs() loadFrs()
} }
} }

8
app/src/main/res/layout/activity_photo_view.xml
View File

@ -7,14 +7,6 @@
android:id="@+id/background" android:id="@+id/background"
android:background="@color/black" android:background="@color/black"
tools:context=".activities.PhotoViewActivity"> tools:context=".activities.PhotoViewActivity">
<com.huanchengfly.tieba.widgets.theme.TintProgressBar
android:id="@+id/progressBar"
android:visibility="gone"
android:layout_gravity="center"
app:progressTint="@color/default_color_accent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/Widget.AppCompat.ProgressBar"/>
<androidx.viewpager2.widget.ViewPager2 <androidx.viewpager2.widget.ViewPager2
android:orientation="horizontal" android:orientation="horizontal"
app:layout_behavior="@string/appbar_scrolling_view_behavior" app:layout_behavior="@string/appbar_scrolling_view_behavior"