Commit 37cfc057 authored by wanglei's avatar wanglei

...

parent d0608324
...@@ -6,13 +6,18 @@ import android.graphics.Color ...@@ -6,13 +6,18 @@ import android.graphics.Color
import androidx.activity.OnBackPressedCallback import androidx.activity.OnBackPressedCallback
import androidx.core.view.updatePadding import androidx.core.view.updatePadding
import com.test.easy.easycleanerjunk.activity.appmanager.AppManagerActivity import com.test.easy.easycleanerjunk.activity.appmanager.AppManagerActivity
import com.test.easy.easycleanerjunk.activity.appmanager.AppManagerAnimationActivity
import com.test.easy.easycleanerjunk.activity.batteryinfo.BatteryInfoAnimationActivity import com.test.easy.easycleanerjunk.activity.batteryinfo.BatteryInfoAnimationActivity
import com.test.easy.easycleanerjunk.activity.largefile.LargeFileAnimationActivity
import com.test.easy.easycleanerjunk.activity.largefile.LargeFileCleanActivity import com.test.easy.easycleanerjunk.activity.largefile.LargeFileCleanActivity
import com.test.easy.easycleanerjunk.activity.photocompress.photo.StartCompressionPhotoActivity import com.test.easy.easycleanerjunk.activity.photocompress.photo.StartCompressionPhotoActivity
import com.test.easy.easycleanerjunk.activity.scanjunk.ScanJunkActivity import com.test.easy.easycleanerjunk.activity.scanjunk.ScanJunkActivity
import com.test.easy.easycleanerjunk.activity.similarphotos.RepeatPhotoActivity import com.test.easy.easycleanerjunk.activity.similarphotos.RepeatPhotoActivity
import com.test.easy.easycleanerjunk.activity.screenshot.ScreenShotActivity import com.test.easy.easycleanerjunk.activity.screenshot.ScreenShotActivity
import com.test.easy.easycleanerjunk.activity.screenshot.ScreenShotAnimationActivity
import com.test.easy.easycleanerjunk.activity.similarphotos.RepeatPhotoAnimationActivity
import com.test.easy.easycleanerjunk.activity.whatsapp.WhatsAppCleanerActivity import com.test.easy.easycleanerjunk.activity.whatsapp.WhatsAppCleanerActivity
import com.test.easy.easycleanerjunk.activity.whatsapp.WhatsAppCleanerAnimationActivity
import com.test.easy.easycleanerjunk.adapter.AppFunctionAdapter import com.test.easy.easycleanerjunk.adapter.AppFunctionAdapter
import com.test.easy.easycleanerjunk.databinding.ActivityLayoutResultBinding import com.test.easy.easycleanerjunk.databinding.ActivityLayoutResultBinding
import com.test.easy.easycleanerjunk.helps.BaseActivity import com.test.easy.easycleanerjunk.helps.BaseActivity
...@@ -49,11 +54,11 @@ class ResultActivity : BaseActivity<ActivityLayoutResultBinding>() { ...@@ -49,11 +54,11 @@ class ResultActivity : BaseActivity<ActivityLayoutResultBinding>() {
} }
LARGE_FILE_CLEANER -> { LARGE_FILE_CLEANER -> {
startActivity(Intent(this, LargeFileCleanActivity::class.java)) startActivity(Intent(this, LargeFileAnimationActivity::class.java))
} }
SIMILAR_PHOTOS -> { SIMILAR_PHOTOS -> {
startActivity(Intent(this, RepeatPhotoActivity::class.java)) startActivity(Intent(this, RepeatPhotoAnimationActivity::class.java))
} }
PHOTO_COMPRESS -> { PHOTO_COMPRESS -> {
...@@ -61,15 +66,15 @@ class ResultActivity : BaseActivity<ActivityLayoutResultBinding>() { ...@@ -61,15 +66,15 @@ class ResultActivity : BaseActivity<ActivityLayoutResultBinding>() {
} }
SCREENSHOT_CLEANER -> { SCREENSHOT_CLEANER -> {
startActivity(Intent(this, ScreenShotActivity::class.java)) startActivity(Intent(this, ScreenShotAnimationActivity::class.java))
} }
WHATSAPP_CLEANER -> { WHATSAPP_CLEANER -> {
startActivity(Intent(this, WhatsAppCleanerActivity::class.java)) startActivity(Intent(this, WhatsAppCleanerAnimationActivity::class.java))
} }
APP_MANAGER -> { APP_MANAGER -> {
startActivity(Intent(this, AppManagerActivity::class.java)) startActivity(Intent(this, AppManagerAnimationActivity::class.java))
} }
} }
......
...@@ -91,8 +91,11 @@ class CleanJunkActivity : BaseActivity<ActivityLayoutCleanJunkBinding>() { ...@@ -91,8 +91,11 @@ class CleanJunkActivity : BaseActivity<ActivityLayoutCleanJunkBinding>() {
}) })
binding.idClBtn.setOnClickListener { binding.idClBtn.setOnClickListener {
if (binding.idClBtn.text == "Go it") { if (binding.idClBtn.text == "Got it") {
onBackPressedDispatcher.onBackPressed() startActivity(Intent(this@CleanJunkActivity, ResultActivity::class.java).apply {
putExtra("clean_size", AFunOb.JUNK_CLEANER)
putExtra("from", 0)
})
} else { } else {
startActivity( startActivity(
Intent(this, CleaningActivity::class.java) Intent(this, CleaningActivity::class.java)
...@@ -192,7 +195,7 @@ class CleanJunkActivity : BaseActivity<ActivityLayoutCleanJunkBinding>() { ...@@ -192,7 +195,7 @@ class CleanJunkActivity : BaseActivity<ActivityLayoutCleanJunkBinding>() {
// ) // )
// finish() // finish()
// } // }
binding.idClBtn.text = "Go it" binding.idClBtn.text = "Got it"
} else { } else {
binding.idClBtn.text = "Clean up ${selectSize.toFormatSize(1)}" binding.idClBtn.text = "Clean up ${selectSize.toFormatSize(1)}"
} }
......
package com.test.easy.easycleanerjunk.activity.screenshot package com.test.easy.easycleanerjunk.activity.screenshot
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.content.Intent
import android.os.Environment import android.os.Environment
import android.os.Handler
import android.view.View
import androidx.activity.addCallback import androidx.activity.addCallback
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
import com.test.easy.easycleanerjunk.activity.ResultActivity
import com.test.easy.easycleanerjunk.adapter.ScreenShotAdapter import com.test.easy.easycleanerjunk.adapter.ScreenShotAdapter
import com.test.easy.easycleanerjunk.bean.ScreenPhotoBean import com.test.easy.easycleanerjunk.bean.ScreenPhotoBean
import com.test.easy.easycleanerjunk.bean.ScreenshotBean import com.test.easy.easycleanerjunk.bean.ScreenshotBean
......
package com.test.easy.easycleanerjunk.fragment package com.test.easy.easycleanerjunk.fragment
import android.content.Intent import android.content.Intent
import com.test.easy.easycleanerjunk.activity.appmanager.AppManagerActivity
import com.test.easy.easycleanerjunk.activity.appmanager.AppManagerAnimationActivity import com.test.easy.easycleanerjunk.activity.appmanager.AppManagerAnimationActivity
import com.test.easy.easycleanerjunk.activity.batteryinfo.BatteryInfoActivity
import com.test.easy.easycleanerjunk.activity.batteryinfo.BatteryInfoAnimationActivity import com.test.easy.easycleanerjunk.activity.batteryinfo.BatteryInfoAnimationActivity
import com.test.easy.easycleanerjunk.activity.largefile.LargeFileAnimationActivity import com.test.easy.easycleanerjunk.activity.largefile.LargeFileAnimationActivity
import com.test.easy.easycleanerjunk.activity.largefile.LargeFileCleanActivity
import com.test.easy.easycleanerjunk.activity.similarphotos.RepeatPhotoActivity
import com.test.easy.easycleanerjunk.activity.scanjunk.ScanJunkActivity import com.test.easy.easycleanerjunk.activity.scanjunk.ScanJunkActivity
import com.test.easy.easycleanerjunk.activity.screenshot.ScreenShotActivity
import com.test.easy.easycleanerjunk.activity.whatsapp.WhatsAppCleanerActivity
import com.test.easy.easycleanerjunk.activity.photocompress.photo.StartCompressionPhotoActivity import com.test.easy.easycleanerjunk.activity.photocompress.photo.StartCompressionPhotoActivity
import com.test.easy.easycleanerjunk.activity.screenshot.ScreenShotAnimationActivity import com.test.easy.easycleanerjunk.activity.screenshot.ScreenShotAnimationActivity
import com.test.easy.easycleanerjunk.activity.similarphotos.RepeatPhotoAnimationActivity import com.test.easy.easycleanerjunk.activity.similarphotos.RepeatPhotoAnimationActivity
......
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