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

[7.0.0] ADAS LIB 移除域控兼容性检查功能

Browse Source
This commit is contained in:
xinfengkun
2025-04-01 10:43:42 +08:00
parent 6e5c7b5873
commit c2483fb577
6 changed files with 90 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app_mogo_magic_ring/src/main/java/com/zhidao/adas/magic/ui/MainActivity.java
View File

@@ -845,11 +845,6 @@ public class MainActivity extends BaseActivity implements OnAdasListener, OnAdas
} }
} }
@Override
public void onCompatibility(VersionCompatibility versionCompatibility) {
showToastCenter("所连工控机：\n" + (versionCompatibility == null ? "未连接" : versionCompatibility.toString()), Toast.LENGTH_LONG);
}
private void showLocalIP() { private void showLocalIP() {
showToastCenter("已刷新本机IP"); showToastCenter("已刷新本机IP");
localIp.setText("本机IP：" + getIpAddressString()); localIp.setText("本机IP：" + getIpAddressString());

5
core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt
View File

@@ -32,7 +32,6 @@ import com.mogo.eagle.core.utilcode.util.AppUtils
import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.eagle.core.utilcode.util.ToastUtils
import com.zhidao.support.adas.high.AdasManager import com.zhidao.support.adas.high.AdasManager
import com.zhidao.support.adas.high.OnAdasConnectStatusListener import com.zhidao.support.adas.high.OnAdasConnectStatusListener
import com.zhidao.support.adas.high.bean.VersionCompatibility
import com.zhidao.support.adas.high.common.Constants.ENVIRONMENT.DEMO import com.zhidao.support.adas.high.common.Constants.ENVIRONMENT.DEMO
import com.zhidao.support.adas.high.common.Constants.ENVIRONMENT.DEVELOP import com.zhidao.support.adas.high.common.Constants.ENVIRONMENT.DEVELOP
import com.zhidao.support.adas.high.common.Constants.ENVIRONMENT.PRODUCTION import com.zhidao.support.adas.high.common.Constants.ENVIRONMENT.PRODUCTION
@@ -358,10 +357,6 @@ class MoGoAdasMsgConnectStatusListenerImpl :
} }
} }
override fun onCompatibility(versionCompatibility: VersionCompatibility?) {
// 与所连接工控机版本兼容性检查通知
}
/** /**
* 工控机获取SN * 工控机获取SN
*/ */

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

