[600]SSL证书相互传递

app_mogo_magic_ring/release/output.json

@@ -1 +0,0 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0","enabled":true,"outputFile":"app_mogo_magic_ring-release.apk","fullName":"release","baseName":"release"},"path":"app_mogo_magic_ring-release.apk","properties":{}}]

libraries/mogo-adas-data/src/main/proto/message_pad.proto

@@ -259,6 +259,7 @@ message TrajectoryDownloadReq
 // message definition for MessageType: MsgTypeBasicInfoReq
 message BasicInfoReq 
 {
+    bytes certification = 1;//域控ssl证书
 }
 
 // message definition for MessageType: MsgTypeBasicInfoResp
@@ -268,6 +269,7 @@ message BasicInfoResp
     uint32 environment = 2; //1: 研发环境, 2:测试环境, 3:生产环境 4:演示环境
     uint32 role = 3; //客户端角色：0: 司机屏，1: 乘客屏，2: 调试屏
     string version = 4; //鹰眼版本
+    bytes certification = 5; //鹰眼ssl证书
 }
 
 // message definition for MsgTypeSetAutopilotModeReq

libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasChannel.java

@@ -812,22 +812,41 @@ public class AdasChannel implements IAdasNetCommApi, FpgaSocket.IWebSocketConnec
     /**
      * 自动驾驶设备基础信息应答
      *
-     * @param sn          SN
+     * @param sn            SN
-     * @param environment 环境 详情参见{@link Constants.ENVIRONMENT}1: 研发环境, 2:测试环境, 3:生产环境 4:演示环境
+     * @param environment   环境 详情参见{@link Constants.ENVIRONMENT}1: 研发环境, 2:测试环境, 3:生产环境 4:演示环境
-     * @param role        终端角色 详情参见{@link Constants.TERMINAL_ROLE}
+     * @param role          终端角色 详情参见{@link Constants.TERMINAL_ROLE}
+     * @param versionCode   鹰眼版本号
+     * @param versionName   鹰眼版本名
+     * @param certification 鹰眼ssl证书
      * @return boolean
      */
     @Override
-    public boolean sendBasicInfoResp(@NonNull String sn, @Define.Environment int environment, @Define.TerminalRole int role) {
+    public boolean sendBasicInfoResp(@NonNull String sn, @Define.Environment int environment, @Define.TerminalRole int role, int versionCode, String versionName, byte[] certification) {
         if (sn == null) {
             sn = "";
         }
-        MessagePad.BasicInfoResp resp = MessagePad.BasicInfoResp
+        MessagePad.BasicInfoResp.Builder builder = MessagePad.BasicInfoResp.newBuilder()
-                .newBuilder()
                 .setSn(sn)
                 .setEnvironment(environment)
-                .setRole(role)
+                .setRole(role);
-                .build();
+        String version = null;
+        if (versionCode > 0) {
+            version = String.valueOf(versionCode);
+        }
+        if (!TextUtils.isEmpty(versionName)) {
+            if (version != null) {
+                version += "," + versionName;
+            } else {
+                version = versionName;
+            }
+        }
+        if (!TextUtils.isEmpty(version)) {
+            builder.setVersion(version);
+        }
+        if (certification != null && certification.length > 0) {
+            builder.setCertification(com.google.protobuf.ByteString.copyFrom(certification));
+        }
+        MessagePad.BasicInfoResp resp = builder.build();
         return sendPBMessage(MessageType.TYPE_SEND_BASIC_INFO_RESP.typeCode, resp.toByteArray());
     }
 

libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasManager.java

@@ -290,9 +290,51 @@ public class AdasManager implements IAdasNetCommApi {
      * @param role        终端角色 详情参见{@link Constants.TERMINAL_ROLE}
      * @return boolean
      */
-    @Override
     public boolean sendBasicInfoResp(@NonNull String sn, @Define.Environment int environment, @Define.TerminalRole int role) {
-        return mChannel != null && mChannel.sendBasicInfoResp(sn, environment, role);
+        return sendBasicInfoResp(sn, environment, role, -1, null, null);
+    }
+
+    /**
+     * 自动驾驶设备基础信息应答
+     *
+     * @param sn          SN
+     * @param environment 环境 详情参见{@link Constants.ENVIRONMENT}1: 研发环境, 2:测试环境, 3:生产环境 4:演示环境
+     * @param role        终端角色 详情参见{@link Constants.TERMINAL_ROLE}
+     * @param versionCode 鹰眼版本号
+     * @param versionName 鹰眼版本名
+     * @return boolean
+     */
+    public boolean sendBasicInfoResp(@NonNull String sn, int environment, int role, int versionCode, String versionName) {
+        return sendBasicInfoResp(sn, environment, role, versionCode, versionName, null);
+    }
+
+    /**
+     * 自动驾驶设备基础信息应答
+     *
+     * @param sn            SN
+     * @param environment   环境 详情参见{@link Constants.ENVIRONMENT}1: 研发环境, 2:测试环境, 3:生产环境 4:演示环境
+     * @param role          终端角色 详情参见{@link Constants.TERMINAL_ROLE}
+     * @param certification 鹰眼ssl证书
+     * @return boolean
+     */
+    public boolean sendBasicInfoResp(@NonNull String sn, @Define.Environment int environment, @Define.TerminalRole int role, byte[] certification) {
+        return sendBasicInfoResp(sn, environment, role, -1, null, certification);
+    }
+
+    /**
+     * 自动驾驶设备基础信息应答
+     *
+     * @param sn            SN
+     * @param environment   环境 详情参见{@link Constants.ENVIRONMENT}1: 研发环境, 2:测试环境, 3:生产环境 4:演示环境
+     * @param role          终端角色 详情参见{@link Constants.TERMINAL_ROLE}
+     * @param versionCode   鹰眼版本号
+     * @param versionName   鹰眼版本名
+     * @param certification 鹰眼ssl证书
+     * @return boolean
+     */
+    @Override
+    public boolean sendBasicInfoResp(@NonNull String sn, @Define.Environment int environment, @Define.TerminalRole int role, int versionCode, String versionName, byte[] certification) {
+        return mChannel != null && mChannel.sendBasicInfoResp(sn, environment, role, versionCode, versionName, certification);
     }
 
     /**

libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/IAdasNetCommApi.java

@@ -76,12 +76,15 @@ public interface IAdasNetCommApi {
     /**
      * 自动驾驶设备基础信息应答
      *
-     * @param sn          SN
+     * @param sn            SN
-     * @param environment 环境 详情参见{@link Constants.ENVIRONMENT}1: 研发环境, 2:测试环境, 3:生产环境 4:演示环境
+     * @param environment   环境 详情参见{@link Constants.ENVIRONMENT}1: 研发环境, 2:测试环境, 3:生产环境 4:演示环境
-     * @param role        终端角色 详情参见{@link Constants.TERMINAL_ROLE}
+     * @param role          终端角色 详情参见{@link Constants.TERMINAL_ROLE}
-     * @return 加入WS发送消息队列是否成功
+     * @param versionCode   鹰眼版本号
+     * @param versionName   鹰眼版本名
+     * @param certification 鹰眼ssl证书
+     * @return boolean
      */
-    boolean sendBasicInfoResp(@NonNull String sn, @Define.Environment int environment, @Define.TerminalRole int role);
+    boolean sendBasicInfoResp(@NonNull String sn, @Define.Environment int environment, @Define.TerminalRole int role, int versionCode, String versionName, byte[] certification);
 
     /**
      * 设置自动驾驶模式 启动自动驾驶