Skip to content

Commit c63a0a8

Browse files
raeeraee
committed
意见反馈，图片加载改成glide
1 parent 4a6ce7b commit c63a0a8

36 files changed

+1092
-281
lines changed

‎.idea/misc.xml

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

‎app/build.gradle

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ def leancloudAppKey = properties.getProperty("leancloudAppKey")
1616

1717

1818
android {
19-
compileSdkVersion 25
20-
buildToolsVersion '26.0.0'
19+
compileSdkVersion 26
20+
buildToolsVersion '26.0.1'
2121

2222
dexOptions {
2323
javaMaxHeapSize '2g'
@@ -35,7 +35,7 @@ android {
3535
defaultConfig {
3636
applicationId "com.rae.cnblogs"
3737
minSdkVersion 15
38-
targetSdkVersion 25
38+
targetSdkVersion 26
3939
versionCode 1
4040
versionName "1.0.0"
4141
multiDexEnabled true
@@ -79,7 +79,11 @@ dependencies {
7979
compile 'in.srain.cube:ultra-ptr:1.0.11'
8080
compile 'com.github.raee:XRecyclerView:1.3.2'
8181
compile 'com.makeramen:roundedimageview:2.2.1'
82-
compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'
82+
// compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'
83+
84+
compile 'com.github.bumptech.glide:glide:4.0.0'
85+
annotationProcessor 'com.github.bumptech.glide:compiler:4.0.0'
86+
8387
compile 'com.umeng.analytics:analytics:6.1.1'
8488
// 事件通知
8589
compile 'org.greenrobot:eventbus:3.0.0'
@@ -95,6 +99,7 @@ dependencies {
9599
compile 'cn.leancloud.android:avoscloud-sdk:v4.4.3'
96100
// LeanCloud 用户反馈包
97101
compile 'cn.leancloud.android:avoscloud-feedback:v4.4.3@aar'
102+
compile 'io.reactivex.rxjava2:rxjava:2.1.0'
98103
}
99104

100105
// 热更新

‎app/src/main/java/com/rae/cnblogs/CnblogsApplication.java

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
import com.avos.avoscloud.AVOSCloud;
66
import com.avos.avoscloud.feedback.FeedbackThread;
7-
import com.nostra13.universalimageloader.core.ImageLoader;
87
import com.rae.cnblogs.sdk.UserProvider;
98
import com.rae.cnblogs.sdk.bean.UserInfoBean;
109
import com.rae.cnblogs.sdk.db.DbCnblogs;
@@ -42,12 +41,11 @@ public void onCreate() {
4241

4342
// 级别较高的初始化操作
4443
DbCnblogs.init(getApplication());
45-
RaeImageLoader.initImageLoader(getApplication());
4644
// 日志上报
4745
Bugly.init(getApplication(), BuildConfig.BUGLY_APP_ID, BuildConfig.DEBUG);
48-
if (!LeakCanary.isInAnalyzerProcess(this)) {
49-
LeakCanary.install(this);
50-
}
46+
// if (!LeakCanary.isInAnalyzerProcess(this)) {
47+
// LeakCanary.install(this);
48+
// }
5149

5250
// LeanCloud用户反馈初始化
5351
AVOSCloud.initialize(getApplication(), BuildConfig.LEAN_CLOUD_APP_ID, BuildConfig.LEAN_CLOUD_APP_KEY);
@@ -83,8 +81,7 @@ private void onDebugMode() {
8381
*/
8482
public void clearCache() {
8583
// 清除图片缓存
86-
ImageLoader.getInstance().clearDiskCache();
87-
ImageLoader.getInstance().clearMemoryCache();
84+
RaeImageLoader.clearCache(getApplicationContext());
8885
// 清除数据库
8986
DbFactory.getInstance().clearCache();
9087
new AppDataManager(this).clearCache();

‎app/src/main/java/com/rae/cnblogs/CnblogsApplicationProxy.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import android.os.Build;
99
import android.support.multidex.MultiDex;
1010

11-
import com.nostra13.universalimageloader.core.ImageLoader;
1211
import com.tencent.bugly.beta.Beta;
1312
import com.tencent.bugly.beta.tinker.TinkerApplicationLike;
1413

@@ -32,7 +31,7 @@ public void onCreate() {
3231
public void onTrimMemory(int level) {
3332
super.onTrimMemory(level);
3433
if (level == ComponentCallbacks2.TRIM_MEMORY_RUNNING_LOW || level == ComponentCallbacks2.TRIM_MEMORY_BACKGROUND) {
35-
ImageLoader.getInstance().getMemoryCache().clear();
34+
RaeImageLoader.clearCache(getApplication());
3635
}
3736
}
3837

‎app/src/main/java/com/rae/cnblogs/CnblogsGlideModule.java

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
package com.rae.cnblogs;
2+
3+
import com.bumptech.glide.annotation.GlideModule;
4+
import com.bumptech.glide.module.AppGlideModule;
5+
6+
/**
7+
* glide
8+
* Created by ChenRui on 2017/8/10 0010 23:15.
9+
*/
10+
@GlideModule
11+
public class CnblogsGlideModule extends AppGlideModule {
12+
13+
@Override
14+
public boolean isManifestParsingEnabled() {
15+
return false;
16+
}
17+
}

‎app/src/main/java/com/rae/cnblogs/RaeImageLoader.java

Lines changed: 22 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1,87 +1,45 @@
11
package com.rae.cnblogs;
22

33
import android.content.Context;
4-
import android.graphics.Bitmap;
54
import android.widget.ImageView;
65

7-
import com.nostra13.universalimageloader.cache.memory.impl.LargestLimitedMemoryCache;
8-
import com.nostra13.universalimageloader.core.DisplayImageOptions;
9-
import com.nostra13.universalimageloader.core.ImageLoader;
10-
import com.nostra13.universalimageloader.core.ImageLoaderConfiguration;
11-
import com.nostra13.universalimageloader.core.assist.ImageScaleType;
12-
import com.nostra13.universalimageloader.core.display.FadeInBitmapDisplayer;
13-
146
/**
157
* 图片加载器
168
* Created by ChenRui on 2016/12/3 17:01.
179
*/
1810
public final class RaeImageLoader {
1911

20-
public static DisplayImageOptions.Builder defaultOptions() {
21-
return new DisplayImageOptions.Builder()
22-
.cacheOnDisk(true)
23-
.cacheInMemory(true)
24-
.bitmapConfig(Bitmap.Config.ARGB_8888)
25-
.imageScaleType(ImageScaleType.EXACTLY)
26-
.showImageForEmptyUri(R.drawable.picture_viewer_no_pic_icon)
27-
.showImageOnLoading(R.drawable.ic_default_placeholder)
28-
.showImageOnFail(R.drawable.picture_viewer_no_pic_icon);
29-
}
30-
31-
public static DisplayImageOptions.Builder fadeOptions(int durationMillis) {
32-
return defaultOptions().displayer(new FadeInBitmapDisplayer(durationMillis, true, false, false));
33-
}
34-
3512
/**
36-
* 头像的默认配置
37-
*
38-
* @return
13+
* 头像显示
3914
*/
40-
public static DisplayImageOptions headerOption() {
41-
return fadeOptions(800)
42-
.showImageForEmptyUri(R.drawable.ic_default_user_avatar)
43-
.showImageOnLoading(R.drawable.ic_default_user_avatar)
44-
.showImageOnFail(R.drawable.ic_default_user_avatar)
45-
.build();
15+
public static void displayHeaderImage(String url, ImageView view) {
16+
Context context = view.getContext();
17+
GlideApp.with(context)
18+
.load(url)
19+
.placeholder(R.drawable.ic_default_user_avatar)
20+
.into(view);
4621
}
4722

48-
public static void displayHeaderView(String url, ImageView view) {
49-
ImageLoader.getInstance().displayImage(url, view, headerOption());
23+
public static void displayImage(String url, ImageView view) {
24+
Context context = view.getContext();
25+
GlideApp.with(context)
26+
.load(url)
27+
.placeholder(R.color.background_divider)
28+
.into(view);
5029
}
5130

5231
/**
53-
* 头像的默认配置
54-
*
55-
* @return
32+
* 清除缓存
5633
*/
57-
public static DisplayImageOptions headerOptionWithoutAnim() {
58-
return defaultOptions()
59-
.showImageForEmptyUri(R.drawable.ic_default_user_avatar)
60-
.showImageOnLoading(R.drawable.ic_default_user_avatar)
61-
.showImageOnFail(R.drawable.ic_default_user_avatar)
62-
.build();
34+
public static void clearCache(Context applicationContext) {
35+
clearMemoryCache(applicationContext);
36+
GlideApp.get(applicationContext).clearDiskCache();
6337
}
6438

65-
66-
public static void initImageLoader(Context context) {
67-
68-
ImageLoaderConfiguration configuration = new ImageLoaderConfiguration
69-
.Builder(context)
70-
.threadPoolSize(5)//线程池
71-
.threadPriority(Thread.NORM_PRIORITY - 2)//线程优先级
72-
.denyCacheImageMultipleSizesInMemory()
73-
.memoryCache(new LargestLimitedMemoryCache(1024))//内存缓存
74-
.memoryCacheSize(1024)//内存缓存大小
75-
.diskCacheSize(50 * 1024 * 1024)//存储卡缓存大小
76-
.diskCacheFileCount(300)//存储卡文件个数
77-
// .memoryCacheSizePercentage(13) // default
78-
// .diskCacheFileNameGenerator(new HashCodeFileNameGenerator()) // default
79-
// .imageDownloader(new BaseImageDownloader(context, 5 * 1000, 30 * 1000)) // default
80-
.defaultDisplayImageOptions(defaultOptions().build()) // default
81-
// .writeDebugLogs()
82-
// .tasksProcessingOrder(QueueProcessingType.FIFO) //先进先出
83-
.build();
84-
85-
ImageLoader.getInstance().init(configuration);
39+
/**
40+
* 清除缓存
41+
*/
42+
public static void clearMemoryCache(Context applicationContext) {
43+
GlideApp.get(applicationContext).clearMemory();
8644
}
8745
}

‎app/src/main/java/com/rae/cnblogs/activity/BlogContentActivity.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import android.widget.ImageView;
1212
import android.widget.TextView;
1313

14-
import com.nostra13.universalimageloader.core.ImageLoader;
1514
import com.rae.cnblogs.AppRoute;
1615
import com.rae.cnblogs.AppStatusBar;
1716
import com.rae.cnblogs.AppUI;
@@ -116,7 +115,7 @@ protected void onViewSourceClick() {
116115
mAuthorView.setVisibility(View.GONE);
117116
mAvatarView.setVisibility(View.GONE);
118117
} else {
119-
ImageLoader.getInstance().displayImage(mBlog.getAvatar(), mAvatarView, RaeImageLoader.headerOption());
118+
RaeImageLoader.displayHeaderImage(mBlog.getAvatar(), mAvatarView);
120119
mAuthorView.setText(mBlog.getAuthor());
121120
}
122121

‎app/src/main/java/com/rae/cnblogs/activity/BloggerActivity.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import android.widget.ImageView;
1313
import android.widget.TextView;
1414

15-
import com.nostra13.universalimageloader.core.ImageLoader;
1615
import com.rae.cnblogs.AppRoute;
1716
import com.rae.cnblogs.AppUI;
1817
import com.rae.cnblogs.R;
@@ -161,10 +160,10 @@ public void onLoadBloggerInfo(FriendsInfoBean userInfo) {
161160
mFollowLayout.setClickable(true);
162161
mFollowView.setEnabled(true);
163162

164-
RaeImageLoader.displayHeaderView(userInfo.getAvatar(), mAvatarView);
163+
RaeImageLoader.displayHeaderImage(userInfo.getAvatar(), mAvatarView);
165164
if (!TextUtils.isEmpty(userInfo.getAvatar())) {
166165
// mBackgroundView.setBackgroundColor(ContextCompat.getColor(this, R.color.dividerColor));
167-
ImageLoader.getInstance().displayImage(userInfo.getAvatar(), mBackgroundView);
166+
RaeImageLoader.displayImage(userInfo.getAvatar(), mBackgroundView);
168167
}
169168

170169
mBloggerNameView.setText(userInfo.getDisplayName());

0 commit comments

Comments
 (0)