1 实现重新上传功能模块

2 完成全部成绩详情页

1 实现重新上传功能模块
2 完成全部成绩详情页
杨帅
1 parent e8e32e1c
Showing 24 changed files with 985 additions and 86 deletions
moudle_pedometer/src/main/AndroidManifest.xml
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/activity/CollRunningFinishActivity.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/presenter/ALLScoreDetailFragmentPresenter.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/presenter/LineUpAgainPresenter.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/frame/presenter/UploadFailDetailFragmentPresenter.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/LineUpAgainView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RaceRecorView.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/UploadFailDetailFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/service/StepService.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/ALLScoreDetailActivity.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/adapter/LineUpAgainAdapter.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/adapter/RaceRecordAdapter.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/LineUpAgainFragment.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/UploadFailDetailFragment.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/utils/MyMapUtil.java
@@ -128,7 +128,7 @@
         <activity
             android:name="com.cnlive.moudle.pedometer.ui.activity.RunRaceDetailActivity"
             android:launchMode="singleTask"
-            android:process=":step" />
+             />
         <activity
             android:name="com.cnlive.moudle.pedometer.ui.activity.RunningFinishActivity"
             android:launchMode="singleTask"
@@ -136,7 +136,11 @@
         <activity
             android:name="com.cnlive.moudle.pedometer.ui.activity.UploadFailDetailActivity"
             android:launchMode="singleTask"
-            android:process=":step" />
+           />
+        <!--全部成绩详情页-->
+        <activity
+            android:name="com.cnlive.moudle.pedometer.ui.activity.ALLScoreDetailActivity"
+            android:launchMode="singleTask" />
         <!--************************************************路径工具**********************************************-->
         <service
             android:name="com.cnlive.moudle.collectionTrace.service.CollKeepLiveService"
@@ -39,7 +39,7 @@ public class CollRunningFinishActivity extends QMUIFragmentActivity {
     }
  
     private void addFragment(RunningFinishBean runningFinishBean) {
-        QMUIFragment fragment = CollRunningFinishFragment.instance(runningFinishBean);
+        QMUIFragment fragment =RunningFinishFragment.instance(runningFinishBean);
         getSupportFragmentManager().beginTransaction()
                 .add(getContextViewId(), fragment, fragment.getClass().getSimpleName())
                 .addToBackStack(fragment.getClass().getSimpleName())
+package com.cnlive.moudle.pedometer.frame.presenter;
+
+import com.cnlive.moudle.pedometer.frame.view.ALLScoreDetailFragmentView;
+import com.hannesdorfmann.mosby3.mvp.MvpBasePresenter;
+
+public class ALLScoreDetailFragmentPresenter extends MvpBasePresenter<ALLScoreDetailFragmentView> {
+}
 package com.cnlive.moudle.pedometer.frame.presenter;
  
+import android.app.Activity;
+import android.os.Handler;
+import android.text.TextUtils;
+import android.util.Log;
+import android.widget.Toast;
+
+import com.baidu.mapapi.model.LatLng;
+import com.baidu.trace.LBSTraceClient;
+import com.baidu.trace.model.SortType;
+import com.cnlive.libs.base.logic.Logic;
+import com.cnlive.libs.base.logic.callback.DataCallback;
+import com.cnlive.libs.base.logic.callback.FailureCallback;
+import com.cnlive.libs.base.logic.callback.SuccessCallback;
+import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.frame.view.LineUpAgainView;
+import com.cnlive.moudle.pedometer.model.Constant;
+import com.cnlive.moudle.pedometer.net.ApiServiceRunLin;
+import com.cnlive.moudle.pedometer.net.SubscriptionRequest;
+import com.cnlive.moudle.pedometer.net.bean.BaseInfo;
+import com.cnlive.moudle.pedometer.sql.entity.FailedEntity;
+import com.cnlive.moudle.pedometer.ui.activity.LineUpAgainActivity;
+import com.cnlive.moudle.pedometer.ui.widget.SelectDialog;
+import com.cnlive.moudle.pedometer.utils.GsonUtil;
+import com.cnlive.moudle.pedometer.utils.MyMapUtil;
+import com.cnlive.moudle.pedometer.utils.QMUITipDialogUtil;
+import com.cnlive.moudle.pedometer.utils.StepUtil;
+import com.example.moudle_pedometer.R;
 import com.hannesdorfmann.mosby3.mvp.MvpBasePresenter;
  
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import io.reactivex.disposables.Disposable;
+
 /**
  * Created by hanyayun 019/06/20.
  */
 public class LineUpAgainPresenter extends MvpBasePresenter<LineUpAgainView> {
+    private LBSTraceClient mClient = null;
+    private List<LatLng> importPoints;
+    private SelectDialog uploadFailDialog;
+    private SelectDialog failTraceDialog;
+
+    /**
+     * 查询当前用户历史轨迹(用于重新上传按钮)
+     */
+    public void queryHistoryTraceNoMap(Activity context, FailedEntity failedEntity,onResultListener onResultListener) {
+        QMUITipDialogUtil.loadingDialog(context, "正在获取轨迹信息,请稍后", false);
+        //查询当前用户的历史轨迹
+        long startTime = failedEntity.getUserStartTime();
+        //获取当前的时间戳(秒)
+        long endTime = failedEntity.getUserEndTime();
+        //获取当前的实体名称
+        String entityName = CommonInfo.getUserId(context);
+        //打的重要点
+        importPoints = null;
+        if (!TextUtils.isEmpty(failedEntity.getImportPoint())) {
+            importPoints = GsonUtil.jsonToList(failedEntity.getImportPoint(), LatLng.class);
+        }
+        if (mClient == null) {
+            mClient = new LBSTraceClient(context);
+        }
+        MyMapUtil.queryHistoryTrace(context, mClient, entityName, startTime, endTime, new MyMapUtil.CallBack() {
+            @Override
+            public void success(List<LatLng> resultPoints) {
+                if (resultPoints != null) {
+                    if (getView() != null) {
+                        QMUITipDialogUtil.dismessDialog();
+                        if (importPoints != null) {
+                            //判断是否完成
+                            boolean isFinish = MyMapUtil.checkIsFinishTrace(importPoints, resultPoints, Constant.PASS_RATE);
+                            if (isFinish) {
+                                Toast.makeText(context, "完成", Toast.LENGTH_LONG).show();
+                                failedEntity.setIsFinish("1");
+                            } else {
+                                Toast.makeText(context, "没有完成", Toast.LENGTH_LONG).show();
+                                failedEntity.setIsFinish("0");
+                            }
+                            saveRouteData(context, failedEntity,onResultListener);
+                        }
+                    }
+                }
+                //查询失败
+                else {
+                    QMUITipDialogUtil.dismessDialog();
+                    if (failTraceDialog == null) {
+                        failTraceDialog = new SelectDialog(context, "获取轨迹失败,是否重试?", "重试", new SelectDialog.DialogInterface() {
+                            @Override
+                            public void onClick(SelectDialog dialog) {
+                                dialog.dismiss();
+                                queryHistoryTraceNoMap(context, failedEntity,onResultListener);
+                            }
+                        }, "取消", new SelectDialog.DialogInterface() {
+                            @Override
+                            public void onClick(SelectDialog dialog) {
+                                dialog.dismiss();
+
+                            }
+                        });
+                        failTraceDialog.setCanceledOnTouchOutside(false);
+                        failTraceDialog.setCancelable(false);
+                        if (!failTraceDialog.isShowing()) {
+                            failTraceDialog.show();
+                        }
+
+                    } else {
+                        if (!failTraceDialog.isShowing()) {
+                            failTraceDialog.show();
+                        }
+                    }
+                }
+            }
+        });
+
+    }
+
+    /**
+     * 上传数据
+     *
+     * @param context
+     * @param failedEntity
+     */
+    public void saveRouteData(Activity context, FailedEntity failedEntity,onResultListener onResultListener) {
+        QMUITipDialogUtil.loadingDialog(context, "正在上传数据", false);
+        // 赛事id
+        String eventId = failedEntity.getStreetId();
+        //用户ID
+        String sid = CommonInfo.getUserId(context);
+        //用时
+        String employTime = failedEntity.getTime();
+        //路线全程里数
+        String mileage = "";
+        if ("--".equals(failedEntity.getDistance())) {
+            mileage = "0";
+        } else {
+            mileage = failedEntity.getDistance();
+        }
+        //配速
+        String pace = "";
+        if ("--".equals(failedEntity.getSpeed())) {
+            pace = "0";
+        } else {
+            pace = failedEntity.getSpeed();
+        }
+        //  路线图
+        String roadmap = "";
+        //经纬度
+        String latLongitude = "";
+        // 开始时间
+        String startTime = failedEntity.getUserStartTime() + "";
+        //结束时间
+        String endTime = failedEntity.getUserEndTime() + "";
+        //暂停时间
+        String pauseTime = "";
+        String isPause = "0";//1暂停
+        if (failedEntity.getIsPause()) {
+            pauseTime = failedEntity.getUserPauseTime() + "";
+            isPause = "1";
+        }
+        //继续时间
+        String continueTime = "";
+        //是否完成
+        String completeStatus = failedEntity.getIsFinish();
+
+        //设置请求参数
+        Map<String, String> paramsMap = new HashMap<>();
+        paramsMap.put("eventId", eventId);
+        paramsMap.put("sid", sid);
+        paramsMap.put("employTime", employTime);
+        paramsMap.put("mileage", mileage);
+        paramsMap.put("pace", pace);
+        paramsMap.put("latLongitude", latLongitude);
+        paramsMap.put("roadmap", roadmap);
+        paramsMap.put("startTime", startTime);
+        paramsMap.put("endTime", endTime);
+        paramsMap.put("pauseTime", pauseTime);
+        paramsMap.put("continueTime", continueTime);
+        paramsMap.put("isPause", isPause);
+        paramsMap.put("completeStatus", completeStatus);
+
+
+        Logic.create(paramsMap).action(new Logic.Action<Map<String, String>, BaseInfo>() {
+            @Override
+            public Disposable action(Map<String, String> stringStringMap, DataCallback<BaseInfo> dataCallback) {
+                return SubscriptionRequest.service(ApiServiceRunLin.class, api -> api.saveRouteData(stringStringMap)).subscribe(context, dataCallback);
+            }
+        }).<BaseInfo>event()
+                .setFailureCallback(new FailureCallback() {
+                    @Override
+                    public void onFailure(int code, String message) {
+                        if (getView() == null) {
+                            return;
+                        }
+                        if (onResultListener!=null){
+                            onResultListener.onFailed(message);
+                        }
+                        Log.e("saveRouteData", "onFailure: " + message);
+                        QMUITipDialogUtil.dismessDialog();
+                        if (uploadFailDialog == null) {
+                            uploadFailDialog = new SelectDialog(context, "上传数据失败,是否重试?", "重试", new SelectDialog.DialogInterface() {
+                                @Override
+                                public void onClick(SelectDialog dialog) {
+                                    dialog.dismiss();
+                                    saveRouteData(context, failedEntity,onResultListener);
+                                }
+                            }, "取消", new SelectDialog.DialogInterface() {
+                                @Override
+                                public void onClick(SelectDialog dialog) {
+                                    dialog.dismiss();
+                                }
+                            });
+                            uploadFailDialog.setCanceledOnTouchOutside(false);
+                            uploadFailDialog.setCancelable(false);
+                            if (!uploadFailDialog.isShowing()) {
+                                uploadFailDialog.show();
+                            }
+                        } else {
+                            if (!uploadFailDialog.isShowing()) {
+                                uploadFailDialog.show();
+                            }
+                        }
+                    }
+                }).setSuccessCallback(new SuccessCallback<BaseInfo>() {
+            @Override
+            public void onSuccess(BaseInfo baseInfo) {
+                if (getView() == null) {
+                    return;
+                }
+
+                QMUITipDialogUtil.dismessDialog();
+                QMUITipDialogUtil.successDialog(context, "上传成功", 1);
+                //删除暂存数据
+                FailedEntity entity = StepUtil.getTempSaveFailData(context, CommonInfo.getUserId(context), failedEntity.getUserStartTime());
+                if (entity != null) {
+                    //删除
+                    StepUtil.deleteTempSaveFailData(context, entity);
+                }
+                if (onResultListener!=null){
+                    onResultListener.onSuccess();
+                }
+            }
+        }).start();
+    }
+
+    public interface onResultListener {
+        void onSuccess();
+
+        void onFailed(String tip);
+    }
 }
@@ -105,7 +105,8 @@ public class RunningFinishFragmetPresenter extends MvpBasePresenter&lt;RunningFinis
         String continueTime = "";
         //是否完成
         String completeStatus = runningFinishBean.getIsFinish();
-
+        //设置步数
+        String step = runningFinishBean.getStep();
         //设置请求参数
         Map<String, String> paramsMap = new HashMap<>();
         paramsMap.put("eventId", eventId);
@@ -121,6 +122,8 @@ public class RunningFinishFragmetPresenter extends MvpBasePresenter&lt;RunningFinis
         paramsMap.put("continueTime", continueTime);
         paramsMap.put("isPause", isPause);
         paramsMap.put("completeStatus", completeStatus);
+        paramsMap.put("step", step);
+
  
  
         Logic.create(paramsMap).action(new Logic.Action<Map<String, String>, BaseInfo>() {
@@ -370,7 +370,7 @@ public class RunningMapFragmentPresenter extends MvpBasePresenter&lt;RunningMapFrag
                                 Toast.makeText(context, "没有完成", Toast.LENGTH_LONG).show();
  
                             }
-                            MyMapUtil.drawHistoryTrack(context, getView().baiduMap, resultPoints, SortType.asc, R.color.red, R.drawable.icon_start, R.drawable.icon_end);
+                            MyMapUtil.drawRealTimeTrack(context, getView().baiduMap, resultPoints, SortType.asc, R.color.red, R.drawable.icon_start);
                         }
                     }
                 }
 package com.cnlive.moudle.pedometer.frame.presenter;
  
