Skip to content

Commit 773b9db

Browse files
zybooo1zybooo1
committed
修复文件浏览单选特定文件无返回结果
1 parent bf9c4cb commit 773b9db

File tree

8 files changed

+52
-69
lines changed

8 files changed

+52
-69
lines changed

‎.idea/modules.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎EssFilePicker.iml

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎app/app.iml

Lines changed: 14 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -49,69 +49,56 @@
4949
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
5050
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
5151
<sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
52-
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />
53-
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />
54-
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />
55-
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true" />
56-
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" />
57-
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />
58-
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />
5952
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
6053
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
6154
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
6255
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
6356
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
6457
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
6558
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
59+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />
60+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />
61+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />
62+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true" />
63+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" />
64+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />
65+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />
6666
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
6767
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
6868
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
6969
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
7070
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
7171
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
7272
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
73-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
74-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
75-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
76-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
77-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
78-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
79-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
8073
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
8174
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
8275
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
8376
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
8477
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
8578
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
8679
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
80+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
81+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
82+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
83+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
84+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
85+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
86+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
8787
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
8888
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
89-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/build-info" />
90-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
9189
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
9290
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
9391
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
94-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
95-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
96-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
97-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-apk" />
98-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
99-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
10092
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
10193
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
10294
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
103-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifest-checker" />
10495
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
10596
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
106-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
10797
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
108-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/resources" />
10998
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
11099
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
111-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" />
112100
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/splits-support" />
113101
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
114-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
115102
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
116103
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
117104
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />

‎app/src/main/java/com/ess/essfilepicker/MainActivity.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,18 @@ public void onScan(View view) {
5555
.start();
5656
}
5757

