From a3a7e02f5f0ac0a9c980ccbba18c707fae735f24 Mon Sep 17 00:00:00 2001 From: xinfengkun Date: Thu, 30 Mar 2023 14:10:09 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=B7=A5=E6=8E=A7=E6=9C=BA=E7=9B=91=E6=8E=A7]?= =?UTF-8?q?=20=E4=BC=98=E5=8C=96=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zhidao/adas/client/DataDistribution.java | 7 +- .../com/zhidao/adas/client/bean/BaseInfo.java | 3 +- .../zhidao/adas/client/bean/ErrorData.java | 4 +- .../com/zhidao/adas/client/bean/ObuMap.java | 13 +- .../com/zhidao/adas/client/bean/ObuRsi.java | 13 +- .../com/zhidao/adas/client/bean/ObuRsm.java | 13 +- .../com/zhidao/adas/client/bean/ObuSpat.java | 14 +- .../client/bean/PerceptionTrafficLight.java | 13 +- .../adas/client/bean/ReceiveBytesData.java | 4 +- .../zhidao/adas/client/bean/ReceiveData.java | 14 +- .../bean/V2nGlobalPathEventsReceiveData.java | 13 +- .../zhidao/adas/client/ui/MainActivity.java | 13 +- .../drawable/icon_dev_status_net_disable.png | Bin 7558 -> 0 bytes .../drawable/icon_dev_status_net_disable.xml | 9 + .../drawable/icon_dev_status_net_enable.png | Bin 10675 -> 0 bytes .../drawable/icon_dev_status_net_enable.xml | 9 + .../src/main/res/drawable/selector_router.xml | 4 +- .../src/main/res/layout/item_main.xml | 164 +++++++++++------- 18 files changed, 215 insertions(+), 95 deletions(-) delete mode 100644 app_ipc_monitoring/src/main/res/drawable/icon_dev_status_net_disable.png create mode 100644 app_ipc_monitoring/src/main/res/drawable/icon_dev_status_net_disable.xml delete mode 100644 app_ipc_monitoring/src/main/res/drawable/icon_dev_status_net_enable.png create mode 100644 app_ipc_monitoring/src/main/res/drawable/icon_dev_status_net_enable.xml diff --git a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/DataDistribution.java b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/DataDistribution.java index b5141a1909..c2bf8cd3a5 100644 --- a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/DataDistribution.java +++ b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/DataDistribution.java @@ -35,6 +35,7 @@ public class DataDistribution { private Future future; private Pair listener; private volatile boolean isCutDown = true;//是否缩短日志显示 + private int resId = R.id.rb_analysis; private DataDistribution() { queue = new LinkedBlockingQueue<>(); @@ -51,7 +52,9 @@ public class DataDistribution { } return INSTANCE; } - + public void setResId(int resId) { + this.resId = resId; + } public void registerAdasClientListener(Pair listener) { this.listener = listener; } @@ -188,7 +191,7 @@ public class DataDistribution { } private String onTransmit(String time, BaseInfo data) { - String temp = data.toString(); + String temp = data.toString(resId); String str = cutDown(temp); if (data.header == null) { if (data instanceof ErrorData) { diff --git a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/BaseInfo.java b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/BaseInfo.java index 41b65e5472..cc7d25f0cc 100644 --- a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/BaseInfo.java +++ b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/BaseInfo.java @@ -35,8 +35,7 @@ public abstract class BaseInfo { this.header = null; } - @Override - public String toString() { + public String toString(int resId) { String str = "原始数据长度：" + len + "\tPayload数据长度：" + payloadLen + '\n'; if (header != null) { str += "Header:[" + "MessageID:" + header.getMsgID() + diff --git a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/ErrorData.java b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/ErrorData.java index b47e46b909..65b6dfd81c 100644 --- a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/ErrorData.java +++ b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/ErrorData.java @@ -14,7 +14,7 @@ public class ErrorData extends BaseInfo { } @Override - public String toString() { - return super.toString() + status + "\n原始数据：" + ByteUtil.byteArrToHex(bytes); + public String toString(int resId) { + return super.toString(resId) + status + "\n原始数据：" + ByteUtil.byteArrToHex(bytes); } } diff --git a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/ObuMap.java b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/ObuMap.java index 51a2c8c4ed..3ffef3e648 100644 --- a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/ObuMap.java +++ b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/ObuMap.java @@ -2,6 +2,7 @@ package com.zhidao.adas.client.bean; import com.google.protobuf.TextFormat; import com.mogo.support.obu.ObuScene; +import com.zhidao.adas.client.R; import com.zhidao.support.adas.high.common.ByteUtil; import java.text.SimpleDateFormat; @@ -18,8 +19,16 @@ public class ObuMap extends BaseInfo { } @Override - public String toString() { - return super.toString() + "Payload原始数据：" + ByteUtil.byteArrToHex(bean.toByteArray()) + '\n' + TextFormat.printer().escapingNonAscii(false).printToString(bean); + public String toString(int resId) { + String srt = ""; + if (resId == R.id.rb_analysis) { + srt = TextFormat.printer().escapingNonAscii(false).printToString(bean); + } else if (resId == R.id.rb_original) { + srt = "Payload原始数据：" + ByteUtil.byteArrToHex(bean.toByteArray()); + } else if (resId == R.id.rb_all) { + srt = "Payload原始数据：" + ByteUtil.byteArrToHex(bean.toByteArray()) + '\n' + TextFormat.printer().escapingNonAscii(false).printToString(bean); + } + return super.toString(resId) + srt; } } diff --git a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/ObuRsi.java b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/ObuRsi.java index 8cd054f956..5cd598119d 100644 --- a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/ObuRsi.java +++ b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/ObuRsi.java @@ -2,6 +2,7 @@ package com.zhidao.adas.client.bean; import com.google.protobuf.TextFormat; import com.mogo.support.obu.ObuScene; +import com.zhidao.adas.client.R; import com.zhidao.support.adas.high.common.ByteUtil; import java.text.SimpleDateFormat; @@ -18,8 +19,16 @@ public class ObuRsi extends BaseInfo { } @Override - public String toString() { - return super.toString() + "Payload原始数据：" + ByteUtil.byteArrToHex(bean.toByteArray()) + '\n' + TextFormat.printer().escapingNonAscii(false).printToString(bean); + public String toString(int resId) { + String srt = ""; + if (resId == R.id.rb_analysis) { + srt = TextFormat.printer().escapingNonAscii(false).printToString(bean); + } else if (resId == R.id.rb_original) { + srt = "Payload原始数据：" + ByteUtil.byteArrToHex(bean.toByteArray()); + } else if (resId == R.id.rb_all) { + srt = "Payload原始数据：" + ByteUtil.byteArrToHex(bean.toByteArray()) + '\n' + TextFormat.printer().escapingNonAscii(false).printToString(bean); + } + return super.toString(resId) + srt; } } diff --git a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/ObuRsm.java b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/ObuRsm.java index badbf1745b..c319657ff5 100644 --- a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/ObuRsm.java +++ b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/ObuRsm.java @@ -2,6 +2,7 @@ package com.zhidao.adas.client.bean; import com.google.protobuf.TextFormat; import com.mogo.support.obu.ObuScene; +import com.zhidao.adas.client.R; import com.zhidao.support.adas.high.common.ByteUtil; import java.text.SimpleDateFormat; @@ -18,8 +19,16 @@ public class ObuRsm extends BaseInfo { } @Override - public String toString() { - return super.toString() + "Payload原始数据：" + ByteUtil.byteArrToHex(bean.toByteArray()) + '\n' + TextFormat.printer().escapingNonAscii(false).printToString(bean); + public String toString(int resId) { + String srt = ""; + if (resId == R.id.rb_analysis) { + srt = TextFormat.printer().escapingNonAscii(false).printToString(bean); + } else if (resId == R.id.rb_original) { + srt = "Payload原始数据：" + ByteUtil.byteArrToHex(bean.toByteArray()); + } else if (resId == R.id.rb_all) { + srt = "Payload原始数据：" + ByteUtil.byteArrToHex(bean.toByteArray()) + '\n' + TextFormat.printer().escapingNonAscii(false).printToString(bean); + } + return super.toString(resId) + srt; } } diff --git a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/ObuSpat.java b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/ObuSpat.java index 3ba064f0e6..fc98ae2edc 100644 --- a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/ObuSpat.java +++ b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/ObuSpat.java @@ -2,6 +2,7 @@ package com.zhidao.adas.client.bean; import com.google.protobuf.TextFormat; import com.mogo.support.obu.ObuScene; +import com.zhidao.adas.client.R; import com.zhidao.support.adas.high.common.ByteUtil; import java.text.SimpleDateFormat; @@ -18,8 +19,15 @@ public class ObuSpat extends BaseInfo { } @Override - public String toString() { - return super.toString() + "Payload原始数据：" + ByteUtil.byteArrToHex(bean.toByteArray()) + '\n' + TextFormat.printer().escapingNonAscii(false).printToString(bean); + public String toString(int resId) { + String srt = ""; + if (resId == R.id.rb_analysis) { + srt = TextFormat.printer().escapingNonAscii(false).printToString(bean); + } else if (resId == R.id.rb_original) { + srt = "Payload原始数据：" + ByteUtil.byteArrToHex(bean.toByteArray()); + } else if (resId == R.id.rb_all) { + srt = "Payload原始数据：" + ByteUtil.byteArrToHex(bean.toByteArray()) + '\n' + TextFormat.printer().escapingNonAscii(false).printToString(bean); + } + return super.toString(resId) + srt; } - } diff --git a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/PerceptionTrafficLight.java b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/PerceptionTrafficLight.java index 246de432ce..a1eee4a875 100644 --- a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/PerceptionTrafficLight.java +++ b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/PerceptionTrafficLight.java @@ -1,6 +1,7 @@ package com.zhidao.adas.client.bean; import com.google.protobuf.TextFormat; +import com.zhidao.adas.client.R; import com.zhidao.support.adas.high.common.ByteUtil; import java.text.SimpleDateFormat; @@ -18,8 +19,16 @@ public class PerceptionTrafficLight extends BaseInfo { @Override - public String toString() { - return super.toString() + "Payload原始数据：" + ByteUtil.byteArrToHex(bean.toByteArray()) + '\n' + TextFormat.printer().escapingNonAscii(false).printToString(bean); + public String toString(int resId) { + String srt = ""; + if (resId == R.id.rb_analysis) { + srt = TextFormat.printer().escapingNonAscii(false).printToString(bean); + } else if (resId == R.id.rb_original) { + srt = "Payload原始数据：" + ByteUtil.byteArrToHex(bean.toByteArray()); + } else if (resId == R.id.rb_all) { + srt = "Payload原始数据：" + ByteUtil.byteArrToHex(bean.toByteArray()) + '\n' + TextFormat.printer().escapingNonAscii(false).printToString(bean); + } + return super.toString(resId) + srt; } } diff --git a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/ReceiveBytesData.java b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/ReceiveBytesData.java index ac72a5b7cf..e4eef87a36 100644 --- a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/ReceiveBytesData.java +++ b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/ReceiveBytesData.java @@ -16,8 +16,8 @@ public class ReceiveBytesData extends BaseInfo { @Override - public String toString() { - return super.toString() + "Payload原始数据：" + ByteUtil.byteArrToHex(data); + public String toString(int resId) { + return super.toString(resId) + "Payload原始数据：" + ByteUtil.byteArrToHex(data); } } diff --git a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/ReceiveData.java b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/ReceiveData.java index 0d8be2857d..a0dd4b4a64 100644 --- a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/ReceiveData.java +++ b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/ReceiveData.java @@ -2,6 +2,7 @@ package com.zhidao.adas.client.bean; import com.google.protobuf.GeneratedMessageV3; import com.google.protobuf.TextFormat; +import com.zhidao.adas.client.R; import com.zhidao.support.adas.high.common.ByteUtil; import java.text.SimpleDateFormat; @@ -17,9 +18,16 @@ public class ReceiveData extends BaseInfo { } - @Override - public String toString() { - return super.toString() + "Payload原始数据：" + ByteUtil.byteArrToHex(bean.toByteArray()) + '\n' + TextFormat.printer().escapingNonAscii(false).printToString(bean); + public String toString(int resId) { + String srt = ""; + if (resId == R.id.rb_analysis) { + srt = TextFormat.printer().escapingNonAscii(false).printToString(bean); + } else if (resId == R.id.rb_original) { + srt = "Payload原始数据：" + ByteUtil.byteArrToHex(bean.toByteArray()); + } else if (resId == R.id.rb_all) { + srt = "Payload原始数据：" + ByteUtil.byteArrToHex(bean.toByteArray()) + '\n' + TextFormat.printer().escapingNonAscii(false).printToString(bean); + } + return super.toString(resId) + srt; } } diff --git a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/V2nGlobalPathEventsReceiveData.java b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/V2nGlobalPathEventsReceiveData.java index 1dc55915a2..115b4f7409 100644 --- a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/V2nGlobalPathEventsReceiveData.java +++ b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/V2nGlobalPathEventsReceiveData.java @@ -1,6 +1,7 @@ package com.zhidao.adas.client.bean; import com.google.protobuf.TextFormat; +import com.zhidao.adas.client.R; import com.zhidao.support.adas.high.common.ByteUtil; import java.text.SimpleDateFormat; @@ -27,7 +28,7 @@ public class V2nGlobalPathEventsReceiveData extends BaseInfo { @Override - public String toString() { + public String toString(int resId) { StringBuilder builder = new StringBuilder(); builder.append('\n').append("施工："); if (construct != null) { @@ -53,7 +54,15 @@ public class V2nGlobalPathEventsReceiveData extends BaseInfo { } else { builder.append("null"); } - return super.toString() + "Payload原始数据：" + ByteUtil.byteArrToHex(roadOverview.toByteArray()) + builder.toString(); + String srt = ""; + if (resId == R.id.rb_analysis) { + srt = builder.toString(); + } else if (resId == R.id.rb_original) { + srt = "Payload原始数据：" + ByteUtil.byteArrToHex(roadOverview.toByteArray()); + } else if (resId == R.id.rb_all) { + srt = "Payload原始数据：" + ByteUtil.byteArrToHex(roadOverview.toByteArray()) + builder.toString(); + } + return super.toString(resId) + srt; } } diff --git a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/MainActivity.java b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/MainActivity.java index e6aa42d2a5..494f0354c4 100644 --- a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/MainActivity.java +++ b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/MainActivity.java @@ -131,7 +131,6 @@ public class MainActivity extends BaseActivity implements OnAdasListener, OnAdas private TextView ipcIp; private TextView background; private TextView localIp; - private View line; private View line1; private RadioGroup connectionType; private AppCompatButton connect; @@ -145,6 +144,7 @@ public class MainActivity extends BaseActivity implements OnAdasListener, OnAdas private RecyclerView infoBtn; private RecyclerView infoFragment; private TextView tvConnectState; + private RadioGroup rg_show_log; private ScheduledExecutorService mExecutorServiceConfigTimer; private PingFloatWindow pingFloatWindow; @@ -303,7 +303,6 @@ public class MainActivity extends BaseActivity implements OnAdasListener, OnAdas etIp = findViewById(R.id.et_ip); background = findViewById(R.id.background); role = findViewById(R.id.role); - line = findViewById(R.id.line); line1 = findViewById(R.id.line1); connectionType = findViewById(R.id.connection_type); tvIp = findViewById(R.id.tv_ip); @@ -321,6 +320,8 @@ public class MainActivity extends BaseActivity implements OnAdasListener, OnAdas tvConnectState = findViewById(R.id.tv_connect_state); ipcIp = findViewById(R.id.ipc_ip); localIp = findViewById(R.id.local_ip); + rg_show_log = findViewById(R.id.rg_show_log); + findViewById(R.id.btn_router).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -330,12 +331,10 @@ public class MainActivity extends BaseActivity implements OnAdasListener, OnAdas role.setSelected(BuildConfig.IS_CLIENT); if (BuildConfig.IS_CLIENT) { - line.setVisibility(View.GONE); line1.setVisibility(View.GONE); connectionType.setVisibility(View.GONE); etIp.setVisibility(View.GONE); tvIp.setVisibility(View.GONE); - line.setVisibility(View.GONE); connect.setVisibility(View.GONE); disconnect.setVisibility(View.GONE); cb_timeout.setVisibility(View.GONE); @@ -619,6 +618,12 @@ public class MainActivity extends BaseActivity implements OnAdasListener, OnAdas btn_ping.setSelected(pingFloatWindow != null); } }); + rg_show_log.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() { + @Override + public void onCheckedChanged(RadioGroup group, int checkedId) { + DataDistribution.getInstance().setResId(checkedId); + } + }); } diff --git a/app_ipc_monitoring/src/main/res/drawable/icon_dev_status_net_disable.png b/app_ipc_monitoring/src/main/res/drawable/icon_dev_status_net_disable.png deleted file mode 100644 index 885b4603f045d78228be56c2f633336f8a00c10e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7558 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 c#?f&8|N6&UNE&X + + diff --git a/app_ipc_monitoring/src/main/res/drawable/icon_dev_status_net_enable.png b/app_ipc_monitoring/src/main/res/drawable/icon_dev_status_net_enable.png deleted file mode 100644 index ea9f95dfa39347d332e95c3c13a60e6950f29e94..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10675 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 Z{|}J!w(H#k`Op9W002ovPDHLkV1jRh(zgHr diff --git a/app_ipc_monitoring/src/main/res/drawable/icon_dev_status_net_enable.xml b/app_ipc_monitoring/src/main/res/drawable/icon_dev_status_net_enable.xml new file mode 100644 index 0000000000..62b02e1a5f --- /dev/null +++ b/app_ipc_monitoring/src/main/res/drawable/icon_dev_status_net_enable.xml @@ -0,0 +1,9 @@ + + + diff --git a/app_ipc_monitoring/src/main/res/drawable/selector_router.xml b/app_ipc_monitoring/src/main/res/drawable/selector_router.xml index 6d820136c1..8ed897608c 100644 --- a/app_ipc_monitoring/src/main/res/drawable/selector_router.xml +++ b/app_ipc_monitoring/src/main/res/drawable/selector_router.xml @@ -1,6 +1,6 @@ - - + + \ No newline at end of file diff --git a/app_ipc_monitoring/src/main/res/layout/item_main.xml b/app_ipc_monitoring/src/main/res/layout/item_main.xml index c1c6b623fd..f286e4ff2a 100644 --- a/app_ipc_monitoring/src/main/res/layout/item_main.xml +++ b/app_ipc_monitoring/src/main/res/layout/item_main.xml @@ -91,59 +91,108 @@ android:layout_width="wrap_content" android:layout_height="match_parent"> - - - - - - - - - - + android:gravity="center_vertical" + android:orientation="horizontal"> - + + + + + + + + + + + + android:gravity="center_vertical"> + + + + + + + + + + + + + + android:background="#CCCCCCCC" /> + android:textColor="@color/colorWhile" /> - - @@ -245,15 +277,17 @@ android:id="@+id/assign" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:buttonTint="@color/colorWhile" android:text="指定" - android:textColor="#ffffff" /> + android:textColor="@color/colorWhile" /> + android:textColor="@color/colorWhile" /> @@ -288,9 +322,9 @@