From e76474b74e72703b8bcf5a5ef4a25ca39c4a2216 Mon Sep 17 00:00:00 2001 From: zhanglei <350328959@qq.com> Date: Tue, 17 Mar 2026 17:02:22 +0800 Subject: [PATCH] =?UTF-8?q?feat(home):=20=E6=96=B0=E5=A2=9E=E9=93=B6?= =?UTF-8?q?=E8=A1=8C=E7=A7=AF=E5=88=86=20API=20=E6=8E=A5=E5=8F=A3=E5=92=8C?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增 HomeBankBean 数据模型，包含今日积分和总积分字段 - 在 HomeApi 中新增 postUserPointDetail() 接口，支持自定义请求头和签名 - 新增银行积分 Retrofit 配置：getBankRetrofit() 函数 - 新增银行积分 BASE_URL 配置和 SECRET_KEY 密钥 - 优化 UrlConfig，支持测试和生产环境的银行积分 API 地址切换 --- .../xjjk/healthyclients/bean/home/HomeBean.kt | 6 ++++ .../xjjk/healthyclients/data/api/HomeApi.kt | 9 ++++++ .../retrofit/BankRetrofitHelper.kt | 11 +++----- .../xjjk/healthyclients/retrofit/UrlConfig.kt | 28 +++++++++++++++++++ 4 files changed, 47 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/xjjk/healthyclients/bean/home/HomeBean.kt b/app/src/main/java/com/xjjk/healthyclients/bean/home/HomeBean.kt index 199bb0f..97e6708 100644 --- a/app/src/main/java/com/xjjk/healthyclients/bean/home/HomeBean.kt +++ b/app/src/main/java/com/xjjk/healthyclients/bean/home/HomeBean.kt @@ -52,3 +52,9 @@ data class HomeBannerBean( data class EncryptInfoBean( val encryptData: String? ) + +data class HomeBankBean( + val todayPoints: String?, + val totalPoints: String? +) + diff --git a/app/src/main/java/com/xjjk/healthyclients/data/api/HomeApi.kt b/app/src/main/java/com/xjjk/healthyclients/data/api/HomeApi.kt index e8454c9..2aee9b4 100644 --- a/app/src/main/java/com/xjjk/healthyclients/data/api/HomeApi.kt +++ b/app/src/main/java/com/xjjk/healthyclients/data/api/HomeApi.kt @@ -1,6 +1,7 @@ package com.xjjk.healthyclients.data.api import com.xjjk.healthyclients.bean.home.EncryptInfoBean +import com.xjjk.healthyclients.bean.home.HomeBankBean import com.xjjk.healthyclients.bean.home.HomeBannerBean import com.xjjk.healthyclients.bean.home.HomeNoticeBean import com.xjjk.healthyclients.bean.home.HomeWatchAllDataBean @@ -12,9 +13,12 @@ import com.xjjk.healthyclients.bean.user.PointRecord import com.xjjk.healthyclients.bean.user.PointsTask import com.xjjk.healthyclients.bean.user.UserPointBean import com.xjjk.healthyclients.data.bean.ApiResponse +import com.xjjk.healthyclients.retrofit.UrlConfig import okhttp3.RequestBody +import retrofit2.Call import retrofit2.http.Body import retrofit2.http.GET +import retrofit2.http.HeaderMap import retrofit2.http.POST import retrofit2.http.QueryMap @@ -102,6 +106,11 @@ interface HomeApi { */ @GET("/health-watch/watch/watchDevice/app/unbundleDevice") suspend fun getUnbundleDevice(@QueryMap params: MutableMap): ApiResponse + /** + * 获取首页银行积分 + */ + @POST("${UrlConfig.middle}api/v1/users/point-details") + fun postUserPointDetail(@HeaderMap headers :Map, @Body requestBody: RequestBody): Call> } \ No newline at end of file diff --git a/app/src/main/java/com/xjjk/healthyclients/retrofit/BankRetrofitHelper.kt b/app/src/main/java/com/xjjk/healthyclients/retrofit/BankRetrofitHelper.kt index 2970933..7f19677 100644 --- a/app/src/main/java/com/xjjk/healthyclients/retrofit/BankRetrofitHelper.kt +++ b/app/src/main/java/com/xjjk/healthyclients/retrofit/BankRetrofitHelper.kt @@ -1,24 +1,21 @@ package com.xjjk.healthyclients.retrofit -import com.xjjk.healthyclients.retrofit.UrlConfig.getDefaultBaseUrl -import com.xjjk.healthyclients.retrofit.interceptor.LoggingInterceptor2 +import com.xjjk.healthyclients.retrofit.UrlConfig.getDefaultBankBaseUrl import com.xjjk.healthyclients.utils.ApiDns import okhttp3.OkHttpClient import retrofit2.Retrofit import retrofit2.converter.gson.GsonConverterFactory import java.util.concurrent.TimeUnit -fun getHealthCheckRetrofit(): Retrofit { +fun getBankRetrofit(): Retrofit { val builder = OkHttpClient.Builder() builder.connectTimeout(30, TimeUnit.SECONDS) builder.readTimeout(30, TimeUnit.SECONDS) - builder.addInterceptor(LoggingInterceptor2()) +// builder.addInterceptor(LoggingInterceptor2()) builder.dns(ApiDns()) - var baseUrl="" - baseUrl = getDefaultBaseUrl() + var baseUrl = getDefaultBankBaseUrl() return Retrofit.Builder() .baseUrl(baseUrl) -// .addConverterFactory(MoshiConverterFactory.create()) .addConverterFactory(GsonConverterFactory.create()) .client(builder.build()) .build() diff --git a/app/src/main/java/com/xjjk/healthyclients/retrofit/UrlConfig.kt b/app/src/main/java/com/xjjk/healthyclients/retrofit/UrlConfig.kt index 53f70ac..c79e9c2 100644 --- a/app/src/main/java/com/xjjk/healthyclients/retrofit/UrlConfig.kt +++ b/app/src/main/java/com/xjjk/healthyclients/retrofit/UrlConfig.kt @@ -31,9 +31,17 @@ object UrlConfig { private const val TEST_HOME_BANK_H5 = "https://gstest.superwx.cn/healthbank/index.html" private const val PRODUCT_HOME_BANK_H5 = "https://console-jkglpt.iosp.ydpt.tech/hb/healthweb/index.html" + //手机银行 + const val SECRET_KEY = "XJp3EHpcnwReXc1A" + private const val TEST_HOME_BANK_IP = "https://gstest.superwx.cn/" + private const val PRODUCT_HOME_BANK_IP = "https://api-jkglpt.iosp.ydpt.tech/" + val baseUrlType: BaseUrlType = BaseUrlType.PRODUCT +// const val middle = "xj_health/" //test + const val middle = "hb/" //product + var isOpenIm: Boolean = true enum class BaseUrlType(val type: Int) { @@ -57,6 +65,19 @@ object UrlConfig { } } } + + private fun getBankBaseUrl(baseUrlType: BaseUrlType = BaseUrlType.PRODUCT): String { + return when (baseUrlType) { + BaseUrlType.DEBUG, BaseUrlType.TEST -> { + TEST_HOME_BANK_IP + } + + BaseUrlType.PRODUCT -> { + PRODUCT_HOME_BANK_IP + } + } + } + fun getH5BaseUrl(baseUrlType: BaseUrlType = BaseUrlType.PRODUCT): String { return when (baseUrlType) { BaseUrlType.DEBUG -> { @@ -90,6 +111,13 @@ object UrlConfig { return getBaseUrl(baseUrlType) } + /** + * 手机银行 + */ + fun getDefaultBankBaseUrl(): String { + return getBankBaseUrl(baseUrlType) + } + /** * 方便在APP运行之后切换环境所以用 get获取 */