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

韩亚云
2 parents ba34a038 67a0c3c5
Showing 14 changed files with 370 additions and 120 deletions
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/presenter/ALLScoreDetailFragmentPresenter.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/presenter/RunningFinishFragmetPresenter.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/ALLScoreDetailFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RaceRecorView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunMainFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunningFinishFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunningMapFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/SelfRecordView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/model/RunningFinishBean.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/net/bean/EventRouteRecordBeanVoListBean.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/service/StepService.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/adapter/RaceRecordAdapter.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/ALLScoreDetailFragment.java
moudle_pedometer/src/main/res/layout/fragment_self_record.xml
 package com.cnlive.moudle.pedometer.frame.presenter;
+import android.app.Activity;
+import android.text.TextUtils;
+import android.widget.Toast;
+
+import com.baidu.mapapi.model.LatLng;
+import com.baidu.trace.LBSTraceClient;
+import com.baidu.trace.model.SortType;
+import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.frame.view.ALLScoreDetailFragmentView;
+import com.cnlive.moudle.pedometer.model.Constant;
+import com.cnlive.moudle.pedometer.model.RunningFinishBean;
+import com.cnlive.moudle.pedometer.sql.entity.FailedEntity;
+import com.cnlive.moudle.pedometer.ui.widget.SelectDialog;
+import com.cnlive.moudle.pedometer.utils.GsonUtil;
+import com.cnlive.moudle.pedometer.utils.MyMapUtil;
+import com.cnlive.moudle.pedometer.utils.QMUITipDialogUtil;
+import com.example.moudle_pedometer.R;
 import com.hannesdorfmann.mosby3.mvp.MvpBasePresenter;
+import java.util.List;
+
 public class ALLScoreDetailFragmentPresenter extends MvpBasePresenter<ALLScoreDetailFragmentView> {
+    private LBSTraceClient mClient = null;
+    private SelectDialog uploadFailDialog;
+    private SelectDialog failTraceDialog;
+
+    /**
+     * 查询当前用户历史轨迹
+     */
+    public void queryHistoryTrace(Activity context, RunningFinishBean runningFinishBean) {
+        QMUITipDialogUtil.loadingDialog(context, "正在获取轨迹信息,请稍后", false);
+        //查询当前用户的历史轨迹
+        long startTime = 0;
+        if (!TextUtils.isEmpty(runningFinishBean.getUserStartTime())) {
+            startTime = Long.parseLong(runningFinishBean.getUserStartTime());
+        }
+        //获取当前的时间戳(秒)
+        long endTime = 0;
+        if (!TextUtils.isEmpty(runningFinishBean.getUserFinishTime())){
+            endTime = Long.parseLong(runningFinishBean.getUserFinishTime());
+        }
+        //获取当前的实体名称
+        String entityName = CommonInfo.getUserId(context);
+        if (mClient == null) {
+            mClient = new LBSTraceClient(context);
+        }
+        MyMapUtil.queryHistoryTrace(context, mClient, entityName, startTime, endTime, new MyMapUtil.CallBack() {
+            @Override
+            public void success(List<LatLng> resultPoints) {
+                if (resultPoints != null) {
+                    if (getView() != null) {
+                        QMUITipDialogUtil.dismessDialog();
+                        if (resultPoints.size() > 1) {
+                            MyMapUtil.drawHistoryTrack(context, getView().baiduMap, resultPoints, SortType.asc, R.color.red, R.drawable.icon_start, R.drawable.icon_end);
+                            //设置地图自动缩放
+                            MyMapUtil.setMapAutoZoom(getView().baiduMap, resultPoints, -2f);
+                        }
+
+                    }
+                }
+                //查询失败
+                else {
+                    if (getView() == null) {
+                        return;
+                    }
+                    QMUITipDialogUtil.dismessDialog();
+
+                    if (failTraceDialog == null) {
+                        failTraceDialog = new SelectDialog(context, "获取轨迹失败,是否重试?", "重试", new SelectDialog.DialogInterface() {
+                            @Override
+                            public void onClick(SelectDialog dialog) {
+                                dialog.dismiss();
+                                queryHistoryTrace(context, runningFinishBean);
+                            }
+                        }, "取消", new SelectDialog.DialogInterface() {
+                            @Override
+                            public void onClick(SelectDialog dialog) {
+                                dialog.dismiss();
+
+                            }
+                        });
+                        failTraceDialog.setCanceledOnTouchOutside(false);
+                        failTraceDialog.setCancelable(false);
+                        if (!failTraceDialog.isShowing()) {
+                            failTraceDialog.show();
+                        }
+
+                    } else {
+                        if (!failTraceDialog.isShowing()) {
+                            failTraceDialog.show();
+                        }
+                    }
+                }
+            }
+        });
+
+    }
 }
