From 748e4163f23f23f017e891e09f5aef3222bf901a Mon Sep 17 00:00:00 2001 From: xinfengkun Date: Tue, 31 Jan 2023 16:40:22 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=B7=A5=E6=8E=A7=E6=9C=BA=E7=9B=91=E6=8E=A7]?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=94=99=E8=AF=AF=E6=95=B0=E6=8D=AE=E6=8F=90?= =?UTF-8?q?=E9=86=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zhidao/adas/client/ui/MainActivity.java | 40 ++++++++++++++++++- .../src/main/res/layout/item_main.xml | 1 + .../src/main/res/values/strings.xml | 1 + 3 files changed, 41 insertions(+), 1 deletion(-) 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 b2589957af..9e5df1467e 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 @@ -12,6 +12,7 @@ import android.os.Build; import android.os.Bundle; import android.os.Message; import android.os.PowerManager; +import android.os.SystemClock; import android.provider.Settings; import android.text.Editable; import android.text.Html; @@ -138,6 +139,9 @@ public class MainActivity extends BaseActivity implements OnAdasListener, OnAdas private static final int WHAT_IPC_IP = 0x00; private static final int WHAT_DRIVER_IP = 0x01; private static final int WHAT_IPC_CONNECT_STATE = 0x02; + private static final int WHAT_RECEIVE_ERROR_DATA_SHOW = 0x03; + private static final int WHAT_RECEIVE_ERROR_DATA_HINT = 0x04; + private static final int WHAT_RECEIVE_ERROR_DATA_STOP = 0x05; private EditText etIp; private ImageView role; private ImageView tvIp; @@ -548,7 +552,14 @@ public class MainActivity extends BaseActivity implements OnAdasListener, OnAdas title.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - showLocalIP(); + if (TextUtils.equals(title.getText(), getString(R.string.have_error_data))) { + int position=titleFragmentData.size() - 1; + infoFragment.smoothScrollToPosition(position); + fragmentAdapter.setSelectedPosition(position); + showFragment(Constants.TITLE.RECEIVE_ERROR); + } else { + showLocalIP(); + } } }); title.setOnLongClickListener(new View.OnLongClickListener() { @@ -829,6 +840,18 @@ public class MainActivity extends BaseActivity implements OnAdasListener, OnAdas @Override public void onError(ProtocolStatus status, byte[] bytes) { + long errorDataReceiveTime = SystemClock.elapsedRealtime(); + if (errorDataUpdateTime == 0) { + errorDataUpdateTime = errorDataReceiveTime + 800; + } + if (errorDataReceiveTime > errorDataUpdateTime) { + errorDataUpdateTime = 0; + getHandler().sendEmptyMessage(WHAT_RECEIVE_ERROR_DATA_SHOW); + if (getHandler().hasMessages(WHAT_RECEIVE_ERROR_DATA_STOP)) { + getHandler().removeMessages(WHAT_RECEIVE_ERROR_DATA_STOP); + } + getHandler().sendEmptyMessageDelayed(WHAT_RECEIVE_ERROR_DATA_STOP, 1500); + } ErrorData base = new ErrorData(status, bytes); DataDistribution.getInstance().addData(base); } @@ -1582,6 +1605,21 @@ public class MainActivity extends BaseActivity implements OnAdasListener, OnAdas tvConnectState.setText(status.status); tvConnectState.setTextColor(getResources().getColor(status.color)); break; + case WHAT_RECEIVE_ERROR_DATA_SHOW: + title.setText(R.string.have_error_data); + title.setTextColor(getColor(android.R.color.holo_red_light)); + title.setVisibility(View.VISIBLE); + getHandler().sendEmptyMessageDelayed(WHAT_RECEIVE_ERROR_DATA_HINT, 500); + break; + case WHAT_RECEIVE_ERROR_DATA_HINT: + title.setVisibility(View.INVISIBLE); + break; + case WHAT_RECEIVE_ERROR_DATA_STOP: + title.setText(R.string.app_name); + title.setTextColor(getColor(R.color.colorWhile)); + title.setVisibility(View.VISIBLE); + errorDataUpdateTime = 0; + break; } } } 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 4f3acb94c9..52fbb751ab 100644 --- a/app_ipc_monitoring/src/main/res/layout/item_main.xml +++ b/app_ipc_monitoring/src/main/res/layout/item_main.xml @@ -17,6 +17,7 @@ 工控机监控 + 存在错误数据 添加 保存 删除