完成新架构的域控制器的监听及数据改造

Signed-off-by: 董宏宇 <martindhy@gmail.com>

core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutoPilotControlCmdParameter.java

@@ -1,19 +1,28 @@
 package com.mogo.eagle.core.data.autopilot;
 
-public
+
 /**
  * @author congtaowang
  * @since 2020/10/22
  *
  * 域控制器 控制指令发送
+ *
  */
-class AutoPilotControlCmdParameter {
+public class AutopilotControlCmdParameter {
 
     public String action;
     public Object result;
 
-    public AutoPilotControlCmdParameter(String action, Object result ) {
+    public AutopilotControlCmdParameter(String action, Object result) {
         this.action = action;
         this.result = result;
     }
+
+    @Override
+    public String toString() {
+        return "AutoPilotControlCmdParameter{" +
+                "action='" + action + '\'' +
+                ", result=" + result +
+                '}';
+    }
 }

core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutoPilotControlParameters.java

@@ -7,8 +7,9 @@ import java.util.List;
  * @since 2021/09/22
  * <p>
  * 启动自动驾驶参数
+ *
  */
-public class AutoPilotControlParameters {
+public class AutopilotControlParameters {
 
     public AutoPilotLonLat startLatLon;
     public List<AutoPilotLonLat> wayLatLons;

core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutoPilotStationInfo.java

@@ -1,21 +1,54 @@
 package com.mogo.eagle.core.data.autopilot;
 
-public
 /**
  * @author congtaowang
  * @since 2021/1/18
- *
+ * <p>
  * 自动驾驶网约车回调数据
+ *
  */
-class AutoPilotStationInfo {
+public class AutopilotStationInfo {
 
-    public int type;
-    public double lon;
-    public double lat;
+    private int type;
+    private double lon;
+    private double lat;
 
-    public AutoPilotStationInfo(int type, double lon, double lat ) {
+    public AutopilotStationInfo(int type, double lon, double lat) {
         this.type = type;
         this.lon = lon;
         this.lat = lat;
     }
+
+    public int getType() {
+        return type;
+    }
+
+    public void setType(int type) {
+        this.type = type;
+    }
+
+    public double getLon() {
+        return lon;
+    }
+
+    public void setLon(double lon) {
+        this.lon = lon;
+    }
+
+    public double getLat() {
+        return lat;
+    }
+
+    public void setLat(double lat) {
+        this.lat = lat;
+    }
+
+    @Override
+    public String toString() {
+        return "AutoPilotStationInfo{" +
+                "type=" + type +
+                ", lon=" + lon +
+                ", lat=" + lat +
+                '}';
+    }
 }

core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutoPilotStatusInfo.kt

@@ -1,12 +1,15 @@
 package com.mogo.eagle.core.data.autopilot
 
+import java.io.Serializable
+
 /**
  * @author xiaoyuzhou
  * @date 2021/10/12 8:16 下午
  * 域控制器状态信息
  * 不建议自己初始化此对象，建议使用 CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo();
+ *
  */
-class AutoPilotStatusInfo {
+class AutopilotStatusInfo : Serializable {
     /**
      * 当前链接的IP地址, 默认地址 192.168.1.102
      */
@@ -29,17 +32,12 @@ class AutoPilotStatusInfo {
     /**
      * 自动驾驶状态 0是不可用 1是ready 2是自动驾驶start
      */
-    var autopilotStatus = 0
-
-    /**
-     * 自动驾驶状态 0非自动驾驶，1自动驾驶
-     */
-    var autoDriveStatus = 0
+    var state = 0
 
     /**
      * 不可用原因
      */
-    var errorReason: String = ""
+    var reason: String = ""
 
     /**
      * 摄像头状态 1代表开启，0代表关闭
@@ -55,4 +53,10 @@ class AutoPilotStatusInfo {
      * RTK状态 1代表开启，0代表关闭
      */
     var rtk = 0
+
+    /**
+     * 自动驾驶状态 0非自动驾驶，1自动驾驶
+     */
+    var pilotmode = 0
+
 }

core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotControlCmdParameter.java

@@ -1,28 +0,0 @@
-package com.mogo.eagle.core.data.autopilot;
-
-
-/**
- * @author congtaowang
- * @since 2020/10/22
- *
- * 域控制器 控制指令发送
- *
- */
-public class AutopilotControlCmdParameter {
-
-    public String action;
-    public Object result;
-
-    public AutopilotControlCmdParameter(String action, Object result) {
-        this.action = action;
-        this.result = result;
-    }
-
-    @Override
-    public String toString() {
-        return "AutoPilotControlCmdParameter{" +
-                "action='" + action + '\'' +
-                ", result=" + result +
-                '}';
-    }
-}

core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotControlParameters.java

@@ -1,55 +0,0 @@
-package com.mogo.eagle.core.data.autopilot;
-
-import java.util.List;
-
-/**
- * @author donghongyu
- * @since 2021/09/22
- * <p>
- * 启动自动驾驶参数
- *
- */
-public class AutopilotControlParameters {
-
-    public AutoPilotLonLat startLatLon;
-    public List<AutoPilotLonLat> wayLatLons;
-    public AutoPilotLonLat endLatLon;
-    public float speedLimit;
-    public int vehicleType;// 运营类型
-    /**
-     * 是否播放adas的 开始自动驾驶 语音
-     */
-    public boolean isSpeakVoice = true;
-
-    public static class AutoPilotLonLat {
-        public double lat;
-        public double lon;
-
-        public AutoPilotLonLat() {
-        }
-
-        public AutoPilotLonLat(double lat, double lon) {
-            this.lat = lat;
-            this.lon = lon;
-        }
-
-        @Override
-        public String toString() {
-            return "AutoPilotLonLat{" +
-                    "lat=" + lat +
-                    ", lon=" + lon +
-                    '}';
-        }
-    }
-
-    @Override
-    public String toString() {
-        return "RemoteControlAutoPilotParameters{" +
-                "startLatLon=" + startLatLon +
-                ", wayLatLons=" + wayLatLons +
-                ", endLatLon=" + endLatLon +
-                ", speedLimit=" + speedLimit +
-                ", vehicleType=" + vehicleType +
-                '}';
-    }
-}

core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotStationInfo.java

@@ -1,54 +0,0 @@
-package com.mogo.eagle.core.data.autopilot;
-
-/**
- * @author congtaowang
- * @since 2021/1/18
- * <p>
- * 自动驾驶网约车回调数据
- *
- */
-public class AutopilotStationInfo {
-
-    private int type;
-    private double lon;
-    private double lat;
-
-    public AutopilotStationInfo(int type, double lon, double lat) {
-        this.type = type;
-        this.lon = lon;
-        this.lat = lat;
-    }
-
-    public int getType() {
-        return type;
-    }
-
-    public void setType(int type) {
-        this.type = type;
-    }
-
-    public double getLon() {
-        return lon;
-    }
-
-    public void setLon(double lon) {
-        this.lon = lon;
-    }
-
-    public double getLat() {
-        return lat;
-    }
-
-    public void setLat(double lat) {
-        this.lat = lat;
-    }
-
-    @Override
-    public String toString() {
-        return "AutoPilotStationInfo{" +
-                "type=" + type +
-                ", lon=" + lon +
-                ", lat=" + lat +
-                '}';
-    }
-}

core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotStatusInfo.kt

@@ -1,62 +0,0 @@
-package com.mogo.eagle.core.data.autopilot
-
-import java.io.Serializable
-
-/**
- * @author xiaoyuzhou
- * @date 2021/10/12 8:16 下午
- * 域控制器状态信息
- * 不建议自己初始化此对象，建议使用 CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo();
- *
- */
-class AutopilotStatusInfo : Serializable {
-    /**
-     * 当前链接的IP地址, 默认地址 192.168.1.102
-     */
-    var connectIP: String = "0.0.0.0"
-    var connectStatus = false
-    var version: String = "v0.0"
-
-    /**
-     * 定位是否可用
-     */
-    var locationStatus = false
-    var locationLat = 0.0
-    var locationLon = 0.0
-
-    /**
-     * 车速 m/s
-     */
-    var speed = 0f
-
-    /**
-     * 自动驾驶状态 0是不可用 1是ready 2是自动驾驶start
-     */
-    var state = 0
-
-    /**
-     * 不可用原因
-     */
-    var reason: String = ""
-
-    /**
-     * 摄像头状态 1代表开启，0代表关闭
-     */
-    var camera = 0
-
-    /**
-     * 雷达状态 1代表开启，0代表关闭
-     */
-    var radar = 0
-
-    /**
-     * RTK状态 1代表开启，0代表关闭
-     */
-    var rtk = 0
-
-    /**
-     * 自动驾驶状态 0非自动驾驶，1自动驾驶
-     */
-    var pilotmode = 0
-
-}