diff --git a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt index 73d1e4c..69ce2d1 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt @@ -2,9 +2,9 @@ import android.app.ProgressDialog import android.content.Intent -import android.graphics.BitmapFactory import android.net.Uri import android.os.Build +import android.os.CountDownTimer import androidx.core.content.FileProvider import androidx.lifecycle.ViewModelProvider import com.casic.smarttube.BuildConfig @@ -105,9 +105,20 @@ "尽情期待~".show(requireContext()) } - //TODO 待后期功能完善后再调整缓存实际位置 clearCacheLayout.setOnClickListener { - cacheSizeView.text = 0L.formatFileSize() + //删除缓存之后在设置缓存大小 + DialogHelper.showLoadingDialog(requireActivity(), "清理中...") + File(requireContext().cacheDir.path).deleteFile() + object : CountDownTimer(1500, 500) { + override fun onTick(millisUntilFinished: Long) { + + } + + override fun onFinish() { + DialogHelper.dismissLoadingDialog() + cacheSizeView.text = collectApplicationCache().formatFileSize() + } + }.start() } loginOutButton.setOnClickListener { @@ -204,6 +215,10 @@ }) } + private fun collectApplicationCache(): Long { + return File(requireContext().cacheDir.path).calculateSize() + } + override fun onResume() { val userDetailJson = SaveKeyValues.getValue(LocaleConstant.USER_DETAIL_MODEL, "") as String if (userDetailJson.isNotBlank()) { @@ -213,7 +228,7 @@ updateUserInfo() } //缓存 - cacheSizeView.text = 0L.formatFileSize() + cacheSizeView.text = collectApplicationCache().formatFileSize() super.onResume() } diff --git a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt index 73d1e4c..69ce2d1 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt @@ -2,9 +2,9 @@ import android.app.ProgressDialog import android.content.Intent -import android.graphics.BitmapFactory import android.net.Uri import android.os.Build +import android.os.CountDownTimer import androidx.core.content.FileProvider import androidx.lifecycle.ViewModelProvider import com.casic.smarttube.BuildConfig @@ -105,9 +105,20 @@ "尽情期待~".show(requireContext()) } - //TODO 待后期功能完善后再调整缓存实际位置 clearCacheLayout.setOnClickListener { - cacheSizeView.text = 0L.formatFileSize() + //删除缓存之后在设置缓存大小 + DialogHelper.showLoadingDialog(requireActivity(), "清理中...") + File(requireContext().cacheDir.path).deleteFile() + object : CountDownTimer(1500, 500) { + override fun onTick(millisUntilFinished: Long) { + + } + + override fun onFinish() { + DialogHelper.dismissLoadingDialog() + cacheSizeView.text = collectApplicationCache().formatFileSize() + } + }.start() } loginOutButton.setOnClickListener { @@ -204,6 +215,10 @@ }) } + private fun collectApplicationCache(): Long { + return File(requireContext().cacheDir.path).calculateSize() + } + override fun onResume() { val userDetailJson = SaveKeyValues.getValue(LocaleConstant.USER_DETAIL_MODEL, "") as String if (userDetailJson.isNotBlank()) { @@ -213,7 +228,7 @@ updateUserInfo() } //缓存 - cacheSizeView.text = 0L.formatFileSize() + cacheSizeView.text = collectApplicationCache().formatFileSize() super.onResume() } diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml index 7dcef71..21c020d 100644 --- a/app/src/main/res/layout/fragment_mine.xml +++ b/app/src/main/res/layout/fragment_mine.xml @@ -89,19 +89,6 @@ android:orientation="vertical"> - - - - - - - - - @@ -177,7 +164,7 @@ style="@style/RelativeTextViewStyle" android:layout_toStartOf="@id/tempView" android:text="0K" - android:textColor="@color/hintTextColor" /> + android:textColor="@color/mainTextColor" />