1.添加工具类

corelib/src/main/java/com/xhly/corelib/utils/FileSizeUtil.java

@@ -99,7 +99,7 @@ public class FileSizeUtil {
             String memoryLine = br.readLine();
             String subMemoryLine = memoryLine.substring(memoryLine.indexOf("MemTotal:"));
             br.close();
-            return Integer.parseInt(subMemoryLine.replaceAll("\\D+", "")) * 1024l;
+            return Integer.parseInt(subMemoryLine.replaceAll("\\D+", "")) * 1024;
         } catch (IOException e) {
             e.printStackTrace();
         }
@@ -127,16 +127,17 @@ public class FileSizeUtil {
      * @return 转换后的单位
      */
     public static String formatFileSize(long size, boolean isInteger) {
+        int unit=1000;
         DecimalFormat df = isInteger ? fileIntegerFormat : fileDecimalFormat;
         String fileSizeString = "0M";
-        if (size < 1024 && size > 0) {
+        if (size < unit && size > 0) {
             fileSizeString = df.format((double) size) + "B";
-        } else if (size < 1024 * 1024) {
-            fileSizeString = df.format((double) size / 1024) + "K";
-        } else if (size < 1024 * 1024 * 1024) {
-            fileSizeString = df.format((double) size / (1024 * 1024)) + "M";
+        } else if (size < unit * unit) {
+            fileSizeString = df.format((double) size / unit) + "K";
+        } else if (size < unit * unit * unit) {
+            fileSizeString = df.format((double) size / (unit * unit)) + "M";
         } else {
-            fileSizeString = df.format((double) size / (1024 * 1024 * 1024)) + "G";
+            fileSizeString = df.format((double) size / (unit * unit * unit)) + "G";
         }
         return fileSizeString;
     }

corelib/src/main/java/com/xhly/corelib/utils/FileSizeUtils.kt

@@ -1,17 +1,31 @@
 package com.xhly.corelib.utils
 
+import android.app.usage.StorageStatsManager
 import android.content.Context
-import android.os.Environment
-import android.os.StatFs
+import android.os.Build
+import android.os.storage.StorageManager
+import androidx.appcompat.app.AppCompatActivity
 
 class FileSizeUtils {
     companion object{
         fun getTotalSpace(context: Context): Long {
-            return context.filesDir.totalSpace
+            return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                val storageStatsManager =
+                    context.getSystemService(AppCompatActivity.STORAGE_STATS_SERVICE) as StorageStatsManager
+                storageStatsManager.getTotalBytes(StorageManager.UUID_DEFAULT)
+            }else{
+                context.filesDir.totalSpace
+            }
         }
 
         fun getFreeSpace(context: Context): Long {
-            return context.filesDir.freeSpace
+            return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                val storageStatsManager =
+                    context.getSystemService(AppCompatActivity.STORAGE_STATS_SERVICE) as StorageStatsManager
+                storageStatsManager.getFreeBytes(StorageManager.UUID_DEFAULT)
+            }else{
+                context.filesDir.freeSpace
+            }
         }
     }
 }