1 修复上传数据页面,用户暂停后,无法显示暂停路线问题

杨帅
1 parent c689e4c6
Showing 4 changed files with 155 additions and 84 deletions
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/service/CollStepService.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/presenter/RunningFinishFragmetPresenter.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/presenter/RunningMapFragmentPresenter.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/utils/StepUtil.java
@@ -28,8 +28,22 @@ import android.widget.Toast;
 import com.baidu.trace.LBSTraceClient;
 import com.baidu.trace.Trace;
+import com.baidu.trace.api.fence.AddMonitoredPersonResponse;
+import com.baidu.trace.api.fence.CreateFenceResponse;
+import com.baidu.trace.api.fence.DeleteFenceResponse;
+import com.baidu.trace.api.fence.DeleteMonitoredPersonResponse;
 import com.baidu.trace.api.fence.FenceAlarmPushInfo;
+import com.baidu.trace.api.fence.FenceListResponse;
+import com.baidu.trace.api.fence.HistoryAlarmResponse;
+import com.baidu.trace.api.fence.ListMonitoredPersonResponse;
 import com.baidu.trace.api.fence.MonitoredAction;
+import com.baidu.trace.api.fence.MonitoredStatus;
+import com.baidu.trace.api.fence.MonitoredStatusByLocationResponse;
+import com.baidu.trace.api.fence.MonitoredStatusInfo;
+import com.baidu.trace.api.fence.MonitoredStatusRequest;
+import com.baidu.trace.api.fence.MonitoredStatusResponse;
+import com.baidu.trace.api.fence.OnFenceListener;
+import com.baidu.trace.api.fence.UpdateFenceResponse;
 import com.baidu.trace.api.track.LatestPoint;
 import com.baidu.trace.api.track.LatestPointResponse;
 import com.baidu.trace.api.track.OnTrackListener;
@@ -43,11 +57,15 @@ import com.cnlive.moudle.pedometer.model.Constant;
 import com.cnlive.moudle.pedometer.model.MessageEvent;
 import com.cnlive.moudle.pedometer.model.step.StepCount;
 import com.cnlive.moudle.pedometer.model.step.StepValuePassListener;
+import com.cnlive.moudle.pedometer.service.KeepLiveService;
+import com.cnlive.moudle.pedometer.service.StepService;
 import com.cnlive.moudle.pedometer.sql.dao.CollUserStepEntityDao;
 import com.cnlive.moudle.pedometer.sql.db.DbCore;
 import com.cnlive.moudle.pedometer.sql.entity.CollUserStepEntity;
+import com.cnlive.moudle.pedometer.sql.entity.UserStepEntity;
 import com.cnlive.moudle.pedometer.ui.activity.PedometerMainActivity;
 import com.cnlive.moudle.pedometer.utils.ServiceUtils;
+import com.cnlive.moudle.pedometer.utils.StepUtil;
 import com.cnlive.moudle.pedometer.utils.TimeUtil;
 import com.example.moudle_pedometer.R;
