1 增加用户到达终点语音震动提示

2 修改打点逻辑

1 增加用户到达终点语音震动提示
2 修改打点逻辑
杨帅
1 parent 045ca6f4
Showing 10 changed files with 84 additions and 16 deletions
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/presenter/CollRunningFinishFragmetPresenter.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/fragment/CollRunningMapFragment.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/ALLScoreDetailFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunMainFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunRaceDetailFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunningMapFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/model/Constant.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/ALLScoreDetailFragment.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/RunMainFragment.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/RunningMapFragment.java
@@ -66,12 +66,12 @@ public class CollRunningFinishFragmetPresenter extends MvpBasePresenter&lt;CollRunn
                     endPoint = GsonUtil.GsonToBean(userStepEntity.getCollEndPointData(), CollectPoint.class);
                 }
                 if (null != startPoint) {
-                    collectPoints.add(0, startPoint);
+//                    collectPoints.add(0, startPoint);
                     //起点
                     paramsMap.put("startLocation", startPoint.getPointName());
                 }
                 if (null != endPoint) {
-                    collectPoints.add(endPoint);
+//                    collectPoints.add(endPoint);
                     // 终点
                     paramsMap.put("endLocation", endPoint.getPointName());
@@ -186,7 +186,7 @@ public class CollRunningMapFragment extends QMUIFragment&lt;CollRunningMapFragmentV
             if (mVibrator != null) {
                 //设置震动周期，数组表示时间：等待+执行，单位是毫秒，下面操作代表:等待100，执行100，等待100，执行1000，
                 //后面的数字如果为-1代表不重复，之执行一次，其他代表会重复，0代表从数组的第0个位置开始
-                mVibrator.vibrate(new long[]{100, 1000, 100, 1000}, -1);
+                mVibrator.vibrate(new long[]{Constant.VIBRATOR_DELAY_TIME, Constant.VIBRATOR_RUN_TIME, Constant.VIBRATOR_DELAY_TIME, Constant.VIBRATOR_RUN_TIME}, Constant.VIBRATOR_REPEAT_TIME);
             }
             if (tipDialog != null) {
                 tipDialog.show();
@@ -89,7 +89,7 @@ public class ALLScoreDetailFragmentView implements MvpView {
         });
     }
