Commit 35faba5a authored by wanglei's avatar wanglei

...

parent 7eddd887
...@@ -59,6 +59,8 @@ object ConstObject { ...@@ -59,6 +59,8 @@ object ConstObject {
const val SHORTCUT_SPLIT_PDF = "shortcut_split_pdf" const val SHORTCUT_SPLIT_PDF = "shortcut_split_pdf"
const val SHORTCUT_MERGE_PDF = "shortcut_merge_pdf" const val SHORTCUT_MERGE_PDF = "shortcut_merge_pdf"
const val FUNCTION_SCAM_JUNK = "function_scam_junk"
const val FUNCTION_APP_PROCESS = "function_app_process"
var ifAgreePrivacy = false var ifAgreePrivacy = false
get() { get() {
......
package com.base.pdfviewerscannerwhite.ui.cleanjunk package com.base.pdfviewerscannerwhite.ui.cleanjunk
import android.animation.ValueAnimator import android.animation.ValueAnimator
import android.content.Intent
import android.graphics.Color import android.graphics.Color
import android.view.animation.LinearInterpolator import android.view.animation.LinearInterpolator
import android.widget.Toast import android.widget.Toast
...@@ -8,8 +9,10 @@ import androidx.activity.addCallback ...@@ -8,8 +9,10 @@ import androidx.activity.addCallback
import androidx.core.animation.doOnEnd import androidx.core.animation.doOnEnd
import androidx.core.view.updatePadding import androidx.core.view.updatePadding
import com.base.pdfviewerscannerwhite.ads.admob.AdmobInterstitialUtils import com.base.pdfviewerscannerwhite.ads.admob.AdmobInterstitialUtils
import com.base.pdfviewerscannerwhite.bean.ConstObject.FUNCTION_APP_PROCESS
import com.base.pdfviewerscannerwhite.databinding.ActivityLayoutCleanupingBinding import com.base.pdfviewerscannerwhite.databinding.ActivityLayoutCleanupingBinding
import com.base.pdfviewerscannerwhite.helper.BaseActivity import com.base.pdfviewerscannerwhite.helper.BaseActivity
import com.base.pdfviewerscannerwhite.ui.result.ResultActivity
import com.base.pdfviewerscannerwhite.utils.AppPreferences import com.base.pdfviewerscannerwhite.utils.AppPreferences
import com.base.pdfviewerscannerwhite.utils.BarUtils import com.base.pdfviewerscannerwhite.utils.BarUtils
import com.base.pdfviewerscannerwhite.utils.updateMediaStore import com.base.pdfviewerscannerwhite.utils.updateMediaStore
...@@ -81,17 +84,18 @@ class CleaningActivity : BaseActivity<ActivityLayoutCleanupingBinding>() { ...@@ -81,17 +84,18 @@ class CleaningActivity : BaseActivity<ActivityLayoutCleanupingBinding>() {
val isCleanEndAdSp = AppPreferences.getInstance().getString("isCleanEndAdSp", "1").toInt() val isCleanEndAdSp = AppPreferences.getInstance().getString("isCleanEndAdSp", "1").toInt()
if (isCleanEndAdSp == 1) { if (isCleanEndAdSp == 1) {
AdmobInterstitialUtils.showInterstitialAd(this@CleaningActivity) { AdmobInterstitialUtils.showInterstitialAd(this@CleaningActivity) {
// startActivity( startActivity(
// Intent(this@com.base.pdfviewerscannerwhite.ui.cleanjunk.CleaningActivity, ResultActivity::class.java).putExtra("from", JUNK_CLEANER) Intent(this@CleaningActivity, ResultActivity::class.java).putExtra("from", FUNCTION_APP_PROCESS)
// .putExtra("clean_size", intentSize) .putExtra("clean_size", intentSize)
// ) )
finish() finish()
} }
} else { } else {
// startActivity( startActivity(
// Intent(this@com.base.pdfviewerscannerwhite.ui.cleanjunk.CleaningActivity, ResultActivity::class.java).putExtra("from", JUNK_CLEANER) Intent(this@CleaningActivity, ResultActivity::class.java).putExtra(
// .putExtra("clean_size", intentSize) "from", ""
// ) ).putExtra("clean_size", intentSize)
)
finish() finish()
} }
} }
......
...@@ -14,10 +14,12 @@ import androidx.lifecycle.lifecycleScope ...@@ -14,10 +14,12 @@ import androidx.lifecycle.lifecycleScope
import com.base.pdfviewerscannerwhite.R import com.base.pdfviewerscannerwhite.R
import com.base.pdfviewerscannerwhite.ads.admob.AdmobInterstitialUtils import com.base.pdfviewerscannerwhite.ads.admob.AdmobInterstitialUtils
import com.base.pdfviewerscannerwhite.bean.ChildBean import com.base.pdfviewerscannerwhite.bean.ChildBean
import com.base.pdfviewerscannerwhite.bean.ConstObject.FUNCTION_SCAM_JUNK
import com.base.pdfviewerscannerwhite.bean.ParentBean import com.base.pdfviewerscannerwhite.bean.ParentBean
import com.base.pdfviewerscannerwhite.databinding.ActivityScanJunkBinding import com.base.pdfviewerscannerwhite.databinding.ActivityScanJunkBinding
import com.base.pdfviewerscannerwhite.helper.BaseActivity import com.base.pdfviewerscannerwhite.helper.BaseActivity
import com.base.pdfviewerscannerwhite.helper.MyApplication import com.base.pdfviewerscannerwhite.helper.MyApplication
import com.base.pdfviewerscannerwhite.ui.result.ResultActivity
import com.base.pdfviewerscannerwhite.utils.AppPreferences import com.base.pdfviewerscannerwhite.utils.AppPreferences
import com.base.pdfviewerscannerwhite.utils.BarUtils import com.base.pdfviewerscannerwhite.utils.BarUtils
import com.base.pdfviewerscannerwhite.utils.FileHelp.getFileFolder import com.base.pdfviewerscannerwhite.utils.FileHelp.getFileFolder
...@@ -80,6 +82,7 @@ class ScanJunkActivity : BaseActivity<ActivityScanJunkBinding>() { ...@@ -80,6 +82,7 @@ class ScanJunkActivity : BaseActivity<ActivityScanJunkBinding>() {
//record last use junk clean function time //record last use junk clean function time
AppPreferences.getInstance().put("last_use_junk_clean", System.currentTimeMillis()) AppPreferences.getInstance().put("last_use_junk_clean", System.currentTimeMillis())
beginScan() beginScan()
AdmobInterstitialUtils.showInterstitialAd(this)
} }
override fun initListener() { override fun initListener() {
...@@ -96,10 +99,10 @@ class ScanJunkActivity : BaseActivity<ActivityScanJunkBinding>() { ...@@ -96,10 +99,10 @@ class ScanJunkActivity : BaseActivity<ActivityScanJunkBinding>() {
binding.tvBtn.setOnClickListener { binding.tvBtn.setOnClickListener {
if (binding.tvBtn.text == "Got it") { if (binding.tvBtn.text == "Got it") {
// startActivity(Intent(this, ResultActivity::class.java).apply { startActivity(Intent(this, ResultActivity::class.java).apply {
// putExtra("from", ConstObject.JUNK_CLEANER) putExtra("from", FUNCTION_SCAM_JUNK)
// }) })
// finish() finish()
} else { } else {
startActivity(Intent(this, CleaningActivity::class.java).apply { startActivity(Intent(this, CleaningActivity::class.java).apply {
val list = junkExpandAdapter.getChoosePath() val list = junkExpandAdapter.getChoosePath()
......
...@@ -71,7 +71,7 @@ class DocumentPageFragment() : BaseFragment<FragmentDocumentPageBinding>(), Docu ...@@ -71,7 +71,7 @@ class DocumentPageFragment() : BaseFragment<FragmentDocumentPageBinding>(), Docu
binding.swipeRefreshLayout.isRefreshing = false binding.swipeRefreshLayout.isRefreshing = false
documentFragment?.changeProgressVisibility(true) documentFragment?.changeProgressVisibility(true)
delay(800) delay(600)
documentFragment?.changeProgressVisibility(false) documentFragment?.changeProgressVisibility(false)
binding.llEmpty.isVisible = isEmpty binding.llEmpty.isVisible = isEmpty
} }
......
package com.base.pdfviewerscannerwhite.ui.result package com.base.pdfviewerscannerwhite.ui.result
import android.annotation.SuppressLint
import android.content.Intent
import android.graphics.Color import android.graphics.Color
import androidx.core.view.updatePadding import androidx.activity.addCallback
import com.base.pdfviewerscannerwhite.R
import com.base.pdfviewerscannerwhite.ads.admob.AdmobNativeUtils import com.base.pdfviewerscannerwhite.ads.admob.AdmobNativeUtils
import com.base.pdfviewerscannerwhite.bean.ConstObject.FUNCTION_APP_PROCESS
import com.base.pdfviewerscannerwhite.bean.ConstObject.FUNCTION_SCAM_JUNK
import com.base.pdfviewerscannerwhite.databinding.ActivityResultBinding import com.base.pdfviewerscannerwhite.databinding.ActivityResultBinding
import com.base.pdfviewerscannerwhite.helper.BaseActivity import com.base.pdfviewerscannerwhite.helper.BaseActivity
import com.base.pdfviewerscannerwhite.ui.appprocess.AppProcessLoadingActivity
import com.base.pdfviewerscannerwhite.ui.cleanjunk.ScanJunkActivity
import com.base.pdfviewerscannerwhite.utils.BarUtils import com.base.pdfviewerscannerwhite.utils.BarUtils
class ResultActivity : BaseActivity<ActivityResultBinding>() { class ResultActivity : BaseActivity<ActivityResultBinding>() {
...@@ -13,12 +20,48 @@ class ResultActivity : BaseActivity<ActivityResultBinding>() { ...@@ -13,12 +20,48 @@ class ResultActivity : BaseActivity<ActivityResultBinding>() {
ActivityResultBinding.inflate(layoutInflater) ActivityResultBinding.inflate(layoutInflater)
} }
var from = ""
@SuppressLint("SetTextI18n")
override fun initView() { override fun initView() {
BarUtils.setStatusBarLightMode(this, true) BarUtils.setStatusBarLightMode(this, true)
BarUtils.setStatusBarColor(this, Color.parseColor("#00B7DD")) BarUtils.setStatusBarColor(this, Color.parseColor("#00B7DD"))
// binding.root.updatePadding(top = BarUtils.getStatusBarHeight()) // binding.root.updatePadding(top = BarUtils.getStatusBarHeight())
AdmobNativeUtils.showNativeAd(this, binding.flAd) AdmobNativeUtils.showNativeAd(this, binding.flAd, R.layout.layout_admob_app_exit)
from = intent.extras?.getString("from") ?: ""
when (from) {
FUNCTION_SCAM_JUNK -> {
binding.ivFunction.setImageResource(R.mipmap.process)
binding.tvFunctionDesc.text = getString(R.string.manage_processes_run_in_the_background)
binding.tvFunctionBtn.text = getString(R.string.scan_now)
binding.tvFunctionBtn.setOnClickListener {
startActivity(Intent(this, AppProcessLoadingActivity::class.java))
}
}
FUNCTION_APP_PROCESS -> {
binding.ivFunction.setImageResource(R.mipmap.clean)
binding.tvFunctionDesc.text = getString(R.string.clean_up_your_phone_storage)
binding.tvFunctionBtn.text = getString(R.string.clean_now)
binding.tvFunctionBtn.setOnClickListener {
startActivity(Intent(this, ScanJunkActivity::class.java))
}
}
}
} }
override fun initListener() {
super.initListener()
onBackPressedDispatcher.addCallback {
finishToMain()
}
}
} }
\ No newline at end of file
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
<com.base.pdfviewerscannerwhite.ui.view.XmlLottieAnimationView <com.base.pdfviewerscannerwhite.ui.view.XmlLottieAnimationView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="50dp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
......
...@@ -78,8 +78,8 @@ ...@@ -78,8 +78,8 @@
<ImageView <ImageView
android:id="@+id/iv_function" android:id="@+id/iv_function"
android:layout_width="wrap_content" android:layout_width="45dp"
android:layout_height="wrap_content" android:layout_height="45dp"
android:layout_marginStart="15dp" android:layout_marginStart="15dp"
android:layout_marginTop="20dp" android:layout_marginTop="20dp"
android:src="@mipmap/process" android:src="@mipmap/process"
......
...@@ -118,5 +118,9 @@ ...@@ -118,5 +118,9 @@
<string name="stop">Stop</string> <string name="stop">Stop</string>
<string name="clean_junk">Clean Junk</string> <string name="clean_junk">Clean Junk</string>
<string name="scanning_for_running_processes">Scanning for running processes</string> <string name="scanning_for_running_processes">Scanning for running processes</string>
<string name="manage_processes_run_in_the_background">Manage processes run in the background</string>
<string name="clean_up_your_phone_storage">Clean up your phone storage</string>
<string name="scan_now">Scan Now</string>
<string name="clean_now">Clean Now</string>
</resources> </resources>
\ 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