Skip to content

Commit bf9c4cb

Browse files
imLiboimLibo
committed
1. 去掉库中AndPermission的依赖
2. 引入压缩
1 parent 7c0bd4e commit bf9c4cb

25 files changed

+525
-251
lines changed

‎.gitignore‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,6 @@
66
/build
77
/captures
88
.externalNativeBuild
9-
bintrayKey
9+
bintrayKey
10+
gradle.properties
11+
*.iml

‎.idea/codeStyles/Project.xml‎

Lines changed: 29 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/misc.xml‎

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/app.iml‎

Lines changed: 48 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -49,20 +49,20 @@
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/testDebug/res" type="java-test-resource" />
53-
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
54-
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
55-
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
56-
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
57-
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
58-
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
5952
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />
6053
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />
6154
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />
6255
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true" />
6356
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" />
6457
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />
6558
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />
59+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
60+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
61+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
62+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
63+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
64+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
65+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/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" />
@@ -94,14 +94,18 @@
9494
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
9595
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
9696
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
97+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-apk" />
9798
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
9899
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
99100
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
100101
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
102+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
103+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifest-checker" />
101104
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
102105
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
103106
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
104107
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
108+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/resources" />
105109
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
106110
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
107111
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" />
@@ -114,40 +118,43 @@
114118
</content>
115119
<orderEntry type="jdk" jdkName="Android API 27 Platform" jdkType="Android SDK" />
116120
<orderEntry type="sourceFolder" forTests="false" />
117-
<orderEntry type="library" name="com.android.support:animated-vector-drawable-27.1.0" level="project" />
118-
<orderEntry type="library" name="com.android.support:appcompat-v7-27.1.0" level="project" />
119-
<orderEntry type="library" scope="TEST" name="junit:junit:4.12@jar" level="project" />
120-
<orderEntry type="library" name="com.android.support:support-core-utils-27.1.0" level="project" />
121-
<orderEntry type="library" name="android.arch.core:common:1.1.0@jar" level="project" />
122-
<orderEntry type="library" scope="TEST" name="com.android.support.test.espresso:espresso-core-3.0.1" level="project" />
123-
<orderEntry type="library" name="com.android.support:support-annotations:27.1.0@jar" level="project" />
124-
<orderEntry type="library" scope="TEST" name="javax.inject:javax.inject:1@jar" level="project" />
125-
<orderEntry type="library" scope="TEST" name="com.squareup:javawriter:2.1.1@jar" level="project" />
126-
<orderEntry type="library" name="com.android.support.constraint:constraint-layout-solver:1.0.2@jar" level="project" />
127-
<orderEntry type="library" name="com.android.support.constraint:constraint-layout-1.0.2" level="project" />
128-
<orderEntry type="library" scope="TEST" name="com.android.support.test:runner-1.0.1" level="project" />
129-
<orderEntry type="library" scope="TEST" name="com.android.support.test:rules-1.0.1" level="project" />
130-
<orderEntry type="library" scope="TEST" name="com.google.code.findbugs:jsr305:2.0.1@jar" level="project" />
131-
<orderEntry type="library" name="com.android.support:support-vector-drawable-27.1.0" level="project" />
132-
<orderEntry type="library" name="android.arch.lifecycle:runtime-1.1.0" level="project" />
133-
<orderEntry type="library" name="android.arch.lifecycle:common:1.1.0@jar" level="project" />
134-
<orderEntry type="library" scope="TEST" name="com.android.support.test.espresso:espresso-idling-resource-3.0.1" level="project" />
135-
<orderEntry type="library" scope="TEST" name="org.hamcrest:hamcrest-core:1.3@jar" level="project" />
136-
<orderEntry type="library" name="com.jakewharton:butterknife-8.8.1" level="project" />
137-
<orderEntry type="library" name="com.jakewharton:butterknife-annotations:8.8.1@jar" level="project" />
138-
<orderEntry type="library" name="com.android.support:support-compat-27.1.0" level="project" />
139-
<orderEntry type="library" scope="TEST" name="org.hamcrest:hamcrest-library:1.3@jar" level="project" />
140-
<orderEntry type="library" name="android.arch.lifecycle:viewmodel-1.1.0" level="project" />
141-
<orderEntry type="library" name="com.android.support:support-core-ui-27.1.0" level="project" />
142-
<orderEntry type="library" scope="TEST" name="org.hamcrest:hamcrest-integration:1.3@jar" level="project" />
143-
<orderEntry type="library" name="com.squareup.haha:haha:2.0.3@jar" level="project" />
144-
<orderEntry type="library" name="android.arch.lifecycle:livedata-core-1.1.0" level="project" />
145-
<orderEntry type="library" scope="TEST" name="net.sf.kxml:kxml2:2.3.0@jar" level="project" />
146-
<orderEntry type="library" name="com.android.support:support-fragment-27.1.0" level="project" />
147-
<orderEntry type="library" name="com.squareup.leakcanary:leakcanary-android-1.5.4" level="project" />
148-
<orderEntry type="library" name="com.squareup.leakcanary:leakcanary-analyzer-1.5.4" level="project" />
149-
<orderEntry type="library" name="com.squareup.leakcanary:leakcanary-watcher:1.5.4@jar" level="project" />
150-
<orderEntry type="library" name="android.arch.core:runtime-1.1.0" level="project" />
121+
<orderEntry type="library" name="Gradle: com.android.support.constraint:constraint-layout-solver:1.0.2@jar" level="project" />
122+
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:runner-1.0.1" level="project" />
123+
<orderEntry type="library" name="Gradle: com.jakewharton:butterknife-8.8.1" level="project" />
124+
<orderEntry type="library" name="Gradle: com.yanzhenjie:permission-2.0.0-rc2" level="project" />
125+
<orderEntry type="library" name="Gradle: android.arch.lifecycle:common:1.1.0@jar" level="project" />
126+
<orderEntry type="library" name="Gradle: com.android.support:animated-vector-drawable-27.1.0" level="project" />
127+
<orderEntry type="library" name="Gradle: com.squareup.haha:haha:2.0.3@jar" level="project" />
128+
<orderEntry type="library" name="Gradle: com.squareup.leakcanary:leakcanary-android-1.5.4" level="project" />
129+
<orderEntry type="library" name="Gradle: android.arch.lifecycle:viewmodel-1.1.0" level="project" />
130+
<orderEntry type="library" name="Gradle: com.android.support:support-v4-27.1.0" level="project" />
131+
<orderEntry type="library" name="Gradle: com.android.support:support-compat-27.1.0" level="project" />
132+
<orderEntry type="library" name="Gradle: com.jakewharton:butterknife-annotations:8.8.1@jar" level="project" />
133+
<orderEntry type="library" scope="TEST" name="Gradle: com.squareup:javawriter:2.1.1@jar" level="project" />
134+
<orderEntry type="library" name="Gradle: com.android.support:support-media-compat-27.1.0" level="project" />
135+
<orderEntry type="library" name="Gradle: com.android.support:support-vector-drawable-27.1.0" level="project" />
136+
<orderEntry type="library" name="Gradle: com.android.support:support-annotations:27.1.0@jar" level="project" />
137+
<orderEntry type="library" name="Gradle: com.android.support:support-core-utils-27.1.0" level="project" />
138+
<orderEntry type="library" name="Gradle: com.android.support:support-core-ui-27.1.0" level="project" />
139+
<orderEntry type="library" scope="TEST" name="Gradle: com.google.code.findbugs:jsr305:2.0.1@jar" level="project" />
140+
<orderEntry type="library" name="Gradle: com.squareup.leakcanary:leakcanary-watcher:1.5.4@jar" level="project" />
141+
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-core-3.0.1" level="project" />
142+
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:rules-1.0.1" level="project" />
143+
<orderEntry type="library" scope="TEST" name="Gradle: javax.inject:javax.inject:1@jar" level="project" />
144+
<orderEntry type="library" name="Gradle: com.android.support:support-fragment-27.1.0" level="project" />
145+
<orderEntry type="library" name="Gradle: com.android.support.constraint:constraint-layout-1.0.2" level="project" />
146+
<orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12@jar" level="project" />
147+
<orderEntry type="library" name="Gradle: android.arch.core:runtime-1.1.0" level="project" />
148+
<orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3@jar" level="project" />
149+
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-idling-resource-3.0.1" level="project" />
150+
<orderEntry type="library" name="Gradle: com.android.support:appcompat-v7-27.1.0" level="project" />
151+
<orderEntry type="library" name="Gradle: android.arch.lifecycle:livedata-core-1.1.0" level="project" />
152+
<orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-library:1.3@jar" level="project" />
153+
<orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-integration:1.3@jar" level="project" />
154+
<orderEntry type="library" name="Gradle: com.squareup.leakcanary:leakcanary-analyzer-1.5.4" level="project" />
155+
<orderEntry type="library" name="Gradle: android.arch.core:common:1.1.0@jar" level="project" />
156+
<orderEntry type="library" scope="TEST" name="Gradle: net.sf.kxml:kxml2:2.3.0@jar" level="project" />
157+
<orderEntry type="library" name="Gradle: android.arch.lifecycle:runtime-1.1.0" level="project" />
151158
<orderEntry type="module" module-name="filepicker" />
152159
</component>
153160
</module>

