Commit ef56952c authored by maxiaoliang's avatar maxiaoliang

1

parent d55842df
......@@ -119,10 +119,7 @@
android:name=".activity.scanjunk.PrepareScanActivity"
android:screenOrientation="portrait"
tools:ignore="DiscouragedApi,LockedOrientationActivity" />
<activity
android:name=".activity.scanjunk.ScanJunkActivity"
android:screenOrientation="portrait"
tools:ignore="DiscouragedApi,LockedOrientationActivity" />
<activity
android:name=".activity.scanjunk.CleanJunkActivity"
android:screenOrientation="portrait"
......
......@@ -10,7 +10,7 @@ import com.test.easy.easycleanerjunk.activity.appmanager.AppManagerAnimationActi
import com.test.easy.easycleanerjunk.activity.batteryinfo.BatteryInfoAnimationActivity
import com.test.easy.easycleanerjunk.activity.largefile.LargeFileAnimationActivity
import com.test.easy.easycleanerjunk.activity.photocompress.photo.StartCompressionPhotoActivity
import com.test.easy.easycleanerjunk.activity.scanjunk.ScanJunkActivity
import com.test.easy.easycleanerjunk.activity.scanjunk.PrepareScanActivity
import com.test.easy.easycleanerjunk.activity.screenshot.ScreenShotAnimationActivity
import com.test.easy.easycleanerjunk.activity.similarphotos.RepeatPhotoAnimationActivity
import com.test.easy.easycleanerjunk.activity.whatsapp.WhatsAppCleanerAnimationActivity
......@@ -50,7 +50,7 @@ class ResultActivity : BaseActivity<ActivityLayoutResultBinding>() {
}
JUNK_CLEANER -> {
startActivity(Intent(this, ScanJunkActivity::class.java))
startActivity(Intent(this, PrepareScanActivity::class.java))
}
LARGE_FILE_CLEANER -> {
......
......@@ -2,6 +2,7 @@ package com.test.easy.easycleanerjunk.activity.scanjunk
import android.content.Intent
import android.graphics.Color
import android.view.View
import androidx.activity.OnBackPressedCallback
import androidx.core.view.updatePadding
import androidx.lifecycle.lifecycleScope
......@@ -41,7 +42,7 @@ class PrepareScanActivity : BaseActivity<ActivityLayoutParepreScanBinding>() {
}
})
if (!checkStorePermission()) {
showGerPermission(tittle = "Storage Permission Required",
showGerPermission(
deny = { finishToMain() },
allow = {
requestStorePermission(launcher, result = {
......@@ -72,7 +73,7 @@ class PrepareScanActivity : BaseActivity<ActivityLayoutParepreScanBinding>() {
// }
override fun onPause() {
super.onPause()
binding.idJunkScan.pauseAnimation()
binding.lottie.pauseAnimation()
job?.cancel()
}
......@@ -87,13 +88,18 @@ class PrepareScanActivity : BaseActivity<ActivityLayoutParepreScanBinding>() {
private fun resumeLottie() {
binding.idJunkScan.imageAssetsFolder = "easy_junk_scan/images/"
binding.idJunkScan.setAnimation("easy_junk_scan/data.json")
binding.idJunkScan.playAnimation()
binding.lottie.imageAssetsFolder = "easy_junk_scan/images/"
binding.lottie.setAnimation("easy_junk_scan/data.json")
binding.lottie.playAnimation()
}
private fun waitJob() = lifecycleScope.launch(Dispatchers.Main) {
delay(5000)
binding.lottie.visibility = View.GONE
binding.lottieCompleted.visibility = View.VISIBLE
binding.lottieCompleted.playAnimation()
binding.idTv.text = "Completed!"
delay(1000)
if (ConfigHelper.admobTrueMaxFlase == 0) {
MaxAdUtils.showInterstitialAd(this@PrepareScanActivity) {
startActivity(Intent(this@PrepareScanActivity, CleanJunkActivity::class.java))
......
package com.test.easy.easycleanerjunk.activity.scanjunk
import android.animation.ValueAnimator
import android.annotation.SuppressLint
import android.content.Intent
import android.view.View
import android.widget.Toast
import androidx.activity.addCallback
import androidx.lifecycle.lifecycleScope
import com.test.easy.easycleanerjunk.databinding.ActivityLayoutScanJunkBinding
import com.test.easy.easycleanerjunk.helps.BaseActivity
import com.test.easy.easycleanerjunk.helps.ConfigHelper
import com.test.easy.easycleanerjunk.helps.ads.AdmobUtils
import com.test.easy.easycleanerjunk.helps.ads.MaxAdUtils
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.delay
import kotlinx.coroutines.launch
/**
* 清理动画页面
*/
class ScanJunkActivity : BaseActivity<ActivityLayoutScanJunkBinding>() {
override val isLightMode = true
override val binding: ActivityLayoutScanJunkBinding by lazy {
ActivityLayoutScanJunkBinding.inflate(layoutInflater)
}
override fun initView() {
// BarUtils.setStatusBarLightMode(this, true)
// BarUtils.setStatusBarColor(this, Color.TRANSPARENT)
// binding.root.updatePadding(top = BarUtils.getStatusBarHeight())
}
override fun initListener() {
onBackPressedDispatcher.addCallback {
Toast.makeText(this@ScanJunkActivity, "wait a moment", Toast.LENGTH_SHORT).show()
}
}
override fun onStart() {
super.onStart()
checkPermission()
}
private var isPause = false
override fun onResume() {
super.onResume()
if (isPause) {
binding.lottie.resumeAnimation()
}
isPause = false
}
override fun onDestroy() {
super.onDestroy()
animator1?.cancel()
animator2?.cancel()
animator3?.cancel()
binding.lottie.cancelAnimation()
}
override fun onPause() {
super.onPause()
isPause = true
animator1?.pause()
animator2?.pause()
animator3?.pause()
binding.lottie.pauseAnimation()
}
var isplay = 0
override fun onPermissionsResult(isGranted: Boolean) {
if (isGranted) {
isplay += 1
if (isplay == 1) {
playLottie()
}
} else {
finishToMain()
}
}
@SuppressLint("SetTextI18n")
private fun playLottie() {
binding.lottie.imageAssetsFolder = "easy_junk_scan/images/"
binding.lottie.setAnimation("easy_junk_scan/data.json")
binding.lottie.playAnimation()
lifecycleScope.launch(Dispatchers.Main) {
delay(5000)
binding.lottie.visibility = View.GONE
binding.lottieCompleted.visibility = View.VISIBLE
binding.lottieCompleted.playAnimation()
binding.tv.text = "Completed!"
delay(1000)
if(ConfigHelper.admobTrueMaxFlase==0){
MaxAdUtils.showInterstitialAd(this@ScanJunkActivity) {
startActivity(Intent(this@ScanJunkActivity, CleanJunkActivity::class.java))
finish()
}
}else{
AdmobUtils.showInterstitialAd(this@ScanJunkActivity) {
startActivity(Intent(this@ScanJunkActivity, CleanJunkActivity::class.java))
finish()
}
}
}
}
private var animator1: ValueAnimator? = null
private var animator2: ValueAnimator? = null
private var animator3: ValueAnimator? = null
}
\ No newline at end of file
......@@ -9,7 +9,7 @@ import com.test.easy.easycleanerjunk.activity.batteryinfo.BatteryInfoAnimationAc
import com.test.easy.easycleanerjunk.activity.home.NewMainActivity
import com.test.easy.easycleanerjunk.activity.largefile.LargeFileAnimationActivity
import com.test.easy.easycleanerjunk.activity.photocompress.photo.StartCompressionPhotoActivity
import com.test.easy.easycleanerjunk.activity.scanjunk.ScanJunkActivity
import com.test.easy.easycleanerjunk.activity.scanjunk.PrepareScanActivity
import com.test.easy.easycleanerjunk.activity.screenshot.ScreenShotAnimationActivity
import com.test.easy.easycleanerjunk.activity.similarphotos.RepeatPhotoAnimationActivity
import com.test.easy.easycleanerjunk.activity.whatsapp.WhatsAppCleanerAnimationActivity
......@@ -41,7 +41,7 @@ object SplashJumpUtils {
when (jumpType) {
//=================================主动广播=======================================
ID_JUNK_CLEAN_PUSH -> {
context.startActivity(Intent(context, ScanJunkActivity::class.java))
context.startActivity(Intent(context, PrepareScanActivity::class.java))
}
ID_PHOTO_COMPRESS -> {
......
......@@ -5,14 +5,13 @@ import android.annotation.SuppressLint
import android.content.Intent
import android.view.animation.LinearInterpolator
import android.widget.ScrollView
import android.widget.Toast
import androidx.core.view.updatePadding
import com.test.easy.easycleanerjunk.activity.scanjunk.ScanJunkActivity
import com.test.easy.easycleanerjunk.activity.SettingActivity
import com.test.easy.easycleanerjunk.activity.appmanager.AppManagerAnimationActivity
import com.test.easy.easycleanerjunk.activity.batteryinfo.BatteryInfoAnimationActivity
import com.test.easy.easycleanerjunk.activity.largefile.LargeFileAnimationActivity
import com.test.easy.easycleanerjunk.activity.photocompress.photo.StartCompressionPhotoActivity
import com.test.easy.easycleanerjunk.activity.scanjunk.PrepareScanActivity
import com.test.easy.easycleanerjunk.activity.screenshot.ScreenShotAnimationActivity
import com.test.easy.easycleanerjunk.activity.similarphotos.RepeatPhotoAnimationActivity
import com.test.easy.easycleanerjunk.activity.whatsapp.WhatsAppCleanerAnimationActivity
......@@ -72,7 +71,7 @@ class HomeFragment : BaseFragment<FragmentLayoutHomeBinding>() {
binding.idScrollView.fullScroll(ScrollView.FOCUS_DOWN)
}
listOf(binding.idCleanJunk, binding.idFlClean, binding.idCleanUp).setOnClickListener {
startActivity(Intent(requireContext(), ScanJunkActivity::class.java))
startActivity(Intent(requireContext(), PrepareScanActivity::class.java))
}
binding.idPhotoCompress.setOnClickListener {
......
......@@ -4,8 +4,8 @@ import android.content.Intent
import com.test.easy.easycleanerjunk.activity.appmanager.AppManagerAnimationActivity
import com.test.easy.easycleanerjunk.activity.batteryinfo.BatteryInfoAnimationActivity
import com.test.easy.easycleanerjunk.activity.largefile.LargeFileAnimationActivity
import com.test.easy.easycleanerjunk.activity.scanjunk.ScanJunkActivity
import com.test.easy.easycleanerjunk.activity.photocompress.photo.StartCompressionPhotoActivity
import com.test.easy.easycleanerjunk.activity.scanjunk.PrepareScanActivity
import com.test.easy.easycleanerjunk.activity.screenshot.ScreenShotAnimationActivity
import com.test.easy.easycleanerjunk.activity.similarphotos.RepeatPhotoAnimationActivity
import com.test.easy.easycleanerjunk.activity.whatsapp.WhatsAppCleanerAnimationActivity
......@@ -32,7 +32,7 @@ class ToolsFragment : BaseFragment<FragmentLayoutTools1Binding>() {
adapter = ToolsAdapter(requireActivity()) { kName ->
when (kName) {
AFunOb.JUNK_CLEANER -> {
startActivity(Intent(requireContext(), ScanJunkActivity::class.java))
startActivity(Intent(requireContext(), PrepareScanActivity::class.java))
}
LARGE_FILE_CLEANER -> {
......
......@@ -4,6 +4,7 @@ import android.annotation.SuppressLint
import android.app.Activity
import android.app.Dialog
import android.content.Context
import android.content.Intent
import android.graphics.Color
import android.graphics.drawable.ColorDrawable
import android.view.LayoutInflater
......@@ -12,12 +13,14 @@ import android.widget.FrameLayout
import android.widget.ImageView
import android.widget.TextView
import com.test.easy.easycleanerjunk.R
import com.test.easy.easycleanerjunk.activity.home.NewMainActivity
import com.test.easy.easycleanerjunk.activity.photocompress.photo.CustomDialog
import com.test.easy.easycleanerjunk.databinding.DialogLayoutFlowTypeBinding
import com.test.easy.easycleanerjunk.databinding.DialogPermissonOpenBinding
import com.test.easy.easycleanerjunk.helps.ConfigHelper
import com.test.easy.easycleanerjunk.helps.ads.AdmobUtils
import com.test.easy.easycleanerjunk.helps.ads.MaxAdUtils
import com.test.easy.easycleanerjunk.utils.ActivityManagerUtils
import com.test.easy.easycleanerjunk.utils.SPUtils
import com.test.easy.easycleanerjunk.view.AFunOb.APP_MANAGER
import com.test.easy.easycleanerjunk.view.AFunOb.BATTERY_INFO
......@@ -57,10 +60,9 @@ object DialogViews {
// .setFontSize(13, true)
// .setForegroundColor(0xFF999999.toInt())
// .create()
tittle?.let { binding.idTvTt.text = it }
binding.idTvTt.text =
"Our application needs to access your files to implement junk scanning, image compression, duplicate photos, and large file cleanup. Before you authorize, we need to confirm with you:"
tittle?.let { binding.idTvTt.text = it }
binding.idFullLottie.imageAssetsFolder = "easy_permission_finger/images/"
binding.idFullLottie.setAnimation("easy_permission_finger/data.json")
binding.idFullLottie.playAnimation()
......@@ -105,6 +107,10 @@ object DialogViews {
fun Context.showDialogFunctionExit(function: String, okAction: () -> Unit) {
val s = SPUtils.getInstance().getInt("isShowBackIntAd", 0)
if (s == 0) {
if (this !is NewMainActivity && !ActivityManagerUtils.getInstance().isActivityInStack(
NewMainActivity::class.java)) {
startActivity(Intent(this, NewMainActivity::class.java))
}
if(this is Activity){
this.finish()
}
......
......@@ -8,7 +8,7 @@ import android.view.View
import android.view.ViewGroup
import android.widget.PopupWindow
import androidx.core.view.updatePadding
import com.test.easy.easycleanerjunk.activity.scanjunk.ScanJunkActivity
import com.test.easy.easycleanerjunk.activity.scanjunk.PrepareScanActivity
import com.test.easy.easycleanerjunk.databinding.LayoutExitWlBinding
import com.test.easy.easycleanerjunk.helps.ConfigHelper
import com.test.easy.easycleanerjunk.helps.ads.AdmobUtils
......@@ -69,7 +69,7 @@ class PopExitWindow(private val activity: Activity) : PopupWindow() {
}
binding.idExperienceNow.setOnClickListener {
dismiss()
activity.startActivity(Intent(activity, ScanJunkActivity::class.java))
activity.startActivity(Intent(activity, PrepareScanActivity::class.java))
}
binding.idGuanbi.setOnClickListener {
dismiss()
......
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:background="@color/white"
android:layout_height="match_parent"
android:background="@color/white"
android:orientation="vertical">
<RelativeLayout
......@@ -35,37 +35,42 @@
</RelativeLayout>
<com.test.easy.easycleanerjunk.view.XmlLottieAnimationView
android:id="@+id/id_junk_scan"
<FrameLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginHorizontal="36dp"
android:adjustViewBounds="true"
app:layout_constraintBottom_toTopOf="@+id/id_bottomt_content"
app:layout_constraintTop_toBottomOf="@+id/id_top_rl"
app:lottie_autoPlay="true"
app:lottie_loop="true" />
android:layout_height="400dp"
android:layout_marginTop="20dp">
<androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/id_bottomt_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent"
tools:layout_editor_absoluteX="0dp">
<com.test.easy.easycleanerjunk.view.XmlLottieAnimationView
android:id="@+id/lottie"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
android:adjustViewBounds="true"
app:lottie_autoPlay="true"
app:lottie_loop="true" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginBottom="295dp"
android:text="Wait a moment..."
android:textColor="#666666"
android:textSize="16sp"
tools:ignore="HardcodedText" />
<com.test.easy.easycleanerjunk.view.XmlLottieAnimationView
android:id="@+id/lottie_completed"
android:layout_width="90dp"
android:layout_height="90dp"
android:layout_gravity="center"
android:visibility="gone"
app:lottie_autoPlay="false"
app:lottie_rawRes="@raw/loading_completed" />
</androidx.appcompat.widget.LinearLayoutCompat>
</FrameLayout>
<TextView
android:id="@+id/id_tv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="20dp"
android:text="Wait a moment..."
android:textColor="#333333"
android:textSize="15sp"
tools:ignore="HardcodedText" />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
</androidx.appcompat.widget.LinearLayoutCompat>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:orientation="vertical">
<FrameLayout
android:id="@+id/id_top_rl"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent">
<TextView
android:id="@+id/id_tv_title_back"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center"
android:text="Clean Junk"
android:textColor="#333333"
android:textSize="18sp"
android:textStyle="bold"
tools:ignore="HardcodedText" />
</FrameLayout>
<FrameLayout
android:layout_width="300dp"
android:layout_height="300dp"
app:layout_constraintBottom_toTopOf="@id/tv"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.65">
<com.test.easy.easycleanerjunk.view.XmlLottieAnimationView
android:id="@+id/lottie"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:adjustViewBounds="true"
app:lottie_autoPlay="true"
app:lottie_loop="true" />
<com.test.easy.easycleanerjunk.view.XmlLottieAnimationView
android:id="@+id/lottie_completed"
android:layout_width="90dp"
android:layout_height="90dp"
android:layout_gravity="center"
android:visibility="gone"
app:lottie_autoPlay="false"
app:lottie_rawRes="@raw/loading_completed" />
</FrameLayout>
<TextView
android:id="@+id/tv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginBottom="275dp"
android:text="Wait a moment..."
android:textColor="#333333"
android:textSize="16sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
tools:ignore="HardcodedText" />
</androidx.constraintlayout.widget.ConstraintLayout>
\ 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