Commit 09aaa6f5 authored by wanglei's avatar wanglei

...

parent 33c2cba5
package com.base.browserwhite.ui.activity.cleanjunk package com.base.browserwhite.ui.activity.cleanjunk
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.content.Intent
import android.content.pm.PackageManager import android.content.pm.PackageManager
import android.graphics.Color import android.graphics.Color
import android.graphics.drawable.Drawable import android.graphics.drawable.Drawable
...@@ -43,7 +44,9 @@ class ScanJunkActivity : BaseActivity<ActivityScanJunkBinding>() { ...@@ -43,7 +44,9 @@ class ScanJunkActivity : BaseActivity<ActivityScanJunkBinding>() {
extraBufferCapacity = 5,//减去replay,MutableSharedFlow还缓存多少数据,缓冲池容量 = replay + extraBufferCapacity extraBufferCapacity = 5,//减去replay,MutableSharedFlow还缓存多少数据,缓冲池容量 = replay + extraBufferCapacity
onBufferOverflow = BufferOverflow.DROP_OLDEST//缓存策略,三种 丢掉最新值、丢掉最旧值和挂起 onBufferOverflow = BufferOverflow.DROP_OLDEST//缓存策略,三种 丢掉最新值、丢掉最旧值和挂起
) )
val pathFlow: SharedFlow<String> = mPathFlow private val pathFlow: SharedFlow<String> = mPathFlow
private var cleanSize: Long = 0L
@SuppressLint("SetTextI18n") @SuppressLint("SetTextI18n")
override fun initView() { override fun initView() {
...@@ -56,6 +59,7 @@ class ScanJunkActivity : BaseActivity<ActivityScanJunkBinding>() { ...@@ -56,6 +59,7 @@ class ScanJunkActivity : BaseActivity<ActivityScanJunkBinding>() {
binding.rv.adapter = junkScanAdapter binding.rv.adapter = junkScanAdapter
junkExpandAdapter = JunkExpandAdapter { size -> junkExpandAdapter = JunkExpandAdapter { size ->
cleanSize = size
if (size > 0) { if (size > 0) {
binding.tvBtn.text = "Clean up ${size.toFormatSize()}" binding.tvBtn.text = "Clean up ${size.toFormatSize()}"
} else { } else {
...@@ -82,6 +86,18 @@ class ScanJunkActivity : BaseActivity<ActivityScanJunkBinding>() { ...@@ -82,6 +86,18 @@ class ScanJunkActivity : BaseActivity<ActivityScanJunkBinding>() {
onBackPressedDispatcher.onBackPressed() onBackPressedDispatcher.onBackPressed()
} }
binding.tvBtn.setOnClickListener {
if (binding.tvBtn.text == "Got it") {
// startActivity(Intent(this, ResultActivity::class.java))
startActivity(Intent(this, CleaningActivity::class.java))
} else {
startActivity(Intent(this, CleaningActivity::class.java).apply {
val list = junkExpandAdapter.getChoosePath()
// putExtra("list", list.toTypedArray())
putExtra("size", cleanSize)
})
}
}
} }
@SuppressLint("SetTextI18n") @SuppressLint("SetTextI18n")
...@@ -164,6 +180,7 @@ class ScanJunkActivity : BaseActivity<ActivityScanJunkBinding>() { ...@@ -164,6 +180,7 @@ class ScanJunkActivity : BaseActivity<ActivityScanJunkBinding>() {
binding.tvPath.visibility = View.GONE binding.tvPath.visibility = View.GONE
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
binding.tvBtn.text = "Clean up ${size.toFormatSize()}" binding.tvBtn.text = "Clean up ${size.toFormatSize()}"
} }
......
package com.base.browserwhite.ui.activity.result package com.base.browserwhite.ui.activity.result
import android.annotation.SuppressLint
import android.graphics.Color
import com.base.browserwhite.bean.ConstObject.JUNK_CLEANER
import com.base.browserwhite.databinding.ActivityResultBinding import com.base.browserwhite.databinding.ActivityResultBinding
import com.base.browserwhite.ui.activity.BaseActivity import com.base.browserwhite.ui.activity.BaseActivity
import com.base.browserwhite.utils.AppPreferences
import com.base.browserwhite.utils.BarUtils
import com.base.browserwhite.utils.KotlinExt.toFormatSize
class ResultActivity : BaseActivity<ActivityResultBinding>() { class ResultActivity : BaseActivity<ActivityResultBinding>() {
...@@ -10,8 +16,25 @@ class ResultActivity : BaseActivity<ActivityResultBinding>() { ...@@ -10,8 +16,25 @@ class ResultActivity : BaseActivity<ActivityResultBinding>() {
ActivityResultBinding.inflate(layoutInflater) ActivityResultBinding.inflate(layoutInflater)
} }
@SuppressLint("SetTextI18n")
override fun initView() { override fun initView() {
BarUtils.setStatusBarLightMode(this, true)
BarUtils.setStatusBarColor(this, Color.TRANSPARENT)
// binding.root.updatePadding(top = BarUtils.getStatusBarHeight())
val from = intent.getStringExtra("from")
when (from) {
JUNK_CLEANER -> {
val cleanSize = intent.getLongExtra("clean_size", 0L)
if (cleanSize > 0) {
binding.tvTip.text = "Cleaned up ${cleanSize.toFormatSize(1)}"
} else {
binding.tvTip.text = "No junk files found."
}
}
} }
}
} }
\ No newline at end of file
...@@ -123,4 +123,7 @@ class JunkExpandAdapter(private val selectAction: (size: Long) -> Unit) : Expand ...@@ -123,4 +123,7 @@ class JunkExpandAdapter(private val selectAction: (size: Long) -> Unit) : Expand
selectAction.invoke(size) selectAction.invoke(size)
} }
fun getChoosePath(): List<String> {
return beanList.flatMap { it.childItem }.filter { it.isSelect }.map { it.path }
}
} }
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<gradient
android:angle="90"
android:endColor="#5AA7FF"
android:startColor="#0571ED" />
</shape>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/main" android:id="@+id/main"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"
tools:context=".ui.activity.result.ResultActivity"> tools:context=".ui.activity.result.ResultActivity">
</androidx.constraintlayout.widget.ConstraintLayout> <androidx.constraintlayout.widget.ConstraintLayout
\ No newline at end of file android:id="@+id/cl_top"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/bg_gradient_0571ed_5aa7ff"
app:layout_constraintTop_toTopOf="parent">
<LinearLayout
android:id="@+id/ll"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="40dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<FrameLayout
android:id="@+id/fl_fanhui"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="15dp">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:src="@mipmap/b_fanhui"
tools:ignore="ContentDescription,MissingPrefix" />
</FrameLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="Clean Junk"
android:textColor="@color/white"
android:textSize="19sp"
android:textStyle="bold"
tools:ignore="HardcodedText" />
</LinearLayout>
<ImageView
android:id="@+id/iv_wancheng"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="45dp"
android:src="@mipmap/wancheng"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/ll"
tools:ignore="ContentDescription" />
<TextView
android:id="@+id/tv_tip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:textColor="@color/white"
android:textSize="16sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/iv_wancheng"
tools:text="Cleaned up 108.7 KB" />
<androidx.cardview.widget.CardView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginHorizontal="15dp"
android:layout_marginTop="20dp"
android:layout_marginBottom="40dp"
app:cardCornerRadius="8dp"
app:cardElevation="0dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_tip">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<ImageView
android:id="@+id/iv_tuijian"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="15dp"
android:layout_marginTop="20dp"
android:src="@mipmap/process"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="ContentDescription" />
<LinearLayout
android:id="@+id/ll_function"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="@id/iv_tuijian"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/iv_tuijian"
app:layout_constraintTop_toTopOf="@id/iv_tuijian">
<TextView
android:id="@+id/tv_function"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Process manage"
android:textColor="@color/black"
android:textSize="16sp"
android:textStyle="bold"
tools:ignore="HardcodedText" />
<TextView
android:id="@+id/tv_function_desc"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:text="Manage processes run in the background"
android:textColor="#999999"
android:textSize="13sp"
tools:ignore="HardcodedText" />
</LinearLayout>
<TextView
android:id="@+id/tv_function_btn"
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_marginHorizontal="30dp"
android:layout_marginVertical="25dp"
android:background="@drawable/bg_0571ed_25"
android:gravity="center"
android:text="Scan Now"
android:textColor="@color/white"
android:textSize="18sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@id/ll_function"
tools:ignore="HardcodedText" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.cardview.widget.CardView>
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
\ 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