From d08a5a6d062f1568aaeb14d2d72357826291ef97 Mon Sep 17 00:00:00 2001 From: zuoxiao <470321431@qq.com> Date: 星期六, 13 七月 2024 18:14:28 +0800 Subject: [PATCH] 添加齐河管理卡相关逻辑 修复bug --- qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/HomeActivity.java | 36 +++++++++++++++++++----------------- 1 files changed, 19 insertions(+), 17 deletions(-) diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/HomeActivityQHAlone.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/HomeActivity.java similarity index 67% rename from qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/HomeActivityQHAlone.java rename to qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/HomeActivity.java index 745efc4..bafb396 100644 --- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/HomeActivityQHAlone.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.baselibrary.view.PassWordDialog; import com.dayu.qihealonelibrary.databinding.ActivityHomeQhaBinding; import com.dayu.qihealonelibrary.dbBean.AdminDataBean; - /** @@ -19,9 +19,9 @@ * Date: 2023-11-6 19:52 * Description: 涓荤晫闈� */ -public class HomeActivityQHAlone extends BaseActivityQHAlone { +public class HomeActivity extends BaseActivity { - public static HomeActivityQHAlone homeActivity; + public static HomeActivity homeActivity; ActivityHomeQhaBinding homeBinding; @Override @@ -35,18 +35,15 @@ } - - - private void initView() { homeBinding.homeNewCard.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { AdminDataBean adminData = baseDao.adminDao().findFirst(); if (adminData != null) { - startActivity(new Intent(HomeActivityQHAlone.this, NewCardActivityQHAlone.class)); + 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(HomeActivityQHAlone.this, RechargeActivityQHAlone.class)); +// if (adminData.getWaterPrice() != 0) { + startActivity(new Intent(HomeActivity.this, RechargeActivity.class)); +// } else { +// TipUtil.show(HomeActivity.this, "璇峰厛鍦ㄤ釜浜轰腑蹇冨唴璁剧疆姘翠环"); +// } } else { - TipUtil.show("璇峰厛璁剧疆鍦板潃淇℃伅"); + TipUtil.show("璇峰厛鍦ㄤ釜浜轰腑蹇冨唴璁剧疆鍖哄煙鍙�"); } } @@ -66,28 +67,29 @@ homeBinding.homeRedCard.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - startActivity(new Intent(HomeActivityQHAlone.this, ReadCardAcitivy.class)); + startActivity(new Intent(HomeActivity.this, ReadCardAcitivy.class)); } }); //绠$悊绯荤粺鐣岄潰 homeBinding.homeAdmin.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - startActivity(new Intent(HomeActivityQHAlone.this, SysActivityQHAlone.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(HomeActivityQHAlone.this, ParameterActivityQHAlone.class)); - + PassWordDialog passWordDialog = new PassWordDialog(HomeActivity.this, new Intent(HomeActivity.this, ParameterActivity.class)); + passWordDialog.show(); } }); homeBinding.homeMy.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - startActivity(new Intent(HomeActivityQHAlone.this, MyActivityQHAlone.class)); + startActivity(new Intent(HomeActivity.this, MyActivity.class)); } }); @@ -107,10 +109,10 @@ public boolean onKeyDown(int keyCode, KeyEvent event) { if (keyCode == KeyEvent.KEYCODE_BACK) { if ((System.currentTimeMillis() - mExitTime) > 2000) { - Toast.makeText(HomeActivityQHAlone.this, "鍐嶆寜涓�娆¢��鍑虹▼搴�", Toast.LENGTH_SHORT).show(); + Toast.makeText(HomeActivity.this, "鍐嶆寜涓�娆¢��鍑虹▼搴�", Toast.LENGTH_SHORT).show(); mExitTime = System.currentTimeMillis(); } else { - HomeActivityQHAlone.this.finish(); + HomeActivity.this.finish(); } return true; } -- Gitblit v1.8.0