使用dagger优化重构代码

Author: hegj

app/build.gradle

@@ -22,7 +22,7 @@ android {
         versionName rootProject.ext.android["versionName"]
         testInstrumentationRunner rootProject.ext.dependencies["androidJUnitRunner"]
         ndk {
-            // 设置支持的SO库架构
+            // 设置支持的SO库架构 一般只设置这个就阔以设配所有的设备了，还可以极大的减少apk的大小
             abiFilters 'armeabi-v7a'
         }
     }
@@ -85,10 +85,10 @@ android {
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     //androidX基础库
-    implementation "androidx.appcompat:appcompat:1.1.0-rc01"
-    implementation 'com.google.android.material:material:1.1.0-alpha09'
+    implementation "androidx.appcompat:appcompat:1.1.0"
+    implementation 'com.google.android.material:material:1.1.0-alpha10'
     implementation "androidx.constraintlayout:constraintlayout:1.1.3"
-    implementation "androidx.preference:preference:1.1.0-rc01"
+    implementation "androidx.preference:preference:1.1.0"
     implementation "androidx.cardview:cardview:1.0.0"
     //dagger
     annotationProcessor rootProject.ext.dependencies["dagger2-compiler"]

app/src/main/java/me/hegj/wandroid/app/AppLifecyclesImpl.kt

@@ -31,6 +31,7 @@ import com.tencent.bugly.Bugly
 import com.tencent.bugly.crashreport.CrashReport.UserStrategy
 import com.tencent.mmkv.MMKV
 import me.hegj.wandroid.BuildConfig
+import me.hegj.wandroid.R
 import me.hegj.wandroid.app.utils.HttpUtils
 import me.hegj.wandroid.app.weight.loadCallBack.EmptyCallback
 import me.hegj.wandroid.app.weight.loadCallBack.ErrorCallback
@@ -100,7 +101,7 @@ class AppLifecyclesImpl : AppLifecycles {
         val strategy = UserStrategy(context)
         strategy.isUploadProcess = processName == null || processName == packageName
         // 初始化Bugly
-        Bugly.init(context, "xxxxx", BuildConfig.DEBUG)
+        Bugly.init(context, "5a5f6366fc", BuildConfig.DEBUG)
 
         CaocConfig.Builder.create()
                 .backgroundMode(CaocConfig.BACKGROUND_MODE_SILENT) //default: CaocConfig.BACKGROUND_MODE_SHOW_CUSTOM

app/src/main/java/me/hegj/wandroid/app/GlobalHttpHandlerImpl.kt

@@ -33,7 +33,7 @@ import okhttp3.Response
  * [Follow me](https://github.com/JessYanCoding)
  * ================================================
  */
-class GlobalHttpHandlerImpl(private val context: Context) : GlobalHttpHandler {
+class GlobalHttpHandlerImpl(val context: Context) : GlobalHttpHandler {
 
     /**
      * 这里可以先客户端一步拿到每一次 Http 请求的结果, 可以先解析成 Json, 再做一些操作, 如检测到 token 过期后
@@ -68,10 +68,12 @@ class GlobalHttpHandlerImpl(private val context: Context) : GlobalHttpHandler {
         /* 如果需要在请求服务器之前做一些操作, 则重新构建一个做过操作的 Request 并 return, 如增加 Header、Params 等请求信息, 不做操作则直接返回参数 request*/
         if (CacheUtil.isLogin()) {
             val cookies = CacheUtil.getCookie()
-            //如果已经登录过了，那么请求的时候可以带上cookie 参数，即 姓名 密码
-            return chain.request().newBuilder()
-                    .addHeader("Cookie", cookies)
-                    .build()
+            //如果已经登录过了，那么请求的时候可以带上cookie 参数
+            cookies?.run {
+                return chain.request().newBuilder()
+                        .addHeader("Cookie", this)
+                        .build()
+            }
         }
 
         return request

app/src/main/java/me/hegj/wandroid/app/utils/CacheDataManager.kt

@@ -2,6 +2,10 @@ package me.hegj.wandroid.app.utils
 
 import android.content.Context
 import android.os.Environment
+import com.jess.arms.base.App
+import com.jess.arms.di.component.AppComponent
+import com.jess.arms.integration.AppManager
+import com.jess.arms.utils.ArmsUtils
 
 import java.io.File
 import java.math.BigDecimal
@@ -19,10 +23,17 @@ object CacheDataManager {
     }
 
     fun clearAllCache(context: Context) {
-
         deleteDir(context.cacheDir)
         if (Environment.getExternalStorageState() == Environment.MEDIA_MOUNTED) {
-            deleteDir(context.externalCacheDir)
+            if(context.externalCacheDir==null){
+                AppManager.getAppManager().currentActivity?.let {
+                    ShowUtils.showDialog(it,"清理缓存失败")
+                }
+                return
+            }
+            context.externalCacheDir?.let {
+                deleteDir(it)
+            }
         }
     }
 

app/src/main/java/me/hegj/wandroid/app/utils/CustomHandleSubscriber.java

@@ -0,0 +1,42 @@
+package me.hegj.wandroid.app.utils;
+
+import io.reactivex.Observer;
+import io.reactivex.annotations.NonNull;
+import io.reactivex.disposables.Disposable;
+import me.jessyan.rxerrorhandler.core.RxErrorHandler;
+import me.jessyan.rxerrorhandler.handler.ErrorHandlerFactory;
+
+public abstract class CustomHandleSubscriber<T> implements Observer<T> {
+    private ErrorHandlerFactory mHandlerFactory;
+
+    public CustomHandleSubscriber(RxErrorHandler rxErrorHandler){
+        this.mHandlerFactory = rxErrorHandler.getHandlerFactory();
+    }
+
+
+    @Override
+    public void onSubscribe(@NonNull Disposable d) {
+
+    }
+
+
+    @Override
+    public void onComplete() {
+
+    }
+
+    @Override
+    public void onNext(T t) {
+        onReturNext(t);
+    }
+    public T onReturNext(T t){
+        return t;
+    }
+    @Override
+    public void onError(@NonNull Throwable t) {
+        t.printStackTrace();
+        //如果你某个地方不想使用全局错误处理,则重写 onError(Throwable) 并将 super.onError(e); 删掉
+        //如果你不仅想使用全局错误处理,还想加入自己的逻辑,则重写 onError(Throwable) 并在 super.onError(e); 后面加入自己的逻辑
+        mHandlerFactory.handleError(t);
+    }
+}

app/src/main/java/me/hegj/wandroid/di/module/main/home/HomeModule.kt

@@ -6,7 +6,9 @@ import dagger.Module
 import dagger.Provides
 
 import me.hegj.wandroid.mvp.contract.main.home.HomeContract
+import me.hegj.wandroid.mvp.model.entity.AriticleResponse
 import me.hegj.wandroid.mvp.model.main.home.HomeModel
+import me.hegj.wandroid.mvp.ui.adapter.AriticleAdapter
 
 
 /**
@@ -35,4 +37,16 @@ class HomeModule(private val view: HomeContract.View) {
     fun provideHomeModel(model: HomeModel): HomeContract.Model {
         return model
     }
+
+    @FragmentScope
+    @Provides
+    fun getData():ArrayList<AriticleResponse>{
+        return arrayListOf()
+    }
+
+    @FragmentScope
+    @Provides
+    fun getAdapter(data:ArrayList<AriticleResponse>):AriticleAdapter{
+        return AriticleAdapter(data,true)
+    }
 }

app/src/main/java/me/hegj/wandroid/mvp/contract/MainContract.kt

@@ -1,7 +1,7 @@
 package me.hegj.wandroid.mvp.contract
 
-import com.jess.arms.mvp.IView
 import com.jess.arms.mvp.IModel
+import me.hegj.wandroid.mvp.ui.base.BaseIView
 
 
 /**
@@ -18,7 +18,7 @@ import com.jess.arms.mvp.IModel
  */
 interface MainContract {
     //对于经常使用的关于UI的方法可以定义到IView中,如显示隐藏进度条,和显示文字消息
-    interface View : IView
+    interface View : BaseIView
 
     //Model层定义接口,外部只需关心Model返回的数据,无需关心内部细节,即是否使用缓存
     interface Model : IModel

app/src/main/java/me/hegj/wandroid/mvp/contract/collect/CollectContract.kt

@@ -1,9 +1,11 @@
 package me.hegj.wandroid.mvp.contract.collect
 
-import com.jess.arms.mvp.IView
 import com.jess.arms.mvp.IModel
 import io.reactivex.Observable
-import me.hegj.wandroid.mvp.model.entity.*
+import me.hegj.wandroid.mvp.model.entity.ApiPagerResponse
+import me.hegj.wandroid.mvp.model.entity.ApiResponse
+import me.hegj.wandroid.mvp.model.entity.CollectResponse
+import me.hegj.wandroid.mvp.ui.base.BaseIView
 
 
 /**
@@ -20,7 +22,7 @@ import me.hegj.wandroid.mvp.model.entity.*
  */
 interface CollectContract {
     //对于经常使用的关于UI的方法可以定义到IView中,如显示隐藏进度条,和显示文字消息
-    interface View : IView{
+    interface View : BaseIView {
         fun requestDataSucc(apiPagerResponse: ApiPagerResponse<MutableList<CollectResponse>>)
         fun requestDataFaild(errorMsg: String)
         fun uncollect(position:Int)

app/src/main/java/me/hegj/wandroid/mvp/contract/collect/CollectUrlContract.kt

@@ -1,10 +1,10 @@
 package me.hegj.wandroid.mvp.contract.collect
 
-import com.jess.arms.mvp.IView
 import com.jess.arms.mvp.IModel
 import io.reactivex.Observable
 import me.hegj.wandroid.mvp.model.entity.ApiResponse
 import me.hegj.wandroid.mvp.model.entity.CollectUrlResponse
+import me.hegj.wandroid.mvp.ui.base.BaseIView
 
 
 /**
@@ -21,7 +21,7 @@ import me.hegj.wandroid.mvp.model.entity.CollectUrlResponse
  */
 interface CollectUrlContract {
     //对于经常使用的关于UI的方法可以定义到IView中,如显示隐藏进度条,和显示文字消息
-    interface View : IView{
+    interface View : BaseIView {
         fun requestDataUrlSucc(apiPagerResponse: MutableList<CollectUrlResponse>)
         fun requestDataFaild(errorMsg: String)
         fun uncollect(position:Int)

app/src/main/java/me/hegj/wandroid/mvp/contract/integral/IntegralContract.kt

@@ -1,12 +1,12 @@
 package me.hegj.wandroid.mvp.contract.integral
 
 import com.jess.arms.mvp.IModel
-import com.jess.arms.mvp.IView
 import io.reactivex.Observable
 import me.hegj.wandroid.mvp.model.entity.ApiPagerResponse
 import me.hegj.wandroid.mvp.model.entity.ApiResponse
 import me.hegj.wandroid.mvp.model.entity.IntegralHistoryResponse
 import me.hegj.wandroid.mvp.model.entity.IntegralResponse
+import me.hegj.wandroid.mvp.ui.base.BaseIView
 
 
 /**
@@ -23,7 +23,7 @@ import me.hegj.wandroid.mvp.model.entity.IntegralResponse
  */
 interface IntegralContract {
     //对于经常使用的关于UI的方法可以定义到IView中,如显示隐藏进度条,和显示文字消息
-    interface View : IView {
+    interface View : BaseIView {
         fun requestDataSucces(ariticles: ApiPagerResponse<MutableList<IntegralResponse>>)
         fun requestHistoryDataSucces(ariticles: ApiPagerResponse<MutableList<IntegralHistoryResponse>>)
         fun requestDataFaild(errorMsg: String)