+import android.app.Activity;
+import android.os.Handler;
+import android.text.TextUtils;
+import android.util.Log;
+import android.widget.Toast;
+
+import com.baidu.mapapi.model.LatLng;
+import com.baidu.trace.LBSTraceClient;
+import com.baidu.trace.model.SortType;
+import com.cnlive.libs.base.logic.Logic;
+import com.cnlive.libs.base.logic.callback.DataCallback;
+import com.cnlive.libs.base.logic.callback.FailureCallback;
+import com.cnlive.libs.base.logic.callback.SuccessCallback;
+import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.frame.view.UploadFailDetailFragmentView;
+import com.cnlive.moudle.pedometer.model.Constant;
+import com.cnlive.moudle.pedometer.model.RunningFinishBean;
+import com.cnlive.moudle.pedometer.net.ApiServiceRunLin;
+import com.cnlive.moudle.pedometer.net.SubscriptionRequest;
+import com.cnlive.moudle.pedometer.net.bean.BaseInfo;
+import com.cnlive.moudle.pedometer.sql.entity.FailedEntity;
+import com.cnlive.moudle.pedometer.sql.entity.UserStepEntity;
+import com.cnlive.moudle.pedometer.ui.activity.LineUpAgainActivity;
+import com.cnlive.moudle.pedometer.ui.widget.SelectDialog;
+import com.cnlive.moudle.pedometer.utils.GsonUtil;
+import com.cnlive.moudle.pedometer.utils.MyMapUtil;
+import com.cnlive.moudle.pedometer.utils.QMUITipDialogUtil;
+import com.cnlive.moudle.pedometer.utils.StepUtil;
+import com.example.moudle_pedometer.R;
 import com.hannesdorfmann.mosby3.mvp.MvpBasePresenter;
  
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import io.reactivex.disposables.Disposable;
+
 public class UploadFailDetailFragmentPresenter extends MvpBasePresenter<UploadFailDetailFragmentView> {
+    private LBSTraceClient mClient = null;
+    private List<LatLng> importPoints;
+    private SelectDialog uploadFailDialog;
+    private SelectDialog failTraceDialog;
+
+    /**
+     * 查询当前用户历史轨迹
+     */
+    public void queryHistoryTrace(Activity context, FailedEntity failedEntity) {
+        QMUITipDialogUtil.loadingDialog(context, "正在获取轨迹信息,请稍后", false);
+        //查询当前用户的历史轨迹
+        long startTime = failedEntity.getUserStartTime();
+        //获取当前的时间戳(秒)
+        long endTime = failedEntity.getUserEndTime();
+        //获取当前的实体名称
+        String entityName = CommonInfo.getUserId(context);
+        //打的重要点
+        importPoints = null;
+        if (!TextUtils.isEmpty(failedEntity.getImportPoint())) {
+            importPoints = GsonUtil.jsonToList(failedEntity.getImportPoint(), LatLng.class);
+        }
+        if (mClient == null) {
+            mClient = new LBSTraceClient(context);
+        }
+        MyMapUtil.queryHistoryTrace(context, mClient, entityName, startTime, endTime, new MyMapUtil.CallBack() {
+            @Override
+            public void success(List<LatLng> resultPoints) {
+                if (resultPoints != null) {
+                    if (getView() != null) {
+                        QMUITipDialogUtil.dismessDialog();
+                        getView().updateStartBtnState(true);
+                        if (importPoints != null) {
+                            //判断是否完成
+                            boolean isFinish = MyMapUtil.checkIsFinishTrace(importPoints, resultPoints, Constant.PASS_RATE);
+                            if (isFinish) {
+                                Toast.makeText(context, "完成", Toast.LENGTH_LONG).show();
+                                failedEntity.setIsFinish("1");
+                                if (getView() != null) {
+                                    getView().updateIsFinish("1");
+                                }
+                            } else {
+                                Toast.makeText(context, "没有完成", Toast.LENGTH_LONG).show();
+                                failedEntity.setIsFinish("0");
+                                if (getView() != null) {
+                                    getView().updateIsFinish("0");
+                                }
+                            }
+                            if (resultPoints.size() > 1) {
+                                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);
+                            }
+
+                        }
+                    }
+                }
+                //查询失败
+                else {
+                    if (getView() == null) {
+                        return;
+                    }
+                    getView().updateStartBtnState(false);
+                    QMUITipDialogUtil.dismessDialog();
+
+                    if (failTraceDialog == null) {
+                        failTraceDialog = new SelectDialog(context, "获取轨迹失败,是否重试?", "重试", new SelectDialog.DialogInterface() {
+                            @Override
+                            public void onClick(SelectDialog dialog) {
+                                dialog.dismiss();
+                                queryHistoryTrace(context, failedEntity);
+                            }
+                        }, "取消", new SelectDialog.DialogInterface() {
+                            @Override
+                            public void onClick(SelectDialog dialog) {
+                                dialog.dismiss();
+
+                            }
+                        });
+                        failTraceDialog.setCanceledOnTouchOutside(false);
+                        failTraceDialog.setCancelable(false);
+                        if (!failTraceDialog.isShowing()) {
+                            failTraceDialog.show();
+                        }
+
+                    } else {
+                        if (!failTraceDialog.isShowing()) {
+                            failTraceDialog.show();
+                        }
+                    }
+                }
+            }
+        });
+
+    }
+
+    /**
+     * 上传数据
+     *
+     * @param context
+     * @param failedEntity
+     */
+    public void saveRouteData(Activity context, FailedEntity failedEntity) {
+        QMUITipDialogUtil.loadingDialog(context, "正在上传数据", false);
+        // 赛事id
+        String eventId = failedEntity.getStreetId();
+        //用户ID
+        String sid = CommonInfo.getUserId(context);
+        //用时
+        String employTime = failedEntity.getTime();
+        //路线全程里数
+        String mileage = "";
+        if ("--".equals(failedEntity.getDistance())) {
+            mileage = "0";
+        } else {
+            mileage = failedEntity.getDistance();
+        }
+        //配速
+        String pace = "";
+        if ("--".equals(failedEntity.getSpeed())) {
+            pace = "0";
+        } else {
+            pace = failedEntity.getSpeed();
+        }
+        //  路线图
+        String roadmap = "";
+        //经纬度
+        String latLongitude = "";
+        // 开始时间
+        String startTime = failedEntity.getUserStartTime() + "";
+        //结束时间
+        String endTime = failedEntity.getUserEndTime() + "";
+        //暂停时间
+        String pauseTime = "";
+        String isPause = "0";//1暂停
+        if (failedEntity.getIsPause()) {
+            pauseTime = failedEntity.getUserPauseTime() + "";
+            isPause = "1";
+        }
+        //继续时间
+        String continueTime = "";
+        //是否完成
+        String completeStatus = failedEntity.getIsFinish();
+        //设置步数
+        String step = failedEntity.getStep();
+        //设置请求参数
+        Map<String, String> paramsMap = new HashMap<>();
+        paramsMap.put("eventId", eventId);
+        paramsMap.put("sid", sid);
+        paramsMap.put("employTime", employTime);
+        paramsMap.put("mileage", mileage);
+        paramsMap.put("pace", pace);
+        paramsMap.put("latLongitude", latLongitude);
+        paramsMap.put("roadmap", roadmap);
+        paramsMap.put("startTime", startTime);
+        paramsMap.put("endTime", endTime);
+        paramsMap.put("pauseTime", pauseTime);
+        paramsMap.put("continueTime", continueTime);
+        paramsMap.put("isPause", isPause);
+        paramsMap.put("completeStatus", completeStatus);
+        paramsMap.put("step", step);
+
+        Logic.create(paramsMap).action(new Logic.Action<Map<String, String>, BaseInfo>() {
+            @Override
+            public Disposable action(Map<String, String> stringStringMap, DataCallback<BaseInfo> dataCallback) {
+                return SubscriptionRequest.service(ApiServiceRunLin.class, api -> api.saveRouteData(stringStringMap)).subscribe(context, dataCallback);
+            }
+        }).<BaseInfo>event()
+                .setFailureCallback(new FailureCallback() {
+                    @Override
+                    public void onFailure(int code, String message) {
+                        if (getView() == null) {
+                            return;
+                        }
+                        Log.e("saveRouteData", "onFailure: " + message);
+                        QMUITipDialogUtil.dismessDialog();
+                        if (uploadFailDialog == null) {
+                            uploadFailDialog = new SelectDialog(context, "上传数据失败,是否重试?", "重试", new SelectDialog.DialogInterface() {
+                                @Override
+                                public void onClick(SelectDialog dialog) {
+                                    dialog.dismiss();
+                                    saveRouteData(context, failedEntity);
+                                }
+                            }, "取消", new SelectDialog.DialogInterface() {
+                                @Override
+                                public void onClick(SelectDialog dialog) {
+                                    dialog.dismiss();
+
+                                }
+                            });
+                            uploadFailDialog.setCanceledOnTouchOutside(false);
+                            uploadFailDialog.setCancelable(false);
+                            if (!uploadFailDialog.isShowing()) {
+                                uploadFailDialog.show();
+                            }
+                        } else {
+                            if (!uploadFailDialog.isShowing()) {
+                                uploadFailDialog.show();
+                            }
+                        }
+                    }
+                }).setSuccessCallback(new SuccessCallback<BaseInfo>() {
+            @Override
+            public void onSuccess(BaseInfo baseInfo) {
+                if (getView() == null) {
+                    return;
+                }
+                QMUITipDialogUtil.dismessDialog();
+                QMUITipDialogUtil.successDialog(context, "上传成功", 1);
+                //删除暂存数据
+                FailedEntity entity = StepUtil.getTempSaveFailData(context, CommonInfo.getUserId(context), failedEntity.getUserStartTime());
+                if (entity != null) {
+                    //删除
+                    StepUtil.deleteTempSaveFailData(context, entity);
+                    //结束
+                    new Handler().postDelayed(new Runnable() {
+                        @Override
+                        public void run() {
+                            if (context != null) {
+                                context.finish();
+                            }
+                        }
+                    }, 1000);
+                }
+            }
+        }).start();
+    }
 }