@@ -19,7 +19,6 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import com.google.protobuf.InvalidProtocolBufferException; import com.google.protobuf.InvalidProtocolBufferException;
import com.zhidao.support.adas.high.bean.VersionCompatibility;
import com.zhidao.support.adas.high.common.AutopilotReview; import com.zhidao.support.adas.high.common.AutopilotReview;
import com.zhidao.support.adas.high.common.CertificateUtils; import com.zhidao.support.adas.high.common.CertificateUtils;
import com.zhidao.support.adas.high.common.Constants; import com.zhidao.support.adas.high.common.Constants;
@@ -103,7 +102,7 @@ public class AdasChannel implements IAdasNetCommApi, FpgaSocket.IWebSocketConnec
private RawPack rawPack;//数据打包 private RawPack rawPack;//数据打包
private DispatchHandler defaultDispatchHandler;//默认分发线程分发 private DispatchHandler defaultDispatchHandler;//默认分发线程分发
private final Map<MessagePad.MessageType, DispatchHandler> dispatchHandlers = new HashMap<>();//其他分发线程 private final Map<MessagePad.MessageType, DispatchHandler> dispatchHandlers = new HashMap<>();//其他分发线程
private Timer checkCompatibilityTimer;//检查版本兼容性定时器 连接成功后5秒内等待工控机发送配置信息 // private Timer checkCompatibilityTimer;//检查版本兼容性定时器 连接成功后5秒内等待工控机发送配置信息
private int seqSpecialVehicle = 0;//特种车辆命令发送次数 private int seqSpecialVehicle = 0;//特种车辆命令发送次数
private AdasConstants.ChassisSource usedChassisSource = AdasConstants.ChassisSource.CHASSIS_UNKNOWN;//使用的底盘类型 新底盘接口还是老底盘接口 private AdasConstants.ChassisSource usedChassisSource = AdasConstants.ChassisSource.CHASSIS_UNKNOWN;//使用的底盘类型 新底盘接口还是老底盘接口
private AdasConstants.SsmSource usedSsmSource = AdasConstants.SsmSource.SSM_UNKNOWN;//使用的SSM类型 服务接口还是定频接口 private AdasConstants.SsmSource usedSsmSource = AdasConstants.SsmSource.SSM_UNKNOWN;//使用的SSM类型 服务接口还是定频接口
@@ -868,7 +867,7 @@ public class AdasChannel implements IAdasNetCommApi, FpgaSocket.IWebSocketConnec
seqSpecialVehicle = 0; seqSpecialVehicle = 0;
AutopilotAbilityManager.getInstance().start(); AutopilotAbilityManager.getInstance().start();
ParallelDrivingManager.getInstance().start(); ParallelDrivingManager.getInstance().start();
startCheckCompatibility(); // startCheckCompatibility();
//更新连接成功状态之后再根据是否认证进行认证检查 //更新连接成功状态之后再根据是否认证进行认证检查
if (adasOptions.isCertification()) { if (adasOptions.isCertification()) {
//启动认证超时 //启动认证超时
@@ -884,7 +883,7 @@ public class AdasChannel implements IAdasNetCommApi, FpgaSocket.IWebSocketConnec
AutopilotAbilityManager.getInstance().stop(); AutopilotAbilityManager.getInstance().stop();
ParallelDrivingManager.getInstance().stop(); ParallelDrivingManager.getInstance().stop();
AdasManager.getInstance().setCarConfig(null); AdasManager.getInstance().setCarConfig(null);
stopCheckCompatibility(); // stopCheckCompatibility();
stopDispatchHandler(); stopDispatchHandler();
isInitConfigure.set(false); isInitConfigure.set(false);
stopCarConfigReq(); stopCarConfigReq();
@@ -926,67 +925,67 @@ public class AdasChannel implements IAdasNetCommApi, FpgaSocket.IWebSocketConnec
} }
} }
/** // /**
* 检查兼容性 // * 检查兼容性
*/ // */
private void startCheckCompatibility() { // private void startCheckCompatibility() {
if (checkCompatibilityTimer == null) { // if (checkCompatibilityTimer == null) {
checkCompatibilityTimer = new Timer(); // checkCompatibilityTimer = new Timer();
checkCompatibilityTimer.schedule(new TimerTask() { // checkCompatibilityTimer.schedule(new TimerTask() {
@Override // @Override
public void run() { // public void run() {
if (adasConnectStatusListener != null) { // if (adasConnectStatusListener != null) {
adasConnectStatusListener.onCompatibility(getVersionCompatibility()); // adasConnectStatusListener.onCompatibility(getVersionCompatibility());
} // }
stopCheckCompatibility(); // stopCheckCompatibility();
} // }
}, 6 * 1000L);//延时 // }, 6 * 1000L);//延时
} // }
} // }
//
private void stopCheckCompatibility() { // private void stopCheckCompatibility() {
if (checkCompatibilityTimer != null) { // if (checkCompatibilityTimer != null) {
checkCompatibilityTimer.cancel(); // checkCompatibilityTimer.cancel();
checkCompatibilityTimer = null; // checkCompatibilityTimer = null;
} // }
} // }
//
/** // /**
* 获取与当前连接工控机兼容性 // * 获取与当前连接工控机兼容性
* 连接状态=已连接 时正常返回，其他状态全部为null // * 连接状态=已连接 时正常返回，其他状态全部为null
* // *
* @return 兼容性 // * @return 兼容性
*/ // */
@Override // @Override
public VersionCompatibility getVersionCompatibility() { // public VersionCompatibility getVersionCompatibility() {
//判断是否是已连接成功 // //判断是否是已连接成功
if (getIpcConnectionStatus() == AdasConstants.IpcConnectionStatus.CONNECTED) { // if (getIpcConnectionStatus() == AdasConstants.IpcConnectionStatus.CONNECTED) {
MessagePad.CarConfigResp carConfigResp = AdasManager.getInstance().getCarConfig(); // MessagePad.CarConfigResp carConfigResp = AdasManager.getInstance().getCarConfig();
boolean isCompatibility = false; // boolean isCompatibility = false;
VersionCompatibility.VersionCompatibilityDegree compatibilityDegree = VersionCompatibility.VersionCompatibilityDegree.INCOMPATIBLE; // VersionCompatibility.VersionCompatibilityDegree compatibilityDegree = VersionCompatibility.VersionCompatibilityDegree.INCOMPATIBLE;
int appProtocolVersion = AdasManager.getInstance().getProtocolVersion(); // int appProtocolVersion = AdasManager.getInstance().getProtocolVersion();
int ipcProtocolVersion = -1; // int ipcProtocolVersion = -1;
String msg = "与当前连接工控机不兼容"; // String msg = "与当前连接工控机不兼容";
if (carConfigResp != null) { // if (carConfigResp != null) {
ipcProtocolVersion = carConfigResp.getProtocolVersionValue(); // ipcProtocolVersion = carConfigResp.getProtocolVersionValue();
if (ipcProtocolVersion == appProtocolVersion) { // if (ipcProtocolVersion == appProtocolVersion) {
isCompatibility = true; // isCompatibility = true;
compatibilityDegree = VersionCompatibility.VersionCompatibilityDegree.CONGRUENT; // compatibilityDegree = VersionCompatibility.VersionCompatibilityDegree.CONGRUENT;
msg = "与当前连接工控机完美兼容"; // msg = "与当前连接工控机完美兼容";
} else if (ipcProtocolVersion == 0) { // } else if (ipcProtocolVersion == 0) {
isCompatibility = false; // isCompatibility = false;
compatibilityDegree = VersionCompatibility.VersionCompatibilityDegree.INCOMPATIBLE; // compatibilityDegree = VersionCompatibility.VersionCompatibilityDegree.INCOMPATIBLE;
msg = "与当前连接工控机不兼容,工控机协议版本有误"; // msg = "与当前连接工控机不兼容,工控机协议版本有误";
} else { // } else {
isCompatibility = true; // isCompatibility = true;
compatibilityDegree = VersionCompatibility.VersionCompatibilityDegree.COMPATIBILITY; // compatibilityDegree = VersionCompatibility.VersionCompatibilityDegree.COMPATIBILITY;
msg = "与当前连接工控机兼容，建议使用相同版本协议通讯"; // msg = "与当前连接工控机兼容，建议使用相同版本协议通讯";
} // }
} // }
return new VersionCompatibility(isCompatibility, compatibilityDegree, appProtocolVersion, ipcProtocolVersion, msg); // return new VersionCompatibility(isCompatibility, compatibilityDegree, appProtocolVersion, ipcProtocolVersion, msg);
} // }
return null; // return null;
} // }
void setOnAdasListener(OnAdasListener adasListener) { void setOnAdasListener(OnAdasListener adasListener) {
mAdasListener = adasListener; mAdasListener = adasListener;

27
libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasManager.java
View File

@@ -7,7 +7,6 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import com.google.protobuf.ByteString; import com.google.protobuf.ByteString;
import com.zhidao.support.adas.high.bean.VersionCompatibility;
import com.zhidao.support.adas.high.common.Constants; import com.zhidao.support.adas.high.common.Constants;
import com.zhidao.support.adas.high.common.CupidLogUtils; import com.zhidao.support.adas.high.common.CupidLogUtils;
import com.zhidao.support.adas.high.common.Define; import com.zhidao.support.adas.high.common.Define;
@@ -225,19 +224,19 @@ public class AdasManager implements IAdasNetCommApi {
} }
} }
/** // /**
* 获取与当前连接工控机兼容性 // * 获取与当前连接工控机兼容性
* 连接状态=已连接 时正常返回，其他状态全部为null // * 连接状态=已连接 时正常返回，其他状态全部为null
* // *
* @return 兼容性 // * @return 兼容性
*/ // */
@Override // @Override
public VersionCompatibility getVersionCompatibility() { // public VersionCompatibility getVersionCompatibility() {
if (mChannel != null) { // if (mChannel != null) {
return mChannel.getVersionCompatibility(); // return mChannel.getVersionCompatibility();
} // }
return null; // return null;
} // }
/** /**
* 向工控机发送数据 * 向工控机发送数据

15
libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/IAdasNetCommApi.java
View File

@@ -3,7 +3,6 @@ package com.zhidao.support.adas.high;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import com.zhidao.support.adas.high.bean.VersionCompatibility;
import com.zhidao.support.adas.high.common.Constants; import com.zhidao.support.adas.high.common.Constants;
import com.zhidao.support.adas.high.common.Define; import com.zhidao.support.adas.high.common.Define;
import com.zhjt.mogo.adas.common.MessageType; import com.zhjt.mogo.adas.common.MessageType;
@@ -1445,11 +1444,11 @@ public interface IAdasNetCommApi {
void setEnableLog(boolean isEnableLog); void setEnableLog(boolean isEnableLog);
/** // /**
* 获取与当前连接工控机兼容性 // * 获取与当前连接工控机兼容性
* 连接状态=已连接 时正常返回，其他状态全部为null // * 连接状态=已连接 时正常返回，其他状态全部为null
* // *
* @return 兼容性 // * @return 兼容性
*/ // */
VersionCompatibility getVersionCompatibility(); // VersionCompatibility getVersionCompatibility();
} }

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

@@ -3,7 +3,6 @@ package com.zhidao.support.adas.high;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import com.zhidao.support.adas.high.bean.VersionCompatibility;
import com.zhjt.mogo.adas.data.AdasConstants; import com.zhjt.mogo.adas.data.AdasConstants;
/** /**
@@ -36,10 +35,10 @@ public interface OnAdasConnectStatusListener {
*/ */
void onCertification(@NonNull AdasConstants.CertificationStatus status); void onCertification(@NonNull AdasConstants.CertificationStatus status);
/** // /**
* 与工控机版本的兼容性 // * 与工控机版本的兼容性
* // *
* @param versionCompatibility 版本兼容对象 // * @param versionCompatibility 版本兼容对象
*/ // */
void onCompatibility(VersionCompatibility versionCompatibility); // void onCompatibility(VersionCompatibility versionCompatibility);
} }