Browse Source

优化登录用户的SP判断

Frankensteinly 11 tháng trước cách đây
mục cha
commit
7dad6d877c

+ 1 - 1
app/src/main/java/com/grkj/iscs/activity/test/ProcessDemoActivity.kt

@@ -174,7 +174,7 @@ class ProcessDemoActivity : BaseActivity<ActivityProcessDemoBinding>() {
             ToastUtils.tip("请先获取工单详情")
             return
         }
-        if (SPUtils.getLoginUser(this)?.userId == null) {
+        if (SPUtils.getLoginUser(this) == null) {
             ToastUtils.tip("请先登录")
             return
         }

+ 1 - 1
app/src/main/java/com/grkj/iscs/presenter/TicketDetailPresenter.kt

@@ -42,7 +42,7 @@ class TicketDetailPresenter : BasePresenter<ITicketDetailView>() {
 
     fun doAction(vo: TicketDetailRespVO?) {
         val loginUser = SPUtils.getLoginUser(mContext!!)
-        if (loginUser == null || loginUser.userId == 0L) {
+        if (loginUser == null) {
             ToastUtils.tip(R.string.please_login)
             return
         }

+ 1 - 1
app/src/main/java/com/grkj/iscs/presenter/TicketListPresenter.kt

@@ -18,7 +18,7 @@ class TicketListPresenter : BasePresenter<ITicketListView>() {
 
     fun initData(ticketStatus: Int?, callBack: (TicketPageRespVO?) -> Unit) {
         val cardInfo = SPUtils.getLoginUser(mContext!!)
-        if (cardInfo?.cardNfc == null || cardInfo.userId == 0L) {
+        if (cardInfo?.cardNfc == null) {
             ToastUtils.tip(mContext!!.resources.getString(R.string.please_login))
             return
         }

+ 2 - 2
app/src/main/java/com/grkj/iscs/util/NetHttpManager.kt

@@ -76,7 +76,7 @@ class NetHttpManager {
             callback(token.token)
             return
         }
-        if (context == null || SPUtils.getLoginUser(context!!)?.cardNfc == null) {
+        if (context == null || SPUtils.getLoginUser(context!!) == null) {
             ToastUtils.tip(context!!.resources.getString(R.string.please_login))
             return
         }
@@ -88,7 +88,7 @@ class NetHttpManager {
             return
         }
         val loginUser = SPUtils.getLoginUser(context!!)
-        if (loginUser?.cardNfc == null) {
+        if (loginUser == null) {
             ToastUtils.tip(context!!.resources.getString(R.string.please_login))
             return
         }

+ 4 - 1
app/src/main/java/com/grkj/iscs/util/SPUtils.kt

@@ -17,7 +17,10 @@ object SPUtils {
     private const val KEY_LOGIN_USER_ROLE_KEY = "role_key"
 
     fun getLoginUser(context: Context): CardInfoRespVO? {
-        val sp = context.getSharedPreferences(SP_NAME, Context.MODE_PRIVATE) ?: return null
+        val sp = context.getSharedPreferences(SP_NAME, Context.MODE_PRIVATE)
+        if (sp.getLong(KEY_LOGIN_USER_USER_ID, 0) == 0L) {
+            return null
+        }
         return CardInfoRespVO(
             cardId = sp.getLong(KEY_LOGIN_USER_CARD_ID, 0),
             cardCode = sp.getString(KEY_LOGIN_USER_CARD_CODE, null),