Commit 9ffe3182 authored by wanglei's avatar wanglei

...

parent cad725df
...@@ -23,7 +23,6 @@ import com.base.pdfviewerscannerwhite.helper.MyApplication ...@@ -23,7 +23,6 @@ import com.base.pdfviewerscannerwhite.helper.MyApplication
import com.base.pdfviewerscannerwhite.ui.main.MainActivity import com.base.pdfviewerscannerwhite.ui.main.MainActivity
import com.base.pdfviewerscannerwhite.ui.splash.SplashActivity import com.base.pdfviewerscannerwhite.ui.splash.SplashActivity
import com.base.pdfviewerscannerwhite.utils.LogEx import com.base.pdfviewerscannerwhite.utils.LogEx
import com.cherry.lib.doc.office.system.IFind
import kotlin.random.Random import kotlin.random.Random
......
...@@ -63,12 +63,15 @@ class DocumentPageFragment() : BaseFragment<FragmentDocumentPageBinding>(), Docu ...@@ -63,12 +63,15 @@ class DocumentPageFragment() : BaseFragment<FragmentDocumentPageBinding>(), Docu
val documentFragment = requireParentFragment() as DocumentFragment? val documentFragment = requireParentFragment() as DocumentFragment?
binding.swipeRefreshLayout.isRefreshing = true binding.swipeRefreshLayout.isRefreshing = true
binding.llEmpty.visibility = View.INVISIBLE binding.llEmpty.visibility = View.INVISIBLE
documentFragment?.changeProgressVisibility(true)
refreshData(false) refreshData(false)
lifecycleScope.launch(Dispatchers.Main) { lifecycleScope.launch(Dispatchers.Main) {
delay(600) delay(600)
binding.swipeRefreshLayout.isRefreshing = false binding.swipeRefreshLayout.isRefreshing = false
documentFragment?.changeProgressVisibility(true)
delay(600)
documentFragment?.changeProgressVisibility(false) documentFragment?.changeProgressVisibility(false)
binding.llEmpty.isVisible = isEmpty binding.llEmpty.isVisible = isEmpty
} }
......
...@@ -47,7 +47,6 @@ import com.base.pdfviewerscannerwhite.utils.LogEx ...@@ -47,7 +47,6 @@ import com.base.pdfviewerscannerwhite.utils.LogEx
import com.base.pdfviewerscannerwhite.utils.PermissionUtils.checkNotificationPermission import com.base.pdfviewerscannerwhite.utils.PermissionUtils.checkNotificationPermission
import com.base.pdfviewerscannerwhite.utils.PermissionUtils.checkStorePermission import com.base.pdfviewerscannerwhite.utils.PermissionUtils.checkStorePermission
import com.base.pdfviewerscannerwhite.utils.ShortcutUtils.addDeskShortCut import com.base.pdfviewerscannerwhite.utils.ShortcutUtils.addDeskShortCut
import com.base.pdfviewerscannerwhite.utils.UmpUtils
import com.base.pdfviewerscannerwhite.utils.updateMediaStore import com.base.pdfviewerscannerwhite.utils.updateMediaStore
import java.io.File import java.io.File
......
...@@ -26,19 +26,22 @@ ...@@ -26,19 +26,22 @@
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="wrap_content" android:layout_height="64dp"
android:layout_marginBottom="60dp" android:layout_marginBottom="60dp"
android:background="@color/white"
android:orientation="horizontal"
app:cardElevation="2dp" app:cardElevation="2dp"
app:layout_constraintBottom_toBottomOf="parent"> app:layout_constraintBottom_toBottomOf="parent">
<androidx.constraintlayout.widget.ConstraintLayout <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="64dp" android:layout_height="1dp"
android:background="@color/white" android:background="#F5F5F5"
android:orientation="horizontal"> app:layout_constraintTop_toTopOf="parent" />
<LinearLayout <LinearLayout
android:id="@+id/ll_document" android:id="@+id/ll_document"
...@@ -250,8 +253,6 @@ ...@@ -250,8 +253,6 @@
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</androidx.cardview.widget.CardView>
<LinearLayout <LinearLayout
android:id="@+id/fl_banner" android:id="@+id/fl_banner"
......
...@@ -5,6 +5,23 @@ ...@@ -5,6 +5,23 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<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:elevation="0dp"
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.cardview.widget.CardView <androidx.cardview.widget.CardView
android:id="@+id/card" android:id="@+id/card"
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -218,28 +235,13 @@ ...@@ -218,28 +235,13 @@
</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_marginVertical="5dp" android:layout_marginTop="5dp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@id/progressBar" /> app:layout_constraintTop_toBottomOf="@id/card" />
<FrameLayout <FrameLayout
......
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv" android:id="@+id/rv"
android:background="#F4F5FA"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
......
...@@ -8,17 +8,23 @@ ...@@ -8,17 +8,23 @@
android:clickable="true" android:clickable="true"
android:focusable="true"> android:focusable="true">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
app:layout_constraintTop_toTopOf="parent">
<ImageView <ImageView
android:id="@+id/iv" android:id="@+id/iv"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginVertical="15dp" android:layout_marginVertical="15dp"
android:layout_marginStart="15dp" android:layout_marginStart="15dp"
android:src="@mipmap/h_pdfiocn"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
tools:ignore="ContentDescription" tools:ignore="ContentDescription" />
android:src="@mipmap/h_pdfiocn" />
<FrameLayout <FrameLayout
...@@ -120,4 +126,7 @@ ...@@ -120,4 +126,7 @@
tools:text="2024-09-10 590.23 KB" /> tools:text="2024-09-10 590.23 KB" />
</LinearLayout> </LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
<com.google.android.gms.ads.nativead.NativeAdView xmlns:android="http://schemas.android.com/apk/res/android" <com.google.android.gms.ads.nativead.NativeAdView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#F4F5FA">
<FrameLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="99dp" android:layout_height="99dp"
android:layout_margin="10dp" android:layout_margin="10dp"
...@@ -10,7 +15,8 @@ ...@@ -10,7 +15,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_margin="8dp" android:layout_margin="8dp"
android:baselineAligned="false"> android:baselineAligned="false"
tools:ignore="UselessParent">
<com.google.android.gms.ads.nativead.MediaView <com.google.android.gms.ads.nativead.MediaView
android:id="@+id/ad_media" android:id="@+id/ad_media"
...@@ -89,5 +95,6 @@ ...@@ -89,5 +95,6 @@
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</FrameLayout>
</com.google.android.gms.ads.nativead.NativeAdView> </com.google.android.gms.ads.nativead.NativeAdView>
\ No newline at end of file
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