@@ -81,7 +81,9 @@ public class RunningFinishFragmetPresenter extends MvpBasePresenter&lt;RunningFinis
         //配速
         String pace = "";
         if ("--".equals(runningFinishBean.getSpeed())) {
-            pace = "0";
+//            pace = "0";
+            //开始计算配速
+            pace = StepUtil.getPaceSpeed(Double.parseDouble(employTime), Double.parseDouble(mileage));
         } else {
             pace = runningFinishBean.getSpeed();
         }
@@ -125,7 +127,6 @@ public class RunningFinishFragmetPresenter extends MvpBasePresenter&lt;RunningFinis
         paramsMap.put("step", step);
-
         Logic.create(paramsMap).action(new Logic.Action<Map<String, String>, BaseInfo>() {
             @Override
             public Disposable action(Map<String, String> stringStringMap, DataCallback<BaseInfo> dataCallback) {
@@ -10,6 +10,7 @@ import com.baidu.mapapi.map.UiSettings;
 import com.cnlive.moudle.pedometer.model.RunningFinishBean;
 import com.cnlive.moudle.pedometer.ui.fragment.ALLScoreDetailFragment;
 import com.cnlive.moudle.pedometer.utils.TimeUtil;
+import com.example.moudle_pedometer.R;
 import com.hannesdorfmann.mosby3.mvp.MvpView;
 /**
@@ -50,6 +51,25 @@ public class ALLScoreDetailFragmentView implements MvpView {
             fragment.binding.includeFinishRunRoute.tvTimer.setText(TimeUtil.stampToChronometer(Long.parseLong(runningFinishBean.getEmployTime())));
         }
+        //设置完成时间
+        if (!TextUtils.isEmpty(runningFinishBean.getUserFinishTime())) {
+            fragment.binding.includeFinishUserInfo.tvDate.setText(TimeUtil.getStampToTime(Long.parseLong(runningFinishBean.getUserFinishTime())*1000, "yyyy/MM/dd HH:mm"));
+        }
+        //设置起点
+        fragment.binding.includeFinishRunRoute.tvStartPoint.setText(runningFinishBean.getStartPoint());
+        //设置终点
+        fragment.binding.includeFinishRunRoute.tvEndPoint.setText(runningFinishBean.getEndPoint());
+        //设置是否完成
+        //未完成
+        if ("1".equals(runningFinishBean.getIsFinish())) {
+            fragment.binding.includeFinishRunRoute.tvFinishState.setText("路线完成");
+            fragment.binding.includeFinishRunRoute.tvFinishState.setTextColor(getContext().getResources().getColor(R.color.green_round));
+        }
+        //完成
+        else if ("0".equals(runningFinishBean.getIsFinish())){
+            fragment.binding.includeFinishRunRoute.tvFinishState.setText("路线未完成");
+            fragment.binding.includeFinishRunRoute.tvFinishState.setTextColor(getContext().getResources().getColor(R.color.red));
+        }
         //设置日期
         //点击返回按钮
         fragment.binding.flBack.setOnClickListener(new View.OnClickListener() {
@@ -86,8 +86,19 @@ public class RaceRecorView implements MvpView {
                             runningFinishBean.setRunDistance(bean.getMileage());
                             //设置配速
                             runningFinishBean.setSpeed(bean.getPace());
-                            //设置用书
+                            //设置用时
                             runningFinishBean.setEmployTime(bean.getEmployTime());
+                            //设置开始位置
+                            runningFinishBean.setStartPoint(bean.getStartLocation());
+                            //设置结束位置
+                            runningFinishBean.setEndPoint(bean.getEndLocation());
+                            //设置用户轨迹开始时间
+                            runningFinishBean.setUserStartTime(bean.getStartTime());
+                            //设置用户轨迹结束时间
+                            runningFinishBean.setUserFinishTime(bean.getEndTime());
+                            //设置用户是否完成
+                            runningFinishBean.setIsFinish(bean.getCompleteStatus() + "");
+
                             //设置起点
                             ALLScoreDetailActivity.startActivity(fragment.getActivity(), runningFinishBean);
@@ -237,8 +237,10 @@ public class RunMainFragmentView implements MvpView {
                                     fragment.binding.chronometer.setFormat("00:00:01");
                                     fragment.binding.chronometer.setBase(SystemClock.elapsedRealtime());
                                 }
-                                //设置继续运动时间
-                                StepUtil.setContinueTime(getContext(), uid, TimeUtil.getNowTimeStamp());
+                                if (userStepEntity.getContinueTime() == 0) {
+                                    //设置继续运动时间
+                                    StepUtil.setContinueTime(getContext(), uid, TimeUtil.getNowTimeStamp());
+                                }
                                 //因为进来以后就运动了,所以需要改变状态
                                 CommonInfo.setIsPauseState(getContext(), false);
                                 //重新设置开始时间
@@ -290,8 +292,10 @@ public class RunMainFragmentView implements MvpView {
         fragment.binding.flContinue.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                //设置继续运动时间
-                StepUtil.setContinueTime(getContext(), uid, TimeUtil.getNowTimeStamp());
+                if (userStepEntity.getContinueTime() == 0) {
+                    //设置继续运动时间
+                    StepUtil.setContinueTime(getContext(), uid, TimeUtil.getNowTimeStamp());
+                }
                 //设置继续标志
                 CommonInfo.setIsPauseState(getContext(), false);
                 //继续记录轨迹
@@ -371,8 +375,17 @@ public class RunMainFragmentView implements MvpView {
                                                     runningFinishBean.setStartPoint(userStepEntity.getStartPoint());
                                                     runningFinishBean.setEndPoint(userStepEntity.getEndPoint());
                                                     runningFinishBean.setRunDistance(fragment.binding.tvRunDistance.getText().toString());
-                                                    runningFinishBean.setSpeed(fragment.binding.tvSpeed.getText().toString());
-                                                    runningFinishBean.setStep(fragment.binding.tvStepCount.getText().toString());
+                                                    if ("--".equals(fragment.binding.tvSpeed.getText().toString())) {
+                                                        String speed = StepUtil.getPaceSpeed(Double.parseDouble(employTime), Double.parseDouble(fragment.binding.tvRunDistance.getText().toString()));
+                                                        runningFinishBean.setSpeed(speed);
+                                                    } else {
+                                                        runningFinishBean.setSpeed(fragment.binding.tvSpeed.getText().toString());
+                                                    }
+                                                    if ("--".equals(fragment.binding.tvStepCount.getText().toString())) {
+                                                        runningFinishBean.setStep("0");
+                                                    } else {
+                                                        runningFinishBean.setStep(fragment.binding.tvStepCount.getText().toString());
+                                                    }
                                                     runningFinishBean.setTime(fragment.binding.chronometer.getText().toString());
                                                     runningFinishBean.setDate(TimeUtil.getStampToTime(userStepEntity.getFinishTimeStamp() * 1000, "yyyy/MM/dd HH:mm"));
                                                     runningFinishBean.setStreetTitle(userStepEntity.getStreetTitle());
@@ -17,6 +17,7 @@ import com.cnlive.moudle.pedometer.ui.fragment.RunningFinishFragment;
 import com.cnlive.moudle.pedometer.ui.fragment.RunningMapFragment;
 import com.cnlive.moudle.pedometer.utils.MyMapUtil;
 import com.cnlive.moudle.pedometer.utils.QMUITipDialogUtil;
+import com.cnlive.moudle.pedometer.utils.StepUtil;
 import com.example.moudle_pedometer.R;
 import com.hannesdorfmann.mosby3.mvp.MvpView;
 import com.sothree.slidinguppanel.SlidingUpPanelLayout;
@@ -59,21 +60,13 @@ public class RunningFinishFragmentView implements MvpView {
         //设置距离
         fragment.binding.includeFinishUserInfo.tvDistance.setText(runningFinishBean.getRunDistance());
         //设置配速
-        if ("--".equals(runningFinishBean.getSpeed())) {
-            fragment.binding.includeFinishUserInfo.tvSpeed.setText("0");
-        } else {
-            fragment.binding.includeFinishUserInfo.tvSpeed.setText(runningFinishBean.getSpeed());
-        }
+        fragment.binding.includeFinishUserInfo.tvSpeed.setText(runningFinishBean.getSpeed());
         //设置用时
         fragment.binding.includeFinishUserInfo.tvTimer.setText(runningFinishBean.getTime());
         //设置日期
         fragment.binding.includeFinishUserInfo.tvDate.setText(runningFinishBean.getDate());
         //设置步数
-        if ("--".equals(runningFinishBean.getStep())) {
-            fragment.binding.includeFinishStep.tvStep.setText("0");
-        } else {
-            fragment.binding.includeFinishStep.tvStep.setText(runningFinishBean.getStep());
-        }
+        fragment.binding.includeFinishStep.tvStep.setText(runningFinishBean.getStep());
         //设置起点位置
         fragment.binding.includeFinishRunRoute.tvStartPoint.setText(runningFinishBean.getStartPoint());
         //设置终点位置
@@ -86,6 +86,50 @@ public class RunningMapFragmentView implements MvpView, SensorEventListener {
     public void initView() {
         currentPoints = new ArrayList<>();
+        initMap();
+        //返回键
+        fragment.binding.flBack.setOnTouchListener(new View.OnTouchListener() {
+            @Override
+            public boolean onTouch(View view, MotionEvent motionEvent) {
+                if (motionEvent.getAction() == MotionEvent.ACTION_DOWN) {
+                    ButtonAnimUtil.setViewZoomIn(fragment.binding.flBack);
+                } else if (motionEvent.getAction() == MotionEvent.ACTION_UP) {
+                    ButtonAnimUtil.setViewZoomOut(fragment.binding.flBack);
+                }
+                return false;
+            }
+        });
+        //返回键点击事件
+        fragment.binding.flBack.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                fragment.getActivity().finish();
+            }
+        });
+        //重新定位
+        fragment.binding.flLocation.setOnTouchListener(new View.OnTouchListener() {
+            @Override
+            public boolean onTouch(View view, MotionEvent motionEvent) {
+                if (motionEvent.getAction() == MotionEvent.ACTION_DOWN) {
+                    ButtonAnimUtil.setViewZoomIn(fragment.binding.flLocation);
+                } else if (motionEvent.getAction() == MotionEvent.ACTION_UP) {
+                    ButtonAnimUtil.setViewZoomOut(fragment.binding.flLocation);
+                }
+                return false;
+            }
+        });
+        //重新定位功能
+        fragment.binding.flLocation.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                mLocClient.restart();
+                isFirstLoc = true;
+            }
+        });
+
+    }
+
+    public void initMap() {
         this.mMapView = fragment.binding.mapView;
         if (baiduMap == null) {
             baiduMap = mMapView.getMap();
@@ -158,46 +202,6 @@ public class RunningMapFragmentView implements MvpView, SensorEventListener {
             public void onMapLoaded() {
             }
         });
-        //返回键
-        fragment.binding.flBack.setOnTouchListener(new View.OnTouchListener() {
-            @Override
-            public boolean onTouch(View view, MotionEvent motionEvent) {
-                if (motionEvent.getAction() == MotionEvent.ACTION_DOWN) {
-                    ButtonAnimUtil.setViewZoomIn(fragment.binding.flBack);
-                } else if (motionEvent.getAction() == MotionEvent.ACTION_UP) {
-                    ButtonAnimUtil.setViewZoomOut(fragment.binding.flBack);
-                }
-                return false;
-            }
-        });
-        //返回键点击事件
-        fragment.binding.flBack.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                fragment.getActivity().finish();
-            }
-        });
-        //重新定位
-        fragment.binding.flLocation.setOnTouchListener(new View.OnTouchListener() {
-            @Override
-            public boolean onTouch(View view, MotionEvent motionEvent) {
-                if (motionEvent.getAction() == MotionEvent.ACTION_DOWN) {
-                    ButtonAnimUtil.setViewZoomIn(fragment.binding.flLocation);
-                } else if (motionEvent.getAction() == MotionEvent.ACTION_UP) {
-                    ButtonAnimUtil.setViewZoomOut(fragment.binding.flLocation);
-                }
-                return false;
-            }
-        });
-        //重新定位功能
-        fragment.binding.flLocation.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                mLocClient.restart();
-                isFirstLoc = true;
-            }
-        });
-
     }
     public void drawServerStreetTrace(List<LatLng> trackPoints) {
@@ -11,6 +11,7 @@ import com.cnlive.moudle.pedometer.model.RunningFinishBean;
 import com.cnlive.moudle.pedometer.net.bean.BaseInfo;
 import com.cnlive.moudle.pedometer.net.bean.EventRouteRecordBeanVoListBean;
 import com.cnlive.moudle.pedometer.net.bean.SelfRecordInfo;
+import com.cnlive.moudle.pedometer.ui.activity.ALLScoreDetailActivity;
 import com.cnlive.moudle.pedometer.ui.activity.LineUpAgainActivity;
 import com.cnlive.moudle.pedometer.ui.activity.RunLineActivity;
 import com.cnlive.moudle.pedometer.ui.adapter.RaceRecordAdapter;
@@ -66,8 +67,34 @@ public class SelfRecordView implements MvpView {
                 adapter.setOnClickListener(new RaceRecordAdapter.OnClickListener() {
                     @Override
                     public void onClickListener(EventRouteRecordBeanVoListBean bean, int position) {
-                        CollRunningFinishActivity.startActivity(fragment.getActivity(), new RunningFinishBean());
-                    }
+                        if (null != bean) {
+                            //设置数据
+                            RunningFinishBean runningFinishBean = new RunningFinishBean();
+                            //设置赛事标题
+                            runningFinishBean.setStreetTitle(bean.getEventTitle());
+                            //设置步数
+                            runningFinishBean.setStep(bean.getStep());
+                            //设置距离
+                            runningFinishBean.setRunDistance(bean.getMileage());
+                            //设置配速
+                            runningFinishBean.setSpeed(bean.getPace());
+                            //设置用时
+                            runningFinishBean.setEmployTime(bean.getEmployTime());
+                            //设置开始位置
+                            runningFinishBean.setStartPoint(bean.getStartLocation());
+                            //设置结束位置
+                            runningFinishBean.setEndPoint(bean.getEndLocation());
+                            //设置用户轨迹开始时间
+                            runningFinishBean.setUserStartTime(bean.getStartTime());
+                            //设置用户轨迹结束时间
+                            runningFinishBean.setUserFinishTime(bean.getEndTime());
+                            //设置用户是否完成
+                            runningFinishBean.setIsFinish(bean.getCompleteStatus() + "");
+
+                            //设置起点
+                            ALLScoreDetailActivity.startActivity(fragment.getActivity(), runningFinishBean);
+
+                        }                    }
                 });
             } else {
                 adapter.notifyDataSetChanged();
@@ -21,6 +21,24 @@ public class RunningFinishBean implements Serializable {
     private String isFinish;
     private String roadmap;
     private String streetTitle;
+    private String userStartTime;
+    private String userFinishTime;
+
+    public String getUserStartTime() {
+        return userStartTime;
+    }
+
+    public void setUserStartTime(String userStartTime) {
+        this.userStartTime = userStartTime;
+    }
+
+    public String getUserFinishTime() {
+        return userFinishTime;
+    }
+
+    public void setUserFinishTime(String userFinishTime) {
+        this.userFinishTime = userFinishTime;
+    }
     public String getStreetTitle() {
         return streetTitle;
@@ -25,6 +25,51 @@ public class EventRouteRecordBeanVoListBean {
     private int recordId;
     private String roadmap;
     private String step;
+    private String startTime;
+    private String endTime;
+    private String startLocation;
+    private String endLocation;
+    private int completeStatus;
+
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+
+    public String getStartLocation() {
+        return startLocation;
+    }
+
+    public void setStartLocation(String startLocation) {
+        this.startLocation = startLocation;
+    }
+
+    public String getEndLocation() {
+        return endLocation;
+    }
+
+    public void setEndLocation(String endLocation) {
+        this.endLocation = endLocation;
+    }
+
+    public int getCompleteStatus() {
+        return completeStatus;
+    }
+
+    public void setCompleteStatus(int completeStatus) {
+        this.completeStatus = completeStatus;
+    }
     public long getCreateTime() {
         return createTime;
@@ -184,6 +184,8 @@ public class StepService extends Service implements SensorEventListener {
         showStartForegroundNotification();
     }
+    private static int retryIndex = 0;
+
     private void initTrace() {
         if (mClient == null) {
             mClient = new LBSTraceClient(getApplicationContext());
@@ -243,6 +245,7 @@ public class StepService extends Service implements SensorEventListener {
                 if (StatusCodes.SUCCESS == errorNo || StatusCodes.START_TRACE_NETWORK_CONNECT_FAILED <= errorNo) {
                     //开始进行采集
                     if (mClient != null) {
+                        retryIndex = 0;
                         mClient.startGather(traceListener);
                         Toast.makeText(getApplicationContext(), "开启轨迹服务", Toast.LENGTH_LONG).show();
                         boolean isFirstSendNotification = CommonInfo.getIsFirstStepSendTraceTip(getApplicationContext());
@@ -262,6 +265,14 @@ public class StepService extends Service implements SensorEventListener {
                         CommonInfo.setIsFirstStepSendTraceTip(getApplicationContext(), false);
                         EventBus.getDefault().post(new MessageEvent(Constant.START_TRACE_GATHER_FAIL, ""));
                     }
+                    if (retryIndex < 4) {
+                        //重新开启服务
+                        if (mClient != null) {
+                            mClient.startTrace(mTrace, traceListener);
+                            retryIndex++;
+                        }
+                    }
+
                 }
             }
@@ -300,7 +311,16 @@ public class StepService extends Service implements SensorEventListener {
             @Override
             public void onStartGatherCallback(int errorNo, String message) {
                 if (StatusCodes.SUCCESS == errorNo || StatusCodes.GATHER_STARTED == errorNo) {
+                    retryIndex = 0;
                     Toast.makeText(getApplicationContext(), "开始采集", Toast.LENGTH_LONG).show();
+                } else {
+                    //重新开启采集
+                    if (retryIndex < 4) {
+                        if (null != mClient) {
+                            mClient.startGather(traceListener);
+                        }
+                        retryIndex++;
+                    }
                 }
             }
@@ -703,7 +723,7 @@ public class StepService extends Service implements SensorEventListener {
                 CURRENT_STEP = Integer.parseInt(userStepEntity.getStepCount());
             }
         }
-        Log.e(TAG, "initTodayData: 初始化当前步数" + CURRENT_STEP);
+//        Log.e(TAG, "initTodayData: 初始化当前步数" + CURRENT_STEP);
         if (mStepCount != null) {
             mStepCount.setSteps(CURRENT_STEP);
         }
@@ -711,7 +731,7 @@ public class StepService extends Service implements SensorEventListener {
     }
     private void updateNotification() {
-        Log.e(TAG, "updateNotification: 当前步数:" + CURRENT_STEP);
+//        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);
@@ -43,14 +43,18 @@ public class RaceRecordAdapter extends RecyclerView.Adapter&lt;RaceRecordAdapter.My
     @NonNull
     @Override
     public MyHolder onCreateViewHolder(@NonNull ViewGroup viewGroup, int i) {
-        View view = LayoutInflater.from(context).inflate(R.layout.item_race_record,viewGroup,false);
+        View view = LayoutInflater.from(context).inflate(R.layout.item_race_record, viewGroup, false);
         return new MyHolder(view);
     }
     @Override
     public void onBindViewHolder(@NonNull MyHolder myHolder, int i) {
-        myHolder.record_time_day.setText(TimeUtil.getStampToTime(list.get(i).getCreateTime(), "MM月dd日"));
-        myHolder.record_time.setText(TimeUtil.getStampToTime(list.get(i).getCreateTime(), "HH:mm"));
+        if (!TextUtils.isEmpty(list.get(i).getStartTime())) {
+            myHolder.record_time_day.setText(TimeUtil.getStampToTime(Long.parseLong(list.get(i).getStartTime()) * 1000, "MM月dd日"));
+        }
+        if (!TextUtils.isEmpty(list.get(i).getStartTime())) {
+            myHolder.record_time.setText(TimeUtil.getStampToTime(Long.parseLong(list.get(i).getStartTime()) * 1000, "HH:mm"));
+        }
         myHolder.item_title.setText(list.get(i).getEventTitle());
         myHolder.record_kli.setText(list.get(i).getMileage());
         //设置时间
@@ -62,7 +66,8 @@ public class RaceRecordAdapter extends RecyclerView.Adapter&lt;RaceRecordAdapter.My
         if (onClickListener != null)
             myHolder.ry_re.setOnClickListener(v -> onClickListener.onClickListener(list.get(i), i));
 //        Glide.with(context).load(list.get(i).getRoadmap()).into(myHolder.item_img);
-        if(onClickListener != null) myHolder.ry_re.setOnClickListener(v -> onClickListener.onClickListener(list.get(i),i));
+        if (onClickListener != null)
+            myHolder.ry_re.setOnClickListener(v -> onClickListener.onClickListener(list.get(i), i));
     }
     @Override
@@ -70,7 +75,7 @@ public class RaceRecordAdapter extends RecyclerView.Adapter&lt;RaceRecordAdapter.My
         return list.size();
     }
-    class MyHolder extends RecyclerView.ViewHolder{
+    class MyHolder extends RecyclerView.ViewHolder {
         TextView record_time_day;
         TextView record_time;
@@ -97,7 +102,7 @@ public class RaceRecordAdapter extends RecyclerView.Adapter&lt;RaceRecordAdapter.My
     }
-    public interface OnClickListener{
+    public interface OnClickListener {
         void onClickListener(EventRouteRecordBeanVoListBean bean, int position);
     }
 }
@@ -49,6 +49,9 @@ public class ALLScoreDetailFragment extends QMUIFragment&lt;ALLScoreDetailFragmentV
                 if (getMvpView() != null) {
                     getMvpView().initMap();
                     getMvpView().initView(runningFinishBean);
+                    if (getPresenter() != null) {
+                        getPresenter().queryHistoryTrace(getActivity(), runningFinishBean);
+                    }
                 }
             }
         }
@@ -17,29 +17,27 @@
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
                 android:padding="10dp"
-                android:src="@drawable/top_back_black"/>
+                android:src="@drawable/top_back_black" />
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:textColor="#333333"
-                android:textSize="18sp"
                 android:layout_centerInParent="true"
+                android:layout_centerVertical="true"
                 android:text="@string/myrecord"
-                />
+                android:textColor="#333333"
+                android:textSize="18sp" />
             <TextView
                 android:id="@+id/again_up"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
                 android:padding="10dp"
-                android:textColor="#333333"
-                android:textSize="15sp"
-                android:layout_alignParentRight="true"
                 android:text="@string/again_up"
-                />
+                android:textColor="#333333"
+                android:textSize="15sp" />
         </RelativeLayout>
         <RelativeLayout
@@ -75,18 +73,17 @@
                 android:textColor="@color/white"
                 android:textSize="50sp" />
-            <RelativeLayout
+            <LinearLayout
                 android:id="@+id/ry_finish"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_below="@id/kilometer_num"
-                android:layout_marginLeft="20dp"
-                android:layout_marginTop="10dp"
-                android:layout_marginRight="20dp">
-
+                android:layout_below="@id/kilometer_num">
+                <!---->
                 <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:gravity="center"
                     android:orientation="vertical">
                     <TextView
@@ -107,12 +104,11 @@
                         android:textColor="@color/white"
                         android:textSize="20sp" />
                 </LinearLayout>
-
-
+                <!---->
                 <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerInParent="true"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
                     android:orientation="vertical">
                     <TextView
@@ -133,11 +129,11 @@
                         android:textColor="@color/white"
                         android:textSize="20sp" />
                 </LinearLayout>
-
+                <!---->
                 <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentRight="true"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
                     android:orientation="vertical">
                     <TextView
@@ -158,19 +154,21 @@
                         android:textColor="@color/white"
                         android:textSize="20sp" />
                 </LinearLayout>
-            </RelativeLayout>
-
-            <RelativeLayout
+                <!---->
+            </LinearLayout>
+            <!---->
+            <!--未完成-->
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_below="@id/ry_finish"
-                android:layout_marginLeft="20dp"
-                android:layout_marginTop="10dp"
-                android:layout_marginRight="20dp">
-
+                android:layout_marginTop="10dp">
+                <!---->
                 <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:gravity="center"
                     android:orientation="vertical">
                     <TextView
@@ -191,12 +189,11 @@
                         android:textColor="@color/white"
                         android:textSize="20sp" />
                 </LinearLayout>
-
-
+                <!---->
                 <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerInParent="true"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
                     android:orientation="vertical">
                     <TextView
@@ -217,11 +214,11 @@
                         android:textColor="@color/white"
                         android:textSize="20sp" />
                 </LinearLayout>
-
+                <!---->
                 <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentRight="true"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
                     android:orientation="vertical">
                     <TextView
@@ -242,7 +239,8 @@
                         android:textColor="@color/white"
                         android:textSize="20sp" />
                 </LinearLayout>
-            </RelativeLayout>
+                <!---->
+            </LinearLayout>
         </RelativeLayout>
@@ -260,7 +258,7 @@
                 android:text="@string/has_take_part_line"
                 android:textColor="#333333"
                 android:textSize="18sp" />
-            
+
             <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -271,19 +269,18 @@
                     android:id="@+id/has_finish"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textSize="18sp"
+                    android:text="@string/finish"
                     android:textColor="#36C28D"
-                    android:text="@string/finish" />
+                    android:textSize="18sp" />
                 <TextView
                     android:id="@+id/no_finish"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/no_finish"
                     android:layout_marginLeft="20dp"
+                    android:text="@string/no_finish"
                     android:textColor="#333333"
-                    android:textSize="15sp"
-                    />
+                    android:textSize="15sp" />
             </LinearLayout>
         </RelativeLayout>