+package com.cnlive.moudle.pedometer.frame.view;
+
+import android.content.Context;
+import android.text.TextUtils;
+import android.view.View;
+
+import com.cnlive.moudle.pedometer.model.RunningFinishBean;
+import com.cnlive.moudle.pedometer.ui.fragment.ALLScoreDetailFragment;
+import com.cnlive.moudle.pedometer.utils.TimeUtil;
+import com.hannesdorfmann.mosby3.mvp.MvpView;
+
+/**
+ * 全部成绩详情页
+ *
+ * @author ShinnyYang
+ */
+public class ALLScoreDetailFragmentView implements MvpView {
+    private ALLScoreDetailFragment fragment;
+    private RunningFinishBean runningFinishBean;
+
+    public ALLScoreDetailFragmentView(ALLScoreDetailFragment fragment) {
+        this.fragment = fragment;
+    }
+
+    public Context getContext() {
+        return fragment == null ? null : fragment.getActivity();
+    }
+
+    public void initView(RunningFinishBean runningFinishBean) {
+        this.runningFinishBean = runningFinishBean;
+        //隐藏开始按钮
+        fragment.binding.rlScrollViewStartBtn.setVisibility(View.GONE);
+        //设置标题
+        fragment.binding.includeFinishUserInfo.tvStreetName.setText(runningFinishBean.getStreetTitle());
+        //设置距离
+        fragment.binding.includeFinishUserInfo.tvDistance.setText(runningFinishBean.getRunDistance());
+        //设置配速
+        fragment.binding.includeFinishUserInfo.tvSpeed.setText(runningFinishBean.getSpeed());
+        if (!TextUtils.isEmpty(runningFinishBean.getEmployTime())) {
+            //设置用时
+            fragment.binding.includeFinishUserInfo.tvTimer.setText(TimeUtil.stampToChronometer(Long.parseLong(runningFinishBean.getEmployTime())));
+        }
+
+        //设置日期
+
+    }
+}
@@ -4,6 +4,7 @@ import android.support.v7.widget.LinearLayoutManager;
 import android.view.View;
  
 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
