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

解决了ADAS 重新连接工控机 没有发送sn的问题

Browse Source
This commit is contained in:
董宏宇
2021-07-02 20:19:25 +08:00
parent f779d565f3
commit c5bc5170b4
3 changed files with 22 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasProvider.java
View File

@@ -11,8 +11,6 @@ import com.zhidao.autopilotservice.model.AdasAIDLAutopilotStateModel;
import com.zhidao.support.adas.high.AdasManager;
import com.zhidao.support.adas.high.bean.BasicInfo;
import adas.Adas;
/**
* ADAS 模块
@@ -32,6 +30,19 @@ public class AdasProvider implements IProvider {
adasEventManager = AdasEventManager.getInstance();
initAdas(context, adasEventManager);
initAutoPilotBusiness(context);
addAdasStatusListener(new AdasStatusListener() {
@Override
public void onServiceConnected() {
Logger.d(TAG, "adas statusListener connected & send sn");
setBasicInfo();
}
@Override
public void onServiceDisconnected() {
Logger.d(TAG, "adas statuslistener disconnected");
}
});
}
private void initAdas(Context context, AdasEventManager adasEventManager) {
@@ -42,12 +53,9 @@ public class AdasProvider implements IProvider {
private void initAutoPilotBusiness(Context context) {
AdasAutoPilotManager.getInstance().initSocket(context);
AdasAutoPilotManager.getInstance().addIDispatchResult(new AdasAutoPilotManager.IDispatchResultListener() {
@Override
public void dispatchAffirm(String json) {
Logger.d(TAG,"aiCloudToAdasData json : " + json);
AdasManager.getInstance().aiCloudToAdasData(json);
}
AdasAutoPilotManager.getInstance().addIDispatchResult(json -> {
Logger.d(TAG,"aiCloudToAdasData json : " + json);
AdasManager.getInstance().aiCloudToAdasData(json);
});
}

9
modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasStatusListener.java
View File

@@ -3,12 +3,9 @@ package com.mogo.module.adas;
/**
* Created by XuYong on 4/28/21 16:19
*/
public abstract class AdasStatusListener {
public interface AdasStatusListener {
public void onServiceConnected() {
void onServiceConnected();
};
public void onServiceDisconnected() {
};
void onServiceDisconnected();
}

22
services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java
View File

@@ -313,22 +313,12 @@ public class MogoADASController implements IMogoADASController {
try {
adasProvider.killAdas();
} catch (Exception e) {
e.printStackTrace();
}
}
private volatile boolean needEmphasizeMyLocation = false;
private void testOCH() {
RemoteControlAutoPilotParameters currentAutopilot = new RemoteControlAutoPilotParameters();
currentAutopilot.isSpeakVoice = true;
currentAutopilot.startLatLon = new RemoteControlAutoPilotParameters.AutoPilotLonLat(0, 1);
currentAutopilot.endLatLon = new RemoteControlAutoPilotParameters.AutoPilotLonLat(2, 3);
currentAutopilot.vehicleType = 10;
Logger.d(TAG, "开启自动驾驶====" + currentAutopilot);
aiCloudToAdasData(currentAutopilot);
}
@Override
public void showADAS() {
@@ -346,19 +336,13 @@ public class MogoADASController implements IMogoADASController {
adasProvider.addAdasStatusListener(new AdasStatusListener() {
@Override
public void onServiceConnected() {
super.onServiceConnected();
Logger.d(TAG, "adas statusListener connected & send sn");
adasProvider.setBasicInfo();
Logger.d(TAG, "adas statusListener connected");
invokeShowADASOperation();
//测试网约车
//testOCH();
}
@Override
public void onServiceDisconnected() {
Logger.d(TAG, "adas statuslistener disconnected");
super.onServiceDisconnected();
}
});
invokeShowADASOperation();
@@ -583,7 +567,7 @@ public class MogoADASController implements IMogoADASController {
intent.putExtra(PARAM_DATA, object.toString());
sendBroadcast(intent);
} catch (Exception e1) {
Logger.e(TAG, e1, "error.");
e1.printStackTrace();
}
}
}, delay);