1.更改计步相关逻辑

杨帅
1 parent 92bf6c51
Showing 21 changed files with 607 additions and 260 deletions
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/service/CollStepService.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/fragment/CollRunningMapFragment.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/commonInfo/CommonInfo.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/RunningMapFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/service/KeepLiveService.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/service/StepService.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/sql/dao/UserStepEntityDao.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/sql/entity/UserStepEntity.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/RunLineActivity.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/RunMainFragment.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/RunRaceDetailFragment.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/RunningMapFragment.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/utils/StepUtil.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/utils/TimeUtil.java
moudle_pedometer/src/main/res/layout/dialog_tip.xml
moudle_pedometer/src/main/res/layout/fragment_finish_run_map.xml
moudle_pedometer/src/main/res/layout/fragment_run_main.xml
@@ -348,9 +348,9 @@ public class CollStepService extends Service implements SensorEventListener {
         //开启轨迹服务
         if (mClient != null) {
             mClient.startTrace(mTrace, traceListener);
-            long stepStartTime = CommonInfo.getStepStartTime(getApplicationContext());
+            long stepStartTime = CollCommonInfo.getStepStartTime(getApplicationContext());
             if (stepStartTime == 0) {
-                CommonInfo.setStepStartTime(getApplicationContext(), TimeUtil.getCurrentTime());
+                CollCommonInfo.setStepStartTime(getApplicationContext(), TimeUtil.getNowTimeStamp());
             }
         }
@@ -15,6 +15,7 @@ import com.cnlive.libs.base.ui.QMUIFragment;
 import com.cnlive.libs.base.util.StatusBarUtil2;
 import com.cnlive.moudle.collectionTrace.frame.presenter.CollRunningMapFragmentPresenter;
 import com.cnlive.moudle.collectionTrace.frame.view.CollRunningMapFragmentView;
+import com.cnlive.moudle.pedometer.commonInfo.CollCommonInfo;
 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.model.Constant;
 import com.cnlive.moudle.pedometer.model.MessageEvent;
@@ -104,7 +105,7 @@ public class CollRunningMapFragment extends QMUIFragment&lt;CollRunningMapFragmentV
         }
         //开始进行历史轨迹查询
         if (getPresenter() != null && !TextUtils.isEmpty(StepService.entityName)) {
-            long stepStartTime = CommonInfo.getStepStartTime(getActivity());
+            long stepStartTime = CollCommonInfo.getStepStartTime(getActivity());
             Log.e(TAG, "onViewCreated: 时间"+stepStartTime );
             long startTime = 0;
             if (stepStartTime != 0) {
@@ -112,7 +113,7 @@ public class CollRunningMapFragment extends QMUIFragment&lt;CollRunningMapFragmentV
             } else {
                 startTime = (int) (System.currentTimeMillis() / 1000 -12 * 60 * 60);
             }
-            long current = TimeUtil.getCurrentTime();
+            long current = TimeUtil.getNowTimeStamp();
 //            long startTime = current - hour * 3600 * 1000 - minute * 60 * 1000 - second * 1000;
             long endTime = current;
 //            Log.e(TAG, "onViewCreated: " + "hour:" + hour + ",minute" + minute + ",second:" + second);
@@ -7,23 +7,23 @@ import com.cnlive.moudle.pedometer.utils.TimeUtil;
 public class CommonInfo {
-    /**
-     * 设置计步时间
-     *
-     * @param context
-     */
-    public static void setStepStartTime(Context context, long currentTime) {
-        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).putLong("stepStartTime", currentTime);
-    }
-
-    /**
-     * 获取计步时间
-     *
-     * @param context
-     */
-    public static long getStepStartTime(Context context) {
-        return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getLong("stepStartTime", 0);
-    }
+//    /**
+//     * 设置计步时间
+//     *
+//     * @param context
+//     */
+//    public static void setStepStartTime(Context context, long currentTime) {
+//        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).putLong("stepStartTime", currentTime);
+//    }
+//
+//    /**
+//     * 获取计步时间
+//     *
+//     * @param context
+//     */
+//    public static long getStepStartTime(Context context) {
+//        return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getLong("stepStartTime", 0);
+//    }
     /**
      * 设置计步完成时间
@@ -209,8 +209,8 @@ public class CommonInfo {
      *
      * @param context
      */
-    public static void getUserNickName(Context context) {
-        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getString("RunUserNickName", "");
+    public static String getUserNickName(Context context) {
+        return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getString("RunUserNickName", "");
     }
@@ -229,28 +229,27 @@ public class CommonInfo {
      *
      * @param context
      */
-    public static void getUserFaceUrl(Context context) {
-        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getString("RunUserFaceUrl", "");
+    public static String getUserFaceUrl(Context context) {
+        return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getString("RunUserFaceUrl", "");
     }
+
     /*重置
      * @param context
      */
     public static void reset(Context context) {
         MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey("writeUserStep");
-        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey("stepStartTime");
         MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey("runStepService");
-        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey("stepStartTime");
         MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey("KeepAliveService");
         MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey("RunBaiduTraceService");
         MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey("streetId");
         MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey("FirstStepSendTraceTip");
         MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey("FenceId");
-        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey("stepEndTime");
     }
+
 }
@@ -33,6 +33,7 @@ import com.cnlive.moudle.pedometer.ui.activity.RunningFinishActivity;
 import com.cnlive.moudle.pedometer.ui.activity.RunningMapActivity;
 import com.cnlive.moudle.pedometer.ui.fragment.RunMainFragment;
 import com.cnlive.moudle.pedometer.ui.widget.SelectDialog;
+import com.cnlive.moudle.pedometer.ui.widget.TipDialog;
 import com.cnlive.moudle.pedometer.utils.ButtonAnimUtil;
 import com.cnlive.moudle.pedometer.utils.MyMapUtil;
 import com.cnlive.moudle.pedometer.utils.MySpHelper;
@@ -115,11 +116,8 @@ public class RunMainFragmentView implements MvpView {
      * 初始化相关视图
      */
     public void initView() {
-
+        uid = CommonInfo.getUserId(getContext());
         UserStepEntity userStepEntity = StepUtil.getUserStepData(getContext(), uid);
-        if (userStepEntity != null) {
-            StepUtil.clearRunData(getContext(), CommonInfo.getUserId(getContext()));
-        }
         initLocationClient();
         fragment.binding.llRunMainRoot.setVisibility(View.GONE);
         ButtonAnimUtil.startAnimation(fragment.binding.llStartTimeTip, false);
@@ -180,40 +178,38 @@ public class RunMainFragmentView implements MvpView {
             }
         });
-//        boolean isRunStep = CommonInfo.getIsRunStepService(getContext());
         //当前用户已经在运动
-//        if (!isRunStep) {
-        //依次倒计时
-        handler.postDelayed(runnable, 1000);
-//        } else {
-//            //隐藏计时界面
-//            fragment.binding.llStartTimeTip.setVisibility(View.GONE);
-//            fragment.binding.llRunMainRoot.setVisibility(View.VISIBLE);
-//            new Handler().postDelayed(new Runnable() {
-//                @Override
-//                public void run() {
-//                    //开始计时
-//                    if (firstTimeFlag) {
-//                        firstTimeFlag = false;
-//                        if (userStepEntity != null) {
-//                            if ((userStepEntity.getPauseTimeStamp() != 0) && (userStepEntity.getRecordTime() != 0)) {
-//                                fragment.binding.chronometer.setBase(userStepEntity.getPauseTimeStamp() + (SystemClock.elapsedRealtime() - userStepEntity.getRecordTime()));
-//                            } else {
-//                                fragment.binding.chronometer.setFormat("00:00:01");
-//                                fragment.binding.chronometer.setBase(SystemClock.elapsedRealtime());
-//                            }
-//                            //设置步数
-//                            if (!TextUtils.isEmpty(userStepEntity.getStepCount())) {
-//                                fragment.binding.tvStepCount.setText(userStepEntity.getStepCount());
-//                            }
-//                        }
-//                        fragment.binding.chronometer.start();
-//                    }
-//                }
-//            }, 10);
-//            //开启计步服务
-//            startStepService(getContext(), uid);
-//        }
+        if (userStepEntity == null) {
+            //依次倒计时
+            handler.postDelayed(runnable, 1000);
+        } else {
+            //隐藏计时界面
+            fragment.binding.llStartTimeTip.setVisibility(View.GONE);
+            fragment.binding.llRunMainRoot.setVisibility(View.VISIBLE);
+            new Handler().postDelayed(new Runnable() {
+                @Override
+                public void run() {
+                    //开始计时
+                    if (firstTimeFlag) {
+                        firstTimeFlag = false;
+                        if (userStepEntity != null) {
+                            if ((userStepEntity.getPauseTimeStamp() != 0) && (userStepEntity.getRecordTime() != 0)) {
+                                fragment.binding.chronometer.setBase(userStepEntity.getPauseTimeStamp() + (SystemClock.elapsedRealtime() - userStepEntity.getRecordTime()));
+                            } else {
+                                fragment.binding.chronometer.setFormat("00:00:01");
+                                fragment.binding.chronometer.setBase(SystemClock.elapsedRealtime());
+                            }
+                            //设置步数
+                            if (!TextUtils.isEmpty(userStepEntity.getStepCount())) {
+                                fragment.binding.tvStepCount.setText(userStepEntity.getStepCount());
+                            }
+                        }
+                        fragment.binding.chronometer.start();
+                    }
+                }
+            }, 10);
+
+        }
         //设置继续按钮,缩放效果
         fragment.binding.flContinue.setOnTouchListener(new View.OnTouchListener() {
@@ -246,20 +242,19 @@ public class RunMainFragmentView implements MvpView {
                     StepService.mClient.startTrace(StepService.mTrace, StepService.traceListener);
                 }
                 needWriteDataFlag = true;
+                //todo 第二阶段使用
                 //将当前计时器时间戳写入数据库
-                setSQLPauseTime(uid);
+                //   setSQLPauseTime(uid);
                 //为了点击时可以显示缩放动画,这里延迟一个动画时间进行(包括放大和缩小)
                 handler.postDelayed(new Runnable() {
                     @Override
                     public void run() {
-                        //
                         //隐藏两个按钮
                         fragment.binding.flStopTip.setVisibility(View.INVISIBLE);
                         fragment.binding.llTwoBottomButton.setVisibility(View.GONE);
                         ButtonAnimUtil.setViewShowZoomIn(fragment.binding.llPause);
                         //显示暂停按钮
                         fragment.binding.llPause.setVisibility(View.VISIBLE);
-                        //
                     }
                 }, ButtonAnimUtil.DEFAULT_ZOOM_DURATION * 2);
                 //继续计步
@@ -269,8 +264,6 @@ public class RunMainFragmentView implements MvpView {
                     fragment.binding.chronometer.setBase(fragment.binding.chronometer.getBase() + (SystemClock.elapsedRealtime() - mRecordTime));
                 }
                 fragment.binding.chronometer.start();
-
-
             }
         });
         //设置停止按钮缩放特效
@@ -308,17 +301,14 @@ public class RunMainFragmentView implements MvpView {
                                             SelectDialog selectDialog = new SelectDialog(fragment.getActivity(), "确定结束运动吗?", "确定", new SelectDialog.DialogInterface() {
                                                 @Override
                                                 public void onClick(SelectDialog dialog) {
-                                                    CommonInfo.setIsRunKeepAliveService(getContext(), false);
-                                                    CommonInfo.setIsWriteUserStep(getContext(), false);
-                                                    //设置运动结束时间
+                                                    //设置状态标志位
+                                                    setStopStartFlag();
+                                                    //设置运动结束时间戳
+                                                    StepUtil.setUserFinishTimeStamp(getContext(), uid);
                                                     CommonInfo.setStepEndTime(getContext(), TimeUtil.getNowTimeStamp());
                                                     fragment.binding.cpCurrent.setVisibility(View.GONE);
                                                     ButtonAnimUtil.setViewDefault(fragment.binding.flStop);
                                                     dialog.dismiss();
-                                                    if (StepService.mClient != null) {
-                                                        StepService.mClient.stopGather(StepService.traceListener);
-                                                    }
-                                                    fragment.getActivity().stopService(new Intent(fragment.getActivity(), StepService.class));
                                                     RunningFinishBean runningFinishBean = new RunningFinishBean();
                                                     runningFinishBean.setStartPoint("开始地点");
                                                     runningFinishBean.setEndPoint("结束地点");
@@ -396,17 +386,43 @@ public class RunMainFragmentView implements MvpView {
                         fragment.binding.llPause.setVisibility(View.GONE);
                     }
                 }, ButtonAnimUtil.HIDE_VIEW_ZOOM_DURATION);
-                //显示继续按钮
-                fragment.binding.llTwoBottomButton.setVisibility(View.VISIBLE);
-                ButtonAnimUtil.setViewShowZoomIn(fragment.binding.flContinue);
-                ButtonAnimUtil.setViewShowZoomIn(fragment.binding.flStop);
-                //停止计时
-                fragment.binding.chronometer.stop();
-                mRecordTime = SystemClock.elapsedRealtime();
-                //暂停计步
-                EventBus.getDefault().post(new MessageEvent(Constant.SERVICE_STEP_COUNT_PAUSE, ""));
-                //重置速度
-//                resetSpeed();
+
+                //获取当前用户暂停次数
+                int userPauseCount = StepUtil.getUserPauseCount(getContext(), uid);
+                if (userPauseCount != -1) {
+                    if (userPauseCount > 1) {
+                        //设置停止标志位,关闭相关服务
+                        setStopStartFlag();
+                        //清除数据库
+                        StepUtil.clearRunData(getContext(), CommonInfo.getUserId(getContext()));
+                        //进行提示
+                        TipDialog tipDialog = new TipDialog(getContext(), getContext().getString(R.string.more_than_pause_count_tip), "我知道了", R.color.green_round, new TipDialog.DialogInterface() {
+                            @Override
+                            public void onClick(TipDialog dialog) {
+                                //关闭当前对话框
+                                dialog.dismiss();
+                                //关闭当前页面
+                                if (getContext() == null) {
+                                    return;
+                                }
+                                fragment.getActivity().finish();
+                            }
+                        });
+                        tipDialog.setCanceledOnTouchOutside(false);
+                        tipDialog.setCancelable(false);
+                        tipDialog.show();
+
+                    }
+                    //显示继续按钮
+                    fragment.binding.llTwoBottomButton.setVisibility(View.VISIBLE);
+                    ButtonAnimUtil.setViewShowZoomIn(fragment.binding.flContinue);
+                    ButtonAnimUtil.setViewShowZoomIn(fragment.binding.flStop);
+                    //停止计时
+                    fragment.binding.chronometer.stop();
+                    mRecordTime = SystemClock.elapsedRealtime();
+                    //暂停计步
+                    EventBus.getDefault().post(new MessageEvent(Constant.SERVICE_STEP_COUNT_PAUSE, ""));
+                }
             }
         });
         //gps点击事件
@@ -431,6 +447,16 @@ public class RunMainFragmentView implements MvpView {
                 RunningMapActivity.startActivity(fragment.getActivity(), runningMapBean);
             }
         });
