diff --git a/CloudKey/app/src/main/java/com/thankvinci/CloudKey/Files/FileUtils.java b/CloudKey/app/src/main/java/com/thankvinci/CloudKey/Files/FileUtils.java index 6c26edd..efc67cf 100644 --- a/CloudKey/app/src/main/java/com/thankvinci/CloudKey/Files/FileUtils.java +++ b/CloudKey/app/src/main/java/com/thankvinci/CloudKey/Files/FileUtils.java @@ -23,6 +23,7 @@ import java.util.List; public class FileUtils { //按照文件夹,文件,文件名次序的顺序进行排序,参考:https://blog.csdn.net/qq_34246164/article/details/111785553 + public static void orderByName(File[] files){ List fileList = Arrays.asList(files); Collections.sort(fileList, new Comparator() { @@ -32,9 +33,9 @@ public class FileUtils { return -1; } if(f2.isDirectory() && f1.isFile()){ - return 0; + return 1; } - return (f1.getName().toUpperCase()).compareTo((f2.getName().toUpperCase())); + return (f1.getName()).compareTo((f2.getName())); //return (f1.getName().toUpperCase()).compareTo((f2.getName().toUpperCase())); } }); diff --git a/CloudKey/app/src/main/java/com/thankvinci/CloudKey/Fragment/FileManageFragment.java b/CloudKey/app/src/main/java/com/thankvinci/CloudKey/Fragment/FileManageFragment.java index 0103e18..bd35de0 100644 --- a/CloudKey/app/src/main/java/com/thankvinci/CloudKey/Fragment/FileManageFragment.java +++ b/CloudKey/app/src/main/java/com/thankvinci/CloudKey/Fragment/FileManageFragment.java @@ -88,6 +88,7 @@ public class FileManageFragment extends Fragment { if (files == null){ //当目录里为空时,列表为空对象 }else{ + Toast.makeText(getActivity(),"进行文件排序",Toast.LENGTH_SHORT).show(); FileUtils.orderByName(files); initDirectory(); } diff --git a/开发历程.md b/开发历程.md index b6fa1fa..afba15f 100644 --- a/开发历程.md +++ b/开发历程.md @@ -319,4 +319,8 @@ FileHandler负责将获取到的md5码发到NetThread,然后将得到的密码 解决方法:https://blog.csdn.net/qq_39200790/article/details/80430743 -获取NetworkCapabilities对象,当前活跃网络的VALIDATED标记是否存在 \ No newline at end of file +获取NetworkCapabilities对象,当前活跃网络的VALIDATED标记是否存在 + +**2021/6/13** + +改了一下原先的文件名排序,之前的文件名排序的返回值有问题 \ No newline at end of file