From 3013b813e5df6977c0be921928f73b1a3adde290 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期三, 02 七月 2025 15:52:04 +0800
Subject: [PATCH] ### 一、巡查模块相关
---
app/src/main/java/cn/flightfeather/thirdappmodule/common/net/RetrofitFactory.kt | 63 +++++++++++++++++--------------
1 files changed, 34 insertions(+), 29 deletions(-)
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/common/net/RetrofitFactory.kt b/app/src/main/java/cn/flightfeather/thirdappmodule/common/net/RetrofitFactory.kt
index bc31f66..f895740 100644
--- a/app/src/main/java/cn/flightfeather/thirdappmodule/common/net/RetrofitFactory.kt
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/common/net/RetrofitFactory.kt
@@ -18,36 +18,41 @@
* Date: 2019/7/22
* 缃戠粶璇锋眰
*/
-class RetrofitFactory constructor(val application: CommonApplication){
-
+class RetrofitFactory constructor(val application: CommonApplication) {
+ // 鏈郴缁熼缇界洃绠″悗绔帴鍙p
val retrofit: Retrofit = application.retrofit
val retrofitImage: Retrofit = application.retrofitImage
- private fun newOkHttpClient(list: List<Interceptor>): OkHttpClient =
- OkHttpClient.Builder()
- .connectTimeout(20 * 1000L, TimeUnit.MILLISECONDS)
- .apply {
- list.forEach {
- addInterceptor(it)
- }
- }
- .build()
+ // 椋炵窘鐜绯荤粺鍚庣鎺ュ彛ip
+ lateinit var retrofit2: Retrofit
- private fun newRetrofit(mOkHttpClient: OkHttpClient): Retrofit =
- Retrofit.Builder()
- .apply {
- baseUrl(application.ROOT_URL_RELEASE)
- }
- .addConverterFactory(
- GsonConverterFactory.create(
- GsonBuilder()
- .setDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ")
- .create()
- )
- )
- .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
- .client(mOkHttpClient)
- .build()
+ init {
+ retrofit2 = newRetrofit(application.ROOT_URL_RELEASE_2)
+ }
+
+ private fun newOkHttpClient(list: List<Interceptor>): OkHttpClient =
+ OkHttpClient.Builder()
+ .connectTimeout(20 * 1000L, TimeUnit.MILLISECONDS)
+ .apply {
+ list.forEach {
+ addInterceptor(it)
+ }
+ }
+ .build()
+
+ private fun newRetrofit(url: String, mOkHttpClient: OkHttpClient? = null): Retrofit =
+ Retrofit.Builder()
+ .baseUrl(url)
+ .addConverterFactory(
+ GsonConverterFactory.create(
+ GsonBuilder()
+ .setDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ")
+ .create()
+ )
+ )
+ .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
+ .apply { mOkHttpClient?.let { client(it) } }
+ .build()
companion object {
@@ -65,8 +70,8 @@
*/
fun <T> executeResult(observable: Observable<Response<T>>, subscriber: ResultObserver<T>) {
observable.subscribeOn(Schedulers.io())
- .observeOn(AndroidSchedulers.mainThread())
- .subscribe(subscriber)
+ .observeOn(AndroidSchedulers.mainThread())
+ .subscribe(subscriber)
}
fun withProgressListeningRetrofit(listener: NetWorkProgressListener?): Retrofit {
@@ -74,7 +79,7 @@
instance.retrofit
} else {
val c = instance.newOkHttpClient(listOf(NetWorkProgressInterceptor(listener)))
- instance.newRetrofit(c)
+ instance.newRetrofit(instance.application.ROOT_URL_RELEASE, c)
}
}
}
--
Gitblit v1.9.3