+import com.cnlive.moudle.pedometer.frame.presenter.LineUpAgainPresenter;
 import com.cnlive.moudle.pedometer.sql.entity.FailedEntity;
 import com.cnlive.moudle.pedometer.ui.activity.UploadFailDetailActivity;
 import com.cnlive.moudle.pedometer.ui.adapter.LineUpAgainAdapter;
@@ -50,5 +51,38 @@ public class LineUpAgainView implements MvpView {
                 UploadFailDetailActivity.startActivity(fragment.getActivity(), bean);
             }
         });
+        //设置重新上传按钮点击事件
+        againAdapter.setOnRestartUploadClickListener(new LineUpAgainAdapter.OnRestartUploadClickListener() {
+            @Override
+            public void onRestartUploadClickListener(FailedEntity failedEntity) {
+                if (fragment.getActivity() == null || fragment.getPresenter() == null) {
+                    return;
+                }
+                fragment.getPresenter().queryHistoryTraceNoMap(fragment.getActivity(), failedEntity, new LineUpAgainPresenter.onResultListener() {
+                    @Override
+                    public void onSuccess() {
+                        //刷新列表
+                        List<FailedEntity> failedEntities = StepUtil.getFailListData(fragment.getActivity(), CommonInfo.getUserId(fragment.getActivity()));
+                        if (failedEntities == null || failedEntities.size() < 1) {
+                            fragment.binding.llNoFailTip.setVisibility(View.VISIBLE);
+                        } else {
+                            uploadList(failedEntities);
+                        }
+                    }
+
+                    @Override
+                    public void onFailed(String tip) {
+
+                    }
+                });
+            }
+        });
+    }
+
+    public void uploadList(List<FailedEntity> failedEntities) {
+        //更新数据
+        if (againAdapter != null) {
+            againAdapter.uploadData(failedEntities);
+        }
     }
 }
@@ -10,6 +10,7 @@ import com.cnlive.moudle.pedometer.model.RunningFinishBean;
 import com.cnlive.moudle.pedometer.net.bean.BaseInfo;
 import com.cnlive.moudle.pedometer.net.bean.EventRouteRecordBeanVoListBean;
 import com.cnlive.moudle.pedometer.net.bean.RaceRecordInfo;
+import com.cnlive.moudle.pedometer.ui.activity.ALLScoreDetailActivity;
 import com.cnlive.moudle.pedometer.ui.activity.ShareRecordActivity;
 import com.cnlive.moudle.pedometer.ui.adapter.RaceRecordAdapter;
 import com.cnlive.moudle.pedometer.ui.fragment.RaceRecorFragment;
@@ -40,7 +41,7 @@ public class RaceRecorView implements MvpView {
                 .create();
     }
  