-    public void initMap() {
+    public void initMap(MapCallBack mapCallBack) {
         this.mMapView = fragment.binding.mapView;
         if (baiduMap == null) {
             baiduMap = mMapView.getMap();
@@ -104,5 +104,17 @@ public class ALLScoreDetailFragmentView implements MvpView {
         mUiSettings.setEnlargeCenterWithDoubleClickEnable(true);
         //隐藏自带的指南针，改用自定义指南针 杨帅
         mUiSettings.setCompassEnabled(false);
+        baiduMap.setOnMapLoadedCallback(new BaiduMap.OnMapLoadedCallback() {
+            @Override
+            public void onMapLoaded() {
+                if (null != mapCallBack) {
+                    mapCallBack.onMapLoadFinish();
+                }
+            }
+        });
+    }
+
+    public interface MapCallBack {
+        void onMapLoadFinish();
     }
 }
 package com.cnlive.moudle.pedometer.frame.view;
 import android.app.Activity;
+import android.app.Service;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Handler;
 import android.os.SystemClock;
+import android.os.Vibrator;
 import android.support.v4.content.ContextCompat;
 import android.text.TextUtils;
 import android.util.Log;
@@ -39,6 +41,7 @@ import com.cnlive.moudle.pedometer.ui.fragment.RunMainFragment;
 import com.cnlive.moudle.pedometer.ui.widget.SelectDialog;
 import com.cnlive.moudle.pedometer.ui.widget.TipDialog;
 import com.cnlive.moudle.pedometer.utils.ButtonAnimUtil;
+import com.cnlive.moudle.pedometer.utils.ChineseToSpeechUtil;
 import com.cnlive.moudle.pedometer.utils.GsonUtil;
 import com.cnlive.moudle.pedometer.utils.MyMapUtil;
 import com.cnlive.moudle.pedometer.utils.MySpHelper;
@@ -72,7 +75,8 @@ public class RunMainFragmentView implements MvpView {
     private String employTime = "";
     private LatLng endLatLng;//终点坐标
     private TipDialog tipDialog;
-
+    //创建震动服务对象
+    private Vibrator mVibrator;
     public RunMainFragmentView(RunMainFragment fragment) {
         this.fragment = fragment;
     }
@@ -125,6 +129,8 @@ public class RunMainFragmentView implements MvpView {
      * 初始化相关视图
      */
     public void initView(RunRaceDetailInfo runRaceDetailInfo) {
+        //获取手机震动服务
+        mVibrator = (Vibrator) getContext().getSystemService(Service.VIBRATOR_SERVICE);
         uid = CommonInfo.getUserId(getContext());
         userStepEntity = StepUtil.getUserStepData(getContext(), uid);
         //设置数据
@@ -770,8 +776,15 @@ public class RunMainFragmentView implements MvpView {
                             //更新数据
                             StepUtil.updateStepData(getContext(), userStepEntity);
                         }
+
                         //进行提示
                         if (null == tipDialog) {
+                            ChineseToSpeechUtil.speech(getContext(), "您已到达终点附近,可以结束运动了!");
+                            if (mVibrator != null) {
+                                //设置震动周期，数组表示时间：等待+执行，单位是毫秒，下面操作代表:等待100，执行100，等待100，执行1000，
+                                //后面的数字如果为-1代表不重复，之执行一次，其他代表会重复，0代表从数组的第0个位置开始
+                                mVibrator.vibrate(new long[]{Constant.VIBRATOR_DELAY_TIME, Constant.VIBRATOR_RUN_TIME, Constant.VIBRATOR_DELAY_TIME, Constant.VIBRATOR_RUN_TIME}, Constant.VIBRATOR_REPEAT_TIME);
+                            }
                             tipDialog = new TipDialog(getContext(), getContext().getResources().getString(R.string.run_race_arrive_end_tip), "好的", R.color.green_round, new TipDialog.DialogInterface() {
                                 @Override
                                 public void onClick(TipDialog dialog) {
@@ -885,6 +898,9 @@ public class RunMainFragmentView implements MvpView {
         StepUtil.setFailData(context, failedEntity);
     }
+    public void onStop() {
+        ChineseToSpeechUtil.destroy();
+    }
 }
@@ -640,6 +640,10 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
     }
     private void checkBaiduServiceState() {
+        CommonInfo.setIsRunKeepAliveService(getContext(), true);
+        CommonInfo.setIsRunStepService(getContext(), true);
+        CommonInfo.setTsRunBaiduTraceService(getContext(), true);
+        CommonInfo.setIsWriteUserStep(getContext(), true);
         boolean isRunBaidu = CommonInfo.getIsRunBaiduTraceService(getContext());
         if (isRunBaidu) {
             //判断百度服务是否运行
 package com.cnlive.moudle.pedometer.frame.view;
+import android.app.Service;
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
@@ -9,6 +10,7 @@ import android.hardware.SensorEventListener;
 import android.hardware.SensorManager;
 import android.os.Handler;
 import android.os.SystemClock;
+import android.os.Vibrator;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.MotionEvent;
@@ -44,6 +46,7 @@ import com.cnlive.moudle.pedometer.ui.fragment.RunningMapFragment;
 import com.cnlive.moudle.pedometer.ui.widget.TipDialog;
 import com.cnlive.moudle.pedometer.utils.BitmapUtil;
 import com.cnlive.moudle.pedometer.utils.ButtonAnimUtil;
+import com.cnlive.moudle.pedometer.utils.ChineseToSpeechUtil;
 import com.cnlive.moudle.pedometer.utils.GsonUtil;
 import com.cnlive.moudle.pedometer.utils.MyMapUtil;
 import com.cnlive.moudle.pedometer.utils.StepUtil;
@@ -83,6 +86,8 @@ public class RunningMapFragmentView implements MvpView, SensorEventListener {
     private LatLng endLatLng;//终点坐标
     private UserStepEntity userStepEntity;
     private TipDialog tipDialog;
+    //创建震动服务对象
+    private Vibrator mVibrator;
     public RunningMapFragmentView(RunningMapFragment fragment) {
         this.fragment = fragment;
@@ -96,6 +101,8 @@ public class RunningMapFragmentView implements MvpView, SensorEventListener {
         if (getContext() == null) {
             return;
         }
+        //获取手机震动服务
+        mVibrator = (Vibrator) getContext().getSystemService(Service.VIBRATOR_SERVICE);
         userStepEntity = StepUtil.getUserStepData(getContext(), CommonInfo.getUserId(getContext()));
         currentPoints = new ArrayList<>();
         initMap();
@@ -341,8 +348,17 @@ public class RunningMapFragmentView implements MvpView, SensorEventListener {
                             //更新数据
                             StepUtil.updateStepData(getContext(), userStepEntity);
                         }
+
+
                         //进行提示
                         if (null == tipDialog) {
+                            ChineseToSpeechUtil.speech(getContext(), "您已到达终点附近,可以结束运动了!");
+                            if (mVibrator != null) {
+                                //设置震动周期，数组表示时间：等待+执行，单位是毫秒，下面操作代表:等待100，执行100，等待100，执行1000，
+                                //后面的数字如果为-1代表不重复，之执行一次，其他代表会重复，0代表从数组的第0个位置开始
+                                mVibrator.vibrate(new long[]{Constant.VIBRATOR_DELAY_TIME, Constant.VIBRATOR_RUN_TIME, Constant.VIBRATOR_DELAY_TIME, Constant.VIBRATOR_RUN_TIME}, Constant.VIBRATOR_REPEAT_TIME);
+                            }
+
                             tipDialog = new TipDialog(getContext(), getContext().getResources().getString(R.string.run_race_arrive_end_tip), "好的", R.color.green_round, new TipDialog.DialogInterface() {
                                 @Override
                                 public void onClick(TipDialog dialog) {
@@ -492,6 +508,10 @@ public class RunningMapFragmentView implements MvpView, SensorEventListener {
     }
+    public void onStop() {
+        ChineseToSpeechUtil.destroy();
+    }
+
     /**
      * 设置从历史轨迹中查询到的最新点
      *
 package com.cnlive.moudle.pedometer.model;
 public class Constant {
-        public static final long SERVICE_ID = 213511;//公司账号
+    public static final long SERVICE_ID = 213511;//公司账号
 //    public static final long SERVICE_ID = 213553;
     public static final int TAG = 1;
@@ -15,7 +15,9 @@ public class Constant {
     public static final int FRAGMENT_RUN_CHRONOMETER = 4;//同步计时器
     public static final int EXIT_RANGE = 5;//超出范围
     public static final int ENTER_RANGE = 6;//进入范围
-
+    public static final int VIBRATOR_DELAY_TIME = 100;//震动等待时间(ms)
+    public static final int VIBRATOR_RUN_TIME = 1000;//震动执行时间(ms)
+    public static final int VIBRATOR_REPEAT_TIME = -1;//震动重复次数(-1代表不重复，之执行一次，其他代表会重复，0代表从数组的第0个位置开始)
     /*****************************************运营工具****************************************************/
     public static final int COLL_SERVICE_STEP_COUNT_RESET_SPEED = 3;//重置速度
@@ -52,11 +52,16 @@ public class ALLScoreDetailFragment extends QMUIFragment&lt;ALLScoreDetailFragmentV
             runningFinishBean = (RunningFinishBean) getArguments().getSerializable("runningFinishBean");
             if (runningFinishBean != null) {
                 if (getMvpView() != null) {
-                    getMvpView().initMap();
-                    getMvpView().initView(runningFinishBean);
-                    if (getPresenter() != null) {
-                        getPresenter().queryHistoryTrace(getActivity(), runningFinishBean);
-                    }
+                    getMvpView().initMap(new ALLScoreDetailFragmentView.MapCallBack() {
+                        @Override
+                        public void onMapLoadFinish() {
+                            getMvpView().initView(runningFinishBean);
+                            if (getPresenter() != null) {
+                                getPresenter().queryHistoryTrace(getActivity(), runningFinishBean);
+                            }
+                        }
+                    });
+
                 }
             }
         }
@@ -186,7 +186,7 @@ public class RunMainFragment extends QMUIFragment&lt;RunMainFragmentView, RunMainFr
             if (mVibrator != null) {
                 //设置震动周期，数组表示时间：等待+执行，单位是毫秒，下面操作代表:等待100，执行100，等待100，执行1000，
                 //后面的数字如果为-1代表不重复，之执行一次，其他代表会重复，0代表从数组的第0个位置开始
-                mVibrator.vibrate(new long[]{100, 1000, 100, 1000}, -1);
+                mVibrator.vibrate(new long[]{Constant.VIBRATOR_DELAY_TIME, Constant.VIBRATOR_RUN_TIME, Constant.VIBRATOR_DELAY_TIME, Constant.VIBRATOR_RUN_TIME}, Constant.VIBRATOR_REPEAT_TIME);
             }
             if (tipDialog != null) {
                 tipDialog.setTipMsg("您已偏离路径轨迹\n请您计时回归路径!");
@@ -199,7 +199,7 @@ public class RunMainFragment extends QMUIFragment&lt;RunMainFragmentView, RunMainFr
             if (mVibrator != null) {
                 //设置震动周期，数组表示时间：等待+执行，单位是毫秒，下面操作代表:等待100，执行100，等待100，执行1000，
                 //后面的数字如果为-1代表不重复，之执行一次，其他代表会重复，0代表从数组的第0个位置开始
-                mVibrator.vibrate(new long[]{100, 1000, 100, 1000}, -1);
+                mVibrator.vibrate(new long[]{Constant.VIBRATOR_DELAY_TIME, Constant.VIBRATOR_RUN_TIME, Constant.VIBRATOR_DELAY_TIME, Constant.VIBRATOR_RUN_TIME}, Constant.VIBRATOR_REPEAT_TIME);
             }
             if (tipDialog != null) {
                 tipDialog.setTipMsg("您已回归轨迹\n继续参与运动吧");
@@ -208,6 +208,14 @@ public class RunMainFragment extends QMUIFragment&lt;RunMainFragmentView, RunMainFr
         }
     }
+    @Override
+    public void onStop() {
+        super.onStop();
+        if (null != getMvpView()) {
+            getMvpView().onStop();
+        }
+    }
+
     /**
      * 屏蔽边缘返回
      * 杨帅
@@ -150,6 +150,7 @@ public class RunningMapFragment extends QMUIFragment&lt;RunningMapFragmentView, Run
         if (getMvpView() != null) {
             //取消注册传感器监听
             mSensorManager.unregisterListener(getMvpView());
+            getMvpView().onStop();
         }
         ChineseToSpeechUtil.destroy();
@@ -196,7 +197,7 @@ public class RunningMapFragment extends QMUIFragment&lt;RunningMapFragmentView, Run
             if (mVibrator != null) {
                 //设置震动周期，数组表示时间：等待+执行，单位是毫秒，下面操作代表:等待100，执行100，等待100，执行1000，
                 //后面的数字如果为-1代表不重复，之执行一次，其他代表会重复，0代表从数组的第0个位置开始
-                mVibrator.vibrate(new long[]{100, 1000, 100, 1000}, -1);
+                mVibrator.vibrate(new long[]{Constant.VIBRATOR_DELAY_TIME, Constant.VIBRATOR_RUN_TIME, Constant.VIBRATOR_DELAY_TIME, Constant.VIBRATOR_RUN_TIME}, Constant.VIBRATOR_REPEAT_TIME);
             }
             if (tipDialog != null) {
                 tipDialog.setTipMsg("您已偏离路径轨迹\n请您计时回归路径!");
@@ -209,7 +210,7 @@ public class RunningMapFragment extends QMUIFragment&lt;RunningMapFragmentView, Run
             if (mVibrator != null) {
                 //设置震动周期，数组表示时间：等待+执行，单位是毫秒，下面操作代表:等待100，执行100，等待100，执行1000，
                 //后面的数字如果为-1代表不重复，之执行一次，其他代表会重复，0代表从数组的第0个位置开始
-                mVibrator.vibrate(new long[]{100, 1000, 100, 1000}, -1);
+                mVibrator.vibrate(new long[]{Constant.VIBRATOR_DELAY_TIME, Constant.VIBRATOR_RUN_TIME, Constant.VIBRATOR_DELAY_TIME, Constant.VIBRATOR_RUN_TIME}, Constant.VIBRATOR_REPEAT_TIME);
             }
             if (tipDialog != null) {
                 tipDialog.setTipMsg("您已回归轨迹\n继续参与运动吧");