From 08bfe3072377b53c60e0952f00c26bce2e5b4bc0 Mon Sep 17 00:00:00 2001 From: zuoxiao <470321431@qq.com> Date: 星期三, 18 六月 2025 17:05:55 +0800 Subject: [PATCH] feat(card): 添加卡片返还功能- 新增 CardReturnActivity 用于执行卡片返还操作 - 在 BSCardFragment 中添加返还按钮,跳转到 CardReturnActivity - 在 CardOperationType 中添加 ReturnCard 类型 - 修改 CardReadActivity,优化卡片信息显示逻辑 - 更新 CardWriteSuccessActivity,支持返还成功提示 - 新增 ic_morny_back 图标用于返还操作 --- 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