From f5180b600511d1871635bd364beb5bdd15f6ae88 Mon Sep 17 00:00:00 2001 From: zuojincheng <lf_zuo@163.com> Date: 星期三, 26 三月 2025 18:05:07 +0800 Subject: [PATCH] feat(nfc): 优化 NFC写卡功能并添加新方法- 在 BaseNfcWriteHelper 中添加了新的 writeData 方法,增加了 isConnect 参数 - 优化了 NativeNfcWriteHelper 中的 writeData 实现,支持选择性连接 NFC - 更新了 NfcWriteAdapter,支持新的 writeData 方法- 修改了 NfcWreatHelper 中的 writeData 方法,使用新的接口 - 优化了 NfcWreatActivity 中的写卡逻辑 --- generallibrary/src/main/java/com/dayu/general/net/RetrofitClient.kt | 21 ++++++++++----------- 1 files changed, 10 insertions(+), 11 deletions(-) diff --git a/generallibrary/src/main/java/com/dayu/general/net/RetrofitClient.kt b/generallibrary/src/main/java/com/dayu/general/net/RetrofitClient.kt index 97bdbeb..aadfdd5 100644 --- a/generallibrary/src/main/java/com/dayu/general/net/RetrofitClient.kt +++ b/generallibrary/src/main/java/com/dayu/general/net/RetrofitClient.kt @@ -1,7 +1,6 @@ package com.dayu.general.net import com.dayu.baselibrary.BuildConfig -import com.dayu.qiheonlinelibrary.net.MyIntercepterApplication import okhttp3.OkHttpClient import okhttp3.logging.HttpLoggingInterceptor import retrofit2.Retrofit @@ -14,7 +13,13 @@ * Author: zuo * Date: 2025-03-06 */ -class RetrofitClient { +class RetrofitClient// 鍖呭惈header銆乥ody鏁版嵁 +// loggingInterceptor.setLevel(HttpLoggingInterceptor.Level.HEADERS); +//璁剧疆杩炴帴鍜岃鍙栨椂闂� +//娣诲姞缁熶竴鐨刪eader +//娣诲姞鏃ュ織鎷︽埅鍣� +//娣诲姞鏁版嵁璇锋眰缁熶竴澶勭悊鎷︽埅鍣� + () { @@ -22,26 +27,19 @@ val READ_TIME_OUT: Int = 10 val CONNECT_TIME_OUT: Int = 10 - private fun RetrofitClient() { + + init { val loggingInterceptor = HttpLoggingInterceptor() - // 鍖呭惈header銆乥ody鏁版嵁 loggingInterceptor.setLevel(HttpLoggingInterceptor.Level.BODY) - // loggingInterceptor.setLevel(HttpLoggingInterceptor.Level.HEADERS); val builder: OkHttpClient.Builder = OkHttpClient().newBuilder() - //璁剧疆杩炴帴鍜岃鍙栨椂闂� builder.readTimeout(READ_TIME_OUT.toLong(), TimeUnit.SECONDS) builder.connectTimeout(CONNECT_TIME_OUT.toLong(), TimeUnit.SECONDS) builder.writeTimeout(CONNECT_TIME_OUT.toLong(), TimeUnit.SECONDS) - //娣诲姞缁熶竴鐨刪eader builder.addInterceptor(MyIntercepterApplication()) - //娣诲姞鏃ュ織鎷︽埅鍣� - //娣诲姞鏁版嵁璇锋眰缁熶竴澶勭悊鎷︽埅鍣� if (BuildConfig.DEBUG) { builder.addInterceptor(loggingInterceptor) } - val client: OkHttpClient = builder.build() - retrofit = Retrofit.Builder() .baseUrl(NetConstans.BASE_URL) .addConverterFactory(GsonConverterFactory.create()) @@ -49,6 +47,7 @@ .client(client).build() } + @Synchronized -- Gitblit v1.8.0