From 765181d92333e1af7f9ec843219ae590ac735d5d Mon Sep 17 00:00:00 2001 From: xinfengkun Date: Wed, 3 Jan 2024 16:52:56 +0800 Subject: [PATCH] =?UTF-8?q?[626][adas]=20=E8=83=BD=E5=90=A6=E5=90=AF?= =?UTF-8?q?=E5=8A=A8=E8=87=AA=E9=A9=BE=E6=A3=80=E6=B5=8B=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8E=9F=E5=A7=8B=E6=95=B0=E6=8D=AE=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E4=BF=AE=E6=94=B9=E6=88=90=EF=BC=9A=E5=8F=AA=E4=BF=9D?= =?UTF-8?q?=E7=95=99=E8=A7=A3=E6=9E=90=E5=90=8E=E6=9C=89=E7=94=A8=E7=9A=84?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/adas/data/bean/UnableLaunchData.java | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/libraries/mogo-adas-data/src/main/java/com/zhjt/mogo/adas/data/bean/UnableLaunchData.java b/libraries/mogo-adas-data/src/main/java/com/zhjt/mogo/adas/data/bean/UnableLaunchData.java index 7f348db3fd..8dcbf8d2be 100644 --- a/libraries/mogo-adas-data/src/main/java/com/zhjt/mogo/adas/data/bean/UnableLaunchData.java +++ b/libraries/mogo-adas-data/src/main/java/com/zhjt/mogo/adas/data/bean/UnableLaunchData.java @@ -3,7 +3,6 @@ package com.zhjt.mogo.adas.data.bean; import com.google.protobuf.GeneratedMessageV3; import com.google.protobuf.InvalidProtocolBufferException; import com.google.protobuf.util.JsonFormat; -import com.zhjt.mogo.adas.utils.ByteUtil; import org.json.JSONArray; import org.json.JSONException; @@ -66,10 +65,10 @@ public class UnableLaunchData { jsonObject.put("ability_version", abilityVersion); JSONArray array = new JSONArray(); if (statusInfo != null) { - arrayPut(array, statusInfo); + arrayPut(array, statusInfo.getClass().getName(), statusInfo.getAutoPilotReady(), statusInfo.getAutoPilotUnreadyReason()); } if (ssmInfo != null) { - arrayPut(array, ssmInfo); + arrayPut(array, ssmInfo.getClass().getName(), ssmInfo.getAutoPilotReady(), ssmInfo.getAutoPilotUnreadyReason()); } if (fsmStatusReasonRespond != null) { arrayPut(array, fsmStatusReasonRespond); @@ -83,10 +82,22 @@ public class UnableLaunchData { return jsonObject.toString(); } + private void arrayPut(JSONArray array, String name, boolean isReady, String reason) throws JSONException { + JSONObject objectParse = new JSONObject(); + objectParse.put("auto_pilot_ready", isReady); + if (reason != null) { + objectParse.put("auto_pilot_unready_reason", reason); + } + JSONObject object = new JSONObject(); + object.put("name", name); + object.put("parse", objectParse); + array.put(object); + } + private void arrayPut(JSONArray array, GeneratedMessageV3 message) throws JSONException, InvalidProtocolBufferException { JSONObject object = new JSONObject(); object.put("name", message.getClass().getName()); - object.put("original", ByteUtil.byteArrToHex(message.toByteArray(), false)); +// object.put("original", ByteUtil.byteArrToHex(message.toByteArray(), false)); object.put("parse", new JSONObject(JsonFormat.printer().print(message))); array.put(object); }