yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[change] 优化重连，更换重连方案

Browse Source
This commit is contained in:
xinfengkun
2022-06-22 17:13:44 +08:00
parent 36dc2c85b0
commit c3346feb5e
5 changed files with 112 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/mogo-adas-other/src/main/res/layout/dialog_adas_permission_long_background_running.xml
View File

@@ -29,7 +29,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginTop="3dp"
android:text="开启池优化功能，会影响熄屏或休眠后网络连接"
android:textColor="#696969" />
</LinearLayout>

64
libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/ReconnectManager.java Normal file
View File

@@ -0,0 +1,64 @@
package com.zhidao.support.adas.high.common;
import java.util.Timer;
import java.util.TimerTask;
import java.util.concurrent.atomic.AtomicBoolean;
/**
* 重连管理器
*/
public class ReconnectManager {
private static final String TAG = ReconnectManager.class.getSimpleName();
private static final long RECONNECT_INTERVAL = 4 * 1000L;//重连间隔
private final AtomicBoolean isReconnection = new AtomicBoolean(false);//是否正在重连
private final OnReconnectListener listener;
private volatile Timer timer;
public interface OnReconnectListener {
void onReconnection();
}
public ReconnectManager(OnReconnectListener listener) {
this.listener = listener;
}
/**
* @return 是否正在重连
*/
public boolean isReconnection() {
return isReconnection.get();
}
public synchronized void start() {
if (!isReconnection.get()) {
CupidLogUtils.i(TAG, "开始重连");
isReconnection.set(true);
if (timer == null) {
timer = new Timer();
timer.schedule(new TimerTask() {
@Override
public void run() {
if (isReconnection.get()) {
if (listener != null)
listener.onReconnection();
}
}
}, 0, RECONNECT_INTERVAL);//延时
}
}
}
public synchronized void stop() {
CupidLogUtils.i(TAG, "停止重连");
isReconnection.set(false);
if (timer != null) {
timer.cancel();
timer = null;
}
}
}

47
libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/socket/FpgaSocket.java
View File

@@ -14,8 +14,10 @@ import androidx.annotation.NonNull;
import com.google.protobuf.InvalidProtocolBufferException;
import com.zhidao.support.adas.high.AdasChannel;
import com.zhidao.support.adas.high.common.ByteUtil;
import com.zhidao.support.adas.high.common.CupidLogUtils;
import com.zhidao.support.adas.high.common.ReceiveTimeoutManager;
import com.zhidao.support.adas.high.common.ReconnectManager;
import com.zhidao.support.adas.high.queue.WSByteQueueManager;
import com.zhidao.support.adas.high.queue.WebSocketQueueManager;
import com.zhjt.service.chain.ChainLog;
@@ -52,7 +54,7 @@ public class FpgaSocket implements IWebSocket {
private EchoWebSocketListener listener;
private IWebSocketConnectListener mWebSocketConnectListener;
private ReconnectManager reconnectManager;
private String wsHost;
private String ipAddress;
@@ -66,10 +68,7 @@ public class FpgaSocket implements IWebSocket {
* 是否是被动关闭
*/
private final AtomicBoolean isPassiveClose = new AtomicBoolean(false);
/**
* 是否启用自动重连
*/
private boolean isReconnect = true;
/**
* 接收数据超时原因 null时表示不是接收数据超时的原因
*/
@@ -92,6 +91,12 @@ public class FpgaSocket implements IWebSocket {
onPassiveClose(1001, receiveTimeoutReason);
}
});
reconnectManager = new ReconnectManager(new ReconnectManager.OnReconnectListener() {
@Override
public void onReconnection() {
connect("重连中");
}
});
client = okBuilder.build();
}
@@ -113,25 +118,18 @@ public class FpgaSocket implements IWebSocket {
Request request = new Request.Builder()
.url(wsHost)
.build();
mWebSocket = client.newWebSocket(request, listener);
client.newWebSocket(request, listener);
}
}
/**
* 重连
*/
public void reconnect() {
if (isReconnect) {
if (!isUserClose.get()) {
try {
Thread.sleep(2000L);
} catch (InterruptedException e) {
e.printStackTrace();
}
connect("重连中");
} else {
isUserClose.set(false);
}
private void reconnect() {
if (!isUserClose.get()) {
reconnectManager.start();
} else {
isUserClose.set(false);
}
}
@@ -143,6 +141,7 @@ public class FpgaSocket implements IWebSocket {
}
isUserClose.set(true);
isPassiveClose.set(false);
reconnectManager.stop();
if (mWebSocket != null) {
close(true, 1000);
} else {
@@ -164,17 +163,12 @@ public class FpgaSocket implements IWebSocket {
public boolean sendDataWebSocket(ByteString data) {
if (mWebSocket != null) {
boolean result = mWebSocket.send(data);
CupidLogUtils.i(TAG, "WebSocket send ByteString= " + data + ", result= " + result);
CupidLogUtils.i(TAG, "WebSocket send ByteString= " + ByteUtil.byteArrToHex(data.toByteArray()) + ", result= " + result);
return result;
}
return false;
}
@Override
public void setIsReconnect(boolean isReconnect) {
this.isReconnect = isReconnect;
}
public interface IWebSocketConnectListener {
/**
@@ -209,8 +203,9 @@ public class FpgaSocket implements IWebSocket {
mWebSocket = webSocket;
boolean isConnect = response.code() == 101;
if (!isConnect) {
reconnect();
onPassiveClose(1001, "協議不匹配");
} else {
reconnectManager.stop();
ReceiveTimeoutManager.getInstance().start();
CupidLogUtils.i(TAG, "WebSocket 连接成功");
if (mWebSocketConnectListener != null)
@@ -330,7 +325,7 @@ public class FpgaSocket implements IWebSocket {
}
/**
* 被动关闭 包含：服务断开 心跳超时 异常断开 等
* 被动关闭 包含：服务断开 心跳超时 等
*
* @param reason
*/

7
libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/socket/IWebSocket.java
View File

@@ -34,13 +34,6 @@ public interface IWebSocket {
boolean sendDataWebSocket(ByteString data);
/**
* 是否启用自动重连
*
* @param isReconnect
*/
void setIsReconnect(boolean isReconnect);
}