From 4f7f99c6ea914bcd38de78bd8371be566026b905 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期三, 26 二月 2025 15:54:14 +0800
Subject: [PATCH] -为按钮和列表项添加波纹效果，以获得更好的视觉反馈 -改进MapFragment中的底部布局动画 -在MapFragment中添加设备状态和RTU地址显示 -更新BaseListResult以支持泛型类型 -为设备数据添加IntakeListResult和IntakeResult -通过数据库支持增强标记位置更新功能 -添加电话拨号意图以分隔标记详细信息 -通过过期检查改进磁贴缓存 -添加问题报告的确认对话框 -更新登录活动以限制用户名长度 -为波纹效果和UI元素添加新颜色 -重构XML布局以使用新的波纹图 -改进MapFragment中的错误处理和用户反馈
---
app/src/main/java/com/dayu/pipirrapp/fragment/MyFragment.java | 68 ++++++++++++++++++++++++++--------
1 files changed, 52 insertions(+), 16 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 02e248e..418de9f 100644
--- a/app/src/main/java/com/dayu/pipirrapp/fragment/MyFragment.java
+++ b/app/src/main/java/com/dayu/pipirrapp/fragment/MyFragment.java
@@ -12,14 +12,20 @@
import androidx.annotation.Nullable;
import com.dayu.pipirrapp.activity.ChangePSActivity;
+import com.dayu.pipirrapp.activity.InspectListActivity;
+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.TitleBar;
+import com.dayu.pipirrapp.view.TipUtil;
+import com.jeremyliao.liveeventbus.LiveEventBus;
/**
* author: zuo
@@ -40,24 +46,30 @@
}
private void initView() {
- binding.changePS.setOnClickListener(v -> {
+ binding.changePSRL.setOnClickListener(v -> {
Intent intent = new Intent(MyFragment.this.getContext(), ChangePSActivity.class);
MyFragment.this.getActivity().startActivity(intent);
});
//閫�鍑虹櫥褰�
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();
@@ -67,9 +79,10 @@
}
// 娓呴櫎缂撳瓨
binding.cleanDataRL.setOnClickListener(v -> {
- ConfirmDialog confirmDialog = new ConfirmDialog(MyFragment.this.getActivity(), "纭畾娓呴櫎缂撳瓨鍚楋紵", v1 -> {
+ ConfirmDialog confirmDialog = new ConfirmDialog(MyFragment.this.getActivity(), "纭畾娓呴櫎缂撳瓨鍚楋紵", (dialog, v1) -> {
try {
- CleanDataUtils.cleanMapData(MyFragment.this.getContext());
+ dialog.dismiss();
+ CleanDataUtils.cleanData(MyFragment.this.getContext());
ToastUtil.showToast(MyFragment.this.getActivity(), "娓呴櫎鎴愬姛");
} catch (Exception e) {
e.printStackTrace();
@@ -77,6 +90,29 @@
});
confirmDialog.show();
+ });
+
+ binding.issueListRL.setOnClickListener(v -> {
+ Intent intent = new Intent(MyFragment.this.getContext(), IssueListActivity.class);
+ MyFragment.this.getActivity().startActivity(intent);
+ });
+ binding.refreshDataRL.setOnClickListener(v -> {
+ ConfirmDialog confirmDialog = new ConfirmDialog(MyFragment.this.getActivity(), "纭畾鏇存柊鏈湴鏁版嵁鍚楋紵", (confirmDialog1, v12) -> {
+ try {
+ LiveEventBus.get(CommonKeyName.refreshData).post(true);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ });
+ confirmDialog.show();
+ // 鍙戦�佸埛鏂颁簨浠堕�氱煡MapFragment鍒锋柊鏁版嵁
+
+ });
+ binding.inspectListRL.setOnClickListener(v -> {
+ Intent intent = new Intent(MyFragment.this.getContext(), InspectListActivity.class);
+ MyFragment.this.getActivity().startActivity(intent);
+ });
+ binding.versionRL.setOnClickListener(v -> {
});
}
@@ -98,6 +134,6 @@
@Override
public void onStart() {
super.onStart();
- new TitleBar(MyFragment.this.getActivity()).setTitleText("鎴戠殑");
+
}
}
--
Gitblit v1.8.0