[Update]升级ADAS版本，增加Docker版本展示，自动驾驶状态展示

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>

config.gradle

@@ -114,7 +114,7 @@ ext {
             obusdk                       : "com.zhidao.enterprise.smartv2x:smartv2x:1.0.0.3",
             mogoobu                      : 'com.zhidao.support.obu:mogoobu:1.0.0.17',
             mogoami                      : 'com.zhidao.support.obu.ami:mogoami:1.0.0.4',
-            adasHigh                     : 'com.zhidao.support.adas:high:1.2.0.11',
+            adasHigh                     : 'com.zhidao.support.adas:high:1.2.0.14',
 
             // google
             googlezxing                  : "com.google.zxing:core:3.3.3",

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

@@ -64,7 +64,10 @@ public class AutopilotStatus implements Serializable {
          * 自动驾驶状态 0非自动驾驶，1自动驾驶
          */
         private int pilotmode;
-
+        /**
+         * 自动驾驶车控状态，0-人工驾驶， 1-自动驾驶
+         */
+        private int control_pilotmode;
 
         public int getState() {
             return state;
@@ -74,6 +77,14 @@ public class AutopilotStatus implements Serializable {
             this.state = state;
         }
 
+        public float getSpeed() {
+            return speed;
+        }
+
+        public void setSpeed(float speed) {
+            this.speed = speed;
+        }
+
         public String getReason() {
             return reason;
         }
@@ -82,27 +93,66 @@ public class AutopilotStatus implements Serializable {
             this.reason = reason;
         }
 
-        public float getSpeed() {
-            return speed;
-        }
-
-        public void setSpeed(float speed) {
-            this.speed = speed;
-        }
         public int getCamera() {
             return camera;
         }
 
+        public void setCamera(int camera) {
+            this.camera = camera;
+        }
+
         public int getRadar() {
             return radar;
         }
 
+        public void setRadar(int radar) {
+            this.radar = radar;
+        }
+
         public int getRtk() {
             return rtk;
         }
 
+        public void setRtk(int rtk) {
+            this.rtk = rtk;
+        }
+
         public int getPilotmode() {
             return pilotmode;
         }
+
+        public void setPilotmode(int pilotmode) {
+            this.pilotmode = pilotmode;
+        }
+
+        public int getControl_pilotmode() {
+            return control_pilotmode;
+        }
+
+        public void setControl_pilotmode(int control_pilotmode) {
+            this.control_pilotmode = control_pilotmode;
+        }
+
+        @Override
+        public String toString() {
+            return "ValuesBean{" +
+                    "state=" + state +
+                    ", speed=" + speed +
+                    ", reason='" + reason + '\'' +
+                    ", camera=" + camera +
+                    ", radar=" + radar +
+                    ", rtk=" + rtk +
+                    ", pilotmode=" + pilotmode +
+                    ", control_pilotmode=" + control_pilotmode +
+                    '}';
+        }
+    }
+
+    @Override
+    public String toString() {
+        return "AutopilotStatus{" +
+                "action='" + action + '\'' +
+                ", values=" + values +
+                '}';
     }
 }

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

@@ -17,6 +17,11 @@ class AutopilotStatusInfo : Serializable {
     var connectStatus = false
     var version: String = "v0.0"
 
+    /**
+     * 工控机镜像版本
+     */
+    var dockVersion: String = "v0.0"
+
     /**
      * 定位是否可用
      */
@@ -59,4 +64,9 @@ class AutopilotStatusInfo : Serializable {
      */
     var pilotmode = 0
 
+    /**
+     * 自动驾驶状态 0非自动驾驶，1自动驾驶
+     */
+    var control_pilotmode = 0
+
 }

modules/mogo-module-adas/src/main/java/com/mogo/module/adas/OnAdasListenerAdapter.java

@@ -70,6 +70,7 @@ public class OnAdasListenerAdapter implements OnAdasListener {
             AutopilotStatusInfo autopilotStatusInfo = CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo();
             autopilotStatusInfo.setState(autopilotStatusValues.getState());
             autopilotStatusInfo.setPilotmode(autopilotStatusValues.getPilotmode());
+            autopilotStatusInfo.setControl_pilotmode(autopilotStatusValues.getControl_pilotmode());
             autopilotStatusInfo.setReason(autopilotStatusValues.getReason());
             autopilotStatusInfo.setCamera(autopilotStatusValues.getCamera());
             autopilotStatusInfo.setRtk(autopilotStatusValues.getRtk());
@@ -78,6 +79,7 @@ public class OnAdasListenerAdapter implements OnAdasListener {
             // 初始化自动驾驶状态信息
             autopilotStatusInfo.setVersion(AdasManager.getInstance().getAdasConfig().getVersion());
             autopilotStatusInfo.setConnectIP(AdasManager.getInstance().getAdasConfig().getAddress());
+            autopilotStatusInfo.setDockVersion(AdasManager.getInstance().getAdasConfig().getDockVersion());
 
             CallerAutoPilotStatusListenerManager.INSTANCE.invokeAutoPilotStatus();
         }