yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[340][魔方]点击按钮添加振动反馈，自车数据显示优化，移除冗余数据

Browse Source
This commit is contained in:
xinfengkun
2023-08-02 16:36:22 +08:00
committed by zhongchao
parent 8859fbaa3b
commit 41f6f3ee7d
2 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app_mogo_magic_ring/src/main/AndroidManifest.xml
View File

@@ -9,7 +9,7 @@
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
<uses-permission android:name="android.permission.VIBRATE" />
<application
android:name=".App"
android:allowBackup="true"

20
app_mogo_magic_ring/src/main/java/com/zhidao/adas/magic/ui/MainActivity.java
View File

@@ -1,12 +1,15 @@
package com.zhidao.adas.magic.ui;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.os.Message;
import android.os.VibrationEffect;
import android.os.Vibrator;
import android.provider.Settings;
import android.text.Editable;
import android.text.TextUtils;
@@ -89,7 +92,7 @@ import system_master.SystemStatusInfo;
public class MainActivity extends BaseActivity implements OnAdasListener, OnAdasConnectStatusListener, BaseAdapter.OnItemClickListener<TitleBean> {
private final static String TAG = MainActivity.class.getSimpleName();
private final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS", Locale.getDefault());
private static final String GNSS_HINT = "%s\n经度：%f 纬度：%f 海拔：%f 航向角：%f 加速度：%f 曲率：%f 惯导车速：%f 车辆车速：%f";
private static final String GNSS_HINT = "%s\n经度：%f 纬度：%f 海拔：%f 航向角：%f 加速度：%f 车速：%f";
private static final int WHAT_IPC_IP = 0x00;
private static final int WHAT_IPC_CONNECT_STATE = 0x01;
@@ -116,7 +119,7 @@ public class MainActivity extends BaseActivity implements OnAdasListener, OnAdas
private ListPopupWindow listPopupWindow;
private FloatWindow floatWindow;
private View include_title;
private Vibrator vibrator;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -129,6 +132,7 @@ public class MainActivity extends BaseActivity implements OnAdasListener, OnAdas
onUpdateConnectStateView();
showIPCIP();
AdasManager.getInstance().setEnableLog(false);
vibrator = (Vibrator) getSystemService(Context.VIBRATOR_SERVICE);
}
@@ -472,8 +476,7 @@ public class MainActivity extends BaseActivity implements OnAdasListener, OnAdas
Message message = Message.obtain();
message.what = WHAT_UPDATE_GNSS;
message.obj = String.format(Locale.getDefault(), GNSS_HINT, sdf.format(new Date((long) (header.getTimestamp() * 1000))),
gnssInfo.getLongitude(), gnssInfo.getLatitude(), gnssInfo.getAltitude(), gnssInfo.getHeading(), gnssInfo.getAcceleration(),
gnssInfo.getYawRate(), gnssInfo.getGnssSpeed(), gnssInfo.getVehicleSpeed());
gnssInfo.getLongitude(), gnssInfo.getLatitude(), gnssInfo.getAltitude(), gnssInfo.getHeading(), gnssInfo.getAcceleration(), gnssInfo.getGnssSpeed());
getHandler().sendMessage(message);
}
@@ -734,6 +737,15 @@ public class MainActivity extends BaseActivity implements OnAdasListener, OnAdas
@Override
public void onItemClick(int position, TitleBean data) {
if (vibrator != null) {//震动
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
VibrationEffect vibe = VibrationEffect.createOneShot(80, 255);
vibrator.vibrate(vibe);
} else {
vibrator.vibrate(80);
}
}
if (connectStatus != IPC_CONNECTION_STATUS.CONNECTED) {
String msg = "未连接工控机";
showToastCenter(msg);