From a95cbe8d30ad85b324758f6e5701154d156164ee Mon Sep 17 00:00:00 2001 From: xinfengkun Date: Fri, 15 Apr 2022 12:55:29 +0800 Subject: [PATCH] =?UTF-8?q?[change]=E4=BF=AE=E6=94=B9=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app_ipc_monitoring/build.gradle | 3 +- .../zhidao/adas/client/DataDistribution.java | 12 +- .../zhidao/adas/client/ui/InfoFragment.java | 188 ------------------ .../zhidao/adas/client/ui/MainActivity.java | 15 ++ .../src/main/res/layout/item_main.xml | 165 ++++++++------- 5 files changed, 117 insertions(+), 266 deletions(-) diff --git a/app_ipc_monitoring/build.gradle b/app_ipc_monitoring/build.gradle index e19c5feaa5..eba7d1fd10 100644 --- a/app_ipc_monitoring/build.gradle +++ b/app_ipc_monitoring/build.gradle @@ -54,8 +54,7 @@ dependencies { implementation project(':libraries:mogo-adas') implementation project(':core:mogo-core-data') implementation project(':core:mogo-core-utils') -// api "com.zhidao.support.adas:high:1.2.1.2_bate21" implementation 'org.greenrobot:eventbus:3.2.0' implementation 'com.android.support:multidex:1.0.3' - implementation 'com.mogo.cloud:telematic:1.3.53-beta' + implementation 'com.mogo.cloud:telematic:1.3.53' } 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 800c42f1f6..33a42ab81c 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 @@ -36,6 +36,7 @@ public class DataDistribution { private final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS ", Locale.getDefault()); private Future future; private final List listeners = new ArrayList<>(); + private volatile boolean isCutDown = true;//是否缩短日志显示 private DataDistribution() { queue = new LinkedBlockingQueue<>(); @@ -83,8 +84,11 @@ public class DataDistribution { future = null; } + public void setCutDown(boolean cutDown) { + this.isCutDown = cutDown; + } - private static final int LIST_SIZE = 5;//默认list最大数据量5个 + private static final int LIST_SIZE = 50;//默认list最大数据量5个 public final List listTrajectory = new ArrayList<>(); public final List listTrackedObjects = new ArrayList<>(); public final List listGnssInfo = new ArrayList<>(); @@ -104,7 +108,7 @@ public class DataDistribution { String str = data.toString(); if (data instanceof Trajectory) { String temp = time + str; - if (temp.length() > 588) { + if (isCutDown && temp.length() > 588) { temp = temp.substring(0, 588) + "\n（已缩短。如需查看完整数据，请勾选日志存储复选框）"; } listTrajectory.add(temp); @@ -118,7 +122,7 @@ public class DataDistribution { } } else if (data instanceof TrackedObjects) { String temp = time + str; - if (temp.length() > 588) { + if (isCutDown && temp.length() > 588) { temp = temp.substring(0, 588) + "\n（已缩短。如需查看完整数据，请勾选日志存储复选框）"; } listTrackedObjects.add(temp); @@ -238,7 +242,7 @@ public class DataDistribution { } } else if (data instanceof ErrorData) { listErrorData.add(time + str); - if (listErrorData.size() > 50) { + if (listErrorData.size() > 100) { listErrorData.remove(0); } if (!listeners.isEmpty()) { diff --git a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/InfoFragment.java b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/InfoFragment.java index 8501446b12..123ddea587 100644 --- a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/InfoFragment.java +++ b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/InfoFragment.java @@ -150,198 +150,10 @@ public class InfoFragment extends BaseFragment { } } - -// @Subscribe(threadMode = ThreadMode.MAIN) -// public void onWarnEvent(Warn info) { -// -// if (title.equals(MainActivity.TITLE.RECEIVE_WARN)) { -// if (data.size() > 9) { -// data.remove(0); -// } -// data.add(info.toString()); -// adapter.notifyDataSetChanged(); -// } -// } -// -// @Subscribe(threadMode = ThreadMode.MAIN) -// public void onRectEvent(TrackedObjects info) { -// -// if (title.equals(MainActivity.TITLE.RECEIVE_TRACKED_OBJECTS)) { -// if (data.size() > 4) { -// data.remove(0); -// } -// data.add(info.toString()); -// adapter.notifyDataSetChanged(); -// } -// } -// -// @Subscribe(threadMode = ThreadMode.MAIN) -// public void onErrorEvent(ErrorData info) { -// -// if (title.equals(MainActivity.TITLE.RECEIVE_ERROR)) { -// if (data.size() > 19) { -// data.remove(0); -// } -// data.add(info.toString()); -// adapter.notifyDataSetChanged(); -// } -// } -// -// private void onTurnLightState(int turnLight, boolean brake_light) { -// StringBuilder builder = new StringBuilder(MainActivity.TITLE.RECEIVE_VEHICLE_STATE + "\t"); -// if (turnLight == 0) { -// builder.append("左转:关"); -// builder.append("右转:关"); -// } else if (turnLight == 1) { -// builder.append("左转:开"); -// builder.append("右转:关"); -// } else if (turnLight == 2) { -// builder.append("左转:关"); -// builder.append("右转:开"); -// } -// -// builder.append(brake_light ? " 刹车:开" : " 刹车:关"); -// tvTitle.setText(builder.toString()); -// } -// -// /** -// * 解析转向灯 -// */ -// private int turnLightTimes = 0; -// private boolean isOnTurnLight = false; -// private int turnLight = 0; -// -// public int setTurnLightState(int turn_light) { -// if (turn_light == 0) { -// if (isOnTurnLight) { -// if (turnLightTimes >= 10) { -// isOnTurnLight = false; -// turnLight = 0; -// } -// turnLightTimes++; -// } -// } else if (turn_light == 1) { -// turnLightTimes = 0; -// isOnTurnLight = true; -// turnLight = 1; -// } else if (turn_light == 2) { -// turnLightTimes = 0; -// isOnTurnLight = true; -// turnLight = 2; -// } -// return turnLight; -// } -// -// @Subscribe(threadMode = ThreadMode.MAIN) -// public void onVehicleStateEvent(VehicleState info) { -// if (title.equals(MainActivity.TITLE.RECEIVE_VEHICLE_STATE)) { -// if (data.size() > 9) { -// data.remove(0); -// } -// data.add(info.toString()); -// adapter.notifyDataSetChanged(); -// int light = info.bean.getLight().getNumber();//转向灯状态 0是正常 1是左转 2是右转 -// onTurnLightState(setTurnLightState(light), info.bean.getBrakeLightStatus()); -// } -// } -// -// -// @Subscribe(threadMode = ThreadMode.MAIN) -// public void onGnssInfoEvent(GnssInfo info) { -// if (title.equals(MainActivity.TITLE.RECEIVE_GNSS_INFO)) { -// if (data.size() > 9) { -// data.remove(0); -// } -// data.add(info.toString()); -// adapter.notifyDataSetChanged(); -// } -// } -// -// @Subscribe(threadMode = ThreadMode.MAIN) -// public void onAutopilotStateEvent(AutopilotState info) { -// if (title.equals(MainActivity.TITLE.RECEIVE_AUTOPILOT_STATE)) { -// if (data.size() > 9) { -// data.remove(0); -// } -// data.add(info.toString()); -// adapter.notifyDataSetChanged(); -// } -// } -// -// -// @Subscribe(threadMode = ThreadMode.MAIN) -// public void onTrajectoryEvent(Trajectory info) { -// if (title.equals(MainActivity.TITLE.RECEIVE_TRAJECTORY)) { -// if (data.size() > 4) { -// data.remove(0); -// } -// data.add(info.toString()); -// adapter.notifyDataSetChanged(); -// } -// } -// -// @Subscribe(threadMode = ThreadMode.MAIN) -// public void onArrivalNotificationEvent(ArrivalNotification info) { -// if (title.equals(MainActivity.TITLE.RECEIVE_ARRIVAL_NOTIFICATION)) { -// if (data.size() > 9) { -// data.remove(0); -// } -// data.add(info.toString()); -// adapter.notifyDataSetChanged(); -// } -// } -// -// @Subscribe(threadMode = ThreadMode.MAIN) -// public void onGlobalPathEvent(GlobalPathResp info) { -// if (title.equals(MainActivity.TITLE.RECEIVE_GLOBAL_PATH_RESP)) { -// if (data.size() > 9) { -// data.remove(0); -// } -// data.add(info.toString()); -// adapter.notifyDataSetChanged(); -// } -// } -// -// @Subscribe(threadMode = ThreadMode.MAIN) -// public void onRecordPanelEvent(RecordPanel info) { -// if (title.equals(MainActivity.TITLE.RECEIVE_RECORD_RESULT)) { -// if (data.size() > 9) { -// data.remove(0); -// } -// data.add(info.toString()); -// adapter.notifyDataSetChanged(); -// } -// } -// -// @Subscribe(threadMode = ThreadMode.MAIN) -// public void onMogoReportMessageEvent(MogoReportMessage info) { -// if (title.equals(MainActivity.TITLE.RECEIVE_REPORT_MESSAGE)) { -// if (data.size() > 9) { -// data.remove(0); -// } -// data.add(info.toString()); -// adapter.notifyDataSetChanged(); -// } -// } -// -// @Subscribe(threadMode = ThreadMode.MAIN, sticky = true) -// public void onPerceptionTrafficLightEvent(PerceptionTrafficLight info) { -// if (title.equals(MainActivity.TITLE.RECEIVE_PERCEPTION_TRAFFIC_LIGHT)) { -// if (data.size() > 9) { -// data.remove(0); -// } -// data.add(info.toString()); -// adapter.notifyDataSetChanged(); -// } -// } - @Override protected void onRefreshView() { if (adapter != null) { -// adapter.notifyDataSetChanged(); adapter.refreshView(); } } - - } 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 d6075c865e..c44ba91b5e 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 @@ -115,6 +115,7 @@ public class MainActivity extends BaseActivity implements OnAdasListener, OnAdas private CheckBox cb_print; private CheckBox cb_save; private CheckBox cb_timeout; + private CheckBox cb_cut_down; private RecyclerView infoBtn; private RecyclerView infoFragment; private TextView tvConnectState; @@ -219,6 +220,7 @@ public class MainActivity extends BaseActivity implements OnAdasListener, OnAdas cb_print = findViewById(R.id.cb_print); cb_save = findViewById(R.id.cb_save); cb_timeout = findViewById(R.id.cb_timeout); + cb_cut_down = findViewById(R.id.cb_cut_down); title = findViewById(R.id.title); infoBtn = findViewById(R.id.info_btn); infoFragment = findViewById(R.id.info_fragment); @@ -315,6 +317,19 @@ public class MainActivity extends BaseActivity implements OnAdasListener, OnAdas return true; } }); + cb_cut_down.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { + @Override + public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { + DataDistribution.getInstance().setCutDown(isChecked); + } + }); + cb_cut_down.setOnLongClickListener(new View.OnLongClickListener() { + @Override + public boolean onLongClick(View v) { + showToastCenter("显示数据量过大，会引起刷新卡顿", Toast.LENGTH_LONG); + return true; + } + }); connectionType.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() { @Override public void onCheckedChanged(RadioGroup group, int checkedId) { 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 2d05a64b68..8652ca51b5 100644 --- a/app_ipc_monitoring/src/main/res/layout/item_main.xml +++ b/app_ipc_monitoring/src/main/res/layout/item_main.xml @@ -26,38 +26,44 @@ android:scaleType="centerInside" android:src="@drawable/selector_role" /> - + android:orientation="vertical"> - + + + + + + @@ -66,11 +72,75 @@ android:layout_height="match_parent"> + + + + + + + + + + + + + + + + + @@ -103,55 +173,6 @@ android:layout_marginTop="10dp" android:layout_marginEnd="5dp" android:layout_marginBottom="10dp" - android:layout_toStartOf="@+id/tv_connect_state" - android:background="#fff124" /> - - - - - - - - - - - - - -