1.;跑步结束页面

杨帅
1 parent f58e15ec
Showing 21 changed files with 608 additions and 362 deletions
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/model/RunningFinishBean.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/service/StepService.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/PedometerMainActivity.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/RunningFinishActivity.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/RunningFinishFragment.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/utils/TimeUtil.java
moudle_pedometer/src/main/res/drawable-hdpi/xqt_share.png
moudle_pedometer/src/main/res/drawable-hdpi/xqy_return.png
moudle_pedometer/src/main/res/drawable-xhdpi/xqt_share.png
moudle_pedometer/src/main/res/drawable-xhdpi/xqy_return.png
moudle_pedometer/src/main/res/drawable-xxhdpi/xqt_share.png
moudle_pedometer/src/main/res/drawable-xxhdpi/xqy_return.png
moudle_pedometer/src/main/res/drawable/shape_10dp_white_raduis_bg.xml
moudle_pedometer/src/main/res/layout/fragment_finish_run_map.xml
moudle_pedometer/src/main/res/layout/fragment_run_race_detail.xml
moudle_pedometer/src/main/res/layout/layout_finish_running_route.xml
moudle_pedometer/src/main/res/layout/layout_finish_step.xml
@@ -11,6 +11,7 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.widget.Chronometer;
+import com.cnlive.moudle.pedometer.model.RunningFinishBean;
 import com.cnlive.moudle.pedometer.model.RunningMapBean;
 import com.cnlive.moudle.pedometer.model.Constant;
 import com.cnlive.moudle.pedometer.model.MessageEvent;
@@ -183,7 +184,7 @@ public class RunMainFragmentView implements MvpView {
             public void onClick(View view) {
                 //继续记录轨迹
                 if (StepService.mClient != null && StepService.traceListener != null) {
-                    StepService.mClient.startTrace(StepService.mTrace,StepService.traceListener);
+                    StepService.mClient.startTrace(StepService.mTrace, StepService.traceListener);
                 }
                 needWriteDataFlag = true;
                 //将当前计时器时间戳写入数据库
@@ -248,6 +249,7 @@ public class RunMainFragmentView implements MvpView {
                                             SelectDialog selectDialog = new SelectDialog(fragment.getActivity(), "确定结束运动吗?", "确定", new SelectDialog.DialogInterface() {
                                                 @Override
                                                 public void onClick(SelectDialog dialog) {
+                                                    MySpHelper.getInstance(getContext(), Context.MODE_MULTI_PROCESS).putBoolean("writeUserStep:" + uid, false);
                                                     fragment.binding.cpCurrent.setVisibility(View.GONE);
                                                     ButtonAnimUtil.setViewDefault(fragment.binding.flStop);
                                                     //清空数据
@@ -259,7 +261,15 @@ public class RunMainFragmentView implements MvpView {
                                                     MySpHelper.getInstance(getContext(), Context.MODE_MULTI_PROCESS).putLong("stepStartTime", 0);
                                                     fragment.getActivity().stopService(new Intent(fragment.getActivity(), StepService.class));
                                                     MySpHelper.getInstance(getContext(), Context.MODE_MULTI_PROCESS).putString("userId", "");
-                                                    RunningFinishActivity.startActivity(fragment.getActivity());
+                                                    RunningFinishBean runningFinishBean = new RunningFinishBean();
+                                                    runningFinishBean.setStartPoint("开始地点");
+                                                    runningFinishBean.setEndPoint("结束地点");
+                                                    runningFinishBean.setRunDistance(fragment.binding.tvRunDistance.getText().toString());
+                                                    runningFinishBean.setSpeed(fragment.binding.tvSpeed.getText().toString());
+                                                    runningFinishBean.setStep(fragment.binding.tvStepCount.getText().toString());
+                                                    runningFinishBean.setTime(fragment.binding.chronometer.getText().toString());
+                                                    runningFinishBean.setDate(TimeUtil.getFormatNowTime());
+                                                    RunningFinishActivity.startActivity(fragment.getActivity(), runningFinishBean);
                                                     fragment.getActivity().finish();
                                                 }
                                             }, "取消", new SelectDialog.DialogInterface() {
@@ -337,7 +347,7 @@ public class RunMainFragmentView implements MvpView {
                 //暂停计步
                 EventBus.getDefault().post(new MessageEvent(Constant.SERVICE_STEP_COUNT_PAUSE, ""));
                 //重置速度
-                resetSpeed();
+//                resetSpeed();
             }
         });
         //gps点击事件
@@ -409,7 +419,7 @@ public class RunMainFragmentView implements MvpView {
         //设置行走公里
         fragment.binding.tvRunDistance.setText(StepUtil.getWalkDistanceKM(step) + "");
         //设置行走步数
-        fragment.binding.tvStepCount.setText(step + "步");
+        fragment.binding.tvStepCount.setText(step+"");
         //设置S速度
         int second = (int) ((SystemClock.elapsedRealtime() - fragment.binding.chronometer.getBase()) / 1000);
         if (second != 0) {
@@ -257,6 +257,16 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
         fragment.binding.includeStreet.fiveJoinPerson.setOnClickListener(v -> {
             TakePartActivity.newInstance(fragment.getActivity());
         });
+        //返回按钮
+        fragment.binding.ivBack.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (fragment.getActivity()==null){
+                    return;
+                }
+                fragment.getActivity().finish();
+            }
+        });
     }
     private void initMap() {
 package com.cnlive.moudle.pedometer.frame.view;
 import android.content.Context;
+import android.view.View;
+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;
@@ -16,4 +18,33 @@ public class RunningFinishFragmentView implements MvpView {
     public Context getContext() {
         return fragment == null ? null : fragment.getActivity();
     }
+
+    public void initView(RunningFinishBean runningFinishBean) {
+        //设置距离
+        fragment.binding.includeFinishUserInfo.tvDistance.setText(runningFinishBean.getRunDistance());
+        //设置配速
+        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());
+        //设置起点位置
+        fragment.binding.includeFinishRunRoute.tvStartPoint.setText(runningFinishBean.getStartPoint());
+        //设置终点位置
+        fragment.binding.includeFinishRunRoute.tvEndPoint.setText(runningFinishBean.getEndPoint());
+        //设置时间
+        fragment.binding.includeFinishRunRoute.tvTimer.setText(runningFinishBean.getTime());
+        //返回按钮点击
+        fragment.binding.flBack.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (fragment.getActivity() == null) {
+                    return;
+                }
+                fragment.getActivity().finish();
+            }
+        });
+    }
 }
