Merge remote-tracking branch 'origin/master'

app/build.gradle

@@ -78,6 +78,8 @@ dependencies {
     implementation("com.airbnb.android:lottie:6.4.0")
     implementation("com.github.bumptech.glide:glide:4.16.0")
     implementation("com.github.pokercc:ExpandableRecyclerView:0.9.3")
+//    implementation 'com.github.zhpanvip:viewpagerindicator:latestVersion'
+    implementation 'com.github.zhpanvip:viewpagerindicator:1.2.3'
 
     //网络
     implementation group: 'com.google.code.gson', name: 'gson', version: '2.10.1'

app/src/main/java/com/base/datarecovery/activity/guide/GuideActivity.kt

 package com.base.datarecovery.activity.guide
 
 import android.graphics.Color
-import android.os.Bundle
-import androidx.activity.enableEdgeToEdge
-import androidx.appcompat.app.AppCompatActivity
-import androidx.core.view.ViewCompat
-import androidx.core.view.WindowInsetsCompat
+import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
 import androidx.viewpager2.adapter.FragmentStateAdapter
 import androidx.viewpager2.widget.ViewPager2
@@ -14,6 +10,8 @@ import com.base.datarecovery.databinding.ActivityGuideBinding
 import com.base.datarecovery.fragment.GuideFragment
 import com.base.datarecovery.help.BaseActivity
 import com.base.datarecovery.utils.BarUtils
+import com.zhpan.indicator.enums.IndicatorSlideMode
+import com.zhpan.indicator.enums.IndicatorStyle
 
 class GuideActivity : BaseActivity<ActivityGuideBinding>() {
 
@@ -57,6 +55,16 @@ class GuideActivity : BaseActivity<ActivityGuideBinding>() {
             override fun onPageSelected(position: Int) {
             }
         })
+
+        val normalColor = ContextCompat.getColor(this, R.color.color_cccccc)
+        val selectedColor = ContextCompat.getColor(this, R.color.color_4f86eb)
+        binding.indicatorView
+            .setSliderColor(normalColor, selectedColor)
+            .setSliderWidth(resources.getDimension(R.dimen.dp_9))
+            .setSliderHeight(resources.getDimension(R.dimen.dp_9))
+            .setSlideMode(IndicatorSlideMode.WORM)
+            .setIndicatorStyle(IndicatorStyle.CIRCLE)
+            .setupWithViewPager(binding.viewpager2)
     }
 
 }
\ No newline at end of file

app/src/main/java/com/base/datarecovery/fragment/GuideFragment.kt

@@ -10,9 +10,11 @@ import android.view.ViewGroup
 import com.base.datarecovery.R
 import com.base.datarecovery.activity.MainActivity
 import com.base.datarecovery.activity.guide.GuideActivity
+import com.base.datarecovery.ads.AdmobMaxHelper
 import com.base.datarecovery.bean.ConstObject.isGuide
 import com.base.datarecovery.databinding.FragmentGuideBinding
 import com.base.datarecovery.help.BaseFragment
+import com.base.datarecovery.utils.AppPreferences
 
 class GuideFragment(
     val page: Int
@@ -45,16 +47,26 @@ class GuideFragment(
             if (page == 1) {
                 (requireActivity() as GuideActivity).setPosition(1)
             } else {
+                jumpMain()
+            }
+        }
+        binding.flSkip.setOnClickListener {
+            jumpMain()
+        }
+    }
+
+    private fun jumpMain() {
+        val showAd = AppPreferences.getInstance().getString("isShowGuideAd", "1")?.toInt()
+        if (showAd == 1) {
+            AdmobMaxHelper.admobMaxShowInterstitialAd(requireActivity()) {
                 startActivity(Intent(requireContext(), MainActivity::class.java))
                 requireActivity().finish()
                 isGuide = true
             }
-        }
-        binding.flSkip.setOnClickListener {
+        } else {
             startActivity(Intent(requireContext(), MainActivity::class.java))
             requireActivity().finish()
             isGuide = true
         }
     }
-
 }
\ No newline at end of file

app/src/main/res/layout/activity_guide.xml

@@ -12,17 +12,19 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
+
     <ImageView
         android:id="@+id/iv"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:src="@mipmap/ydytu1"
+        android:visibility="invisible"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0.25"
-        tools:ignore="ContentDescription"
-        tools:src="@mipmap/ydytu1" />
+        tools:ignore="ContentDescription" />
 
     <View
         android:id="@+id/ll"
@@ -32,22 +34,27 @@
         android:orientation="vertical"
         app:layout_constraintEnd_toEndOf="@id/iv"
         app:layout_constraintStart_toStartOf="@id/iv"
-        app:layout_constraintTop_toBottomOf="@id/iv">
-
-    </View>
+        app:layout_constraintTop_toBottomOf="@id/iv" />
 
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="0dp"
         app:layout_constraintBottom_toTopOf="@id/tv_btn"
-        app:layout_constraintTop_toBottomOf="@id/ll"
-        tools:ignore="UselessLeaf" />
+        app:layout_constraintTop_toBottomOf="@id/ll">
+
+        <com.zhpan.indicator.IndicatorView
+            android:id="@+id/indicator_view"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center" />
+    </FrameLayout>
 
     <View
         android:id="@+id/tv_btn"
         android:layout_width="164dp"
         android:layout_height="45dp"
         android:layout_marginBottom="100dp"
+        android:visibility="invisible"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"

app/src/main/res/values/colors.xml

@@ -5,4 +5,6 @@
     <color name="color_747474">#747474</color>
     <color name="color_fa020b">#FA020B</color>
     <color name="theme_color">#50B3FA</color>
+    <color name="color_cccccc">#CCCCCC</color>
+    <color name="color_4f86eb">#4F86EB</color>
 </resources>
\ No newline at end of file

app/src/main/res/values/dimens.xml

@@ -4,4 +4,7 @@
     <dimen name="dp_300">300dp</dimen>
     <dimen name="dp_345">345dp</dimen>
     <dimen name="fab_margin">16dp</dimen>
+    <dimen name="dp_17">17dp</dimen>
+    <dimen name="dp_5">5dp</dimen>
+    <dimen name="dp_9">9dp</dimen>
 </resources>
\ No newline at end of file