+        //返回按钮点击事件
+        fragment.binding.ivBack.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (getContext() == null) {
+                    return;
+                }
+                fragment.getActivity().finish();
+            }
+        });
         fragment.binding.rlClose.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -450,6 +476,8 @@ public class RunMainFragmentView implements MvpView {
                     userStepEntity.setPauseTimeStamp(fragment.binding.chronometer.getBase());
                     //设置当前暂停的时间戳
                     userStepEntity.setRecordTime(SystemClock.elapsedRealtime());
+                    //设置暂停次数
+                    userStepEntity.setPauseCount(userStepEntity.getPauseCount() + 1);
                     //更新数据
                     StepUtil.updateStepData(fragment.getActivity(), userStepEntity);
                 }
@@ -457,6 +485,20 @@ public class RunMainFragmentView implements MvpView {
         }
     }
+    public void setFragmentPauseTime(String id) {
+        if (!TextUtils.isEmpty(id)) {
+            UserStepEntity userStepEntity = StepUtil.getUserStepData(fragment.getActivity(), uid);
+            if (userStepEntity != null) {
+                userStepEntity.setPauseTimeStamp(fragment.binding.chronometer.getBase());
+                userStepEntity.setRecordTime(SystemClock.elapsedRealtime());
+                //设置当前暂停的时间戳
+                userStepEntity.setUserPauseTimeStamp(TimeUtil.getNowTimeStamp());
+                //更新数据
+                StepUtil.updateStepData(fragment.getActivity(), userStepEntity);
+            }
+        }
+    }
+
     /**
      * 更新行走距离
@@ -551,6 +593,20 @@ public class RunMainFragmentView implements MvpView {
                 }
             }
         }
+
+    }
+
+    /**
+     * 设置停止状态标志位
+     */
+    private void setStopStartFlag() {
+        CommonInfo.setTsRunBaiduTraceService(getContext(), false);
+        CommonInfo.setIsRunKeepAliveService(getContext(), false);
+        CommonInfo.setIsWriteUserStep(getContext(), false);
+        if (StepService.mClient != null) {
+            StepService.mClient.stopGather(StepService.traceListener);
+        }
+        fragment.getActivity().stopService(new Intent(fragment.getActivity(), StepService.class));
     }
     public void onDestroy() {
@@ -50,17 +50,22 @@ import com.cnlive.moudle.pedometer.commonInfo.CollCommonInfo;
 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 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.UserStepEntity;
 import com.cnlive.moudle.pedometer.ui.activity.PedometerMainActivity;
 import com.cnlive.moudle.pedometer.ui.activity.RaceRecordActivity;
 import com.cnlive.moudle.pedometer.ui.activity.RegistrationInfoActivity;
 import com.cnlive.moudle.pedometer.ui.activity.TakePartActivity;
 import com.cnlive.moudle.pedometer.ui.fragment.RunRaceDetailFragment;
+import com.cnlive.moudle.pedometer.ui.widget.SelectDialog;
 import com.cnlive.moudle.pedometer.ui.widget.TipDialog;
 import com.cnlive.moudle.pedometer.utils.BitmapUtil;
 import com.cnlive.moudle.pedometer.utils.GsonUtil;
 import com.cnlive.moudle.pedometer.utils.MyMapUtil;
 import com.cnlive.moudle.pedometer.utils.QMUITipDialogUtil;
 import com.cnlive.moudle.pedometer.utils.ScreenUtil;
+import com.cnlive.moudle.pedometer.utils.ServiceUtils;
+import com.cnlive.moudle.pedometer.utils.StepUtil;
 import com.cnlive.moudle.pedometer.utils.TimeUtil;
 import com.cnlive.strike.application.GlideApp;
 import com.example.moudle_pedometer.R;
@@ -111,6 +116,8 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
     private LatLng startLatLng = new LatLng(39.934733, 116.308646);//起始点
     private List<LatLng> trackPoints;
     private RunRaceDetailInfo runRaceDetailInfo;
+    private UserStepEntity userStepEntity;
+    private boolean isDifferentStreet = false;
     public RunRaceDetailFragmentView(RunRaceDetailFragment fragment) {
         this.fragment = fragment;
@@ -313,6 +320,7 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
             fragment.binding.rlScrollViewStartBtn.setTag("1");
             fragment.binding.tvRunNow.setText("现在开始");
             fragment.binding.tvGoTip.setVisibility(View.VISIBLE);
+            checkStartBtnState();
         } else {
             fragment.binding.rlScrollViewStartBtn.setTag("0");
             fragment.binding.tvRunNow.setText("立即报名");
@@ -373,9 +381,44 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
                 //立即报名
                 if ("0".equals(fragment.binding.rlScrollViewStartBtn.getTag())) {
                     RegistrationInfoActivity.newInstance(fragment.getActivity());
-                } else {
+                }
+                //现在开始
+                else if ("1".equals(fragment.binding.rlScrollViewStartBtn.getTag())) {
                     startStepService(getContext());
                 }
+                //继续运动
+                else if ("2".equals(fragment.binding.rlScrollViewStartBtn.getTag())) {
+                    if (!isDifferentStreet) {
+                        checkBaiduServiceState();
+                    }
+
+                    //赛事id不同
+                    else {
+                        SelectDialog selectDialog = new SelectDialog(getContext(), "您正在进行另一赛事,是否回到当前进行赛事?", "否", new SelectDialog.DialogInterface() {
+                            @Override
+                            public void onClick(SelectDialog dialog) {
+                                dialog.dismiss();
+                                //清空上次保存数据
+                                StepUtil.clearRunData(getContext(), CommonInfo.getUserId(getContext()));
+                                //停止服务
+                                stopStepService();
+                                //更改当前按钮
+                                fragment.binding.tvRunNow.setText("立即开始");
+                                fragment.binding.rlScrollViewStartBtn.setTag("1");
+
+                            }
+                        }, "是", new SelectDialog.DialogInterface() {
+                            @Override
+                            public void onClick(SelectDialog dialog) {
+                                dialog.dismiss();
+                                checkBaiduServiceState();
+                            }
+                        });
+                        selectDialog.setCanceledOnTouchOutside(false);
+                        selectDialog.setCancelable(false);
+                        selectDialog.show();
+                    }
+                }
             }
         });
         //查看全部成绩点击事件
