1.;跑步结束页面

杨帅
1 parent e02ba35f
Showing 48 changed files with 230 additions and 130 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/RunningMapFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/service/StepService.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/utils/StepUtil.java
moudle_pedometer/src/main/res/drawable-hdpi/bg_tips_bottom_center.9.png
moudle_pedometer/src/main/res/drawable-hdpi/bg_tips_bottom_center.png
moudle_pedometer/src/main/res/drawable-hdpi/crown.png
moudle_pedometer/src/main/res/drawable-hdpi/more.png
moudle_pedometer/src/main/res/drawable-hdpi/rt_ic_home_map.png
moudle_pedometer/src/main/res/drawable-hdpi/rt_ic_home_map.webp
moudle_pedometer/src/main/res/drawable-hdpi/rt_training_button_pause.png
moudle_pedometer/src/main/res/drawable-hdpi/rt_training_button_pause.webp
moudle_pedometer/src/main/res/drawable-hdpi/rt_training_button_resume.png
moudle_pedometer/src/main/res/drawable-hdpi/rt_training_button_resume.webp
moudle_pedometer/src/main/res/drawable-hdpi/rt_training_button_stop.png
moudle_pedometer/src/main/res/drawable-hdpi/sport_speed.png
moudle_pedometer/src/main/res/drawable-hdpi/sport_step.png
moudle_pedometer/src/main/res/drawable-hdpi/sport_time_cost.png
moudle_pedometer/src/main/res/drawable-xhdpi/bg_tips_bottom_center.png
moudle_pedometer/src/main/res/drawable-xhdpi/crown.png
@@ -183,7 +183,7 @@ public class RunMainFragmentView implements MvpView {
             public void onClick(View view) {
                 //继续记录轨迹
                 if (StepService.mClient != null && StepService.traceListener != null) {
-                    StepService.mClient.startGather(StepService.traceListener);
+                    StepService.mClient.startTrace(StepService.mTrace,StepService.traceListener);
                 }
                 needWriteDataFlag = true;
                 //将当前计时器时间戳写入数据库
@@ -275,8 +275,7 @@ public class RunningMapFragmentView implements MvpView, SensorEventListener {
                     LatLng lastLatLng = currentPoints.get(currentPoints.size() - 1);
                     LatLng curLatLng = new LatLng(location.getLatitude(),
                             location.getLongitude());
-                    Log.e(TAG, "onReceiveLocation: 距离:" + DistanceUtil.getDistance(lastLatLng, curLatLng));
-                    if (DistanceUtil.getDistance(lastLatLng, curLatLng) > 1) {
+                    if (DistanceUtil.getDistance(lastLatLng, curLatLng) > 0.5) {
                         currentPoints.add(curLatLng);
                     }
                 } else {
@@ -160,7 +160,7 @@ public class StepService extends Service implements SensorEventListener {
     /**
      * 轨迹服务
      */
-    public Trace mTrace = null;
+    public static Trace mTrace = null;
     public StepService() {
@@ -95,9 +95,7 @@ public class StepUtil {
         if (list != null && list.size() > 0) {
             Log.e(TAG, "clearRunData: " + list.size());
 //            for (int i = 0; i < list.size(); i++) {
-            DbCore.getDaoSession().getUserStepEntityDao().deleteInTx(list);
-            DbCore.getDaoSession().getUserStepEntityDao().detachAll();
-            DbCore.getDaoSession().clear();
+            DbCore.getDaoSession().getUserStepEntityDao().deleteByKey(list.get(0).getUuid());
 //            }
         }
     }
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <!--边-->
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="7px"
+                android:left="7px"
+                android:right="7px"
+                android:top="5px" />
+
+            <solid android:color="#00eeeeee" />
+
+            <corners android:radius="5dp" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="7px"
+                android:left="7px"
+                android:right="7px"
+                android:top="5px" />
+
+            <solid android:color="#0Deeeeee" />
+
+            <corners android:radius="5dp" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="7px"
+                android:left="7px"
+                android:right="7px"
+                android:top="5px" />
+            <solid android:color="#0Deeeeee" />
+            <corners android:radius="5dp" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="7px"
+                android:left="7px"
+                android:right="7px"
+                android:top="5px" />
+            <solid android:color="#0Deeeeee" />
+            <corners android:radius="5dp" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="7px"
+                android:left="7px"
+                android:right="7px"
+                android:top="5px" />
+
+            <solid android:color="#0Deeeeee" />
+            <corners android:radius="5dp" />
+        </shape>
+    </item>
+
+    <!--中心背景 -->
+    <item>
+        <shape
+            android:shape="rectangle"
+            android:useLevel="false">
+            <!--实心 -->
+            <solid android:color="@color/white" />
+            <corners android:radius="5dp" />
+            <size
+                android:width="32dp"
+                android:height="32dp" />
+
+        </shape>
+    </item>
+
+</layer-list>
 \ No newline at end of file
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <corners android:radius="100dp" />
-    <solid android:color="@color/gray_round" />
+    <solid android:color="@color/white" />
 </shape>
 \ No newline at end of file
@@ -51,5 +51,5 @@
         android:layout_width="9dp"
         android:layout_height="15dp"
         android:layout_marginLeft="5dp"
-        android:background="@drawable/tc_suit_right_arrow" />
+        android:background="@drawable/more" />
 </LinearLayout>
 \ No newline at end of file
@@ -51,10 +51,10 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="10dp"
-                        android:layout_marginTop="15dp"
+                        android:layout_marginTop="20dp"
                         android:text="公里"
                         android:textColor="@color/white"
-                        android:textSize="25sp" />
+                        android:textSize="15sp" />
                 </LinearLayout>
                 <!--GPS信息-->
                 <LinearLayout
@@ -73,10 +73,10 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_centerVertical="true"
-                            android:layout_marginLeft="15dp"
+                            android:layout_marginLeft="20dp"
                             android:text="GPS"
                             android:textColor="@color/white"
-                            android:textSize="20sp"
+                            android:textSize="18sp"
                             android:textStyle="bold" />
                         <TextView
@@ -88,7 +88,7 @@
                             android:layout_toRightOf="@id/tv_gps"
                             android:text="(点击查看轨迹)"
                             android:textColor="@color/text_gray"
-                            android:textSize="15sp"
+                            android:textSize="12sp"
                             android:textStyle="bold" />
                         <ImageView
@@ -102,7 +102,7 @@
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="15dp">
+                        android:layout_marginTop="35dp">
                         <LinearLayout
                             android:layout_width="0dp"
@@ -112,10 +112,10 @@
                             android:orientation="vertical">
                             <ImageView
-                                android:layout_width="30dp"
-                                android:layout_height="30dp"
+                                android:layout_width="26dp"
+                                android:layout_height="23dp"
                                 android:layout_marginBottom="5dp"
-                                android:src="@drawable/rt_outdoor_video_pace" />
+                                android:src="@drawable/sport_speed" />
                             <LinearLayout
                                 android:layout_width="match_parent"
@@ -140,7 +140,7 @@
                                 android:gravity="center"
                                 android:text="配速"
                                 android:textColor="@color/text_gray"
-                                android:textSize="17sp"
+                                android:textSize="15sp"
                                 android:textStyle="bold" />
                         </LinearLayout>
                         <!--用时-->
@@ -152,10 +152,10 @@
                             android:orientation="vertical">
                             <ImageView
-                                android:layout_width="30dp"
-                                android:layout_height="30dp"
+                                android:layout_width="23dp"
+                                android:layout_height="25dp"
                                 android:layout_marginBottom="5dp"
-                                android:src="@drawable/rt_outdoor_video_time" />
+                                android:src="@drawable/sport_time_cost" />
                             <Chronometer
                                 android:id="@+id/chronometer"
@@ -173,7 +173,7 @@
                                 android:gravity="center"
                                 android:text="用时"
                                 android:textColor="@color/text_gray"
-                                android:textSize="17sp"
+                                android:textSize="15sp"
                                 android:textStyle="bold" />
                         </LinearLayout>
                         <!--热量-->
@@ -185,10 +185,10 @@
                             android:orientation="vertical">
                             <ImageView
-                                android:layout_width="30dp"
-                                android:layout_height="30dp"
+                                android:layout_width="26dp"
+                                android:layout_height="24dp"
                                 android:layout_marginBottom="5dp"
-                                android:src="@drawable/rt_outdoor_video_cal" />
+                                android:src="@drawable/sport_step" />
                             <TextView
                                 android:id="@+id/tv_step_count"
@@ -207,7 +207,7 @@
                                 android:gravity="center"
                                 android:text="步"
                                 android:textColor="@color/text_gray"
-                                android:textSize="17sp"
+                                android:textSize="15sp"
                                 android:textStyle="bold" />
                         </LinearLayout>
                     </LinearLayout>
@@ -248,26 +248,22 @@
                                 <FrameLayout
                                     android:layout_width="match_parent"
-                                    android:layout_height="wrap_content">
-
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginTop="5dp"
+                                    android:visibility="invisible">
                                     <ImageView
-                                        android:layout_width="70dp"
-                                        android:layout_height="50dp"
-                                        android:layout_gravity="center"
-                                        android:layout_marginTop="-5dp"
-                                        android:layout_marginBottom="-10dp"
-                                        android:padding="0dp"
-                                        android:scaleX="1.1"
-                                        android:scaleY="0.8" />
+                                        android:layout_width="72dp"
+                                        android:layout_height="33dp"
+                                        android:layout_gravity="center" />
                                     <TextView
                                         android:layout_width="wrap_content"
                                         android:layout_height="wrap_content"
                                         android:layout_gravity="center"
+                                        android:layout_marginBottom="5dp"
                                         android:gravity="center"
                                         android:src="@drawable/bg_tips_bottom_center"
-                                        android:text=""
                                         android:textSize="12sp" />
                                 </FrameLayout>
@@ -280,8 +276,8 @@
                                     android:focusable="true">
                                     <ImageView
-                                        android:layout_width="35dp"
-                                        android:layout_height="35dp"
+                                        android:layout_width="17dp"
+                                        android:layout_height="20dp"
                                         android:layout_gravity="center"
                                         android:layout_marginBottom="10dp"
                                         android:background="@drawable/rt_training_button_resume"
@@ -308,23 +304,20 @@
                                     android:id="@+id/fl_stop_tip"
                                     android:layout_width="match_parent"
                                     android:layout_height="wrap_content"
+                                    android:layout_marginTop="5dp"
                                     android:visibility="invisible">
                                     <ImageView
-                                        android:layout_width="70dp"
-                                        android:layout_height="50dp"
+                                        android:layout_width="72dp"
+                                        android:layout_height="33dp"
                                         android:layout_gravity="center"
-                                        android:layout_marginTop="-5dp"
-                                        android:layout_marginBottom="-10dp"
-                                        android:background="@drawable/bg_tips_bottom_center"
-                                        android:padding="0dp"
-                                        android:scaleX="1.1"
-                                        android:scaleY="0.8" />
+                                        android:background="@drawable/bg_tips_bottom_center" />
                                     <TextView
                                         android:layout_width="wrap_content"
                                         android:layout_height="wrap_content"
                                         android:layout_gravity="center"
+                                        android:layout_marginBottom="3dp"
                                         android:gravity="center"
                                         android:src="@drawable/bg_tips_bottom_center"
                                         android:text="长按结束"
@@ -346,8 +339,8 @@
                                         android:visibility="gone" />
                                     <ImageView
-                                        android:layout_width="35dp"
-                                        android:layout_height="35dp"
+                                        android:layout_width="17dp"
+                                        android:layout_height="17dp"
                                         android:layout_gravity="center"
                                         android:layout_marginBottom="10dp"
                                         android:background="@drawable/rt_training_button_stop"
@@ -377,12 +370,12 @@
                                 android:layout_width="85dp"
                                 android:layout_height="85dp"
                                 android:layout_marginBottom="12dp"
-                                android:background="@drawable/shape_gray_round"
+                                android:background="@drawable/shape_white_round"
                                 android:focusable="true">
                                 <ImageView
-                                    android:layout_width="35dp"
-                                    android:layout_height="35dp"
+                                    android:layout_width="15dp"
+                                    android:layout_height="18dp"
                                     android:layout_gravity="center"
                                     android:layout_marginBottom="10dp"
                                     android:background="@drawable/rt_training_button_pause"
@@ -408,7 +401,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:background="@color/run_main_time_bg"
-                android:gravity="center">
+                android:gravity="center"
+                android:visibility="gone">
                 <TextView
                     android:id="@+id/tv_time_count_down"
@@ -10,7 +10,7 @@
         sothree:umanoDragView="@+id/dragView"
         sothree:umanoFadeColor="@color/black_20"
         sothree:umanoOverlay="true"
-        sothree:umanoPanelHeight="142dp"
+        sothree:umanoPanelHeight="141dp"
         sothree:umanoParallaxOffset="250dp"
         sothree:umanoScrollableView="@+id/scrollView"
         sothree:umanoShadowHeight="0dp">
@@ -89,6 +89,11 @@
                         android:id="@+id/include_rank"
                         layout="@layout/layout_run_detail_rank"
                         android:visibility="visible" />
+                    <!---->
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="20dp"
+                        android:background="#F4F4F4" />
                     <!--路线介绍-->
                     <include
                         android:id="@+id/include_street_introduce"
@@ -6,12 +6,11 @@
     <!--个人最佳成绩-->
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="150dp"
-        android:layout_marginLeft="10dp"
-        android:layout_marginTop="20dp"
-        android:layout_marginRight="10dp"
-        android:layout_marginBottom="10dp"
-        android:background="@drawable/shape_10dp_white_raduis_bg"
+        android:layout_height="180dp"
+        android:layout_marginLeft="1dp"
+        android:layout_marginRight="1dp"
+        android:layout_marginBottom="5dp"
+        android:background="@drawable/layer_shadow"
         android:orientation="vertical">
         <LinearLayout
@@ -27,7 +26,7 @@
                 android:layout_marginLeft="10dp"
                 android:layout_weight="1"
                 android:text="个人最佳成绩"
-                android:textColor="@color/black"
+                android:textColor="@color/text_black"
                 android:textSize="18sp"
                 android:textStyle="bold" />
@@ -37,7 +36,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginRight="10dp"
                 android:text="查看全部成绩 >"
-                android:textColor="@color/black"
+                android:textColor="@color/text_black"
                 android:textSize="13sp" />
         </LinearLayout>
         <!---->
@@ -58,7 +57,7 @@
                     android:layout_marginLeft="15dp"
                     android:text="1.53"
                     android:textColor="@color/black"
-                    android:textSize="25sp"
+                    android:textSize="30sp"
                     android:textStyle="bold" />
                 <TextView
@@ -66,8 +65,8 @@
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="5dp"
                     android:text="公里"
-                    android:textColor="@color/text_gray"
-                    android:textSize="15sp" />
+                    android:textColor="@color/text_black"
+                    android:textSize="12sp" />
             </LinearLayout>
         </LinearLayout>
@@ -88,15 +87,15 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="步数"
-                    android:textColor="@color/text_gray"
-                    android:textSize="15sp" />
+                    android:textColor="@color/text_black"
+                    android:textSize="12sp" />
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="5dp"
                     android:text="1234"
-                    android:textColor="@color/black"
+                    android:textColor="@color/text_black"
                     android:textSize="20sp"
                     android:textStyle="bold" />
@@ -113,10 +112,9 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-
                     android:text="用时"
-                    android:textColor="@color/text_gray"
-                    android:textSize="15sp" />
+                    android:textColor="@color/text_black"
+                    android:textSize="12sp" />
                 <TextView
                     android:layout_width="wrap_content"
@@ -141,15 +139,15 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="配速"
-                    android:textColor="@color/text_gray"
-                    android:textSize="15sp" />
+                    android:textColor="@color/text_black"
+                    android:textSize="12sp" />
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="5dp"
                     android:text="22'22''"
-                    android:textColor="@color/black"
+                    android:textColor="@color/text_black"
                     android:textSize="20sp"
                     android:textStyle="bold" />
@@ -11,8 +11,11 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="150dp"
-        android:layout_margin="10dp"
-        android:background="@drawable/shape_10dp_white_raduis_bg"
+        android:layout_marginLeft="1dp"
+        android:layout_marginTop="10dp"
+        android:layout_marginRight="1dp"
+        android:layout_marginBottom="15dp"
+        android:background="@drawable/layer_shadow"
         android:orientation="vertical">
         <LinearLayout
@@ -78,7 +81,7 @@
                         android:layout_marginTop="5dp"
                         android:text="@string/layout_run_detail_rank_person_finish"
                         android:textColor="@color/text_gray"
-                        android:textSize="15sp" />
+                        android:textSize="12sp" />
                 </LinearLayout>
             </LinearLayout>
             <!--右侧-->
@@ -99,8 +102,8 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="00:27:23"
-                        android:textColor="@color/black"
-                        android:textSize="20sp"
+                        android:textColor="@color/text_black"
+                        android:textSize="18sp"
                         android:textStyle="bold" />
                     <TextView
@@ -109,24 +112,32 @@
                         android:layout_marginTop="5dp"
                         android:text="用户昵称"
                         android:textColor="@color/text_gray"
-                        android:textSize="15sp" />
+                        android:textSize="12sp" />
                     <!---->
                 </LinearLayout>
-                <LinearLayout
+                <FrameLayout
                     android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:gravity="center">
+                    android:layout_height="match_parent">
                     <com.qmuiteam.qmui.widget.QMUIRadiusImageView
                         android:layout_width="60dp"
                         android:layout_height="60dp"
+                        android:layout_gravity="center"
                         android:layout_marginLeft="10dp"
                         android:layout_marginRight="15dp"
                         android:background="@drawable/tc_ic_workout_level_adjust_coach"
                         app:qmui_corner_radius="100dp" />
-                </LinearLayout>
+
+                    <ImageView
+                        android:layout_width="16dp"
+                        android:layout_height="17dp"
+                        android:layout_gravity="right"
+                        android:layout_marginTop="10dp"
+                        android:layout_marginRight="10dp"
+                        android:background="@drawable/crown" />
+                </FrameLayout>
                 <!---->
             </LinearLayout>
@@ -34,6 +34,7 @@
                         android:layout_marginLeft="10dp"
                         android:layout_marginTop="10dp"
                         android:text="奥森南园跑道"
+                        android:textColor="@color/text_black"
                         android:textSize="18sp"
                         android:textStyle="bold" />
                     <!--活动地点-->
@@ -45,8 +46,8 @@
                         android:gravity="center_vertical">
                         <ImageView
-                            android:layout_width="10dp"
-                            android:layout_height="12dp"
+                            android:layout_width="14dp"
+                            android:layout_height="16dp"
                             android:background="@drawable/sport_location" />
                         <TextView
@@ -70,7 +71,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginLeft="25dp"
                             android:text="北京"
-                            android:textColor="@color/black"
+                            android:textColor="@color/text_black"
                             android:textSize="15sp" />
                         <TextView
@@ -78,7 +79,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginLeft="25dp"
                             android:text="首都师范大学"
-                            android:textColor="@color/black"
+                            android:textColor="@color/text_black"
                             android:textSize="15sp" />
                         <TextView
@@ -86,7 +87,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginLeft="25dp"
                             android:text="全长4.42公里"
-                            android:textColor="@color/black"
+                            android:textColor="@color/text_black"
                             android:textSize="15sp" />
                     </LinearLayout>
                 </LinearLayout>
@@ -157,7 +158,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="10dp"
                         android:text="首都师范大学操场东门"
-                        android:textColor="@color/black"
+                        android:textColor="@color/text_black"
                         android:textSize="15sp" />
                 </LinearLayout>
                 <!--终点-->
@@ -188,7 +189,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="10dp"
                         android:text="首都师范大学操场西门"
-                        android:textColor="@color/black"
+                        android:textColor="@color/text_black"
                         android:textSize="15sp" />
                 </LinearLayout>
@@ -198,12 +199,13 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="10dp"
-                    android:layout_marginTop="10dp">
+                    android:layout_marginTop="10dp"
+                    android:gravity="center_vertical">
                     <ImageView
-                        android:layout_width="20dp"
-                        android:layout_height="20dp"
-                        android:background="@drawable/icon_race_location_green" />
+                        android:layout_width="14dp"
+                        android:layout_height="14dp"
+                        android:background="@drawable/sport_time" />
                     <TextView
                         android:layout_width="wrap_content"
@@ -225,7 +227,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="25dp"
                         android:text="2019.05.01"
-                        android:textColor="@color/black"
+                        android:textColor="@color/text_black"
                         android:textSize="15sp" />
                     <TextView
@@ -233,7 +235,7 @@
                         android:layout_height="match_parent"
                         android:layout_marginLeft="5dp"
                         android:text="——"
-                        android:textColor="@color/black"
+                        android:textColor="@color/text_black"
                         android:textSize="15sp" />
                     <TextView
@@ -241,26 +243,29 @@
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="5dp"
                         android:text="2019.09.01"
-                        android:textColor="@color/black"
+                        android:textColor="@color/text_black"
                         android:textSize="15sp" />
                 </LinearLayout>
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="1dp"
+                    android:layout_marginLeft="10dp"
                     android:layout_marginTop="5dp"
+                    android:layout_marginRight="10dp"
                     android:background="@color/line" />
                 <!--活动时间-->
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="10dp"
-                    android:layout_marginTop="10dp">
+                    android:layout_marginTop="10dp"
+                    android:gravity="center_vertical">
                     <ImageView
-                        android:layout_width="20dp"
-                        android:layout_height="20dp"
-                        android:background="@drawable/icon_race_location_green" />
+                        android:layout_width="14dp"
+                        android:layout_height="14dp"
+                        android:background="@drawable/sport_time" />
                     <TextView
                         android:layout_width="wrap_content"
@@ -282,7 +287,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="25dp"
                         android:text="2019.05.01"
-                        android:textColor="@color/black"
+                        android:textColor="@color/text_black"
                         android:textSize="15sp" />
                     <TextView
@@ -290,7 +295,7 @@
                         android:layout_height="match_parent"
                         android:layout_marginLeft="5dp"
                         android:text="——"
-                        android:textColor="@color/black"
+                        android:textColor="@color/text_black"
                         android:textSize="15sp" />
                     <TextView
@@ -298,14 +303,16 @@
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="5dp"
                         android:text="2019.09.01"
-                        android:textColor="@color/black"
+                        android:textColor="@color/text_black"
                         android:textSize="15sp" />
                 </LinearLayout>
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="1dp"
+                    android:layout_marginLeft="10dp"
                     android:layout_marginTop="5dp"
+                    android:layout_marginRight="10dp"
                     android:background="@color/line" />
                 <!--参与人数-->
                 <LinearLayout
@@ -331,34 +338,41 @@
                 <!--相关的人数-->
                 <LinearLayout
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_marginBottom="20dp"
                     android:gravity="center_vertical">
-                    <TextView
-                        android:layout_width="wrap_content"
+                    <LinearLayout
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_marginLeft="25dp"
-                        android:text="123"
-                        android:textColor="@color/black"
-                        android:textSize="17sp"
-                        android:textStyle="bold" />
+                        android:layout_weight="1">
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginLeft="5dp"
-                        android:text="人参与"
-                        android:textColor="@color/black"
-                        android:textSize="15sp" />
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="28dp"
+                            android:text="123"
+                            android:textColor="@color/text_black"
+                            android:textSize="17sp"
+                            android:textStyle="bold" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="5dp"
+                            android:text="人参与"
+                            android:textColor="@color/text_black"
+                            android:textSize="15sp" />
+                    </LinearLayout>
                     <LinearLayout
-                        android:layout_width="match_parent"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:gravity="right|center">
                         <com.cnlive.moudle.pedometer.ui.widget.FivePersonIconView
                             android:id="@+id/five_join_person"
-                            android:layout_width="match_parent"
+                            android:layout_width="180dp"
                             android:layout_height="40dp"
                             android:layout_marginRight="10dp"
                             FivePersonIconView:showRightFlag="true" />
@@ -2,9 +2,9 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:background="@color/white"
     android:orientation="vertical"
     android:paddingLeft="10dp"
-    android:background="@color/white"
     android:paddingRight="10dp">
     <!--路线介绍-->
     <TextView
@@ -21,7 +21,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="10dp"
         android:text="路线介绍路线介绍路线介绍路线介绍路线介绍路线介绍路线介绍路线介绍路线介绍路线介绍路线介绍路线介绍路线介绍路线介绍路线介绍路线介绍路线介绍路线介绍路线介绍"
-        android:textColor="@color/black"
+        android:textColor="@color/text_black"
         android:textSize="15sp" />
     <!--地图-->
@@ -37,7 +37,7 @@
         android:layout_width="match_parent"
         android:layout_height="500dp"
         android:layout_marginTop="10dp"
-        android:layout_marginBottom="10dp"
+        android:layout_marginBottom="60dp"
         android:background="@drawable/map"
         android:scaleType="center" />
 </LinearLayout>
 \ No newline at end of file
@@ -2,8 +2,8 @@
 <resources>
     <color name="run_main_bg">#3D3745</color>
     <color name="run_main_time_bg">#5BC4A4</color>
-    <color name="text_gray">#8F8C95</color>
-    <color name="green_round">#29C48A</color>
+    <color name="text_gray">#666666</color>
+    <color name="green_round">#5BC4A4</color>
     <color name="red_round">#F97070</color>
     <color name="gray_round">#D6D6D6</color>
     <color name="circle_stop">#40000000</color>
@@ -25,6 +25,6 @@
     <color name="red">#EF5544</color>
-
-    <color name="bottom_sheet_dialog_race_location_text">#C3C3C3</color>
+    <color name="text_black">#333333</color>
+    <color name="bottom_sheet_dialog_race_location_text">#999999</color>
 </resources>