From 844597b5813ff8589de503cd7d7b1bbd0586d287 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期一, 13 五月 2024 19:38:03 +0800
Subject: [PATCH] 1.添加水量单价 2.修复发现的bug
---
app/src/main/java/com/dayu/recharge/activity/LoginActivity.java | 58 +++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 39 insertions(+), 19 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 a785b32..b79405b 100644
--- a/app/src/main/java/com/dayu/recharge/activity/LoginActivity.java
+++ b/app/src/main/java/com/dayu/recharge/activity/LoginActivity.java
@@ -41,6 +41,7 @@
ActivityLoginBinding binding;
PassWordBean passWordBean;
+ int clickNumber;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -52,34 +53,27 @@
}
private void initView() {
+ binding.title.setOnClickListener(v -> {
+ clickNumber++;
+ if (clickNumber == 20) {
+ choesLibrary();
+ }
+
+ });
binding.loginBtn.setOnClickListener(v -> {
String psStr = binding.loginPw.getText().toString();
- if (MyApplication.myApplication.libraryType == BaseCommon.NoLibrary) {
- //閫夋嫨鐗堟湰
- LibraryDialog dialog = new LibraryDialog(this, type -> {
- if (type == BaseCommon.HeNanLibrary) {
- getHNPermission();
- } else if (type == BaseCommon.QHAloneLibrary) {
- getQHAlonePermission();
- }
- MyApplication.myApplication.initApplication();
- });
- dialog.show();
- //娌℃湁閫夋嫨鐗堟湰鍏堥�夋嫨鐗堟湰
- return;
- }
if (TextUtils.isEmpty(psStr)) {
TipUtil.show("璇疯緭鍏ュ瘑鐮�");
return;
}
if ((passWordBean == null && psStr.equals("123456"))
|| passWordBean != null && passWordBean.getPassWord().equalsIgnoreCase(WSMD5.getMD5Str(psStr))) {
- if (MyApplication.myApplication.libraryType == BaseCommon.HeNanLibrary) {
- startActivity(new Intent(LoginActivity.this, com.dayu.henanlibrary.activity.HomeActivity.class));
- } else if (MyApplication.myApplication.libraryType == BaseCommon.QHAloneLibrary) {
- startActivity(new Intent(LoginActivity.this, HomeActivity.class));
+ if (MyApplication.myApplication.libraryType == BaseCommon.NoLibrary) {
+ choesLibrary();
+ //娌℃湁閫夋嫨鐗堟湰鍏堥�夋嫨鐗堟湰
+ } else {
+ startToHomeActivity();
}
- LoginActivity.this.finish();
} else {
Toast.makeText(LoginActivity.this, "瀵嗙爜閿欒", Toast.LENGTH_SHORT).show();
}
@@ -93,6 +87,32 @@
}
/**
+ * 閫夋嫨鐗堟湰
+ */
+ private void choesLibrary() {
+
+ LibraryDialog dialog = new LibraryDialog(this, type -> {
+ if (type == BaseCommon.HeNanLibrary) {
+ getHNPermission();
+ } else if (type == BaseCommon.QHAloneLibrary) {
+ getQHAlonePermission();
+ }
+ MyApplication.myApplication.initApplication();
+ startToHomeActivity();
+ });
+ dialog.show();
+ }
+
+ private void startToHomeActivity() {
+ if (MyApplication.myApplication.libraryType == BaseCommon.HeNanLibrary) {
+ startActivity(new Intent(LoginActivity.this, com.dayu.henanlibrary.activity.HomeActivity.class));
+ } else if (MyApplication.myApplication.libraryType == BaseCommon.QHAloneLibrary) {
+ startActivity(new Intent(LoginActivity.this, HomeActivity.class));
+ }
+ LoginActivity.this.finish();
+ }
+
+ /**
* 娌冲崡鐗堢殑鑾峰彇鏉冮檺
*/
private void getHNPermission() {
--
Gitblit v1.8.0