Commit 700a4294 authored by wanglei's avatar wanglei

[拆包]ui权限弹窗

parent d8743c6e
...@@ -41,7 +41,6 @@ import com.base.appzxhy.bean.FeatureBean.Companion.JUNK_CLEAN ...@@ -41,7 +41,6 @@ import com.base.appzxhy.bean.FeatureBean.Companion.JUNK_CLEAN
import com.base.appzxhy.bean.FeatureBean.Companion.LARGE_FILE_CLEAN import com.base.appzxhy.bean.FeatureBean.Companion.LARGE_FILE_CLEAN
import com.base.appzxhy.bean.FeatureBean.Companion.PHOTO_COMPRESSION import com.base.appzxhy.bean.FeatureBean.Companion.PHOTO_COMPRESSION
import com.base.appzxhy.bean.FeatureBean.Companion.SCREENSHOT_CLEAN import com.base.appzxhy.bean.FeatureBean.Companion.SCREENSHOT_CLEAN
import com.base.appzxhy.bean.FeatureBean.Companion.SETTINGS
import com.base.appzxhy.bean.FeatureBean.Companion.SIMILAR_PHOTOS import com.base.appzxhy.bean.FeatureBean.Companion.SIMILAR_PHOTOS
import com.base.appzxhy.bean.FileBean import com.base.appzxhy.bean.FileBean
import com.base.appzxhy.bean.config.AdConfigBean import com.base.appzxhy.bean.config.AdConfigBean
......
...@@ -6,6 +6,7 @@ import android.view.LayoutInflater ...@@ -6,6 +6,7 @@ import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import android.view.animation.LinearInterpolator import android.view.animation.LinearInterpolator
import androidx.core.content.ContextCompat
import androidx.core.view.ViewCompat import androidx.core.view.ViewCompat
import androidx.core.view.WindowInsetsCompat import androidx.core.view.WindowInsetsCompat
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
...@@ -141,6 +142,11 @@ class JunkCleanActivity : BaseActivity<ActivityJunkCleanBinding>(ActivityJunkCle ...@@ -141,6 +142,11 @@ class JunkCleanActivity : BaseActivity<ActivityJunkCleanBinding>(ActivityJunkCle
binding.tvClean.text = binding.tvClean.text =
if (total > 0) "${getString(R.string.clean)} (${Utils.getSizeFormat(total)})" else getString(R.string.go_it) if (total > 0) "${getString(R.string.clean)} (${Utils.getSizeFormat(total)})" else getString(R.string.go_it)
binding.tvClean.isEnabled = total > 0 binding.tvClean.isEnabled = total > 0
if (binding.tvClean.isEnabled) {
binding.tvClean.setTextColor(ContextCompat.getColor(this, R.color.white))
} else {
binding.tvClean.setTextColor(ContextCompat.getColor(this, R.color.colorPrimary))
}
} }
override fun useDefaultImmersive() { override fun useDefaultImmersive() {
......
...@@ -23,9 +23,9 @@ class ConfirmDialog( ...@@ -23,9 +23,9 @@ class ConfirmDialog(
dialog.show() dialog.show()
val params = dialog.window?.attributes val params = dialog.window?.attributes
params?.width = LinearLayout.LayoutParams.MATCH_PARENT // params?.width = LinearLayout.LayoutParams.MATCH_PARENT
params?.height = LinearLayout.LayoutParams.WRAP_CONTENT // params?.height = LinearLayout.LayoutParams.WRAP_CONTENT
params?.gravity = Gravity.BOTTOM params?.gravity = Gravity.CENTER
dialog.window?.attributes = params dialog.window?.attributes = params
dialog.window?.setBackgroundDrawableResource(android.R.color.transparent) dialog.window?.setBackgroundDrawableResource(android.R.color.transparent)
......
...@@ -4,8 +4,11 @@ package com.base.appzxhy.ui.main ...@@ -4,8 +4,11 @@ package com.base.appzxhy.ui.main
import android.animation.ObjectAnimator import android.animation.ObjectAnimator
import android.animation.ValueAnimator import android.animation.ValueAnimator
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.app.ActivityManager
import android.content.Context
import android.view.View import android.view.View
import android.view.animation.LinearInterpolator import android.view.animation.LinearInterpolator
import androidx.core.content.ContextCompat.getSystemService
import androidx.core.graphics.toColorInt import androidx.core.graphics.toColorInt
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
import com.base.appzxhy.R import com.base.appzxhy.R
...@@ -106,7 +109,6 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(FragmentHomeBinding::infl ...@@ -106,7 +109,6 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(FragmentHomeBinding::infl
binding.rv.adapter = adapter binding.rv.adapter = adapter
startAnimation() startAnimation()
initData()
} }
override fun initListener() { override fun initListener() {
...@@ -145,6 +147,10 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(FragmentHomeBinding::infl ...@@ -145,6 +147,10 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(FragmentHomeBinding::infl
} }
} }
binding.ivUp.setOnClickListener {
val lastChild = binding.nestedScrollView.getChildAt(binding.nestedScrollView.childCount - 1)
binding.nestedScrollView.smoothScrollTo(0, lastChild.bottom)
}
} }
private fun startAnimation() { private fun startAnimation() {
...@@ -178,6 +184,7 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(FragmentHomeBinding::infl ...@@ -178,6 +184,7 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(FragmentHomeBinding::infl
} }
@SuppressLint("SetTextI18n")
private fun initData() { private fun initData() {
lifecycleScope.launch(Dispatchers.IO) { lifecycleScope.launch(Dispatchers.IO) {
val totalStorageSize = async { Utils.getTotalStorageSize() }.await() val totalStorageSize = async { Utils.getTotalStorageSize() }.await()
...@@ -187,8 +194,20 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(FragmentHomeBinding::infl ...@@ -187,8 +194,20 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(FragmentHomeBinding::infl
val usedStorage = Utils.getSizeFormat(usedStorageSize) val usedStorage = Utils.getSizeFormat(usedStorageSize)
val percent = (usedStorageSize * 100 / totalStorageSize).toInt() val percent = (usedStorageSize * 100 / totalStorageSize).toInt()
val activityManager = getSystemService(requireContext(), ActivityManager::class.java) as ActivityManager
val memoryInfo = ActivityManager.MemoryInfo()
activityManager.getMemoryInfo(memoryInfo)
val totalMem = memoryInfo.totalMem / (1024 * 1024) // 总内存(MB)
val availMem = memoryInfo.availMem / (1024 * 1024) // 可用内存(MB)
val isLowMemory = memoryInfo.lowMemory // 是否低内存状态
val percentM = (100 * availMem / totalMem).toInt()
launch(Dispatchers.Main) { launch(Dispatchers.Main) {
binding binding.tvMemoryPercent.text = "$percentM%"
binding.progressBarMemory.setProgress(100 - percentM, true)
binding.tvStoragePercent.text = "$percent%"
binding.progressBarStorage.setProgress(100 - percent, true)
} }
} }
} }
...@@ -196,6 +215,7 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(FragmentHomeBinding::infl ...@@ -196,6 +215,7 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(FragmentHomeBinding::infl
override fun onResumeOneShoot() { override fun onResumeOneShoot() {
super.onResumeOneShoot() super.onResumeOneShoot()
changeListTodayUsed() changeListTodayUsed()
initData()
} }
@SuppressLint("NotifyDataSetChanged") @SuppressLint("NotifyDataSetChanged")
......
...@@ -19,6 +19,7 @@ import com.base.appzxhy.databinding.ItemPhotoDetailBinding ...@@ -19,6 +19,7 @@ import com.base.appzxhy.databinding.ItemPhotoDetailBinding
import com.base.appzxhy.ui.cleanresult.CleanResultActivity import com.base.appzxhy.ui.cleanresult.CleanResultActivity
import com.base.appzxhy.ui.dialog.ConfirmDialog import com.base.appzxhy.ui.dialog.ConfirmDialog
import com.base.appzxhy.ui.photocompression.CompressionUtils.compressSave import com.base.appzxhy.ui.photocompression.CompressionUtils.compressSave
import com.base.appzxhy.utils.LogEx
import com.base.appzxhy.utils.Utils import com.base.appzxhy.utils.Utils
import com.bumptech.glide.Glide import com.bumptech.glide.Glide
import com.bumptech.glide.load.resource.bitmap.CenterCrop import com.bumptech.glide.load.resource.bitmap.CenterCrop
...@@ -78,7 +79,6 @@ class PhotoCompressionDetailActivity : ...@@ -78,7 +79,6 @@ class PhotoCompressionDetailActivity :
binding.tvCurrentCount.text = "${position + 1}" binding.tvCurrentCount.text = "${position + 1}"
currentFile = item currentFile = item
showPhoto()
compress() compress()
} }
} }
...@@ -87,11 +87,13 @@ class PhotoCompressionDetailActivity : ...@@ -87,11 +87,13 @@ class PhotoCompressionDetailActivity :
private fun showPhoto() { private fun showPhoto() {
LogEx.logDebug(TAG, "showPhoto ${currentFile.path}")
Glide.with(this).load(currentFile.path).into(binding.ivOriginalImage) Glide.with(this).load(currentFile.path).into(binding.ivOriginalImage)
binding.tvOriginalSize.text = Utils.getSizeFormat(currentFile.length) binding.tvOriginalSize.text = Utils.getSizeFormat(currentFile.length)
} }
private fun compress() { private fun compress() {
showPhoto()
CompressionUtils.compressPhoto(currentFile.path, mode) { size, bitmap -> CompressionUtils.compressPhoto(currentFile.path, mode) { size, bitmap ->
runOnUiThread { runOnUiThread {
binding.tvCompressSize.text = Utils.getSizeFormat(size) binding.tvCompressSize.text = Utils.getSizeFormat(size)
......
...@@ -167,7 +167,7 @@ ...@@ -167,7 +167,7 @@
android:gravity="center" android:gravity="center"
android:paddingVertical="12dp" android:paddingVertical="12dp"
android:text="@string/clean" android:text="@string/clean"
android:textColor="@color/white" android:textColor="@color/colorPrimary"
android:textSize="18sp" android:textSize="18sp"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent" /> app:layout_constraintBottom_toBottomOf="parent" />
......
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
android:layout_margin="2dp"> android:layout_margin="2dp">
<androidx.appcompat.widget.AppCompatImageView <androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_original_image" android:id="@+id/ivOriginalImage"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:scaleType="centerCrop" android:scaleType="centerCrop"
...@@ -131,7 +131,7 @@ ...@@ -131,7 +131,7 @@
android:layout_margin="2dp"> android:layout_margin="2dp">
<androidx.appcompat.widget.AppCompatImageView <androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_compress_image" android:id="@+id/ivCompressImage"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:scaleType="centerCrop" android:scaleType="centerCrop"
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
android:lineSpacingExtra="4dp" android:lineSpacingExtra="4dp"
android:text="@string/confirm_content" android:text="@string/confirm_content"
android:textAlignment="center" android:textAlignment="center"
android:textColor="@color/color_666666" android:textColor="#A0A0A0"
android:textSize="14sp" android:textSize="14sp"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
...@@ -41,16 +41,17 @@ ...@@ -41,16 +41,17 @@
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_cancel" android:id="@+id/tv_cancel"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="@dimen/dp_50"
android:layout_marginStart="32dp" android:layout_marginStart="32dp"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:layout_marginBottom="24dp" android:layout_marginBottom="24dp"
android:background="@drawable/button_border_background" android:background="@drawable/bg_enable_no_50"
android:foreground="?attr/selectableItemBackground"
android:gravity="center" android:gravity="center"
android:paddingVertical="8dp" android:paddingVertical="8dp"
android:text="@string/cancel" android:text="@string/cancel"
android:textColor="@color/color_aeb4bd" android:textColor="@color/colorPrimary"
android:textSize="14sp" android:textSize="14sp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/tv_confirm" app:layout_constraintEnd_toStartOf="@id/tv_confirm"
...@@ -60,12 +61,13 @@ ...@@ -60,12 +61,13 @@
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_confirm" android:id="@+id/tv_confirm"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="@dimen/dp_50"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:layout_marginEnd="32dp" android:layout_marginEnd="32dp"
android:layout_marginBottom="24dp" android:layout_marginBottom="24dp"
android:background="@drawable/bg_btn_4" android:background="@drawable/bg_enable_50"
android:foreground="?attr/selectableItemBackground"
android:gravity="center" android:gravity="center"
android:paddingVertical="8dp" android:paddingVertical="8dp"
android:text="@string/confirm" android:text="@string/confirm"
......
...@@ -71,11 +71,11 @@ ...@@ -71,11 +71,11 @@
android:orientation="vertical"> android:orientation="vertical">
<TextView <TextView
android:visibility="gone"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="@dimen/sp_30" android:textSize="@dimen/sp_30"
android:visibility="gone"
tools:text="96.6" /> tools:text="96.6" />
<TextView <TextView
...@@ -103,6 +103,7 @@ ...@@ -103,6 +103,7 @@
app:layout_constraintTop_toTopOf="parent"> app:layout_constraintTop_toTopOf="parent">
<TextView <TextView
android:id="@+id/tvMemoryPercent"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:includeFontPadding="false" android:includeFontPadding="false"
...@@ -111,6 +112,7 @@ ...@@ -111,6 +112,7 @@
tools:text="76%" /> tools:text="76%" />
<ProgressBar <ProgressBar
android:id="@+id/progressBarMemory"
style="@style/Widget.AppCompat.ProgressBar.Horizontal" style="@style/Widget.AppCompat.ProgressBar.Horizontal"
android:layout_width="@dimen/dp_88" android:layout_width="@dimen/dp_88"
android:layout_height="@dimen/dp_4" android:layout_height="@dimen/dp_4"
...@@ -143,6 +145,7 @@ ...@@ -143,6 +145,7 @@
app:layout_constraintTop_toBottomOf="@id/ll1"> app:layout_constraintTop_toBottomOf="@id/ll1">
<TextView <TextView
android:id="@+id/tvStoragePercent"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:includeFontPadding="false" android:includeFontPadding="false"
...@@ -151,6 +154,7 @@ ...@@ -151,6 +154,7 @@
tools:text="76%" /> tools:text="76%" />
<ProgressBar <ProgressBar
android:id="@+id/progressBarStorage"
style="@style/Widget.AppCompat.ProgressBar.Horizontal" style="@style/Widget.AppCompat.ProgressBar.Horizontal"
android:layout_width="@dimen/dp_88" android:layout_width="@dimen/dp_88"
android:layout_height="@dimen/dp_4" android:layout_height="@dimen/dp_4"
......
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