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

修改测试程序bug

Browse Source
This commit is contained in:
xinfengkun
2022-03-18 13:03:02 +08:00
parent 22c7920027
commit cc42c9f9df
3 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/mian/InfoFragment.java
View File

@@ -104,6 +104,7 @@ public class InfoFragment extends Fragment {
@Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
public void onWarnEvent(Warn info) {
EventBus.getDefault().removeStickyEvent(info);
if (title.equals(MainActivity.TITLE.RECEIVE_WARN)) {
if (data.size() > 9) {
data.remove(0);
@@ -115,6 +116,7 @@ public class InfoFragment extends Fragment {
@Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
public void onRectEvent(TrackedObjects info) {
EventBus.getDefault().removeStickyEvent(info);
if (title.equals(MainActivity.TITLE.RECEIVE_TRACKED_OBJECTS)) {
if (data.size() > 4) {
data.remove(0);
@@ -126,6 +128,7 @@ public class InfoFragment extends Fragment {
@Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
public void onErrorEvent(ErrorData info) {
EventBus.getDefault().removeStickyEvent(info);
if (title.equals(MainActivity.TITLE.RECEIVE_ERROR)) {
if (data.size() > 19) {
data.remove(0);
@@ -182,6 +185,7 @@ public class InfoFragment extends Fragment {
@Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
public void onCarEvent(VehicleState info) {
EventBus.getDefault().removeStickyEvent(info);
if (title.equals(MainActivity.TITLE.RECEIVE_VEHICLE_STATE)) {
if (data.size() > 5) {
data.remove(0);
@@ -196,6 +200,7 @@ public class InfoFragment extends Fragment {
@Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
public void onAutoEvent(GnssInfo info) {
EventBus.getDefault().removeStickyEvent(info);
if (title.equals(MainActivity.TITLE.RECEIVE_GNSS_INFO)) {
if (data.size() > 9) {
data.remove(0);
@@ -207,6 +212,7 @@ public class InfoFragment extends Fragment {
@Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
public void onAutoEvent(AutopilotState info) {
EventBus.getDefault().removeStickyEvent(info);
if (title.equals(MainActivity.TITLE.RECEIVE_AUTOPILOT_STATE)) {
if (data.size() > 9) {
data.remove(0);
@@ -219,6 +225,7 @@ public class InfoFragment extends Fragment {
@Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
public void onTrajectoryEvent(Trajectory info) {
EventBus.getDefault().removeStickyEvent(info);
if (title.equals(MainActivity.TITLE.RECEIVE_TRAJECTORY)) {
if (data.size() > 9) {
data.remove(0);
@@ -230,6 +237,7 @@ public class InfoFragment extends Fragment {
@Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
public void onAutopilotWayArriveEvent(ArrivalNotification info) {
EventBus.getDefault().removeStickyEvent(info);
if (title.equals(MainActivity.TITLE.RECEIVE_ARRIVAL_NOTIFICATION)) {
data.add(info.toString());
adapter.notifyDataSetChanged();
@@ -238,6 +246,7 @@ public class InfoFragment extends Fragment {
@Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
public void onAutopilotRouteEvent(GlobalPathResp info) {
EventBus.getDefault().removeStickyEvent(info);
if (title.equals(MainActivity.TITLE.RECEIVE_GLOBAL_PATH_RESP)) {
data.add(info.toString());
adapter.notifyDataSetChanged();
@@ -246,6 +255,7 @@ public class InfoFragment extends Fragment {
@Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
public void onAutopilotRecordResultEvent(RecordPanel info) {
EventBus.getDefault().removeStickyEvent(info);
if (title.equals(MainActivity.TITLE.RECEIVE_RECORD_RESULT)) {
data.add(info.toString());
adapter.notifyDataSetChanged();
@@ -254,6 +264,7 @@ public class InfoFragment extends Fragment {
@Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
public void onAutopilotGuardianInfoEvent(MogoReportMessage info) {
EventBus.getDefault().removeStickyEvent(info);
if (title.equals(MainActivity.TITLE.RECEIVE_REPORT_MESSAGE)) {
data.add(info.toString());
adapter.notifyDataSetChanged();

2
app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/mian/MainActivity.java
View File

@@ -970,7 +970,7 @@ public class MainActivity extends AppCompatActivity implements OnAdasListener, O
AdasManager.getInstance().sendTrafficLightData("10038", 26.848153, 112.574883, "180.0", "SN", 100413, -4, 201, 0, detail);
break;
case "速度设置":
AdasManager.getInstance().sendAutopilotSpeedReq(30);
AdasManager.getInstance().sendAutopilotSpeedReq(28);
break;
case "重启Docker":
AdasManager.getInstance().rebootAPDocker();

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

@@ -341,7 +341,7 @@ public class AdasChannel implements IAdasNetCommApi, FpgaSocket.IWebSocketConnec
if (raw.getProtocolStatus() == ProtocolStatus.SUCCEED) {
MessagePad.Header header = MessagePad.Header.parseFrom(raw.getHeader());
MessagePad.MessageType messageType = header.getMsgType();
CupidLogUtils.w("--->websocket byte read header = " + messageType.toString());
// CupidLogUtils.w("--->websocket byte read header = " + messageType.toString());
IMsg iMsg = myMessageFactory.createMessage(messageType);
if (iMsg == null) {
callError(ProtocolStatus.MESSAGE_TYPE_UNKNOWN, bytes);