From 798128053bb17ed293aa8d5424db3b5ed007d375 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期一, 23 十二月 2024 10:20:57 +0800
Subject: [PATCH] 1.优化订单列表框架，升级为viewPager2，提升性能。 2.添加收到新工单后的红点提醒。 3.修复查询数据为空时报错。 4.优化修改经纬度的流程。 5.修复mqtt的CLIENT_ID一致导致的连接错误。 6.修复收到新工单后点击消息通知栏跳转详情时不更新数据的bug。
---
app/src/main/java/com/dayu/pipirrapp/activity/MainActivity.java | 99 ++++++++++++++++++++++++++++++++-----------------
1 files changed, 65 insertions(+), 34 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..11ed339 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,15 @@
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.view.View;
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,16 +17,20 @@
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.HashMap;
import java.util.List;
+import java.util.Map;
/**
* 棣栭〉
@@ -37,6 +40,8 @@
private List<Fragment> fragments = new ArrayList<>();
private long mExitTime;
MqttManager mqttManager;
+ private Map<String, String> workerIddata = new HashMap<>();
+
private enum Tab {
ORDER, MAP, MY
@@ -47,7 +52,6 @@
super.onCreate(savedInstanceState);
binding = ActivityMainBinding.inflate(LayoutInflater.from(this));
setContentView(binding.getRoot());
- registNetCallBack();
setupFragments();
initView();
initTab();
@@ -58,8 +62,55 @@
} catch (Exception e) {
e.printStackTrace();
}
- mqttManager = new MqttManager(this);
- mqttManager.connect();
+ mqttManager = new MqttManager(this, this);
+ 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;
+ }
+ }
+ });
+ //mq浼犳潵鐨勬秷鎭�
+ LiveEventBus.get(CommonKeyName.MQTTData).observeForever(new Observer<Object>() {
+ @Override
+ public void onChanged(Object o) {
+ workerIddata.put((String) o, (String) o);
+
+ binding.redDotImg.setVisibility(View.VISIBLE);
+
+ }
+ });
+ LiveEventBus.get(CommonKeyName.RedLotRefresh).observeForever(new Observer<Object>() {
+ @Override
+ public void onChanged(Object o) {
+ if (o instanceof Boolean) {
+ if ((boolean) o) {
+ binding.redDotImg.setVisibility(View.GONE);
+ workerIddata.clear();
+ }
+ } else if (o instanceof String) {
+ workerIddata.remove(o);
+ if (workerIddata.size() == 0) {
+ binding.redDotImg.setVisibility(View.GONE);
+ }
+ }
+
+ }
+ });
+ registNetCallBack();
+ }
+
+ @Override
+ protected void onStart() {
+ super.onStart();
+
}
private void setupFragments() {
@@ -75,11 +126,11 @@
}
private void initTab() {
- TabAdapter adapter = new TabAdapter(getSupportFragmentManager(), fragments);
+ TabAdapter adapter = new TabAdapter(this, fragments);
binding.viewPager.setAdapter(adapter);
- binding.viewPager.setPagingEnabled(false);
+ binding.viewPager.setCurrentItem(1, false); // 榛樿鏄剧ず鍦板浘椤�
binding.viewPager.setOffscreenPageLimit(fragments.size());
- binding.viewPager.setCurrentItem(1); // 榛樿鏄剧ず鍦板浘椤�
+
}
@Override
@@ -99,8 +150,9 @@
@Override
protected void onDestroy() {
super.onDestroy();
- //鍏抽棴MQ
+
try {
+ //鍏抽棴MQ
mqttManager.disconnect();
unregisterNetworkCallback();
} catch (Exception e) {
@@ -163,33 +215,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