diff --git a/app/src/main/java/com/bell/scansdcardfiles/activity/ScanListActivity.java b/app/src/main/java/com/bell/scansdcardfiles/activity/ScanListActivity.java index 8df3ad9..84ec57e 100755 --- a/app/src/main/java/com/bell/scansdcardfiles/activity/ScanListActivity.java +++ b/app/src/main/java/com/bell/scansdcardfiles/activity/ScanListActivity.java @@ -54,6 +54,7 @@ private List sdFolder; private CheckBox checkBox; private FrameLayout progressLayout; + private PopupWindow popupWindow; @Override protected void onCreate(Bundle savedInstanceState) { @@ -165,7 +166,7 @@ */ private void showPopUpWindow() { View view = LayoutInflater.from(mContext).inflate(R.layout.lt_select, null); - final PopupWindow popupWindow = new PopupWindow(mContext); + popupWindow = new PopupWindow(mContext); popupWindow.setContentView(view); popupWindow.setWidth(ViewGroup.LayoutParams.MATCH_PARENT); popupWindow.setHeight(ViewGroup.LayoutParams.WRAP_CONTENT); @@ -198,12 +199,12 @@ File f; if (data.isSelectModel() && data.isSelect()) { if (data.isFile()) { - f = new File(data.getFilePath()); + f = new File(data.getFilePath() + "/" + data.getFileName()); if (f.delete()) { iterator.remove(); } } else { - f = new File(data.getFilePath()); + f = new File(data.getFilePath() + "/" + data.getFileName()); if (FileUtil.deleteDir(f)) { iterator.remove(); } @@ -211,7 +212,8 @@ } } - mAdapter.notifyDataSetChanged(); + Log.e(TAG, "mListItems size => " + mListItems.size()); + mainHandler.sendEmptyMessage(333); } }).start(); } @@ -274,7 +276,7 @@ } }); - mainHandler.sendEmptyMessage(1); + mainHandler.sendEmptyMessage(777); Log.e(TAG, "执行全部结束~~~~~~~~~" + mListItems.size()); @@ -328,7 +330,7 @@ } }); - mainHandler.sendEmptyMessage(2); + mainHandler.sendEmptyMessage(666); Log.e(TAG, "执行全部结束~~~~~~~~~" + mListItems.size()); } catch (Exception e) { @@ -351,8 +353,10 @@ } if (file.isFile()) { + Log.e(TAG, file.getName() + ", " + file.length()); // 大于10M的文件写入List if (file.length() >= fileSize) { + FileData data = new FileData(); data.setFile(true); data.setFileName(file.getName()); @@ -396,7 +400,7 @@ FileData data = new FileData(); data.setFile(true); data.setFileName(file.getName()); - data.setFilePath(file.getPath()); + data.setFilePath(file.getParent()); data.setFileSize(FileUtil.getDataSize(file.length())); data.setFileTime(FileUtil.formatTime(file.lastModified())); mListItems.add(data); @@ -408,7 +412,7 @@ FileData data = new FileData(); data.setFile(false); data.setFileName(file.getName()); - data.setFilePath(file.getPath()); + data.setFilePath(file.getParent()); data.setFileSize(file.list().length + "个文件"); data.setFileTime(FileUtil.formatTime(file.lastModified())); mListItems.add(data); @@ -422,7 +426,7 @@ FileData data = new FileData(); data.setFile(false); data.setFileName(file.getName()); - data.setFilePath(file.getPath()); + data.setFilePath(file.getParent()); data.setFileSize(file.list().length + "个文件"); data.setFileTime(FileUtil.formatTime(file.lastModified())); mListItems.add(data); @@ -525,16 +529,24 @@ } } else if (msg.what == 888) { // checkBox.setButtonDrawable(R.drawable.check_box_select); - } else if (msg.what == 1) { + } else if (msg.what == 777) { mAdapter = new FileAdapter(mContext, mListItems, mainHandler); mListView.setAdapter(mAdapter); progressLayout.setVisibility(View.GONE); fileText.setText("按文件扫描(" + mListItems.size() + ")"); - } else if (msg.what == 2) { + } else if (msg.what == 666) { mAdapter = new FileAdapter(mContext, mListItems, mainHandler); mListView.setAdapter(mAdapter); progressLayout.setVisibility(View.GONE); folderText.setText("按目录扫描(" + mListItems.size() + ")"); + } else if (msg.what == 333) { + mAdapter.notifyDataSetChanged(); + for (int i = 0; i < mListItems.size(); i++) { + mListItems.get(i).setSelect(false); + mListItems.get(i).setSelectModel(false); + } + popupWindow.dismiss(); + Toast.makeText(mContext, "删除成功", Toast.LENGTH_SHORT).show(); } } }