Commit 649603c8 authored by wanglei's avatar wanglei

...

parent 03e87af4
......@@ -26,7 +26,7 @@ class PhotoManagerAnimationActivity : BaseActivity<ActivityScreenShotAnimationBi
}
fun jumpJob() = lifecycleScope.launch(Dispatchers.Main) {
private fun jumpJob() = lifecycleScope.launch(Dispatchers.Main) {
delay(Random.nextLong(4000, 4500))
binding.lottie.visibility = View.INVISIBLE
binding.lottieCompleted.visibility = View.VISIBLE
......@@ -47,7 +47,7 @@ class PhotoManagerAnimationActivity : BaseActivity<ActivityScreenShotAnimationBi
override fun onResume() {
super.onResume()
if (job?.isActive == false) {
if (job?.isActive == false || job == null) {
job = jumpJob()
}
}
......@@ -55,6 +55,7 @@ class PhotoManagerAnimationActivity : BaseActivity<ActivityScreenShotAnimationBi
override fun onPause() {
super.onPause()
job?.cancel()
job = null
}
}
\ No newline at end of file
......@@ -34,6 +34,12 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>() {
startActivity(Intent(requireContext(), ScanJunkActivity::class.java))
// sendNotification(requireContext(), ConstObject.ID_JUNK_CLEAN_PUSH)
}
binding.tvClean.setOnClickListener {
startActivity(Intent(requireContext(), ScanJunkActivity::class.java))
}
binding.cardCleanJunk.setOnClickListener {
startActivity(Intent(requireContext(), ScanJunkActivity::class.java))
}
binding.cardPhotosManager.setOnClickListener {
startActivity(Intent(requireContext(), PhotoManagerAnimationActivity::class.java))
......
package com.base.datarecovery.fragment
import android.content.Intent
import com.base.datarecovery.activity.photomanager.PhotoManagerAnimationActivity
import com.base.datarecovery.activity.privacyspace.PrivacyPinOneActivity
import com.base.datarecovery.activity.privacyspace.PrivacySpaceActivity
import com.base.datarecovery.activity.recovery.FileScanResultActivity
......@@ -45,6 +46,9 @@ class RecoveryFragment : BaseFragment<FragmentRecoveryBinding>() {
})
}
}
binding.cardPhotosManager.setOnClickListener {
startActivity(Intent(requireContext(), PhotoManagerAnimationActivity::class.java))
}
}
}
\ No newline at end of file
......@@ -102,7 +102,7 @@
android:layout_width="285dp"
android:layout_height="45dp"
android:layout_gravity="center_horizontal"
android:layout_marginVertical="20dp"
android:layout_marginTop="10dp"
android:background="@drawable/bg_ff852c_22"
android:gravity="center"
android:text="Clean Junk"
......
......@@ -127,7 +127,7 @@
</androidx.cardview.widget.CardView>
<androidx.cardview.widget.CardView
android:id="@+id/card_privacy_space"
android:id="@+id/card_ry_audio"
android:layout_width="0dp"
android:layout_height="70dp"
android:layout_marginHorizontal="8dp"
......@@ -150,7 +150,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="8dp"
android:src="@mipmap/space"
android:src="@mipmap/h_audio"
tools:ignore="ContentDescription" />
<TextView
......@@ -158,7 +158,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="8dp"
android:text="Privacy\nSpace"
android:text="Audio\nRecovery"
android:textColor="@color/black"
android:textSize="15sp"
tools:ignore="HardcodedText" />
......@@ -179,10 +179,13 @@
android:orientation="horizontal">
<androidx.cardview.widget.CardView
android:id="@+id/card_privacy_space"
android:layout_width="0dp"
android:layout_height="70dp"
android:layout_marginHorizontal="8dp"
android:layout_weight="1"
android:clickable="true"
android:focusable="true"
app:cardBackgroundColor="#F8F8F8"
app:cardCornerRadius="10dp"
app:cardElevation="0dp">
......@@ -199,7 +202,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="8dp"
android:src="@mipmap/recovery"
android:src="@mipmap/space"
tools:ignore="ContentDescription" />
<TextView
......@@ -207,7 +210,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="8dp"
android:text="Recovery\nDocuments"
android:text="Privacy\nSpace"
android:textColor="@color/black"
android:textSize="15sp"
tools:ignore="HardcodedText" />
......@@ -218,12 +221,11 @@
</androidx.cardview.widget.CardView>
<androidx.cardview.widget.CardView
android:id="@+id/card_photos_manager"
android:layout_width="0dp"
android:layout_height="70dp"
android:layout_marginHorizontal="8dp"
android:layout_weight="1"
android:clickable="true"
android:focusable="true"
app:cardBackgroundColor="#F8F8F8"
app:cardCornerRadius="10dp"
app:cardElevation="0dp">
......@@ -240,7 +242,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="8dp"
android:src="@mipmap/space"
android:src="@mipmap/photosmanager"
tools:ignore="ContentDescription" />
<TextView
......@@ -248,7 +250,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="8dp"
android:text="Privacy\nSpace"
android:text="Photos\nManager"
android:textColor="@color/black"
android:textSize="15sp"
tools:ignore="HardcodedText" />
......@@ -261,5 +263,9 @@
</LinearLayout>
<FrameLayout
android:id="@+id/fl_ad"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
\ 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