1.修复两个工程因layout名字一样导致的bug

zuoxiao

2024-05-06 e79ced190337222c7475409363c8071c976c7de9

 qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/PassWordActivityQHAlone.java

File was renamed from qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/PassWordActivity.java
@@ -7,7 +7,7 @@

import com.dayu.baselibrary.utils.TipUtil;
import com.dayu.baselibrary.utils.WSMD5;
import com.dayu.qihealonelibrary.databinding.ActivityPswBinding;
import com.dayu.qihealonelibrary.databinding.ActivityPswQhaBinding;
import com.dayu.qihealonelibrary.dbBean.PassWordBean;


@@ -17,16 +17,16 @@
 * Date: 2023-11-10 19:52
 * Description: 修改密码界面
 */
public class PassWordActivity extends QHAloneBaseActivity {
public class PassWordActivityQHAlone extends BaseActivityQHAlone {

    ActivityPswBinding pswBinding;
    ActivityPswQhaBinding pswBinding;

    PassWordBean passWordBean;

    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
        pswBinding = ActivityPswBinding.inflate(LayoutInflater.from(this));
        pswBinding = ActivityPswQhaBinding.inflate(LayoutInflater.from(this));
        setContentView(pswBinding.getRoot());
        pswBinding.waterOk.setOnClickListener(new View.OnClickListener() {
            @Override
@@ -44,18 +44,18 @@
                            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(PassWordActivityQHAlone.this, "密码修改完成", () -> {
                                    PassWordActivityQHAlone.this.finish();
                                });

                            } else {
                                TipUtil.show(PassWordActivity.this, "两次输入的密码不一致");
                                TipUtil.show(PassWordActivityQHAlone.this, "两次输入的密码不一致");
                            }
                        } else {
                            TipUtil.show(PassWordActivity.this, "旧密码输入错误");
                            TipUtil.show(PassWordActivityQHAlone.this, "旧密码输入错误");
                        }
                    } else {
                        TipUtil.show(PassWordActivity.this, "请输完内容");
                        TipUtil.show(PassWordActivityQHAlone.this, "请输完内容");
                    }