see 09/06 log

Blankj · Blankj · commit c2c44d3e1112 · 2017-09-06T18:18:51.000+08:00
diff --git a/README-CN.md b/README-CN.md
@@ -422,11 +422,8 @@ isTablet         : 判断是否是平板
 
 * ### SD卡相关→[SDCardUtils.java][sdcard.java]→[Demo][sdcard.demo]
 ```
-isSDCardEnable: 判断SD卡是否可用
-getSDCardPath : 获取SD卡路径
-getDataPath   : 获取SD卡Data路径
-getFreeSpace  : 计算SD卡的剩余空间
-getSDCardInfo : 获取SD卡信息
+isSDCardEnable : 判断SD卡是否可用
+getSDCardPaths : 获取SD卡路径
 ```
 
 * ### 服务相关→[ServiceUtils.java][service.java]
diff --git a/app/src/main/java/com/blankj/androidutilcode/core/sdcard/SDCardActivity.java b/app/src/main/java/com/blankj/androidutilcode/core/sdcard/SDCardActivity.java
@@ -10,6 +10,8 @@
 import com.blankj.androidutilcode.base.BaseBackActivity;
 import com.blankj.utilcode.util.SDCardUtils;
 
+import java.util.Arrays;
+
 /**
  * <pre>
  *     author: Blankj
@@ -41,10 +43,10 @@ public void initView(Bundle savedInstanceState, View view) {
 
         TextView tvAboutSdcard = (TextView) findViewById(R.id.tv_about_sdcard);
         tvAboutSdcard.setText("isSDCardEnable: " + SDCardUtils.isSDCardEnable()
-                + "\ngetDataPath: " + SDCardUtils.getDataPath()
-                + "\ngetSDCardPath: " + SDCardUtils.getSDCardPath()
-                + "\ngetFreeSpace: " + SDCardUtils.getFreeSpace()
-                + "\ngetSDCardInfo: " + SDCardUtils.getSDCardInfo()
+                + "\ngetSDCardPaths: " + SDCardUtils.getSDCardPaths()
+                + "\ngetInnerSDCardPaths: " + SDCardUtils.getSDCardPaths(true)
+                + "\ngetOuterSDCardPaths: " + SDCardUtils.getSDCardPaths(false)
+                + "\ngetStorageDirectories: " + Arrays.asList(SDCardUtils.getStorageDirectories())
         );
     }
 
diff --git a/update_log.md b/update_log.md
@@ -1,3 +1,4 @@
+* 17/09/06 完善SDCardUtils获取SD卡路径，完善SPUtils新增commit
 * 17/09/05 完善LogUtils，发布版本1.9.0
 * 17/09/04 完善ToastUtils，去除相关safe函数，都改为safe实现，新增CustomToast的Demo
 * 17/09/02 完善ToastUtils，去除引入view带来的问题，发布版本1.8.6
diff --git a/utilcode/src/main/java/com/blankj/utilcode/util/SDCardUtils.java b/utilcode/src/main/java/com/blankj/utilcode/util/SDCardUtils.java
@@ -1,14 +1,14 @@
 package com.blankj.utilcode.util;
 
-import android.annotation.TargetApi;
-import android.os.Build;
-import android.os.Environment;
-import android.os.StatFs;
+import android.content.Context;
+import android.os.storage.StorageManager;
 
-import java.io.BufferedInputStream;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.InputStreamReader;
+import java.lang.reflect.Array;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 
 /**
  * <pre>
@@ -30,109 +30,69 @@ private SDCardUtils() {
      * @return true : 可用<br>false : 不可用
      */
     public static boolean isSDCardEnable() {
-        return Environment.MEDIA_MOUNTED.equals(Environment.getExternalStorageState());
+        return !getSDCardPaths().isEmpty();
     }
 
     /**
      * 获取SD卡路径
-     * <p>先用shell，shell失败再普通方法获取，一般是/storage/emulated/0/</p>
      *
+     * @param removable true : 外置SD卡<br>false : 内置SD卡
      * @return SD卡路径
      */
