Merge branch 'master' of http://bj.gitlab.cnlive.com/cnlive-team/ModulePedometer

# Conflicts: # moudle_pedometer/src/main/res/layout/line_up__item_view.xml

Merge branch 'master' of http://bj.gitlab.cnlive.com/cnlive-team/ModulePedometer
# Conflicts: # moudle_pedometer/src/main/res/layout/line_up__item_view.xml
杨帅
1 parent a7cac7d9
Showing 41 changed files with 852 additions and 532 deletions
.idea/gradle.xml
app/src/main/java/com/example/modulepedometer/MainActivity.java
app/src/main/res/layout/activity_main.xml
moudle_pedometer/src/main/AndroidManifest.xml
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/commonInfo/CommonInfo.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/UploadFailDetailFragmentPresenter.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/RunMainFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunRaceDetailFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunningFinishFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/UploadFailDetailFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/model/Constant.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/model/RunningFinishBean.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/net/bean/RunRaceDetailInfo.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/service/StepService.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/sql/dao/DaoMaster.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/sql/dao/DaoSession.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/sql/entity/FailedEntity.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/PedometerMainActivity.java
@@ -3,9 +3,6 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <compositeConfiguration>
-          <compositeBuild compositeDefinitionSource="SCRIPT" />
-        </compositeConfiguration>
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">
@@ -10,6 +10,7 @@ import com.cnlive.moudle.collectionTrace.ui.activity.RaceListActivity;
 import com.cnlive.moudle.collectionTrace.ui.activity.RaceNameListActivity;
 import com.cnlive.moudle.pedometer.ui.activity.MyRecordActivity;
 import com.cnlive.moudle.pedometer.ui.activity.RunLineActivity;
+import com.cnlive.moudle.pedometer.ui.activity.SelfRecordActivity;
 public class MainActivity extends AppCompatActivity {
@@ -33,6 +34,13 @@ public class MainActivity extends AppCompatActivity {
                 startActivity(intent);
             }
         });
+        findViewById(R.id.tool2).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                SelfRecordActivity.newInstance(MainActivity.this, "10513196",null,null,null);
+//                startActivity(intent);
+            }
+        });
 //        RunLineActivity.newInstance(this,null,null,null);
 //        Intent intent = new Intent(this, CollRunRaceDetailActivity.class);
@@ -12,15 +12,19 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="10dp"
-        android:text="体育活动"
-        />
+        android:text="体育活动" />
     <Button
         android:id="@+id/tooll"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="10dp"
-        android:text="路径工具"
-        />
+        android:text="路径工具" />
+    <Button
+        android:id="@+id/tool2"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="10dp"
+        android:text="我的记录" />
 </LinearLayout>
 \ No newline at end of file
@@ -131,7 +131,13 @@
             android:process=":step" />
         <activity
             android:name="com.cnlive.moudle.pedometer.ui.activity.RunningFinishActivity"
-            android:process=":step" /> <!-- 路径工具 -->
+            android:launchMode="singleTask"
+            android:process=":step" />
+        <activity
+            android:name="com.cnlive.moudle.pedometer.ui.activity.UploadFailDetailActivity"
+            android:launchMode="singleTask"
+            android:process=":step" />
+        <!--************************************************路径工具**********************************************-->
         <service
             android:name="com.cnlive.moudle.collectionTrace.service.CollKeepLiveService"
             android:enabled="true"
