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/activity/MainActivity.java | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 56 insertions(+), 3 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 4d3180b..767a6b9 100644
--- a/app/src/main/java/com/dayu/pipirrapp/activity/MainActivity.java
+++ b/app/src/main/java/com/dayu/pipirrapp/activity/MainActivity.java
@@ -8,14 +8,23 @@
import androidx.appcompat.app.AppCompatActivity;
import androidx.core.content.ContextCompat;
import androidx.fragment.app.Fragment;
+import androidx.lifecycle.Observer;
+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.OrderFragment;
import com.dayu.pipirrapp.fragment.MapFragment;
import com.dayu.pipirrapp.fragment.MyFragment;
+import com.dayu.pipirrapp.fragment.OrderFragment;
import com.dayu.pipirrapp.net.MqttManager;
+import com.dayu.pipirrapp.tool.InspectionUtils;
+import com.dayu.pipirrapp.utils.CommonKeyName;
+import com.dayu.pipirrapp.utils.MyLog;
+import com.dayu.pipirrapp.utils.NetUtils;
+import com.jeremyliao.liveeventbus.LiveEventBus;
import java.util.ArrayList;
import java.util.List;
@@ -42,8 +51,36 @@
setupFragments();
initView();
initTab();
- mqttManager = new MqttManager(this);
+
+ try {
+ TagBean tagBean = DaoSingleton.getInstance(this).tagDao().findFirst();
+ MyApplication.myApplication.myTag = tagBean.getTag();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ mqttManager = new MqttManager(this, this);
mqttManager.connect();
+ LiveEventBus.get(CommonKeyName.NetworkCallback).observeForever(new Observer<Object>() {
+ @Override
+ public void onChanged(Object o) {
+ switch ((int) o) {
+ case NetUtils.Available:
+ MyLog.i("MqttManager>>>Lost");
+ InspectionUtils.aginPutInspectionData(MainActivity.this);
+ break;
+ case NetUtils.Lost:
+
+ break;
+ }
+ }
+ });
+ registNetCallBack();
+ }
+
+ @Override
+ protected void onStart() {
+ super.onStart();
+
}
private void setupFragments() {
@@ -84,7 +121,12 @@
protected void onDestroy() {
super.onDestroy();
//鍏抽棴MQ
- mqttManager.disconnect();
+ try {
+ mqttManager.disconnect();
+ unregisterNetworkCallback();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
/**
@@ -139,4 +181,15 @@
binding.myImg.setImageDrawable(ContextCompat.getDrawable(this, R.drawable.bottom_my_black));
binding.myText.setTextColor(ContextCompat.getColor(this, R.color.black));
}
+
+ // 娉ㄥ唽缃戠粶鐩戞帶
+ private void registNetCallBack() {
+ NetUtils.registerNetCallBack(this);
+ }
+
+ private void unregisterNetworkCallback() {
+ NetUtils.unregisterReceiver(this);
+ }
+
+
}
--
Gitblit v1.8.0