From 8d5acf987a3a2484123e3a0e97ae8c4ad8e60e38 Mon Sep 17 00:00:00 2001
From: jessyan <jessyan@foxmail.com>
Date: Wed, 26 Apr 2017 10:40:14 +0800
Subject: [PATCH] fix demo bug

---
 .../mvparms/demo/mvp/ui/holder/UserItemHolder.java   | 12 +++++++-----
 .../com/jess/arms/base/delegate/AppDelegate.java     |  6 ++++--
 arms/src/main/java/com/jess/arms/utils/FastBlur.java |  2 +-
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/me/jessyan/mvparms/demo/mvp/ui/holder/UserItemHolder.java b/app/src/main/java/me/jessyan/mvparms/demo/mvp/ui/holder/UserItemHolder.java
index e50c00b..78c13bb 100644
--- a/app/src/main/java/me/jessyan/mvparms/demo/mvp/ui/holder/UserItemHolder.java
+++ b/app/src/main/java/me/jessyan/mvparms/demo/mvp/ui/holder/UserItemHolder.java
@@ -44,11 +44,13 @@ public class UserItemHolder extends BaseHolder<User> {
         Observable.just(data.getLogin())
                 .subscribe(RxTextView.text(mName));
 
-        mImageLoader.loadImage(mAppComponent.appManager().getCurrentActivity(), GlideImageConfig
-                .builder()
-                .url(data.getAvatarUrl())
-                .imageView(mAvater)
-                .build());
+        mImageLoader.loadImage(mAppComponent.appManager().getCurrentActivity() == null
+                        ? mAppComponent.Application() : mAppComponent.appManager().getCurrentActivity(),
+                GlideImageConfig
+                        .builder()
+                        .url(data.getAvatarUrl())
+                        .imageView(mAvater)
+                        .build());
     }
 
 
diff --git a/arms/src/main/java/com/jess/arms/base/delegate/AppDelegate.java b/arms/src/main/java/com/jess/arms/base/delegate/AppDelegate.java
index 60b71b6..da4b58d 100644
--- a/arms/src/main/java/com/jess/arms/base/delegate/AppDelegate.java
+++ b/arms/src/main/java/com/jess/arms/base/delegate/AppDelegate.java
@@ -2,6 +2,7 @@ package com.jess.arms.base.delegate;
 
 import android.app.Application;
 
+import com.jess.arms.base.App;
 import com.jess.arms.di.component.AppComponent;
 import com.jess.arms.di.component.DaggerAppComponent;
 import com.jess.arms.di.module.AppModule;
@@ -27,7 +28,7 @@ import javax.inject.Inject;
  * Contact with jess.yan.effort@gmail.com
  */
 
-public class AppDelegate {
+public class AppDelegate implements App {
     private Application mApplication;
     private AppComponent mAppComponent;
     @Inject
@@ -47,7 +48,7 @@ public class AppDelegate {
     public void onCreate() {
         mAppComponent = DaggerAppComponent
                 .builder()
-                .appModule(new AppModule(mApplication))////提供application
+                .appModule(new AppModule(mApplication))//提供application
                 .clientModule(new ClientModule())//用于提供okhttp和retrofit的单例
                 .imageModule(new ImageModule())//图片加载框架默认使用glide
                 .globalConfigModule(getGlobalConfigModule(mApplication, mModules))//全局配置
@@ -106,6 +107,7 @@ public class AppDelegate {
      *
      * @return
      */
+    @Override
     public AppComponent getAppComponent() {
         return mAppComponent;
     }
diff --git a/arms/src/main/java/com/jess/arms/utils/FastBlur.java b/arms/src/main/java/com/jess/arms/utils/FastBlur.java
index 5127f80..6f82e4c 100644
--- a/arms/src/main/java/com/jess/arms/utils/FastBlur.java
+++ b/arms/src/main/java/com/jess/arms/utils/FastBlur.java
@@ -248,7 +248,7 @@ public class FastBlur {
         return (bitmap);
     }
 
-    public static void blur(Context context,Bitmap bkg, View view) {
+    public static void blur(Context context, Bitmap bkg, View view) {
         long startMs = System.currentTimeMillis();
         float radius = 15;
         float scaleFactor = 8;
-- 
GitLab