From dc5b620703dcfdeed0339d1d157f2fb15419aa97 Mon Sep 17 00:00:00 2001 From: xinfengkun Date: Thu, 17 Mar 2022 17:45:14 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E8=AF=95=E7=A8=8B=E5=BA=8F=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E7=9B=91=E6=8E=A7=E4=BA=8B=E4=BB=B6=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zhidao/adas/client/bean/ArrivalNotification.java | 2 +- .../java/com/zhidao/adas/client/bean/AutopilotState.java | 2 +- .../main/java/com/zhidao/adas/client/bean/BasicInfoReq.java | 2 +- .../java/com/zhidao/adas/client/bean/CarConfigResp.java | 2 +- .../java/com/zhidao/adas/client/bean/GlobalPathResp.java | 2 +- .../src/main/java/com/zhidao/adas/client/bean/GnssInfo.java | 2 +- .../java/com/zhidao/adas/client/bean/MogoReportMessage.java | 2 +- .../main/java/com/zhidao/adas/client/bean/RecordPanel.java | 2 +- .../java/com/zhidao/adas/client/bean/TrackedObjects.java | 2 +- .../main/java/com/zhidao/adas/client/bean/Trajectory.java | 2 +- .../main/java/com/zhidao/adas/client/bean/VehicleState.java | 2 +- .../src/main/java/com/zhidao/adas/client/bean/Warn.java | 2 +- .../java/com/zhidao/adas/client/ui/mian/InfoFragment.java | 3 ++- .../java/com/zhidao/adas/client/ui/mian/MainActivity.java | 6 +++--- 14 files changed, 17 insertions(+), 16 deletions(-) diff --git a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/ArrivalNotification.java b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/ArrivalNotification.java index 8ee24ac34e..787f60c6d0 100644 --- a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/ArrivalNotification.java +++ b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/ArrivalNotification.java @@ -15,7 +15,7 @@ public class ArrivalNotification extends Base { @Override public String toString() { - return super.toString() + "Data:" + TextFormat.printer().escapingNonAscii(false).printToString(bean); + return super.toString() + TextFormat.printer().escapingNonAscii(false).printToString(bean); } } diff --git a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/AutopilotState.java b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/AutopilotState.java index f067d388d1..95924fa432 100644 --- a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/AutopilotState.java +++ b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/AutopilotState.java @@ -16,7 +16,7 @@ public class AutopilotState extends Base { @Override public String toString() { - return super.toString() + "Data:" + TextFormat.printer().escapingNonAscii(false).printToString(bean); + return super.toString() + TextFormat.printer().escapingNonAscii(false).printToString(bean); } } diff --git a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/BasicInfoReq.java b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/BasicInfoReq.java index 4fb4076519..698bea7d2d 100644 --- a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/BasicInfoReq.java +++ b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/BasicInfoReq.java @@ -16,6 +16,6 @@ public class BasicInfoReq extends Base { @Override public String toString() { - return super.toString() + "Data:" + TextFormat.printer().escapingNonAscii(false).printToString(bean); + return super.toString() + TextFormat.printer().escapingNonAscii(false).printToString(bean); } } diff --git a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/CarConfigResp.java b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/CarConfigResp.java index aa9d82790d..85488fe61a 100644 --- a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/CarConfigResp.java +++ b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/CarConfigResp.java @@ -16,6 +16,6 @@ public class CarConfigResp extends Base { @Override public String toString() { - return super.toString() + "Data:" + TextFormat.printer().escapingNonAscii(false).printToString(bean); + return super.toString() + TextFormat.printer().escapingNonAscii(false).printToString(bean); } } diff --git a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/GlobalPathResp.java b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/GlobalPathResp.java index 3b8f694d1e..5fb044171c 100644 --- a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/GlobalPathResp.java +++ b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/GlobalPathResp.java @@ -15,7 +15,7 @@ public class GlobalPathResp extends Base { @Override public String toString() { - return super.toString() + "Data:" + TextFormat.printer().escapingNonAscii(false).printToString(bean); + return super.toString() + TextFormat.printer().escapingNonAscii(false).printToString(bean); } } diff --git a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/GnssInfo.java b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/GnssInfo.java index 3b47532d5b..cb762f80f8 100644 --- a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/GnssInfo.java +++ b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/GnssInfo.java @@ -16,7 +16,7 @@ public class GnssInfo extends Base { @Override public String toString() { - return super.toString() + "Data:" + TextFormat.printer().escapingNonAscii(false).printToString(bean); + return super.toString() + TextFormat.printer().escapingNonAscii(false).printToString(bean); } } diff --git a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/MogoReportMessage.java b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/MogoReportMessage.java index c51c98185b..39a2f8e7e2 100644 --- a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/MogoReportMessage.java +++ b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/MogoReportMessage.java @@ -17,7 +17,7 @@ public class MogoReportMessage extends Base { @Override public String toString() { - return super.toString() + "Data:" + TextFormat.printer().escapingNonAscii(false).printToString(bean); + return super.toString() + TextFormat.printer().escapingNonAscii(false).printToString(bean); } } diff --git a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/RecordPanel.java b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/RecordPanel.java index 7d5e01696f..3071ef7317 100644 --- a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/RecordPanel.java +++ b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/RecordPanel.java @@ -17,6 +17,6 @@ public class RecordPanel extends Base { @Override public String toString() { - return super.toString() + "Data:" + TextFormat.printer().escapingNonAscii(false).printToString(bean); + return super.toString() + TextFormat.printer().escapingNonAscii(false).printToString(bean); } } diff --git a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/TrackedObjects.java b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/TrackedObjects.java index 8a5061ac41..caaa4d1c81 100644 --- a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/TrackedObjects.java +++ b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/TrackedObjects.java @@ -14,6 +14,6 @@ public class TrackedObjects extends Base { @Override public String toString() { - return super.toString() + "Data:" + TextFormat.printer().escapingNonAscii(false).printToString(bean); + return super.toString() + TextFormat.printer().escapingNonAscii(false).printToString(bean); } } diff --git a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/Trajectory.java b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/Trajectory.java index b78095766c..047888f8f7 100644 --- a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/Trajectory.java +++ b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/Trajectory.java @@ -13,7 +13,7 @@ public class Trajectory extends Base { } @Override public String toString() { - return super.toString() + "Data:" + TextFormat.printer().escapingNonAscii(false).printToString(bean); + return super.toString() + TextFormat.printer().escapingNonAscii(false).printToString(bean); } } diff --git a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/VehicleState.java b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/VehicleState.java index db44e63ce7..df03675788 100644 --- a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/VehicleState.java +++ b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/VehicleState.java @@ -15,6 +15,6 @@ public class VehicleState extends Base { @Override public String toString() { - return super.toString() + "Data:" + TextFormat.printer().escapingNonAscii(false).printToString(bean); + return super.toString() + TextFormat.printer().escapingNonAscii(false).printToString(bean); } } diff --git a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/Warn.java b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/Warn.java index 310ceee8a9..f438ae5b8f 100644 --- a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/Warn.java +++ b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/Warn.java @@ -14,6 +14,6 @@ public class Warn extends Base { @Override public String toString() { - return super.toString() + "Data:" + TextFormat.printer().escapingNonAscii(false).printToString(bean); + return super.toString() + TextFormat.printer().escapingNonAscii(false).printToString(bean); } } diff --git a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/mian/InfoFragment.java b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/mian/InfoFragment.java index 51d06b0e10..fda17fe9d6 100644 --- a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/mian/InfoFragment.java +++ b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/mian/InfoFragment.java @@ -19,6 +19,7 @@ import com.zhidao.adas.client.bean.AutopilotState; import com.zhidao.adas.client.bean.ErrorData; import com.zhidao.adas.client.bean.GlobalPathResp; import com.zhidao.adas.client.bean.GnssInfo; +import com.zhidao.adas.client.bean.MogoReportMessage; import com.zhidao.adas.client.bean.RecordPanel; import com.zhidao.adas.client.bean.TrackedObjects; import com.zhidao.adas.client.bean.Trajectory; @@ -252,7 +253,7 @@ public class InfoFragment extends Fragment { } @Subscribe(threadMode = ThreadMode.MAIN, sticky = true) - public void onAutopilotGuardianInfoEvent(ReportMessage info) { + public void onAutopilotGuardianInfoEvent(MogoReportMessage info) { if (title.equals(MainActivity.TITLE.RECEIVE_REPORT_MESSAGE)) { data.add(info.toString()); adapter.notifyDataSetChanged(); diff --git a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/mian/MainActivity.java b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/mian/MainActivity.java index b49286cc5b..f94cc905b5 100644 --- a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/mian/MainActivity.java +++ b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/mian/MainActivity.java @@ -739,14 +739,14 @@ public class MainActivity extends AppCompatActivity implements OnAdasListener, O @Override public void onChannelConnect(Channel channel) { - Log.i(TAG,"onChannelConnect channel="+channel.id()); + Log.i(TAG, "onChannelConnect channel=" + channel.id()); } @Override public void onChannelDisConnect(Channel channel) { - Log.i(TAG,"onChannelDisConnect channel="+channel.id()); + Log.i(TAG, "onChannelDisConnect channel=" + channel.id()); } - },"1234567"); + }, "1234567"); }