Commit 9ae1e36b authored by wanglei's avatar wanglei

...

parent 8a03c8ac
...@@ -10,6 +10,7 @@ import androidx.core.animation.doOnEnd ...@@ -10,6 +10,7 @@ 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.bean.ConstObject.FUNCTION_APP_PROCESS
import com.base.pdfviewerscannerwhite.bean.ConstObject.FUNCTION_SCAM_JUNK
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.ui.result.ResultActivity
...@@ -85,16 +86,20 @@ class CleaningActivity : BaseActivity<ActivityLayoutCleanupingBinding>() { ...@@ -85,16 +86,20 @@ class CleaningActivity : BaseActivity<ActivityLayoutCleanupingBinding>() {
if (isCleanEndAdSp == 1) { if (isCleanEndAdSp == 1) {
AdmobInterstitialUtils.showInterstitialAd(this@CleaningActivity) { AdmobInterstitialUtils.showInterstitialAd(this@CleaningActivity) {
startActivity( startActivity(
Intent(this@CleaningActivity, ResultActivity::class.java).putExtra("from", FUNCTION_APP_PROCESS) Intent(this@CleaningActivity, ResultActivity::class.java).apply {
.putExtra("clean_size", intentSize) putExtra("from", FUNCTION_SCAM_JUNK)
putExtra("clean_size", intentSize)
}
) )
finish() finish()
} }
} else { } else {
startActivity( startActivity(
Intent(this@CleaningActivity, ResultActivity::class.java).putExtra( Intent(this@CleaningActivity, ResultActivity::class.java).apply {
"from", "" putExtra("from", FUNCTION_SCAM_JUNK)
).putExtra("from", FUNCTION_APP_PROCESS) putExtra("clean_size", intentSize)
}
) )
finish() finish()
} }
......
...@@ -13,6 +13,7 @@ import com.base.pdfviewerscannerwhite.helper.BaseActivity ...@@ -13,6 +13,7 @@ import com.base.pdfviewerscannerwhite.helper.BaseActivity
import com.base.pdfviewerscannerwhite.ui.appprocess.AppProcessLoadingActivity import com.base.pdfviewerscannerwhite.ui.appprocess.AppProcessLoadingActivity
import com.base.pdfviewerscannerwhite.ui.cleanjunk.ScanJunkActivity import com.base.pdfviewerscannerwhite.ui.cleanjunk.ScanJunkActivity
import com.base.pdfviewerscannerwhite.utils.BarUtils import com.base.pdfviewerscannerwhite.utils.BarUtils
import com.base.pdfviewerscannerwhite.utils.KotlinExt.toFormatSize
class ResultActivity : BaseActivity<ActivityResultBinding>() { class ResultActivity : BaseActivity<ActivityResultBinding>() {
...@@ -52,6 +53,10 @@ class ResultActivity : BaseActivity<ActivityResultBinding>() { ...@@ -52,6 +53,10 @@ class ResultActivity : BaseActivity<ActivityResultBinding>() {
startActivity(Intent(this, ScanJunkActivity::class.java)) startActivity(Intent(this, ScanJunkActivity::class.java))
finish() finish()
} }
val s = intent.extras?.getString("clean_size")?.toLong() ?: 0
if (s != 0L) {
binding.tvSize.text = "Cleaned up ${s.toFormatSize(1)}"
}
} }
} }
......
...@@ -53,12 +53,12 @@ ...@@ -53,12 +53,12 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="13dp" android:layout_marginTop="13dp"
android:text="@string/completed"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="16sp" android:textSize="16sp"
app:layout_constraintEnd_toEndOf="@id/iv" app:layout_constraintEnd_toEndOf="@id/iv"
app:layout_constraintStart_toStartOf="@id/iv" app:layout_constraintStart_toStartOf="@id/iv"
app:layout_constraintTop_toBottomOf="@id/iv" app:layout_constraintTop_toBottomOf="@id/iv" />
tools:text="Cleaned!108.7 KB" />
<androidx.cardview.widget.CardView <androidx.cardview.widget.CardView
android:id="@+id/card" android:id="@+id/card"
......
...@@ -122,5 +122,6 @@ ...@@ -122,5 +122,6 @@
<string name="clean_up_your_phone_storage">Clean up your phone storage</string> <string name="clean_up_your_phone_storage">Clean up your phone storage</string>
<string name="scan_now">Scan Now</string> <string name="scan_now">Scan Now</string>
<string name="clean_now">Clean Now</string> <string name="clean_now">Clean Now</string>
<string name="completed">Completed</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