@@ -405,6 +448,32 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
         });
     }
+    private void checkBaiduServiceState() {
+        boolean isRunBaidu = CommonInfo.getIsRunBaiduTraceService(getContext());
+        if (isRunBaidu) {
+            //判断百度服务是否运行
+            if (!ServiceUtils.isServiceRunning(getContext(), "com.baidu.trace.LBSTraceService")) {
+                stopStepService();
+                startStepService(getContext());
+            } else {
+                PedometerMainActivity.startActivity(fragment.getActivity());
+            }
+        } else {
+            PedometerMainActivity.startActivity(fragment.getActivity());
+        }
+    }
+
+    private void stopStepService() {
+        CommonInfo.setTsRunBaiduTraceService(getContext(), false);
+        CommonInfo.setIsRunKeepAliveService(getContext(), false);
+        CommonInfo.setIsWriteUserStep(getContext(), false);
+        CommonInfo.setIsFirstStepSendTraceTip(getContext(), true);
+        if (StepService.mClient != null) {
+            StepService.mClient.stopGather(StepService.traceListener);
+        }
+        fragment.getActivity().stopService(new Intent(fragment.getActivity(), StepService.class));
+    }
+
     public void initMap() {
         //隐藏底部滑动卡片
         fragment.binding.slidingLayout.setPanelState(SlidingUpPanelLayout.PanelState.HIDDEN);
@@ -717,9 +786,50 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
     }
     public void onResume() {
+        if (getContext() == null) {
+            return;
+        }
         if (mMapView != null) {
             mMapView.onResume();
         }
+
+    }
+
+    public void checkStartBtnState() {
+        //判断是否有进行中的赛事
+        userStepEntity = StepUtil.getUserStepData(getContext(), CommonInfo.getUserId(getContext()));
+        Log.e(TAG, "checkStartBtnState: " + userStepEntity);
+        if (userStepEntity != null) {
+            //判断赛事id是否一致
+            String currentStreetId = CommonInfo.getStreetId(getContext());
+            //数据库保存的id
+            String dbStreetId = userStepEntity.getStreetId();
+            //获取当前时间戳
+            long currnetTime = TimeUtil.getNowTimeStamp();
+            //获取用户暂停的时间戳
+            long userPauseTime = userStepEntity.getUserPauseTimeStamp();
+            //判断时间是否小于9小时
+            if ((currnetTime - userPauseTime) <= (9 * 60 * 60 * 1000)) {
+                fragment.binding.tvRunNow.setText("继续运动");
+                fragment.binding.rlScrollViewStartBtn.setTag("2");
+            } else {
+                fragment.binding.tvRunNow.setText("立即开始");
+                fragment.binding.rlScrollViewStartBtn.setTag("1");
+            }
+
+            if (currentStreetId.equals(dbStreetId)) {
+                isDifferentStreet = false;
+            }
+            //当前id与赛事id不一样
+            else {
+                isDifferentStreet = true;
+            }
+
+        } else {
+            fragment.binding.tvRunNow.setText("立即开始");
+            fragment.binding.rlScrollViewStartBtn.setTag("1");
+        }
+
     }
     public void onPause() {
@@ -862,9 +972,6 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
     public void startStepService(Context context) {
         CommonInfo.setIsFirstStepSendTraceTip(getContext(), true);
         QMUITipDialogUtil.loadingDialog(getContext(), "请稍后", false);
-        if (CommonInfo.getStepStartTime(context) == 0) {
-            CommonInfo.setStepStartTime(context, TimeUtil.getNowTimeStamp());
-        }
         CommonInfo.setIsRunKeepAliveService(context, true);
         CommonInfo.setIsRunStepService(context, true);
         CommonInfo.setTsRunBaiduTraceService(context, true);
@@ -883,4 +990,6 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
         fragment.binding.tvRunNow.setText("现在开始");
         fragment.binding.tvGoTip.setVisibility(View.VISIBLE);
     }
+
+
 }
 package com.cnlive.moudle.pedometer.frame.view;
 import android.content.Context;
