diff --git a/app_mogo_magic_ring/src/main/AndroidManifest.xml b/app_mogo_magic_ring/src/main/AndroidManifest.xml index 98a158eb58..e0a51cb24e 100644 --- a/app_mogo_magic_ring/src/main/AndroidManifest.xml +++ b/app_mogo_magic_ring/src/main/AndroidManifest.xml @@ -9,7 +9,7 @@ - + { 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);