solve some dagger2 bug

maoqitian · Mar 28, 2019 · 5175c4e · 5175c4e
1 parent 19485aa
commit 5175c4e
Show file tree

Hide file tree

Showing 7 changed files with 52 additions and 50 deletions.
diff --git a/app/src/main/java/mao/com/mao_wanandroid_client/core/http/tools/NetworkUtils.java b/app/src/main/java/mao/com/mao_wanandroid_client/core/http/tools/NetworkUtils.java
@@ -6,6 +6,8 @@
 import java.io.IOException;
 import java.util.concurrent.TimeUnit;
 
+import javax.inject.Inject;
+
 import mao.com.mao_wanandroid_client.BuildConfig;
 import mao.com.mao_wanandroid_client.application.Constants;
 import mao.com.mao_wanandroid_client.core.http.cookie.CookieManager;
@@ -45,7 +47,7 @@ public static NetworkUtils getInstance() {
         }
         return mInstance;
     }*/
-
+    @Inject
     public NetworkUtils(){
        mRetrofitBuilder=new Retrofit.Builder()
                .addCallAdapterFactory(RxJava2CallAdapterFactory.create())

diff --git a/app/src/main/java/mao/com/mao_wanandroid_client/di/MyComponent.java b/app/src/main/java/mao/com/mao_wanandroid_client/di/MyComponent.java
diff --git a/app/src/main/java/mao/com/mao_wanandroid_client/di/MyModule.java b/app/src/main/java/mao/com/mao_wanandroid_client/di/MyModule.java
diff --git a/app/src/main/java/mao/com/mao_wanandroid_client/di/component/BaseActivityComponent.java b/app/src/main/java/mao/com/mao_wanandroid_client/di/component/BaseActivityComponent.java
@@ -14,6 +14,6 @@
  */
 @Subcomponent(modules = {AndroidInjectionModule.class})
 public interface BaseActivityComponent extends AndroidInjector<BaseActivity> {
-    @Component.Builder
+    @Subcomponent.Builder
     abstract class BaseActivityBuilder extends AndroidInjector.Builder<BaseActivity> {}
 }
diff --git a/app/src/main/java/mao/com/mao_wanandroid_client/di/module/CreateBaseActivityModule.java b/app/src/main/java/mao/com/mao_wanandroid_client/di/module/CreateBaseActivityModule.java
@@ -1,6 +1,8 @@
 package mao.com.mao_wanandroid_client.di.module;
 
 import dagger.Module;
+import dagger.Subcomponent;
+import dagger.android.AndroidInjectionModule;
 import dagger.android.ContributesAndroidInjector;
 import mao.com.mao_wanandroid_client.di.component.BaseActivityComponent;
 import mao.com.mao_wanandroid_client.view.welcome.WelcomeActivity;
@@ -11,7 +13,7 @@
  * （相当于注入mvp 中的 View）
  * @Time 2019/3/27 0027 23:46
  */
-@Module(subcomponents = BaseActivityComponent.class)
+@Module(subcomponents = {BaseActivityComponent.class})
 public abstract class CreateBaseActivityModule {
 
     @ContributesAndroidInjector(modules = WelcomeActivityModule.class)

diff --git a/app/src/main/java/mao/com/mao_wanandroid_client/di/module/MyAppModule.java b/app/src/main/java/mao/com/mao_wanandroid_client/di/module/MyAppModule.java
@@ -1,7 +1,15 @@
 package mao.com.mao_wanandroid_client.di.module;
 
+import javax.inject.Singleton;
+
 import dagger.Module;
+import dagger.Provides;
 import mao.com.mao_wanandroid_client.application.MyApplication;
+import mao.com.mao_wanandroid_client.core.db.DbHelperImpl;
+import mao.com.mao_wanandroid_client.core.http.DataClient;
+import mao.com.mao_wanandroid_client.core.http.helper.IHttpHelperImpl;
+import mao.com.mao_wanandroid_client.core.http.tools.NetworkUtils;
+import mao.com.mao_wanandroid_client.core.sp.SharedPreferenceHelperImpl;
 
 /**
  * @author maoqitian
@@ -17,5 +25,42 @@ public MyAppModule(MyApplication myApplication){
         this.application = myApplication;
     }
 
+    @Provides
+    @Singleton
+    public MyApplication providerApplication(){
+        return application;
+    }
+    @Provides
+    @Singleton
+    public DataClient providerDataClient(IHttpHelperImpl iHttpHelper,
+                                         SharedPreferenceHelperImpl sharedPreferenceHelper,
+                                         DbHelperImpl dbHelper){
+        return new DataClient(iHttpHelper,sharedPreferenceHelper,dbHelper);
+    }
+
+    @Provides
+    @Singleton
+    public IHttpHelperImpl providerIHttpHelperImpl(IHttpHelperImpl iHttpHelper){
+        return iHttpHelper;
+    }
+
+    @Provides
+    @Singleton
+    public DbHelperImpl providerDbHelper(DbHelperImpl dbHelper){
+        return dbHelper;
+    }
+
+    @Provides
+    @Singleton
+    public SharedPreferenceHelperImpl providerSharedPreferenceHelper(SharedPreferenceHelperImpl sharedPreferenceHelper){
+        return sharedPreferenceHelper;
+    }
+
+
+    @Provides
+    @Singleton
+    public NetworkUtils providerNetworkUtils(){
+        return new NetworkUtils();
+    }
 
 }
diff --git a/app/src/main/java/mao/com/mao_wanandroid_client/view/welcome/WelcomeActivity.java b/app/src/main/java/mao/com/mao_wanandroid_client/view/welcome/WelcomeActivity.java
@@ -3,13 +3,9 @@
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
-import android.util.Log;
-
-import javax.inject.Inject;
 
 import mao.com.mao_wanandroid_client.R;
 import mao.com.mao_wanandroid_client.base.activity.BaseActivity;
-import mao.com.mao_wanandroid_client.model.banner.HomePageBannerModel;
 import mao.com.mao_wanandroid_client.presenter.welcome.WelcomeContract;
 import mao.com.mao_wanandroid_client.presenter.welcome.WelcomePresenter;
 import mao.com.mao_wanandroid_client.view.main.MainActivity;