From 8521954fa97bdfc54123afb4a72755ece311db06 Mon Sep 17 00:00:00 2001
From: zuojincheng <lf_zuo@163.com>
Date: 星期五, 21 三月 2025 14:45:45 +0800
Subject: [PATCH] feat(general): 更新登录逻辑和用户信息展示
---
generallibrary/src/main/java/com/dayu/general/activity/LoginActivity.kt | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 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..4839223 100644
--- a/generallibrary/src/main/java/com/dayu/general/activity/LoginActivity.kt
+++ b/generallibrary/src/main/java/com/dayu/general/activity/LoginActivity.kt
@@ -1,8 +1,12 @@
package com.dayu.general.activity
+import android.app.Activity
import android.content.Context
+import android.content.Intent
import com.dayu.baselibrary.net.subscribers.SubscriberListener
import com.dayu.baselibrary.utils.ToastUtil
+import com.dayu.general.BaseApplication
+import com.dayu.general.bean.net.LoginResult
import com.dayu.general.bean.net.SearchUserResult
import com.dayu.general.net.ApiManager
import com.dayu.general.net.BaseResponse
@@ -16,7 +20,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 +31,21 @@
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)
} else {
// 澶勭悊鎼滅储澶辫触鐨勬儏鍐�
ToastUtil.show(t.msg)
--
Gitblit v1.8.0