@@ -25,23 +25,6 @@ public class CommonInfo {
 //        return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getLong("stepStartTime", 0);
 //    }
-    /**
-     * 设置计步完成时间
-     *
-     * @param context
-     */
-    public static void setStepEndTime(Context context, long currentTime) {
-        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).putLong("stepEndTime", currentTime);
-    }
-
-    /**
-     * 获取计步完成时间
-     *
-     * @param context
-     */
-    public static long getStepEndTime(Context context) {
-        return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getLong("stepEndTime", 0);
-    }
     /**
      * 是否允许写入步数
@@ -295,88 +278,10 @@ public class CommonInfo {
         return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getBoolean("runIsPauseState", false);
     }
-    /**
-     * 设置轨迹查询开始时间
-     *
-     * @param context
-     * @param startTime
-     */
-    public static void setQueryTraceStartTime(Context context, long startTime) {
-        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).putLong("runQueryTraceStartTime", startTime);
-
-    }
-
-    /**
-     * 互殴轨迹查询开始时间
-     *
-     * @param context
-     */
-    public static long getQueryTraceStartTime(Context context) {
-        return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getLong("runQueryTraceStartTime", 0);
-    }
-    /**
-     * 设置轨迹查询结束时间
-     *
-     * @param context
-     * @param startTime
-     */
-    public static void setQueryTraceEndTime(Context context, long startTime) {
-        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).putLong("runQueryTraceEndTime", startTime);
-    }
-    /**
-     * 互殴轨迹查询开始时间
-     *
-     * @param context
-     */
-    public static long getQueryTraceEndTime(Context context) {
-        return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getLong("runQueryTraceEndTime", 0);
-
-    }
-
-    /**
-     * 设置轨迹查询实体名称
-     *
-     * @param context
-     */
-    public static void setQueryEntityName(Context context, String entityName) {
-        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).putString("runQueryEntityName", entityName);
-
-    }
-
-    /**
-     * 互殴轨迹查询\的实体名称
-     *
-     * @param context
-     */
-    public static String getQueryQueryEntityName(Context context) {
-        return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getString("runQueryEntityName", "");
-
-    }
-
-
-    /**
-     * 设置赛事标题
-     *
-     * @param context
-     */
-    public static void setStreetTitle(Context context, String streetTitle) {
-        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).putString("runStreetTitle", streetTitle);
-
-    }
-
-    /**
-     * 互殴轨迹查询\的实体名称
-     *
-     * @param context
-     */
-    public static String getStreetTitle(Context context) {
-        return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getString("runStreetTitle", "");
-
-    }
     /*重置
@@ -395,9 +300,6 @@ public class CommonInfo {
         MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey("IsFirstShowTimeTip");
         MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey("runIsPauseState");
         MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey("runStreetTitle");
-//        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey("runQueryTraceStartTime");
-//        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey("runQueryTraceEndTime");
-//        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey("runQueryEntityName");
     }
@@ -22,6 +22,7 @@ import com.cnlive.libs.base.logic.callback.SuccessCallback;
 import com.cnlive.libs.base.util.ToastUtil;
 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.frame.view.RunningFinishFragmentView;
+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;
@@ -59,8 +60,11 @@ import static com.cnlive.libs.base.logic.Config.STATE_LOAD;
 public class RunningFinishFragmetPresenter extends MvpBasePresenter<RunningFinishFragmentView> {
     private LBSTraceClient mClient = null;
     private List<LatLng> importPoints;
+    private SelectDialog uploadFailDialog;
+    private SelectDialog failTraceDialog;
     public void saveRouteData(Activity context, UserStepEntity userStepEntity, RunningFinishBean runningFinishBean) {
+        QMUITipDialogUtil.loadingDialog(context, "正在上传数据", false);
         // 赛事id
         String eventId = userStepEntity.getStreetId();
         //用户ID
@@ -83,6 +87,7 @@ public class RunningFinishFragmetPresenter extends MvpBasePresenter&lt;RunningFinis
         }
         //  路线图
         String roadmap = runningFinishBean.getRoadmap();
+        roadmap = "";
         //经纬度
         String latLongitude = "";
         // 开始时间
@@ -127,18 +132,41 @@ public class RunningFinishFragmetPresenter extends MvpBasePresenter&lt;RunningFinis
                 .setFailureCallback(new FailureCallback() {
                     @Override
                     public void onFailure(int code, String message) {
-                        QMUITipDialogUtil.dismessDialog();
                         if (getView() == null) {
                             return;
                         }
                         Log.e("saveRouteData", "onFailure: " + message);
-//                        getView().hideLoadingView();
-//                        getView().showRetryView(code, new View.OnClickListener() {
-//                            @Override
-//                            public void onClick(View view) {
-//                                getRunRaceDetailInfo(context, id, userId,state);
-//                            }
-//                        });
+                        QMUITipDialogUtil.dismessDialog();
+                        if (uploadFailDialog == null) {
+                            uploadFailDialog = new SelectDialog(context, "上传数据失败,是否重试?", "重试", new SelectDialog.DialogInterface() {
+                                @Override
+                                public void onClick(SelectDialog dialog) {
+                                    dialog.dismiss();
+                                    saveRouteData(context, userStepEntity, runningFinishBean);
+                                }
+                            }, "暂存", new SelectDialog.DialogInterface() {
+                                @Override
+                                public void onClick(SelectDialog dialog) {
+                                    dialog.dismiss();
+                                    StepUtil.clearRunData(context, CommonInfo.getUserId(context));
+                                    CommonInfo.reset(context);
+                                    //跳转到上传失败列表
+                                    LineUpAgainActivity.newInstance(context);
+                                    //关闭当前窗口
+                                    context.finish();
+
+                                }
+                            });
+                            uploadFailDialog.setCanceledOnTouchOutside(false);
+                            uploadFailDialog.setCancelable(false);
+                            if (!uploadFailDialog.isShowing()) {
+                                uploadFailDialog.show();
+                            }
+                        } else {
+                            if (!uploadFailDialog.isShowing()) {
+                                uploadFailDialog.show();
+                            }
+                        }
                     }
                 }).setSuccessCallback(new SuccessCallback<BaseInfo>() {
             @Override
@@ -146,10 +174,15 @@ public class RunningFinishFragmetPresenter extends MvpBasePresenter&lt;RunningFinis
                 if (getView() == null) {
                     return;
                 }
-                Log.e("saveRouteData", "onSuccess: ");
-
                 QMUITipDialogUtil.dismessDialog();
                 getView().updataIsFinish(runningFinishBean);
+                //删除暂存数据
+                FailedEntity entity = StepUtil.getTempSaveFailData(context, CommonInfo.getUserId(context), userStepEntity.getStartTimeStamp());
+                if (entity != null) {
+                    //删除
+                    StepUtil.deleteTempSaveFailData(context, entity);
+                }
+                //删除当前跑步数据
                 StepUtil.clearRunData(context, CommonInfo.getUserId(context));
                 CommonInfo.reset(context);
@@ -161,6 +194,7 @@ public class RunningFinishFragmetPresenter extends MvpBasePresenter&lt;RunningFinis
      * 查询当前用户历史轨迹
      */
     public void queryHistoryTrace(Activity context, UserStepEntity userStepEntity, RunningFinishBean runningFinishBean) {
+        QMUITipDialogUtil.loadingDialog(context, "正在获取轨迹信息,请稍后", false);
         //查询当前用户的历史轨迹
         long startTime = userStepEntity.getStartTimeStamp();
         //获取当前的时间戳(秒)
@@ -179,10 +213,11 @@ public class RunningFinishFragmetPresenter extends MvpBasePresenter&lt;RunningFinis
             @Override
             public void success(List<LatLng> resultPoints) {
                 if (resultPoints != null) {
-                    if (getView() != null && resultPoints != null) {
-                        if (importPoints != null && resultPoints != null) {
+                    if (getView() != null) {
+                        QMUITipDialogUtil.dismessDialog();
+                        if (importPoints != null) {
                             //判断是否完成
-                            boolean isFinish = MyMapUtil.checkIsFinishTrace(importPoints, resultPoints, 0.6);
+                            boolean isFinish = MyMapUtil.checkIsFinishTrace(importPoints, resultPoints, Constant.PASS_RATE);
                             if (isFinish) {
                                 Toast.makeText(context, "完成", Toast.LENGTH_LONG).show();
                                 runningFinishBean.setIsFinish("1");
@@ -191,161 +226,50 @@ public class RunningFinishFragmetPresenter extends MvpBasePresenter&lt;RunningFinis
                                 runningFinishBean.setIsFinish("0");
                             }
                             MyMapUtil.drawHistoryTrack(context, getView().baiduMap, resultPoints, SortType.asc, R.color.red, R.drawable.icon_start, R.drawable.icon_end);
-                            new Handler().postDelayed(new Runnable() {
-                                @Override
-                                public void run() {
-                                    //开始截图
-                                    getView().baiduMap.snapshot(new BaiduMap.SnapshotReadyCallback() {
-                                        @Override
-                                        public void onSnapshotReady(Bitmap bitmap) {
-                                            if (context == null) {
-                                                return;
-                                            }
-                                            if (null == bitmap) {
-                                                return;
-                                            }
-                                            //开始保存截屏
-                                            try {
-                                                SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
-                                                File image = new File(context.getExternalCacheDir() + "/location_screenshot_" + sdf.format(new Date()) + ".jpeg");
-                                                FileOutputStream fos = new FileOutputStream(image);
-                                                boolean b = bitmap.compress(Bitmap.CompressFormat.PNG, 100, fos);
-                                                fos.flush();
-                                                fos.close();
-                                                String mapImagePath = image.getAbsolutePath();
-                                                if (!TextUtils.isEmpty(mapImagePath)) {
-                                                    QMUITipDialogUtil.loadingDialog(context, "正在上传数据", false);
-                                                    //开始上传7牛
-                                                    List<String> imagePaths = new ArrayList<>();
-                                                    imagePaths.add(mapImagePath);
-                                                    UploadLogic.uploadAddressPicInfo(getView().getContext(), imagePaths, new Event<String>()
-                                                            .setFailureCallback(new FailureCallback() {
-                                                                @Override
-                                                                public void onFailure(int i, String s) {
-                                                                    QMUITipDialogUtil.dismessDialog();
-                                                                }
-                                                            })
-                                                            .setSuccessCallback(new SuccessCallback<String>() {
-                                                                @Override
-                                                                public void onSuccess(String data) {
-                                                                    //设置截图
-                                                                    runningFinishBean.setRoadmap(data);
-                                                                    //开始向服务器传数据
-                                                                    saveRouteData(context, userStepEntity, runningFinishBean);
-                                                                }
-                                                            })
-                                                    );
-                                                }
-                                            } catch (Exception e) {
-                                                e.printStackTrace();
-                                            }
-                                        }
-                                    });
-//
-                                }
-                            }, 2000);
-                            //
+                            saveRouteData(context, userStepEntity, runningFinishBean);
                         }
                     }
                 }
                 //查询失败
                 else {
                     QMUITipDialogUtil.dismessDialog();
-                    SelectDialog selectDialog = new SelectDialog(context, "获取轨迹失败,是否重试?", "重试", new SelectDialog.DialogInterface() {
-                        @Override
-                        public void onClick(SelectDialog dialog) {
-                            dialog.dismiss();
-                            queryHistoryTrace(context, userStepEntity, runningFinishBean);
+                    if (failTraceDialog == null) {
+                        failTraceDialog = new SelectDialog(context, "获取轨迹失败,是否重试?", "重试", new SelectDialog.DialogInterface() {
+                            @Override
+                            public void onClick(SelectDialog dialog) {
+                                dialog.dismiss();
+                                queryHistoryTrace(context, userStepEntity, runningFinishBean);
+                            }
+                        }, "暂存", new SelectDialog.DialogInterface() {
+                            @Override
+                            public void onClick(SelectDialog dialog) {
+                                dialog.dismiss();
+                                StepUtil.clearRunData(context, CommonInfo.getUserId(context));
+                                CommonInfo.reset(context);
+                                //跳转到上传失败列表
+                                LineUpAgainActivity.newInstance(context);
+                                //关闭当前窗口
+                                context.finish();
+
+                            }
+                        });
+                        failTraceDialog.setCanceledOnTouchOutside(false);
+                        failTraceDialog.setCancelable(false);
+                        if (!failTraceDialog.isShowing()) {
+                            failTraceDialog.show();
                         }
-                    }, "暂存", new SelectDialog.DialogInterface() {
-                        @Override
-                        public void onClick(SelectDialog dialog) {
-                            setFailData(context, userStepEntity, runningFinishBean);
-                            dialog.dismiss();
+                    } else {
+                        if (!failTraceDialog.isShowing()) {
+                            failTraceDialog.show();
                         }
-                    });
-                    selectDialog.setCanceledOnTouchOutside(false);
-                    selectDialog.setCancelable(false);
-                    selectDialog.show();
+                    }
                 }
             }
         });
     }
-    public void setFailData(Activity activity, UserStepEntity userStepEntity, RunningFinishBean runningFinishBean) {
-        if (userStepEntity == null || runningFinishBean == null || activity == null) {
-            return;
-        }
-        //设置数据
-        FailedEntity failedEntity = new FailedEntity();
-        //设置主键
-        failedEntity.setUuid(StepUtil.getUUID());
-        //设置用户id
-        failedEntity.setUid(userStepEntity.getUserId());
-        //设置当前数据创建时间戳
-        failedEntity.setCreatTimeStamp(TimeUtil.getNowTimeStamp());
-        //设置是否暂停
-        if (userStepEntity.getPauseCount() > 1) {
-            failedEntity.setIsPause(true);
-            //设置暂停时间
-            failedEntity.setUserPauseTime(userStepEntity.getUserPauseTimeStamp());
-            //设置继续时间戳
-            failedEntity.setUsrContinueTime(userStepEntity.getContinueTime());
-        } else {
-            failedEntity.setIsPause(false);
-        }
-        //设置用时
-        failedEntity.setTime(runningFinishBean.getEmployTime());
-        //设置配速
-        if ("--".equals(runningFinishBean.getSpeed())) {
-            failedEntity.setSpeed("0");
-        } else {
-            failedEntity.setSpeed(runningFinishBean.getSpeed());
-        }
-        //设置步数
-        if ("--".equals(runningFinishBean.getStep())) {
-            failedEntity.setStep("0");
-        } else {
-            failedEntity.setStep(runningFinishBean.getStep());
-        }
-        //设置距离
-        if ("--".equals(runningFinishBean.getRunDistance())) {
-            failedEntity.setDistance("0");
-        } else {
-            failedEntity.setDistance(runningFinishBean.getRunDistance());
-        }
-        //设置开始地点
-        failedEntity.setStartPoint(userStepEntity.getStartPoint());
-        //设置结束地点
-        failedEntity.setEndPoint(userStepEntity.getEndPoint());
-        //设置赛道开始时间
-        failedEntity.setStreetTraceStartTime(userStepEntity.getQueryTraceStartTime());
-        //设置赛道结束时间
-        failedEntity.setStreetTraceEndTime(userStepEntity.getQueryTraceEndTime());
-        //设置赛道查询实体
-        failedEntity.setEntityName(userStepEntity.getQueryEntityName());
-        //设置用户开始时间
-        failedEntity.setUserStartTime(userStepEntity.getStartTimeStamp());
-        //设置用户完成时间
-        failedEntity.setUserEndTime(userStepEntity.getFinishTimeStamp());
-        //设置关键点
-        failedEntity.setImportPoint(userStepEntity.getImportPoint());
-        //设置赛事id
-        failedEntity.setStreetId(userStepEntity.getStreetId());
-        //设置赛事标题
-        failedEntity.setStreetTitle(userStepEntity.getStreetTitle());
-        //设置数据
-        StepUtil.setFailData(activity, failedEntity);
-        //跳转到上传失败列表
-        LineUpAgainActivity.newInstance(activity);
-        StepUtil.clearRunData(activity, CommonInfo.getUserId(activity));
-        CommonInfo.reset(activity);
-        //关闭当前窗口
-        activity.finish();
-
-    }
     /**
      * 查询运营人员踩得轨迹
@@ -377,4 +301,60 @@ public class RunningFinishFragmetPresenter extends MvpBasePresenter&lt;RunningFinis
         }
     }
+
+
+//     new Handler().postDelayed(new Runnable() {
+//        @Override
+//        public void run() {
+//            //开始截图
+//            getView().baiduMap.snapshot(new BaiduMap.SnapshotReadyCallback() {
+//                @Override
+//                public void onSnapshotReady(Bitmap bitmap) {
+//                    if (context == null) {
+//                        return;
+//                    }
+//                    if (null == bitmap) {
+//                        return;
+//                    }
+//                    //开始保存截屏
+//                    try {
+//                        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
+//                        File image = new File(context.getExternalCacheDir() + "/location_screenshot_" + sdf.format(new Date()) + ".jpeg");
+//                        FileOutputStream fos = new FileOutputStream(image);
+//                        boolean b = bitmap.compress(Bitmap.CompressFormat.PNG, 100, fos);
+//                        fos.flush();
+//                        fos.close();
+//                        String mapImagePath = image.getAbsolutePath();
+//                        if (!TextUtils.isEmpty(mapImagePath)) {
+//                            QMUITipDialogUtil.loadingDialog(context, "正在上传数据", false);
+//                            //开始上传7牛
+//                            List<String> imagePaths = new ArrayList<>();
+//                            imagePaths.add(mapImagePath);
+//                            UploadLogic.uploadAddressPicInfo(getView().getContext(), imagePaths, new Event<String>()
+//                                    .setFailureCallback(new FailureCallback() {
+//                                        @Override
+//                                        public void onFailure(int i, String s) {
+//                                            QMUITipDialogUtil.dismessDialog();
+//                                        }
+//                                    })
+//                                    .setSuccessCallback(new SuccessCallback<String>() {
+//                                        @Override
+//                                        public void onSuccess(String data) {
+//                                            //设置截图
+//                                            runningFinishBean.setRoadmap(data);
+//                                            //开始向服务器传数据
+//                                            saveRouteData(context, userStepEntity, runningFinishBean);
+//                                        }
+//                                    })
+//                            );
+//                        }
+//                    } catch (Exception e) {
+//                        e.printStackTrace();
+//                    }
+//                }
+//            });
+////
+//        }
+//    }, 2000);
+    //
 }
+package com.cnlive.moudle.pedometer.frame.presenter;
+
+import com.cnlive.moudle.pedometer.frame.view.UploadFailDetailFragmentView;
+import com.hannesdorfmann.mosby3.mvp.MvpBasePresenter;
+
+public class UploadFailDetailFragmentPresenter extends MvpBasePresenter<UploadFailDetailFragmentView> {
+}
 package com.cnlive.moudle.pedometer.frame.view;
 import android.support.v7.widget.LinearLayoutManager;
+import android.view.View;
 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.sql.entity.FailedEntity;
+import com.cnlive.moudle.pedometer.ui.activity.UploadFailDetailActivity;
 import com.cnlive.moudle.pedometer.ui.adapter.LineUpAgainAdapter;
 import com.cnlive.moudle.pedometer.ui.fragment.LineUpAgainFragment;
 import com.cnlive.moudle.pedometer.utils.StepUtil;
@@ -34,19 +36,19 @@ public class LineUpAgainView implements MvpView {
         });
         fragment.binding.topbar.setTitle("重新上传");
         //获取上传失败的数据
-        List<FailedEntity> failedEntities = StepUtil.getFailListData(fragment.getContext(), CommonInfo.getUserId(fragment.getContext()));
-        //没有失败数据
-        if (failedEntities == null) {
-
-        }
-        //有失败数据
-        else {
-            againAdapter = new LineUpAgainAdapter(failedEntities, fragment.getActivity());
-            fragment.binding.recycler.setAdapter(againAdapter);
-        }
 //        fragment.binding.refreshLayout.setRefreshHeader(new ClassicsHeader(fragment.getActivity()));
 //        fragment.binding.refreshLayout.setRefreshFooter(new ClassicsFooter(fragment.getActivity()));
         fragment.binding.recycler.setLayoutManager(new LinearLayoutManager(fragment.getActivity()));
     }
+    public void setData(List<FailedEntity> failedEntities) {
+        againAdapter = new LineUpAgainAdapter(failedEntities, fragment.getActivity());
+        fragment.binding.recycler.setAdapter(againAdapter);
+        againAdapter.setOnClickListener(new LineUpAgainAdapter.OnClickListener() {
+            @Override
+            public void onClickListener(FailedEntity bean, int position) {
+                UploadFailDetailActivity.startActivity(fragment.getActivity(), bean);
+            }
+        });
+    }
 }
 package com.cnlive.moudle.pedometer.frame.view;
+import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Handler;
@@ -25,9 +26,12 @@ import com.cnlive.moudle.pedometer.model.RunningFinishBean;
 import com.cnlive.moudle.pedometer.model.RunningMapBean;
 import com.cnlive.moudle.pedometer.model.Constant;
 import com.cnlive.moudle.pedometer.model.MessageEvent;
+import com.cnlive.moudle.pedometer.net.bean.RunRaceDetailInfo;
 import com.cnlive.moudle.pedometer.service.KeepLiveService;
 import com.cnlive.moudle.pedometer.service.StepService;
+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.activity.RunRaceDetailActivity;
 import com.cnlive.moudle.pedometer.ui.activity.RunningFinishActivity;
 import com.cnlive.moudle.pedometer.ui.activity.RunningMapActivity;
@@ -117,10 +121,27 @@ public class RunMainFragmentView implements MvpView {
     /**
      * 初始化相关视图
      */
-    public void initView() {
+    public void initView(RunRaceDetailInfo runRaceDetailInfo) {
         Log.e(TAG, "initView: +时间" + SystemClock.elapsedRealtime());
         uid = CommonInfo.getUserId(getContext());
         userStepEntity = StepUtil.getUserStepData(getContext(), uid);
+        //设置数据
+        if (userStepEntity != null) {
+            //设置赛事标题
+            if (TextUtils.isEmpty(userStepEntity.getStreetTitle())) {
+                StepUtil.setStreetTitle(getContext(), CommonInfo.getUserId(getContext()), runRaceDetailInfo.getTitle());
+            }
+            //设置实体名字
+            if (TextUtils.isEmpty(userStepEntity.getQueryEntityName())) {
+                long startTime = Long.parseLong(runRaceDetailInfo.getStartTime());
+                long endTime = Long.parseLong(runRaceDetailInfo.getEndTime());
+                StepUtil.setQueryTraceTime(getContext(), CommonInfo.getUserId(getContext()), startTime, endTime, runRaceDetailInfo.getEntityName());
+            }
+            //设置重要点
+         if (TextUtils.isEmpty(userStepEntity.getImportPoint())){
+             StepUtil.setImportPoints(getContext(),CommonInfo.getUserId(getContext()),runRaceDetailInfo.getLatLongitude());
+         }
+        }
         initLocationClient();
         fragment.binding.llRunMainRoot.setVisibility(View.GONE);
         ButtonAnimUtil.startAnimation(fragment.binding.llStartTimeTip, false);
@@ -183,6 +204,7 @@ public class RunMainFragmentView implements MvpView {
             }
         });
+
         boolean isFirstShowTime = CommonInfo.getIsFirstShowTimeTip(getContext());
         //当前用户已经在运动
         if (isFirstShowTime) {
@@ -338,7 +360,6 @@ public class RunMainFragmentView implements MvpView {
                                                     setStopStartFlag();
                                                     //设置运动结束时间戳
                                                     StepUtil.setUserFinishTimeStamp(getContext(), uid);
-                                                    CommonInfo.setStepEndTime(getContext(), TimeUtil.getNowTimeStamp());
                                                     fragment.binding.cpCurrent.setVisibility(View.GONE);
                                                     ButtonAnimUtil.setViewDefault(fragment.binding.flStop);
                                                     dialog.dismiss();
@@ -349,11 +370,20 @@ 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.getFormatNowTime());
+                                                    runningFinishBean.setDate(TimeUtil.getStampToTime(userStepEntity.getFinishTimeStamp()*1000,"yyyy/MM/dd HH:mm"));
+                                                    runningFinishBean.setStreetTitle(userStepEntity.getStreetTitle());
                                                     //设置用时
                                                     runningFinishBean.setEmployTime(employTime);
-                                                    RunningFinishActivity.startActivity(fragment.getActivity(), runningFinishBean);
-                                                    fragment.getActivity().finish();
+
+                                                    //先将失败数据保存起来
+                                                    if (runningFinishBean != null && userStepEntity != null) {
+                                                        setFailData(getContext(), userStepEntity, runningFinishBean);
+                                                    }
+                                                    FailedEntity failedEntity = StepUtil.getTempSaveFailData(getContext(), CommonInfo.getUserId(getContext()), userStepEntity.getStartTimeStamp());
+                                                    if (failedEntity != null) {
+                                                        RunningFinishActivity.startActivity(fragment.getActivity(), runningFinishBean);
+                                                        fragment.getActivity().finish();
+                                                    }
                                                 }
                                             }, "取消", new SelectDialog.DialogInterface() {
                                                 @Override
@@ -486,6 +516,8 @@ public class RunMainFragmentView implements MvpView {
      * 暂停按钮
      */
     public void onBtnPause() {
+        //暂停计步
+        EventBus.getDefault().post(new MessageEvent(Constant.SERVICE_STEP_COUNT_PAUSE, ""));
         //将当前计时器时间戳写入数据库
         setSQLPauseTime(uid);
         //设置暂停标志
@@ -537,8 +569,7 @@ public class RunMainFragmentView implements MvpView {
             //停止计时
             fragment.binding.chronometer.stop();
             mRecordTime = SystemClock.elapsedRealtime();
-            //暂停计步
-            EventBus.getDefault().post(new MessageEvent(Constant.SERVICE_STEP_COUNT_PAUSE, ""));
+
         }
     }
@@ -692,6 +723,80 @@ public class RunMainFragmentView implements MvpView {
             mLocClient.stop();
         }
     }
+
+    /**
+     * 暂存失败数据
+     *
+     * @param context
+     * @param userStepEntity
+     * @param runningFinishBean
+     */
+    public void setFailData(Context context, UserStepEntity userStepEntity, RunningFinishBean runningFinishBean) {
+        if (userStepEntity == null || runningFinishBean == null || context == null) {
+            return;
+        }
+        //设置数据
+        FailedEntity failedEntity = new FailedEntity();
+        //设置主键
+        failedEntity.setUuid(StepUtil.getUUID());
+        //设置用户id
+        failedEntity.setUid(userStepEntity.getUserId());
+        //设置当前数据创建时间戳
+        failedEntity.setCreatTimeStamp(TimeUtil.getNowTimeStamp());
+        //设置是否暂停
+        if (userStepEntity.getPauseCount() > 1) {
+            failedEntity.setIsPause(true);
+            //设置暂停时间
+            failedEntity.setUserPauseTime(userStepEntity.getUserPauseTimeStamp());
+            //设置继续时间戳
+            failedEntity.setUsrContinueTime(userStepEntity.getContinueTime());
+        } else {
+            failedEntity.setIsPause(false);
+        }
+        //设置用时
+        failedEntity.setTime(runningFinishBean.getEmployTime());
+        //设置配速
+        if ("--".equals(runningFinishBean.getSpeed())) {
+            failedEntity.setSpeed("0");
+        } else {
+            failedEntity.setSpeed(runningFinishBean.getSpeed());
+        }
+        //设置步数
+        if ("--".equals(runningFinishBean.getStep())) {
+            failedEntity.setStep("0");
+        } else {
+            failedEntity.setStep(runningFinishBean.getStep());
+        }
+        //设置距离
+        if ("--".equals(runningFinishBean.getRunDistance())) {
+            failedEntity.setDistance("0");
+        } else {
+            failedEntity.setDistance(runningFinishBean.getRunDistance());
+        }
+        //设置开始地点
+        failedEntity.setStartPoint(userStepEntity.getStartPoint());
+        //设置结束地点
+        failedEntity.setEndPoint(userStepEntity.getEndPoint());
+        //设置赛道开始时间
+        failedEntity.setStreetTraceStartTime(userStepEntity.getQueryTraceStartTime());
+        //设置赛道结束时间
+        failedEntity.setStreetTraceEndTime(userStepEntity.getQueryTraceEndTime());
+        //设置赛道查询实体
+        failedEntity.setEntityName(userStepEntity.getQueryEntityName());
+        //设置用户开始时间
+        failedEntity.setUserStartTime(userStepEntity.getStartTimeStamp());
+        //设置用户完成时间
+        failedEntity.setUserEndTime(userStepEntity.getFinishTimeStamp());
+        //设置关键点
+        failedEntity.setImportPoint(userStepEntity.getImportPoint());
+        //设置赛事id
+        failedEntity.setStreetId(userStepEntity.getStreetId());
+        //设置赛事标题
+        failedEntity.setStreetTitle(userStepEntity.getStreetTitle());
+        //设置数据
+        StepUtil.setFailData(context, failedEntity);
+
+    }
 }
@@ -131,7 +131,7 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
     //    private String test = "[{\"latitude\":39.933889208848,\"latitudeE6\":3.9933889208848E7,\"longitude\":116.30900265517,\"longitudeE6\":1.1630900265517001E8},{\"latitude\":39.933868507347,\"latitudeE6\":3.9933868507347E7,\"longitude\":116.30865416508,\"longitudeE6\":1.1630865416508E8},{\"latitude\":39.934756505077,\"latitudeE6\":3.9934756505077E7,\"longitude\":116.30860516469,\"longitudeE6\":1.1630860516468999E8},{\"latitude\":39.934781620502,\"latitudeE6\":3.9934781620502E7,\"longitude\":116.30961013007,\"longitudeE6\":1.1630961013007E8},{\"latitude\":39.934881620374,\"latitudeE6\":3.9934881620374E7,\"longitude\":116.30960513008,\"longitudeE6\":1.1630960513008E8},{\"latitude\":39.934077623132,\"latitudeE6\":3.9934077623132E7,\"longitude\":116.30965812942,\"longitudeE6\":1.1630965812942E8},{\"latitude\":39.933972618463,\"latitudeE6\":3.9933972618463E7,\"longitude\":116.30962113087,\"longitudeE6\":1.1630962113087E8},{\"latitude\":39.933932608856,\"latitudeE6\":3.9933932608856E7,\"longitude\":116.30953913383,\"longitudeE6\":1.1630953913383E8}]";
     private LinkedList<LatLng> importLatLngs;//关键点
     private LatLng startLatLng = new LatLng(39.934733, 116.308646);//起始点
-    private RunRaceDetailInfo runRaceDetailInfo;
+    public RunRaceDetailInfo runRaceDetailInfo;
     private UserStepEntity userStepEntity;
     private boolean isDifferentStreet = false;
     private LBSTraceClient mClient = null;
@@ -212,12 +212,6 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
             startTime = Long.parseLong(runRaceDetailInfo.getStartTime());
             endTime = Long.parseLong(runRaceDetailInfo.getEndTime());
             //todo 注意后续查询历史轨迹的时候,必须查数据库中的时间,因为涉及到历史运动恢复,所以不能用这个sp文件中的,这里设置,只是为了在服务启动成功后,
-            //设置轨迹查询实体名称
-            CommonInfo.setQueryEntityName(getContext(), runRaceDetailInfo.getEntityName());
-            //设置轨迹查询开始时间
-            CommonInfo.setQueryTraceStartTime(getContext(), startTime);
-            //设置轨迹查询结束时间
-            CommonInfo.setQueryTraceEndTime(getContext(), endTime);
             mClient = new LBSTraceClient(getContext());
             //获取轨迹
@@ -307,7 +301,6 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
         }
         //设置标题
         if (!TextUtils.isEmpty(runRaceDetailInfo.getTitle())) {
-            CommonInfo.setStreetTitle(getContext(), runRaceDetailInfo.getTitle());
             fragment.binding.includeStreet.tvRaceTitle.setText(runRaceDetailInfo.getTitle());
             //根据标题字数动态设置卡片高度
             if (runRaceDetailInfo.getTitle().length() > 19) {
@@ -574,10 +567,10 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
                 stopStepService();
                 startStepService(getContext());
             } else {
-                PedometerMainActivity.startActivity(fragment.getActivity(), runRaceDetailInfo.getStartLocation(), runRaceDetailInfo.getEndLocation(), importStreetPoints);
+                PedometerMainActivity.startActivity(fragment.getActivity(), runRaceDetailInfo);
             }
         } else {
-            PedometerMainActivity.startActivity(fragment.getActivity(), runRaceDetailInfo.getStartLocation(), runRaceDetailInfo.getEndLocation(), importStreetPoints);
+            PedometerMainActivity.startActivity(fragment.getActivity(), runRaceDetailInfo);
         }
     }
