Skip to content

Commit 570c04f

Browse files
imLiboimLibo
committed
修改Glide加载方式
1 parent fca95b1 commit 570c04f

File tree

9 files changed

+40
-86
lines changed

9 files changed

+40
-86
lines changed

‎app/app.iml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,23 +86,30 @@
8686
<sourceFolder url="file://$MODULE_DIR$/src/test/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" />
8991
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
9092
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
9193
<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-resources" />
98+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
9299
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
93100
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
94101
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
95102
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
103+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
96104
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
97105
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
98106
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
107+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" />
99108
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/splits-support" />
100109
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
101110
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
102111
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
103112
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
104-
<excludeFolder url="file://$MODULE_DIR$/build/reports" />
105-
<excludeFolder url="file://$MODULE_DIR$/build/test-results" />
106113
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
107114
</content>
108115
<orderEntry type="jdk" jdkName="Android API 27 Platform" jdkType="Android SDK" />
@@ -154,5 +161,6 @@
154161
<orderEntry type="library" name="org.greenrobot:eventbus:3.1.1@jar" level="project" />
155162
<orderEntry type="library" name="com.squareup.leakcanary:leakcanary-analyzer-1.5.4" level="project" />
156163
<orderEntry type="library" name="com.squareup.leakcanary:leakcanary-watcher:1.5.4@jar" level="project" />
164+
<orderEntry type="module" module-name="filepicker" />
157165
</component>
158166
</module>

‎app/build.gradle

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,13 @@ dependencies {
3434
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
3535
debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5.4'
3636
releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.4'
37-
3837
implementation 'com.jakewharton:butterknife:8.8.1'
3938
annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
40-
4139
testImplementation 'junit:junit:4.12'
4240
androidTestImplementation 'com.android.support.test:runner:1.0.1'
4341
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
44-
45-
implementation 'cn.imlibo:FilePicker:v0.0.1_alpha'
42+
// implementation 'cn.imlibo:FilePicker:v0.0.1_alpha'
43+
implementation project(':filepicker')
4644
}
4745

4846

