From dd2562d8dc2b01bcdfca3152f82f09efbbd09259 Mon Sep 17 00:00:00 2001
From: zuoxiao <lf_zuo@163.com>
Date: 星期三, 25 六月 2025 19:49:48 +0800
Subject: [PATCH] fix(generallibrary): 优化卡片处理和支付方式获取逻辑- 修复地区卡处理逻辑，增加对"00"类型卡的特殊处理 - 优化用户卡数据解析和显示逻辑，提高容错性 - 改进支付方式获取方法，增加错误处理和日志记录 -调整充值接口调用参数，确保正确传递当前余额等信息- 修复 AreaCard 中 areaNumber 类型，改为字符串处理
---
generallibrary/src/main/java/com/dayu/general/activity/LoginActivity.kt | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/generallibrary/src/main/java/com/dayu/general/activity/LoginActivity.kt b/generallibrary/src/main/java/com/dayu/general/activity/LoginActivity.kt
index 762fc90..0ba2d6c 100644
--- a/generallibrary/src/main/java/com/dayu/general/activity/LoginActivity.kt
+++ b/generallibrary/src/main/java/com/dayu/general/activity/LoginActivity.kt
@@ -1,9 +1,11 @@
package com.dayu.general.activity
-import android.content.Context
+import android.app.Activity
+import android.content.Intent
import com.dayu.baselibrary.net.subscribers.SubscriberListener
import com.dayu.baselibrary.utils.ToastUtil
-import com.dayu.general.bean.net.SearchUserResult
+import com.dayu.general.BaseApplication
+import com.dayu.general.bean.net.LoginResult
import com.dayu.general.net.ApiManager
import com.dayu.general.net.BaseResponse
@@ -16,7 +18,7 @@
companion object {
@JvmStatic
- fun login(phone: String, password: String, myContext: Context) {
+ fun login(phone: String, password: String, myContext: Activity) {
val map = mutableMapOf<String, Any>()
if (phone.isNotEmpty()) {
@@ -27,18 +29,22 @@
map["password"] = password
}
- map["orgTag"] = "ym"
+ map["orgTag"] = BaseApplication.tag
// 浣跨敤姝ｇ‘鐨勭被鍨嬪弬鏁�
ApiManager.getInstance().requestPostLoading(
myContext,
"sso/sso/loginJson",
- SearchUserResult::class.java,
+ LoginResult::class.java,
map,
- object : SubscriberListener<BaseResponse<SearchUserResult>>() {
- override fun onNext(t: BaseResponse<SearchUserResult>) {
+ object : SubscriberListener<BaseResponse<LoginResult>>() {
+ override fun onNext(t: BaseResponse<LoginResult>) {
if (t.success) {
-
+ BaseApplication.token = t.content?.token ?: ""
+ BaseApplication.userId = t.content?.id ?: ""
+ val intent = Intent(myContext, MainActivity::class.java)
+ myContext.startActivity(intent)
+ myContext.finish()
} else {
// 澶勭悊鎼滅储澶辫触鐨勬儏鍐�
ToastUtil.show(t.msg)
--
Gitblit v1.8.0