1.删除无用的Toast

2.使dialog在解压过程中点击空白区域无效,点击取消无效

CloudKey/app/src/main/java/com/thankvinci/CloudKey/Fragment/UnzipDialogFragment.java

@@ -173,25 +173,11 @@ public class UnzipDialogFragment extends DialogFragment {
                 nt.start();
             }
         });
-/**
-        builder.setView(view).setTitle("解压到当前路径").setPositiveButton("解压", new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-                passwd = passwd_edit.getText().toString();
-                Handler fHandler = new FileHandler(getActivity(),fragment);
-                Thread ft = new Thread(new FileThread(fHandler,srcFile,desPath,passwd,FileHandler.FUNCTION_DECOMPRESS));
-                ft.start();
-                progressBar.setVisibility(View.VISIBLE);
-                //listener.onDialogUnzipClicked();
-
-            }
-        })
- **/
         builder.setView(view).setTitle("解压到当前路径").setPositiveButton("解压",null)
                 .setNegativeButton("取消", new DialogInterface.OnClickListener() {
             @Override
             public void onClick(DialogInterface dialog, int which) {
-                //Toast.makeText(getActivity(),"取消操作",Toast.LENGTH_SHORT).show();
+                Toast.makeText(getActivity(),"取消",Toast.LENGTH_SHORT).show();
             }
         });;
         alertDialog = builder.create();
@@ -200,6 +186,7 @@ public class UnzipDialogFragment extends DialogFragment {
     @Override
     public void onStart(){
         super.onStart();
+        alertDialog.setCanceledOnTouchOutside(false);
         if (alertDialog != null){
             Button pb = alertDialog.getButton(AlertDialog.BUTTON_POSITIVE);
             pb.setOnClickListener(new View.OnClickListener() {
@@ -212,6 +199,9 @@ public class UnzipDialogFragment extends DialogFragment {
                     Thread ft = new Thread(new FileThread(fHandler,srcFile,desPath,passwd,FileHandler.FUNCTION_DECOMPRESS));
                     ft.start();
                     progressBar.setVisibility(View.VISIBLE);
+                    Button nb = alertDialog.getButton(AlertDialog.BUTTON_NEGATIVE);
+                    nb.setClickable(false);
+                    nb.setTextColor(getResources().getColor(R.color.grey_1));
                 }
             });
         }
@@ -226,10 +216,13 @@ public class UnzipDialogFragment extends DialogFragment {
         passwd_edit.setFocusable(false);
     }
     public void setMD5(String md5){
+        if(md5 != null && !("".equals(md5))) {
             md5_edit.setText(md5);
             this.md5 = md5_edit.getText().toString();
             md5_edit.setSelection(md5.length());
             md5_edit.setTextColor(getResources().getColor(R.color.grey_1));
+            Toast.makeText(getActivity(),"md5码加载完成",Toast.LENGTH_SHORT).show();
+        }
     }
     public void setSuccessful(boolean successful){
         this.successful = successful;

CloudKey/app/src/main/java/com/thankvinci/CloudKey/Utils/FileHandler.java

@@ -40,7 +40,6 @@ public class FileHandler extends Handler {
             case FUNCTION_GET_MD5:
                 ((UnzipDialogFragment)fragment).setMD5(msg.getData().getString("md5"));
                 ((UnzipDialogFragment)fragment).setProgressBar(View.INVISIBLE);
-                Toast.makeText(activity,"MD5码加载完成",Toast.LENGTH_SHORT).show();
                 break;
             case ERROR:
                 Toast.makeText(activity,msg.getData().getString("error"),Toast.LENGTH_SHORT).show();

开发历程.md

@@ -329,4 +329,8 @@ FileHandler负责将获取到的md5码发到NetThread,然后将得到的密码
 
 **2021/6/13**
 
-给fmfragment添加菜单项用于刷新当前的页面,和从其他应用返回时刷新布局
+给fmfragment添加菜单项用于刷新当前的页面,比如连接电脑传给文件到当前路径,传进来后刷新一下才能看见
+
+删除无用的Toast
+
+使dialog在解压过程中点击空白区域无效,点击取消无效