From 7a1caa42ad3282ff22513785fa997953e084b188 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期一, 16 十二月 2024 15:50:31 +0800
Subject: [PATCH] 1.修改app的Icon。 2.优化取水口加载本地数据,改为异步加载。 3.添加取水口点击后显示取水口信息。 4.美化登录界面。
---
app/src/main/java/com/dayu/pipirrapp/fragment/MyFragment.java | 41 +++++++++++++++++++++++++++++------------
1 files changed, 29 insertions(+), 12 deletions(-)
diff --git a/app/src/main/java/com/dayu/pipirrapp/fragment/MyFragment.java b/app/src/main/java/com/dayu/pipirrapp/fragment/MyFragment.java
index c2526b3..28aa351 100644
--- a/app/src/main/java/com/dayu/pipirrapp/fragment/MyFragment.java
+++ b/app/src/main/java/com/dayu/pipirrapp/fragment/MyFragment.java
@@ -12,13 +12,18 @@
import androidx.annotation.Nullable;
import com.dayu.pipirrapp.activity.ChangePSActivity;
+import com.dayu.pipirrapp.activity.IssueListActivity;
import com.dayu.pipirrapp.activity.LoginActivity;
import com.dayu.pipirrapp.bean.db.LoginBean;
import com.dayu.pipirrapp.dao.DaoSingleton;
import com.dayu.pipirrapp.databinding.FragmentMyBinding;
+import com.dayu.pipirrapp.tool.InspectionUtils;
import com.dayu.pipirrapp.utils.CleanDataUtils;
+import com.dayu.pipirrapp.utils.CommonKeyName;
+import com.dayu.pipirrapp.utils.SharedPreferencesHelper;
import com.dayu.pipirrapp.utils.ToastUtil;
import com.dayu.pipirrapp.view.ConfirmDialog;
+import com.dayu.pipirrapp.view.TipUtil;
/**
* author: zuo
@@ -45,18 +50,24 @@
});
//閫�鍑虹櫥褰�
binding.loginOutRL.setOnClickListener((v) -> {
+ int inspectionState = SharedPreferencesHelper.getInstance(this.getContext()).get(CommonKeyName.inspectionState, 0);
+ if (inspectionState == InspectionUtils.NO_INSPECTION) {
+ ConfirmDialog confirmDialog = new ConfirmDialog(MyFragment.this.getActivity(), "纭畾閫�鍑哄悧锛�", (confirmDialog1, v12) -> {
+ try {
+ confirmDialog1.dismiss();
+ CleanDataUtils.cleanUserData(MyFragment.this.getContext());
+ Intent intent = new Intent(MyFragment.this.getContext(), LoginActivity.class);
+ MyFragment.this.getActivity().startActivity(intent);
+ MyFragment.this.getActivity().finish();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ });
+ confirmDialog.show();
+ } else {
+ TipUtil.show(MyFragment.this.getActivity(), "鎮ㄨ繕鏈粨鏉熷贰妫�锛岃缁撴潫宸℃鍚庨��鍑猴紒");
+ }
- ConfirmDialog confirmDialog = new ConfirmDialog(MyFragment.this.getActivity(), "纭畾閫�鍑哄悧锛�", v1 -> {
- try {
- CleanDataUtils.cleanUserData(MyFragment.this.getContext());
- Intent intent = new Intent(MyFragment.this.getContext(), LoginActivity.class);
- MyFragment.this.getActivity().startActivity(intent);
- MyFragment.this.getActivity().finish();
- } catch (Exception e) {
- e.printStackTrace();
- }
- });
- confirmDialog.show();
});
LoginBean loginBean = DaoSingleton.getInstance(MyFragment.this.getContext()).loginDao().findFirst();
@@ -66,8 +77,9 @@
}
// 娓呴櫎缂撳瓨
binding.cleanDataRL.setOnClickListener(v -> {
- ConfirmDialog confirmDialog = new ConfirmDialog(MyFragment.this.getActivity(), "纭畾娓呴櫎缂撳瓨鍚楋紵", v1 -> {
+ ConfirmDialog confirmDialog = new ConfirmDialog(MyFragment.this.getActivity(), "纭畾娓呴櫎缂撳瓨鍚楋紵", (dialog, v1) -> {
try {
+ dialog.dismiss();
CleanDataUtils.cleanMapData(MyFragment.this.getContext());
ToastUtil.showToast(MyFragment.this.getActivity(), "娓呴櫎鎴愬姛");
} catch (Exception e) {
@@ -77,6 +89,11 @@
confirmDialog.show();
});
+
+ binding.issueListRL.setOnClickListener(v -> {
+ Intent intent = new Intent(MyFragment.this.getContext(), IssueListActivity.class);
+ MyFragment.this.getActivity().startActivity(intent);
+ });
}
private void initData() {
--
Gitblit v1.8.0