From a44c47bc7f37245612635866adaddf5c98d41747 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期五, 16 八月 2024 11:03:49 +0800
Subject: [PATCH] 添加补打逻辑 联调修复bug
---
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/HomeActivity.java | 30 ++++++++++++++++--------------
1 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/HomeActivity.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/HomeActivity.java
index fa7d852..bafb396 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/HomeActivity.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/HomeActivity.java
@@ -8,9 +8,9 @@
import android.widget.Toast;
import com.dayu.baselibrary.utils.TipUtil;
-import com.dayu.qihealonelibrary.databinding.ActivityHomeBinding;
+import com.dayu.baselibrary.view.PassWordDialog;
+import com.dayu.qihealonelibrary.databinding.ActivityHomeQhaBinding;
import com.dayu.qihealonelibrary.dbBean.AdminDataBean;
-
/**
@@ -19,23 +19,20 @@
* Date: 2023-11-6 19:52
* Description: 涓荤晫闈�
*/
-public class HomeActivity extends QHAloneBaseActivity {
+public class HomeActivity extends BaseActivity {
public static HomeActivity homeActivity;
- ActivityHomeBinding homeBinding;
+ ActivityHomeQhaBinding homeBinding;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
homeActivity = this;
- homeBinding = ActivityHomeBinding.inflate(LayoutInflater.from(this));
+ homeBinding = ActivityHomeQhaBinding.inflate(LayoutInflater.from(this));
setContentView(homeBinding.getRoot());
initView();
}
-
-
-
private void initView() {
@@ -46,7 +43,7 @@
if (adminData != null) {
startActivity(new Intent(HomeActivity.this, NewCardActivity.class));
} else {
- TipUtil.show("璇峰厛璁剧疆鍦板潃淇℃伅");
+ TipUtil.show(HomeActivity.this, "璇峰厛鍦ㄤ釜浜轰腑蹇冨唴璁剧疆鍖哄煙鍙�");
}
}
@@ -56,9 +53,13 @@
public void onClick(View v) {
AdminDataBean adminData = baseDao.adminDao().findFirst();
if (adminData != null) {
- startActivity(new Intent(HomeActivity.this, RechargeActivity.class));
+// if (adminData.getWaterPrice() != 0) {
+ startActivity(new Intent(HomeActivity.this, RechargeActivity.class));
+// } else {
+// TipUtil.show(HomeActivity.this, "璇峰厛鍦ㄤ釜浜轰腑蹇冨唴璁剧疆姘翠环");
+// }
} else {
- TipUtil.show("璇峰厛璁剧疆鍦板潃淇℃伅");
+ TipUtil.show("璇峰厛鍦ㄤ釜浜轰腑蹇冨唴璁剧疆鍖哄煙鍙�");
}
}
@@ -73,15 +74,16 @@
homeBinding.homeAdmin.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- startActivity(new Intent(HomeActivity.this, SysActivity.class));
+ PassWordDialog passWordDialog = new PassWordDialog(HomeActivity.this, new Intent(HomeActivity.this, SysActivity.class));
+ passWordDialog.show();
}
});
//鍙傛暟璁剧疆
homeBinding.homeParameter.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- startActivity(new Intent(HomeActivity.this, ParameterActivity.class));
-
+ PassWordDialog passWordDialog = new PassWordDialog(HomeActivity.this, new Intent(HomeActivity.this, ParameterActivity.class));
+ passWordDialog.show();
}
});
homeBinding.homeMy.setOnClickListener(new View.OnClickListener() {
--
Gitblit v1.8.0