From ba794144122a679fad6bf6120aa81e2b36ef51fb Mon Sep 17 00:00:00 2001
From: yimiao <iori320222@126.com>
Date: Mon, 19 Jul 2021 18:16:42 +0800
Subject: [PATCH] =?UTF-8?q?author:wangyimiao=20desc:=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E6=8B=A6=E6=88=AA=E5=99=A8API?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/commonlibtest/MainActivity.java    | 30 +++++++++
 .../commonlibtest/bean/CollectionData.kt      | 15 +++++
 .../commonlibtest/bean/CollectionResponse.kt  |  8 +++
 .../commonlibtest/manager/CollectionLoader.kt | 29 +++++++++
 .../commonlibtest/manager/InternetLoader.kt   |  3 +
 app/src/main/res/layout/activity_main.xml     | 14 +++-
 commonLib/build.gradle                        |  4 +-
 .../com/common/commonlib/net/BaseObserve.kt   |  7 +-
 .../common/commonlib/net/RequestManager.kt    | 64 +++++++++++++------
 .../net/interceptor/BaseUrlInterceptor.kt     |  2 +-
 .../net/interceptor/HttpCommonInterceptor.kt  |  6 +-
 11 files changed, 153 insertions(+), 29 deletions(-)
 create mode 100644 app/src/main/java/com/common/commonlibtest/bean/CollectionData.kt
 create mode 100644 app/src/main/java/com/common/commonlibtest/bean/CollectionResponse.kt
 create mode 100644 app/src/main/java/com/common/commonlibtest/manager/CollectionLoader.kt

diff --git a/app/src/main/java/com/common/commonlibtest/MainActivity.java b/app/src/main/java/com/common/commonlibtest/MainActivity.java
index f55c5e1..2b1ee28 100644
--- a/app/src/main/java/com/common/commonlibtest/MainActivity.java
+++ b/app/src/main/java/com/common/commonlibtest/MainActivity.java
@@ -6,12 +6,18 @@ import android.os.Bundle;
 import android.util.Log;
 
 import com.common.commonlib.net.RequestCallBack;
+import com.common.commonlib.net.interceptor.HttpCommonInterceptor;
 import com.common.commonlibtest.bean.ArticlesResponse;
+import com.common.commonlibtest.bean.CollectionResponse;
+import com.common.commonlibtest.manager.CollectionLoader;
 import com.common.commonlibtest.manager.InternetLoader;
 import com.yinuo.commonlibtest.databinding.ActivityMainBinding;
 
 import org.jetbrains.annotations.Nullable;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class MainActivity extends AppCompatActivity {
     private static final String TAG = MainActivity.class.getSimpleName();
     ActivityMainBinding binding;
@@ -44,5 +50,29 @@ public class MainActivity extends AppCompatActivity {
                 }
             });
         });