-    public static String getSDCardPath() {
-        if (!isSDCardEnable()) return null;
-        String cmd = "cat /proc/mounts";
-        Runtime run = Runtime.getRuntime();
-        BufferedReader bufferedReader = null;
+    @SuppressWarnings("TryWithIdenticalCatches")
+    public static List<String> getSDCardPaths(boolean removable) {
+        List<String> paths = new ArrayList<>();
+        StorageManager mStorageManager = (StorageManager) Utils.getApp()
+                .getSystemService(Context.STORAGE_SERVICE);
         try {
-            Process p = run.exec(cmd);
-            bufferedReader = new BufferedReader(new InputStreamReader(new BufferedInputStream(p.getInputStream())));
-            String lineStr;
-            while ((lineStr = bufferedReader.readLine()) != null) {
-                if (lineStr.contains("sdcard") && lineStr.contains(".android_secure")) {
-                    String[] strArray = lineStr.split(" ");
-                    if (strArray.length >= 5) {
-                        return strArray[1].replace("/.android_secure", "") + File.separator;
-                    }
-                }
-                if (p.waitFor() != 0 && p.exitValue() == 1) {
-                    break;
+            Class<?> storageVolumeClazz = Class.forName("android.os.storage.StorageVolume");
+            Method getVolumeList = StorageManager.class.getMethod("getVolumeList");
+            Method getPath = storageVolumeClazz.getMethod("getPath");
+            Method isRemovable = storageVolumeClazz.getMethod("isRemovable");
+            Object result = getVolumeList.invoke(mStorageManager);
+            final int length = Array.getLength(result);
+            for (int i = 0; i < length; i++) {
+                Object storageVolumeElement = Array.get(result, i);
+                String path = (String) getPath.invoke(storageVolumeElement);
+                boolean res = (Boolean) isRemovable.invoke(storageVolumeElement);
+                if (removable == res) {
+                    paths.add(path);
                 }
             }
-        } catch (Exception e) {
+        } catch (ClassNotFoundException e) {
+            e.printStackTrace();
+        } catch (InvocationTargetException e) {
+            e.printStackTrace();
+        } catch (NoSuchMethodException e) {
+            e.printStackTrace();
+        } catch (IllegalAccessException e) {
             e.printStackTrace();
-        } finally {
-            CloseUtils.closeIO(bufferedReader);
         }
-        return Environment.getExternalStorageDirectory().getPath() + File.separator;
-    }
-
-    /**
-     * 获取SD卡data路径
-     *
-     * @return SD卡data路径
-     */
-    public static String getDataPath() {
-        if (!isSDCardEnable()) return null;
-        return Environment.getExternalStorageDirectory().getPath() + File.separator + "data" + File.separator;
+        return paths;
     }
 
     /**
-     * 获取SD卡剩余空间
-     *
-     * @return SD卡剩余空间
-     */
-    @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR2)
-    public static String getFreeSpace() {
-        if (!isSDCardEnable()) return null;
-        StatFs stat = new StatFs(getSDCardPath());
-        long blockSize, availableBlocks;
-        availableBlocks = stat.getAvailableBlocksLong();
-        blockSize = stat.getBlockSizeLong();
-        return ConvertUtils.byte2FitMemorySize(availableBlocks * blockSize);
-    }
-
-    /**
-     * 获取SD卡信息
+     * 获取SD卡路径
      *
-     * @return SDCardInfo
+     * @return SD卡路径
      */
-    @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR2)
-    public static String getSDCardInfo() {
-        if (!isSDCardEnable()) return null;
-        SDCardInfo sd = new SDCardInfo();
-        sd.isExist = true;
-        StatFs sf = new StatFs(Environment.getExternalStorageDirectory().getPath());
-        sd.totalBlocks = sf.getBlockCountLong();
-        sd.blockByteSize = sf.getBlockSizeLong();
-        sd.availableBlocks = sf.getAvailableBlocksLong();
-        sd.availableBytes = sf.getAvailableBytes();
-        sd.freeBlocks = sf.getFreeBlocksLong();
-        sd.freeBytes = sf.getFreeBytes();
-        sd.totalBytes = sf.getTotalBytes();
-        return sd.toString();
-    }
-
-    public static class SDCardInfo {
-        boolean isExist;
-        long    totalBlocks;
-        long    freeBlocks;
-        long    availableBlocks;
-        long    blockByteSize;
-        long    totalBytes;
-        long    freeBytes;
-        long    availableBytes;
-
-        @Override
-        public String toString() {
-            return "isExist=" + isExist +
-                    "\ntotalBlocks=" + totalBlocks +
-                    "\nfreeBlocks=" + freeBlocks +
-                    "\navailableBlocks=" + availableBlocks +
-                    "\nblockByteSize=" + blockByteSize +
-                    "\ntotalBytes=" + totalBytes +
-                    "\nfreeBytes=" + freeBytes +
-                    "\navailableBytes=" + availableBytes;
+    @SuppressWarnings("TryWithIdenticalCatches")
+    public static List<String> getSDCardPaths() {
+        StorageManager storageManager = (StorageManager) Utils.getApp()
+                .getSystemService(Context.STORAGE_SERVICE);
+        List<String> paths = new ArrayList<>();
+        try {
+            Method getVolumePathsMethod = StorageManager.class.getMethod("getVolumePaths");
+            getVolumePathsMethod.setAccessible(true);
+            Object invoke = getVolumePathsMethod.invoke(storageManager);
+            paths = Arrays.asList((String[]) invoke);
+        } catch (NoSuchMethodException e) {
+            e.printStackTrace();
+        } catch (IllegalAccessException e) {
+            e.printStackTrace();
+        } catch (InvocationTargetException e) {
+            e.printStackTrace();
         }
+        return paths;
     }
 }
diff --git a/utilcode/src/main/java/com/blankj/utilcode/util/SPUtils.java b/utilcode/src/main/java/com/blankj/utilcode/util/SPUtils.java

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+* 17/09/06 完善SDCardUtils获取SD卡路径，完善SPUtils新增commit`
`1`	`2`	`* 17/09/05 完善LogUtils，发布版本1.9.0`
`2`	`3`	`* 17/09/04 完善ToastUtils，去除相关safe函数，都改为safe实现，新增CustomToast的Demo`
`3`	`4`	`* 17/09/02 完善ToastUtils，去除引入view带来的问题，发布版本1.8.6`