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 | 58 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 29 insertions(+), 29 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 e394ea6..767a6b9 100644
--- a/app/src/main/java/com/dayu/pipirrapp/activity/MainActivity.java
+++ b/app/src/main/java/com/dayu/pipirrapp/activity/MainActivity.java
@@ -1,16 +1,14 @@
package com.dayu.pipirrapp.activity;
-import android.net.ConnectivityManager;
-import android.net.Network;
import android.os.Bundle;
import android.view.KeyEvent;
import android.view.LayoutInflater;
import android.widget.Toast;
-import androidx.annotation.NonNull;
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;
@@ -18,13 +16,15 @@
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;
@@ -47,7 +47,7 @@
super.onCreate(savedInstanceState);
binding = ActivityMainBinding.inflate(LayoutInflater.from(this));
setContentView(binding.getRoot());
- registNetCallBack();
+
setupFragments();
initView();
initTab();
@@ -58,8 +58,29 @@
} catch (Exception e) {
e.printStackTrace();
}
- mqttManager = new MqttManager(this);
+ 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() {
@@ -163,33 +184,12 @@
// 娉ㄥ唽缃戠粶鐩戞帶
private void registNetCallBack() {
- NetUtils.registerNetCallBack(this, networkCallback);
+ NetUtils.registerNetCallBack(this);
}
private void unregisterNetworkCallback() {
- NetUtils.unregisterReceiver(this, networkCallback);
+ NetUtils.unregisterReceiver(this);
}
-
- //缃戠粶鐩戞帶
- ConnectivityManager.NetworkCallback networkCallback = new ConnectivityManager.NetworkCallback() {
- @Override
- public void onAvailable(@NonNull Network network) {
- super.onAvailable(network);
- // 杩欓噷鍙互鎵ц缃戠粶鍙敤鍚庣殑閫昏緫锛屾瘮濡傝繘琛屾暟鎹姹傜瓑
- MyLog.d("onAvailable");
- InspectionUtils.aginPutInspectionData(MainActivity.this);
- }
-
- @Override
- public void onLost(@NonNull Network network) {
- super.onLost(network);
- // 杩欓噷鍙互鎵ц缃戠粶涓㈠け鍚庣殑閫昏緫锛屾瘮濡傚仠姝㈡暟鎹姹傜瓑
- MyLog.d("onLost");
- }
- };
-
-
-
}
--
Gitblit v1.8.0