Commit f584deef authored by wanglei's avatar wanglei

...

parent ad694826
...@@ -90,6 +90,15 @@ class DocumentFragment( ...@@ -90,6 +90,15 @@ class DocumentFragment(
currentPage.refreshData() currentPage.refreshData()
} }
fun changeProgressVisibility(show: Boolean) {
if (show) {
binding.progressBar.isIndeterminate = true
binding.progressBar.visibility = View.VISIBLE
} else {
binding.progressBar.visibility = View.INVISIBLE
}
}
private fun initSearchAdapter() { private fun initSearchAdapter() {
searchAdapter = DocumentAdapter(requireActivity()) searchAdapter = DocumentAdapter(requireActivity())
binding.rvSearch.adapter = searchAdapter binding.rvSearch.adapter = searchAdapter
......
...@@ -60,15 +60,16 @@ class DocumentPageFragment() : BaseFragment<FragmentDocumentPageBinding>(), Docu ...@@ -60,15 +60,16 @@ class DocumentPageFragment() : BaseFragment<FragmentDocumentPageBinding>(), Docu
override fun setListener() { override fun setListener() {
super.setListener() super.setListener()
binding.swipeRefreshLayout.setOnRefreshListener { binding.swipeRefreshLayout.setOnRefreshListener {
val documentFragment = requireParentFragment() as DocumentFragment?
binding.swipeRefreshLayout.isRefreshing = true binding.swipeRefreshLayout.isRefreshing = true
binding.llEmpty.visibility = View.INVISIBLE binding.llEmpty.visibility = View.INVISIBLE
binding.progressBar.visibility = View.VISIBLE documentFragment?.changeProgressVisibility(true)
binding.progressBar.isIndeterminate = true
refreshData(false) refreshData(false)
lifecycleScope.launch(Dispatchers.Main) { lifecycleScope.launch(Dispatchers.Main) {
delay(900) delay(600)
binding.swipeRefreshLayout.isRefreshing = false binding.swipeRefreshLayout.isRefreshing = false
binding.progressBar.visibility = View.GONE documentFragment?.changeProgressVisibility(false)
binding.llEmpty.isVisible = isEmpty binding.llEmpty.isVisible = isEmpty
} }
} }
......
...@@ -26,15 +26,20 @@ ...@@ -26,15 +26,20 @@
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
tools:ignore="ContentDescription" /> tools:ignore="ContentDescription" />
<androidx.cardview.widget.CardView
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/ll_bottom" android:id="@+id/ll_bottom"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="64dp" android:layout_height="wrap_content"
android:layout_marginBottom="60dp" android:layout_marginBottom="60dp"
android:orientation="horizontal" app:cardElevation="2dp"
app:layout_constraintBottom_toBottomOf="parent"> app:layout_constraintBottom_toBottomOf="parent">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="64dp"
android:orientation="horizontal">
<LinearLayout <LinearLayout
android:id="@+id/ll_document" android:id="@+id/ll_document"
android:layout_width="0dp" android:layout_width="0dp"
...@@ -245,22 +250,33 @@ ...@@ -245,22 +250,33 @@
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</androidx.cardview.widget.CardView>
<FrameLayout
<LinearLayout
android:id="@+id/fl_banner" android:id="@+id/fl_banner"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:background="@color/white"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@id/ll_bottom"> app:layout_constraintTop_toBottomOf="@id/ll_bottom">
<View
android:layout_width="wrap_content"
android:layout_height="1.5dp"
android:background="#D2D2D2" />
<ImageView <ImageView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginTop="2dp"
android:src="@mipmap/zhanweitu2" android:src="@mipmap/zhanweitu2"
android:tag="zhanweitu" android:tag="zhanweitu"
tools:ignore="ContentDescription" /> tools:ignore="ContentDescription" />
</FrameLayout>
</LinearLayout>
<FrameLayout <FrameLayout
android:id="@+id/fl_scan_guide" android:id="@+id/fl_scan_guide"
......
...@@ -7,9 +7,9 @@ ...@@ -7,9 +7,9 @@
<androidx.cardview.widget.CardView <androidx.cardview.widget.CardView
android:id="@+id/card" android:id="@+id/card"
app:cardElevation="5dp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:cardElevation="5dp"
app:layout_constraintTop_toTopOf="parent"> app:layout_constraintTop_toTopOf="parent">
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
...@@ -217,13 +217,29 @@ ...@@ -217,13 +217,29 @@
</androidx.cardview.widget.CardView> </androidx.cardview.widget.CardView>
<ProgressBar
android:id="@+id/progressBar"
style="@style/Widget.AppCompat.ProgressBar.Horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="-5dp"
android:background="@color/transparent"
android:indeterminate="true"
android:indeterminateBehavior="cycle"
android:indeterminateDuration="1200"
android:indeterminateTint="#00B8DE"
android:indeterminateTintMode="src_in"
android:visibility="invisible"
app:layout_constraintTop_toBottomOf="@id/card" />
<androidx.viewpager2.widget.ViewPager2 <androidx.viewpager2.widget.ViewPager2
android:id="@+id/viewPager2" android:id="@+id/viewPager2"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_marginTop="5dp" android:layout_marginVertical="5dp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@id/card" /> app:layout_constraintTop_toBottomOf="@id/progressBar" />
<FrameLayout <FrameLayout
......
...@@ -12,18 +12,6 @@ ...@@ -12,18 +12,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical">
<ProgressBar
android:indeterminateDuration="1600"
android:id="@+id/progressBar"
style="@style/Widget.AppCompat.ProgressBar.Horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:indeterminate="true"
android:indeterminateBehavior="cycle"
android:indeterminateTint="#00B8DE"
android:indeterminateTintMode="src_atop"
android:visibility="gone" />
<FrameLayout <FrameLayout
android:id="@+id/fl_ad" android:id="@+id/fl_ad"
android:layout_width="match_parent" android:layout_width="match_parent"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment