From 15d9aae9a65c3385aaea29cb6d9810e4a8e8bd27 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期二, 07 五月 2024 11:04:45 +0800
Subject: [PATCH] 1.修复开卡列表显示异常bug 2.实现读卡界面相关功能 3.所有Activity去掉齐河后缀
---
app/src/main/java/com/dayu/recharge/activity/LoginActivity.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/app/src/main/java/com/dayu/recharge/activity/LoginActivity.java b/app/src/main/java/com/dayu/recharge/activity/LoginActivity.java
index c48f912..a785b32 100644
--- a/app/src/main/java/com/dayu/recharge/activity/LoginActivity.java
+++ b/app/src/main/java/com/dayu/recharge/activity/LoginActivity.java
@@ -20,6 +20,7 @@
import com.dayu.henanlibrary.dbBean.PassWordBean;
+import com.dayu.qihealonelibrary.activity.HomeActivity;
import com.dayu.recharge.MyApplication;
import com.dayu.recharge.databinding.ActivityLoginBinding;
import com.hjq.permissions.OnPermissionCallback;
@@ -54,6 +55,7 @@
binding.loginBtn.setOnClickListener(v -> {
String psStr = binding.loginPw.getText().toString();
if (MyApplication.myApplication.libraryType == BaseCommon.NoLibrary) {
+ //閫夋嫨鐗堟湰
LibraryDialog dialog = new LibraryDialog(this, type -> {
if (type == BaseCommon.HeNanLibrary) {
getHNPermission();
@@ -72,10 +74,10 @@
}
if ((passWordBean == null && psStr.equals("123456"))
|| passWordBean != null && passWordBean.getPassWord().equalsIgnoreCase(WSMD5.getMD5Str(psStr))) {
- if (MyApplication.myApplication.libraryType == 0) {
+ if (MyApplication.myApplication.libraryType == BaseCommon.HeNanLibrary) {
startActivity(new Intent(LoginActivity.this, com.dayu.henanlibrary.activity.HomeActivity.class));
- } else if (MyApplication.myApplication.libraryType == 1) {
- startActivity(new Intent(LoginActivity.this, com.dayu.qihealonelibrary.activity.HomeActivity.class));
+ } else if (MyApplication.myApplication.libraryType == BaseCommon.QHAloneLibrary) {
+ startActivity(new Intent(LoginActivity.this, HomeActivity.class));
}
LoginActivity.this.finish();
} else {
--
Gitblit v1.8.0