From 08f1963054af6c668f439e92f80b969f4846aa07 Mon Sep 17 00:00:00 2001
From: lvmeng <848755140@qq.com>
Date: Tue, 3 Mar 2026 09:19:49 +0800
Subject: [PATCH] =?UTF-8?q?refactor(network):=20=E4=BC=98=E5=8C=96=20ApiCl?=
 =?UTF-8?q?ient=20=E4=BB=A3=E7=A0=81=EF=BC=8C=E6=B8=85=E7=90=86=E6=AD=BB?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=B9=B6=E7=BB=9F=E4=B8=80=E6=87=92=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD=E5=88=9D=E5=A7=8B=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除未使用的 DEVICE_BASE_URL 中间变量，直接引用 GlobalData.appBaseUrl
- okHttpClient 改为 private，收敛可见性
- retrofit 改为 by lazy，与 apiService 保持一致
- 简化日志拦截器 lambda 写法
- 清除所有注释掉的废弃代码

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .../com/sw/platecabinet/network/ApiClient.kt  | 36 ++++++++-----------
 1 file changed, 14 insertions(+), 22 deletions(-)

diff --git a/app/src/main/java/com/sw/platecabinet/network/ApiClient.kt b/app/src/main/java/com/sw/platecabinet/network/ApiClient.kt
index 73c75d5..02ee2c2 100644
--- a/app/src/main/java/com/sw/platecabinet/network/ApiClient.kt
+++ b/app/src/main/java/com/sw/platecabinet/network/ApiClient.kt
@@ -12,37 +12,29 @@ import timber.log.Timber
 import java.util.concurrent.TimeUnit
 
 object ApiClient {
-    //private const val BASE_URL = "https://vip.shuziweidao.com"
-//    private const val DEVICE_BASE_URL = "http://device.shuziweidao.com:8889/"
-    private var DEVICE_BASE_URL = GlobalData.appBaseUrl
-        //    private const val BASE_URL = "http://192.168.1.8:9092"
-//    private const val TIME_OUT = 30L // 超时时间(秒)
-    private const val TIME_OUT = 60L // 超时时间(秒)
 
-    val okHttpClient = OkHttpClient.Builder()
+    private const val TIME_OUT = 60L // 超时时间（秒）
+
+    private val okHttpClient = OkHttpClient.Builder()
         .connectTimeout(TIME_OUT, TimeUnit.SECONDS)
         .readTimeout(TIME_OUT, TimeUnit.SECONDS)
         .writeTimeout(TIME_OUT, TimeUnit.SECONDS)
-        .addNetworkInterceptor(HttpLoggingInterceptor(logger = {
-            Timber.d("okhttp logger ==>${it}")
-        }).apply {
-            level = if (MyApp.DEBUG) {
-                HttpLoggingInterceptor.Level.BODY
-            } else {
-                HttpLoggingInterceptor.Level.NONE
-            }
+        .addNetworkInterceptor(HttpLoggingInterceptor { Timber.d("okhttp ==>${it}") }.apply {
+            level = if (MyApp.DEBUG) HttpLoggingInterceptor.Level.BODY
+                    else HttpLoggingInterceptor.Level.NONE
         })
         .addInterceptor(RequestInterceptor())
         .build()
 
-    private val retrofit = Retrofit.Builder()
-        .baseUrl(DEVICE_BASE_URL)
-        .client(okHttpClient)
-        .addConverterFactory(GsonConverterFactory.create())
-//        .addCallAdapterFactory(CoroutineCallAdapterFactory()) // 协程适配器
-        .build()
+    private val retrofit by lazy {
+        Retrofit.Builder()
+            .baseUrl(GlobalData.appBaseUrl)
+            .client(okHttpClient)
+            .addConverterFactory(GsonConverterFactory.create())
+            .build()
+    }
 
     val apiService: ApiService by lazy {
         retrofit.create(ApiService::class.java)
     }
-}
\ No newline at end of file
+}