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 885b4603f0..0000000000 Binary files a/app_ipc_monitoring/src/main/res/drawable/icon_dev_status_net_disable.png and /dev/null differ diff --git a/app_ipc_monitoring/src/main/res/drawable/icon_dev_status_net_disable.xml b/app_ipc_monitoring/src/main/res/drawable/icon_dev_status_net_disable.xml new file mode 100644 index 0000000000..ae72ee0cef --- /dev/null +++ b/app_ipc_monitoring/src/main/res/drawable/icon_dev_status_net_disable.xml @@ -0,0 +1,9 @@ + + + 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 ea9f95dfa3..0000000000 Binary files a/app_ipc_monitoring/src/main/res/drawable/icon_dev_status_net_enable.png and /dev/null differ 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 @@