From 41f6f3ee7d24be22a88ce904e54cc083520db919 Mon Sep 17 00:00:00 2001
From: xinfengkun <xinfengkun@zhidaoauto.com>
Date: Wed, 2 Aug 2023 16:36:22 +0800
Subject: [PATCH] =?UTF-8?q?[340][=E9=AD=94=E6=96=B9]=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=B7=BB=E5=8A=A0=E6=8C=AF=E5=8A=A8=E5=8F=8D?=
 =?UTF-8?q?=E9=A6=88=EF=BC=8C=E8=87=AA=E8=BD=A6=E6=95=B0=E6=8D=AE=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E4=BC=98=E5=8C=96=EF=BC=8C=E7=A7=BB=E9=99=A4=E5=86=97?=
 =?UTF-8?q?=E4=BD=99=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/AndroidManifest.xml              |  2 +-
 .../zhidao/adas/magic/ui/MainActivity.java    | 20 +++++++++++++++----
 2 files changed, 17 insertions(+), 5 deletions(-)

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 @@
     <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"
diff --git a/app_mogo_magic_ring/src/main/java/com/zhidao/adas/magic/ui/MainActivity.java b/app_mogo_magic_ring/src/main/java/com/zhidao/adas/magic/ui/MainActivity.java
index f87a1b0733..450826ab84 100644
--- a/app_mogo_magic_ring/src/main/java/com/zhidao/adas/magic/ui/MainActivity.java
+++ b/app_mogo_magic_ring/src/main/java/com/zhidao/adas/magic/ui/MainActivity.java
@@ -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);