+package com.cnlive.moudle.pedometer.model;
+
+import java.io.Serializable;
+
+/**
+ * 跑步结束相关数据
+ *
+ * @author ShinnyYang
+ */
+public class RunningFinishBean implements Serializable {
+    private String runDistance;
+    private String speed;
+    private String time;
+    private String step;
+    private String startPoint;
+    private String endPoint;
+    private String date;
+
+    public String getRunDistance() {
+        return runDistance;
+    }
+
+    public void setRunDistance(String runDistance) {
+        this.runDistance = runDistance;
+    }
+
+    public String getSpeed() {
+        return speed;
+    }
+
+    public void setSpeed(String speed) {
+        this.speed = speed;
+    }
+
+    public String getTime() {
+        return time;
+    }
+
+    public void setTime(String time) {
+        this.time = time;
+    }
+
+    public String getStep() {
+        return step;
+    }
+
+    public void setStep(String step) {
+        this.step = step;
+    }
+
+    public String getStartPoint() {
+        return startPoint;
+    }
+
+    public void setStartPoint(String startPoint) {
+        this.startPoint = startPoint;
+    }
+
+    public String getEndPoint() {
+        return endPoint;
+    }
+
+    public void setEndPoint(String endPoint) {
+        this.endPoint = endPoint;
+    }
+
+    public String getDate() {
+        return date;
+    }
+
+    public void setDate(String date) {
+        this.date = date;
+    }
+}
@@ -360,12 +360,13 @@ public class StepService extends Service implements SensorEventListener {
 //        userId=intent.getExtras().getString("userId");
         userId = MySpHelper.getInstance(getApplicationContext(), Context.MODE_MULTI_PROCESS).getString("userId", "");
         if (userId != null && !TextUtils.isEmpty(userId)) {
-            entityName = userId;
-            initTodayData(userId);
-            initTrace();
             if (!EventBus.getDefault().isRegistered(this)) {
                 EventBus.getDefault().register(this);
             }
+            MySpHelper.getInstance(getApplicationContext(), Context.MODE_MULTI_PROCESS).putBoolean("writeUserStep:" + userId, true);
+            entityName = userId;
+            initTodayData(userId);
+            initTrace();
             //显示计步通知
             showStartForegroundNotification();
             new Thread(new Runnable() {
@@ -532,7 +533,7 @@ public class StepService extends Service implements SensorEventListener {
         if (userId == null || CURRENT_DATE == null) {
             return;
         }
-//        //获取当天的数据，用于展示 CURRENT_DATE
+        //获取当天的数据，用于展示 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;
@@ -895,10 +896,10 @@ public class StepService extends Service implements SensorEventListener {
      * 保存记步数据
      */
     private void save() {
-//        boolean isWriteUserStep = MySpHelper.getInstance(getApplicationContext(), Context.MODE_MULTI_PROCESS).getBoolean("writeUserStep:" + userId, false);
-//        if (!isWriteUserStep) {
-//            return;
-//        }
+        boolean isWriteUserStep = MySpHelper.getInstance(getApplicationContext(), Context.MODE_MULTI_PROCESS).getBoolean("writeUserStep:" + userId, false);
+        if (!isWriteUserStep) {
+            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()) {
 package com.cnlive.moudle.pedometer.ui.activity;
 import android.Manifest;
+import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageInfo;
@@ -240,6 +241,7 @@ public class PedometerMainActivity extends QMUIFragmentActivity {
     }
+
     @Override
     public void onBackPressed() {
         return;
@@ -9,6 +9,7 @@ import com.alibaba.android.arouter.facade.annotation.Route;
 import com.cnlive.libs.base.ui.QMUIFragment;
 import com.cnlive.libs.base.ui.QMUIFragmentActivity;
 import com.cnlive.libs.base.util.StatusBarUtil2;
+import com.cnlive.moudle.pedometer.model.RunningFinishBean;
 import com.cnlive.moudle.pedometer.model.RunningMapBean;
 import com.cnlive.moudle.pedometer.ui.fragment.RunRaceDetailFragment;
 import com.cnlive.moudle.pedometer.ui.fragment.RunningFinishFragment;
@@ -31,12 +32,15 @@ public class RunningFinishActivity extends QMUIFragmentActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         StatusBarUtil2.setColor(this, getResources().getColor(R.color.run_main_bg), 0);
-        addFragment();
+        if (getIntent().getSerializableExtra("runningFinishBean") != null) {
+            addFragment((RunningFinishBean) getIntent().getSerializableExtra("runningFinishBean"));
+        }
+
     }
-    private void addFragment() {
-        QMUIFragment fragment = new RunningFinishFragment();
+    private void addFragment(RunningFinishBean runningFinishBean) {
+        QMUIFragment fragment = RunningFinishFragment.instance(runningFinishBean);
         getSupportFragmentManager().beginTransaction()
                 .add(getContextViewId(), fragment, fragment.getClass().getSimpleName())
                 .addToBackStack(fragment.getClass().getSimpleName())
@@ -51,8 +55,9 @@ public class RunningFinishActivity extends QMUIFragmentActivity {
         }
     }
-    public static void startActivity(Activity activity) {
+    public static void startActivity(Activity activity, RunningFinishBean runningFinishBean) {
         Intent intent = new Intent(activity, RunningFinishActivity.class);
+        intent.putExtra("runningFinishBean", runningFinishBean);
         activity.startActivity(intent);
     }
 }
 package com.cnlive.moudle.pedometer.ui.fragment;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.view.View;
+
 import com.cnlive.libs.base.ui.QMUIFragment;
 import com.cnlive.moudle.pedometer.frame.presenter.RunningFinishFragmetPresenter;
 import com.cnlive.moudle.pedometer.frame.view.RunningFinishFragmentView;
+import com.cnlive.moudle.pedometer.model.RunningFinishBean;
 import com.example.moudle_pedometer.R;
 import com.example.moudle_pedometer.databinding.FragmentFinishRunMapBinding;
 public class RunningFinishFragment extends QMUIFragment<RunningFinishFragmentView, RunningFinishFragmetPresenter, FragmentFinishRunMapBinding> {
+    private RunningFinishBean runningFinishBean;
+
+    public static RunningFinishFragment instance(RunningFinishBean runningFinishBean) {
+        RunningFinishFragment fragment = new RunningFinishFragment();
+        Bundle bundle = null;
+        if (runningFinishBean != null) {
+            bundle = new Bundle();
+            bundle.putSerializable("runningFinishBean", runningFinishBean);
+        }
+        fragment.setArguments(bundle);
+        return fragment;
+    }
+
     @Override
     protected int getToolbarId() {
         return 0;
@@ -21,4 +39,17 @@ public class RunningFinishFragment extends QMUIFragment&lt;RunningFinishFragmentVie
     protected int getLayoutId() {
         return R.layout.fragment_finish_run_map;
     }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        if (getArguments() != null) {
+            runningFinishBean = (RunningFinishBean) getArguments().getSerializable("runningFinishBean");
+            if (runningFinishBean != null) {
+                if (getMvpView() != null) {
+                    getMvpView().initView(runningFinishBean);
+                }
+            }
+        }
+    }
 }
 package com.cnlive.moudle.pedometer.utils;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+/**
+ * @author ShinnyYang
+ */
 public class TimeUtil {
     /**
      * 获取当前时间戳(单位：秒)
@@ -10,4 +17,84 @@ public class TimeUtil {
         return System.currentTimeMillis() / 1000;
     }
+    /**
+     * 日期格式字符串转换成时间戳
+     *
+     * @param dateStr 字符串日期
+     * @return
+     */
+    public static long DateToTimeStamp(String dateStr) {
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        try {
+            Date date = simpleDateFormat.parse(dateStr);
+            long ts = date.getTime() / 1000;
+            return ts;
+        } catch (ParseException e) {
+            return 0;
+        }
+    }
+
+    /**
+     * 取得当前时间戳（精确到秒）
+     *
+     * @return time(long型的时间)
+     */
+    public static long getNowTimeStamp() {
+        long time = System.currentTimeMillis() / 1000;
+        return time;
+    }
+
+
+    /**
+     * 取得当前格式化的时间戳
+     *
+     * @return 格式化后的日期
+     */
+    public static String getFormatNowTime() {
+        SimpleDateFormat df = new SimpleDateFormat("yyyy/MM/dd HH:mm");
+        long time = System.currentTimeMillis();
+        return df.format(time);
+    }
+
+    /**
+     * 取得指定时间的格式化的时间戳（精确到秒）
+     *
+     * @return 格式化后的日期
+     */
+    public static String getFormatTimeStamp(String timeType) {
+        SimpleDateFormat df = new SimpleDateFormat(timeType);
+        long time = System.currentTimeMillis();
+        return df.format(time);
+    }
+
+    /**
+     * 取得指定时间的格式化的时间戳（精确到秒）
+     *
+     * @return 格式化后的日期
+     */
+    public static String getStampToTime(long time) {
+        String res;
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        long lt = new Long(time * 1000);
+        Date date = new Date(lt);
+        res = simpleDateFormat.format(date);
+        return res;
+    }
+
+    /**
+     * 计算时间差
+     *
+     * @return
+     */
+    public static String getWorkTime(long startTime, long workTime) {
+        int days = (int) ((workTime - startTime) / (1000 * 60 * 60 * 24));
+        int hours = (int) ((workTime - startTime) / (1000 * 60 * 60));
+        int minute = (int) ((workTime - startTime) / (1000 * 60));
+        return "据上班时间还有：" + hours + "小时," + minute + "分钟";
+    }
+
+    public static String getCurrentTimeStr(String formate) {
+        SimpleDateFormat df = new SimpleDateFormat(formate);
+        return df.format(new Date());
+    }
 }
@@ -2,7 +2,4 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <solid android:color="@color/white" />
     <corners android:radius="10dp" />
-    <stroke
-        android:width="1dp"
-        android:color="@color/line" />
 </shape>
 \ No newline at end of file
@@ -10,7 +10,7 @@
         sothree:umanoDragView="@+id/dragView"
         sothree:umanoFadeColor="@color/black_20"
         sothree:umanoOverlay="true"
-        sothree:umanoPanelHeight="220dp"
+        sothree:umanoPanelHeight="360dp"
         sothree:umanoParallaxOffset="100dp"
         sothree:umanoScrollableView="@+id/scrollView"
         sothree:umanoShadowHeight="0dp">
@@ -25,32 +25,22 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"></com.baidu.mapapi.map.MapView>
-            <FrameLayout
-                android:layout_width="40dp"
-                android:layout_height="40dp"
+
+            <ImageView
+                android:id="@+id/iv_back"
+                android:layout_width="35dp"
+                android:layout_height="35dp"
                 android:layout_margin="10dp"
-                android:background="@drawable/shape_circle_50_black">
-
-                <ImageView
-                    android:layout_width="10dp"
-                    android:layout_height="20dp"
-                    android:layout_gravity="center"
-                    android:background="@drawable/ic_white_back" />
-            </FrameLayout>
-
-            <FrameLayout
-                android:layout_width="40dp"
-                android:layout_height="40dp"
+                android:background="@drawable/xqy_return" />
+
+
+            <ImageView
+                android:id="@+id/iv_share"
+                android:layout_width="35dp"
+                android:layout_height="35dp"
                 android:layout_gravity="right"
                 android:layout_margin="10dp"
-                android:background="@drawable/shape_circle_50_black">
-
-                <ImageView
-                    android:layout_width="15dp"
-                    android:layout_height="15dp"
-                    android:layout_gravity="center"
-                    android:background="@drawable/icon_share" />
-            </FrameLayout>
+                android:background="@drawable/xqt_share" />
             <!---->
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_margin="10dp"
-    android:background="@drawable/shape_10dp_white_raduis_bg"
-    android:orientation="vertical">
-    <!--跑步路线-->
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
-        android:gravity="bottom">
-
-        <ImageView
-            android:layout_width="18dp"
-            android:layout_height="18dp"
-            android:layout_marginLeft="10dp"
-            android:background="@drawable/icon_run_route" />
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_marginLeft="5dp"
-            android:layout_marginBottom="1dp"
-            android:gravity="bottom"
-            android:text="跑步路线"
-            android:textColor="@color/text_black"
-            android:textSize="12sp" />
-    </LinearLayout>
-    <!--起点-->
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
-        android:gravity="center_vertical">
-
-        <View
-            android:layout_width="6dp"
-            android:layout_height="6dp"
-            android:layout_marginLeft="15dp"
-            android:background="@drawable/shape_circle_green" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="10dp"
-            android:text="@string/layout_street_start_point"
-            android:textColor="@color/text_gray"
-            android:textSize="12sp" />
-
-        <TextView
-            android:id="@+id/tv_start_point"
-            android:layout_width="wrap_content"
+        android:layout_margin="10dp"
+        android:background="@drawable/shape_10dp_white_raduis_bg"
+        android:orientation="vertical">
+        <!--跑步路线-->
+        <LinearLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="10dp"
-            android:text="首都师范大学操场东门"
-            android:textColor="@color/black"
-            android:textSize="12sp" />
-    </LinearLayout>
-    <!--竖线-->
-    <View
-        android:layout_width="1dp"
-        android:layout_height="18dp"
-        android:layout_marginLeft="17dp"
-        android:layout_marginTop="-3dp"
-        android:background="@color/vertical_line" />
-    <!--终点-->
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="-3dp"
-        android:gravity="center_vertical">
+            android:layout_marginTop="10dp"
+            android:gravity="bottom">
-        <View
-            android:layout_width="6dp"
-            android:layout_height="6dp"
-            android:layout_marginLeft="15dp"
-            android:background="@drawable/shape_circle_red" />
+            <ImageView
+                android:layout_width="18dp"
+                android:layout_height="18dp"
+                android:layout_marginLeft="10dp"
+                android:background="@drawable/icon_run_route" />
-        <TextView
-            android:layout_width="wrap_content"
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_marginLeft="5dp"
+                android:layout_marginBottom="1dp"
+                android:gravity="bottom"
+                android:text="跑步路线"
+                android:textColor="@color/text_black"
+                android:textSize="12sp" />
+        </LinearLayout>
+        <!--起点-->
+        <LinearLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="10dp"
-            android:text="@string/layout_street_end_point"
-            android:textColor="@color/text_gray"
-            android:textSize="12sp" />
+            android:layout_marginTop="10dp"
+            android:gravity="center_vertical">
-        <TextView
-            android:id="@+id/tv_end_point"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="10dp"
-            android:text="首都师范大学操场东门"
-            android:textColor="@color/black"
-            android:textSize="12sp" />
-    </LinearLayout>
-    <!--竖线-->
-    <View
-        android:layout_width="1dp"
-        android:layout_height="25dp"
-        android:layout_marginLeft="17dp"
-        android:layout_marginTop="-3dp"
-        android:background="@color/vertical_line" />
-    <!--时间-->
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="-15dp"
-        android:gravity="center_vertical">
+            <View
+                android:layout_width="6dp"
+                android:layout_height="6dp"
+                android:layout_marginLeft="15dp"
+                android:background="@drawable/shape_circle_green" />
-        <View
-            android:layout_width="4dp"
-            android:layout_height="4dp"
-            android:layout_marginLeft="16dp"
-            android:background="@drawable/shape_circle_gray" />
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10dp"
+                android:text="@string/layout_street_start_point"
+                android:textColor="@color/text_gray"
+                android:textSize="12sp" />
+            <TextView
+                android:id="@+id/tv_start_point"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10dp"
+                android:text="首都师范大学操场东门"
+                android:textColor="@color/black"
+                android:textSize="12sp" />
+        </LinearLayout>
+        <!--竖线-->
+        <View
+            android:layout_width="1dp"
+            android:layout_height="18dp"
+            android:layout_marginLeft="17dp"
+            android:layout_marginTop="-3dp"
+            android:background="@color/vertical_line" />
+        <!--终点-->
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
+            android:layout_marginTop="-3dp"
+            android:gravity="center_vertical">
+
+            <View
+                android:layout_width="6dp"
+                android:layout_height="6dp"
+                android:layout_marginLeft="15dp"
+                android:background="@drawable/shape_circle_red" />
             <TextView
-                android:id="@+id/tv_timer"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="10dp"
-                android:layout_marginTop="5dp"
-                android:text="00:27:23"
-                android:textColor="@color/text_black"
-                android:textSize="18sp"
-                android:textStyle="bold" />
+                android:text="@string/layout_street_end_point"
+                android:textColor="@color/text_gray"
+                android:textSize="12sp" />
             <TextView
+                android:id="@+id/tv_end_point"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="11dp"
-                android:text="跑步记录时长"
-                android:textColor="@color/text_gray"
-                android:textSize="11sp" />
-            <!---->
+                android:layout_marginLeft="10dp"
+                android:text="首都师范大学操场东门"
+                android:textColor="@color/black"
+                android:textSize="12sp" />
         </LinearLayout>
-    </LinearLayout>
-    <!--竖线-->
-    <View
-        android:layout_width="1dp"
-        android:layout_height="25dp"
-        android:layout_marginLeft="17dp"
-        android:layout_marginTop="-15dp"
-        android:background="@color/vertical_line" />
-    <!---->
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="-5dp"
-        android:layout_marginBottom="10dp"
-        android:gravity="center_vertical"
-        android:paddingTop="5dp">
-
+        <!--竖线-->
         <View
-            android:layout_width="4dp"
-            android:layout_height="4dp"
-            android:layout_marginLeft="16dp"
-            android:background="@drawable/shape_circle_gray" />
+            android:layout_width="1dp"
+            android:layout_height="25dp"
+            android:layout_marginLeft="17dp"
+            android:layout_marginTop="-3dp"
+            android:background="@color/vertical_line" />
+        <!--时间-->
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="-15dp"
+            android:gravity="center_vertical">
+
+            <View
+                android:layout_width="4dp"
+                android:layout_height="4dp"
+                android:layout_marginLeft="16dp"
+                android:background="@drawable/shape_circle_gray" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@+id/tv_timer"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="10dp"
+                    android:layout_marginTop="5dp"
+                    android:text="00:27:23"
+                    android:textColor="@color/text_black"
+                    android:textSize="18sp"
+                    android:textStyle="bold" />
-        <TextView
-            android:layout_width="wrap_content"
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="11dp"
+                    android:text="跑步记录时长"
+                    android:textColor="@color/text_gray"
+                    android:textSize="11sp" />
+                <!---->
+            </LinearLayout>
+        </LinearLayout>
+        <!--竖线-->
+        <View
+            android:layout_width="1dp"
+            android:layout_height="25dp"
+            android:layout_marginLeft="17dp"
+            android:layout_marginTop="-15dp"
+            android:background="@color/vertical_line" />
+        <!---->
+        <LinearLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="10dp"
-            android:text="路线完成"
-            android:textColor="@color/text_gray"
-            android:textSize="11sp" />
+            android:layout_marginTop="-5dp"
+            android:layout_marginBottom="10dp"
+            android:gravity="center_vertical"
+            android:paddingTop="5dp">
+
+            <View
+                android:layout_width="4dp"
+                android:layout_height="4dp"
+                android:layout_marginLeft="16dp"
+                android:background="@drawable/shape_circle_gray" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10dp"
+                android:text="路线完成"
+                android:textColor="@color/text_gray"
+                android:textSize="11sp" />
+        </LinearLayout>
+        <!---->
     </LinearLayout>
-    <!---->
-</LinearLayout>
 \ No newline at end of file
+</layout>
 \ No newline at end of file
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="80dp"
-    android:layout_margin="10dp"
-    android:background="@drawable/shape_10dp_white_raduis_bg"
-    android:orientation="vertical">
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
     <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="10dp"
-        android:layout_marginTop="10dp"
-        android:gravity="bottom">
-
-        <ImageView
-            android:layout_width="16dp"
-            android:layout_height="18dp"
-            android:background="@drawable/icon_step" />
+        android:layout_width="match_parent"
+        android:layout_height="80dp"
+        android:layout_margin="10dp"
+        android:background="@drawable/shape_10dp_white_raduis_bg"
+        android:orientation="vertical">
-        <TextView
+        <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="10dp"
-            android:text="总步数"
-            android:textSize="12sp" />
-    </LinearLayout>
-    <!---->
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center"
-        android:paddingBottom="10dp">
+            android:layout_marginTop="10dp"
+            android:gravity="bottom">
-        <TextView
-            android:id="@+id/tv_step"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="1233"
-            android:textColor="@color/green_round"
-            android:textSize="28sp"
-            android:textStyle="bold" />
+            <ImageView
+                android:layout_width="16dp"
+                android:layout_height="18dp"
+                android:background="@drawable/icon_step" />
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="10dp"
-            android:layout_marginTop="4dp"
-            android:text="步"
-            android:textColor="@color/text_black"
-            android:textSize="12sp" />
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10dp"
+                android:text="总步数"
+                android:textSize="12sp" />
+        </LinearLayout>
+        <!---->
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:gravity="center"
+            android:paddingBottom="10dp">
+
+            <TextView
+                android:id="@+id/tv_step"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="1233"
+                android:textColor="@color/green_round"
+                android:textSize="28sp"
+                android:textStyle="bold" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10dp"
+                android:layout_marginTop="4dp"
+                android:text="步"
+                android:textColor="@color/text_black"
+                android:textSize="12sp" />
+        </LinearLayout>
+        <!---->
     </LinearLayout>
-    <!---->
-</LinearLayout>
 \ No newline at end of file
+</layout>
 \ No newline at end of file
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:layout_margin="10dp">
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
-    <LinearLayout
+    <FrameLayout xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
-        android:layout_height="170dp"
-        android:layout_marginTop="30dp"
-        android:background="@drawable/shape_10dp_white_raduis_bg"
-        android:orientation="vertical">
+        android:layout_height="match_parent"
+        android:layout_margin="10dp">
-        <TextView
-            android:id="@+id/tv_user_nickName"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="80dp"
-            android:layout_marginTop="10dp"
-            android:text="用户昵称"
-            android:textColor="@color/text_black"
-            android:textSize="13sp" />
-        <!---->
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center_vertical">
+            android:layout_height="170dp"
+            android:layout_marginTop="30dp"
+            android:background="@drawable/shape_10dp_white_raduis_bg"
+            android:orientation="vertical">
-            <LinearLayout
-                android:layout_width="0dp"
+            <TextView
+                android:id="@+id/tv_user_nickName"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:orientation="vertical">
-
-                <TextView
-                    android:id="@+id/tv_street_name"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="15dp"
-                    android:layout_marginTop="15dp"
-                    android:text="奥森公园南路"
-                    android:textColor="@color/text_black"
-                    android:textSize="15sp" />
-
-                <TextView
-                    android:id="@+id/tv_date"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="15dp"
-                    android:layout_marginTop="5dp"
-                    android:text="2019/06/10 9:51"
-                    android:textSize="10sp"
-                    android:textColor="@color/text_gray" />
-            </LinearLayout>
+                android:layout_marginLeft="80dp"
+                android:layout_marginTop="10dp"
+                android:text="用户昵称"
+                android:textColor="@color/text_black"
+                android:textSize="13sp" />
             <!---->
             <LinearLayout
-                android:layout_width="0dp"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:gravity="right|bottom">
+                android:gravity="center_vertical">
-                <TextView
-                    android:id="@+id/tv_distance"
-                    android:layout_width="wrap_content"
+                <LinearLayout
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginRight="10dp"
-                    android:text="1.53"
-                    android:textColor="@color/text_black"
-                    android:textSize="45sp"
-                    android:textStyle="bold" />
+                    android:layout_weight="1"
+                    android:orientation="vertical">
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginRight="15dp"
-                    android:text="公里"
-                    android:textColor="@color/text_black"
-                    android:textSize="15sp" />
-            </LinearLayout>
-            <!---->
-        </LinearLayout>
-        <!--横线-->
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_marginTop="10dp"
-            android:background="@color/line" />
-        <!--配速和用时-->
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="10sp">
-            <!---->
-            <LinearLayout
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:gravity="center"
-                android:orientation="vertical">
+                    <TextView
+                        android:id="@+id/tv_street_name"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="15dp"
+                        android:layout_marginTop="15dp"
+                        android:text="奥森公园南路"
+                        android:textColor="@color/text_black"
+                        android:textSize="15sp" />
-                <TextView
-                    android:id="@+id/tv_speed"
-                    android:layout_width="wrap_content"
+                    <TextView
+                        android:id="@+id/tv_date"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="15dp"
+                        android:layout_marginTop="5dp"
+                        android:text="2019/06/10 9:51"
+                        android:textColor="@color/text_gray"
+                        android:textSize="10sp" />
+                </LinearLayout>
+                <!---->
+                <LinearLayout
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:text="34'33''"
-                    android:textColor="@color/text_black"
-                    android:textSize="20sp"
-                    android:textStyle="bold" />
+                    android:layout_weight="1"
+                    android:gravity="right|bottom">
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="5dp"
-                    android:text="配速"
-                    android:textColor="@color/text_black"
-                    android:textSize="15sp" />
+                    <TextView
+                        android:id="@+id/tv_distance"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="10dp"
+                        android:text="1.53"
+                        android:textColor="@color/text_black"
+                        android:textSize="45sp"
+                        android:textStyle="bold" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="15dp"
+                        android:text="公里"
+                        android:textColor="@color/text_black"
+                        android:textSize="15sp" />
+                </LinearLayout>
+                <!---->
             </LinearLayout>
-            <!---->
+            <!--横线-->
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginTop="10dp"
+                android:background="@color/line" />
+            <!--配速和用时-->
             <LinearLayout
-                android:layout_width="0dp"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:gravity="center"
-                android:orientation="vertical">
-
-                <TextView
-                    android:id="@+id/tv_timer"
-                    android:layout_width="wrap_content"
+                android:layout_marginTop="10sp">
+                <!---->
+                <LinearLayout
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:text="00:00:00"
-                    android:textColor="@color/text_black"
-                    android:textSize="20sp"
-                    android:textStyle="bold" />
+                    android:layout_weight="1"
+                    android:gravity="center"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:id="@+id/tv_speed"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="34'33''"
+                        android:textColor="@color/text_black"
+                        android:textSize="20sp"
+                        android:textStyle="bold" />
-                <TextView
-                    android:layout_width="wrap_content"
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="5dp"
+                        android:text="配速"
+                        android:textColor="@color/text_black"
+                        android:textSize="15sp" />
+                </LinearLayout>
+                <!---->
+                <LinearLayout
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="5dp"
-                    android:text="用时"
-                    android:textColor="@color/text_black"
-                    android:textSize="15sp" />
+                    android:layout_weight="1"
+                    android:gravity="center"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:id="@+id/tv_timer"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="00:00:00"
+                        android:textColor="@color/text_black"
+                        android:textSize="20sp"
+                        android:textStyle="bold" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="5dp"
+                        android:text="用时"
+                        android:textColor="@color/text_black"
+                        android:textSize="15sp" />
+                </LinearLayout>
+                <!---->
             </LinearLayout>
             <!---->
         </LinearLayout>
-        <!---->
-    </LinearLayout>
-    <com.qmuiteam.qmui.widget.QMUIRadiusImageView
-        android:id="@+id/qm_iv_icon"
-        android:layout_width="60dp"
-        android:layout_height="60dp"
-        android:layout_marginLeft="10dp"
-        android:background="@drawable/tc_ic_workout_level_adjust_coach"
-        app:qmui_corner_radius="100dp" />
-</FrameLayout>
 \ No newline at end of file
+        <com.qmuiteam.qmui.widget.QMUIRadiusImageView
+            android:id="@+id/qm_iv_icon"
+            android:layout_width="60dp"
+            android:layout_height="60dp"
+            android:layout_marginLeft="10dp"
+            android:background="@drawable/tc_ic_workout_level_adjust_coach"
+            app:qmui_corner_radius="100dp" />
+    </FrameLayout>
+</layout>
 \ No newline at end of file