Merge branch 'dev_robotaxi-d_240523_6.4.4' of gitlab.zhidaoauto.com:SCA/L4HA/AndroidApp/MoGoEagleEye into dev_robotaxi-d_240523_6.4.4

This commit is contained in:
xinfengkun
2024-05-28 15:11:35 +08:00
24 changed files with 407 additions and 110 deletions

View File

@@ -957,6 +957,15 @@ class MoGoAutopilotControlProvider :
return AdasManager.getInstance().protocolVersion
}
override fun getVIN(): String {
val carConfig = AdasManager.getInstance().carConfig
return if(carConfig != null){
carConfig.vinCode
}else{
""
}
}
override fun connectSpecifiedServer(ip: String) {
ThreadUtils.getIoPool().submit {
NSDNettyManager.getInstance().connectSpecifiedServer(

View File

@@ -9,4 +9,12 @@ public class BaseData implements Serializable, Cloneable {
public int code = -1;
public String msg;
@Override
public String toString() {
return "BaseData{" +
"code=" + code +
", msg='" + msg + '\'' +
'}';
}
}

View File

@@ -337,6 +337,11 @@ interface IMoGoAutopilotControlProvider : IMoGoFunctionServerProvider {
*/
fun getProtocolVersion(): Int
/**
* 获取VIN车辆识别代号
*/
fun getVIN(): String
fun connectSpecifiedServer(ip: String)
/**

View File

@@ -617,6 +617,13 @@ object CallerAutoPilotControlManager {
return providerApi?.getProtocolVersion() ?: 0
}
/**
* 获取VIN车辆识别代号
*/
fun getVIN(): String{
return providerApi?.getVIN()?:""
}
fun connectSpecifiedServer(ip: String) {
providerApi?.connectSpecifiedServer(ip)
}