+import android.text.TextUtils;
+import android.util.Log;
 import android.view.View;
+import com.bumptech.glide.Glide;
+import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.model.RunningFinishBean;
 import com.cnlive.moudle.pedometer.ui.fragment.RunningFinishFragment;
 import com.cnlive.moudle.pedometer.ui.fragment.RunningMapFragment;
 import com.hannesdorfmann.mosby3.mvp.MvpView;
+
 public class RunningFinishFragmentView implements MvpView {
+    private final String TAG = "RunningFinishView";
     private RunningFinishFragment fragment;
     public RunningFinishFragmentView(RunningFinishFragment fragment) {
@@ -20,16 +26,34 @@ public class RunningFinishFragmentView implements MvpView {
     }
     public void initView(RunningFinishBean runningFinishBean) {
+        //设置用户头像
+        String faceUrl = CommonInfo.getUserFaceUrl(getContext());
+        if (!TextUtils.isEmpty(faceUrl)) {
+            Glide.with(getContext()).load(faceUrl).into(fragment.binding.includeFinishUserInfo.qmIvIcon);
+        }
+        //设置用户昵称
+        String nickName = CommonInfo.getUserNickName(getContext());
+        if (!TextUtils.isEmpty(nickName)) {
+            fragment.binding.includeFinishUserInfo.tvUserNickName.setText(nickName);
+        }
         //设置距离
         fragment.binding.includeFinishUserInfo.tvDistance.setText(runningFinishBean.getRunDistance());
         //设置配速
-        fragment.binding.includeFinishUserInfo.tvSpeed.setText(runningFinishBean.getSpeed());
+        if ("--".equals(runningFinishBean.getSpeed())) {
+            fragment.binding.includeFinishUserInfo.tvSpeed.setText("0");
+        } else {
+            fragment.binding.includeFinishUserInfo.tvSpeed.setText(runningFinishBean.getSpeed());
+        }
         //设置用时
         fragment.binding.includeFinishUserInfo.tvTimer.setText(runningFinishBean.getTime());
         //设置日期
         fragment.binding.includeFinishUserInfo.tvDate.setText(runningFinishBean.getDate());
         //设置步数
-        fragment.binding.includeFinishStep.tvStep.setText(runningFinishBean.getStep());
+        if ("--".equals(runningFinishBean.getStep())) {
+            fragment.binding.includeFinishStep.tvStep.setText("0");
+        } else {
+            fragment.binding.includeFinishStep.tvStep.setText(runningFinishBean.getStep());
+        }
         //设置起点位置
         fragment.binding.includeFinishRunRoute.tvStartPoint.setText(runningFinishBean.getStartPoint());
         //设置终点位置
@@ -48,7 +48,7 @@ import java.util.HashMap;
 import java.util.List;
 public class RunningMapFragmentView implements MvpView, SensorEventListener {
-    private static final String TAG = "CollRunningMapFragmentView";
+    private static final String TAG = "RunningMapFragmentView";
     private RunningMapFragment fragment;
     public BaiduMap baiduMap;
     private MapView mMapView;
@@ -180,7 +180,6 @@ public class RunningMapFragmentView implements MvpView, SensorEventListener {
         fragment.binding.flBack.setOnTouchListener(new View.OnTouchListener() {
             @Override
             public boolean onTouch(View view, MotionEvent motionEvent) {
-                Log.e(TAG, "onTouch: " + motionEvent.getAction());
                 if (motionEvent.getAction() == MotionEvent.ACTION_DOWN) {
                     ButtonAnimUtil.setViewZoomIn(fragment.binding.flBack);
                 } else if (motionEvent.getAction() == MotionEvent.ACTION_UP) {
@@ -44,7 +44,7 @@ public class KeepLiveService extends Service implements MediaPlayer.OnCompletion
     public static boolean isKeepService = true;
     public static KeepLiveService instance;
     private int startId;
-    private final String TAG = "CollKeepLiveService";
+    private final String TAG = "KeepLiveService";
     private Handler handler;
     private Runnable runnable;
@@ -108,7 +108,7 @@ public class KeepLiveService extends Service implements MediaPlayer.OnCompletion
 //        intentFilter.addAction(Intent.ACTION_TIME_CHANGED);
 //        intentFilter.addAction(Intent.ACTION_POWER_CONNECTED);
 //        intentFilter.addAction(Intent.ACTION_POWER_DISCONNECTED);
-        intentFilter.addAction("com.cnlive.strike.receiver.CollServiceReceiver");
+        intentFilter.addAction("com.cnlive.strike.receiver.ServiceReceiver");
         intentFilter.addAction("close.KeepService");
         registerReceiver(myReceiver, intentFilter);
     }
@@ -136,7 +136,7 @@ public class KeepLiveService extends Service implements MediaPlayer.OnCompletion
         //判断是否运行计步服务
         boolean isRunStepService = CommonInfo.getIsRunStepService(getApplicationContext());
         if (isRunStepService) {
-            if (!ServiceUtils.isServiceRunning(getApplicationContext(), "com.cnlive.moudle.pedometer.service.CollStepService")) {
+            if (!ServiceUtils.isServiceRunning(getApplicationContext(), "com.cnlive.moudle.pedometer.service.StepService")) {
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                     startForegroundService(new Intent(getApplicationContext(), StepService.class));
                 } else {
@@ -37,18 +37,16 @@ import com.baidu.trace.model.LocationMode;
 import com.baidu.trace.model.OnTraceListener;
 import com.baidu.trace.model.PushMessage;
 import com.baidu.trace.model.StatusCodes;
-import com.cnlive.moudle.pedometer.commonInfo.CollCommonInfo;
 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.model.Constant;
 import com.cnlive.moudle.pedometer.model.MessageEvent;
 import com.cnlive.moudle.pedometer.model.step.StepCount;
 import com.cnlive.moudle.pedometer.model.step.StepValuePassListener;
-import com.cnlive.moudle.pedometer.sql.dao.UserStepEntityDao;
 import com.cnlive.moudle.pedometer.sql.db.DbCore;
 import com.cnlive.moudle.pedometer.sql.entity.UserStepEntity;
 import com.cnlive.moudle.pedometer.ui.activity.PedometerMainActivity;
-import com.cnlive.moudle.pedometer.utils.MySpHelper;
 import com.cnlive.moudle.pedometer.utils.ServiceUtils;
+import com.cnlive.moudle.pedometer.utils.StepUtil;
 import com.cnlive.moudle.pedometer.utils.TimeUtil;
 import com.example.moudle_pedometer.R;
@@ -58,15 +56,11 @@ import org.greenrobot.eventbus.ThreadMode;
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import java.util.List;
-import java.util.UUID;
 public class StepService extends Service implements SensorEventListener {
-    private String TAG = "CollStepService";
-    public static boolean isKeep = true;
-
+    private String TAG = "StepService";
     /**
      * 通知栏相关
      */
@@ -353,9 +347,10 @@ public class StepService extends Service implements SensorEventListener {
         //开启轨迹服务
         if (mClient != null) {
             mClient.startTrace(mTrace, traceListener);
-            long stepStartTime = CommonInfo.getStepStartTime(getApplicationContext());
-            if (stepStartTime == 0) {
-                CommonInfo.setStepStartTime(getApplicationContext(), TimeUtil.getCurrentTime());
+            //设置用户开始时间以及赛事ID
+            UserStepEntity userStepEntity = StepUtil.getUserStepData(getApplicationContext(), CommonInfo.getUserId(getApplicationContext()));
+            if (userStepEntity == null) {
+                StepUtil.setStepStartData(getApplicationContext(), userId, TimeUtil.getNowTimeStamp(), CommonInfo.getStreetId(getApplicationContext()));
             }
         }
@@ -548,17 +543,13 @@ public class StepService extends Service implements SensorEventListener {
             return;
         }
         //获取当天的数据，用于展示 CURRENT_DATE
-        List<UserStepEntity> list = DbCore.getDaoSession().getUserStepEntityDao().queryBuilder().where(UserStepEntityDao.Properties.UserId.eq(userId), UserStepEntityDao.Properties.Date.eq(CURRENT_DATE)).list();
-        if (list == null) {
-            return;
-        }
-        if (list.size() == 0 || list.isEmpty()) {
+        UserStepEntity userStepEntity = StepUtil.getUserStepData(getApplicationContext(), CommonInfo.getUserId(getApplicationContext()));
+        if (userStepEntity == null) {
             CURRENT_STEP = 0;
-        } else if (list.size() == 1) {
-            Log.e(TAG, "StepData=" + list.get(0).toString());
-            CURRENT_STEP = Integer.parseInt(list.get(0).getStepCount());
         } else {
-            Log.e(TAG, "出错了！");
+            if (userStepEntity.getStepCount() != null) {
+                CURRENT_STEP = Integer.parseInt(userStepEntity.getStepCount());
+            }
         }
         if (mStepCount != null) {
             mStepCount.setSteps(CURRENT_STEP);
@@ -915,19 +906,16 @@ public class StepService extends Service implements SensorEventListener {
             return;
         }
         int tempStep = CURRENT_STEP;
-        List<UserStepEntity> list = DbCore.getDaoSession().getUserStepEntityDao().queryBuilder().where(UserStepEntityDao.Properties.UserId.eq(userId), UserStepEntityDao.Properties.Date.eq(CURRENT_DATE)).list();
-        if (list.size() == 0 || list.isEmpty()) {
+        UserStepEntity userStepEntity = StepUtil.getUserStepData(getApplicationContext(), CommonInfo.getUserId(getApplicationContext()));
+        if (userStepEntity == null) {
             UserStepEntity data = new UserStepEntity();
-            data.setUuid(UUID.randomUUID().toString());
             data.setUserId(userId);
             data.setDate(CURRENT_DATE);
             data.setStepCount(tempStep + "");
-            DbCore.getDaoSession().getUserStepEntityDao().insert(data);
-        } else if (list.size() == 1) {
-            UserStepEntity data = list.get(0);
-            data.setStepCount(tempStep + "");
-            DbCore.getDaoSession().getUserStepEntityDao().update(data);
+            StepUtil.insertStepData(getApplicationContext(), data);
         } else {
+            userStepEntity.setStepCount(tempStep + "");
+            StepUtil.updateStepData(getApplicationContext(), userStepEntity);
         }
     }
@@ -24,14 +24,20 @@ public class UserStepEntityDao extends AbstractDao&lt;UserStepEntity, String&gt; {
      * Can be used for QueryBuilder and for referencing column names.
      */
     public static class Properties {
-        public final static Property Uuid = new Property(0, String.class, "uuid", true, "UUID");
-        public final static Property UserId = new Property(1, String.class, "userId", false, "USER_ID");
-        public final static Property Date = new Property(2, String.class, "date", false, "DATE");
-        public final static Property StepCount = new Property(3, String.class, "stepCount", false, "STEP_COUNT");
-        public final static Property PauseTimeStamp = new Property(4, long.class, "pauseTimeStamp", false, "PAUSE_TIME_STAMP");
-        public final static Property RecordTime = new Property(5, long.class, "recordTime", false, "RECORD_TIME");
-        public final static Property CaloriesCount = new Property(6, double.class, "caloriesCount", false, "CALORIES_COUNT");
-        public final static Property ServerTraceData = new Property(7, String.class, "serverTraceData", false, "SERVER_TRACE_DATA");
+        public final static Property UserId = new Property(0, String.class, "userId", true, "USER_ID");
+        public final static Property Date = new Property(1, String.class, "date", false, "DATE");
+        public final static Property StepCount = new Property(2, String.class, "stepCount", false, "STEP_COUNT");
+        public final static Property PauseTimeStamp = new Property(3, long.class, "pauseTimeStamp", false, "PAUSE_TIME_STAMP");
+        public final static Property RecordTime = new Property(4, long.class, "recordTime", false, "RECORD_TIME");
+        public final static Property CaloriesCount = new Property(5, double.class, "caloriesCount", false, "CALORIES_COUNT");
+        public final static Property ServerTraceData = new Property(6, String.class, "serverTraceData", false, "SERVER_TRACE_DATA");
+        public final static Property StartPoint = new Property(7, String.class, "startPoint", false, "START_POINT");
+        public final static Property EndPoint = new Property(8, String.class, "endPoint", false, "END_POINT");
+        public final static Property StartTimeStamp = new Property(9, long.class, "startTimeStamp", false, "START_TIME_STAMP");
+        public final static Property FinishTimeStamp = new Property(10, long.class, "finishTimeStamp", false, "FINISH_TIME_STAMP");
+        public final static Property StreetId = new Property(11, String.class, "streetId", false, "STREET_ID");
+        public final static Property PauseCount = new Property(12, int.class, "pauseCount", false, "PAUSE_COUNT");
+        public final static Property UserPauseTimeStamp = new Property(13, long.class, "userPauseTimeStamp", false, "USER_PAUSE_TIME_STAMP");
     }
@@ -47,14 +53,20 @@ public class UserStepEntityDao extends AbstractDao&lt;UserStepEntity, String&gt; {
     public static void createTable(Database db, boolean ifNotExists) {
         String constraint = ifNotExists? "IF NOT EXISTS ": "";
         db.execSQL("CREATE TABLE " + constraint + "\"USER_STEP_ENTITY\" (" + //
-                "\"UUID\" TEXT PRIMARY KEY NOT NULL ," + // 0: uuid
-                "\"USER_ID\" TEXT," + // 1: userId
-                "\"DATE\" TEXT," + // 2: date
-                "\"STEP_COUNT\" TEXT," + // 3: stepCount
-                "\"PAUSE_TIME_STAMP\" INTEGER NOT NULL ," + // 4: pauseTimeStamp
-                "\"RECORD_TIME\" INTEGER NOT NULL ," + // 5: recordTime
-                "\"CALORIES_COUNT\" REAL NOT NULL ," + // 6: caloriesCount
-                "\"SERVER_TRACE_DATA\" TEXT);"); // 7: serverTraceData
+                "\"USER_ID\" TEXT PRIMARY KEY NOT NULL ," + // 0: userId
+                "\"DATE\" TEXT," + // 1: date
+                "\"STEP_COUNT\" TEXT," + // 2: stepCount
+                "\"PAUSE_TIME_STAMP\" INTEGER NOT NULL ," + // 3: pauseTimeStamp
+                "\"RECORD_TIME\" INTEGER NOT NULL ," + // 4: recordTime
+                "\"CALORIES_COUNT\" REAL NOT NULL ," + // 5: caloriesCount
+                "\"SERVER_TRACE_DATA\" TEXT," + // 6: serverTraceData
+                "\"START_POINT\" TEXT," + // 7: startPoint
+                "\"END_POINT\" TEXT," + // 8: endPoint
+                "\"START_TIME_STAMP\" INTEGER NOT NULL ," + // 9: startTimeStamp
+                "\"FINISH_TIME_STAMP\" INTEGER NOT NULL ," + // 10: finishTimeStamp
+                "\"STREET_ID\" TEXT," + // 11: streetId
+                "\"PAUSE_COUNT\" INTEGER NOT NULL ," + // 12: pauseCount
+                "\"USER_PAUSE_TIME_STAMP\" INTEGER NOT NULL );"); // 13: userPauseTimeStamp
     }
     /** Drops the underlying database table. */
@@ -67,66 +79,94 @@ public class UserStepEntityDao extends AbstractDao&lt;UserStepEntity, String&gt; {
     protected final void bindValues(DatabaseStatement stmt, UserStepEntity entity) {
         stmt.clearBindings();
-        String uuid = entity.getUuid();
-        if (uuid != null) {
-            stmt.bindString(1, uuid);
-        }
- 
         String userId = entity.getUserId();
         if (userId != null) {
-            stmt.bindString(2, userId);
+            stmt.bindString(1, userId);
         }
         String date = entity.getDate();
         if (date != null) {
-            stmt.bindString(3, date);
+            stmt.bindString(2, date);
         }
         String stepCount = entity.getStepCount();
         if (stepCount != null) {
-            stmt.bindString(4, stepCount);
+            stmt.bindString(3, stepCount);
         }
-        stmt.bindLong(5, entity.getPauseTimeStamp());
-        stmt.bindLong(6, entity.getRecordTime());
-        stmt.bindDouble(7, entity.getCaloriesCount());
+        stmt.bindLong(4, entity.getPauseTimeStamp());
+        stmt.bindLong(5, entity.getRecordTime());
+        stmt.bindDouble(6, entity.getCaloriesCount());
         String serverTraceData = entity.getServerTraceData();
         if (serverTraceData != null) {
-            stmt.bindString(8, serverTraceData);
+            stmt.bindString(7, serverTraceData);
+        }
+ 
+        String startPoint = entity.getStartPoint();
+        if (startPoint != null) {
+            stmt.bindString(8, startPoint);
+        }
+ 
+        String endPoint = entity.getEndPoint();
+        if (endPoint != null) {
+            stmt.bindString(9, endPoint);
+        }
+        stmt.bindLong(10, entity.getStartTimeStamp());
+        stmt.bindLong(11, entity.getFinishTimeStamp());
+ 
+        String streetId = entity.getStreetId();
+        if (streetId != null) {
+            stmt.bindString(12, streetId);
         }
+        stmt.bindLong(13, entity.getPauseCount());
+        stmt.bindLong(14, entity.getUserPauseTimeStamp());
     }
     @Override
     protected final void bindValues(SQLiteStatement stmt, UserStepEntity entity) {
         stmt.clearBindings();
-        String uuid = entity.getUuid();
-        if (uuid != null) {
-            stmt.bindString(1, uuid);
-        }
- 
         String userId = entity.getUserId();
         if (userId != null) {
-            stmt.bindString(2, userId);
+            stmt.bindString(1, userId);
         }
         String date = entity.getDate();
         if (date != null) {
-            stmt.bindString(3, date);
+            stmt.bindString(2, date);
         }
         String stepCount = entity.getStepCount();
         if (stepCount != null) {
-            stmt.bindString(4, stepCount);
+            stmt.bindString(3, stepCount);
         }
-        stmt.bindLong(5, entity.getPauseTimeStamp());
-        stmt.bindLong(6, entity.getRecordTime());
-        stmt.bindDouble(7, entity.getCaloriesCount());
+        stmt.bindLong(4, entity.getPauseTimeStamp());
+        stmt.bindLong(5, entity.getRecordTime());
+        stmt.bindDouble(6, entity.getCaloriesCount());
         String serverTraceData = entity.getServerTraceData();
         if (serverTraceData != null) {
-            stmt.bindString(8, serverTraceData);
+            stmt.bindString(7, serverTraceData);
+        }
+ 
+        String startPoint = entity.getStartPoint();
+        if (startPoint != null) {
+            stmt.bindString(8, startPoint);
+        }
+ 
+        String endPoint = entity.getEndPoint();
+        if (endPoint != null) {
+            stmt.bindString(9, endPoint);
+        }
+        stmt.bindLong(10, entity.getStartTimeStamp());
+        stmt.bindLong(11, entity.getFinishTimeStamp());
+ 
+        String streetId = entity.getStreetId();
+        if (streetId != null) {
+            stmt.bindString(12, streetId);
         }
+        stmt.bindLong(13, entity.getPauseCount());
+        stmt.bindLong(14, entity.getUserPauseTimeStamp());
     }
     @Override
@@ -137,39 +177,51 @@ public class UserStepEntityDao extends AbstractDao&lt;UserStepEntity, String&gt; {
     @Override
     public UserStepEntity readEntity(Cursor cursor, int offset) {
         UserStepEntity entity = new UserStepEntity( //
-            cursor.isNull(offset + 0) ? null : cursor.getString(offset + 0), // uuid
-            cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // userId
-            cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // date
-            cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // stepCount
-            cursor.getLong(offset + 4), // pauseTimeStamp
-            cursor.getLong(offset + 5), // recordTime
-            cursor.getDouble(offset + 6), // caloriesCount
-            cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7) // serverTraceData
+            cursor.isNull(offset + 0) ? null : cursor.getString(offset + 0), // userId
+            cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // date
+            cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // stepCount
+            cursor.getLong(offset + 3), // pauseTimeStamp
+            cursor.getLong(offset + 4), // recordTime
+            cursor.getDouble(offset + 5), // caloriesCount
+            cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // serverTraceData
+            cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // startPoint
+            cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // endPoint
+            cursor.getLong(offset + 9), // startTimeStamp
+            cursor.getLong(offset + 10), // finishTimeStamp
+            cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11), // streetId
+            cursor.getInt(offset + 12), // pauseCount
+            cursor.getLong(offset + 13) // userPauseTimeStamp
         );
         return entity;
     }
     @Override
     public void readEntity(Cursor cursor, UserStepEntity entity, int offset) {
-        entity.setUuid(cursor.isNull(offset + 0) ? null : cursor.getString(offset + 0));
-        entity.setUserId(cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1));
-        entity.setDate(cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2));
-        entity.setStepCount(cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3));
-        entity.setPauseTimeStamp(cursor.getLong(offset + 4));
-        entity.setRecordTime(cursor.getLong(offset + 5));
-        entity.setCaloriesCount(cursor.getDouble(offset + 6));
-        entity.setServerTraceData(cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7));
+        entity.setUserId(cursor.isNull(offset + 0) ? null : cursor.getString(offset + 0));
+        entity.setDate(cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1));
+        entity.setStepCount(cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2));
+        entity.setPauseTimeStamp(cursor.getLong(offset + 3));
+        entity.setRecordTime(cursor.getLong(offset + 4));
+        entity.setCaloriesCount(cursor.getDouble(offset + 5));
+        entity.setServerTraceData(cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6));
+        entity.setStartPoint(cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7));
+        entity.setEndPoint(cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8));
+        entity.setStartTimeStamp(cursor.getLong(offset + 9));
+        entity.setFinishTimeStamp(cursor.getLong(offset + 10));
+        entity.setStreetId(cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11));
+        entity.setPauseCount(cursor.getInt(offset + 12));
+        entity.setUserPauseTimeStamp(cursor.getLong(offset + 13));
      }
     @Override
     protected final String updateKeyAfterInsert(UserStepEntity entity, long rowId) {
-        return entity.getUuid();
+        return entity.getUserId();
     }
     @Override
     public String getKey(UserStepEntity entity) {
         if(entity != null) {
-            return entity.getUuid();
+            return entity.getUserId();
         } else {
             return null;
         }
@@ -177,7 +229,7 @@ public class UserStepEntityDao extends AbstractDao&lt;UserStepEntity, String&gt; {
     @Override
     public boolean hasKey(UserStepEntity entity) {
-        return entity.getUuid() != null;
+        return entity.getUserId() != null;
     }
     @Override
@@ -7,7 +7,6 @@ import org.greenrobot.greendao.annotation.Id;
 @Entity
 public class UserStepEntity {
     @Id
-    private String uuid;
     private String userId;
     private String date;
     private String stepCount;
@@ -15,12 +14,18 @@ public class UserStepEntity {
     private long recordTime;//暂停时间
     private double caloriesCount;//卡路里
     private String serverTraceData;//服务端赛道数据
-
-    @Generated(hash = 1521646580)
-    public UserStepEntity(String uuid, String userId, String date, String stepCount,
-            long pauseTimeStamp, long recordTime, double caloriesCount,
-            String serverTraceData) {
-        this.uuid = uuid;
+    private String startPoint;
+    private String endPoint;
+    private long startTimeStamp;
+    private long finishTimeStamp;
+    private String streetId;//赛事ID
+    private int pauseCount;//暂停次数
+    private long userPauseTimeStamp;//暂停时间戳
+
+    @Generated(hash = 446594441)
+    public UserStepEntity(String userId, String date, String stepCount, long pauseTimeStamp, long recordTime, double caloriesCount,
+            String serverTraceData, String startPoint, String endPoint, long startTimeStamp, long finishTimeStamp, String streetId, int pauseCount,
+            long userPauseTimeStamp) {
         this.userId = userId;
         this.date = date;
         this.stepCount = stepCount;
@@ -28,6 +33,13 @@ public class UserStepEntity {
         this.recordTime = recordTime;
         this.caloriesCount = caloriesCount;
         this.serverTraceData = serverTraceData;
+        this.startPoint = startPoint;
+        this.endPoint = endPoint;
+        this.startTimeStamp = startTimeStamp;
+        this.finishTimeStamp = finishTimeStamp;
+        this.streetId = streetId;
+        this.pauseCount = pauseCount;
+        this.userPauseTimeStamp = userPauseTimeStamp;
     }
     @Generated(hash = 273857141)
@@ -58,14 +70,6 @@ public class UserStepEntity {
         this.stepCount = stepCount;
     }
-    public String getUuid() {
-        return this.uuid;
-    }
-
-    public void setUuid(String uuid) {
-        this.uuid = uuid;
-    }
-
     public long getPauseTimeStamp() {
         return this.pauseTimeStamp;
     }
@@ -74,14 +78,6 @@ public class UserStepEntity {
         this.pauseTimeStamp = pauseTimeStamp;
     }
-    public double getCaloriesCount() {
-        return this.caloriesCount;
-    }
-
-    public void setCaloriesCount(double caloriesCount) {
-        this.caloriesCount = caloriesCount;
-    }
-
     public long getRecordTime() {
         return this.recordTime;
     }
@@ -90,6 +86,14 @@ public class UserStepEntity {
         this.recordTime = recordTime;
     }
+    public double getCaloriesCount() {
+        return this.caloriesCount;
+    }
+
+    public void setCaloriesCount(double caloriesCount) {
+        this.caloriesCount = caloriesCount;
+    }
+
     public String getServerTraceData() {
         return this.serverTraceData;
     }
@@ -98,5 +102,61 @@ public class UserStepEntity {
         this.serverTraceData = serverTraceData;
     }
+    public String getStartPoint() {
+        return this.startPoint;
+    }
+
+    public void setStartPoint(String startPoint) {
+        this.startPoint = startPoint;
+    }
+
+    public String getEndPoint() {
+        return this.endPoint;
+    }
+
+    public void setEndPoint(String endPoint) {
+        this.endPoint = endPoint;
+    }
+
+    public long getStartTimeStamp() {
+        return this.startTimeStamp;
+    }
+
+    public void setStartTimeStamp(long startTimeStamp) {
+        this.startTimeStamp = startTimeStamp;
+    }
+
+    public long getFinishTimeStamp() {
+        return this.finishTimeStamp;
+    }
+
+    public void setFinishTimeStamp(long finishTimeStamp) {
+        this.finishTimeStamp = finishTimeStamp;
+    }
+
+    public String getStreetId() {
+        return this.streetId;
+    }
+
+    public void setStreetId(String streetId) {
+        this.streetId = streetId;
+    }
+
+    public int getPauseCount() {
+        return this.pauseCount;
+    }
+
+    public void setPauseCount(int pauseCount) {
+        this.pauseCount = pauseCount;
+    }
+
+    public long getUserPauseTimeStamp() {
+        return this.userPauseTimeStamp;
+    }
+
+    public void setUserPauseTimeStamp(long userPauseTimeStamp) {
+        this.userPauseTimeStamp = userPauseTimeStamp;
+    }
+
 }
@@ -24,6 +24,11 @@ public class RunLineActivity extends AppCompatActivity {
         setContentView(R.layout.activity_run_line);
         CommonInfo.setUserId(this, "10513196");
+        //设置用户昵称
+        CommonInfo.setUserNickName(this, "测试账号");
+        //设置用户头像
+
+        CommonInfo.setUserFaceUrl(this, "http://yweb0.cnliveimg.com/images/headImg/2019/0505/1557039035723_small.jpg");
         getSupportFragmentManager().beginTransaction().replace(R.id.run_line_container, new RunLineFragment()).commit();
     }
 }
@@ -10,6 +10,7 @@ import android.view.View;
 import com.cnlive.libs.base.ui.QMUIFragment;
 import com.cnlive.libs.base.util.StatusBarUtil;
 import com.cnlive.libs.base.util.StatusBarUtil2;
+import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.frame.presenter.RunMainFragmentPresenter;
 import com.cnlive.moudle.pedometer.frame.view.RunMainFragmentView;
 import com.cnlive.moudle.pedometer.model.Constant;
@@ -57,10 +58,11 @@ public class RunMainFragment extends QMUIFragment&lt;RunMainFragmentView, RunMainFr
     @Override
     public void onPause() {
         super.onPause();
+        //todo 第二期在用
         //记录当前计时器相关数据
         if (getMvpView() != null) {
-            if (!TextUtils.isEmpty(userId)) {
-                getMvpView().setSQLPauseTime(userId);
+            if (!TextUtils.isEmpty(CommonInfo.getUserId(getActivity()))) {
+                getMvpView().setFragmentPauseTime(userId);
             }
         }
     }
@@ -89,12 +89,14 @@ public class RunRaceDetailFragment extends QMUIFragment&lt;RunRaceDetailFragmentVie
         super.onResume();
         if (getMvpView() != null) {
             getMvpView().onResume();
+            getMvpView().checkStartBtnState();
         }
         if (getMvpView() != null) {
             //为系统的方向传感器注册监听器
             mSensorManager.registerListener(getMvpView(), mSensorManager.getDefaultSensor(Sensor.TYPE_ORIENTATION),
                     SensorManager.SENSOR_DELAY_UI);
         }
+
     }
     @Override
@@ -109,7 +109,8 @@ public class RunningMapFragment extends QMUIFragment&lt;RunningMapFragmentView, Run
         }
         //开始进行历史轨迹查询
         if (getPresenter() != null && !TextUtils.isEmpty(StepService.entityName)) {
-            long stepStartTime = CommonInfo.getStepStartTime(getActivity());
+            long stepStartTime = 0;
+//                    CommonInfo.getStepStartTime(getActivity());
             Log.e(TAG, "onViewCreated: 时间"+stepStartTime );
             long startTime = 0;
             if (stepStartTime != 0) {
@@ -117,7 +118,7 @@ public class RunningMapFragment extends QMUIFragment&lt;RunningMapFragmentView, Run
             } else {
                 startTime = (int) (System.currentTimeMillis() / 1000 -12 * 60 * 60);
             }
-            long current = TimeUtil.getCurrentTime();
+            long current = TimeUtil.getNowTimeStamp();
 //            long startTime = current - hour * 3600 * 1000 - minute * 60 * 1000 - second * 1000;
             long endTime = current;
 //            Log.e(TAG, "onViewCreated: " + "hour:" + hour + ",minute" + minute + ",second:" + second);
@@ -90,14 +90,11 @@ public class StepUtil {
      */
     public static void clearRunData(Context context, String uid) {
         DbCore.init(context, dbName);
-        String CURRENT_DATE = getTodayDate();
-        List<UserStepEntity> list = DbCore.getDaoSession().getUserStepEntityDao().queryBuilder().where(UserStepEntityDao.Properties.UserId.eq(uid), UserStepEntityDao.Properties.Date.eq(CURRENT_DATE)).list();
+        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());
-//            for (int i = 0; i < list.size(); i++) {
-            DbCore.getDaoSession().getUserStepEntityDao().deleteByKey(list.get(0).getUuid());
+            DbCore.getDaoSession().getUserStepEntityDao().delete(list.get(0));
             DbCore.getDaoSession().getUserStepEntityDao().detachAll();
-//            }
         }
     }
@@ -111,10 +108,7 @@ public class StepUtil {
     public static UserStepEntity getUserStepData(Context context, String uid) {
         if (!TextUtils.isEmpty(uid)) {
             DbCore.init(context, dbName);
-            DbCore.getDaoSession().getUserStepEntityDao().detachAll();
-            DbCore.getDaoSession().clear();
-            String CURRENT_DATE = getTodayDate();
-            List<UserStepEntity> list = DbCore.getDaoSession().getUserStepEntityDao().queryBuilder().where(UserStepEntityDao.Properties.UserId.eq(uid), UserStepEntityDao.Properties.Date.eq(CURRENT_DATE)).list();
+            List<UserStepEntity> list = DbCore.getDaoSession().getUserStepEntityDao().queryBuilder().where(UserStepEntityDao.Properties.UserId.eq(uid)).list();
             if (list != null && list.size() > 0) {
                 return list.get(0);
             } else {
@@ -126,18 +120,70 @@ public class StepUtil {
     }
     /**
-     * 获取用户数据
+     * 设置用户数据
      *
      * @param context
      * @param uid
      * @return
      */
-    public static void setServerTraceData(Context context, String uid, UserStepEntity userStepEntity) {
+    public static void setUserStepData(Context context, String uid, UserStepEntity userStepEntity) {
+        if (getUserStepData(context, uid) != null) {
+            UserStepEntity entity = getUserStepData(context, uid);
+        } else {
+
+        }
+    }
+
+    public static void setStepStartData(Context context, String uid, long startStamp, String streetId) {
         if (getUserStepData(context, uid) != null) {
             UserStepEntity entity = getUserStepData(context, uid);
-//            entity.setServerTraceData();
+            entity.setStartTimeStamp(startStamp);
+            entity.setStreetId(streetId);
+            //更新数据
+            updateStepData(context, entity);
         } else {
+            //创建数据
+            UserStepEntity userStepEntity = new UserStepEntity();
+            userStepEntity.setUserId(uid);
+            userStepEntity.setStartTimeStamp(startStamp);
+            userStepEntity.setStreetId(streetId);
+            insertStepData(context, userStepEntity);
+        }
+    }
+
+    public static void insertStepData(Context context, UserStepEntity userStepEntity) {
+        DbCore.init(context, dbName);
+        DbCore.getDaoSession().getUserStepEntityDao().insert(userStepEntity);
+    }
+
+    /**
+     * 获取用户暂停次数
+     *
+     * @param context
+     * @param uid
+     * @return
+     */
+    public static int getUserPauseCount(Context context, String uid) {
+        UserStepEntity userStepEntity = getUserStepData(context, uid);
+        if (userStepEntity != null) {
+            return userStepEntity.getPauseCount();
+        } else {
+            return -1;
+        }
+    }
+
+    /**
+     * 设置用户完成时间戳
+     *
+     * @param context
+     */
+    public static void setUserFinishTimeStamp(Context context, String uid) {
+        UserStepEntity userStepEntity = getUserStepData(context, uid);
+        if (userStepEntity != null) {
+            userStepEntity.setFinishTimeStamp(TimeUtil.getNowTimeStamp());
+            //更新
+            updateStepData(context, userStepEntity);
         }
     }
@@ -10,14 +10,6 @@ import java.util.Date;
  * @author ShinnyYang
  */
 public class TimeUtil {
-    /**
-     * 获取当前时间戳(单位：秒)
-     *
-     * @return
-     */
-    public static long getCurrentTime() {
-        return System.currentTimeMillis();
-    }
     /**
      * 日期格式字符串转换成时间戳
@@ -11,16 +11,17 @@
         android:layout_height="wrap_content"
         android:background="@drawable/free_dialog_bg"
         android:orientation="vertical"
-        android:paddingTop="10dp"
-       >
+        android:paddingTop="10dp">
         <TextView
             android:id="@+id/tv_dialog_tip"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:minHeight="75dp"
-            android:gravity="center"
             android:layout_gravity="center"
+            android:layout_marginLeft="10dp"
+            android:layout_marginRight="10dp"
+            android:gravity="center"
+            android:minHeight="75dp"
             android:text="标题"
             android:textColor="@color/black"
             android:textSize="17sp"
@@ -59,7 +60,6 @@
             </LinearLayout>
-
         </LinearLayout>
     </LinearLayout>
 </LinearLayout>
@@ -15,7 +15,7 @@
             sothree:umanoFadeColor="@color/black_20"
             sothree:umanoOverlay="true"
             sothree:umanoPanelHeight="310dp"
-            sothree:umanoParallaxOffset="100dp"
+            sothree:umanoParallaxOffset="0dp"
             sothree:umanoScrollableView="@+id/scrollView"
             sothree:umanoShadowHeight="0dp">
@@ -31,32 +31,42 @@
                         android:src="@drawable/icon_right_close" />
                 </RelativeLayout>
                 <!--公里数显示-->
-                <LinearLayout
+                <FrameLayout
                     android:layout_width="match_parent"
                     android:layout_height="0dp"
-                    android:layout_weight="1.2"
-                    android:gravity="center"
-                    android:paddingLeft="50dp">
+                    android:layout_weight="1.2">
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:gravity="center"
+                        android:paddingLeft="50dp">
-                    <TextView
-                        android:id="@+id/tv_run_distance"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="0.00"
-                        android:textColor="@color/white"
-                        android:textSize="70sp"
-                        android:textStyle="bold" />
+                        <TextView
+                            android:id="@+id/tv_run_distance"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="0.00"
+                            android:textColor="@color/white"
+                            android:textSize="70sp"
+                            android:textStyle="bold" />
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginLeft="10dp"
-                        android:layout_marginTop="20dp"
-                        android:text="公里"
-                        android:textColor="@color/white"
-                        android:textSize="15sp" />
-                </LinearLayout>
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="10dp"
+                            android:layout_marginTop="20dp"
+                            android:text="公里"
+                            android:textColor="@color/white"
+                            android:textSize="15sp" />
+                    </LinearLayout>
+
+                    <ImageView
+                        android:id="@+id/iv_back"
+                        android:layout_width="20dp"
+                        android:layout_height="40dp"
+                        android:background="@drawable/back" />
+                </FrameLayout>
                 <!--GPS信息-->
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -83,6 +83,7 @@
     <string name="up_fail">上传失败</string>
     <string name="enter_range_tip">您已回归轨迹 继续参与运动吧</string>
     <string name="exit_range_tip">您已偏离路径轨迹 请您计时回归路径!</string>
+    <string name="more_than_pause_count_tip">您已超过最大暂停次数,无法继续比赛!</string>
 </resources>