1 修改暂停后,实时轨迹显示逻辑

杨帅
1 parent 67a0c3c5
Showing 4 changed files with 47 additions and 9 deletions
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/presenter/RunningMapFragmentPresenter.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/model/RunningFinishBean.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/RunningMapFragment.java
moudle_pedometer/src/main/res/layout/fragment_self_record.xml
@@ -342,11 +342,17 @@ public class RunningMapFragmentPresenter extends MvpBasePresenter&lt;RunningMapFrag
     /**
      * 查询当前用户历史轨迹
      */
-    public void queryHistoryTrace(Context context, UserStepEntity userStepEntity) {
+    public void queryHistoryTrace(Context context, UserStepEntity userStepEntity, boolean isPause) {
         //查询当前用户的历史轨迹
         long startTime = userStepEntity.getStartTimeStamp();
         //获取当前的时间戳(秒)
-        long endTime = TimeUtil.getNowTimeStamp();
+        long endTime = 0;
+        //如果没有暂停
+        if (!isPause) {
+            endTime = TimeUtil.getNowTimeStamp();
+        } else {
+            endTime = userStepEntity.getPauseTimeStamp();
+        }
         //获取当前的实体名称
         String entityName = CommonInfo.getUserId(context);
         //打的重要点
@@ -356,10 +362,12 @@ public class RunningMapFragmentPresenter extends MvpBasePresenter&lt;RunningMapFrag
             public void success(List<LatLng> resultPoints) {
                 if (resultPoints != null && resultPoints.size() > 1) {
                     if (getView() != null && resultPoints != null) {
-                        if (resultPoints.size() == 1) {
-                            getView().setHistoryLastPoint(resultPoints.get(0));
-                        } else if (resultPoints.size() > 1) {
-                            getView().setHistoryLastPoint(resultPoints.get(resultPoints.size() - 1));
+                        if (!isPause) {
+                            if (resultPoints.size() == 1) {
+                                getView().setHistoryLastPoint(resultPoints.get(0));
+                            } else if (resultPoints.size() > 1) {
+                                getView().setHistoryLastPoint(resultPoints.get(resultPoints.size() - 1));
+                            }
                         }
                         if (importPoints != null && resultPoints != null) {
                             boolean isFinish = MyMapUtil.checkIsFinishTrace(importPoints, resultPoints, 0.6);
@@ -377,6 +385,28 @@ public class RunningMapFragmentPresenter extends MvpBasePresenter&lt;RunningMapFrag
             }
         });
  
+        //然后查询从暂停到现在的距离
+        if (isPause) {
+            long continueTime = userStepEntity.getContinueTime();
+            long continueendTime = TimeUtil.getNowTimeStamp();
+            MyMapUtil.queryHistoryTrace(context, StepService.mClient, entityName, startTime, endTime, new MyMapUtil.CallBack() {
+                @Override
+                public void success(List<LatLng> resultPoints) {
+                    if (resultPoints != null && resultPoints.size() > 1) {
+                        if (resultPoints.size() == 1) {
+                            getView().setHistoryLastPoint(resultPoints.get(0));
+                        } else if (resultPoints.size() > 1) {
+                            getView().setHistoryLastPoint(resultPoints.get(resultPoints.size() - 1));
+                        }
+                        //开始划线
+                        MyMapUtil.drawHistoryTrack(context, getView().baiduMap, resultPoints, SortType.asc, R.color.red, 0, 0);
+
+                    }
+                }
+            });
+
+        }
+
     }
  
  
@@ -21,6 +21,7 @@ public class RunningFinishBean implements Serializable {
     private String isFinish;
     private String roadmap;
     private String streetTitle;
+    //后续添加的,用于我的记录详情页跳转
     private String userStartTime;
     private String userFinishTime;
  
@@ -110,9 +110,15 @@ public class RunningMapFragment extends QMUIFragment&lt;RunningMapFragmentView, Run
         if (getMvpView() != null && userStepEntity != null) {
             //查询运营人员踩得轨迹
             getPresenter().getServerStreetTrace(getActivity(), userStepEntity);
-
-            //开始查询
-            getPresenter().queryHistoryTrace(getActivity(), userStepEntity);
+            //判断用户是否暂停过
+            if (userStepEntity.getPauseCount() != 0) {
+                //开始查询,用户已经点击暂停按钮(先画出用户 开始-暂停时间中的轨迹)
+                getPresenter().queryHistoryTrace(getActivity(), userStepEntity, true);
+
+            } else {
+                //开始查询,用户没有点击暂停按钮
+                getPresenter().queryHistoryTrace(getActivity(), userStepEntity, false);
+            }
         }
  
  
@@ -16,6 +16,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
+                android:layout_marginLeft="10dp"
                 android:padding="10dp"
                 android:src="@drawable/top_back_black" />