diff --git a/app_ipc_monitoring/src/main/AndroidManifest.xml b/app_ipc_monitoring/src/main/AndroidManifest.xml index b4e003c0bc..68c61efc7b 100644 --- a/app_ipc_monitoring/src/main/AndroidManifest.xml +++ b/app_ipc_monitoring/src/main/AndroidManifest.xml @@ -30,6 +30,7 @@ + + + + \ No newline at end of file diff --git a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/base/BaseActivity.java b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/base/BaseActivity.java index b04a20f511..b89e5feca2 100644 --- a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/base/BaseActivity.java +++ b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/base/BaseActivity.java @@ -2,14 +2,38 @@ package com.zhidao.adas.client.base; import android.os.Handler; import android.os.Message; +import android.view.Gravity; +import android.widget.Toast; import androidx.appcompat.app.AppCompatActivity; +import com.zhidao.adas.client.ui.MainActivity; + import java.lang.ref.WeakReference; public abstract class BaseActivity extends AppCompatActivity { private BaseHandler mBaseHandler; + private Toast toast; + protected void showToastCenter(String msg) { + showToastCenter(msg, Toast.LENGTH_SHORT); + } + + protected void showToastCenter(String msg, int duration) { + runOnUiThread(new Runnable() { + @Override + public void run() { + if (toast != null) { + toast.cancel(); + toast = null; + } + toast = Toast.makeText(BaseActivity.this, "", duration); //如果有居中显示需求 + toast.setGravity(Gravity.CENTER, 0, 0); + toast.setText(msg); + toast.show(); + } + }); + } @Override protected void onDestroy() { super.onDestroy(); diff --git a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/HelpActivity.java b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/HelpActivity.java new file mode 100644 index 0000000000..e9c5cf6607 --- /dev/null +++ b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/HelpActivity.java @@ -0,0 +1,22 @@ +package com.zhidao.adas.client.ui; + +import android.os.Bundle; +import android.view.View; + +import androidx.annotation.Nullable; + +import com.zhidao.adas.client.R; +import com.zhidao.adas.client.base.BaseActivity; + +public class HelpActivity extends BaseActivity { + @Override + protected void onCreate(@Nullable Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_help); + showToastCenter("点击屏幕任意位置,退出帮助页面"); + } + + public void onBack(View view) { + finish(); + } +} 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 8906ff70f3..c74df8e22b 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 @@ -4,6 +4,7 @@ import static com.mogo.telematic.MogoProtocolMsg.NORMAL_DATA; import android.content.Context; import android.content.DialogInterface; +import android.content.Intent; import android.content.res.Configuration; import android.os.Bundle; import android.os.Message; @@ -382,6 +383,13 @@ public class MainActivity extends BaseActivity implements OnAdasListener, OnAdas showLocalIP(); } }); + title.setOnLongClickListener(new View.OnLongClickListener() { + @Override + public boolean onLongClick(View v) { + startActivity(new Intent(MainActivity.this, HelpActivity.class)); + return true; + } + }); tvIp.setOnClickListener(new View.OnClickListener() { @Override @@ -811,27 +819,7 @@ public class MainActivity extends BaseActivity implements OnAdasListener, OnAdas } - private Toast toast; - public void showToastCenter(String msg) { - showToastCenter(msg, Toast.LENGTH_SHORT); - } - - public void showToastCenter(String msg, int duration) { - runOnUiThread(new Runnable() { - @Override - public void run() { - if (toast != null) { - toast.cancel(); - toast = null; - } - toast = Toast.makeText(MainActivity.this, "", duration); //如果有居中显示需求 - toast.setGravity(Gravity.CENTER, 0, 0); - toast.setText(msg); - toast.show(); - } - }); - } private void initAdas() { diff --git a/app_ipc_monitoring/src/main/res/drawable/help.png b/app_ipc_monitoring/src/main/res/drawable/help.png new file mode 100644 index 0000000000..7c4f62166e Binary files /dev/null and b/app_ipc_monitoring/src/main/res/drawable/help.png differ diff --git a/app_ipc_monitoring/src/main/res/layout/activity_help.xml b/app_ipc_monitoring/src/main/res/layout/activity_help.xml new file mode 100644 index 0000000000..76bfacd070 --- /dev/null +++ b/app_ipc_monitoring/src/main/res/layout/activity_help.xml @@ -0,0 +1,10 @@ + + +