From da8f72d2db0bbfc221a881d5aa31065cd5717043 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期二, 19 十二月 2023 14:56:01 +0800
Subject: [PATCH] 修改密码登录相关
---
app/src/main/java/com/dayu/recharge/activity/LoginActivity.java | 10 +++++++++-
app/src/main/java/com/dayu/recharge/activity/PassWordActivity.java | 6 ++++--
2 files changed, 13 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 91b0873..664b632 100644
--- a/app/src/main/java/com/dayu/recharge/activity/LoginActivity.java
+++ b/app/src/main/java/com/dayu/recharge/activity/LoginActivity.java
@@ -3,6 +3,7 @@
import android.Manifest;
import android.content.Intent;
import android.os.Bundle;
+import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.Toast;
@@ -13,6 +14,7 @@
import com.dayu.recharge.dao.BaseDaoSingleton;
import com.dayu.recharge.databinding.ActivityLoginBinding;
import com.dayu.recharge.dbBean.PassWordBean;
+import com.dayu.recharge.utils.TipUtil;
import com.dayu.recharge.utils.WSMD5;
import com.permissionx.guolindev.PermissionX;
@@ -43,7 +45,13 @@
binding.loginBtn.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- if ((passWordBean != null && (passWordBean.getPassWord().equals(binding.loginPw.getText().toString()) || WSMD5.getMD5Str(binding.loginPw.getText().toString()).equals("8af357996269a1b52b182a839150097d"))) || (passWordBean == null && binding.loginPw.getText().toString().equals("123456")) || WSMD5.getMD5Str(binding.loginPw.getText().toString()).equalsIgnoreCase("00A93D54CF982B18A05ADB4520D58FC8")) {
+ String psStr = binding.loginPw.getText().toString();
+ if (TextUtils.isEmpty(psStr)) {
+ TipUtil.show("璇疯緭鍏ュ瘑鐮�");
+ return;
+ }
+ if ((passWordBean == null && psStr.equals("123456"))
+ || passWordBean != null && passWordBean.getPassWord().equals(psStr)) {
startActivity(new Intent(LoginActivity.this, HomeActivity.class));
LoginActivity.this.finish();
} else {
diff --git a/app/src/main/java/com/dayu/recharge/activity/PassWordActivity.java b/app/src/main/java/com/dayu/recharge/activity/PassWordActivity.java
index e89fc9e..b2936f4 100644
--- a/app/src/main/java/com/dayu/recharge/activity/PassWordActivity.java
+++ b/app/src/main/java/com/dayu/recharge/activity/PassWordActivity.java
@@ -44,8 +44,10 @@
if (pswBinding.pswNew.getText().toString().equals(pswBinding.pswNewAgin.getText().toString())) {
passWordBean.setPassWord(pswBinding.pswNewAgin.getText().toString());
baseDao.loginPsDao().insert(passWordBean);
- TipUtil.show(PassWordActivity.this, "瀵嗙爜淇敼瀹屾垚");
- PassWordActivity.this.finish();
+ TipUtil.show(PassWordActivity.this, "瀵嗙爜淇敼瀹屾垚", () -> {
+ PassWordActivity.this.finish();
+ });
+
} else {
TipUtil.show(PassWordActivity.this, "涓ゆ杈撳叆鐨勫瘑鐮佷笉涓�鑷�");
}
--
Gitblit v1.8.0