‎filepicker/build.gradle

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,11 @@ dependencies {
3535
implementation 'com.android.support:design:26.1.0'
3636
implementation 'com.android.support:appcompat-v7:26.1.0'
3737
implementation 'com.github.CymChad:BaseRecyclerViewAdapterHelper:2.9.34'
38-
implementation 'com.github.chrisbanes:PhotoView:2.1.3'
3938
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
4039
implementation 'com.github.bumptech.glide:glide:4.6.1'
4140
implementation 'com.android.support:support-v4:26.1.0'
42-
annotationProcessor 'com.github.bumptech.glide:compiler:4.6.1'
4341
implementation 'org.greenrobot:eventbus:3.1.1'
4442
implementation 'com.yanzhenjie:permission:2.0.0-rc2'
45-
implementation 'it.sephiroth.android.library.imagezoom:library:1.0.4'
4643

4744
testImplementation 'junit:junit:4.12'
4845
androidTestImplementation 'com.android.support.test:runner:1.0.1'

‎filepicker/filepicker.iml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,6 @@
8585
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
8686
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
8787
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
88-
<excludeFolder url="file://$MODULE_DIR$/build/docs" />
89-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
9088
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/attr" />
9189
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
9290
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
@@ -103,12 +101,7 @@
103101
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
104102
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
105103
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
106-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/typedefs.txt" />
107-
<excludeFolder url="file://$MODULE_DIR$/build/libs" />
108104
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
109-
<excludeFolder url="file://$MODULE_DIR$/build/publications" />
110-
<excludeFolder url="file://$MODULE_DIR$/build/reports" />
111-
<excludeFolder url="file://$MODULE_DIR$/build/test-results" />
112105
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
113106
</content>
114107
<orderEntry type="jdk" jdkName="Android API 26 Platform" jdkType="Android SDK" />
@@ -120,7 +113,6 @@
120113
<orderEntry type="library" name="com.yanzhenjie:permission-2.0.0-rc2" level="project" />
121114
<orderEntry type="library" name="com.github.bumptech.glide:disklrucache:4.6.1@jar" level="project" />
122115
<orderEntry type="library" scope="TEST" name="com.android.support.test.espresso:espresso-core-3.0.1" level="project" />
123-
<orderEntry type="library" name="com.github.chrisbanes:PhotoView-2.1.3" level="project" />
124116
<orderEntry type="library" scope="TEST" name="javax.inject:javax.inject:1@jar" level="project" />
125117
<orderEntry type="library" scope="TEST" name="com.squareup:javawriter:2.1.1@jar" level="project" />
126118
<orderEntry type="library" name="com.android.support:support-vector-drawable-26.1.0" level="project" />
@@ -142,13 +134,11 @@
142134
<orderEntry type="library" name="com.github.CymChad:BaseRecyclerViewAdapterHelper-2.9.34" level="project" />
143135
<orderEntry type="library" scope="TEST" name="org.hamcrest:hamcrest-integration:1.3@jar" level="project" />
144136
<orderEntry type="library" name="com.github.bumptech.glide:annotations:4.6.1@jar" level="project" />
145-
<orderEntry type="library" name="it.sephiroth.android.library.easing:library-1.0.2" level="project" />
146137
<orderEntry type="library" name="com.android.support:support-v4-26.1.0" level="project" />
147138
<orderEntry type="library" name="com.github.bumptech.glide:gifdecoder-4.6.1" level="project" />
148139
<orderEntry type="library" scope="TEST" name="net.sf.kxml:kxml2:2.3.0@jar" level="project" />
149140
<orderEntry type="library" name="com.android.support:support-core-utils-27.0.2" level="project" />
150141
<orderEntry type="library" name="com.android.support:animated-vector-drawable-26.1.0" level="project" />
151-
<orderEntry type="library" name="it.sephiroth.android.library.imagezoom:library-1.0.4" level="project" />
152142
<orderEntry type="library" name="com.android.support:support-fragment-27.0.2" level="project" />
153143
<orderEntry type="library" name="com.android.support:design-26.1.0" level="project" />
154144
<orderEntry type="library" name="com.android.support:transition-26.1.0" level="project" />

‎filepicker/src/main/java/com/ess/filepicker/adapter/BuketAdapter.java

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,11 @@
1111
import android.widget.ImageView;
1212
import android.widget.TextView;
1313

14+
import com.bumptech.glide.Glide;
15+
import com.bumptech.glide.request.RequestOptions;
1416
import com.ess.filepicker.R;
17+
import com.ess.filepicker.SelectOptions;
1518
import com.ess.filepicker.model.Album;
16-
import com.ess.filepicker.model.GlideApp;
1719

1820
/**
1921
* BuketAdapter
@@ -42,12 +44,13 @@ public void bindView(View view, Context context, Cursor cursor) {
4244
Album album = Album.valueOf(cursor);
4345
((TextView) view.findViewById(R.id.album_name)).setText(album.getDisplayName(context));
4446
((TextView) view.findViewById(R.id.album_media_count)).setText(String.valueOf(album.getCount()));
45-
46-
GlideApp
47+
RequestOptions options = new RequestOptions()
48+
.centerCrop()
49+
.placeholder(mPlaceholder);
50+
Glide
4751
.with(context)
4852
.load(album.getCoverPath())
49-
.placeholder(mPlaceholder)
50-
.centerCrop()
53+
.apply(options)
5154
.into((ImageView) view.findViewById(R.id.album_cover));
5255
}
5356
}

‎filepicker/src/main/java/com/ess/filepicker/adapter/EssMediaAdapter.java

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,13 @@
66
import android.view.ViewGroup;
77
import android.widget.ImageView;
88

9+
import com.bumptech.glide.Glide;
10+
import com.bumptech.glide.request.RequestOptions;
911
import com.chad.library.adapter.base.BaseQuickAdapter;
1012
import com.chad.library.adapter.base.BaseViewHolder;
1113
import com.ess.filepicker.R;
1214
import com.ess.filepicker.SelectOptions;
1315
import com.ess.filepicker.model.EssFile;
14-
import com.ess.filepicker.model.GlideApp;
1516
import com.ess.filepicker.util.UiUtils;
1617

1718
import java.util.List;
@@ -46,12 +47,14 @@ protected void convert(BaseViewHolder helper, EssFile item) {
4647
helper.getView(R.id.media).setVisibility(View.VISIBLE);
4748
helper.itemView.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, mImageResize));
4849
ImageView imageView = helper.getView(R.id.media_thumbnail);
49-
GlideApp
50+
RequestOptions options = new RequestOptions()
51+
.centerCrop()
52+
.override(mImageResize, mImageResize)
53+
.placeholder(SelectOptions.getInstance().placeHolder == null ? mContext.getResources().getDrawable(R.mipmap.png_holder) : SelectOptions.getInstance().placeHolder);
54+
Glide
5055
.with(mContext)
5156
.load(item.getUri())
52-
.placeholder(SelectOptions.getInstance().placeHolder == null ? mContext.getResources().getDrawable(R.mipmap.png_holder) : SelectOptions.getInstance().placeHolder)
53-
.override(mImageResize, mImageResize)
54-
.centerCrop()
57+
.apply(options)
5558
.into(imageView);
5659
if(SelectOptions.getInstance().isSingle || SelectOptions.getInstance().maxCount == 1){
5760
helper.setVisible(R.id.check_view,false);

‎filepicker/src/main/java/com/ess/filepicker/adapter/FileListAdapter.java

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,12 @@
44
import android.widget.ImageView;
55
import android.widget.TextView;
66

7+
import com.bumptech.glide.Glide;
8+
import com.bumptech.glide.request.RequestOptions;
79
import com.chad.library.adapter.base.BaseQuickAdapter;
810
import com.chad.library.adapter.base.BaseViewHolder;
911
import com.ess.filepicker.model.EssFile;
1012
import com.ess.filepicker.model.FileEvent;
11-
import com.ess.filepicker.model.GlideApp;
1213
import com.ess.filepicker.util.FileSizeUtil;
1314
import com.ess.filepicker.util.FileUtils;
1415
import com.ess.filepicker.R;
@@ -67,21 +68,25 @@ protected void convert(BaseViewHolder helper, EssFile item) {
6768
imageView.setImageResource(R.mipmap.flv);
6869
break;
6970
case "gif":
70-
GlideApp
71+
RequestOptions options = new RequestOptions()
72+
.centerCrop()
73+
.placeholder(R.mipmap.gif);
74+
Glide
7175
.with(mContext)
7276
.load(item.getAbsolutePath())
73-
.placeholder(R.mipmap.gif)
74-
.centerCrop()
77+
.apply(options)
7578
.into(imageView);
7679
break;
7780
case "jpg":
7881
case "jpeg":
7982
case "png":
80-
GlideApp
83+
RequestOptions options2 = new RequestOptions()
84+
.centerCrop()
85+
.placeholder(R.mipmap.png);
86+
Glide
8187
.with(mContext)
8288
.load(item.getAbsolutePath())
83-
.placeholder(R.mipmap.png)
84-
.centerCrop()
89+
.apply(options2)
8590
.into(imageView);
8691
break;
8792
case "mp3":

‎filepicker/src/main/java/com/ess/filepicker/model/FileGlideModule.java

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

‎filepicker/src/main/java/com/ess/filepicker/widget/PreviewViewPager.java

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

0 commit comments

Comments
 (0)