-    public void initView(){
+    public void initView() {
         fragment.binding.topbar.addLeftImageButton(R.drawable.top_back_black, R.id.fragment_back).setOnClickListener(v -> {
             fragment.getActivity().finish();
         });
@@ -49,58 +50,74 @@ public class RaceRecorView implements MvpView {
         fragment.binding.refreshLayout.setRefreshFooter(new ClassicsFooter(fragment.getActivity()));
     }
  
-    public void setData(BaseInfo<RaceRecordInfo> raceRecordInfoBaseInfo){
+    public void setData(BaseInfo<RaceRecordInfo> raceRecordInfoBaseInfo) {
         hideLoading();
         fragment.binding.ryRecord.setVisibility(View.VISIBLE);
         fragment.binding.txAll.setVisibility(View.VISIBLE);
-        if(raceRecordInfoBaseInfo.getData().getBestResult() == null){
+        if (raceRecordInfoBaseInfo.getData().getBestResult() == null) {
             showEmpty();
             return;
         }
  
-        if(fragment.currentPage == 1){
+        if (fragment.currentPage == 1) {
             list.clear();
             list.addAll(raceRecordInfoBaseInfo.getData().getEventRouteRecordBeanVoList());
-            if(adapter == null){
-                RaceRecordInfo.BestResultBean bestResultBean =  raceRecordInfoBaseInfo.getData().getBestResult();
+            if (adapter == null) {
+                RaceRecordInfo.BestResultBean bestResultBean = raceRecordInfoBaseInfo.getData().getBestResult();
                 fragment.binding.kilometerNum.setText(bestResultBean.getMileage());
                 fragment.binding.stepNum.setText(bestResultBean.getStep());
                 fragment.binding.kilometerTime.setText(bestResultBean.getEmployTime());
                 fragment.binding.kilometerSpeed.setText(bestResultBean.getPace());
                 fragment.binding.recordRecy.setLayoutManager(new LinearLayoutManager(fragment.getActivity()));
-                adapter = new RaceRecordAdapter(list,fragment.getActivity());
+                adapter = new RaceRecordAdapter(list, fragment.getActivity());
                 fragment.binding.recordRecy.setAdapter(adapter);
                 adapter.setOnClickListener(new RaceRecordAdapter.OnClickListener() {
                     @Override
                     public void onClickListener(EventRouteRecordBeanVoListBean bean, int position) {
-                        CollRunningFinishActivity.startActivity(fragment.getActivity(),new RunningFinishBean());
+                        if (null != bean) {
+                            //设置数据
+                            RunningFinishBean runningFinishBean = new RunningFinishBean();
+                            //设置赛事标题
+                            runningFinishBean.setStreetTitle(bean.getEventTitle());
+                            //设置步数
+                            runningFinishBean.setStep(bean.getStep());
+                            //设置距离
+                            runningFinishBean.setRunDistance(bean.getMileage());
+                            //设置配速
+                            runningFinishBean.setSpeed(bean.getPace());
+                            //设置用书
+                            runningFinishBean.setEmployTime(bean.getEmployTime());
+                            //设置起点
+                            ALLScoreDetailActivity.startActivity(fragment.getActivity(), runningFinishBean);
+
+                        }
                     }
                 });
                 fragment.binding.topbar.addRightImageButton(R.drawable.share_img, R.id.fragment_more)
                         .setOnClickListener(v -> {
                             //分享
-                            ShareRecordActivity.newInstance(fragment.getActivity(),fragment.raceTitle,bestResultBean.getMileage(),bestResultBean.getStep(),
-                                    bestResultBean.getEmployTime(),bestResultBean.getPace());
+                            ShareRecordActivity.newInstance(fragment.getActivity(), fragment.raceTitle, bestResultBean.getMileage(), bestResultBean.getStep(),
+                                    bestResultBean.getEmployTime(), bestResultBean.getPace());
                         });
  
-            }else {
+            } else {
                 adapter.notifyDataSetChanged();
             }
         }
  
-        if(list.size() != 0){
+        if (list.size() != 0) {
             fragment.binding.emptyNet.setVisibility(View.GONE);
             fragment.binding.refreshLayout.setVisibility(View.VISIBLE);
-        }else {
+        } else {
             showEmpty();
         }
  
-        if(raceRecordInfoBaseInfo.getData().getEventRouteRecordBeanVoList().size() < fragment.pageSize){
+        if (raceRecordInfoBaseInfo.getData().getEventRouteRecordBeanVoList().size() < fragment.pageSize) {
             fragment.binding.refreshLayout.setEnableLoadMore(false);
-        }else {
+        } else {
             fragment.binding.refreshLayout.setEnableLoadMore(true);
         }
-        if(fragment.currentPage > 1){
+        if (fragment.currentPage > 1) {
             list.addAll(raceRecordInfoBaseInfo.getData().getEventRouteRecordBeanVoList());
             adapter.notifyDataSetChanged();
         }
@@ -108,7 +125,7 @@ public class RaceRecorView implements MvpView {
         fragment.binding.refreshLayout.finishLoadMore();
     }
  
-    public void showEmpty(){
+    public void showEmpty() {
         fragment.binding.refreshLayout.setVisibility(View.GONE);
         fragment.binding.emptyNet.setVisibility(View.VISIBLE);
         fragment.binding.kilometerNum.setText("0.00");
@@ -118,7 +135,7 @@ public class RaceRecorView implements MvpView {
         fragment.binding.emptyNet.show("你还没有该线路的成绩", "", R.drawable.bmcg_has);
     }
  
-    public void showError(String msg){
+    public void showError(String msg) {
         fragment.binding.refreshLayout.finishRefresh();
         fragment.binding.refreshLayout.finishLoadMore();
         if (list.size() == 0) {
@@ -132,7 +149,7 @@ public class RaceRecorView implements MvpView {
                 @Override
                 public void onClick(View v) {
                     fragment.currentPage = 1;
-                    fragment.getPresenter().getData(fragment.getActivity(), CommonInfo.getStreetId(fragment.getActivity()),CommonInfo.getUserId(fragment.getActivity()),fragment.currentPage,fragment.pageSize);
+                    fragment.getPresenter().getData(fragment.getActivity(), CommonInfo.getStreetId(fragment.getActivity()), CommonInfo.getUserId(fragment.getActivity()), fragment.currentPage, fragment.pageSize);
                 }
             });
             fragment.binding.emptyNet.setLoadingShowing(false);
@@ -122,7 +122,6 @@ public class RunMainFragmentView implements MvpView {
      * 初始化相关视图
      */
     public void initView(RunRaceDetailInfo runRaceDetailInfo) {
-        Log.e(TAG, "initView: +时间" + SystemClock.elapsedRealtime());
         uid = CommonInfo.getUserId(getContext());
         userStepEntity = StepUtil.getUserStepData(getContext(), uid);
         //设置数据
@@ -138,9 +137,14 @@ public class RunMainFragmentView implements MvpView {
                 StepUtil.setQueryTraceTime(getContext(), CommonInfo.getUserId(getContext()), startTime, endTime, runRaceDetailInfo.getEntityName());
             }
             //设置重要点
-         if (TextUtils.isEmpty(userStepEntity.getImportPoint())){
-             StepUtil.setImportPoints(getContext(),CommonInfo.getUserId(getContext()),runRaceDetailInfo.getLatLongitude());
-         }
+            if (TextUtils.isEmpty(userStepEntity.getImportPoint())) {
+                StepUtil.setImportPoints(getContext(), CommonInfo.getUserId(getContext()), runRaceDetailInfo.getLatLongitude());
+            }
+            //设置开始时间和赛事id
+            if (TextUtils.isEmpty(userStepEntity.getStreetId())) {
+                StepUtil.setStepStartData(getContext(), uid, TimeUtil.getNowTimeStamp(), CommonInfo.getStreetId(getContext()));
+            }
+
         }
         initLocationClient();
         fragment.binding.llRunMainRoot.setVisibility(View.GONE);
@@ -370,7 +374,7 @@ public class RunMainFragmentView implements MvpView {
                                                     runningFinishBean.setSpeed(fragment.binding.tvSpeed.getText().toString());
                                                     runningFinishBean.setStep(fragment.binding.tvStepCount.getText().toString());
                                                     runningFinishBean.setTime(fragment.binding.chronometer.getText().toString());
-                                                    runningFinishBean.setDate(TimeUtil.getStampToTime(userStepEntity.getFinishTimeStamp()*1000,"yyyy/MM/dd HH:mm"));
+                                                    runningFinishBean.setDate(TimeUtil.getStampToTime(userStepEntity.getFinishTimeStamp() * 1000, "yyyy/MM/dd HH:mm"));
                                                     runningFinishBean.setStreetTitle(userStepEntity.getStreetTitle());
                                                     //设置用时
                                                     runningFinishBean.setEmployTime(employTime);
@@ -4,16 +4,24 @@ import android.content.Context;
 import android.text.TextUtils;
 import android.view.View;
  
+import com.baidu.mapapi.map.BaiduMap;
+import com.baidu.mapapi.map.MapView;
+import com.baidu.mapapi.map.UiSettings;
 import com.bumptech.glide.Glide;
+import com.cnlive.libs.base.util.ToastUtil;
 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.sql.entity.FailedEntity;
 import com.cnlive.moudle.pedometer.ui.fragment.UploadFailDetailFragment;
 import com.cnlive.moudle.pedometer.utils.TimeUtil;
+import com.example.moudle_pedometer.R;
 import com.hannesdorfmann.mosby3.mvp.MvpView;
  
 public class UploadFailDetailFragmentView implements MvpView {
     private UploadFailDetailFragment fragment;
     private FailedEntity failedEntity;
+    public BaiduMap baiduMap;
+    private MapView mMapView;
+    private UiSettings mUiSettings;
  
     public UploadFailDetailFragmentView(UploadFailDetailFragment fragment) {
         this.fragment = fragment;
@@ -88,8 +96,72 @@ public class UploadFailDetailFragmentView implements MvpView {
         fragment.binding.rlScrollViewStartBtn.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
+                if (fragment.getActivity() == null || fragment.getPresenter() == null || failedEntity == null) {
+                    return;
+                }
+                if (fragment.binding.rlScrollViewStartBtn.getTag() != null) {
+                    if ("1".equals(fragment.binding.rlScrollViewStartBtn.getTag().toString())) {
+                        fragment.getPresenter().saveRouteData(fragment.getActivity(), failedEntity);
+                    } else {
+                        if (fragment.getPresenter() == null || failedEntity == null) {
+                            return;
+                        }
+                        fragment.getPresenter().queryHistoryTrace(fragment.getActivity(), failedEntity);
+                    }
+                }
  
             }
         });
     }
+
+    public void initMap() {
+        this.mMapView = fragment.binding.mapView;
+        if (baiduMap == null) {
+            baiduMap = mMapView.getMap();
+        }
+        if (mUiSettings == null) {
+            mUiSettings = baiduMap.getUiSettings();
+        }
+        //启动所有手势
+        mUiSettings.setAllGesturesEnabled(true);
+        //通过设置enable为true或false 选择是否显示缩放按钮
+        mMapView.showZoomControls(false);
+        mUiSettings.setEnlargeCenterWithDoubleClickEnable(true);
+        //隐藏自带的指南针，改用自定义指南针 杨帅
+        mUiSettings.setCompassEnabled(false);
+    }
+
+    /**
+     * 更新路线是否完成
+     *
+     * @param state
+     */
+    public void updateIsFinish(String state) {
+        if (getContext() == null || TextUtils.isEmpty(state)) {
+            return;
+        }
+        if ("1".equals(state)) {
+            fragment.binding.includeFinishRunRoute.tvFinishState.setText("路线完成");
+            fragment.binding.includeFinishRunRoute.tvFinishState.setTextColor(getContext().getResources().getColor(R.color.green_round));
+        } else if ("0".equals(state)) {
+            fragment.binding.includeFinishRunRoute.tvFinishState.setText("路线未完成");
+            fragment.binding.includeFinishRunRoute.tvFinishState.setTextColor(getContext().getResources().getColor(R.color.red));
+        }
+    }
+
+    /**
+     * 更新开始按钮状态
+     *
+     * @param isQuerySuccess
+     */
+    public void updateStartBtnState(boolean isQuerySuccess) {
+        if (fragment.getActivity() == null) {
+            return;
+        }
+        if (!isQuerySuccess) {
+            fragment.binding.rlScrollViewStartBtn.setTag("0");
+        } else {
+            fragment.binding.rlScrollViewStartBtn.setTag("1");
+        }
+    }
 }
@@ -250,19 +250,7 @@ public class StepService extends Service implements SensorEventListener {
                             CommonInfo.setIsFirstStepSendTraceTip(getApplicationContext(), false);
                             EventBus.getDefault().post(new MessageEvent(Constant.START_TRACE_GATHER_SUCCESS, ""));
                         }
-                        //设置用户开始时间以及赛事ID
-                        UserStepEntity userStepEntity = StepUtil.getUserStepData(getApplicationContext(), CommonInfo.getUserId(getApplicationContext()));
-                        if (userStepEntity == null) {
-                            StepUtil.setStepStartData(getApplicationContext(), userId, TimeUtil.getNowTimeStamp(), CommonInfo.getStreetId(getApplicationContext()));
-                            //设置从服务器获取的时间(后续查询历史轨迹的时间,要从数据库中获取,因为涉及到现有运动恢复问题)
-                            int fenceId = CommonInfo.getFenceId(getApplicationContext());
-                            Log.e(TAG, "onStartTraceCallback: 保存的围栏id" + fenceId);
-                            //设置围栏id
-                            StepUtil.setFenceId(getApplicationContext(), CommonInfo.getUserId(getApplicationContext()), fenceId);
-                            //清空临时保存的时间
-                            CommonInfo.setFenceId(getApplicationContext(), -1);
  
-                        }
                         //开始设置围栏报警
                         startQueryFence();
  
@@ -515,7 +503,14 @@ public class StepService extends Service implements SensorEventListener {
             if (!EventBus.getDefault().isRegistered(this)) {
                 EventBus.getDefault().register(this);
             }
-
+            //设置围栏ID
+            UserStepEntity userStepEntity = StepUtil.getUserStepData(getApplicationContext(), CommonInfo.getUserId(getApplicationContext()));
+            if (userStepEntity == null) {
+                int fenceId = CommonInfo.getFenceId(getApplicationContext());
+                Log.e(TAG, "onStartTraceCallback: 保存的围栏id" + fenceId);
+                //设置围栏id
+                StepUtil.setFenceId(getApplicationContext(), CommonInfo.getUserId(getApplicationContext()), fenceId);
+            }
             entityName = userId;
             initTodayData(userId);
             initTrace();
@@ -627,14 +622,17 @@ public class StepService extends Service implements SensorEventListener {
             handler.removeCallbacks(speedRunnable);
         }
 //        Log.e("杀死", "MyTestService");
-        lastStep=0;
+        lastStep = 0;
         hasStepCount = 0;
         hasRecord = false;
         CURRENT_STEP = 0;
         previousStepCount = 0;
-        sensorManager = null;
+        if (sensorManager != null) {
+            sensorManager.unregisterListener(StepService.this);
+            sensorManager = null;
+        }
         stepSensorType = -1;
-        time=null;
+        time = null;
     }
  
     //接收事件
@@ -1017,7 +1015,7 @@ public class StepService extends Service implements SensorEventListener {
         if (stepSensorType == Sensor.TYPE_STEP_COUNTER) {
             //获取当前传感器返回的临时步数
             int tempStep = (int) event.values[0];
-            Log.e(TAG, "onSensorChanged: 第一次,tempStep:" + tempStep + "lastStep:" + lastStep + ",previousStepCount" + previousStepCount + ",CURRENT_STEP" + CURRENT_STEP);
+//            Log.e(TAG, "onSensorChanged: 第一次,tempStep:" + tempStep + "lastStep:" + lastStep + ",previousStepCount" + previousStepCount + ",CURRENT_STEP" + CURRENT_STEP);
             //首次如果没有获取手机系统中已有的步数则获取一次系统中APP还未开始记步的步数
             if (!hasRecord) {
                 hasRecord = true;
@@ -1026,26 +1024,26 @@ public class StepService extends Service implements SensorEventListener {
             } else {
                 if (tempStep > lastStep) {
                     //获取APP打开到现在的总步数=本次系统回调的总步数-APP打开之前已有的步数
-                    Log.e(TAG, "tempStep: " + tempStep + ",hasStepCount:" + hasStepCount);
+//                    Log.e(TAG, "tempStep: " + tempStep + ",hasStepCount:" + hasStepCount);
                     int thisStepCount = tempStep - hasStepCount;
-                    Log.e(TAG, "onSensorChanged: thisStepCount" + thisStepCount);
+//                    Log.e(TAG, "onSensorChanged: thisStepCount" + thisStepCount);
                     //本次有效步数=（APP打开后所记录的总步数-上一次APP打开后所记录的总步数）
                     int thisStep = thisStepCount - previousStepCount;
                     //记录最后一次APP打开到现在的总步数
                     previousStepCount = thisStepCount;
-                    Log.e(TAG, "本次有效步数: thisStep" + thisStep + ",previousStepCount:" + previousStepCount);
+//                    Log.e(TAG, "本次有效步数: thisStep" + thisStep + ",previousStepCount:" + previousStepCount);
                     //当用户点击暂停了
                     if (pauseFlag) {
                         thisStep = 0;
-                        Log.e(TAG, "修改: thisStepCount" + thisStep);
+//                        Log.e(TAG, "修改: thisStepCount" + thisStep);
                     }
-                    Log.e(TAG, "onSensorChanged: CURRENT_STEP" + CURRENT_STEP);
+//                    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);
+//                    Log.e(TAG, "onSensorChanged: 加了以后" + CURRENT_STEP);
                     lastStep = tempStep;
                 }
             }
@@ -1103,9 +1101,11 @@ public class StepService extends Service implements SensorEventListener {
         @Override
         public void onFinish() {
             // 如果计时器正常结束，则开始计步
-            time.cancel();
-            save();
-            startTimeCount();
+            if (null != time) {
+                time.cancel();
+                save();
+                startTimeCount();
+            }
         }
  
         @Override
+package com.cnlive.moudle.pedometer.ui.activity;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+
+import com.cnlive.libs.base.ui.QMUIFragment;
+import com.cnlive.libs.base.ui.QMUIFragmentActivity;
+import com.cnlive.moudle.pedometer.model.RunningFinishBean;
+import com.cnlive.moudle.pedometer.ui.fragment.ALLScoreDetailFragment;
+import com.example.moudle_pedometer.R;
+
+/**
+ * 全部成绩详情
+ *
+ * @author ShinnyYang
+ */
+public class ALLScoreDetailActivity extends QMUIFragmentActivity {
+    @Override
+    protected int getContextViewId() {
+        return R.id.fragment_all_score_detail;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        RunningFinishBean runningFinishBean = (RunningFinishBean) getIntent().getExtras().getSerializable("runningFinishBean");
+        if (runningFinishBean != null) {
+            addFragment(ALLScoreDetailFragment.newInstance(runningFinishBean));
+        }
+    }
+
+    public static void startActivity(Activity activity, RunningFinishBean runningFinishBean) {
+        Intent intent = new Intent(activity, ALLScoreDetailActivity.class);
+        intent.putExtra("runningFinishBean", runningFinishBean);
+        activity.startActivity(intent);
+    }
+
+    private void addFragment(QMUIFragment fragment) {
+        getSupportFragmentManager().beginTransaction()
+                .add(getContextViewId(), fragment, fragment.getClass().getSimpleName())
+                .addToBackStack(fragment.getClass().getSimpleName())
+                .commit();
+    }
+
+}
@@ -28,6 +28,11 @@ public class LineUpAgainAdapter extends RecyclerView.Adapter&lt;LineUpAgainAdapter.
     private List<FailedEntity> list;
     private Context context;
     private OnClickListener onClickListener;
+    private OnRestartUploadClickListener onRestartUploadClickListener;
+
+    public void setOnRestartUploadClickListener(OnRestartUploadClickListener onRestartUploadClickListener) {
+        this.onRestartUploadClickListener = onRestartUploadClickListener;
+    }
  
     public void setOnClickListener(OnClickListener onClickListener) {
         this.onClickListener = onClickListener;
@@ -38,6 +43,11 @@ public class LineUpAgainAdapter extends RecyclerView.Adapter&lt;LineUpAgainAdapter.
         this.context = context;
     }
  
+    public void uploadData(List<FailedEntity> failedEntities) {
+        this.list = failedEntities;
+        notifyDataSetChanged();
+    }
+
     @NonNull
     @Override
     public MyHolder onCreateViewHolder(@NonNull ViewGroup viewGroup, int i) {
@@ -51,11 +61,14 @@ public class LineUpAgainAdapter extends RecyclerView.Adapter&lt;LineUpAgainAdapter.
         if (onClickListener != null) {
             myHolder.ry_re.setOnClickListener(v -> onClickListener.onClickListener(list.get(i), i));
         }
+        if (onRestartUploadClickListener != null) {
+            myHolder.again_up.setOnClickListener(v -> onRestartUploadClickListener.onRestartUploadClickListener(list.get(i)));
+        }
         //设置视图数据
         if (myHolder != null) {
             //设置数据创建时间
-            myHolder.up_day.setText(TimeUtil.getStampToTime(list.get(i).getCreatTimeStamp()*1000, "MM月dd日"));
-            myHolder.up_record_time.setText(TimeUtil.getStampToTime(list.get(i).getCreatTimeStamp()*1000, " HH:mm"));
+            myHolder.up_day.setText(TimeUtil.getStampToTime(list.get(i).getCreatTimeStamp() * 1000, "MM月dd日"));
+            myHolder.up_record_time.setText(TimeUtil.getStampToTime(list.get(i).getCreatTimeStamp() * 1000, " HH:mm"));
             //设置赛道标题
             myHolder.up_item_title.setText(list.get(i).getStreetTitle());
             //设置公里
@@ -107,4 +120,8 @@ public class LineUpAgainAdapter extends RecyclerView.Adapter&lt;LineUpAgainAdapter.
     public interface OnClickListener {
         void onClickListener(FailedEntity bean, int position);
     }
+
+    public interface OnRestartUploadClickListener {
+        void onRestartUploadClickListener(FailedEntity failedEntity);
+    }
 }
@@ -4,6 +4,7 @@ package com.cnlive.moudle.pedometer.ui.adapter;
 import android.content.Context;
 import android.support.annotation.NonNull;
 import android.support.v7.widget.RecyclerView;
+import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -42,21 +43,25 @@ public class RaceRecordAdapter extends RecyclerView.Adapter&lt;RaceRecordAdapter.My
     @NonNull
     @Override
     public MyHolder onCreateViewHolder(@NonNull ViewGroup viewGroup, int i) {
-        View view = LayoutInflater.from(context).inflate(R.layout.item_race_record,viewGroup,false);
+        View view = LayoutInflater.from(context).inflate(R.layout.item_race_record, viewGroup, false);
         return new MyHolder(view);
     }
  
     @Override
     public void onBindViewHolder(@NonNull MyHolder myHolder, int i) {
-        myHolder.record_time_day.setText(TimeUtil.getStampToTime(list.get(i).getCreateTime(),"MM月dd日"));
-        myHolder.record_time.setText(TimeUtil.getStampToTime(list.get(i).getCreateTime(),"HH:mm"));
+        myHolder.record_time_day.setText(TimeUtil.getStampToTime(list.get(i).getCreateTime(), "MM月dd日"));
+        myHolder.record_time.setText(TimeUtil.getStampToTime(list.get(i).getCreateTime(), "HH:mm"));
         myHolder.item_title.setText(list.get(i).getEventTitle());
         myHolder.record_kli.setText(list.get(i).getMileage());
-        myHolder.record_minit.setText(list.get(i).getEmployTime());
+        //设置时间
+        if (!TextUtils.isEmpty(list.get(i).getEmployTime())) {
+            myHolder.record_minit.setText(TimeUtil.stampToChronometer(Long.parseLong(list.get(i).getEmployTime())));
+        }
         myHolder.record_speed.setText(list.get(i).getPace());
         myHolder.record_step.setText(list.get(i).getStep());
         Glide.with(context).load(list.get(i).getRoadmap()).into(myHolder.item_img);
-        if(onClickListener != null) myHolder.ry_re.setOnClickListener(v -> onClickListener.onClickListener(list.get(i),i));
+        if (onClickListener != null)
+            myHolder.ry_re.setOnClickListener(v -> onClickListener.onClickListener(list.get(i), i));
     }
  
     @Override
@@ -64,7 +69,7 @@ public class RaceRecordAdapter extends RecyclerView.Adapter&lt;RaceRecordAdapter.My
         return list.size();
     }
  
-    class MyHolder extends RecyclerView.ViewHolder{
+    class MyHolder extends RecyclerView.ViewHolder {
  
         TextView record_time_day;
         TextView record_time;
@@ -91,7 +96,7 @@ public class RaceRecordAdapter extends RecyclerView.Adapter&lt;RaceRecordAdapter.My
     }
  
  
-    public interface OnClickListener{
+    public interface OnClickListener {
         void onClickListener(EventRouteRecordBeanVoListBean bean, int position);
     }
 }
+package com.cnlive.moudle.pedometer.ui.fragment;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.view.View;
+
+import com.cnlive.libs.base.ui.QMUIFragment;
+import com.cnlive.libs.base.util.StatusBarUtil2;
+import com.cnlive.moudle.pedometer.frame.presenter.ALLScoreDetailFragmentPresenter;
+import com.cnlive.moudle.pedometer.frame.view.ALLScoreDetailFragmentView;
+import com.cnlive.moudle.pedometer.model.RunningFinishBean;
+import com.example.moudle_pedometer.R;
+import com.example.moudle_pedometer.databinding.FragmentFinishRunMapBinding;
+
+public class ALLScoreDetailFragment extends QMUIFragment<ALLScoreDetailFragmentView, ALLScoreDetailFragmentPresenter, FragmentFinishRunMapBinding> {
+    private RunningFinishBean runningFinishBean;
+
+    public static ALLScoreDetailFragment newInstance(RunningFinishBean runningFinishBean) {
+        Bundle bundle = new Bundle();
+        bundle.putSerializable("runningFinishBean", runningFinishBean);
+        ALLScoreDetailFragment fragment = new ALLScoreDetailFragment();
+        fragment.setArguments(bundle);
+        return fragment;
+    }
+
+    @Override
+    protected int getToolbarId() {
+        return 0;
+    }
+
+    @Override
+    public String getTitle() {
+        return null;
+    }
+
+    @Override
+    protected int getLayoutId() {
+        return R.layout.fragment_finish_run_map;
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        StatusBarUtil2.setColor(getActivity(), getResources().getColor(R.color.run_main_bg), 0);
+
+        if (getArguments() != null) {
+            runningFinishBean = (RunningFinishBean) getArguments().getSerializable("runningFinishBean");
+            if (runningFinishBean != null) {
+                if (getMvpView() != null) {
+                    getMvpView().initView(runningFinishBean);
+                }
+            }
+        }
+    }
+}
@@ -4,6 +4,7 @@ package com.cnlive.moudle.pedometer.ui.fragment;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.util.Log;
 import android.view.View;
  
 import com.cnlive.libs.base.frame.fragment.MvpBindingFragment;
@@ -21,7 +22,7 @@ import java.util.List;
  * Created by hanyayun 019/06/20.
  */
 public class LineUpAgainFragment extends MvpBindingFragment<LineUpAgainView, LineUpAgainPresenter, Object, FragmentLineUpAgainBinding> {
-
+    private final String TAG = "LineUpAgainFragment";
  
     public LineUpAgainFragment() {
         // Required empty public constructor
@@ -37,10 +38,9 @@ public class LineUpAgainFragment extends MvpBindingFragment&lt;LineUpAgainView, Lin
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
         List<FailedEntity> failedEntities = StepUtil.getFailListData(getActivity(), CommonInfo.getUserId(getActivity()));
-
         if (getMvpView() != null) {
             getMvpView().initView();
-            if (failedEntities == null||failedEntities.size()<1) {
+            if (failedEntities == null || failedEntities.size() < 1) {
                 binding.llNoFailTip.setVisibility(View.VISIBLE);
             } else {
                 getMvpView().setData(failedEntities);
@@ -49,4 +49,18 @@ public class LineUpAgainFragment extends MvpBindingFragment&lt;LineUpAgainView, Lin
         binding.refreshLayout.setEnableLoadMore(false);
         binding.refreshLayout.setEnableRefresh(false);
     }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        Log.e(TAG, "onResume: ");
+        List<FailedEntity> failedEntities = StepUtil.getFailListData(getActivity(), CommonInfo.getUserId(getActivity()));
+        if (getMvpView() != null) {
+            if (failedEntities == null || failedEntities.size() < 1) {
+                binding.llNoFailTip.setVisibility(View.VISIBLE);
+            } else {
+                getMvpView().uploadList(failedEntities);
+            }
+        }
+    }
 }
@@ -54,7 +54,9 @@ public class UploadFailDetailFragment extends QMUIFragment&lt;UploadFailDetailFragm
             failedEntity = (FailedEntity) getArguments().getSerializable("failedEntity");
             if (failedEntity != null) {
                 if (getMvpView() != null) {
+                    getMvpView().initMap();
                     getMvpView().initView(failedEntity);
+                    getPresenter().queryHistoryTrace(getActivity(),failedEntity);
                 }
             }
         }
@@ -270,7 +270,7 @@ public class MyMapUtil {
      */
     public static Overlay drawHistoryTrack(Context context, BaiduMap baiduMap, List<LatLng> points, SortType sortType, int lineColor, int startIconRes, int endIconRes) {
         // 绘制新覆盖物前，清空之前的覆盖物
-        if (points == null || points.size() == 0) {
+        if (points == null || points.size() == 0 || lineColor == 0 || startIconRes == 0 || endIconRes == 0) {
             return null;
         }
         //只有一个点
@@ -327,6 +327,54 @@ public class MyMapUtil {
     }
  
     /**
+     * 绘制实时轨迹
+     */
+    public static Overlay drawRealTimeTrack(Context context, BaiduMap baiduMap, List<LatLng> points, SortType sortType, int lineColor, int startIconRes) {
+        // 绘制新覆盖物前，清空之前的覆盖物
+        if (points == null || points.size() == 0 || lineColor == 0 || startIconRes == 0) {
+            return null;
+        }
+        //只有一个点
+        if (points.size() == 1) {
+            if (startIconRes != 0) {
+                Bitmap pointBitmap = BitmapUtil.getBitmapFromDp(context, BitmapFactory.decodeResource(context.getResources(), startIconRes), 24, 30);
+                OverlayOptions startOptions = new MarkerOptions().position(points.get(0)).icon(BitmapDescriptorFactory.fromBitmap(pointBitmap));
+//                    .zIndex(9).draggable(true);
+                return baiduMap.addOverlay(startOptions);
+            } else {
+                return null;
+            }
+        }
+
+        LatLng startPoint;
+        LatLng endPoint;
+        if (sortType == SortType.asc) {
+            startPoint = points.get(0);
+            endPoint = points.get(points.size() - 1);
+        } else {
+            startPoint = points.get(points.size() - 1);
+            endPoint = points.get(0);
+        }
+
+        // 添加起点图标
+        Bitmap startPointBitmap = null;
+        OverlayOptions startOptions = null;
+        if (startIconRes != 0) {
+            startPointBitmap = BitmapUtil.getBitmapFromDp(context, BitmapFactory.decodeResource(context.getResources(), startIconRes), 24, 30);
+            startOptions = new MarkerOptions().perspective(false).animateType(MarkerOptions.MarkerAnimateType.grow)
+                    .position(startPoint).icon(BitmapDescriptorFactory.fromBitmap(startPointBitmap));
+        }
+
+        // 添加路线（轨迹）
+        OverlayOptions polylineOptions = new PolylineOptions().width(10)
+                .color(context.getResources().getColor(lineColor)).points(points);
+        if (startOptions != null) {
+            baiduMap.addOverlay(startOptions);
+        }
+        return baiduMap.addOverlay(polylineOptions);
+    }
+
+    /**
      * 绘制服务器传过来的轨迹
      */
     public static List<Overlay> drawServerLineTrack(Context context, BaiduMap baiduMap, List<LatLng> points, SortType sortType, int lineColor, int startIconRes, int endIconRes) {
@@ -520,10 +568,18 @@ public class MyMapUtil {
  
         for (LatLng latLng : points) {
             tempLatLng = latLng;
-            if (tempLatLng.longitude > maxLng) maxLng = tempLatLng.longitude;
-            if (tempLatLng.longitude < minLng) minLng = tempLatLng.longitude;
-            if (tempLatLng.latitude > maxLat) maxLat = tempLatLng.latitude;
-            if (tempLatLng.latitude < minLat) minLat = tempLatLng.latitude;
+            if (tempLatLng.longitude > maxLng) {
+                maxLng = tempLatLng.longitude;
+            }
+            if (tempLatLng.longitude < minLng) {
+                minLng = tempLatLng.longitude;
+            }
+            if (tempLatLng.latitude > maxLat) {
+                maxLat = tempLatLng.latitude;
+            }
+            if (tempLatLng.latitude < minLat) {
+                minLat = tempLatLng.latitude;
+            }
         }
  
         double[] zooms = {50, 100, 200, 500, 1000, 2000, 5000, 10000, 20000, 25000, 50000, 100000, 200000, 500000, 1000000, 2000000};//级别18到3。
@@ -124,6 +124,12 @@ public class StepUtil {
             UserStepEntity entity = getUserStepData(context, uid);
             entity.setFenceId(fenceId);
             updateStepData(context, entity);
+        } else {
+            DbCore.init(context, dbName);
+            UserStepEntity userStepEntity = new UserStepEntity();
+            userStepEntity.setUserId(uid);
+            userStepEntity.setFenceId(fenceId);
+            DbCore.getDaoSession().getUserStepEntityDao().insert(userStepEntity);
         }
     }
  
@@ -127,6 +127,8 @@
                 android:id="@+id/loading"
                 android:layout_width="20dp"
                 android:layout_height="20dp"
+                android:clickable="false"
+                android:focusableInTouchMode="false"
                 app:indicatorColor="@color/white"
                 app:indicatorName="BallSpinFadeLoaderIndicator" />
  
@@ -136,6 +138,8 @@
                 android:layout_height="wrap_content"
                 android:layout_centerInParent="true"
                 android:layout_marginLeft="5dp"
+                android:clickable="false"
+                android:focusableInTouchMode="false"
                 android:tag="0"
                 android:text="保存中"
                 android:textColor="@color/white"
@@ -4,6 +4,7 @@
     <data>
  
     </data>
+
     <RelativeLayout
         android:id="@+id/ry_re"
         android:layout_width="match_parent"
@@ -14,19 +15,19 @@
             android:id="@+id/record_time_day"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:text="--"
             android:textColor="#333333"
-            android:textSize="14sp"
-            android:text="5月1日" />
+            android:textSize="14sp" />
  
         <TextView
             android:id="@+id/record_time"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_toRightOf="@id/record_time_day"
             android:layout_marginLeft="15dp"
+            android:layout_toRightOf="@id/record_time_day"
+            android:text="--"
             android:textColor="#999999"
-            android:textSize="14sp"
-            android:text="15:30" />
+            android:textSize="14sp" />
  
         <LinearLayout
             android:layout_width="match_parent"
@@ -53,31 +54,31 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:singleLine="true"
-                    android:textSize="12sp"
-                    android:textColor="#333333"/>
+                    android:textColor="#333333"
+                    android:textSize="12sp" />
  
                 <LinearLayout
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
                     android:orientation="horizontal">
+
                     <TextView
                         android:id="@+id/kilometer_num"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:textColor="#333333"
-                        android:textSize="30sp"
                         android:layout_centerVertical="true"
-                        />
+                        android:textColor="#333333"
+                        android:textSize="30sp" />
  
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_centerVertical="true"
+                        android:layout_marginLeft="5dp"
                         android:text="@string/kilometer"
                         android:textColor="#333333"
-                        android:textSize="12sp"
-                        android:layout_marginLeft="5dp"/>
+                        android:textSize="12sp" />
                 </LinearLayout>
  
  
@@ -119,7 +120,7 @@
         <View
             android:layout_width="match_parent"
             android:layout_height="1dp"
-            android:background="@color/line"
-            android:layout_alignParentBottom="true"/>
+            android:layout_alignParentBottom="true"
+            android:background="@color/line" />
     </RelativeLayout>
 </layout>
@@ -10,5 +10,7 @@
     <item name="fragment_start_collect_trace" type="id" />
     <!--上传失败-->
     <item name="fragment_upload_fail" type="id" />
+    <!--全部成绩详情页-->
+    <item name="fragment_all_score_detail" type="id" />
  
 </resources>