From 71ac5ea208fb15da401b980fe788d03ed0f086b1 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期三, 04 十二月 2024 09:56:14 +0800
Subject: [PATCH] 1.添加退出登录时判断是否开启巡检，开启巡检不可退出登录。 2.添加异常退出后恢复巡检记录的功能。 3.添加统一的提示Dialog
---
app/src/main/java/com/dayu/pipirrapp/activity/MainActivity.java | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/app/src/main/java/com/dayu/pipirrapp/activity/MainActivity.java b/app/src/main/java/com/dayu/pipirrapp/activity/MainActivity.java
index e06568d..2976fb0 100644
--- a/app/src/main/java/com/dayu/pipirrapp/activity/MainActivity.java
+++ b/app/src/main/java/com/dayu/pipirrapp/activity/MainActivity.java
@@ -9,12 +9,16 @@
import androidx.core.content.ContextCompat;
import androidx.fragment.app.Fragment;
+import com.dayu.pipirrapp.MyApplication;
import com.dayu.pipirrapp.R;
import com.dayu.pipirrapp.adapter.TabAdapter;
+import com.dayu.pipirrapp.bean.db.TagBean;
+import com.dayu.pipirrapp.dao.DaoSingleton;
import com.dayu.pipirrapp.databinding.ActivityMainBinding;
-import com.dayu.pipirrapp.fragment.MainFragment;
+import com.dayu.pipirrapp.fragment.OrderFragment;
import com.dayu.pipirrapp.fragment.MapFragment;
import com.dayu.pipirrapp.fragment.MyFragment;
+import com.dayu.pipirrapp.net.MqttManager;
import java.util.ArrayList;
import java.util.List;
@@ -26,6 +30,7 @@
private ActivityMainBinding binding;
private List<Fragment> fragments = new ArrayList<>();
private long mExitTime;
+ MqttManager mqttManager;
private enum Tab {
ORDER, MAP, MY
@@ -40,10 +45,15 @@
setupFragments();
initView();
initTab();
+
+ TagBean tagBean = DaoSingleton.getInstance(this).tagDao().findFirst();
+ MyApplication.myApplication.myTag = tagBean.getTag();
+ mqttManager = new MqttManager(this);
+ mqttManager.connect();
}
private void setupFragments() {
- fragments.add(new MainFragment());
+ fragments.add(new OrderFragment());
fragments.add(new MapFragment());
fragments.add(new MyFragment());
}
@@ -76,6 +86,13 @@
return super.onKeyDown(keyCode, event);
}
+ @Override
+ protected void onDestroy() {
+ super.onDestroy();
+ //鍏抽棴MQ
+ mqttManager.disconnect();
+ }
+
/**
* 淇敼搴曢儴鐘舵��
*/
--
Gitblit v1.8.0