@@ -913,19 +906,9 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
         }
         //todo 防止停止后,再次开始,无法获取到赛道的轨迹
         if (runRaceDetailInfo != null) {
-            if (!TextUtils.isEmpty(runRaceDetailInfo.getStartTime()) && !TextUtils.isEmpty(runRaceDetailInfo.getEndTime()) && !TextUtils.isEmpty(runRaceDetailInfo.getEntityName())) {
-                long startTime = Long.parseLong(runRaceDetailInfo.getStartTime());
-                long endTime = Long.parseLong(runRaceDetailInfo.getEndTime());
-                //todo 注意后续查询历史轨迹的时候,必须查数据库中的时间,因为涉及到历史运动恢复,所以不能用这个sp文件中的,这里设置,只是为了在服务启动成功后,
-                //设置轨迹查询实体名称
-                CommonInfo.setQueryEntityName(getContext(), runRaceDetailInfo.getEntityName());
-                //设置轨迹查询开始时间
-                CommonInfo.setQueryTraceStartTime(getContext(), startTime);
-                //设置轨迹查询结束时间
-                CommonInfo.setQueryTraceEndTime(getContext(), endTime);
-            }
-            if (!TextUtils.isEmpty(runRaceDetailInfo.getTitle())) {
-                CommonInfo.setStreetTitle(getContext(), runRaceDetailInfo.getTitle());
+            if (runRaceDetailInfo.getFenceId() != null) {
+                //设置围栏ID
+                CommonInfo.setFenceId(getContext(), Integer.parseInt(runRaceDetailInfo.getFenceId()));
             }
         }
@@ -42,6 +42,10 @@ public class RunningFinishFragmentView implements MvpView {
     public void initView(RunningFinishBean runningFinishBean) {
         this.mMapView = fragment.binding.mapView;
         initMap();
+        //设置赛事标题
+        if (!TextUtils.isEmpty(runningFinishBean.getStreetTitle())) {
+            fragment.binding.includeFinishUserInfo.tvStreetName.setText(runningFinishBean.getStreetTitle());
+        }
         //设置用户头像
         String faceUrl = CommonInfo.getUserIcon(getContext());
         if (!TextUtils.isEmpty(faceUrl)) {
+package com.cnlive.moudle.pedometer.frame.view;
+
+import android.content.Context;
+import android.text.TextUtils;
+import android.view.View;
+
+import com.bumptech.glide.Glide;
+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.hannesdorfmann.mosby3.mvp.MvpView;
+
+public class UploadFailDetailFragmentView implements MvpView {
+    private UploadFailDetailFragment fragment;
+    private FailedEntity failedEntity;
+
+    public UploadFailDetailFragmentView(UploadFailDetailFragment fragment) {
+        this.fragment = fragment;
+    }
+
+    public Context getContext() {
+        return fragment == null ? null : fragment.getActivity();
+    }
+
+    public void initView(FailedEntity failedEntity) {
+        if (getContext() == null) {
+            return;
+        }
+        if (failedEntity == null) {
+            return;
+        }
+        this.failedEntity = failedEntity;
+        //隐藏loading
+        fragment.binding.loading.setVisibility(View.GONE);
+        //设置提示文字为重新上传
+        fragment.binding.tvRunNow.setText("重新上传");
+        fragment.binding.rlScrollViewStartBtn.setTag("0");
+        //初始化相关数据
+        //设置用户昵称
+        String nickName = CommonInfo.getUserNickName(getContext());
+        if (!TextUtils.isEmpty(nickName)) {
+            fragment.binding.includeFinishUserInfo.tvUserNickName.setText(nickName);
+        }
+        //设置用户头像
+        String faceUrl = CommonInfo.getUserIcon(getContext());
+        if (!TextUtils.isEmpty(faceUrl)) {
+            Glide.with(getContext()).load(faceUrl).into(fragment.binding.includeFinishUserInfo.qmIvIcon);
+        }
+        //设置赛事标题
+        if (!TextUtils.isEmpty(failedEntity.getStreetTitle())) {
+            fragment.binding.includeFinishUserInfo.tvStreetName.setText(failedEntity.getStreetTitle());
+        }
+        //设置距离
+        fragment.binding.includeFinishUserInfo.tvDistance.setText(failedEntity.getDistance());
+        //设置配速
+        if ("--".equals(failedEntity.getSpeed())) {
+            fragment.binding.includeFinishUserInfo.tvSpeed.setText("0");
+        } else {
+            fragment.binding.includeFinishUserInfo.tvSpeed.setText(failedEntity.getSpeed());
+        }
+        //设置用时
+        fragment.binding.includeFinishUserInfo.tvTimer.setText(TimeUtil.stampToChronometer(Long.parseLong(failedEntity.getTime())));
+        //设置日期
+        fragment.binding.includeFinishUserInfo.tvDate.setText(TimeUtil.getStampToTime(failedEntity.getUserEndTime() * 1000, "yyyy/MM/dd HH:mm"));
+        //设置步数
+        if ("--".equals(failedEntity.getStep())) {
+            fragment.binding.includeFinishStep.tvStep.setText("0");
+        } else {
+            fragment.binding.includeFinishStep.tvStep.setText(failedEntity.getStep());
+        }
+        //设置起点位置
+        fragment.binding.includeFinishRunRoute.tvStartPoint.setText(failedEntity.getStartPoint());
+        //设置终点位置
+        fragment.binding.includeFinishRunRoute.tvEndPoint.setText(failedEntity.getEndPoint());
+        //设置时间
+        fragment.binding.includeFinishRunRoute.tvTimer.setText(TimeUtil.stampToChronometer(Long.parseLong(failedEntity.getTime())));
+        //返回按钮点击事件
+        fragment.binding.flBack.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (fragment.getActivity() != null) {
+                    fragment.getActivity().finish();
+                }
+            }
+        });
+        //重新上传按钮点击事件
+        fragment.binding.rlScrollViewStartBtn.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+
+            }
+        });
+    }
+}
@@ -3,7 +3,7 @@ package com.cnlive.moudle.pedometer.model;
 public class Constant {
     public static final long SERVICE_ID = 213511;
     public static final int TAG = 1;
-    public static final int GATHER_INTERVAL =2;//位置采集周期
+    public static final int GATHER_INTERVAL = 2;//位置采集周期
     public static final int PACK_INTERVAL = 10;//位置采集周期
     public static final int SERVICE_STEP_COUNT_UPDATE = 0;//步数更新
@@ -18,5 +18,6 @@ public class Constant {
     public static final int START_TRACE_GATHER_SUCCESS = 9;//启动轨迹服务成功(用户)
     public static final int START_TRACE_GATHER_FAIL = 10;//启动轨迹服务失败(用户)
     public static final int REGISTRATION_SUCCESS = 11;//用户报名成功
-
+    public static final double PASS_RATE = 0.7;//通过率70%
+    public static final int CHECK_ACCURACY = 50;//判断用户是否完成的精度范围
 }
@@ -20,6 +20,15 @@ public class RunningFinishBean implements Serializable {
     private String employTime;
     private String isFinish;
     private String roadmap;
+    private String streetTitle;
+
+    public String getStreetTitle() {
+        return streetTitle;
+    }
+
+    public void setStreetTitle(String streetTitle) {
+        this.streetTitle = streetTitle;
+    }
     public String getRoadmap() {
         return roadmap;
 package com.cnlive.moudle.pedometer.net.bean;
+import java.io.Serializable;
 import java.util.List;
 /**
@@ -7,7 +8,7 @@ import java.util.List;
  *
  * @author ShinnyYang
  */
-public class RunRaceDetailInfo {
+public class RunRaceDetailInfo implements Serializable {
     /**
@@ -104,11 +104,11 @@ public class StepService 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
      */
@@ -137,7 +137,7 @@ public class StepService extends Service implements SensorEventListener {
     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;//是否是已经更新速度
@@ -255,18 +255,12 @@ public class StepService extends Service implements SensorEventListener {
                         if (userStepEntity == null) {
                             StepUtil.setStepStartData(getApplicationContext(), userId, TimeUtil.getNowTimeStamp(), CommonInfo.getStreetId(getApplicationContext()));
                             //设置从服务器获取的时间(后续查询历史轨迹的时间,要从数据库中获取,因为涉及到现有运动恢复问题)
-                            StepUtil.setQueryTraceTime(getApplicationContext(), userId, CommonInfo.getQueryTraceStartTime(getApplicationContext()), CommonInfo.getQueryTraceEndTime(getApplicationContext()), CommonInfo.getQueryQueryEntityName(getApplicationContext()));
                             int fenceId = CommonInfo.getFenceId(getApplicationContext());
+                            Log.e(TAG, "onStartTraceCallback: 保存的围栏id" + fenceId);
                             //设置围栏id
                             StepUtil.setFenceId(getApplicationContext(), CommonInfo.getUserId(getApplicationContext()), fenceId);
-                            //设置赛事标题
-                            StepUtil.setStreetTitle(getApplicationContext(), CommonInfo.getUserId(getApplicationContext()), CommonInfo.getStreetTitle(getApplicationContext()));
                             //清空临时保存的时间
-                            CommonInfo.setQueryTraceEndTime(getApplicationContext(), 0);
-                            CommonInfo.setQueryTraceStartTime(getApplicationContext(), 0);
-                            CommonInfo.setQueryEntityName(getApplicationContext(), "");
                             CommonInfo.setFenceId(getApplicationContext(), -1);
-                            CommonInfo.setStreetTitle(getApplicationContext(), "");
                         }
                         //开始设置围栏报警
@@ -632,7 +626,15 @@ public class StepService 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;
+        sensorManager = null;
+        stepSensorType = -1;
+        time=null;
     }
     //接收事件
@@ -703,6 +705,7 @@ public class StepService extends Service implements SensorEventListener {
                 CURRENT_STEP = Integer.parseInt(userStepEntity.getStepCount());
             }
         }
+        Log.e(TAG, "initTodayData: 初始化当前步数" + CURRENT_STEP);
         if (mStepCount != null) {
             mStepCount.setSteps(CURRENT_STEP);
         }
@@ -710,6 +713,7 @@ public class StepService 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);
@@ -1005,29 +1009,45 @@ public class StepService 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) {
@@ -1053,10 +1073,10 @@ public class StepService extends Service implements SensorEventListener {
      * 保存记步数据
      */
     private void save() {
-        boolean isWriteUserStep = CommonInfo.getIsWriteUserStep(getApplicationContext());
-        if (!isWriteUserStep) {
-            return;
-        }
+//        boolean isWriteUserStep = CommonInfo.getIsWriteUserStep(getApplicationContext());
+//        if (!isWriteUserStep) {
+//            return;
+//        }
         int tempStep = CURRENT_STEP;
         UserStepEntity userStepEntity = StepUtil.getUserStepData(getApplicationContext(), CommonInfo.getUserId(getApplicationContext()));
         if (userStepEntity == null) {
@@ -22,15 +22,15 @@ public class DaoMaster extends AbstractDaoMaster {
     /** Creates underlying database table using DAOs. */
     public static void createAllTables(Database db, boolean ifNotExists) {
         CollUserStepEntityDao.createTable(db, ifNotExists);
-        UserStepEntityDao.createTable(db, ifNotExists);
         FailedEntityDao.createTable(db, ifNotExists);
+        UserStepEntityDao.createTable(db, ifNotExists);
     }
     /** Drops underlying database table using DAOs. */
     public static void dropAllTables(Database db, boolean ifExists) {
         CollUserStepEntityDao.dropTable(db, ifExists);
-        UserStepEntityDao.dropTable(db, ifExists);
         FailedEntityDao.dropTable(db, ifExists);
+        UserStepEntityDao.dropTable(db, ifExists);
     }
     /**
@@ -50,8 +50,8 @@ public class DaoMaster extends AbstractDaoMaster {
     public DaoMaster(Database db) {
         super(db, SCHEMA_VERSION);
         registerDaoClass(CollUserStepEntityDao.class);
-        registerDaoClass(UserStepEntityDao.class);
         registerDaoClass(FailedEntityDao.class);
+        registerDaoClass(UserStepEntityDao.class);
     }
     public DaoSession newSession() {
@@ -9,12 +9,12 @@ import org.greenrobot.greendao.identityscope.IdentityScopeType;
 import org.greenrobot.greendao.internal.DaoConfig;
 import com.cnlive.moudle.pedometer.sql.entity.CollUserStepEntity;
-import com.cnlive.moudle.pedometer.sql.entity.UserStepEntity;
 import com.cnlive.moudle.pedometer.sql.entity.FailedEntity;
+import com.cnlive.moudle.pedometer.sql.entity.UserStepEntity;
 import com.cnlive.moudle.pedometer.sql.dao.CollUserStepEntityDao;
-import com.cnlive.moudle.pedometer.sql.dao.UserStepEntityDao;
 import com.cnlive.moudle.pedometer.sql.dao.FailedEntityDao;
+import com.cnlive.moudle.pedometer.sql.dao.UserStepEntityDao;
 // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
@@ -26,12 +26,12 @@ import com.cnlive.moudle.pedometer.sql.dao.FailedEntityDao;
 public class DaoSession extends AbstractDaoSession {
     private final DaoConfig collUserStepEntityDaoConfig;
-    private final DaoConfig userStepEntityDaoConfig;
     private final DaoConfig failedEntityDaoConfig;
+    private final DaoConfig userStepEntityDaoConfig;
     private final CollUserStepEntityDao collUserStepEntityDao;
-    private final UserStepEntityDao userStepEntityDao;
     private final FailedEntityDao failedEntityDao;
+    private final UserStepEntityDao userStepEntityDao;
     public DaoSession(Database db, IdentityScopeType type, Map<Class<? extends AbstractDao<?, ?>>, DaoConfig>
             daoConfigMap) {
@@ -40,37 +40,37 @@ public class DaoSession extends AbstractDaoSession {
         collUserStepEntityDaoConfig = daoConfigMap.get(CollUserStepEntityDao.class).clone();
         collUserStepEntityDaoConfig.initIdentityScope(type);
-        userStepEntityDaoConfig = daoConfigMap.get(UserStepEntityDao.class).clone();
-        userStepEntityDaoConfig.initIdentityScope(type);
-
         failedEntityDaoConfig = daoConfigMap.get(FailedEntityDao.class).clone();
         failedEntityDaoConfig.initIdentityScope(type);
+        userStepEntityDaoConfig = daoConfigMap.get(UserStepEntityDao.class).clone();
+        userStepEntityDaoConfig.initIdentityScope(type);
+
         collUserStepEntityDao = new CollUserStepEntityDao(collUserStepEntityDaoConfig, this);
-        userStepEntityDao = new UserStepEntityDao(userStepEntityDaoConfig, this);
         failedEntityDao = new FailedEntityDao(failedEntityDaoConfig, this);
+        userStepEntityDao = new UserStepEntityDao(userStepEntityDaoConfig, this);
         registerDao(CollUserStepEntity.class, collUserStepEntityDao);
-        registerDao(UserStepEntity.class, userStepEntityDao);
         registerDao(FailedEntity.class, failedEntityDao);
+        registerDao(UserStepEntity.class, userStepEntityDao);
     }
     public void clear() {
         collUserStepEntityDaoConfig.clearIdentityScope();
-        userStepEntityDaoConfig.clearIdentityScope();
         failedEntityDaoConfig.clearIdentityScope();
+        userStepEntityDaoConfig.clearIdentityScope();
     }
     public CollUserStepEntityDao getCollUserStepEntityDao() {
         return collUserStepEntityDao;
     }
-    public UserStepEntityDao getUserStepEntityDao() {
-        return userStepEntityDao;
-    }
-
     public FailedEntityDao getFailedEntityDao() {
         return failedEntityDao;
     }
+    public UserStepEntityDao getUserStepEntityDao() {
+        return userStepEntityDao;
+    }
+
 }
@@ -4,13 +4,16 @@ import org.greenrobot.greendao.annotation.Entity;
 import org.greenrobot.greendao.annotation.Id;
 import org.greenrobot.greendao.annotation.Generated;
+import java.io.Serializable;
+
 /**
  * 上传失败列表
  *
  * @author ShinnyYang
  */
 @Entity
-public class FailedEntity {
+public class FailedEntity implements Serializable {
+    static final long serialVersionUID = 01L;
     @Id
     private String uuid;//主键
     private String uid;//用户id
@@ -2,31 +2,20 @@ package com.cnlive.moudle.pedometer.ui.activity;
 import android.Manifest;
 import android.app.Activity;
-import android.content.Context;
 import android.content.Intent;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.location.LocationManager;
 import android.os.Build;
 import android.provider.Settings;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.v4.app.NotificationManagerCompat;
-import android.support.v4.content.ContextCompat;
 import android.text.TextUtils;
 import android.util.Log;
-import android.view.KeyEvent;
 import android.widget.Toast;
 import com.alibaba.android.arouter.facade.annotation.Route;
-import com.baidu.mapapi.CoordType;
-import com.baidu.mapapi.SDKInitializer;
 import com.baidu.mapapi.model.LatLng;
-import com.cnlive.libs.base.ui.QMUIFragment;
 import com.cnlive.libs.base.ui.QMUIFragmentActivity;
-import com.cnlive.libs.base.util.StatusBarUtil;
-import com.cnlive.libs.base.util.StatusBarUtil2;
-import com.cnlive.moudle.collectionTrace.ui.activity.CollPedometerMainActivity;
+import com.cnlive.moudle.pedometer.net.bean.RunRaceDetailInfo;
 import com.cnlive.moudle.pedometer.ui.fragment.RunMainFragment;
 import com.cnlive.moudle.pedometer.utils.MyMapUtil;
 import com.cnlive.moudle.pedometer.utils.lib_permisshelper.PermissionsListener;
@@ -47,13 +36,11 @@ import static android.provider.Settings.EXTRA_APP_PACKAGE;
 public class PedometerMainActivity extends QMUIFragmentActivity {
     private static final String TAG = "PedometerMainActivity";
-    private NotificationManagerCompat notificationManagerCompat;
-    private boolean isOpen;
+
     private PermissionsUtils mPermissionsUtils = new PermissionsUtils();//权限申请
     private RunMainFragment fragment;
-    private String startPointAdd;
-    private String endPointAdd;
     private List<LatLng> importStreetPoints;
+    private RunRaceDetailInfo runRaceDetailInfo;
     @Override
     protected int getContextViewId() {
@@ -63,9 +50,7 @@ public class PedometerMainActivity extends QMUIFragmentActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        startPointAdd = getIntent().getExtras().getString("startPointAdd");
-        endPointAdd = getIntent().getExtras().getString("endPointAdd");
-        importStreetPoints = (List<LatLng>) getIntent().getExtras().getSerializable("importStreetPoints");
+        runRaceDetailInfo = (RunRaceDetailInfo) getIntent().getExtras().get("runRaceDetailInfo");
     }
@@ -74,51 +59,10 @@ public class PedometerMainActivity extends QMUIFragmentActivity {
         super.onDestroy();
     }
-    private void check() {
-
-        //监测通知权限是否打开
-        notificationManagerCompat = NotificationManagerCompat.from(this);
-        isOpen = notificationManagerCompat.areNotificationsEnabled();
-        if (isOpen) {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-//                ContextCompat.startForegroundService(CollPedometerMainActivity.this, new Intent(CollPedometerMainActivity.this, CollStepService.class));
-            }
-        } else {
-            goToSettingNo();
-        }
+    private void checkIsOpenNotifiction() {
+        getPermissionsWithTip();
     }
-    private void goToSettingNo() {
-        Intent intent1 = new Intent();
-        try {
-            // 根据isOpened结果，判断是否需要提醒用户跳转AppInfo页面，去打开App通知权限
-            intent1.setAction(Settings.ACTION_APP_NOTIFICATION_SETTINGS);
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                //这种方案适用于 API 26, 即8.0（含8.0）以上可以用
-                intent1.putExtra(EXTRA_APP_PACKAGE, getPackageName());
-                intent1.putExtra(EXTRA_CHANNEL_ID, getApplicationInfo().uid);
-            } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-                //这种方案适用于 API21——25，即 5.0——7.1 之间的版本可以使用
-                intent1.putExtra("app_package", getPackageName());
-                intent1.putExtra("app_uid", getApplicationInfo().uid);
-            }
-
-            // 小米6 -MIUI9.6-8.0.0系统，是个特例，通知设置界面只能控制"允许使用通知圆点"——然而这个玩意并没有卵用，我想对雷布斯说：I'm not ok!!!
-            //  if ("MI 6".equals(Build.MODEL)) {
-            //      intent.setAction(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
-            //      Uri uri = Uri.fromParts("package", getPackageName(), null);
-            //      intent.setData(uri);
-            //      // intent.setAction("com.android.settings/.SubSettings");
-            //  }
-            startActivity(intent1);
-        } catch (Exception e) {
-            //其他低版本或者异常情况，走该节点。进入APP设置界面
-            intent1.setAction(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
-            intent1.putExtra("package", getPackageName());
-            startActivity(intent1);
-        }
-        Toast.makeText(getApplicationContext(), "您尚未开启通知权限,无法进行计步", Toast.LENGTH_LONG).show();
-    }
     @Override
     protected void onRestart() {
@@ -129,12 +73,11 @@ public class PedometerMainActivity extends QMUIFragmentActivity {
     @Override
     protected void onResume() {
         super.onResume();
-        check();
-        getPermissionsWithTip();
+        checkIsOpenNotifiction();
     }
-    private void addFragment(String startPointAdd, String endPointAdd, List<LatLng> importStreetPoints) {
-        fragment = RunMainFragment.newInstance(startPointAdd, endPointAdd, importStreetPoints);
+    private void addFragment(RunRaceDetailInfo runRaceDetailInfo) {
+        fragment = RunMainFragment.newInstance(runRaceDetailInfo);
         getSupportFragmentManager().beginTransaction()
                 .add(getContextViewId(), fragment, fragment.getClass().getSimpleName())
                 .addToBackStack(fragment.getClass().getSimpleName())
@@ -165,8 +108,8 @@ public class PedometerMainActivity extends QMUIFragmentActivity {
                             Toast.makeText(getApplicationContext(), getString(R.string.open_gps_tip), Toast.LENGTH_LONG).show();
                         } else {
                             if (getCurrentFragment() == null) {
-                                if (!TextUtils.isEmpty(startPointAdd) && !TextUtils.isEmpty(endPointAdd) && importStreetPoints != null) {
-                                    addFragment(startPointAdd, endPointAdd, importStreetPoints);
+                                if (runRaceDetailInfo != null) {
+                                    addFragment(runRaceDetailInfo);
                                 }
                             }
                         }
@@ -213,11 +156,9 @@ public class PedometerMainActivity extends QMUIFragmentActivity {
         return;
     }
-    public static void startActivity(Activity activity, String startPointAdd, String endPointAdd, List<LatLng> importStreetPoints) {
+    public static void startActivity(Activity activity, RunRaceDetailInfo runRaceDetailInfo) {
         Intent intent = new Intent(activity, PedometerMainActivity.class);
-        intent.putExtra("startPointAdd", startPointAdd);
-        intent.putExtra("endPointAdd", endPointAdd);
-        intent.putExtra("importStreetPoints", (Serializable) importStreetPoints);
+        intent.putExtra("runRaceDetailInfo", (Serializable) runRaceDetailInfo);
         activity.startActivity(intent);
     }
 }
@@ -30,6 +30,7 @@ import com.cnlive.moudle.pedometer.ui.fragment.RunRaceDetailFragment;
 import com.cnlive.moudle.pedometer.ui.fragment.RunningMapFragment;
 import com.cnlive.moudle.pedometer.ui.widget.FivePersonIconView;
 import com.cnlive.moudle.pedometer.utils.MyMapUtil;
+import com.cnlive.moudle.pedometer.utils.NotificationUtil;
 import com.cnlive.moudle.pedometer.utils.StepUtil;
 import com.cnlive.moudle.pedometer.utils.lib_permisshelper.PermissionsListener;
 import com.cnlive.moudle.pedometer.utils.lib_permisshelper.PermissionsUtils;
@@ -47,6 +48,7 @@ import java.util.List;
 public class RunRaceDetailActivity extends QMUIFragmentActivity {
     private QMUIFragment fragment;
     private PermissionsUtils mPermissionsUtils = new PermissionsUtils();//权限申请
+    private String eventId;//赛道id
     public static void startActivity(Activity activity, String eventId, String userId, String userIcon, String userName, String userPhone) {
         Intent intent = new Intent(activity, RunRaceDetailActivity.class);
@@ -55,7 +57,6 @@ public class RunRaceDetailActivity extends QMUIFragmentActivity {
         intent.putExtra("userIcon", userIcon);
         intent.putExtra("userName", userName);
         intent.putExtra("userPhone", userPhone);
-        CommonInfo.setStreetId(activity, eventId);
         activity.startActivity(intent);
     }
@@ -67,12 +68,15 @@ public class RunRaceDetailActivity extends QMUIFragmentActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-
+        if (getIntent().getStringExtra("eventId") != null) {
+            eventId = getIntent().getStringExtra("eventId");
+        }
         if (getIntent().getStringExtra("userId") != null) {
             CommonInfo.setUserId(this, getIntent().getStringExtra("userId"));
             CommonInfo.setUserNickName(this, getIntent().getStringExtra("userName"));
             CommonInfo.setUserIcon(this, getIntent().getStringExtra("userIcon"));
             CommonInfo.setUserPhone(this, getIntent().getStringExtra("userPhone"));
+
         }
         //判断用户是否结束运动
 //        boolean isRunStep = CommonInfo.getIsRunStepService(this);
@@ -90,7 +94,23 @@ public class RunRaceDetailActivity extends QMUIFragmentActivity {
     @Override
     protected void onResume() {
         super.onResume();
-        getPermissionsWithTip();
+        if (eventId != null) {
+            CommonInfo.setStreetId(this, eventId);
+            Log.e("设置全局eventId", "onResume: " + eventId);
+        }
+        boolean isOpen = NotificationUtil.isOpenNotification(this);
+        if (isOpen) {
+            //判断GPS是否开启
+            if (!MyMapUtil.isOPenGps(getApplicationContext())) {
+                Toast.makeText(getApplicationContext(), getString(R.string.open_gps_tip), Toast.LENGTH_LONG).show();
+                //开启GPS
+                Intent intent = new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS);
+                startActivityForResult(intent, 10);
+            } else {
+                getPermissionsWithTip();
+            }
+        }
+
     }
     private void addFragment(QMUIFragment fragment) {
@@ -123,17 +143,9 @@ public class RunRaceDetailActivity extends QMUIFragmentActivity {
                     @Override
                     public void onGranted() {
-                        //判断GPS是否开启
-                        if (!MyMapUtil.isOPenGps(getApplicationContext())) {
-                            //开启GPS
-                            Intent intent = new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS);
-                            startActivityForResult(intent, 10);
-                            Toast.makeText(getApplicationContext(), getString(R.string.open_gps_tip), Toast.LENGTH_LONG).show();
-                        } else {
-                            if (getCurrentFragment() == null) {
-                                if (fragment != null) {
-                                    addFragment(fragment);
-                                }
+                        if (getCurrentFragment() == null) {
+                            if (fragment != null) {
+                                addFragment(fragment);
                             }
                         }
                     }
+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.sql.entity.FailedEntity;
+import com.cnlive.moudle.pedometer.ui.fragment.UploadFailDetailFragment;
+import com.example.moudle_pedometer.R;
+
+import java.io.Serializable;
+
+public class UploadFailDetailActivity extends QMUIFragmentActivity {
+    @Override
+    protected int getContextViewId() {
+        return R.id.fragment_upload_fail;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        FailedEntity failedEntity = (FailedEntity) getIntent().getExtras().getSerializable("failedEntity");
+        if (failedEntity != null) {
+            addFragment(UploadFailDetailFragment.newInstance(failedEntity));
+        }
+    }
+    private void addFragment(QMUIFragment fragment) {
+        getSupportFragmentManager().beginTransaction()
+                .add(getContextViewId(), fragment, fragment.getClass().getSimpleName())
+                .addToBackStack(fragment.getClass().getSimpleName())
+                .commit();
+    }
+    public static void startActivity(Activity activity, FailedEntity failedEntity) {
+        Intent intent = new Intent(activity, UploadFailDetailActivity.class);
+        intent.putExtra("failedEntity", (Serializable) failedEntity);
+        activity.startActivity(intent);
+    }
+}
@@ -60,7 +60,6 @@ public class LineUpAgainAdapter extends RecyclerView.Adapter&lt;LineUpAgainAdapter.
             myHolder.up_item_title.setText(list.get(i).getStreetTitle());
             //设置公里
             myHolder.up_kilometer_num.setText(list.get(i).getDistance());
-            Log.e("时间", "onBindViewHolder: "+list.get(i).getTime() );
             //设置运动时间
             myHolder.up_record_minit.setText(TimeUtil.stampToChronometer(Long.parseLong(list.get(i).getTime())));
             //设置配速
@@ -7,15 +7,20 @@ import android.support.annotation.Nullable;
 import android.view.View;
 import com.cnlive.libs.base.frame.fragment.MvpBindingFragment;
+import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.frame.presenter.LineUpAgainPresenter;
 import com.cnlive.moudle.pedometer.frame.view.LineUpAgainView;
+import com.cnlive.moudle.pedometer.sql.entity.FailedEntity;
+import com.cnlive.moudle.pedometer.utils.StepUtil;
 import com.example.moudle_pedometer.R;
 import com.example.moudle_pedometer.databinding.FragmentLineUpAgainBinding;
+import java.util.List;
+
 /**
  * Created by hanyayun 019/06/20.
  */
-public class LineUpAgainFragment extends MvpBindingFragment<LineUpAgainView, LineUpAgainPresenter,Object,FragmentLineUpAgainBinding> {
+public class LineUpAgainFragment extends MvpBindingFragment<LineUpAgainView, LineUpAgainPresenter, Object, FragmentLineUpAgainBinding> {
     public LineUpAgainFragment() {
@@ -31,7 +36,16 @@ public class LineUpAgainFragment extends MvpBindingFragment&lt;LineUpAgainView, Lin
     @Override
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        if(getMvpView() != null) getMvpView().initView();
+        List<FailedEntity> failedEntities = StepUtil.getFailListData(getActivity(), CommonInfo.getUserId(getActivity()));
+
+        if (getMvpView() != null) {
+            getMvpView().initView();
+            if (failedEntities == null||failedEntities.size()<1) {
+                binding.llNoFailTip.setVisibility(View.VISIBLE);
+            } else {
+                getMvpView().setData(failedEntities);
+            }
+        }
         binding.refreshLayout.setEnableLoadMore(false);
         binding.refreshLayout.setEnableRefresh(false);
     }
@@ -16,6 +16,7 @@ import com.cnlive.moudle.pedometer.frame.presenter.RunMainFragmentPresenter;
 import com.cnlive.moudle.pedometer.frame.view.RunMainFragmentView;
 import com.cnlive.moudle.pedometer.model.Constant;
 import com.cnlive.moudle.pedometer.model.MessageEvent;
+import com.cnlive.moudle.pedometer.net.bean.RunRaceDetailInfo;
 import com.cnlive.moudle.pedometer.sql.entity.UserStepEntity;
 import com.cnlive.moudle.pedometer.utils.GsonUtil;
 import com.cnlive.moudle.pedometer.utils.StepUtil;
@@ -31,17 +32,12 @@ import java.io.Serializable;
 import java.util.List;
 public class RunMainFragment extends QMUIFragment<RunMainFragmentView, RunMainFragmentPresenter, FragmentRunMainBinding> {
-    private final String TAG = "CollRunMainFragment";
-    private String userId = "yangshuai";
-    private String startPointAdd;
-    private String endPointAdd;
-    private List<LatLng> importStreetPoints;
+    private final String TAG = "RunMainFragment";
+    private RunRaceDetailInfo runRaceDetailInfo;
-    public static RunMainFragment newInstance(String startPointAdd, String endPointAdd, List<LatLng> importStreetPoints) {
+    public static RunMainFragment newInstance(RunRaceDetailInfo runRaceDetailInfo) {
         Bundle bundle = new Bundle();
-        bundle.putString("startPointAdd", startPointAdd);
-        bundle.putString("endPointAdd", endPointAdd);
-        bundle.putSerializable("importStreetPoints", (Serializable) importStreetPoints);
+        bundle.putSerializable("runRaceDetailInfo", (Serializable) runRaceDetailInfo);
         RunMainFragment fragment = new RunMainFragment();
         fragment.setArguments(bundle);
         return fragment;
@@ -54,30 +50,31 @@ public class RunMainFragment extends QMUIFragment&lt;RunMainFragmentView, RunMainFr
         StatusBarUtil2.setColor(getActivity(), getResources().getColor(R.color.run_main_bg), 0);
         EventBus.getDefault().register(this);
         if (getArguments() != null) {
-            startPointAdd = getArguments().getString("startPointAdd");
-            endPointAdd = getArguments().getString("endPointAdd");
-            importStreetPoints = (List<LatLng>) getArguments().getSerializable("importStreetPoints");
+            runRaceDetailInfo = (RunRaceDetailInfo) getArguments().getSerializable("runRaceDetailInfo");
             UserStepEntity userStepEntity = StepUtil.getUserStepData(getActivity(), CommonInfo.getUserId(getActivity()));
             if (userStepEntity != null) {
-                if (!TextUtils.isEmpty(startPointAdd) && !TextUtils.isEmpty(endPointAdd)) {
-                    userStepEntity.setStartPoint(startPointAdd);
-                    userStepEntity.setEndPoint(endPointAdd);
+                if (runRaceDetailInfo != null) {
+                    userStepEntity.setStartPoint(runRaceDetailInfo.getStartLocation());
+                    userStepEntity.setEndPoint(runRaceDetailInfo.getEndLocation());
                     //更新数据
                     StepUtil.updateStepData(getActivity(), userStepEntity);
+                    //获取数据库中的重要点
+                    String importStr = userStepEntity.getImportPoint();
+                    if (TextUtils.isEmpty(runRaceDetailInfo.getLatLongitude())) {
+                        //设置重要点
+                        StepUtil.setImportPoints(getActivity(), CommonInfo.getUserId(getActivity()), GsonUtil.GsonString(runRaceDetailInfo.getLatLongitude()));
+                    }
                 }
-                //获取数据库中的重要点
-                String importStr = userStepEntity.getImportPoint();
-                if (TextUtils.isEmpty(importStr) && importStreetPoints != null) {
-                    //设置重要点
-                    StepUtil.setImportPoints(getActivity(), CommonInfo.getUserId(getActivity()), GsonUtil.GsonString(importStreetPoints));
-                }
+
             }
         }
         if (getMvpView() != null) {
             new Handler().postDelayed(new Runnable() {
                 @Override
                 public void run() {
-                    getMvpView().initView();
+                    if (runRaceDetailInfo != null) {
+                        getMvpView().initView(runRaceDetailInfo);
+                    }
                 }
             }, 5);
         }
@@ -64,6 +64,7 @@ public class RunRaceDetailFragment extends QMUIFragment&lt;RunRaceDetailFragmentVie
         if (getMvpView() != null) {
             getMvpView().initMap();
         }
+
         if (getPresenter() != null) {
             if (!TextUtils.isEmpty(CommonInfo.getStreetId(getActivity()))) {
                 getPresenter().getRunRaceDetailInfo(getActivity(), CommonInfo.getStreetId(getActivity()), CommonInfo.getUserId(getActivity()), "0");
@@ -179,7 +180,7 @@ public class RunRaceDetailFragment extends QMUIFragment&lt;RunRaceDetailFragmentVie
             if (getMvpView() != null) {
                 Log.e(TAG, "跳转: " + getMvpView().importStreetPoints.size());
                 QMUITipDialogUtil.dismessDialog();
-                PedometerMainActivity.startActivity(getActivity(), binding.includeStreet.tvStartAddr.getText().toString(), binding.includeStreet.tvEndAddr.getText().toString(), getMvpView().importStreetPoints);
+                PedometerMainActivity.startActivity(getActivity(), getMvpView().runRaceDetailInfo);
             }
         }
         //启动鹰眼失败
@@ -3,6 +3,7 @@ package com.cnlive.moudle.pedometer.ui.fragment;
 import android.os.Bundle;
 import android.os.Handler;
 import android.support.annotation.Nullable;
+import android.util.Log;
 import android.view.View;
 import com.cnlive.libs.base.ui.QMUIFragment;
@@ -55,20 +56,13 @@ public class RunningFinishFragment extends QMUIFragment&lt;RunningFinishFragmentVie
                     getMvpView().initView(runningFinishBean);
                 }
             }
+            UserStepEntity userStepEntity = StepUtil.getUserStepData(getActivity(), CommonInfo.getUserId(getActivity()));
+            if (getMvpView() != null && userStepEntity != null) {
+//            getPresenter().getServerStreetTrace(getActivity(), userStepEntity);
+                getPresenter().queryHistoryTrace(getActivity(), userStepEntity, runningFinishBean);
+            }
         }
-        UserStepEntity userStepEntity = StepUtil.getUserStepData(getActivity(), CommonInfo.getUserId(getActivity()));
-        if (getMvpView() != null && userStepEntity != null) {
-            QMUITipDialogUtil.loadingDialog(getContext(), "正在获取轨迹信息,请稍后", false);
-            getPresenter().getServerStreetTrace(getActivity(), userStepEntity);
-            new Handler().postDelayed(new Runnable() {
-                @Override
-                public void run() {
-                    getPresenter().queryHistoryTrace(getActivity(), userStepEntity, runningFinishBean);
-                }
-            },2000);
-//             StepUtil.clearRunData(context, CommonInfo.getUserId(context));
-//                    CommonInfo.reset(context);
-        }
+
     }
+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.UploadFailDetailFragmentPresenter;
+import com.cnlive.moudle.pedometer.frame.view.UploadFailDetailFragmentView;
+import com.cnlive.moudle.pedometer.sql.entity.FailedEntity;
+import com.example.moudle_pedometer.R;
+import com.example.moudle_pedometer.databinding.FragmentFinishRunMapBinding;
+
+import java.io.Serializable;
+
+/**
+ * 重新 上传详情页面
+ *
+ * @author ShinnyYang
+ */
+public class UploadFailDetailFragment extends QMUIFragment<UploadFailDetailFragmentView, UploadFailDetailFragmentPresenter, FragmentFinishRunMapBinding> {
+    private FailedEntity failedEntity;
+
+    @Override
+    protected int getToolbarId() {
+        return 0;
+    }
+
+    @Override
+    public String getTitle() {
+        return null;
+    }
+
+    @Override
+    protected int getLayoutId() {
+        return R.layout.fragment_finish_run_map;
+    }
+
+    public static UploadFailDetailFragment newInstance(FailedEntity failedEntity) {
+        UploadFailDetailFragment failDetailFragment = new UploadFailDetailFragment();
+        Bundle bundle = new Bundle();
+        bundle.putSerializable("failedEntity", (Serializable) failedEntity);
+        failDetailFragment.setArguments(bundle);
+        return failDetailFragment;
+    }
+
+    @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) {
+            failedEntity = (FailedEntity) getArguments().getSerializable("failedEntity");
+            if (failedEntity != null) {
+                if (getMvpView() != null) {
+                    getMvpView().initView(failedEntity);
+                }
+            }
+        }
+    }
+}
@@ -66,13 +66,17 @@ public class GsonUtil {
      * @return
      */
     public static <T> List<T> jsonToList(String json, Class<T> cls) {
-        Gson gson = new Gson();
-        List<T> list = new ArrayList<T>();
-        JsonArray array = new JsonParser().parse(json).getAsJsonArray();
-        for (final JsonElement elem : array) {
-            list.add(gson.fromJson(elem, cls));
+        try {
+            Gson gson = new Gson();
+            List<T> list = new ArrayList<T>();
+            JsonArray array = new JsonParser().parse(json).getAsJsonArray();
+            for (final JsonElement elem : array) {
+                list.add(gson.fromJson(elem, cls));
+            }
+            return list;
+        } catch (Exception e) {
+            return null;
         }
-        return list;
     }
@@ -89,9 +93,9 @@ public class GsonUtil {
                     new TypeToken<List<Map<String, String>>>() {
                     }.getType());
         }
-        for(int i=0;i<list.size();i++){
-            for(Map.Entry<String, String> entry:list.get(i).entrySet()){
-                if(entry.getValue()==null) {
+        for (int i = 0; i < list.size(); i++) {
+            for (Map.Entry<String, String> entry : list.get(i).entrySet()) {
+                if (entry.getValue() == null) {
                     entry.setValue("");
                 }
             }
@@ -100,7 +104,6 @@ public class GsonUtil {
     }
-
     /**
      * 转成map的
      *
@@ -118,31 +121,31 @@ public class GsonUtil {
     /**
      * 过滤null
+     *
      * @param jsonElement
      * @return
      */
-    public static String StrConver(JsonElement jsonElement){
-        if(jsonElement==null||jsonElement.isJsonNull()||jsonElement.equals("null")){
+    public static String StrConver(JsonElement jsonElement) {
+        if (jsonElement == null || jsonElement.isJsonNull() || jsonElement.equals("null")) {
             return "";
-        }
-        else {
+        } else {
             return jsonElement.getAsString();
         }
     }
-    public static int IntConver(JsonElement jsonElement){
-        if(jsonElement.isJsonNull()){
+
+    public static int IntConver(JsonElement jsonElement) {
+        if (jsonElement.isJsonNull()) {
             return 0;
-        }
-        else {
+        } else {
             return jsonElement.getAsInt();
         }
     }
-    public static JsonObject toJsonObject(String str){
+    public static JsonObject toJsonObject(String str) {
         return new JsonParser().parse(str).getAsJsonObject();
     }
-    public static JsonArray toJsonArray(String str){
+    public static JsonArray toJsonArray(String str) {
         return new JsonParser().parse(str).getAsJsonArray();
     }
@@ -92,7 +92,7 @@ public class MyMapUtil {
             LatLng importLatLng = importPoints.get(i);
             for (int j = index; j < trackPoints.size(); j++) {
                 double distance = DistanceUtil.getDistance(importLatLng, trackPoints.get(j));
-                if (distance < 50) {
+                if (distance < Constant.CHECK_ACCURACY) {
                     importHash.put(i, true);
                     index = j;
                 }
@@ -168,21 +168,23 @@ public class MyMapUtil {
                 Log.e(TAG, "onHistoryTrackCallback: " + response.getMessage());
                 if (StatusCodes.SUCCESS != response.getStatus()) {
 //                    if (response.getStatus() == 14004) {
-                        //给3次重新查询的机会
-                        if (queryNum < 4) {
-                            //重新查询
+                    //给3次重新查询的机会
+                    if (queryNum < 4) {
+                        //重新查询
 //                            new Handler().postDelayed(new Runnable() {
 //                                @Override
 //                                public void run() {
 //                                    //间隔3秒查一次
-                            queryHistoryTrace(context, mClient, entityName, startTime, endTime, callBack);
-                            queryNum++;
+                        queryHistoryTrace(context, mClient, entityName, startTime, endTime, callBack);
+                        queryNum++;
 //                                }
 //                            }, 1000);
-                        } else {
+                    } else {
+                        if (callBack != null) {
                             callBack.success(null);
                         }
+                    }
 //                    } else {
 //                        Toast.makeText(context, "获取轨迹失败!" + response.getMessage() + "," + response.getStatus(), Toast.LENGTH_SHORT).show();
@@ -207,17 +209,17 @@ public class MyMapUtil {
                             }
                         }
                     }
-                }
-                if (total > pageSize * pageIndex) {
-                    historyTrackRequest.setPageIndex(++pageIndex);
-                    queryHistoryTrace(context, mClient, entityName, startTime, endTime, callBack);
-                } else {
-                    if (callBack != null) {
-                        callBack.success(trackPoints);
-                        trackPoints.clear();
+
+                    if (total > pageSize * pageIndex) {
+                        historyTrackRequest.setPageIndex(++pageIndex);
+                        queryHistoryTrace(context, mClient, entityName, startTime, endTime, callBack);
+                    } else {
+                        if (callBack != null) {
+                            callBack.success(trackPoints);
+                            trackPoints.clear();
+                        }
                     }
                 }
-
             }
         };
         //开始查询历史轨迹
@@ -355,9 +357,11 @@ public class MyMapUtil {
             startPoint = points.get(points.size() - 1);
             endPoint = points.get(0);
         }
-
         // 添加起点图标
-        Bitmap startPointBitmap = BitmapUtil.getBitmapFromDp(context, BitmapFactory.decodeResource(context.getResources(), startIconRes), 24, 30);
+        Bitmap startPointBitmap = null;
+        if (null != context.getResources()) {
+            startPointBitmap = BitmapUtil.getBitmapFromDp(context, BitmapFactory.decodeResource(context.getResources(), startIconRes), 24, 30);
+        }
         OverlayOptions startOptions = null;
         if (startPointBitmap != null) {
             startOptions = new MarkerOptions()
+package com.cnlive.moudle.pedometer.utils;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Build;
+import android.provider.Settings;
+import android.support.v4.app.NotificationManagerCompat;
+import android.widget.Toast;
+
+import static android.app.Notification.EXTRA_CHANNEL_ID;
+import static android.provider.Settings.EXTRA_APP_PACKAGE;
+
+public class NotificationUtil {
+    private static boolean isOpen;
+    private static NotificationManagerCompat notificationManagerCompat;
+
+    public static boolean isOpenNotification(Activity activity) {
+        //监测通知权限是否打开
+        notificationManagerCompat = NotificationManagerCompat.from(activity);
+        isOpen = notificationManagerCompat.areNotificationsEnabled();
+        if (!isOpen) {
+            goToSettingNo(activity);
+        }
+        return isOpen;
+    }
+
+    private static void goToSettingNo(Activity activity) {
+        Toast.makeText(activity, "您尚未开启通知权限,无法进行计步", Toast.LENGTH_LONG).show();
+        Intent intent1 = new Intent();
+        try {
+            // 根据isOpened结果，判断是否需要提醒用户跳转AppInfo页面，去打开App通知权限
+            intent1.setAction(Settings.ACTION_APP_NOTIFICATION_SETTINGS);
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                //这种方案适用于 API 26, 即8.0（含8.0）以上可以用
+                intent1.putExtra(EXTRA_APP_PACKAGE, activity.getPackageName());
+                intent1.putExtra(EXTRA_CHANNEL_ID, activity.getApplicationInfo().uid);
+            } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                //这种方案适用于 API21——25，即 5.0——7.1 之间的版本可以使用
+                intent1.putExtra("app_package", activity.getPackageName());
+                intent1.putExtra("app_uid", activity.getApplicationInfo().uid);
+            }
+
+            // 小米6 -MIUI9.6-8.0.0系统，是个特例，通知设置界面只能控制"允许使用通知圆点"——然而这个玩意并没有卵用，我想对雷布斯说：I'm not ok!!!
+            //  if ("MI 6".equals(Build.MODEL)) {
+            //      intent.setAction(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
+            //      Uri uri = Uri.fromParts("package", getPackageName(), null);
+            //      intent.setData(uri);
+            //      // intent.setAction("com.android.settings/.SubSettings");
+            //  }
+            activity.startActivity(intent1);
+        } catch (Exception e) {
+            //其他低版本或者异常情况，走该节点。进入APP设置界面
+            intent1.setAction(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
+            intent1.putExtra("package", activity.getPackageName());
+            activity.startActivity(intent1);
+        }
+    }
+}
@@ -32,6 +32,41 @@ public class StepUtil {
         return UUID.randomUUID().toString().replace("-", "");
     }
+    /**
+     * 删除临时保存数据
+     *
+     * @param context
+     * @param entity
+     */
+    public static void deleteTempSaveFailData(Context context, FailedEntity entity) {
+        DbCore.init(context, dbName);
+        if (entity != null && !TextUtils.isEmpty(entity.getUuid())) {
+            DbCore.getDaoSession().getFailedEntityDao().deleteByKey(entity.getUuid());
+            Log.e(TAG, "deleteTempSaveFailData: 删除临时保存数据");
+        }
+    }
+
+    /**
+     * 获取暂存的失败数据
+     *
+     * @param context
+     * @param uid
+     * @param userStartTime
+     * @return
+     */
+    public static FailedEntity getTempSaveFailData(Context context, String uid, long userStartTime) {
+        DbCore.init(context, dbName);
+        List<FailedEntity> list = DbCore.getDaoSession().getFailedEntityDao().queryBuilder().where(FailedEntityDao.Properties.Uid.eq(uid), FailedEntityDao.Properties.UserStartTime.eq(userStartTime)).list();
+        if (list != null && list.size() > 0) {
+            if (list.get(0) == null) {
+                return null;
+            } else {
+                return list.get(0);
+            }
+        }
+        return null;
+    }
+
     //获取上传失败列表
     public static List<FailedEntity> getFailListData(Context context, String uid) {
         DbCore.init(context, dbName);
@@ -194,7 +229,7 @@ public class StepUtil {
         DbCore.init(context, dbName);
         List<UserStepEntity> list = DbCore.getDaoSession().getUserStepEntityDao().queryBuilder().where(UserStepEntityDao.Properties.UserId.eq(uid)).list();
         if (list != null && list.size() > 0) {
-            Log.e(TAG, "clearRunData: " + list.size());
+            Log.e(TAG, "clearRunData:删除用户逻辑数据 " + list.size());
             DbCore.getDaoSession().getUserStepEntityDao().delete(list.get(0));
             DbCore.getDaoSession().getUserStepEntityDao().detachAll();
         }
 <layout xmlns:android="http://schemas.android.com/apk/res/android">
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -10,19 +11,48 @@
             android:layout_width="match_parent"
             android:layout_height="?attr/qmui_topbar_height" />
-        <com.scwang.smartrefresh.layout.SmartRefreshLayout
-            android:id="@+id/refreshLayout"
+        <FrameLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="#F8F8F8" >
+            android:layout_height="match_parent">
+
+            <com.scwang.smartrefresh.layout.SmartRefreshLayout
+                android:id="@+id/refreshLayout"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="#F8F8F8">
-            <android.support.v7.widget.RecyclerView
-                android:id="@+id/recycler"
+                <android.support.v7.widget.RecyclerView
+                    android:id="@+id/recycler"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent" />
+
+            </com.scwang.smartrefresh.layout.SmartRefreshLayout>
+            <!---->
+            //没有失败记录
+
+            <LinearLayout
+                android:id="@+id/ll_no_fail_tip"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                />
+                android:background="@color/white"
+                android:gravity="center"
+                android:orientation="vertical"
+                android:visibility="gone">
-        </com.scwang.smartrefresh.layout.SmartRefreshLayout>
+                <ImageView
+                    android:layout_width="224dp"
+                    android:layout_height="124dp"
+                    android:background="@drawable/icon_no_fail_line" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="10dp"
+                    android:text="@string/no_fail_line_text_tip"
+                    android:textColor="@color/text_black" />
+            </LinearLayout>
+        </FrameLayout>
     </LinearLayout>
+
 </layout>
@@ -56,7 +56,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="10dp"
-                android:text="首都师范大学操场东门"
+                android:text="--"
                 android:textColor="@color/black"
                 android:textSize="12sp" />
         </LinearLayout>
@@ -93,7 +93,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="10dp"
-                android:text="首都师范大学操场东门"
+                android:text="--"
                 android:textColor="@color/black"
                 android:textSize="12sp" />
         </LinearLayout>
@@ -128,7 +128,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="10dp"
                     android:layout_marginTop="5dp"
-                    android:text="00:27:23"
+                    android:text="--"
                     android:textColor="@color/text_black"
                     android:textSize="18sp"
                     android:textStyle="bold" />
@@ -170,7 +170,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="10dp"
-                android:text="路线完成"
+                android:text="--"
                 android:textColor="@color/text_gray"
                 android:textSize="11sp" />
         </LinearLayout>
@@ -38,7 +38,7 @@
                 android:id="@+id/tv_step"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="1233"
+                android:text="--"
                 android:textColor="@color/green_round"
                 android:textSize="28sp"
                 android:textStyle="bold" />
@@ -8,7 +8,7 @@
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="170dp"
+            android:layout_height="190dp"
             android:layout_marginTop="30dp"
             android:background="@drawable/shape_10dp_white_raduis_bg"
             android:orientation="vertical">
@@ -19,7 +19,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="80dp"
                 android:layout_marginTop="10dp"
-                android:text="用户昵称"
+                android:text="--"
                 android:textColor="@color/text_black"
                 android:textSize="13sp" />
             <!---->
@@ -40,7 +40,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="15dp"
                         android:layout_marginTop="15dp"
-                        android:text="奥森公园南路"
+                        android:text="--"
                         android:textColor="@color/text_black"
                         android:textSize="15sp" />
@@ -50,7 +50,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="15dp"
                         android:layout_marginTop="5dp"
-                        android:text="2019/06/10 9:51"
+                        android:text="--"
                         android:textColor="@color/text_gray"
                         android:textSize="10sp" />
                 </LinearLayout>
@@ -66,7 +66,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginRight="10dp"
-                        android:text="1.53"
+                        android:text="--"
                         android:textColor="@color/text_black"
                         android:textSize="45sp"
                         android:textStyle="bold" />
@@ -104,7 +104,7 @@
                         android:id="@+id/tv_speed"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="34'33''"
+                        android:text="--"
                         android:textColor="@color/text_black"
                         android:textSize="20sp"
                         android:textStyle="bold" />
@@ -129,7 +129,7 @@
                         android:id="@+id/tv_timer"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="00:00:00"
+                        android:text="--"
                         android:textColor="@color/text_black"
                         android:textSize="20sp"
                         android:textStyle="bold" />
@@ -8,5 +8,7 @@
     <item name="fragment_finish_run_map" type="id" />
     <!--路径工具-->
     <item name="fragment_start_collect_trace" type="id" />
+    <!--上传失败-->
+    <item name="fragment_upload_fail" type="id" />
 </resources>
@@ -69,7 +69,7 @@
     <string name="loc_gps_accuracy_mid">GPS信号质量中等</string>
     <string name="loc_gps_accuracy_good">GPS信号质量好</string>
     <string name="layout_street_active_type">活动类型</string>
-    <string name="open_gps_tip">您尚未开启GPS,为确保定位准确性,请您打开后使用!</string>
+    <string name="open_gps_tip">请开启GPS饼将其设置为高精度模式!</string>
     <!---->
     <!--网络请求-->
     <string name="retry">重试</string>
@@ -88,6 +88,7 @@
     <string name="add_path">添加轨迹</string>
     <string name="addpath">绑定轨迹</string>
     <string name="delect">删除</string>
+    <string name="no_fail_line_text_tip">没有上传失败的路线哦</string>
 </resources>