From d1573513f0eada6a915c2163ce6c84451c8c1070 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期四, 13 六月 2024 15:06:05 +0800
Subject: [PATCH] 1.修复河南版本域名卡结构不同问题 2.修复齐河版本最终购水日期的bug

---
 henanlibrary/src/main/java/com/dayu/henanlibrary/activity/PassWordActivity.java |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/PassWordActivity.java b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/PassWordActivity.java
index 700717b..2fb1d5b 100644
--- a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/PassWordActivity.java
+++ b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/PassWordActivity.java
@@ -4,10 +4,10 @@
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 
+import com.dayu.baselibrary.dbbean.PassWordBean;
 import com.dayu.baselibrary.utils.TipUtil;
 import com.dayu.baselibrary.utils.WSMD5;
 import com.dayu.henanlibrary.databinding.ActivityPswHnBinding;
-import com.dayu.henanlibrary.dbBean.PassWordBean;
 
 /**
  * Copyright (C), 2023,
@@ -28,19 +28,19 @@
         setContentView(pswBinding.getRoot());
         pswBinding.waterOk.setOnClickListener(v -> {
             try {
-                passWordBean = baseDao.loginPsDao().findFirst();
+                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)) {
+                            && (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())) {
                             String passWord = WSMD5.getMD5Str(pswBinding.pswNewAgin.getText().toString());
                             passWordBean.setPassWord(passWord);
-                            baseDao.loginPsDao().insert(passWordBean);
+                            baseBaseDao.loginPsDao().insert(passWordBean);
                             TipUtil.show(PassWordActivity.this, "瀵嗙爜淇敼瀹屾垚", () -> {
                                 PassWordActivity.this.finish();
                             });

--
Gitblit v1.8.0