From 22ec43b446a3a46b7947171b18f8f79aa58b8bdc Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期四, 28 三月 2024 15:37:22 +0800
Subject: [PATCH] 登录界面添加版本信息

---
 app/src/main/java/com/dayu/recharge/activity/PassWordActivity.java |   25 +++++++++++++++++--------
 1 files changed, 17 insertions(+), 8 deletions(-)

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 133dda6..c24d836 100644
--- a/app/src/main/java/com/dayu/recharge/activity/PassWordActivity.java
+++ b/app/src/main/java/com/dayu/recharge/activity/PassWordActivity.java
@@ -7,9 +7,15 @@
 
 import com.dayu.recharge.databinding.ActivityPswBinding;
 import com.dayu.recharge.dbBean.PassWordBean;
-import com.dayu.recharge.utils.ToastUtil;
+import com.dayu.recharge.utils.TipUtil;
 import com.dayu.recharge.utils.WSMD5;
 
+/**
+ * Copyright (C), 2023,
+ * Author: zuo
+ * Date: 2023-11-10 19:52
+ * Description: 淇敼瀵嗙爜鐣岄潰
+ */
 public class PassWordActivity extends BaseActivity {
 
     ActivityPswBinding pswBinding;
@@ -29,25 +35,28 @@
 
                     if (!TextUtils.isEmpty(pswBinding.pswNew.getText().toString()) && !TextUtils.isEmpty(pswBinding.pswOld.getText().toString()) && !TextUtils.isEmpty(pswBinding.pswNewAgin.getText().toString())) {
                         if ((passWordBean != null
-                                && (passWordBean.getPassWord().equals(pswBinding.pswOld.getText().toString())
+                                && (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());
+                                String passWord = WSMD5.getMD5Str(pswBinding.pswNewAgin.getText().toString());
+                                passWordBean.setPassWord(passWord);
                                 baseDao.loginPsDao().insert(passWordBean);
-                                ToastUtil.show(PassWordActivity.this, "瀵嗙爜淇敼瀹屾垚");
-                                PassWordActivity.this.finish();
+                                TipUtil.show(PassWordActivity.this, "瀵嗙爜淇敼瀹屾垚", () -> {
+                                    PassWordActivity.this.finish();
+                                });
+
                             } else {
-                                ToastUtil.show(PassWordActivity.this, "涓ゆ杈撳叆鐨勫瘑鐮佷笉涓�鑷�");
+                                TipUtil.show(PassWordActivity.this, "涓ゆ杈撳叆鐨勫瘑鐮佷笉涓�鑷�");
                             }
                         } else {
-                            ToastUtil.show(PassWordActivity.this, "鏃у瘑鐮佽緭鍏ラ敊璇�");
+                            TipUtil.show(PassWordActivity.this, "鏃у瘑鐮佽緭鍏ラ敊璇�");
                         }
                     } else {
-                        ToastUtil.show(PassWordActivity.this, "璇疯緭瀹屽唴瀹�");
+                        TipUtil.show(PassWordActivity.this, "璇疯緭瀹屽唴瀹�");
                     }
 
 

--
Gitblit v1.8.0