From a2a1bd40089d81286f8257ca4c61ce49155b6af3 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期一, 09 十二月 2024 09:14:21 +0800
Subject: [PATCH] 1.详情界面显示已上传的图片并可放大查看

---
 app/src/main/java/com/dayu/pipirrapp/net/MqttManager.java |   70 ++++++++++++++--------------------
 1 files changed, 29 insertions(+), 41 deletions(-)

diff --git a/app/src/main/java/com/dayu/pipirrapp/net/MqttManager.java b/app/src/main/java/com/dayu/pipirrapp/net/MqttManager.java
index 7a85cc5..dbea4cd 100644
--- a/app/src/main/java/com/dayu/pipirrapp/net/MqttManager.java
+++ b/app/src/main/java/com/dayu/pipirrapp/net/MqttManager.java
@@ -2,9 +2,6 @@
 
 import android.content.Context;
 import android.net.ConnectivityManager;
-import android.net.Network;
-import android.net.NetworkCapabilities;
-import android.net.NetworkRequest;
 import android.util.Log;
 
 import com.dayu.pipirrapp.utils.CommonKeyName;
@@ -49,7 +46,27 @@
             connectOptions.setKeepAliveInterval(60); // 璁剧疆淇濇寔杩炴帴鐨勬椂闂�
             connectOptions.setAutomaticReconnect(true);  // 鍚敤鑷姩閲嶈繛
             connectivityManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
-            checkNetwork();
+//            LiveEventBus.get(CommonKeyName.NetworkCallback).observeForever(new Observer<Object>() {
+//                @Override
+//                public void onChanged(Object o) {
+//                    switch ((int) o) {
+//                        case NetUtils.Available:
+//                            MyLog.i("MqttManager>>>Available");
+//                            isHasNet = true;
+//                            reconnect();
+//                            break;
+//                        case NetUtils.Lost:
+//                            MyLog.i("MqttManager>>>Lost");
+//                            isHasNet = false;
+//                            try {
+//                                mqttClient.disconnect();
+//                            } catch (MqttException e) {
+//                                e.printStackTrace();
+//                            }
+//                            break;
+//                    }
+//                }
+//            });
         } catch (MqttException e) {
             e.printStackTrace();
         }
@@ -156,47 +173,18 @@
                 Log.d("MqttManager", "Reconnected to MQTT broker! isHasNet=true");
             } else {
                 Log.d("MqttManager", "isHasNet is false");
-                Thread.sleep(5000);
-                reconnect();
+//                Thread.sleep(5000);
+//                reconnect();
             }
 
         } catch (MqttException | InterruptedException e) {
-            try {
-                Thread.sleep(5000);
-            } catch (InterruptedException ex) {
-                e.printStackTrace();
-            }// 姣� 5 绉掗噸璇曚竴娆�
-            reconnect();
+//            try {
+//                Thread.sleep(5000);
+//            } catch (InterruptedException ex) {
+//                e.printStackTrace();
+//            }// 姣� 5 绉掗噸璇曚竴娆�
+//            reconnect();
 
         }
-    }
-
-    public void checkNetwork() {
-        NetworkRequest request = new NetworkRequest.Builder().addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)  // 蹇呴』鍏峰浜掕仈缃戣兘鍔�
-                .build();
-
-        connectivityManager.registerNetworkCallback(request, new ConnectivityManager.NetworkCallback() {
-            @Override
-            public void onAvailable(Network network) {
-                super.onAvailable(network);
-                // 缃戠粶鍙敤鏃剁殑澶勭悊閫昏緫
-                Log.d("MqttManager", "Network is available.");
-                isHasNet = true;
-                reconnect();
-            }
-
-            @Override
-            public void onLost(Network network) {
-                super.onLost(network);
-                // 缃戠粶涓㈠け鏃剁殑澶勭悊閫昏緫
-                Log.d("MqttManager", "Network is lost.");
-                isHasNet = false;
-                try {
-                    mqttClient.disconnect();
-                } catch (MqttException e) {
-                    e.printStackTrace();
-                }
-            }
-        });
     }
 }

--
Gitblit v1.8.0