修改测试程序bug
This commit is contained in:
@@ -104,6 +104,7 @@ public class InfoFragment extends Fragment {
|
|||||||
|
|
||||||
@Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
|
@Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
|
||||||
public void onWarnEvent(Warn info) {
|
public void onWarnEvent(Warn info) {
|
||||||
|
EventBus.getDefault().removeStickyEvent(info);
|
||||||
if (title.equals(MainActivity.TITLE.RECEIVE_WARN)) {
|
if (title.equals(MainActivity.TITLE.RECEIVE_WARN)) {
|
||||||
if (data.size() > 9) {
|
if (data.size() > 9) {
|
||||||
data.remove(0);
|
data.remove(0);
|
||||||
@@ -115,6 +116,7 @@ public class InfoFragment extends Fragment {
|
|||||||
|
|
||||||
@Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
|
@Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
|
||||||
public void onRectEvent(TrackedObjects info) {
|
public void onRectEvent(TrackedObjects info) {
|
||||||
|
EventBus.getDefault().removeStickyEvent(info);
|
||||||
if (title.equals(MainActivity.TITLE.RECEIVE_TRACKED_OBJECTS)) {
|
if (title.equals(MainActivity.TITLE.RECEIVE_TRACKED_OBJECTS)) {
|
||||||
if (data.size() > 4) {
|
if (data.size() > 4) {
|
||||||
data.remove(0);
|
data.remove(0);
|
||||||
@@ -126,6 +128,7 @@ public class InfoFragment extends Fragment {
|
|||||||
|
|
||||||
@Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
|
@Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
|
||||||
public void onErrorEvent(ErrorData info) {
|
public void onErrorEvent(ErrorData info) {
|
||||||
|
EventBus.getDefault().removeStickyEvent(info);
|
||||||
if (title.equals(MainActivity.TITLE.RECEIVE_ERROR)) {
|
if (title.equals(MainActivity.TITLE.RECEIVE_ERROR)) {
|
||||||
if (data.size() > 19) {
|
if (data.size() > 19) {
|
||||||
data.remove(0);
|
data.remove(0);
|
||||||
@@ -182,6 +185,7 @@ public class InfoFragment extends Fragment {
|
|||||||
|
|
||||||
@Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
|
@Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
|
||||||
public void onCarEvent(VehicleState info) {
|
public void onCarEvent(VehicleState info) {
|
||||||
|
EventBus.getDefault().removeStickyEvent(info);
|
||||||
if (title.equals(MainActivity.TITLE.RECEIVE_VEHICLE_STATE)) {
|
if (title.equals(MainActivity.TITLE.RECEIVE_VEHICLE_STATE)) {
|
||||||
if (data.size() > 5) {
|
if (data.size() > 5) {
|
||||||
data.remove(0);
|
data.remove(0);
|
||||||
@@ -196,6 +200,7 @@ public class InfoFragment extends Fragment {
|
|||||||
|
|
||||||
@Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
|
@Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
|
||||||
public void onAutoEvent(GnssInfo info) {
|
public void onAutoEvent(GnssInfo info) {
|
||||||
|
EventBus.getDefault().removeStickyEvent(info);
|
||||||
if (title.equals(MainActivity.TITLE.RECEIVE_GNSS_INFO)) {
|
if (title.equals(MainActivity.TITLE.RECEIVE_GNSS_INFO)) {
|
||||||
if (data.size() > 9) {
|
if (data.size() > 9) {
|
||||||
data.remove(0);
|
data.remove(0);
|
||||||
@@ -207,6 +212,7 @@ public class InfoFragment extends Fragment {
|
|||||||
|
|
||||||
@Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
|
@Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
|
||||||
public void onAutoEvent(AutopilotState info) {
|
public void onAutoEvent(AutopilotState info) {
|
||||||
|
EventBus.getDefault().removeStickyEvent(info);
|
||||||
if (title.equals(MainActivity.TITLE.RECEIVE_AUTOPILOT_STATE)) {
|
if (title.equals(MainActivity.TITLE.RECEIVE_AUTOPILOT_STATE)) {
|
||||||
if (data.size() > 9) {
|
if (data.size() > 9) {
|
||||||
data.remove(0);
|
data.remove(0);
|
||||||
@@ -219,6 +225,7 @@ public class InfoFragment extends Fragment {
|
|||||||
|
|
||||||
@Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
|
@Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
|
||||||
public void onTrajectoryEvent(Trajectory info) {
|
public void onTrajectoryEvent(Trajectory info) {
|
||||||
|
EventBus.getDefault().removeStickyEvent(info);
|
||||||
if (title.equals(MainActivity.TITLE.RECEIVE_TRAJECTORY)) {
|
if (title.equals(MainActivity.TITLE.RECEIVE_TRAJECTORY)) {
|
||||||
if (data.size() > 9) {
|
if (data.size() > 9) {
|
||||||
data.remove(0);
|
data.remove(0);
|
||||||
@@ -230,6 +237,7 @@ public class InfoFragment extends Fragment {
|
|||||||
|
|
||||||
@Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
|
@Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
|
||||||
public void onAutopilotWayArriveEvent(ArrivalNotification info) {
|
public void onAutopilotWayArriveEvent(ArrivalNotification info) {
|
||||||
|
EventBus.getDefault().removeStickyEvent(info);
|
||||||
if (title.equals(MainActivity.TITLE.RECEIVE_ARRIVAL_NOTIFICATION)) {
|
if (title.equals(MainActivity.TITLE.RECEIVE_ARRIVAL_NOTIFICATION)) {
|
||||||
data.add(info.toString());
|
data.add(info.toString());
|
||||||
adapter.notifyDataSetChanged();
|
adapter.notifyDataSetChanged();
|
||||||
@@ -238,6 +246,7 @@ public class InfoFragment extends Fragment {
|
|||||||
|
|
||||||
@Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
|
@Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
|
||||||
public void onAutopilotRouteEvent(GlobalPathResp info) {
|
public void onAutopilotRouteEvent(GlobalPathResp info) {
|
||||||
|
EventBus.getDefault().removeStickyEvent(info);
|
||||||
if (title.equals(MainActivity.TITLE.RECEIVE_GLOBAL_PATH_RESP)) {
|
if (title.equals(MainActivity.TITLE.RECEIVE_GLOBAL_PATH_RESP)) {
|
||||||
data.add(info.toString());
|
data.add(info.toString());
|
||||||
adapter.notifyDataSetChanged();
|
adapter.notifyDataSetChanged();
|
||||||
@@ -246,6 +255,7 @@ public class InfoFragment extends Fragment {
|
|||||||
|
|
||||||
@Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
|
@Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
|
||||||
public void onAutopilotRecordResultEvent(RecordPanel info) {
|
public void onAutopilotRecordResultEvent(RecordPanel info) {
|
||||||
|
EventBus.getDefault().removeStickyEvent(info);
|
||||||
if (title.equals(MainActivity.TITLE.RECEIVE_RECORD_RESULT)) {
|
if (title.equals(MainActivity.TITLE.RECEIVE_RECORD_RESULT)) {
|
||||||
data.add(info.toString());
|
data.add(info.toString());
|
||||||
adapter.notifyDataSetChanged();
|
adapter.notifyDataSetChanged();
|
||||||
@@ -254,6 +264,7 @@ public class InfoFragment extends Fragment {
|
|||||||
|
|
||||||
@Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
|
@Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
|
||||||
public void onAutopilotGuardianInfoEvent(MogoReportMessage info) {
|
public void onAutopilotGuardianInfoEvent(MogoReportMessage info) {
|
||||||
|
EventBus.getDefault().removeStickyEvent(info);
|
||||||
if (title.equals(MainActivity.TITLE.RECEIVE_REPORT_MESSAGE)) {
|
if (title.equals(MainActivity.TITLE.RECEIVE_REPORT_MESSAGE)) {
|
||||||
data.add(info.toString());
|
data.add(info.toString());
|
||||||
adapter.notifyDataSetChanged();
|
adapter.notifyDataSetChanged();
|
||||||
|
|||||||
@@ -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);
|
AdasManager.getInstance().sendTrafficLightData("10038", 26.848153, 112.574883, "180.0", "SN", 100413, -4, 201, 0, detail);
|
||||||
break;
|
break;
|
||||||
case "速度设置":
|
case "速度设置":
|
||||||
AdasManager.getInstance().sendAutopilotSpeedReq(30);
|
AdasManager.getInstance().sendAutopilotSpeedReq(28);
|
||||||
break;
|
break;
|
||||||
case "重启Docker":
|
case "重启Docker":
|
||||||
AdasManager.getInstance().rebootAPDocker();
|
AdasManager.getInstance().rebootAPDocker();
|
||||||
|
|||||||
@@ -341,7 +341,7 @@ public class AdasChannel implements IAdasNetCommApi, FpgaSocket.IWebSocketConnec
|
|||||||
if (raw.getProtocolStatus() == ProtocolStatus.SUCCEED) {
|
if (raw.getProtocolStatus() == ProtocolStatus.SUCCEED) {
|
||||||
MessagePad.Header header = MessagePad.Header.parseFrom(raw.getHeader());
|
MessagePad.Header header = MessagePad.Header.parseFrom(raw.getHeader());
|
||||||
MessagePad.MessageType messageType = header.getMsgType();
|
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);
|
IMsg iMsg = myMessageFactory.createMessage(messageType);
|
||||||
if (iMsg == null) {
|
if (iMsg == null) {
|
||||||
callError(ProtocolStatus.MESSAGE_TYPE_UNKNOWN, bytes);
|
callError(ProtocolStatus.MESSAGE_TYPE_UNKNOWN, bytes);
|
||||||
|
|||||||
Reference in New Issue
Block a user