diff --git a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/base/BaseFragment.java b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/base/BaseFragment.java
index 1f36d21caa..992b1cab08 100644
--- a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/base/BaseFragment.java
+++ b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/base/BaseFragment.java
@@ -23,6 +23,8 @@ public abstract class BaseFragment extends Fragment {
private static final int WHAT_REFRESH = 0x01;
protected String title;
+ public BaseFragment() {
+ }
public BaseFragment(String title) {
this.title = title;
diff --git a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/log/LogSave.java b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/log/LogSave.java
index 9ba58355f9..d6a5ecde1b 100644
--- a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/log/LogSave.java
+++ b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/log/LogSave.java
@@ -2,9 +2,7 @@ package com.zhidao.adas.client.log;
import android.os.Environment;
import android.text.TextUtils;
-import android.util.Log;
-import com.zhidao.adas.client.bean.BaseInfo;
import com.zhidao.support.adas.high.common.ThreadPoolManager;
import java.io.BufferedWriter;
@@ -57,7 +55,7 @@ public class LogSave {
return bl;
}
- private void getFile() throws IOException {
+ private synchronized void getFile() throws IOException {
if (isSdcardUse()) {
String time = sdf.format(new Date());
String childPath = time.split("_")[0] + File.separator;
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 a1a2e7359c..8501446b12 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
@@ -31,6 +31,9 @@ public class InfoFragment extends BaseFragment {
private DataShowAdapter adapter;
+ public InfoFragment() {
+ }
+
public InfoFragment(String title) {
super(title);
}
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 4530ec44fe..d6075c865e 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
@@ -19,6 +19,7 @@ import android.widget.ArrayAdapter;
import android.widget.CheckBox;
import android.widget.CompoundButton;
import android.widget.EditText;
+import android.widget.ImageView;
import android.widget.ListPopupWindow;
import android.widget.PopupWindow;
import android.widget.RadioButton;
@@ -99,12 +100,13 @@ public class MainActivity extends BaseActivity implements OnAdasListener, OnAdas
private static final int WHAT_DRIVER_IP = 0x01;
private static final int WHATIPC_CONNECT_STATE = 0x02;
private EditText etIp;
- private TextView role;
- private TextView tvIp;
+ private ImageView role;
+ private ImageView tvIp;
private TextView title;
private TextView ipcIp;
private TextView localIp;
private View line;
+ private View line1;
private RadioGroup connectionType;
private AppCompatButton connect;
private AppCompatButton disconnect;
@@ -207,6 +209,7 @@ public class MainActivity extends BaseActivity implements OnAdasListener, OnAdas
etIp = findViewById(R.id.et_ip);
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);
connect = findViewById(R.id.connect);
@@ -224,16 +227,25 @@ public class MainActivity extends BaseActivity implements OnAdasListener, OnAdas
localIp = findViewById(R.id.local_ip);
- role.setText(BuildConfig.IS_CLIENT ? "乘客端" : "司机端");
+ 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);
+ ReceiveTimeoutManager.getInstance().setEnable(false, AdasManager.getInstance().getIpcConnectionStatus());
}
+ role.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ showToastCenter("我是" + (BuildConfig.IS_CLIENT ? "乘客端" : "司机端"));
+ }
+ });
connect.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -353,12 +365,14 @@ public class MainActivity extends BaseActivity implements OnAdasListener, OnAdas
}
});
- findViewById(R.id.tv_ip).setOnClickListener(new View.OnClickListener() {
+ tvIp.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- if (listPopupWindow == null)
+ if (listPopupWindow == null) {
+ tvIp.setSelected(true);
showListPopupWindow();
- else {
+ } else {
+ tvIp.setSelected(false);
listPopupWindow.dismiss();
listPopupWindow = null;
}
@@ -377,6 +391,7 @@ public class MainActivity extends BaseActivity implements OnAdasListener, OnAdas
@Override
public void onDismiss() {
listPopupWindow = null;
+ tvIp.setSelected(false);
}
});
listPopupWindow.setOnItemClickListener(new AdapterView.OnItemClickListener() {
diff --git a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/VersionFragment.java b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/VersionFragment.java
index 5802921b59..9eb89345e7 100644
--- a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/VersionFragment.java
+++ b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/VersionFragment.java
@@ -38,6 +38,8 @@ import mogo.telematics.pad.MessagePad;
*/
public class VersionFragment extends BaseFragment {
+ public VersionFragment() {
+ }
private ConfigAdapter adapter;
diff --git a/app_ipc_monitoring/src/main/res/drawable/ic_driver.xml b/app_ipc_monitoring/src/main/res/drawable/ic_driver.xml
new file mode 100644
index 0000000000..86e1d257b1
--- /dev/null
+++ b/app_ipc_monitoring/src/main/res/drawable/ic_driver.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app_ipc_monitoring/src/main/res/drawable/ic_pack_up.xml b/app_ipc_monitoring/src/main/res/drawable/ic_pack_up.xml
new file mode 100644
index 0000000000..328407001b
--- /dev/null
+++ b/app_ipc_monitoring/src/main/res/drawable/ic_pack_up.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app_ipc_monitoring/src/main/res/drawable/ic_passenger.xml b/app_ipc_monitoring/src/main/res/drawable/ic_passenger.xml
new file mode 100644
index 0000000000..19739491ff
--- /dev/null
+++ b/app_ipc_monitoring/src/main/res/drawable/ic_passenger.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app_ipc_monitoring/src/main/res/drawable/ic_pull.xml b/app_ipc_monitoring/src/main/res/drawable/ic_pull.xml
new file mode 100644
index 0000000000..2a5cad0c1e
--- /dev/null
+++ b/app_ipc_monitoring/src/main/res/drawable/ic_pull.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app_ipc_monitoring/src/main/res/drawable/selector_history_ip.xml b/app_ipc_monitoring/src/main/res/drawable/selector_history_ip.xml
new file mode 100644
index 0000000000..a36a8d2aa8
--- /dev/null
+++ b/app_ipc_monitoring/src/main/res/drawable/selector_history_ip.xml
@@ -0,0 +1,5 @@
+
+
+