From c1d325aeb5bfc710b1ef4d801619ffb65e0afe90 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期五, 24 十一月 2023 18:03:15 +0800
Subject: [PATCH] 修复当查无此卡状态时的bug
---
app/src/main/java/com/dayu/recharge/activity/HomeActivity.java | 79 ++++++++++++++++++++++++++++++++++++---
1 files changed, 73 insertions(+), 6 deletions(-)
diff --git a/app/src/main/java/com/dayu/recharge/activity/HomeActivity.java b/app/src/main/java/com/dayu/recharge/activity/HomeActivity.java
index 1a27f2c..62eae53 100644
--- a/app/src/main/java/com/dayu/recharge/activity/HomeActivity.java
+++ b/app/src/main/java/com/dayu/recharge/activity/HomeActivity.java
@@ -1,13 +1,20 @@
package com.dayu.recharge.activity;
+import android.Manifest;
import android.content.Intent;
import android.os.Bundle;
+import android.view.KeyEvent;
import android.view.LayoutInflater;
import android.view.View;
+import android.widget.Toast;
+import com.dayu.recharge.MyApplication;
+import com.dayu.recharge.R;
import com.dayu.recharge.databinding.ActivityHomeBinding;
import com.dayu.recharge.dbBean.AdminDataBean;
+import com.dayu.recharge.utils.TipUtil;
import com.dayu.recharge.utils.ToastUtil;
+import com.permissionx.guolindev.PermissionX;
/**
@@ -18,26 +25,56 @@
*/
public class HomeActivity extends BaseActivity {
-
+ public static HomeActivity homeActivity;
ActivityHomeBinding homeBinding;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+ homeActivity = this;
homeBinding = ActivityHomeBinding.inflate(LayoutInflater.from(this));
setContentView(homeBinding.getRoot());
initView();
+ getPermission();
+ rushState();
+ }
+
+ private void getPermission() {
+ PermissionX.init(HomeActivity.this).permissions(Manifest.permission.READ_PHONE_STATE)
+ .onExplainRequestReason((scope, deniedList) -> {
+
+// val message = "PermissionX闇�瑕佹偍鍚屾剰浠ヤ笅鏉冮檺鎵嶈兘姝ｅ父浣跨敤"
+ })
+ .request((allGranted, grantedList, deniedList) -> {
+ if (allGranted) {//鎵�鏈夌敵璇风殑鏉冮檺閮藉凡閫氳繃
+
+ } else {//鎮ㄦ嫆缁濅簡濡備笅鏉冮檺锛�$deniedList
+
+
+ }
+ });
+ }
+
+ public void rushState() {
+ if (MyApplication.myApplication.isConncet) {
+ homeBinding.socketState.setTextColor(getResources().getColor(R.color.title_bg));
+ homeBinding.socketState.setText("宸茶繛鎺ユ暟鎹腑蹇�");
+ } else {
+ homeBinding.socketState.setTextColor(getResources().getColor(R.color.red));
+ homeBinding.socketState.setText("姝ｅ湪杩炴帴鏁版嵁涓績");
+ }
+
}
private void initView() {
homeBinding.homeNewCard.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- AdminDataBean adminData= baseDao.adminDao().findFirst();
- if (adminData!=null){
+ AdminDataBean adminData = baseDao.adminDao().findFirst();
+ if (adminData != null) {
startActivity(new Intent(HomeActivity.this, NewCardActivity.class));
- }else {
- ToastUtil.show("璇峰厛璁剧疆绠＄悊鍛樹俊鎭�");
+ } else {
+ TipUtil.show("璇峰厛璁剧疆鍦板潃淇℃伅");
}
}
@@ -45,7 +82,13 @@
homeBinding.homeRecharge.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- startActivity(new Intent(HomeActivity.this, RechargeActivity.class));
+ AdminDataBean adminData = baseDao.adminDao().findFirst();
+ if (adminData != null) {
+ startActivity(new Intent(HomeActivity.this, RechargeActivity.class));
+ } else {
+ TipUtil.show("璇峰厛璁剧疆鍦板潃淇℃伅");
+ }
+
}
});
homeBinding.homeRedCard.setOnClickListener(new View.OnClickListener() {
@@ -76,4 +119,28 @@
}
});
}
+
+ @Override
+ protected void onDestroy() {
+ super.onDestroy();
+ homeActivity = null;
+ }
+
+
+ long mExitTime;
+
+ //鐐瑰嚮涓ゆ閫�鍑虹▼搴� 鏈夋椂闂撮棿闅� 闂撮殧鍐呯偣鍑诲垯閫�鍑虹▼搴� 鍚﹀垯 鍒欐彁绀�
+ @Override
+ public boolean onKeyDown(int keyCode, KeyEvent event) {
+ if (keyCode == KeyEvent.KEYCODE_BACK) {
+ if ((System.currentTimeMillis() - mExitTime) > 2000) {
+ Toast.makeText(HomeActivity.this, "鍐嶆寜涓�娆￠��鍑虹▼搴�", Toast.LENGTH_SHORT).show();
+ mExitTime = System.currentTimeMillis();
+ } else {
+ HomeActivity.this.finish();
+ }
+ return true;
+ }
+ return super.onKeyDown(keyCode, event);
+ }
}
--
Gitblit v1.8.0