From cc42c9f9df63eeaee62797b055af77bd7b9d9d1d Mon Sep 17 00:00:00 2001 From: xinfengkun Date: Fri, 18 Mar 2022 13:03:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95=E7=A8=8B?= =?UTF-8?q?=E5=BA=8Fbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zhidao/adas/client/ui/mian/InfoFragment.java | 11 +++++++++++ .../com/zhidao/adas/client/ui/mian/MainActivity.java | 2 +- .../com/zhidao/support/adas/high/AdasChannel.java | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/mian/InfoFragment.java b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/mian/InfoFragment.java index fda17fe9d6..28898aa44d 100644 --- a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/mian/InfoFragment.java +++ b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/mian/InfoFragment.java @@ -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(); diff --git a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/mian/MainActivity.java b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/mian/MainActivity.java index f94cc905b5..8bea944df4 100644 --- a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/mian/MainActivity.java +++ b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/mian/MainActivity.java @@ -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(); diff --git a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasChannel.java b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasChannel.java index 1547dbeee0..15f6925b48 100644 --- a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasChannel.java +++ b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasChannel.java @@ -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);