From 2c9e99500ff7eda445f8c827652cdc6944b4dcf9 Mon Sep 17 00:00:00 2001
From: ThankVinci <thankvinci@163.com>
Date: Sun, 13 Jun 2021 17:10:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E4=BA=86=E4=B8=80=E4=B8=8B=E5=8E=9F?=
 =?UTF-8?q?=E5=85=88=E7=9A=84=E6=96=87=E4=BB=B6=E5=90=8D=E6=8E=92=E5=BA=8F?=
 =?UTF-8?q?,=E4=B9=8B=E5=89=8D=E7=9A=84=E6=96=87=E4=BB=B6=E5=90=8D?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F=E7=9A=84=E8=BF=94=E5=9B=9E=E5=80=BC=E6=9C=89?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=AF=BC=E8=87=B4=E6=96=87=E4=BB=B6=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F=E4=B8=80=E7=9B=B4=E6=98=AF=E4=B9=B1=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/thankvinci/CloudKey/Files/FileUtils.java  | 5 +++--
 .../thankvinci/CloudKey/Fragment/FileManageFragment.java    | 1 +
 开发历程.md                                             | 6 +++++-
 3 files changed, 9 insertions(+), 3 deletions(-)

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<File>() {
@@ -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