Commit e0ea35f1 authored by wanglei's avatar wanglei

...

parent edb705a6
...@@ -16,6 +16,7 @@ import androidx.core.content.ContextCompat ...@@ -16,6 +16,7 @@ import androidx.core.content.ContextCompat
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
import com.base.browserwhite.R import com.base.browserwhite.R
import com.base.browserwhite.bean.ChildBean import com.base.browserwhite.bean.ChildBean
import com.base.browserwhite.bean.ConstObject
import com.base.browserwhite.bean.ParentBean import com.base.browserwhite.bean.ParentBean
import com.base.browserwhite.databinding.ActivityScanJunkBinding import com.base.browserwhite.databinding.ActivityScanJunkBinding
import com.base.browserwhite.ui.activity.BaseActivity import com.base.browserwhite.ui.activity.BaseActivity
...@@ -94,7 +95,9 @@ class ScanJunkActivity : BaseActivity<ActivityScanJunkBinding>() { ...@@ -94,7 +95,9 @@ 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)) startActivity(Intent(this, ResultActivity::class.java).apply {
putExtra("from", ConstObject.JUNK_CLEANER)
})
finish() finish()
} else { } else {
startActivity(Intent(this, CleaningActivity::class.java).apply { startActivity(Intent(this, CleaningActivity::class.java).apply {
...@@ -189,8 +192,12 @@ class ScanJunkActivity : BaseActivity<ActivityScanJunkBinding>() { ...@@ -189,8 +192,12 @@ class ScanJunkActivity : BaseActivity<ActivityScanJunkBinding>() {
binding.tvBtn.isEnabled = true binding.tvBtn.isEnabled = true
binding.tvBtn.setTextColor(ContextCompat.getColor(this@ScanJunkActivity, R.color.white)) binding.tvBtn.setTextColor(ContextCompat.getColor(this@ScanJunkActivity, R.color.white))
cleanSize = size cleanSize = size
binding.tvBtn.text = "Clean up ${size.toFormatSize()}"
if (size > 0) {
binding.tvBtn.text = "Clean up ${size.toFormatSize()}"
} else {
binding.tvBtn.text = "Got it"
}
} }
......
...@@ -45,7 +45,7 @@ class ResultActivity : BaseActivity<ActivityResultBinding>() { ...@@ -45,7 +45,7 @@ class ResultActivity : BaseActivity<ActivityResultBinding>() {
} }
} }
} }
newsAdapter = NewsAdapter( newsAdapter = NewsAdapter(false,
clickAction = { url -> clickAction = { url ->
startActivity(Intent(this, NewsDetailActivity::class.java).apply { startActivity(Intent(this, NewsDetailActivity::class.java).apply {
putExtra("url", url) putExtra("url", url)
......
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