From babb7f637d2c26fe379c8a4d014ad95ddaa5ea72 Mon Sep 17 00:00:00 2001 From: xinfengkun Date: Wed, 13 Apr 2022 19:13:28 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=E4=BF=AE=E6=94=B9=E5=B7=A5=E6=8E=A7?= =?UTF-8?q?=E6=9C=BA=E7=9B=91=E6=8E=A7=E5=B4=A9=E6=BA=83=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zhidao/adas/client/base/BaseFragment.java | 2 ++ .../com/zhidao/adas/client/log/LogSave.java | 4 +-- .../zhidao/adas/client/ui/InfoFragment.java | 3 ++ .../zhidao/adas/client/ui/MainActivity.java | 27 ++++++++++---- .../adas/client/ui/VersionFragment.java | 2 ++ .../src/main/res/drawable/ic_driver.xml | 9 +++++ .../src/main/res/drawable/ic_pack_up.xml | 9 +++++ .../src/main/res/drawable/ic_passenger.xml | 9 +++++ .../src/main/res/drawable/ic_pull.xml | 9 +++++ .../main/res/drawable/selector_history_ip.xml | 5 +++ .../src/main/res/drawable/selector_role.xml | 5 +++ .../src/main/res/layout/item_main.xml | 35 +++++++++---------- .../src/main/res/layout/item_pop.xml | 1 - 13 files changed, 91 insertions(+), 29 deletions(-) create mode 100644 app_ipc_monitoring/src/main/res/drawable/ic_driver.xml create mode 100644 app_ipc_monitoring/src/main/res/drawable/ic_pack_up.xml create mode 100644 app_ipc_monitoring/src/main/res/drawable/ic_passenger.xml create mode 100644 app_ipc_monitoring/src/main/res/drawable/ic_pull.xml create mode 100644 app_ipc_monitoring/src/main/res/drawable/selector_history_ip.xml create mode 100644 app_ipc_monitoring/src/main/res/drawable/selector_role.xml 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 @@ + + + + + \ No newline at end of file diff --git a/app_ipc_monitoring/src/main/res/drawable/selector_role.xml b/app_ipc_monitoring/src/main/res/drawable/selector_role.xml new file mode 100644 index 0000000000..bf22904e61 --- /dev/null +++ b/app_ipc_monitoring/src/main/res/drawable/selector_role.xml @@ -0,0 +1,5 @@ + + + + + \ 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 593d90069b..2d05a64b68 100644 --- a/app_ipc_monitoring/src/main/res/layout/item_main.xml +++ b/app_ipc_monitoring/src/main/res/layout/item_main.xml @@ -17,17 +17,14 @@ android:textSize="18dp" android:textStyle="bold" /> - + android:scaleType="centerInside" + android:src="@drawable/selector_role" /> - + android:layout_marginStart="-42dp" + android:scaleType="centerInside" + android:src="@drawable/selector_history_ip" /> \ No newline at end of file diff --git a/app_ipc_monitoring/src/main/res/layout/item_pop.xml b/app_ipc_monitoring/src/main/res/layout/item_pop.xml index 3c6ddae24a..501a4044bd 100644 --- a/app_ipc_monitoring/src/main/res/layout/item_pop.xml +++ b/app_ipc_monitoring/src/main/res/layout/item_pop.xml @@ -5,7 +5,6 @@ android:layout_height="wrap_content" android:gravity="center" android:maxLines="1" - android:minWidth="100dp" android:paddingTop="10dp" android:paddingBottom="10dp" android:textAppearance="?android:attr/textAppearanceListItemSmall"