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

[630][adas] 修复处于PING状态时，无法停止PING问题

Browse Source
This commit is contained in:
xinfengkun
2024-03-15 13:59:47 +08:00
parent fec3d1b8dc
commit 8a8d0bf56a
11 changed files with 251 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasChannel.java
View File

@@ -590,8 +590,8 @@ public class AdasChannel implements IAdasNetCommApi, FpgaSocket.IWebSocketConnec
}
}
}
if (mAdasListener != null) {
mAdasListener.onCertification(result);
if (adasConnectStatusListener != null) {
adasConnectStatusListener.onCertification(result);
}
CupidLogUtils.log(TAG, "证书验证状态=" + result);
if (result == AdasConstants.CertificationStatus.CERTIFICATE_CHAIN_SUCCESS) {
@@ -633,7 +633,7 @@ public class AdasChannel implements IAdasNetCommApi, FpgaSocket.IWebSocketConnec
}
String rootCrt = adasOptions.getRootCrt();
if (!TextUtils.isEmpty(rootCrt)) {
certification(rootCrt, basicInfoReq.getCertification());
certification(false, rootCrt, basicInfoReq.getCertification());
}
} else {
IMsg iMsg = myMessageFactory.createMessage(messageType);

13
libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/OnAdasConnectStatusListener.java
View File

@@ -1,5 +1,6 @@
package com.zhidao.support.adas.high;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.zhidao.support.adas.high.bean.VersionCompatibility;
@@ -23,6 +24,18 @@ public interface OnAdasConnectStatusListener {
*/
void onConnectionIPCStatus(AdasConstants.IpcConnectionStatus status, @Nullable String reason);
/**
* 域控证书认证状态
* 启用认证需要配置 AdasOptions.setEnableCertification()
* 连接时启用认证 后才会有证认结果
* ROOT证书异常会影响校验域控证书
* PAD证书异常会影响域控端校验的证书校验，域控端证书校验失败将会断开连接，且并不会给出断开原因，ADAS LIB会执行重连操作（如果配置启用重连）
* 假如校验域控证书认证失败会主动断开连接，且不进行重连
*
* @param status 域控证书认证结果{@link AdasConstants.CertificationStatus}
*/
void onCertification(@NonNull AdasConstants.CertificationStatus status);
/**
* 与工控机版本的兼容性
*

12
libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/OnAdasListener.java
View File

@@ -155,18 +155,6 @@ public interface OnAdasListener {
*/
void onBasicInfoReq(MessagePad.Header header, @NonNull MessagePad.BasicInfoReq basicInfoReq);
/**
* 域控证书认证状态
* 启用认证需要配置 AdasOptions.setEnableCertification()
* 连接时启用认证 后才会有证认结果
* ROOT证书异常会影响校验域控证书
* PAD证书异常会影响域控端校验的证书校验，域控端证书校验失败将会断开连接，且并不会给出断开原因，ADAS LIB会执行重连操作（如果配置启用重连）
* 假如校验域控证书认证失败会主动断开连接，且不进行重连
*
* @param status 域控证书认证结果{@link AdasConstants.CertificationStatus}
*/
void onCertification(@NonNull AdasConstants.CertificationStatus status);
/**
* 车机基础信息应答
*