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 | 47 ++++++++++++++++++++++++++++++++++++++---------
1 files changed, 38 insertions(+), 9 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 d04a7d7..11ed339 100644
--- a/app/src/main/java/com/dayu/pipirrapp/activity/MainActivity.java
+++ b/app/src/main/java/com/dayu/pipirrapp/activity/MainActivity.java
@@ -3,6 +3,7 @@
import android.os.Bundle;
import android.view.KeyEvent;
import android.view.LayoutInflater;
+import android.view.View;
import android.widget.Toast;
import androidx.appcompat.app.AppCompatActivity;
@@ -27,7 +28,9 @@
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());
-
setupFragments();
initView();
initTab();
@@ -58,8 +62,7 @@
} 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) {
@@ -72,6 +75,33 @@
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();
@@ -96,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
@@ -120,8 +150,9 @@
@Override
protected void onDestroy() {
super.onDestroy();
- //鍏抽棴MQ
+
try {
+ //鍏抽棴MQ
mqttManager.disconnect();
unregisterNetworkCallback();
} catch (Exception e) {
@@ -190,8 +221,6 @@
private void unregisterNetworkCallback() {
NetUtils.unregisterReceiver(this);
}
-
-
}
--
Gitblit v1.8.0