1 修复用户从后台进入前台时,步数显示错误问题

杨帅
1 parent 50f4cc40
Showing 13 changed files with 165 additions and 19 deletions
config.gradle
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/CollRunningMapFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/service/CollStepService.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/fragment/StartTraceFragment.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/presenter/RunningFinishFragmetPresenter.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/RunningMapFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/model/Constant.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/model/RunningFinishBean.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/service/StepService.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/sql/entity/UserStepEntity.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/RunMainFragment.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/utils/StepUtil.java
@@ -21,7 +21,7 @@ ext {
             //编译方式
             debug  : false,
             //版本号
-            version: "0.5.3",
+            version: "0.5.4",
             //Lib库前缀
             packeg : "com.cnlive.module",
             //Lib库名称
@@ -42,6 +42,7 @@ import com.cnlive.moudle.collectionTrace.ui.fragment.CollRunningMapFragment;
 import com.cnlive.moudle.collectionTrace.commonInfo.CollCommonInfo;
 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.model.Constant;
+import com.cnlive.moudle.pedometer.model.MessageEvent;
 import com.cnlive.moudle.pedometer.net.bean.RunRaceDetailInfo;
 import com.cnlive.moudle.pedometer.service.StepService;
 import com.cnlive.moudle.pedometer.sql.entity.CollUserStepEntity;
@@ -55,6 +56,8 @@ import com.cnlive.moudle.pedometer.utils.TimeUtil;
 import com.example.moudle_pedometer.R;
 import com.hannesdorfmann.mosby3.mvp.MvpView;
  
+import org.greenrobot.eventbus.EventBus;
+
 import java.util.ArrayList;
 import java.util.List;
  
@@ -788,6 +791,8 @@ public class CollRunningMapFragmentView implements MvpView, SensorEventListener 
         if (mMapView != null) {
             mMapView.onResume();
         }
+        //保持最新的步数
+        EventBus.getDefault().post(new MessageEvent(Constant.COLL_SERVICE_STEP_COUNT_ONRESUME, ""));
     }
  
     public void onPause() {
@@ -494,6 +494,12 @@ public class CollStepService extends Service implements SensorEventListener {
 //        else if (messageEvent.getMessageType() == Constant.SERVICE_STEP_COUNT_CONTINUE) {
 //            pauseFlag = false;
 //        }
+
+        //更新锁屏步数
+        if (messageEvent.getMessageType() == Constant.COLL_SERVICE_STEP_COUNT_ONRESUME) {
+            updateNotification();
+        }
+
     }
  
     /**
@@ -669,12 +675,12 @@ public class CollStepService extends Service implements SensorEventListener {
                 } else if (Intent.ACTION_DATE_CHANGED.equals(action)) {//日期变化步数重置为0
 //                    Logger.d("重置步数" + StepDcretor.CURRENT_STEP);
                     save();
-                    isNewDay();
+//                    isNewDay();
                 } else if (Intent.ACTION_TIME_CHANGED.equals(action)) {
                     //时间变化步数重置为0
 //                    isCall();
                     save();
-                    isNewDay();
+//                    isNewDay();
                 } else if (Intent.ACTION_TIME_TICK.equals(action)) {//日期变化步数重置为0
 //                    isCall();
 //                    Logger.d("重置步数" + StepDcretor.CURRENT_STEP);
@@ -7,6 +7,8 @@ import android.support.annotation.Nullable;
 import android.view.View;
  
 import com.cnlive.libs.base.ui.QMUIFragment;
+import com.cnlive.libs.base.util.StatusBarUtil;
+import com.cnlive.libs.base.util.StatusBarUtil2;
 import com.cnlive.moudle.collectionTrace.frame.presenter.StartTraceFragmentPresenter;
 import com.cnlive.moudle.collectionTrace.frame.view.StartTraceFragmentView;
 import com.cnlive.moudle.collectionTrace.ui.activity.CollPedometerMainActivity;
@@ -55,6 +57,8 @@ public class StartTraceFragment extends QMUIFragment&lt;StartTraceFragmentView, Sta
     @Override
     public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
+        StatusBarUtil.setStatusBarWrite(getActivity());
+        StatusBarUtil2.setColor(getActivity(), getResources().getColor(R.color.white), 0);
         EventBus.getDefault().register(this);
         mSensorManager = (SensorManager) getActivity().getSystemService(SENSOR_SERVICE);//获取传感器管理服务
         if (null != getArguments()) {
@@ -7,6 +7,7 @@ import android.util.Log;
 import android.widget.Toast;
  
 import com.baidu.mapapi.model.LatLng;
+import com.baidu.mapapi.utils.DistanceUtil;
 import com.baidu.trace.LBSTraceClient;
 import com.baidu.trace.model.SortType;
 import com.cnlive.libs.base.logic.Logic;
@@ -270,9 +271,39 @@ public class RunningFinishFragmetPresenter extends MvpBasePresenter&lt;RunningFinis
      * @param context
      */
     public void checkUserIsFinish(List<LatLng> resultPoints, UserStepEntity userStepEntity, RunningFinishBean runningFinishBean, Activity context) {
+        boolean isArrive = false;
+        FailedEntity failedEntity = null;
+        if (!TextUtils.isEmpty(runningFinishBean.getFailUUID())) {
+            StepUtil.getTempSaveFailByUUID(context, CommonInfo.getUserId(context), runningFinishBean.getFailUUID());
+        }
         if (!userStepEntity.getIsArriveEndPoint()) {
             runningFinishBean.setIsFinish("0");
-        } else {
+            isArrive = false;
+            if (null != failedEntity) {
+                failedEntity.setIsArriveEndPoint(false);
+                StepUtil.updateFailData(context, failedEntity);
+            }
+            //在判断一次历史轨迹
+            if (null != resultPoints && resultPoints.size() > 1) {
+                if (!TextUtils.isEmpty(userStepEntity.getEndLatLng())) {
+                    LatLng endLat = GsonUtil.GsonToBean(userStepEntity.getEndLatLng(), LatLng.class);
+                    if (null != endLat) {
+                        for (int i = 0; i < resultPoints.size(); i++) {
+                            double distance = DistanceUtil.getDistance(endLat, resultPoints.get(i));
+                            if (distance < Constant.LOCA_END_POINT_ACCURACY) {
+                                isArrive = true;
+                                if (null != failedEntity) {
+                                    failedEntity.setIsArriveEndPoint(true);
+                                    StepUtil.updateFailData(context, failedEntity);
+                                }
+                                break;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        if (isArrive) {
             if (importPoints != null) {
                 //判断是否完成
                 boolean isFinish = MyMapUtil.checkIsFinishTrace(importPoints, resultPoints, Constant.PASS_RATE);
@@ -284,6 +315,8 @@ public class RunningFinishFragmetPresenter extends MvpBasePresenter&lt;RunningFinis
                     runningFinishBean.setIsFinish("0");
                 }
             }
+        } else {
+            runningFinishBean.setIsFinish("0");
         }
     }
  
@@ -77,6 +77,7 @@ public class RunMainFragmentView implements MvpView {
     private TipDialog tipDialog;
     //创建震动服务对象
     private Vibrator mVibrator;
+    private boolean isfirstEndTip = true;
  
     public RunMainFragmentView(RunMainFragment fragment) {
         this.fragment = fragment;
@@ -439,6 +440,9 @@ public class RunMainFragmentView implements MvpView {
                                                     }
                                                     FailedEntity failedEntity = StepUtil.getTempSaveFailData(getContext(), CommonInfo.getUserId(getContext()), userStepEntity.getStartTimeStamp());
                                                     if (failedEntity != null) {
+                                                        if (null != failedEntity.getUuid()) {
+                                                            runningFinishBean.setFailUUID(failedEntity.getUuid());
+                                                        }
                                                         RunningFinishActivity.startActivity(fragment.getActivity(), runningFinishBean);
                                                         fragment.getActivity().finish();
                                                     }
@@ -789,7 +793,12 @@ public class RunMainFragmentView implements MvpView {
                             //更新数据
                             StepUtil.updateStepData(getContext(), userStepEntity);
                         }
-
+                        if (!isfirstEndTip) {
+                            return;
+                        }
+                        if (isfirstEndTip) {
+                            isfirstEndTip = false;
+                        }
                         //进行提示
                         if (null == tipDialog) {
                             ChineseToSpeechUtil.speech(getContext(), "您已到达终点附近,可以结束运动了!");
@@ -826,6 +835,7 @@ public class RunMainFragmentView implements MvpView {
         CommonInfo.setIsWriteUserStep(getContext(), false);
         if (StepService.mClient != null) {
             StepService.mClient.stopGather(StepService.traceListener);
+//            StepService.CURRENT_STEP = 0;
         }
         fragment.getActivity().stopService(new Intent(fragment.getActivity(), StepService.class));
     }
@@ -836,6 +846,11 @@ public class RunMainFragmentView implements MvpView {
         }
     }
  
+    public void onResume() {
+        //保持最新的步数
+        EventBus.getDefault().post(new MessageEvent(Constant.SERVICE_STEP_COUNT_ONRESUME, ""));
+    }
+
     /**
      * 暂存失败数据
      *
@@ -40,7 +40,9 @@ import com.baidu.mapapi.utils.DistanceUtil;
 import com.baidu.trace.model.SortType;
 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.model.Constant;
+import com.cnlive.moudle.pedometer.model.MessageEvent;
 import com.cnlive.moudle.pedometer.model.RunningMapBean;
+import com.cnlive.moudle.pedometer.service.StepService;
 import com.cnlive.moudle.pedometer.sql.entity.UserStepEntity;
 import com.cnlive.moudle.pedometer.ui.fragment.RunningMapFragment;
 import com.cnlive.moudle.pedometer.ui.widget.TipDialog;
@@ -53,6 +55,8 @@ import com.cnlive.moudle.pedometer.utils.StepUtil;
 import com.example.moudle_pedometer.R;
 import com.hannesdorfmann.mosby3.mvp.MvpView;
  
+import org.greenrobot.eventbus.EventBus;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -88,6 +92,7 @@ public class RunningMapFragmentView implements MvpView, SensorEventListener {
     private TipDialog tipDialog;
     //创建震动服务对象
     private Vibrator mVibrator;
+    private boolean isfirstEndTip = true;//是否是第一次提示到达终点
  
     public RunningMapFragmentView(RunningMapFragment fragment) {
         this.fragment = fragment;
@@ -349,7 +354,12 @@ public class RunningMapFragmentView implements MvpView, SensorEventListener {
                             StepUtil.updateStepData(getContext(), userStepEntity);
                         }
  
-
+                        if (!isfirstEndTip) {
+                            return;
+                        }
+                        if (isfirstEndTip) {
+                            isfirstEndTip = false;
+                        }
                         //进行提示
                         if (null == tipDialog) {
                             ChineseToSpeechUtil.speech(getContext(), "您已到达终点附近,可以结束运动了!");
@@ -532,6 +542,7 @@ public class RunningMapFragmentView implements MvpView, SensorEventListener {
         if (mMapView != null) {
             mMapView.onResume();
         }
+        EventBus.getDefault().post(new MessageEvent(Constant.SERVICE_STEP_COUNT_ONRESUME, ""));
     }
  
     public void onPause() {
 package com.cnlive.moudle.pedometer.model;
  
 public class Constant {
-    public static final long SERVICE_ID = 213511;//公司账号
-//    public static final long SERVICE_ID = 213553;
-
-    public static final int TAG = 1;
-    public static final int GATHER_INTERVAL = 2;//位置采集周期
-    public static final int PACK_INTERVAL = 10;//位置采集周期
-
+    /*********************************用户标志位**************************************************/
     public static final int SERVICE_STEP_COUNT_UPDATE = 0;//步数更新
     public static final int SERVICE_STEP_COUNT_PAUSE = 1;//步数暂停
     public static final int SERVICE_STEP_COUNT_CONTINUE = 2;//继续计步
@@ -15,11 +9,7 @@ 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;//重置速度
     public static final int COLL_SERVICE_STEP_COUNT_UPDATE = 0;//步数更新
     public static final int COLL_START_TRACE_GATHER_SUCCESS = 7;//启动轨迹服务成功(运营)
@@ -29,6 +19,21 @@ public class Constant {
     public static final int REGISTRATION_SUCCESS = 11;//用户报名成功
     public static final int UPDATA_COLL_BIND_TRACE_LIST = 12;//更新已绑定列表
     public static final int DELECT_COLL_BIND_TRACE_LIST = 13;//删除已绑定列表
+    public static final int SERVICE_STEP_COUNT_ONRESUME = 14;//用户从后台回到前台,更新步数
+    public static final int COLL_SERVICE_STEP_COUNT_ONRESUME = 15;//运营从后台回到前台,更新步数
+
+
+
+    /*************************************用户其他值,非标志位************************************************************/
+    public static final long SERVICE_ID = 213511;//公司账号
+    //    public static final long SERVICE_ID = 213553;
+    public static final int TAG = 1;
+    public static final int GATHER_INTERVAL = 2;//位置采集周期
+    public static final int PACK_INTERVAL = 10;//位置采集周期
+    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 double PASS_RATE = 0.7;//通过率70%
     public static final int CHECK_ACCURACY = 50;//判断用户是否完成的精度范围
     public static final int LOCA_ACCURACY = 20;//定位过滤精度
@@ -27,6 +27,15 @@ public class RunningFinishBean implements Serializable {
     private boolean isPause;
     private String userPauseTime;
     private String userContinueTime;
+    private String failUUID;
+
+    public String getFailUUID() {
+        return failUUID;
+    }
+
+    public void setFailUUID(String failUUID) {
+        this.failUUID = failUUID;
+    }
  
     public boolean isPause() {
         return isPause;
@@ -666,6 +666,10 @@ public class StepService extends Service implements SensorEventListener {
         else if (messageEvent.getMessageType() == Constant.SERVICE_STEP_COUNT_CONTINUE) {
             pauseFlag = false;
         }
+        //更新锁屏步数
+        else if (messageEvent.getMessageType() == Constant.SERVICE_STEP_COUNT_ONRESUME) {
+            updateNotification();
+        }
     }
  
     /**
@@ -1063,7 +1067,7 @@ public class StepService extends Service implements SensorEventListener {
                     }
                     //总步数=现有的步数+本次有效步数
                     CURRENT_STEP += (thisStep);
-//                    Log.e(TAG, "onSensorChanged: 加了以后" + CURRENT_STEP);
+                    Log.e(TAG, "onSensorChanged: 加了以后" + CURRENT_STEP);
                     lastStep = tempStep;
                 }
             }
@@ -251,4 +251,5 @@ public class UserStepEntity {
     }
  
  
+
 }
@@ -127,6 +127,14 @@ public class RunMainFragment extends QMUIFragment&lt;RunMainFragmentView, RunMainFr
     }
  
     @Override
+    public void onResume() {
+        super.onResume();
+        if (getMvpView() != null) {
+            getMvpView().onResume();
+        }
+    }
+
+    @Override
     public void onDestroy() {
  
         super.onDestroy();
@@ -35,6 +35,7 @@ public class StepUtil {
         return UUID.randomUUID().toString().replace("-", "");
     }
  
+
     public static void initDataBase(Context context, String uid) {
         try {
             if (null == getUserStepData(context, uid)) {
@@ -50,6 +51,50 @@ public class StepUtil {
     }
  
     /**
+     * 更新删除临时保存数据
+     *
+     * @param context
+     * @param entity
+     */
+    public static void updateFailData(Context context, FailedEntity entity) {
+        try {
+            DbCore.init(context, dbName);
+            if (entity != null && !TextUtils.isEmpty(entity.getUuid())) {
+                DbCore.getDaoSession().getFailedEntityDao().update(entity);
+            }
+        } catch (Exception e) {
+            Log.e(TAG, "deleteTempSaveFailData: " + e.toString());
+        }
+
+    }
+
+    /**
+     * 获取暂存的失败数据
+     *
+     * @param context
+     * @param uid
+     * @return
+     */
+    public static FailedEntity getTempSaveFailByUUID(Context context, String uid, String UUID) {
+        try {
+            DbCore.init(context, dbName);
+            List<FailedEntity> list = DbCore.getDaoSession().getFailedEntityDao().queryBuilder().where(FailedEntityDao.Properties.Uid.eq(uid), FailedEntityDao.Properties.Uuid.eq(UUID)).list();
+            if (list != null && list.size() > 0) {
+                if (list.get(0) == null) {
+                    return null;
+                } else {
+                    return list.get(0);
+                }
+            }
+            return null;
+        } catch (Exception e) {
+            Log.e(TAG, "getTempSaveFailByUUID: " + e.toString());
+            return null;
+        }
+
+    }
+
+    /**
      * 删除临时保存数据
      *
      * @param context