From 59237ecbcb9828b1dc762da07f83fa598bd9d6b2 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期二, 03 六月 2025 18:07:01 +0800
Subject: [PATCH] fix(NewCard2Activity): 优化读卡逻辑
---
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/PassWordActivityQHAlone.java | 56 ++++++++++++++++++++++++++------------------------------
1 files changed, 26 insertions(+), 30 deletions(-)
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/PassWordActivityQHAlone.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/PassWordActivityQHAlone.java
index 22f3222..a604d28 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/PassWordActivityQHAlone.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/PassWordActivityQHAlone.java
@@ -3,12 +3,11 @@
import android.os.Bundle;
import android.text.TextUtils;
import android.view.LayoutInflater;
-import android.view.View;
+import com.dayu.baselibrary.dbbean.PassWordBean;
import com.dayu.baselibrary.utils.TipUtil;
import com.dayu.baselibrary.utils.WSMD5;
import com.dayu.qihealonelibrary.databinding.ActivityPswQhaBinding;
-import com.dayu.qihealonelibrary.dbBean.PassWordBean;
/**
@@ -17,7 +16,7 @@
* Date: 2023-11-10 19:52
* Description: 淇敼瀵嗙爜鐣岄潰
*/
-public class PassWordActivityQHAlone extends BaseActivityQHAlone {
+public class PassWordActivityQHAlone extends QHAloneBaseActivity {
ActivityPswQhaBinding pswBinding;
@@ -28,40 +27,37 @@
super.onCreate(savedInstanceState);
pswBinding = ActivityPswQhaBinding.inflate(LayoutInflater.from(this));
setContentView(pswBinding.getRoot());
- pswBinding.waterOk.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- try {
- passWordBean = baseDao.loginPsDao().findFirst();
+ pswBinding.waterOk.setOnClickListener(v -> {
+ try {
+ passWordBean = baseBaseDao.loginPsDao().findFirst();
- if (!TextUtils.isEmpty(pswBinding.pswNew.getText().toString()) && !TextUtils.isEmpty(pswBinding.pswOld.getText().toString()) && !TextUtils.isEmpty(pswBinding.pswNewAgin.getText().toString())) {
- if ((passWordBean != null
- && (passWordBean.getPassWord().equalsIgnoreCase(WSMD5.getMD5Str(pswBinding.pswOld.getText().toString())))
- || (WSMD5.getMD5Str(pswBinding.pswOld.getText().toString()).equals("8af357996269a1b52b182a839150097d"))&& passWordBean == null)) {
- if (passWordBean == null) {
- passWordBean = new PassWordBean();
- }
- if (pswBinding.pswNew.getText().toString().equals(pswBinding.pswNewAgin.getText().toString())) {
- passWordBean.setPassWord(pswBinding.pswNewAgin.getText().toString());
- baseDao.loginPsDao().insert(passWordBean);
- TipUtil.show(PassWordActivityQHAlone.this, "瀵嗙爜淇敼瀹屾垚", () -> {
- PassWordActivityQHAlone.this.finish();
- });
+ if (!TextUtils.isEmpty(pswBinding.pswNew.getText().toString()) && !TextUtils.isEmpty(pswBinding.pswOld.getText().toString()) && !TextUtils.isEmpty(pswBinding.pswNewAgin.getText().toString())) {
+ if ((passWordBean != null
+ && (passWordBean.getPassWord().equalsIgnoreCase(WSMD5.getMD5Str(pswBinding.pswOld.getText().toString()))))
+ || (WSMD5.getMD5Str(pswBinding.pswOld.getText().toString()).equals("e10adc3949ba59abbe56e057f20f883e") && passWordBean == null)) {
+ if (passWordBean == null) {
+ passWordBean = new PassWordBean();
+ }
+ if (pswBinding.pswNew.getText().toString().equals(pswBinding.pswNewAgin.getText().toString())) {
+ passWordBean.setPassWord(pswBinding.pswNewAgin.getText().toString());
+ baseBaseDao.loginPsDao().insert(passWordBean);
+ TipUtil.show(PassWordActivityQHAlone.this, "瀵嗙爜淇敼瀹屾垚", () -> {
+ PassWordActivityQHAlone.this.finish();
+ });
- } else {
- TipUtil.show(PassWordActivityQHAlone.this, "涓ゆ杈撳叆鐨勫瘑鐮佷笉涓�鑷�");
- }
} else {
- TipUtil.show(PassWordActivityQHAlone.this, "鏃у瘑鐮佽緭鍏ラ敊璇�");
+ TipUtil.show(PassWordActivityQHAlone.this, "涓ゆ杈撳叆鐨勫瘑鐮佷笉涓�鑷�");
}
} else {
- TipUtil.show(PassWordActivityQHAlone.this, "璇疯緭瀹屽唴瀹�");
+ TipUtil.show(PassWordActivityQHAlone.this, "鏃у瘑鐮佽緭鍏ラ敊璇�");
}
-
-
- } catch (Exception e) {
- e.printStackTrace();
+ } else {
+ TipUtil.show(PassWordActivityQHAlone.this, "璇疯緭瀹屽唴瀹�");
}
+
+
+ } catch (Exception e) {
+ e.printStackTrace();
}
});
}
--
Gitblit v1.8.0