‎app/build.gradle‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,12 @@ dependencies {
3232
implementation fileTree(include: ['*.jar'], dir: 'libs')
3333
implementation 'com.android.support:appcompat-v7:27.1.0'
3434
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
35+
implementation 'com.android.support:support-v4:27.1.0'
3536
debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5.4'
3637
releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.4'
3738
implementation 'com.jakewharton:butterknife:8.8.1'
3839
annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
40+
implementation 'com.yanzhenjie:permission:2.0.0-rc2'
3941
testImplementation 'junit:junit:4.12'
4042
androidTestImplementation 'com.android.support.test:runner:1.0.1'
4143
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'

‎app/src/main/AndroidManifest.xml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,21 @@
33
package="com.ess.essfilepicker">
44

55
<application
6+
android:name=".LApplication"
67
android:allowBackup="true"
7-
android:name="com.ess.essfilepicker.LApplication"
88
android:icon="@mipmap/ic_launcher"
99
android:label="@string/app_name"
1010
android:roundIcon="@mipmap/ic_launcher_round"
1111
android:supportsRtl="true"
1212
android:theme="@style/AppTheme">
13-
<activity android:name="com.ess.essfilepicker.MainActivity">
13+
<activity android:name=".MainActivity">
1414
<intent-filter>
1515
<action android:name="android.intent.action.MAIN" />
1616

1717
<category android:name="android.intent.category.LAUNCHER" />
1818
</intent-filter>
1919
</activity>
20+
<activity android:name=".FragmentTestActivity"></activity>
2021
</application>
2122

2223
</manifest>

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

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
package com.ess.essfilepicker;
2+
3+
import android.support.v4.app.FragmentTransaction;
4+
import android.support.v7.app.AppCompatActivity;
5+
import android.os.Bundle;
6+
import android.widget.FrameLayout;
7+
8+
import butterknife.BindView;
9+
import butterknife.ButterKnife;
10+
11+
public class FragmentTestActivity extends AppCompatActivity {
12+
13+
@BindView(R.id.container_fragment)
14+
FrameLayout mFrameLayout;
15+
16+
@Override
17+
protected void onCreate(Bundle savedInstanceState) {
18+
super.onCreate(savedInstanceState);
19+
setContentView(R.layout.activity_fragment_test);
20+
ButterKnife.bind(this);
21+
22+
FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction();
23+
fragmentTransaction.add(R.id.container_fragment,TestFragment.newInstance());
24+
fragmentTransaction.commit();
25+
}
26+
}

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

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,27 @@
11
package com.ess.essfilepicker;
22

33
import android.content.Intent;
4+
import android.support.v4.app.Fragment;
45
import android.support.v7.app.AppCompatActivity;
56
import android.os.Bundle;
67
import android.view.View;
78
import android.widget.TextView;
89

910
import com.ess.filepicker.FilePicker;
11+
import com.ess.filepicker.SelectCreator;
12+
import com.ess.filepicker.SelectOptions;
13+
import com.ess.filepicker.activity.SelectFileByBrowserActivity;
14+
import com.ess.filepicker.activity.SelectFileByScanActivity;
15+
import com.ess.filepicker.activity.SelectPictureActivity;
1016
import com.ess.filepicker.model.EssFile;
1117
import com.ess.filepicker.util.Const;
18+
import com.ess.filepicker.util.DialogUtil;
19+
import com.yanzhenjie.permission.Action;
20+
import com.yanzhenjie.permission.AndPermission;
21+
import com.yanzhenjie.permission.Permission;
1222

1323
import java.util.ArrayList;
24+
import java.util.List;
1425

1526
import butterknife.BindView;
1627
import butterknife.ButterKnife;
@@ -55,12 +66,29 @@ public void onSelectPictures(View view){
5566
.start();
5667
}
5768

69+
@OnClick(R.id.button_fragment)
70+
public void onFragment(View view){
71+
startActivity(new Intent(this,FragmentTestActivity.class));
72+
}
73+
5874

5975
@Override
6076
protected void onCreate(Bundle savedInstanceState) {
6177
super.onCreate(savedInstanceState);
6278
setContentView(R.layout.activity_main);
6379
ButterKnife.bind(this);
80+
AndPermission
81+
.with(this)
82+
.permission(Permission.READ_EXTERNAL_STORAGE,Permission.WRITE_EXTERNAL_STORAGE)
83+
.onDenied(new Action() {
84+
@Override
85+
public void onAction(List<String> permissions) {
86+
//拒绝权限
87+
DialogUtil.showPermissionDialog(MainActivity.this,Permission.transformText(MainActivity.this, permissions).get(0));
88+
}
89+
})
90+
.start();
91+
6492
}
6593

6694
@Override

0 commit comments

Comments
 (0)