+
+        binding.btn.setOnClickListener(l -> {
+            List<HttpCommonInterceptor> interceptors = new ArrayList<>();
+            HttpCommonInterceptor.Builder builder = new HttpCommonInterceptor.Builder();
+            builder.addHeadParams("Cookie", "loginUserName_wanandroid_com=wang11;token_pass_wanandroid_com=6fbec4fe15d69af8b4531171798f3926;loginUserName=wang11;token_pass=6fbec4fe15d69af8b4531171798f3926");
+            interceptors.add(builder.build());
+            CollectionLoader loader = new CollectionLoader(interceptors);
+            loader.getCollections(0, new RequestCallBack<CollectionResponse>() {
+                @Override
+                public void onResult(CollectionResponse result) {
+                    Log.d(TAG, "onResult");
+                }
+
+                @Override
+                public void onError(@Nullable String error) {
+                    Log.d(TAG, "onError");
+                }
+
+                @Override
+                public void onComplete() {
+                    Log.d(TAG, "onComplete");
+                }
+            });
+        });
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/common/commonlibtest/bean/CollectionData.kt b/app/src/main/java/com/common/commonlibtest/bean/CollectionData.kt
new file mode 100644
index 0000000..6abcdb5
--- /dev/null
+++ b/app/src/main/java/com/common/commonlibtest/bean/CollectionData.kt
@@ -0,0 +1,15 @@
+package com.common.commonlibtest.bean
+
+import android.os.Parcelable
+import com.common.commonlib.net.bean.BaseResponse
+import kotlinx.android.parcel.Parcelize
+
+@Parcelize
+data class CollectionData(var curPage: Int = 0) : Parcelable {
+    var datas: List<Article>? = null
+    var offset: Int = 0
+    var over: Boolean = false
+    var pageCount: Int = 0
+    var size: Int = 0
+    var total: Int = 0
+}
diff --git a/app/src/main/java/com/common/commonlibtest/bean/CollectionResponse.kt b/app/src/main/java/com/common/commonlibtest/bean/CollectionResponse.kt
new file mode 100644
index 0000000..89a9934
--- /dev/null
+++ b/app/src/main/java/com/common/commonlibtest/bean/CollectionResponse.kt
@@ -0,0 +1,8 @@
+package com.common.commonlibtest.bean
+
+import android.os.Parcelable
+import com.common.commonlib.net.bean.BaseResponse
+import kotlinx.android.parcel.Parcelize
+
+@Parcelize
+data class CollectionResponse(var data: CollectionData) : BaseResponse(), Parcelable
diff --git a/app/src/main/java/com/common/commonlibtest/manager/CollectionLoader.kt b/app/src/main/java/com/common/commonlibtest/manager/CollectionLoader.kt
new file mode 100644
index 0000000..8d51636
--- /dev/null
+++ b/app/src/main/java/com/common/commonlibtest/manager/CollectionLoader.kt
@@ -0,0 +1,29 @@
+package com.common.commonlibtest.manager
+
+import com.common.commonlib.net.BaseObserve
+import com.common.commonlib.net.RequestCallBack
+import com.common.commonlibtest.bean.CollectionResponse
+import io.reactivex.Observable
+import okhttp3.Interceptor
+import retrofit2.http.GET
+import retrofit2.http.Headers
+import retrofit2.http.Path
+
+class CollectionLoader(interceptors: List<Interceptor>) :
+    BaseObserve<CollectionLoader.CollectionApi>() {
+    private val api: CollectionApi
+
+    init {
+        api = initService(CollectionApi::class.java, interceptors)
+    }
+
+    fun getCollections(pageName: Int, callBack: RequestCallBack<CollectionResponse>) {
+        observe(api.getCollections(pageName), callBack)
+    }
+
+    interface CollectionApi {
+        @Headers("baseurl:debug1")
+        @GET("/lg/collect/list/{pageNum}/json")
+        fun getCollections(@Path("pageNum") pageNum: Int): Observable<CollectionResponse>
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/common/commonlibtest/manager/InternetLoader.kt b/app/src/main/java/com/common/commonlibtest/manager/InternetLoader.kt
index 1e74af8..c88a652 100644
--- a/app/src/main/java/com/common/commonlibtest/manager/InternetLoader.kt
+++ b/app/src/main/java/com/common/commonlibtest/manager/InternetLoader.kt
@@ -8,6 +8,9 @@ import retrofit2.http.GET
 import retrofit2.http.Headers
 import retrofit2.http.Path
 
+/**
+ * 网络请求样例
+ */
 class InternetLoader : BaseObserve<InternetLoader.HomeApi>() {
     var homeApi: HomeApi
 
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 7b64f39..0e19d78 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -3,8 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".MainActivity">
+    android:layout_height="match_parent">
 
     <TextView
         android:id="@+id/tv"
@@ -16,4 +15,15 @@
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
+    <Button
+        android:id="@+id/btn"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Hello World!"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.599" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/commonLib/build.gradle b/commonLib/build.gradle
index 060c04b..6477d38 100644
--- a/commonLib/build.gradle
+++ b/commonLib/build.gradle
@@ -48,8 +48,8 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'com.google.android.material:material:1.2.1'
 
-    implementation 'androidx.navigation:navigation-fragment:2.3.0'
-    implementation 'androidx.navigation:navigation-ui:2.3.0'
+    implementation 'androidx.navigation:navigation-fragment-ktx:2.3.0'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.3.0'
 
     // 添加kotlin依赖
     implementation rootProject.ext.dependencies.kotlin
diff --git a/commonLib/src/main/java/com/common/commonlib/net/BaseObserve.kt b/commonLib/src/main/java/com/common/commonlib/net/BaseObserve.kt
index 1eda43a..dfa50f6 100644
--- a/commonLib/src/main/java/com/common/commonlib/net/BaseObserve.kt
+++ b/commonLib/src/main/java/com/common/commonlib/net/BaseObserve.kt
@@ -8,6 +8,7 @@ import io.reactivex.Observer
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.Disposable
 import io.reactivex.schedulers.Schedulers
+import okhttp3.Interceptor
 import org.json.JSONException
 import retrofit2.HttpException
 import java.net.ConnectException
@@ -23,7 +24,11 @@ open class BaseObserve<T> {
      * 初始化服务类
      */
     fun initService(clazz: Class<T>): T {
-        return RequestManager.INSTANCE.create(clazz)
+        return RequestManager.create(clazz)
+    }
+
+    fun initService(clazz: Class<T>, interceptors: List<Interceptor>): T {
+        return RequestManager.create(clazz, interceptors)
     }
 
     /**
diff --git a/commonLib/src/main/java/com/common/commonlib/net/RequestManager.kt b/commonLib/src/main/java/com/common/commonlib/net/RequestManager.kt
index cf52a11..e54071f 100644
--- a/commonLib/src/main/java/com/common/commonlib/net/RequestManager.kt
+++ b/commonLib/src/main/java/com/common/commonlib/net/RequestManager.kt
@@ -2,6 +2,8 @@ package com.common.commonlib.net
 
 import com.common.commonlib.net.interceptor.BaseUrlInterceptor
 import com.common.commonlib.net.interceptor.HttpCommonInterceptor
+import com.common.commonlib.utils.BaseUtils
+import okhttp3.Interceptor
 import okhttp3.OkHttpClient
 import retrofit2.Retrofit
 import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory
@@ -11,41 +13,63 @@ import java.util.concurrent.TimeUnit
 /**
  * 网络请求管理器
  */
-enum class RequestManager {
-    INSTANCE;
-
+object RequestManager {
     /**
      * 默认超时时间
      */
-    private val defaultTimeOut: Long = 5
+    private const val defaultTimeOut: Long = 5
 
     /**
      * 默认读取超时时间
      */
-    private val defaultReadTimeOut: Long = 10
+    private const val defaultReadTimeOut: Long = 10
 
     private var mRetrofit: Retrofit? = null
 
-    init {
-        val builder: OkHttpClient.Builder = OkHttpClient.Builder()
-        builder.connectTimeout(defaultTimeOut, TimeUnit.SECONDS)
-        builder.readTimeout(defaultReadTimeOut, TimeUnit.SECONDS)
-        val commonInterceptor: HttpCommonInterceptor = HttpCommonInterceptor.Builder().build()
-        builder.addInterceptor(commonInterceptor)
-        builder.addInterceptor(BaseUrlInterceptor())
-
-        mRetrofit = Retrofit.Builder()
-            .client(builder.build())
-            .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
-            .addConverterFactory(GsonConverterFactory.create())
-            .baseUrl("https://www.wanandroid.com")
-            .build()
-    }
+    private var mRetrofitWithIntercept: Retrofit? = null
 
     /**
      * 创建service
      */
     fun <T> create(service: Class<T>): T {
+        if (mRetrofit == null) {
+            init(null)
+        }
         return mRetrofit!!.create(service)
     }
+
+    /**
+     * 携带commonInterceptor
+     */
+    fun <T> create(service: Class<T>, interceptors: List<Interceptor>): T {
+        init(interceptors)
+        return mRetrofitWithIntercept!!.create(service)
+    }
+
+    private fun init(interceptors: List<Interceptor>?) {
+        val builder: OkHttpClient.Builder = OkHttpClient.Builder()
+        builder.connectTimeout(defaultTimeOut, TimeUnit.SECONDS)
+        builder.readTimeout(defaultReadTimeOut, TimeUnit.SECONDS)
+        // 动态HOST替换拦截器
+        builder.addInterceptor(BaseUrlInterceptor())
+
+        if (!BaseUtils.isListEmpty(interceptors)) {
+            for (intercept in interceptors!!) {
+                builder.addInterceptor(intercept)
+            }
+            mRetrofitWithIntercept = Retrofit.Builder()
+                .client(builder.build())
+                .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
+                .addConverterFactory(GsonConverterFactory.create())
+                .baseUrl("https://www.wanandroid.com")
+                .build()
+        } else {
+            mRetrofit = Retrofit.Builder()
+                .client(builder.build())
+                .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
+                .addConverterFactory(GsonConverterFactory.create())
+                .baseUrl("https://www.wanandroid.com")
+                .build()
+        }
+    }
 }
\ No newline at end of file
diff --git a/commonLib/src/main/java/com/common/commonlib/net/interceptor/BaseUrlInterceptor.kt b/commonLib/src/main/java/com/common/commonlib/net/interceptor/BaseUrlInterceptor.kt
index 1713edd..2ba405c 100644
--- a/commonLib/src/main/java/com/common/commonlib/net/interceptor/BaseUrlInterceptor.kt
+++ b/commonLib/src/main/java/com/common/commonlib/net/interceptor/BaseUrlInterceptor.kt
@@ -13,7 +13,7 @@ import java.io.BufferedInputStream
 import java.util.*
 
 /**
- * BaseUrl链接拦截器
+ * HOST拦截器:动态替换HOST
  */
 class BaseUrlInterceptor : Interceptor {
     /**
diff --git a/commonLib/src/main/java/com/common/commonlib/net/interceptor/HttpCommonInterceptor.kt b/commonLib/src/main/java/com/common/commonlib/net/interceptor/HttpCommonInterceptor.kt
index 38fd104..5f7fa7c 100644
--- a/commonLib/src/main/java/com/common/commonlib/net/interceptor/HttpCommonInterceptor.kt
+++ b/commonLib/src/main/java/com/common/commonlib/net/interceptor/HttpCommonInterceptor.kt
@@ -11,7 +11,7 @@ class HttpCommonInterceptor : Interceptor {
     /**
      * 请求头部参数
      */
-    var mHeaderHashMap: HashMap<String, String>? = null
+    var mHeaderHashMap: HashMap<String, String> = HashMap()
 
     /**
      * 拦截请求并添加参数
@@ -20,8 +20,8 @@ class HttpCommonInterceptor : Interceptor {
         val oldRequest: Request = chain.request()
         val requestBuilder: Request.Builder = oldRequest.newBuilder()
         requestBuilder.method(oldRequest.method, oldRequest.body)
-        if (mHeaderHashMap != null && mHeaderHashMap!!.size > 0) {
-            for (item: Map.Entry<String, String> in mHeaderHashMap!!.entries) {
+        if (mHeaderHashMap.size > 0) {
+            for (item: Map.Entry<String, String> in mHeaderHashMap.entries) {
                 requestBuilder.addHeader(item.key, item.value)
             }
         }