[chang]adas lib 移除透传障碍物接口

2022-05-18 18:08:18 +08:00
parent 04222e3bdf
commit 048630673f
12 changed files with 4 additions and 248 deletions
--- a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/DataDistribution.java
+++ b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/DataDistribution.java
@@ -10,7 +10,6 @@ import com.zhidao.adas.client.bean.GlobalPathResp;
 import com.zhidao.adas.client.bean.GnssInfo;
 import com.zhidao.adas.client.bean.MogoReportMessage;
 import com.zhidao.adas.client.bean.MyPointCloud;
-import com.zhidao.adas.client.bean.PerceptionObstacles;
 import com.zhidao.adas.client.bean.PerceptionTrafficLight;
 import com.zhidao.adas.client.bean.PredictionObstacleTrajectory;
 import com.zhidao.adas.client.bean.RecordPanel;
@@ -103,7 +102,6 @@ public class DataDistribution {
    public final List<String> listMogoReportMessage = new ArrayList<>();
    public final List<String> listPerceptionTrafficLight = new ArrayList<>();
    public final List<String> listPredictionObstacleTrajectory = new ArrayList<>();
-    public final List<String> listPerceptionObstacles = new ArrayList<>();
    public final List<String> listBasicInfoReq = new ArrayList<>();
    public final List<String> listRecordPanel = new ArrayList<>();
    public final List<String> listGlobalPathResp = new ArrayList<>();
@@ -238,19 +236,6 @@ public class DataDistribution {
 //                for (OnAdasClientListener listener : listeners) {
 //                    listener.onRefresh();
 //                }
-//            }
-        } else if (data instanceof PerceptionObstacles) {
-            listPerceptionObstacles.add(0, time + str);
-            if (listPerceptionObstacles.size() > LIST_SIZE) {
-                listPerceptionObstacles.remove(listPerceptionObstacles.size() - 1);
-            }
-            if (listener != null) {
-                listener.onRefresh();
-            }
-//            if (!listeners.isEmpty()) {
-//                for (OnAdasClientListener listener : listeners) {
-//                    listener.onRefresh();
-//                }
 //            }
        } else if (data instanceof BasicInfoReq) {
            listBasicInfoReq.add(0, time + str);
--- a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/PerceptionObstacles.java
+++ b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/PerceptionObstacles.java
@@ -1,23 +0,0 @@
-package com.zhidao.adas.client.bean;
-
-import com.google.protobuf.TextFormat;
-
-import mogo.telematics.pad.MessagePad;
-import perception.ObjectOuterClass;
-import prediction.Prediction;
-
-public class PerceptionObstacles extends BaseInfo {
-    public final ObjectOuterClass.TrackedObjects bean;
-
-    public PerceptionObstacles(MessagePad.Header header, ObjectOuterClass.TrackedObjects bean) {
-        super("接收", bean.getSerializedSize(), header);
-        this.bean = bean;
-    }
-
-
-    @Override
-    public String toString() {
-        return super.toString() + TextFormat.printer().escapingNonAscii(false).printToString(bean);
-    }
-
-}
--- a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/InfoFragment.java
+++ b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/InfoFragment.java
@@ -139,9 +139,6 @@ public class InfoFragment extends BaseFragment {
            case Constants.TITLE.RECEIVE_PREDICTION_OBSTACLE_TRAJECTORY:
                adapter.setData(DataDistribution.getInstance().listPredictionObstacleTrajectory);
                break;
-            case Constants.TITLE.RECEIVE_PERCEPTION_OBSTACLES:
-                adapter.setData(DataDistribution.getInstance().listPerceptionObstacles);
-                break;
            case Constants.TITLE.RECEIVE_POINT_CLOUD:
                adapter.setData(DataDistribution.getInstance().listPointCloud);
                break;
--- a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/MainActivity.java
+++ b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/MainActivity.java
@@ -60,7 +60,6 @@ import com.zhidao.adas.client.bean.GnssInfo;
 import com.zhidao.adas.client.bean.IPCConnectState;
 import com.zhidao.adas.client.bean.MogoReportMessage;
 import com.zhidao.adas.client.bean.MyPointCloud;
-import com.zhidao.adas.client.bean.PerceptionObstacles;
 import com.zhidao.adas.client.bean.PerceptionTrafficLight;
 import com.zhidao.adas.client.bean.PredictionObstacleTrajectory;
 import com.zhidao.adas.client.bean.RecordPanel;
@@ -78,7 +77,6 @@ import com.zhidao.support.adas.high.OnMultiDeviceListener;
 import com.zhidao.support.adas.high.bean.VersionCompatibility;
 import com.zhidao.support.adas.high.common.Constants.IPC_CONNECTION_STATUS;
 import com.zhidao.support.adas.high.common.CupidLogUtils;
-import com.zhidao.support.adas.high.common.PointCloudDecoder;
 import com.zhidao.support.adas.high.common.ProtocolStatus;
 import com.zhidao.support.adas.high.common.ReceiveTimeoutManager;

@@ -95,7 +93,6 @@ import chassis.VehicleStateOuterClass;
 import io.netty.channel.Channel;
 import mogo.telematics.pad.MessagePad;
 import mogo_msg.MogoReportMsg;
-import perception.ObjectOuterClass;
 import perception.TrafficLightOuterClass;
 import prediction.Prediction;
 import record_cache.RecordPanelOuterClass;
@@ -148,7 +145,6 @@ public class MainActivity extends BaseActivity implements OnAdasListener, OnAdas
    private InfoFragment reportMessageFragment;
    private InfoFragment perceptionTrafficLightFragment;
    private InfoFragment predictionObstacleTrajectoryFragment;
-    private InfoFragment perceptionObstaclesFragment;
    private InfoFragment pointCloudFragment;
    private VersionFragment versionFragment;
    private FragmentManager manager;
@@ -527,7 +523,6 @@ public class MainActivity extends BaseActivity implements OnAdasListener, OnAdas
        titleFragmentData.add(Constants.TITLE.RECEIVE_GNSS_INFO);
        titleFragmentData.add(Constants.TITLE.RECEIVE_TRAJECTORY);
        titleFragmentData.add(Constants.TITLE.RECEIVE_TRACKED_OBJECTS);
-        titleFragmentData.add(Constants.TITLE.RECEIVE_PERCEPTION_OBSTACLES);
        titleFragmentData.add(Constants.TITLE.RECEIVE_POINT_CLOUD);
        titleFragmentData.add(Constants.TITLE.RECEIVE_VEHICLE_STATE);
        titleFragmentData.add(Constants.TITLE.RECEIVE_AUTOPILOT_STATE);
@@ -703,16 +698,6 @@ public class MainActivity extends BaseActivity implements OnAdasListener, OnAdas
                            transaction.commit();
                        }
                        break;
-                    case Constants.TITLE.RECEIVE_PERCEPTION_OBSTACLES:
-                        showToastCenter("此接口目前弃用");
-//                        hintTrackedObjects(true);
-                        if (perceptionObstaclesFragment == null)
-                            perceptionObstaclesFragment = new InfoFragment(data);
-                        if (!perceptionObstaclesFragment.isVisible()) {
-                            transaction.replace(R.id.fl_info, perceptionObstaclesFragment);
-                            transaction.commit();
-                        }
-                        break;
                    case Constants.TITLE.RECEIVE_POINT_CLOUD:
                        if (pointCloudFragment == null)
                            pointCloudFragment = new InfoFragment(data);
@@ -882,11 +867,6 @@ public class MainActivity extends BaseActivity implements OnAdasListener, OnAdas
        DataDistribution.getInstance().addData(base);
    }

-    @Override
-    public void onTrackedObjects(MessagePad.Header header, ObjectOuterClass.TrackedObjects trackedObjects) {
-        PerceptionObstacles base = new PerceptionObstacles(header, trackedObjects);
-        DataDistribution.getInstance().addData(base);
-    }

    @Override
    public void onPointCloud(MessagePad.Header header, PointCloud.LidarPointCloud pointCloud) {
--- a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/utils/Constants.java
+++ b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/utils/Constants.java
@@ -151,7 +151,6 @@ public class Constants {
        String RECEIVE_REPORT_MESSAGE = "监控事件";
        String RECEIVE_PERCEPTION_TRAFFIC_LIGHT = "感知红绿灯";
        String RECEIVE_PREDICTION_OBSTACLE_TRAJECTORY = "他车轨迹预测";
-        String RECEIVE_PERCEPTION_OBSTACLES = "透传障碍物";
        String RECEIVE_POINT_CLOUD = "点云透传";

        //        String RECEIVE_BASIC_INFO_REQ = "自动驾驶设备基础信息请求";