see 02/15 log

README-CN.md

@@ -226,15 +226,15 @@ popAddFragment           : 先出栈后新增fragment
 hideFragment             : 隐藏fragment
 showFragment             : 显示fragment
 hideShowFragment         : 先隐藏后显示fragment
-getLastAddFragment       : 获取最后加入的fragment
-getLastAddFragmentInStack: 获取栈中最后加入的fragment
+getLastAddFragment       : 获取同级别最后加入的fragment
+getLastAddFragmentInStack: 获取栈中同级别最后加入的fragment
 getTopShowFragment       : 获取顶层可见fragment
 getTopShowFragmentInStack: 获取栈中顶层可见fragment
-getPreFragment           : 获取目标fragment的前一个fragment
 getFragments             : 获取同级别fragment
 getFragmentsInStack      : 获取栈中同级别fragment
 getAllFragments          : 获取所有fragment
 getAllFragmentsInStack   : 获取栈中所有fragment
+getPreFragment           : 获取目标fragment的前一个fragment
 findFragment             : 查找fragment
 dispatchBackPress        : 处理fragment回退键
 setBackgroundColor       : 设置背景色

update_log.md

+* 17/02/14 完善FragmentUtils中，修复部分bug
+* 17/02/14 完善FragmentUtils中，Demo测试中
+* 17/02/13 完善FragmentUtils中
+* 17/02/12 完善FragmentUtils中
+* 17/02/11 完善FragmentUtils中
 * 17/02/10 完善FragmentUtils中，LogUtils对长度进行分割
 * 17/02/09 完善FragmentUtils中
 * 17/02/08 完善FragmentUtils中

utilcode/src/main/java/com/blankj/utilcode/utils/FragmentUtils.java

@@ -425,7 +425,7 @@ public class FragmentUtils {
     }
 
     /**
-     * 获取最后加入的fragment
+     * 获取同级别最后加入的fragment
      *
      * @param fragmentManager fragment管理器
      * @return 最后加入的fragment
@@ -435,7 +435,7 @@ public class FragmentUtils {
     }
 
     /**
-     * 获取栈中最后加入的fragment
+     * 获取栈中同级别最后加入的fragment
      *
      * @param fragmentManager fragment管理器
      * @return 最后加入的fragment
@@ -445,7 +445,7 @@ public class FragmentUtils {
     }
 
     /**
-     * 根据栈参数获取最后加入的fragment
+     * 根据栈参数获取同级别最后加入的fragment
      *
      * @param fragmentManager fragment管理器
      * @param isInStack       是否是栈中的
@@ -517,29 +517,6 @@ public class FragmentUtils {
         return parentFragment;
     }
 
-    /**
-     * 获取目标fragment的前一个fragment
-     *
-     * @param destFragment 目标fragment
-     * @return 目标fragment的前一个fragment
-     */
-    public static Fragment getPreFragment(@NonNull Fragment destFragment) {
-        FragmentManager fragmentManager = destFragment.getFragmentManager();
-        if (fragmentManager == null) return null;
-        List<Fragment> fragments = getFragments(fragmentManager);
-        boolean flag = false;
-        for (int i = fragments.size() - 1; i >= 0; --i) {
-            Fragment fragment = fragments.get(i);
-            if (flag && fragment != null) {
-                return fragment;
-            }
-            if (fragment == destFragment) {
-                flag = true;
-            }
-        }
-        return null;
-    }
-
     /**
      * 获取同级别fragment
      *
@@ -635,6 +612,29 @@ public class FragmentUtils {
         return result;
     }
 
+    /**
+     * 获取目标fragment的前一个fragment
+     *
+     * @param destFragment 目标fragment
+     * @return 目标fragment的前一个fragment
+     */
+    public static Fragment getPreFragment(@NonNull Fragment destFragment) {
+        FragmentManager fragmentManager = destFragment.getFragmentManager();
+        if (fragmentManager == null) return null;
+        List<Fragment> fragments = getFragments(fragmentManager);
+        boolean flag = false;
+        for (int i = fragments.size() - 1; i >= 0; --i) {
+            Fragment fragment = fragments.get(i);
+            if (flag && fragment != null) {
+                return fragment;
+            }
+            if (fragment == destFragment) {
+                flag = true;
+            }
+        }
+        return null;
+    }
+
     /**
      * 查找fragment
      *

utilcode/src/main/java/com/blankj/utilcode/utils/PhoneUtils.java

@@ -161,7 +161,7 @@ public class PhoneUtils {
         str += "NetworkOperator = " + tm.getNetworkOperator() + "\n";
         str += "NetworkOperatorName = " + tm.getNetworkOperatorName() + "\n";
         str += "NetworkType = " + tm.getNetworkType() + "\n";
-        str += "honeType = " + tm.getPhoneType() + "\n";
+        str += "PhoneType = " + tm.getPhoneType() + "\n";
         str += "SimCountryIso = " + tm.getSimCountryIso() + "\n";
         str += "SimOperator = " + tm.getSimOperator() + "\n";
         str += "SimOperatorName = " + tm.getSimOperatorName() + "\n";

utilcode/src/main/java/com/blankj/utilcode/utils/SDCardUtils.java

@@ -40,7 +40,7 @@ public class SDCardUtils {
      * @return SD卡路径
      */
     public static String getSDCardPath() {
-        if (!isSDCardEnable()) return "sdcard unable!";
+        if (!isSDCardEnable()) return null;
         String cmd = "cat /proc/mounts";
         Runtime run = Runtime.getRuntime();
         BufferedReader bufferedReader = null;
@@ -73,7 +73,7 @@ public class SDCardUtils {
      * @return SD卡data路径
      */
     public static String getDataPath() {
-        if (!isSDCardEnable()) return "sdcard unable!";
+        if (!isSDCardEnable()) return null;
         return Environment.getExternalStorageDirectory().getPath() + File.separator + "data" + File.separator;
     }
 
@@ -84,7 +84,7 @@ public class SDCardUtils {
      */
     @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR2)
     public static String getFreeSpace() {
-        if (!isSDCardEnable()) return "sdcard unable!";
+        if (!isSDCardEnable()) return null;
         StatFs stat = new StatFs(getSDCardPath());
         long blockSize, availableBlocks;
         availableBlocks = stat.getAvailableBlocksLong();
@@ -99,8 +99,8 @@ public class SDCardUtils {
      */
     @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR2)
     public static String getSDCardInfo() {
+        if (!isSDCardEnable()) return null;
         SDCardInfo sd = new SDCardInfo();
-        if (!isSDCardEnable()) return "sdcard unable!";
         sd.isExist = true;
         StatFs sf = new StatFs(Environment.getExternalStorageDirectory().getPath());
         sd.totalBlocks = sf.getBlockCountLong();

utilcode/src/main/java/com/blankj/utilcode/utils/SizeUtils.java

@@ -124,12 +124,6 @@ public class SizeUtils {
         void onGetSize(View view);
     }
 
-    public static void setListener(onGetSizeListener listener) {
-        mListener = listener;
-    }
-
-    private static onGetSizeListener mListener;
-
     /**
      * 测量视图尺寸
      *