From 4327a8638cf30c43a5faaf8e12aad87ba3bdc0cf Mon Sep 17 00:00:00 2001 From: yangxisong Date: Thu, 13 Nov 2025 10:25:54 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E7=BD=91=E7=BB=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yuanxuan/rokid/dependencies/AppDependencies.kt | 9 ++++++--- .../dependencies/ApplicationDependencyProvider.kt | 6 +++++- .../com/yuanxuan/rokid/network/http/RequestApi.kt | 13 ------------- .../yuanxuan/rokid/network/http/RetrofitClient.kt | 2 +- 4 files changed, 12 insertions(+), 18 deletions(-) delete mode 100644 app/src/main/java/com/yuanxuan/rokid/network/http/RequestApi.kt diff --git a/app/src/main/java/com/yuanxuan/rokid/dependencies/AppDependencies.kt b/app/src/main/java/com/yuanxuan/rokid/dependencies/AppDependencies.kt index 4294d90..7995e55 100644 --- a/app/src/main/java/com/yuanxuan/rokid/dependencies/AppDependencies.kt +++ b/app/src/main/java/com/yuanxuan/rokid/dependencies/AppDependencies.kt @@ -4,8 +4,6 @@ import android.app.Application import com.yuanxuan.rokid.device.DeviceServiceManager import com.yuanxuan.rokid.network.http.ApiRepository import com.yuanxuan.rokid.network.http.ApiService -import com.yuanxuan.rokid.network.http.OkHttpManager -import com.yuanxuan.rokid.network.http.RequestApi import com.yuanxuan.rokid.network.http.RetrofitClient import com.yuanxuan.rokid.network.websocket.WebSocketManager @@ -37,15 +35,20 @@ object AppDependencies { provider.provideWebSocketManager() } + val retrofitClient by lazy { + provider.provideRetrofitClient() + } + val requestApi by lazy { provider.provideApiRepository( - apiService = RetrofitClient.apiService + apiService = retrofitClient.apiService ) } interface Provider { fun provideDeviceServiceManager(): DeviceServiceManager fun provideWebSocketManager(): WebSocketManager + fun provideRetrofitClient(): RetrofitClient fun provideApiRepository(apiService: ApiService): ApiRepository } diff --git a/app/src/main/java/com/yuanxuan/rokid/dependencies/ApplicationDependencyProvider.kt b/app/src/main/java/com/yuanxuan/rokid/dependencies/ApplicationDependencyProvider.kt index e305c42..c6a6eac 100644 --- a/app/src/main/java/com/yuanxuan/rokid/dependencies/ApplicationDependencyProvider.kt +++ b/app/src/main/java/com/yuanxuan/rokid/dependencies/ApplicationDependencyProvider.kt @@ -5,7 +5,7 @@ import com.yuanxuan.rokid.device.DeviceServiceManager import com.yuanxuan.rokid.network.http.ApiRepository import com.yuanxuan.rokid.network.http.ApiService import com.yuanxuan.rokid.network.http.OkHttpManager -import com.yuanxuan.rokid.network.http.RequestApi +import com.yuanxuan.rokid.network.http.RetrofitClient import com.yuanxuan.rokid.network.websocket.WebSocketManager import kotlinx.coroutines.CoroutineScope @@ -22,6 +22,10 @@ class ApplicationDependencyProvider(val context: Application, val scope: Corouti ) } + override fun provideRetrofitClient(): RetrofitClient { + return RetrofitClient() + } + override fun provideApiRepository(apiService: ApiService): ApiRepository { return ApiRepository( apiService = apiService diff --git a/app/src/main/java/com/yuanxuan/rokid/network/http/RequestApi.kt b/app/src/main/java/com/yuanxuan/rokid/network/http/RequestApi.kt deleted file mode 100644 index 696a20c..0000000 --- a/app/src/main/java/com/yuanxuan/rokid/network/http/RequestApi.kt +++ /dev/null @@ -1,13 +0,0 @@ -package com.yuanxuan.rokid.network.http - -class RequestApi( - private val okHttp: OkHttpManager -) { - - suspend fun testApi(): Result { - return runCatching { - okHttp.testApi() - } - } - -} \ No newline at end of file diff --git a/app/src/main/java/com/yuanxuan/rokid/network/http/RetrofitClient.kt b/app/src/main/java/com/yuanxuan/rokid/network/http/RetrofitClient.kt index 5863d12..2d3b3f6 100644 --- a/app/src/main/java/com/yuanxuan/rokid/network/http/RetrofitClient.kt +++ b/app/src/main/java/com/yuanxuan/rokid/network/http/RetrofitClient.kt @@ -8,7 +8,7 @@ import retrofit2.converter.gson.GsonConverterFactory import timber.log.Timber import kotlin.time.Duration.Companion.seconds -object RetrofitClient { +class RetrofitClient { private val okHttpClient: OkHttpClient by lazy { val httpLoggingInterceptor by lazy { HttpLoggingInterceptor { message ->