From 4add71e4ccfca9f3679c5b0e6c430d41835cc6e8 Mon Sep 17 00:00:00 2001
From: xinfengkun <xinfengkun@zhidaoauto.com>
Date: Fri, 1 Aug 2025 15:14:36 +0800
Subject: [PATCH] =?UTF-8?q?[8.2.0][adas]=20=E4=BF=AE=E5=A4=8D=E9=87=8D?=
 =?UTF-8?q?=E8=BF=9E=E7=AE=A1=E7=90=86=E5=99=A8=E5=8F=96=E6=B6=88=E7=BD=91?=
 =?UTF-8?q?=E7=BB=9C=E6=B3=A8=E5=86=8C=E7=9B=91=E5=90=AC=E5=BC=95=E8=B5=B7?=
 =?UTF-8?q?=E7=9A=84=E5=B4=A9=E6=BA=83=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E9=87=8D=E8=BF=9E=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../support/adas/high/common/ReconnectManager.java  | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/ReconnectManager.java b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/ReconnectManager.java
index 18c937617c..cfd95b97c6 100644
--- a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/ReconnectManager.java
+++ b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/ReconnectManager.java
@@ -66,13 +66,13 @@ public class ReconnectManager {
         } else if (reconnectCount == 0) {
             return true;
         } else {
-            return currentCount < reconnectCount;
+            return currentCount <= reconnectCount;
         }
     }
 
     private void callOnReconnection(AdasConstants.IpcConnectionStatus status) {
+        currentCount++;
         if (isNeedReconnect()) {
-            currentCount++;
             listener.onReconnection(status);
         } else {
             stop(true);
@@ -84,7 +84,7 @@ public class ReconnectManager {
      */
     public synchronized void start() {
         if (isNeedReconnect()) {
-            if (!isReconnection.get()) {
+            if (!isReconnection()) {
                 CupidLogUtils.log(TAG, "开始重连");
                 isReconnection.set(true);
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP && connectivityManager == null) {
@@ -97,10 +97,8 @@ public class ReconnectManager {
                     timer.schedule(new TimerTask() {
                         @Override
                         public void run() {
-                            if (isNeedReconnect()) {
+                            if (isReconnection()) {
                                 callOnReconnection(AdasConstants.IpcConnectionStatus.RECONNECTING_TIMER);
-                            } else {
-                                stop(true);
                             }
                         }
                     }, RECONNECT_INTERVAL, RECONNECT_INTERVAL);//延时
@@ -117,6 +115,7 @@ public class ReconnectManager {
         }
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP && connectivityManager != null) {
             connectivityManager.unregisterNetworkCallback(networkCallback);
+            connectivityManager = null;
         }
         if (timer != null) {
             timer.cancel();
@@ -130,7 +129,7 @@ public class ReconnectManager {
         public void onAvailable(@NonNull Network network) {
             super.onAvailable(network);
             CupidLogUtils.log(TAG, "网络连接成功");
-            if (isReconnection.get() && !isNetworkConnected()) {
+            if (isReconnection() && isNetworkConnected()) {
                 callOnReconnection(AdasConstants.IpcConnectionStatus.RECONNECTING_NETWORK);
             }
         }