58+
59+
@OnClick(R.id.button_single_pick)
60+
public void onSinglePick(View view) {
61+
FilePicker
62+
.from(this)
63+
.chooseForBrowser()
64+
.isSingle()
65+
.setFileTypes("pdf")
66+
.requestCode(REQUEST_CODE_CHOOSE)
67+
.start();
68+
}
69+
5870
@OnClick(R.id.button_select_pictures)
5971
public void onSelectPictures(View view){
6072
FilePicker

‎app/src/main/res/layout/activity_main.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,13 @@
2424
android:text="按文件类型选择文件"
2525
/>
2626

27+
<Button
28+
android:id="@+id/button_single_pick"
29+
android:layout_width="match_parent"
30+
android:layout_height="wrap_content"
31+
android:text="单选特定文件"
32+
/>
33+
2734
<Button
2835
android:id="@+id/button_select_pictures"
2936
android:layout_width="match_parent"

‎filePicker.iml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<module external.linked.project.id="filePicker" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
2+
<module external.linked.project.id="FilePicker" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
33
<component name="FacetManager">
44
<facet type="java-gradle" name="Java-Gradle">
55
<configuration>
@@ -8,7 +8,7 @@
88
</configuration>
99
</facet>
1010
</component>
11-
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
11+
<component name="NewModuleRootManager" inherit-compiler-output="true">
1212
<exclude-output />
1313
<content url="file://$MODULE_DIR$">
1414
<excludeFolder url="file://$MODULE_DIR$/.gradle" />

‎filepicker/filepicker.iml

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -71,24 +71,21 @@
7171
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
7272
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
7373
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
74-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
75-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
76-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
77-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
78-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
79-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
80-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
8174
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
8275
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
8376
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
8477
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
8578
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
8679
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
8780
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
88-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
81+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
82+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
83+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
84+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
85+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
86+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
87+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
8988
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/attr" />
90-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
91-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
9289
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
9390
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
9491
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
@@ -105,9 +102,7 @@
105102
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
106103
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
107104
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
108-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
109105
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
110-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/typedefs.txt" />
111106
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
112107
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
113108
</content>

‎filepicker/src/main/java/com/ess/filepicker/activity/SelectFileByBrowserActivity.java

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@
3434
import com.ess.filepicker.util.Const;
3535
import com.ess.filepicker.util.FileUtils;
3636

37-
import org.greenrobot.eventbus.EventBus;
38-
3937
import java.io.File;
4038
import java.util.ArrayList;
4139
import java.util.List;
@@ -78,7 +76,8 @@ public class SelectFileByBrowserActivity extends AppCompatActivity
7876
protected void onCreate(Bundle savedInstanceState) {
7977
super.onCreate(savedInstanceState);
8078
setContentView(R.layout.activity_select_file);
81-
EventBus.getDefault().register(this);
79+
// TODO: 2019/3/12 暂时移除
80+
// EventBus.getDefault().register(this);
8281

8382
mSdCardList = FileUtils.getAllSdPaths(this);
8483
if (!mSdCardList.isEmpty()) {
@@ -239,6 +238,7 @@ public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
239238
} else {
240239
//选中某文件后，判断是否单选
241240
if (SelectOptions.getInstance().isSingle) {
241+
mSelectedFileList.add(item);
242242
Intent result = new Intent();
243243
result.putParcelableArrayListExtra(Const.EXTRA_RESULT_SELECTION, mSelectedFileList);
244244
setResult(RESULT_OK, result);
@@ -283,7 +283,7 @@ public void onBackPressed() {
283283
super.onBackPressed();
284284
return;
285285
}
286-
executeListTask(mSelectedFileList, new File(mCurFolder).getParentFile().getAbsolutePath() + File.separator, SelectOptions.getInstance().getFileTypes(),SelectOptions.getInstance().getSortType());
286+
executeListTask(mSelectedFileList, new File(mCurFolder).getParentFile().getAbsolutePath() + File.separator, SelectOptions.getInstance().getFileTypes(), SelectOptions.getInstance().getSortType());
287287
}
288288

289289
@Override
@@ -294,14 +294,15 @@ public void onItemChildClick(BaseQuickAdapter adapter, View view, int position)
294294
if (mCurFolder.equals(queryPath)) {
295295
return;
296296
}
297-
executeListTask(mSelectedFileList, queryPath, SelectOptions.getInstance().getFileTypes(),SelectOptions.getInstance().getSortType());
297+
executeListTask(mSelectedFileList, queryPath, SelectOptions.getInstance().getFileTypes(), SelectOptions.getInstance().getSortType());
298298
}
299299
}
300300

301301
@Override
302302
protected void onDestroy() {
303303
super.onDestroy();
304-
EventBus.getDefault().unregister(this);
304+
// TODO: 2019/3/12 暂时移除
305+
// EventBus.getDefault().unregister(this);
305306
if(essFileListTask!=null){
306307
essFileListTask.cancel(true);
307308
}
@@ -361,7 +362,7 @@ public void onClick(DialogInterface dialog, int which) {
361362
}
362363
//恢复排序
363364
mBreadAdapter.getData().get(mBreadAdapter.getData().size() - 1).setPrePosition(0);
364-
executeListTask(mSelectedFileList, mCurFolder, SelectOptions.getInstance().getFileTypes(),SelectOptions.getInstance().getSortType());
365+
executeListTask(mSelectedFileList, mCurFolder, SelectOptions.getInstance().getFileTypes(), SelectOptions.getInstance().getSortType());
365366
}
366367
})
367368
.setPositiveButton("升序", new DialogInterface.OnClickListener() {
@@ -383,7 +384,7 @@ public void onClick(DialogInterface dialog, int which) {
383384
}
384385
//恢复排序
385386
mBreadAdapter.getData().get(mBreadAdapter.getData().size() - 1).setPrePosition(0);
386-
executeListTask(mSelectedFileList, mCurFolder, SelectOptions.getInstance().getFileTypes(),SelectOptions.getInstance().getSortType());
387+
executeListTask(mSelectedFileList, mCurFolder, SelectOptions.getInstance().getFileTypes(), SelectOptions.getInstance().getSortType());
387388
}
388389
})
389390
.setTitle("请选择")

0 commit comments

Comments
 (0)