From 5edfd12deb166302708857515a833d1471a0f208 Mon Sep 17 00:00:00 2001 From: zuoxiao <lf_zuo@163.com> Date: 星期三, 25 六月 2025 16:15:23 +0800 Subject: [PATCH] feat(database): 增加管理卡相关功能并优化数据库结构- 新增 ManagerCardBean 数据类用于管理卡信息 - 在 AppDataBase 中添加 ManagerCardDao 接口 - 实现管理卡的数据库迁移策略 - 优化支付方式 ID 类型,从 Long改为 String - 重构更新写卡和上报状态的逻辑,支持管理卡和用户卡 --- generallibrary/src/main/java/com/dayu/general/net/ApiManager.kt | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/generallibrary/src/main/java/com/dayu/general/net/ApiManager.kt b/generallibrary/src/main/java/com/dayu/general/net/ApiManager.kt index 0667e86..79e1dae 100644 --- a/generallibrary/src/main/java/com/dayu/general/net/ApiManager.kt +++ b/generallibrary/src/main/java/com/dayu/general/net/ApiManager.kt @@ -2,6 +2,7 @@ import android.content.Context import android.util.Log +import com.dayu.baselibrary.business.BusinessProvider import com.dayu.baselibrary.net.subscribers.ProgressSubscriber import com.dayu.baselibrary.net.subscribers.SubscriberListener import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers @@ -120,13 +121,13 @@ observable .subscribeOn(Schedulers.io()) - .map(mapResponse(tClass)) + .map(mapResponse(context, tClass)) .unsubscribeOn(Schedulers.newThread()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(mySubscriber) } - private fun <T> mapResponse(tClass: Class<T>): Function<Any, BaseResponse<T>> { + private fun <T> mapResponse(context: Context, tClass: Class<T>): Function<Any, BaseResponse<T>> { return Function { rawResponse -> when (rawResponse) { is BaseResponse<*> -> { @@ -136,12 +137,13 @@ val response = BaseResponse<T>().apply { code = temp.code msg = temp.msg ?: "" + success = temp.success } // 澶勭悊token澶辨晥鐨勬儏鍐� if (temp.code == NetConstans.TOKEN_INVALID) { // 鍙互鍦ㄨ繖閲屾坊鍔犻噸瀹氬悜鍒扮櫥褰曢〉闈㈢殑閫昏緫 - // redirectToLogin() + BusinessProvider.getBusinessProvider().startLoginNavigotor.navigateToLogin(context) return@Function response } -- Gitblit v1.8.0