@@ -56,6 +74,7 @@ import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.UUID;
@@ -63,8 +82,7 @@ import java.util.UUID;
 public class CollStepService extends Service implements SensorEventListener {
-    private String TAG = "CollStepService";
-
+    private String TAG = "StepService";
     /**
      * 通知栏相关
      */
@@ -92,11 +110,11 @@ public class CollStepService extends Service implements SensorEventListener {
     /**
      * 保存记步计时器
      */
-    private TimeCount time;
+    private static TimeCount time;
     /**
      * 当前所走的步数
      */
-    private int CURRENT_STEP;
+    private int CURRENT_STEP = 0;
     /**
      * 计步传感器类型  Sensor.TYPE_STEP_COUNTER或者Sensor.TYPE_STEP_DETECTOR
      */
@@ -120,12 +138,12 @@ public class CollStepService extends Service implements SensorEventListener {
     /**
      * IBinder对象，向Activity传递数据的桥梁
      */
-    private StepBinder stepBinder = new StepBinder();
+    private CollStepService.StepBinder stepBinder = new CollStepService.StepBinder();
     private String userId;
     private Handler handler;
     private Runnable speedRunnable;
     private final int NOTIFICATION_ID = 100;
-    private static int tempStep;//计步器临时保存步数
+    //    private static int tempStep;//计步器临时保存步数
     private static boolean pauseFlag;//是否暂停
     private static int speedCurrentStep;//用于检测速度步数
     private boolean updateSpeedStepFlag;//是否是已经更新速度
@@ -139,7 +157,6 @@ public class CollStepService extends Service implements SensorEventListener {
      * 轨迹监听器(用于接收纠偏后实时位置回调)
      */
     private OnTrackListener realTimeTraceListener = null;
-//    public static final long serviceId = 213553;//杨帅
     // 设备标识
     public static String entityName = "";
@@ -153,8 +170,6 @@ public class CollStepService extends Service implements SensorEventListener {
      */
     public static Trace mTrace = null;
-    private boolean isFirstSendNotification = true;
-
     public CollStepService() {
     }
@@ -165,11 +180,19 @@ public class CollStepService extends Service implements SensorEventListener {
         super.onCreate();
         init();
         initBroadcastReceiver();
+        if (!ServiceUtils.isServiceRunning(getApplicationContext(), "com.cnlive.moudle.pedometer.service.CollKeepLiveService")) {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                startForegroundService(new Intent(getApplicationContext(), KeepLiveService.class));
+            } else {
+                startService(new Intent(getApplicationContext(), KeepLiveService.class));
+            }
+        }
         showStartForegroundNotification();
     }
-    private void initTrace() {
+    private static int retryIndex = 0;
+    private void initTrace() {
         if (mClient == null) {
             mClient = new LBSTraceClient(getApplicationContext());
             // 设置定位和打包周期
@@ -228,9 +251,33 @@ public class CollStepService extends Service implements SensorEventListener {
                 if (StatusCodes.SUCCESS == errorNo || StatusCodes.START_TRACE_NETWORK_CONNECT_FAILED <= errorNo) {
                     //开始进行采集
                     if (mClient != null) {
+                        retryIndex = 0;
                         mClient.startGather(traceListener);
                         Toast.makeText(getApplicationContext(), "开启轨迹服务", Toast.LENGTH_LONG).show();
+                        boolean isFirstSendNotification = CollCommonInfo.getIsFirstStepSendTraceTip(getApplicationContext());
+                        if (isFirstSendNotification) {
+                            CollCommonInfo.setIsFirstStepSendTraceTip(getApplicationContext(), false);
+                            EventBus.getDefault().post(new MessageEvent(Constant.COLL_START_TRACE_GATHER_SUCCESS, ""));
+                        }
+
+
+                    }
+                } else {
+
+                    if (retryIndex < 4) {
+                        //重新开启服务
+                        if (mClient != null) {
+                            mClient.startTrace(mTrace, traceListener);
+                            retryIndex++;
+                        }
+                    } else {
+                        boolean isFirstSendNotification = CollCommonInfo.getIsFirstStepSendTraceTip(getApplicationContext());
+                        if (isFirstSendNotification) {
+                            CollCommonInfo.setIsFirstStepSendTraceTip(getApplicationContext(), false);
+                            EventBus.getDefault().post(new MessageEvent(Constant.COLL_START_TRACE_GATHER_FAIL, ""));
+                        }
                     }
+
                 }
             }
@@ -269,17 +316,15 @@ public class CollStepService extends Service implements SensorEventListener {
             @Override
             public void onStartGatherCallback(int errorNo, String message) {
                 if (StatusCodes.SUCCESS == errorNo || StatusCodes.GATHER_STARTED == errorNo) {
+                    retryIndex = 0;
                     Toast.makeText(getApplicationContext(), "开始采集", Toast.LENGTH_LONG).show();
-                    boolean isFirstSendNotification = CollCommonInfo.getIsFirstStepSendTraceTip(getApplicationContext());
-                    if (isFirstSendNotification) {
-                        CollCommonInfo.setIsFirstStepSendTraceTip(getApplicationContext(), false);
-                        EventBus.getDefault().post(new MessageEvent(Constant.COLL_START_TRACE_GATHER_SUCCESS, ""));
-                    }
                 } else {
-                    boolean isFirstSendNotification = CollCommonInfo.getIsFirstStepSendTraceTip(getApplicationContext());
-                    if (isFirstSendNotification) {
-                        CollCommonInfo.setIsFirstStepSendTraceTip(getApplicationContext(), false);
-                        EventBus.getDefault().post(new MessageEvent(Constant.COLL_START_TRACE_GATHER_FAIL, ""));
+                    //重新开启采集
+                    if (retryIndex < 4) {
+                        if (null != mClient) {
+                            mClient.startGather(traceListener);
+                        }
+                        retryIndex++;
                     }
                 }
             }
@@ -320,24 +365,6 @@ public class CollStepService extends Service implements SensorEventListener {
             @Override
             public void onPushCallback(byte messageType, PushMessage pushMessage) {
                 Log.e(TAG, "onPushCallback: ");
-
-                if (messageType < 0x03 || messageType > 0x04) {
-                    return;
-                }
-                FenceAlarmPushInfo alarmPushInfo = pushMessage.getFenceAlarmPushInfo();
-                if (null == alarmPushInfo) {
-                    return;
-                }
-                //超出范围
-                if (alarmPushInfo.getMonitoredAction() == MonitoredAction.exit) {
-                    EventBus.getDefault().post(new MessageEvent(Constant.EXIT_RANGE, ""));
-                }
-                //进入范围
-                else if (alarmPushInfo.getMonitoredAction() == MonitoredAction.enter) {
-                    EventBus.getDefault().post(new MessageEvent(Constant.ENTER_RANGE, ""));
-                }
-                Toast.makeText(getApplicationContext(), "onPushCallback:" + alarmPushInfo.getMonitoredAction(), Toast.LENGTH_SHORT).show();
-
             }
             @Override
@@ -348,14 +375,11 @@ public class CollStepService extends Service implements SensorEventListener {
         //开启轨迹服务
         if (mClient != null) {
             mClient.startTrace(mTrace, traceListener);
-            long stepStartTime = CollCommonInfo.getStepStartTime(getApplicationContext());
-            if (stepStartTime == 0) {
-                CollCommonInfo.setStepStartTime(getApplicationContext(), TimeUtil.getNowTimeStamp());
-            }
         }
     }
+
     private long i = 0;
     private long index = 0;
     private int mJobId;
@@ -369,7 +393,6 @@ public class CollStepService extends Service implements SensorEventListener {
             if (!EventBus.getDefault().isRegistered(this)) {
                 EventBus.getDefault().register(this);
             }
-
             entityName = userId;
             initTodayData(userId);
             initTrace();
@@ -383,8 +406,7 @@ public class CollStepService extends Service implements SensorEventListener {
             }).start();
             startTimeCount();
         } else {
-            EventBus.getDefault().post(new MessageEvent(Constant.COLL_START_TRACE_GATHER_FAIL, ""));
-
+            EventBus.getDefault().post(new MessageEvent(Constant.START_TRACE_GATHER_FAIL, ""));
         }
 //        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.LOLLIPOP) {
 //            //开始配置JobInfo
@@ -406,7 +428,7 @@ public class CollStepService extends Service implements SensorEventListener {
     }
     private void init() {
-        CommonInfo.setIsRunStepService(getApplicationContext(), true);
+        CollCommonInfo.setIsRunStepService(getApplicationContext(), true);
         if (null == mNM) {
             mNM = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
         }
@@ -431,7 +453,7 @@ public class CollStepService extends Service implements SensorEventListener {
     private void showStartForegroundNotification() {
         remoteViews = new RemoteViews(getPackageName(), R.layout.custom_step_notification);
         NotificationChannel channel = null;
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
             channel = new NotificationChannel(CHANNEL_ONE_ID, CHANNEL_ONE_NAME,
                     NotificationManager.IMPORTANCE_HIGH);
             channel.enableLights(false);
@@ -481,7 +503,18 @@ public class CollStepService extends Service implements SensorEventListener {
         if (speedRunnable != null) {
             handler.removeCallbacks(speedRunnable);
         }
-        Log.e("杀死", "MyTestService");
+//        Log.e("杀死", "MyTestService");
+        lastStep = 0;
+        hasStepCount = 0;
+        hasRecord = false;
+        CURRENT_STEP = 0;
+        previousStepCount = 0;
+        if (sensorManager != null) {
+            sensorManager.unregisterListener(CollStepService.this);
+            sensorManager = null;
+        }
+        stepSensorType = -1;
+        time = null;
     }
     //接收事件
@@ -544,17 +577,15 @@ public class CollStepService extends Service implements SensorEventListener {
             return;
         }
         //获取当天的数据，用于展示 CURRENT_DATE
-        List<CollUserStepEntity> list = DbCore.getDaoSession().getCollUserStepEntityDao().queryBuilder().where(CollUserStepEntityDao.Properties.UserId.eq(userId), CollUserStepEntityDao.Properties.Date.eq(CURRENT_DATE)).list();
-        if (list == null) {
-            return;
-        }
-        if (list.size() == 0 || list.isEmpty()) {
+        CollUserStepEntity userStepEntity = StepUtil.getCollUserStepData(getApplicationContext(), CollCommonInfo.getUserId(getApplicationContext()));
+        if (userStepEntity == null) {
             CURRENT_STEP = 0;
-        } else if (list.size() == 1) {
-            CURRENT_STEP = Integer.parseInt(list.get(0).getStepCount());
         } else {
-            Log.e(TAG, "出错了！");
+            if (userStepEntity.getStepCount() != null) {
+                CURRENT_STEP = Integer.parseInt(userStepEntity.getStepCount());
+            }
         }
+//        Log.e(TAG, "initTodayData: 初始化当前步数" + CURRENT_STEP);
         if (mStepCount != null) {
             mStepCount.setSteps(CURRENT_STEP);
         }
@@ -562,6 +593,7 @@ public class CollStepService extends Service implements SensorEventListener {
     }
     private void updateNotification() {
+//        Log.e(TAG, "updateNotification: 当前步数:" + CURRENT_STEP);
         EventBus.getDefault().post(new MessageEvent(Constant.SERVICE_STEP_COUNT_UPDATE, CURRENT_STEP));
         updateSpeedStepFlag = false;
 //        remoteViews = new RemoteViews(getPackageName(), R.layout.custom_step_notification);
@@ -857,29 +889,45 @@ public class CollStepService extends Service implements SensorEventListener {
      *
      * @param event
      */
+    private static int lastStep = 0;//有时候获取的是一样的
+
     @Override
     public void onSensorChanged(SensorEvent event) {
         //没有暂停
         if (stepSensorType == Sensor.TYPE_STEP_COUNTER) {
             //获取当前传感器返回的临时步数
-            tempStep = (int) event.values[0];
+            int tempStep = (int) event.values[0];
+//            Log.e(TAG, "onSensorChanged: 第一次,tempStep:" + tempStep + "lastStep:" + lastStep + ",previousStepCount" + previousStepCount + ",CURRENT_STEP" + CURRENT_STEP);
             //首次如果没有获取手机系统中已有的步数则获取一次系统中APP还未开始记步的步数
             if (!hasRecord) {
                 hasRecord = true;
                 hasStepCount = tempStep;
+                previousStepCount = 0;
             } else {
-                //获取APP打开到现在的总步数=本次系统回调的总步数-APP打开之前已有的步数
-                int thisStepCount = tempStep - hasStepCount;
-                //本次有效步数=（APP打开后所记录的总步数-上一次APP打开后所记录的总步数）
-                int thisStep = thisStepCount - previousStepCount;
-                //当用户点击暂停了
-                if (pauseFlag) {
-                    thisStep = 0;
+                if (tempStep > lastStep) {
+                    //获取APP打开到现在的总步数=本次系统回调的总步数-APP打开之前已有的步数
+//                    Log.e(TAG, "tempStep: " + tempStep + ",hasStepCount:" + hasStepCount);
+                    int thisStepCount = tempStep - hasStepCount;
+//                    Log.e(TAG, "onSensorChanged: thisStepCount" + thisStepCount);
+                    //本次有效步数=（APP打开后所记录的总步数-上一次APP打开后所记录的总步数）
+                    int thisStep = thisStepCount - previousStepCount;
+                    //记录最后一次APP打开到现在的总步数
+                    previousStepCount = thisStepCount;
+//                    Log.e(TAG, "本次有效步数: thisStep" + thisStep + ",previousStepCount:" + previousStepCount);
+                    //当用户点击暂停了
+                    if (pauseFlag) {
+                        thisStep = 0;
+//                        Log.e(TAG, "修改: thisStepCount" + thisStep);
+                    }
+//                    Log.e(TAG, "onSensorChanged: CURRENT_STEP" + CURRENT_STEP);
+                    if (CURRENT_STEP < 0) {
+                        CURRENT_STEP = -CURRENT_STEP;
+                    }
+                    //总步数=现有的步数+本次有效步数
+                    CURRENT_STEP += (thisStep);
+//                    Log.e(TAG, "onSensorChanged: 加了以后" + CURRENT_STEP);
+                    lastStep = tempStep;
                 }
-                //总步数=现有的步数+本次有效步数
-                CURRENT_STEP += (thisStep);
-                //记录最后一次APP打开到现在的总步数
-                previousStepCount = thisStepCount;
             }
         } else if (stepSensorType == Sensor.TYPE_STEP_DETECTOR) {
             if (event.values[0] == 1.0) {
@@ -905,27 +953,21 @@ public class CollStepService extends Service implements SensorEventListener {
      * 保存记步数据
      */
     private void save() {
-        boolean isWriteUserStep = CommonInfo.getIsWriteUserStep(getApplicationContext());
-        if (!isWriteUserStep) {
-            return;
-        }
         int tempStep = CURRENT_STEP;
-        List<CollUserStepEntity> list = DbCore.getDaoSession().getCollUserStepEntityDao().queryBuilder().where(CollUserStepEntityDao.Properties.UserId.eq(userId), CollUserStepEntityDao.Properties.Date.eq(CURRENT_DATE)).list();
-        if (list.size() == 0 || list.isEmpty()) {
-            CollUserStepEntity data = new CollUserStepEntity();
-            data.setUuid(UUID.randomUUID().toString());
+        UserStepEntity userStepEntity = StepUtil.getUserStepData(getApplicationContext(), CollCommonInfo.getUserId(getApplicationContext()));
+        if (userStepEntity == null) {
+            UserStepEntity data = new UserStepEntity();
             data.setUserId(userId);
             data.setDate(CURRENT_DATE);
             data.setStepCount(tempStep + "");
-            DbCore.getDaoSession().getCollUserStepEntityDao().insert(data);
-        } else if (list.size() == 1) {
-            CollUserStepEntity data = list.get(0);
-            data.setStepCount(tempStep + "");
-            DbCore.getDaoSession().getCollUserStepEntityDao().update(data);
+            StepUtil.insertStepData(getApplicationContext(), data);
         } else {
+            userStepEntity.setStepCount(tempStep + "");
+            StepUtil.updateStepData(getApplicationContext(), userStepEntity);
         }
     }
+
     /**
      * 保存记步数据
      */
@@ -937,9 +979,11 @@ public class CollStepService extends Service implements SensorEventListener {
         @Override
         public void onFinish() {
             // 如果计时器正常结束，则开始计步
-            time.cancel();
-            save();
-            startTimeCount();
+            if (null != time) {
+                time.cancel();
+                save();
+                startTimeCount();
+            }
         }
         @Override
@@ -211,6 +211,8 @@ public class RunningFinishFragmetPresenter extends MvpBasePresenter&lt;RunningFinis
                         //判断用户是否点击暂停按钮
                         if (userStepEntity.getPauseCount() == 0) {
                             MyMapUtil.drawHistoryTrack(context, getView().baiduMap, resultPoints, SortType.asc, R.color.red, R.drawable.icon_start, R.drawable.icon_end);
+                            MyMapUtil.setMapAutoZoom(getView().baiduMap, resultPoints, -2f);
+
                             //没有点击暂停
                             //先判断是否到达终点
                             checkUserIsFinish(resultPoints, userStepEntity, runningFinishBean, context);
@@ -231,6 +233,8 @@ public class RunningFinishFragmetPresenter extends MvpBasePresenter&lt;RunningFinis
                                         allResults.addAll(resultPoints);
                                         //判断用户是否完成
                                         if (importPoints != null) {
+                                            MyMapUtil.drawHistoryTrack(context, getView().baiduMap, resultPoints, SortType.asc, R.color.red, 0, R.drawable.icon_end);
+                                            MyMapUtil.setMapAutoZoom(getView().baiduMap, allResults, -2f);
                                             //先判断是否到达终点
                                             checkUserIsFinish(resultPoints, userStepEntity, runningFinishBean, context);
                                             saveRouteData(context, userStepEntity, runningFinishBean);
@@ -382,7 +382,7 @@ public class RunningMapFragmentPresenter extends MvpBasePresenter&lt;RunningMapFrag
                             if (isPause) {
                                 MyMapUtil.drawRealTimeTrack(context, getView().baiduMap, resultPoints, SortType.asc, R.color.red, R.drawable.icon_start);
                             } else {
-                                MyMapUtil.drawHistoryTrack(context, getView().baiduMap, resultPoints, SortType.asc, R.color.red, R.drawable.icon_start, R.drawable.icon_end);
+                                MyMapUtil.drawHistoryTrack(context, getView().baiduMap, resultPoints, SortType.asc, R.color.red, R.drawable.icon_start, 0);
                             }
                         }
                     }
@@ -6,9 +6,11 @@ import android.util.Log;
 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.model.Constant;
+import com.cnlive.moudle.pedometer.sql.dao.CollUserStepEntityDao;
 import com.cnlive.moudle.pedometer.sql.dao.FailedEntityDao;
 import com.cnlive.moudle.pedometer.sql.dao.UserStepEntityDao;
 import com.cnlive.moudle.pedometer.sql.db.DbCore;
+import com.cnlive.moudle.pedometer.sql.entity.CollUserStepEntity;
 import com.cnlive.moudle.pedometer.sql.entity.FailedEntity;
 import com.cnlive.moudle.pedometer.sql.entity.UserStepEntity;
@@ -264,6 +266,27 @@ public class StepUtil {
     }
     /**
+     * 获取运营用户数据
+     *
+     * @param context
+     * @param uid
+     * @return
+     */
+    public static CollUserStepEntity getCollUserStepData(Context context, String uid) {
+        if (!TextUtils.isEmpty(uid)) {
+            DbCore.init(context, dbName);
+            List<CollUserStepEntity> list = DbCore.getDaoSession().getCollUserStepEntityDao().queryBuilder().where(CollUserStepEntityDao.Properties.UserId.eq(uid)).list();
+            if (list != null && list.size() > 0) {
+                return list.get(0);
+            } else {
+                return null;
+            }
+        } else {
+            return null;
+        }
+    }
+
+    /**
      * 设置用户数据
      *
      * @param context