diff --git a/CloudKey/app/src/main/java/com/thankvinci/CloudKey/Files/FileAdapter.java b/CloudKey/app/src/main/java/com/thankvinci/CloudKey/Files/FileAdapter.java index cb10be1..ef90bbb 100644 --- a/CloudKey/app/src/main/java/com/thankvinci/CloudKey/Files/FileAdapter.java +++ b/CloudKey/app/src/main/java/com/thankvinci/CloudKey/Files/FileAdapter.java @@ -91,7 +91,7 @@ public class FileAdapter extends RecyclerView.Adapter { unzipDialog.setArguments(data); unzipDialog.show(((MainActivity)v.getContext()).getSupportFragmentManager(),"unzip"); //Toast.makeText(v.getContext(),""+unzipDialog.getPosiBtn(),Toast.LENGTH_SHORT).show(); - + unzipDialog.setFmFragment((FileManageFragment) fragment); }else{ Toast.makeText(v.getContext(),"压缩包已损坏或者格式不合法",Toast.LENGTH_SHORT).show(); } diff --git a/CloudKey/app/src/main/java/com/thankvinci/CloudKey/Fragment/UnzipDialogFragment.java b/CloudKey/app/src/main/java/com/thankvinci/CloudKey/Fragment/UnzipDialogFragment.java index ef137e7..a5bb115 100644 --- a/CloudKey/app/src/main/java/com/thankvinci/CloudKey/Fragment/UnzipDialogFragment.java +++ b/CloudKey/app/src/main/java/com/thankvinci/CloudKey/Fragment/UnzipDialogFragment.java @@ -44,6 +44,8 @@ public class UnzipDialogFragment extends DialogFragment { Button posi_btn; //点击解压的按钮 //用一个fragment来存当前这个fragment对象 Fragment fragment; + // + FileManageFragment fmFragment; //点击压缩文件弹出来的Dialog private UnzipDialogListener listener; //源文件绝对路径,目标文件夹绝对路径,md5码和密码 @@ -94,10 +96,12 @@ public class UnzipDialogFragment extends DialogFragment { srcFile_edit = view.findViewById(R.id.src_edit); srcFile_edit.setText(srcFile); srcFile_edit.setSelection(srcFile.length()); + srcFile_edit.setTextColor(getResources().getColor(R.color.grey_1)); desPath_edit = view.findViewById(R.id.des_edit); desPath_edit.setText(desPath); desPath_edit.setSelection(desPath.length()); + desPath_edit.setTextColor(getResources().getColor(R.color.grey_1)); md5_edit = view.findViewById(R.id.md5_edit); passwd_edit = view.findViewById(R.id.pwd_edit); @@ -112,7 +116,7 @@ public class UnzipDialogFragment extends DialogFragment { if(!FileUtils.isEncrypted(srcFile)){ //当文件不是加密文件时 TextView text = view.findViewById(R.id.pwd_text); - text.setTextColor(getResources().getColor(R.color.grey)); + text.setTextColor(getResources().getColor(R.color.grey_1)); setNoPWD(); } } catch (ZipException e) { @@ -225,6 +229,7 @@ public class UnzipDialogFragment extends DialogFragment { md5_edit.setText(md5); this.md5 = md5_edit.getText().toString(); md5_edit.setSelection(md5.length()); + md5_edit.setTextColor(getResources().getColor(R.color.grey_1)); } public void setSuccessful(boolean successful){ this.successful = successful; @@ -252,12 +257,19 @@ public class UnzipDialogFragment extends DialogFragment { } public void setNoPWD(){ getPWD.setClickable(false); - getPWD.setTextColor(getResources().getColor(R.color.grey)); + getPWD.setTextColor(getResources().getColor(R.color.grey_1)); passwd_edit.setFocusable(false); passwd_edit.setHint("非加密文件"); + passwd_edit.setHintTextColor(getResources().getColor(R.color.grey_1)); acceptPWD2SQL.setChecked(false); } public Button getPosiBtn(){ return posi_btn; } + public void setFmFragment(FileManageFragment fmFragment){ + this.fmFragment = fmFragment; + } + public FileManageFragment getFMFragment(){ + return fmFragment; + } } diff --git a/CloudKey/app/src/main/java/com/thankvinci/CloudKey/Utils/FileHandler.java b/CloudKey/app/src/main/java/com/thankvinci/CloudKey/Utils/FileHandler.java index 07f5dd6..1cafd31 100644 --- a/CloudKey/app/src/main/java/com/thankvinci/CloudKey/Utils/FileHandler.java +++ b/CloudKey/app/src/main/java/com/thankvinci/CloudKey/Utils/FileHandler.java @@ -10,11 +10,13 @@ import android.widget.Toast; import androidx.annotation.RequiresApi; import androidx.fragment.app.Fragment; +import androidx.navigation.Navigation; import com.thankvinci.CloudKey.Fragment.UnzipDialogFragment; import com.thankvinci.CloudKey.NetUtils.NetCheck; import com.thankvinci.CloudKey.NetUtils.NetHandler; import com.thankvinci.CloudKey.NetUtils.NetThread; +import com.thankvinci.CloudKey.R; public class FileHandler extends Handler { //定义功能选择的常量 获取MD5和解压 @@ -48,6 +50,7 @@ public class FileHandler extends Handler { ((UnzipDialogFragment)fragment).setProgressBar(View.INVISIBLE); ((UnzipDialogFragment)fragment).dismiss(); Toast.makeText(activity,"解压完成",Toast.LENGTH_SHORT).show(); + ((UnzipDialogFragment)fragment).getFMFragment().loadDirectory(); //当dialog的checkbox为选中时并且密码来源不是数据库时再并且解压成功时再并且密码输入框不为空时,即用户同意输入解压密码解压成功后把密码上传到数据库 if("无网络".equals(NetCheck.getNetStatus(activity))){ Toast.makeText(activity,"上传密码失败,当前网络不畅通"+NetCheck.getNetStatus((Context)activity),Toast.LENGTH_SHORT).show(); diff --git a/CloudKey/app/src/main/res/values/colors.xml b/CloudKey/app/src/main/res/values/colors.xml index 942ebf9..2c3f130 100644 --- a/CloudKey/app/src/main/res/values/colors.xml +++ b/CloudKey/app/src/main/res/values/colors.xml @@ -7,6 +7,7 @@ #FF018786 #FF000000 #FF343434 + #FFDCDCDC #FFFFFFFF #FFff0000 #FF0000ff diff --git a/开发历程.md b/开发历程.md index afba15f..48f60d6 100644 --- a/开发历程.md +++ b/开发历程.md @@ -323,4 +323,6 @@ FileHandler负责将获取到的md5码发到NetThread,然后将得到的密码 **2021/6/13** -改了一下原先的文件名排序,之前的文件名排序的返回值有问题 \ No newline at end of file +改了一下原先的文件名排序,之前的文件名排序的返回值有问题导致文件排序一直是乱的 + +实现解压后刷新布局 \ No newline at end of file