[change] 自动驾驶设备基础信息应答添加角色字段

app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/MainActivity.java

@@ -1149,7 +1149,42 @@ public class MainActivity extends BaseActivity implements OnAdasListener, OnAdas
                 break;
             case Constants.TITLE.SEND_BASIC_INFO_RESP:
                 //发送sn
-                AdasManager.getInstance().sendBasicInfoResp("X202021111192N41VY", 0);
+                //速度设置
+                AlertDialog.Builder builder = new AlertDialog.Builder(this);
+                builder.setTitle("发送SN");
+                View view = getLayoutInflater().inflate(R.layout.dialog_sn, null);
+                final EditText et = view.findViewById(R.id.et);
+                final EditText ev = view.findViewById(R.id.ev);
+                final EditText role = view.findViewById(R.id.role);
+                builder.setView(view);//
+                builder.setCancelable(false);//
+                builder.setPositiveButton("发送", null);
+                //设置反面按钮，并做事件处理
+                builder.setNegativeButton("取消", null);
+                AlertDialog alertDialog = builder.show();//显示Dialog对话框
+                alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        Editable editable = et.getText();
+                        if (TextUtils.isEmpty(editable)) {
+                            // 条件不成立不能关闭 AlertDialog 窗口
+                            Toast.makeText(MainActivity.this, "请输入SN", Toast.LENGTH_SHORT).show();
+                            return;
+                        }
+                        int evInt = 0;
+                        Editable evEd = ev.getText();
+                        if (!TextUtils.isEmpty(evEd)) {
+                            evInt = Integer.parseInt(evEd.toString().trim());
+                        }
+                        int roleInt = com.zhidao.support.adas.high.common.Constants.TERMINAL_ROLE.DEBUG;
+                        Editable roleEd = role.getText();
+                        if (!TextUtils.isEmpty(roleEd)) {
+                            roleInt = Integer.parseInt(roleEd.toString().trim());
+                        }
+                        AdasManager.getInstance().sendBasicInfoResp(editable.toString().trim(), evInt, roleInt);
+                        alertDialog.dismiss();
+                    }
+                });
                 break;
             case Constants.TITLE.SEND_RECORD_DATA_5:
                 //数据采集5秒

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

@@ -188,6 +188,7 @@ message BasicInfoResp
 {
     string sn = 1;
     uint32 environment = 2; //1: 研发环境, 2:测试环境, 3:生产环境 4:演示环境
+    uint32 role = 3; //客户端角色：0: 司机屏，1: 乘客屏，2: 调试屏
 }
 
 // message definition for MsgTypeSetAutopilotModeReq

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

@@ -616,11 +616,12 @@ public class AdasChannel implements IAdasNetCommApi, FpgaSocket.IWebSocketConnec
      * 自动驾驶设备基础信息应答
      *
      * @param sn          SN
-     * @param environment 1: 研发环境, 2:测试环境, 3:生产环境 4:演示环境
+     * @param environment 环境 详情参见{@link Constants.ENVIRONMENT}1: 研发环境, 2:测试环境, 3:生产环境 4:演示环境
+     * @param role        终端角色 详情参见{@link Constants.TERMINAL_ROLE}
      * @return boolean
      */
     @Override
-    public boolean sendBasicInfoResp(@NonNull String sn, int environment) {
+    public boolean sendBasicInfoResp(@NonNull String sn, @Define.Environment int environment, @Define.TerminalRole int role) {
         if (sn == null) {
             sn = "";
         }
@@ -628,6 +629,7 @@ public class AdasChannel implements IAdasNetCommApi, FpgaSocket.IWebSocketConnec
                 .newBuilder()
                 .setSn(sn)
                 .setEnvironment(environment)
+                .setRole(role)
                 .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

@@ -262,12 +262,13 @@ public class AdasManager implements IAdasNetCommApi {
      * 自动驾驶设备基础信息应答
      *
      * @param sn          SN
-     * @param environment 1: 研发环境, 2:测试环境, 3:生产环境 4:演示环境
-     * @return
+     * @param environment 环境 详情参见{@link Constants.ENVIRONMENT}1: 研发环境, 2:测试环境, 3:生产环境 4:演示环境
+     * @param role        终端角色 详情参见{@link Constants.TERMINAL_ROLE}
+     * @return boolean
      */
     @Override
-    public boolean sendBasicInfoResp(@NonNull String sn, int environment) {
-        return mChannel != null && mChannel.sendBasicInfoResp(sn, environment);
+    public boolean sendBasicInfoResp(@NonNull String sn, @Define.Environment int environment, @Define.TerminalRole int role) {
+        return mChannel != null && mChannel.sendBasicInfoResp(sn, environment, role);
     }
 
     /**

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

@@ -57,10 +57,11 @@ public interface IAdasNetCommApi {
      * 自动驾驶设备基础信息应答
      *
      * @param sn          SN
-     * @param environment 1: 研发环境, 2:测试环境, 3:生产环境 4:演示环境
-     * @return boolean
+     * @param environment 环境 详情参见{@link Constants.ENVIRONMENT}1: 研发环境, 2:测试环境, 3:生产环境 4:演示环境
+     * @param role        终端角色 详情参见{@link Constants.TERMINAL_ROLE}
+     * @return 加入WS发送消息队列是否成功
      */
-    boolean sendBasicInfoResp(@NonNull String sn, int environment);
+    boolean sendBasicInfoResp(@NonNull String sn, @Define.Environment int environment, @Define.TerminalRole int role);
 
     /**
      * 设置自动驾驶模式 启动自动驾驶