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 | 74 +++++++++++++++++++++++++++++++++----
1 files changed, 66 insertions(+), 8 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 6806cc1..28aa351 100644
--- a/app/src/main/java/com/dayu/pipirrapp/fragment/MyFragment.java
+++ b/app/src/main/java/com/dayu/pipirrapp/fragment/MyFragment.java
@@ -1,6 +1,8 @@
package com.dayu.pipirrapp.fragment;
import android.content.Intent;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
@@ -10,11 +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.FragmentMapBinding;
import com.dayu.pipirrapp.databinding.FragmentMyBinding;
-import com.dayu.pipirrapp.view.TitleBar;
+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
@@ -35,18 +44,56 @@
}
private void initView() {
- binding.changePS.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- Intent intent = new Intent(MyFragment.this.getContext(), ChangePSActivity.class);
- MyFragment.this.getActivity().startActivity(intent);
+ binding.changePS.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(), "鎮ㄨ繕鏈粨鏉熷贰妫�锛岃缁撴潫宸℃鍚庨��鍑猴紒");
}
+
+
});
LoginBean loginBean = DaoSingleton.getInstance(MyFragment.this.getContext()).loginDao().findFirst();
if (loginBean != null) {
binding.name.setText(loginBean.getName());
binding.phone.setText(loginBean.getPhone());
}
+// 娓呴櫎缂撳瓨
+ binding.cleanDataRL.setOnClickListener(v -> {
+ 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) {
+ e.printStackTrace();
+ }
+ });
+ confirmDialog.show();
+
+ });
+
+ binding.issueListRL.setOnClickListener(v -> {
+ Intent intent = new Intent(MyFragment.this.getContext(), IssueListActivity.class);
+ MyFragment.this.getActivity().startActivity(intent);
+ });
}
private void initData() {
@@ -55,7 +102,18 @@
binding.name.setText(loginBean.getName());
binding.phone.setText(loginBean.getPhone());
}
-
+ //
+ try {
+ PackageInfo packageInfo = MyFragment.this.getActivity().getPackageManager().getPackageInfo(MyFragment.this.getActivity().getPackageName(), 0);
+ binding.versionText.setText(packageInfo.versionName);
+ } catch (PackageManager.NameNotFoundException e) {
+ throw new RuntimeException(e);
+ }
}
+ @Override
+ public void onStart() {
+ super.onStart();
+
+ }
}
--
Gitblit v1.8.0