CNLive Android Team / ModulePedometer · Commits

Commit 983fa564c5ad626d8477b4b619408a31d0a05a11

Authored by 杨帅
1 parent e02ba35f

1.;跑步结束页面

Inline Side-by-side
Showing 48 changed files with 230 additions and 130 deletions
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunMainFragmentView.java
  View file @983fa56
... ... @@ -183,7 +183,7 @@ public class RunMainFragmentView implements MvpView {
183 183 public void onClick(View view) {
184 184 //继续记录轨迹
185 185 if (StepService.mClient != null && StepService.traceListener != null) {
186   - StepService.mClient.startGather(StepService.traceListener);
  186 + StepService.mClient.startTrace(StepService.mTrace,StepService.traceListener);
187 187 }
188 188 needWriteDataFlag = true;
189 189 //将当前计时器时间戳写入数据库
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunningMapFragmentView.java
  View file @983fa56
... ... @@ -275,8 +275,7 @@ public class RunningMapFragmentView implements MvpView, SensorEventListener {
275 275 LatLng lastLatLng = currentPoints.get(currentPoints.size() - 1);
276 276 LatLng curLatLng = new LatLng(location.getLatitude(),
277 277 location.getLongitude());
278   - Log.e(TAG, "onReceiveLocation: 距离:" + DistanceUtil.getDistance(lastLatLng, curLatLng));
279   - if (DistanceUtil.getDistance(lastLatLng, curLatLng) > 1) {
  278 + if (DistanceUtil.getDistance(lastLatLng, curLatLng) > 0.5) {
280 279 currentPoints.add(curLatLng);
281 280 }
282 281 } else {
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/service/StepService.java
  View file @983fa56
... ... @@ -160,7 +160,7 @@ public class StepService extends Service implements SensorEventListener {
160 160 /**
161 161 * 轨迹服务
162 162 */
163   - public Trace mTrace = null;
  163 + public static Trace mTrace = null;
164 164  
165 165 public StepService() {
166 166  
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/utils/StepUtil.java
  View file @983fa56
... ... @@ -95,9 +95,7 @@ public class StepUtil {
95 95 if (list != null && list.size() > 0) {
96 96 Log.e(TAG, "clearRunData: " + list.size());
97 97 // for (int i = 0; i < list.size(); i++) {
98   - DbCore.getDaoSession().getUserStepEntityDao().deleteInTx(list);
99   - DbCore.getDaoSession().getUserStepEntityDao().detachAll();
100   - DbCore.getDaoSession().clear();
  98 + DbCore.getDaoSession().getUserStepEntityDao().deleteByKey(list.get(0).getUuid());
101 99 // }
102 100 }
103 101 }
... ...
moudle_pedometer/src/main/res/drawable-hdpi/bg_tips_bottom_center.9.png deleted 100644 → 0
View file @e02ba35

2.04 KB
moudle_pedometer/src/main/res/drawable-hdpi/bg_tips_bottom_center.png 0 → 100644
View file @983fa56

765 Bytes
moudle_pedometer/src/main/res/drawable-hdpi/crown.png 0 → 100644
View file @983fa56

915 Bytes
moudle_pedometer/src/main/res/drawable-hdpi/more.png 0 → 100644
View file @983fa56

414 Bytes
moudle_pedometer/src/main/res/drawable-hdpi/rt_ic_home_map.png 0 → 100644
View file @983fa56

7.73 KB
moudle_pedometer/src/main/res/drawable-hdpi/rt_ic_home_map.webp deleted 100644 → 0
View file @e02ba35
No preview for this file type
moudle_pedometer/src/main/res/drawable-hdpi/rt_training_button_pause.png 0 → 100644
View file @983fa56

252 Bytes
moudle_pedometer/src/main/res/drawable-hdpi/rt_training_button_pause.webp deleted 100644 → 0
View file @e02ba35
No preview for this file type
moudle_pedometer/src/main/res/drawable-hdpi/rt_training_button_resume.png 0 → 100644
View file @983fa56

443 Bytes
moudle_pedometer/src/main/res/drawable-hdpi/rt_training_button_resume.webp deleted 100644 → 0
View file @e02ba35
No preview for this file type
moudle_pedometer/src/main/res/drawable-hdpi/rt_training_button_stop.png
View file @983fa56

98 Bytes | W: | H:

114 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
moudle_pedometer/src/main/res/drawable-hdpi/sport_speed.png 0 → 100644
View file @983fa56

1.8 KB
moudle_pedometer/src/main/res/drawable-hdpi/sport_step.png 0 → 100644
View file @983fa56

2.02 KB
moudle_pedometer/src/main/res/drawable-hdpi/sport_time_cost.png 0 → 100644
View file @983fa56

1.86 KB
moudle_pedometer/src/main/res/drawable-xhdpi/bg_tips_bottom_center.png 0 → 100644
View file @983fa56

968 Bytes
moudle_pedometer/src/main/res/drawable-xhdpi/crown.png 0 → 100644
View file @983fa56

1.07 KB
moudle_pedometer/src/main/res/drawable-xhdpi/more.png 0 → 100644
View file @983fa56

459 Bytes
moudle_pedometer/src/main/res/drawable-xhdpi/rt_ic_home_map.png 0 → 100644
View file @983fa56

7.52 KB
moudle_pedometer/src/main/res/drawable-xhdpi/rt_training_button_pause.png 0 → 100644
View file @983fa56

152 Bytes
moudle_pedometer/src/main/res/drawable-xhdpi/rt_training_button_resume.png 0 → 100644
View file @983fa56

555 Bytes
moudle_pedometer/src/main/res/drawable-xhdpi/rt_training_button_stop.png 0 → 100644
View file @983fa56

130 Bytes
moudle_pedometer/src/main/res/drawable-xhdpi/sport_speed.png 0 → 100644
View file @983fa56

1.9 KB
moudle_pedometer/src/main/res/drawable-xhdpi/sport_step.png 0 → 100644
View file @983fa56

2.15 KB
moudle_pedometer/src/main/res/drawable-xhdpi/sport_time_cost.png 0 → 100644
View file @983fa56

1.97 KB
moudle_pedometer/src/main/res/drawable-xxhdpi/bg_tips_bottom_center.png 0 → 100644
View file @983fa56

1.79 KB
moudle_pedometer/src/main/res/drawable-xxhdpi/crown.png 0 → 100644
View file @983fa56

1.85 KB
moudle_pedometer/src/main/res/drawable-xxhdpi/more.png 0 → 100644
View file @983fa56

776 Bytes
moudle_pedometer/src/main/res/drawable-xxhdpi/rt_ic_home_map.png 0 → 100644
View file @983fa56

23.2 KB
moudle_pedometer/src/main/res/drawable-xxhdpi/rt_training_button_pause.png 0 → 100644
View file @983fa56

427 Bytes
moudle_pedometer/src/main/res/drawable-xxhdpi/rt_training_button_resume.png 0 → 100644
View file @983fa56

854 Bytes
moudle_pedometer/src/main/res/drawable-xxhdpi/rt_training_button_stop.png 0 → 100644
View file @983fa56

207 Bytes
moudle_pedometer/src/main/res/drawable-xxhdpi/sport_speed.png 0 → 100644
View file @983fa56

3.74 KB
moudle_pedometer/src/main/res/drawable-xxhdpi/sport_step.png 0 → 100644
View file @983fa56

4.42 KB
moudle_pedometer/src/main/res/drawable-xxhdpi/sport_time_cost.png 0 → 100644
View file @983fa56

3.91 KB
moudle_pedometer/src/main/res/drawable/layer_shadow.xml 0 → 100644
  View file @983fa56
  1 +<?xml version="1.0" encoding="utf-8"?>
  2 +<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
  3 +
  4 + <!--边-->
  5 + <item>
  6 + <shape android:shape="rectangle">
  7 + <padding
  8 + android:bottom="7px"
  9 + android:left="7px"
  10 + android:right="7px"
  11 + android:top="5px" />
  12 +
  13 + <solid android:color="#00eeeeee" />
  14 +
  15 + <corners android:radius="5dp" />
  16 + </shape>
  17 + </item>
  18 + <item>
  19 + <shape android:shape="rectangle">
  20 + <padding
  21 + android:bottom="7px"
  22 + android:left="7px"
  23 + android:right="7px"
  24 + android:top="5px" />
  25 +
  26 + <solid android:color="#0Deeeeee" />
  27 +
  28 + <corners android:radius="5dp" />
  29 + </shape>
  30 + </item>
  31 + <item>
  32 + <shape android:shape="rectangle">
  33 + <padding
  34 + android:bottom="7px"
  35 + android:left="7px"
  36 + android:right="7px"
  37 + android:top="5px" />
  38 + <solid android:color="#0Deeeeee" />
  39 + <corners android:radius="5dp" />
  40 + </shape>
  41 + </item>
  42 + <item>
  43 + <shape android:shape="rectangle">
  44 + <padding
  45 + android:bottom="7px"
  46 + android:left="7px"
  47 + android:right="7px"
  48 + android:top="5px" />
  49 + <solid android:color="#0Deeeeee" />
  50 + <corners android:radius="5dp" />
  51 + </shape>
  52 + </item>
  53 + <item>
  54 + <shape android:shape="rectangle">
  55 + <padding
  56 + android:bottom="7px"
  57 + android:left="7px"
  58 + android:right="7px"
  59 + android:top="5px" />
  60 +
  61 + <solid android:color="#0Deeeeee" />
  62 + <corners android:radius="5dp" />
  63 + </shape>
  64 + </item>
  65 +
  66 + <!--中心背景 -->
  67 + <item>
  68 + <shape
  69 + android:shape="rectangle"
  70 + android:useLevel="false">
  71 + <!--实心 -->
  72 + <solid android:color="@color/white" />
  73 + <corners android:radius="5dp" />
  74 + <size
  75 + android:width="32dp"
  76 + android:height="32dp" />
  77 +
  78 + </shape>
  79 + </item>
  80 +
  81 +</layer-list>
0 82 \ No newline at end of file
... ...
moudle_pedometer/src/main/res/drawable/shape_gray_round.xml renamed to moudle_pedometer/src/main/res/drawable/shape_white_round.xml
  View file @983fa56
1 1 <?xml version="1.0" encoding="utf-8"?>
2 2 <shape xmlns:android="http://schemas.android.com/apk/res/android">
3 3 <corners android:radius="100dp" />
4   - <solid android:color="@color/gray_round" />
  4 + <solid android:color="@color/white" />
5 5 </shape>
6 6 \ No newline at end of file
... ...
moudle_pedometer/src/main/res/layout/five_persion_icon.xml
  View file @983fa56
... ... @@ -51,5 +51,5 @@
51 51 android:layout_width="9dp"
52 52 android:layout_height="15dp"
53 53 android:layout_marginLeft="5dp"
54   - android:background="@drawable/tc_suit_right_arrow" />
  54 + android:background="@drawable/more" />
55 55 </LinearLayout>
56 56 \ No newline at end of file
... ...
moudle_pedometer/src/main/res/layout/fragment_run_main.xml
  View file @983fa56
... ... @@ -51,10 +51,10 @@
51 51 android:layout_width="wrap_content"
52 52 android:layout_height="wrap_content"
53 53 android:layout_marginLeft="10dp"
54   - android:layout_marginTop="15dp"
  54 + android:layout_marginTop="20dp"
55 55 android:text="公里"
56 56 android:textColor="@color/white"
57   - android:textSize="25sp" />
  57 + android:textSize="15sp" />
58 58 </LinearLayout>
59 59 <!--GPS信息-->
60 60 <LinearLayout
... ... @@ -73,10 +73,10 @@
73 73 android:layout_width="wrap_content"
74 74 android:layout_height="wrap_content"
75 75 android:layout_centerVertical="true"
76   - android:layout_marginLeft="15dp"
  76 + android:layout_marginLeft="20dp"
77 77 android:text="GPS"
78 78 android:textColor="@color/white"
79   - android:textSize="20sp"
  79 + android:textSize="18sp"
80 80 android:textStyle="bold" />
81 81  
82 82 <TextView
... ... @@ -88,7 +88,7 @@
88 88 android:layout_toRightOf="@id/tv_gps"
89 89 android:text="(点击查看轨迹)"
90 90 android:textColor="@color/text_gray"
91   - android:textSize="15sp"
  91 + android:textSize="12sp"
92 92 android:textStyle="bold" />
93 93  
94 94 <ImageView
... ... @@ -102,7 +102,7 @@
102 102 <LinearLayout
103 103 android:layout_width="match_parent"
104 104 android:layout_height="wrap_content"
105   - android:layout_marginTop="15dp">
  105 + android:layout_marginTop="35dp">
106 106  
107 107 <LinearLayout
108 108 android:layout_width="0dp"
... ... @@ -112,10 +112,10 @@
112 112 android:orientation="vertical">
113 113  
114 114 <ImageView
115   - android:layout_width="30dp"
116   - android:layout_height="30dp"
  115 + android:layout_width="26dp"
  116 + android:layout_height="23dp"
117 117 android:layout_marginBottom="5dp"
118   - android:src="@drawable/rt_outdoor_video_pace" />
  118 + android:src="@drawable/sport_speed" />
119 119  
120 120 <LinearLayout
121 121 android:layout_width="match_parent"
... ... @@ -140,7 +140,7 @@
140 140 android:gravity="center"
141 141 android:text="配速"
142 142 android:textColor="@color/text_gray"
143   - android:textSize="17sp"
  143 + android:textSize="15sp"
144 144 android:textStyle="bold" />
145 145 </LinearLayout>
146 146 <!--用时-->
... ... @@ -152,10 +152,10 @@
152 152 android:orientation="vertical">
153 153  
154 154 <ImageView
155   - android:layout_width="30dp"
156   - android:layout_height="30dp"
  155 + android:layout_width="23dp"
  156 + android:layout_height="25dp"
157 157 android:layout_marginBottom="5dp"
158   - android:src="@drawable/rt_outdoor_video_time" />
  158 + android:src="@drawable/sport_time_cost" />
159 159  
160 160 <Chronometer
161 161 android:id="@+id/chronometer"
... ... @@ -173,7 +173,7 @@
173 173 android:gravity="center"
174 174 android:text="用时"
175 175 android:textColor="@color/text_gray"
176   - android:textSize="17sp"
  176 + android:textSize="15sp"
177 177 android:textStyle="bold" />
178 178 </LinearLayout>
179 179 <!--热量-->
... ... @@ -185,10 +185,10 @@
185 185 android:orientation="vertical">
186 186  
187 187 <ImageView
188   - android:layout_width="30dp"
189   - android:layout_height="30dp"
  188 + android:layout_width="26dp"
  189 + android:layout_height="24dp"
190 190 android:layout_marginBottom="5dp"
191   - android:src="@drawable/rt_outdoor_video_cal" />
  191 + android:src="@drawable/sport_step" />
192 192  
193 193 <TextView
194 194 android:id="@+id/tv_step_count"
... ... @@ -207,7 +207,7 @@
207 207 android:gravity="center"
208 208 android:text="步"
209 209 android:textColor="@color/text_gray"
210   - android:textSize="17sp"
  210 + android:textSize="15sp"
211 211 android:textStyle="bold" />
212 212 </LinearLayout>
213 213 </LinearLayout>
... ... @@ -248,26 +248,22 @@
248 248  
249 249 <FrameLayout
250 250 android:layout_width="match_parent"
251   - android:layout_height="wrap_content">
252   -
  251 + android:layout_height="wrap_content"
  252 + android:layout_marginTop="5dp"
  253 + android:visibility="invisible">
253 254  
254 255 <ImageView
255   - android:layout_width="70dp"
256   - android:layout_height="50dp"
257   - android:layout_gravity="center"
258   - android:layout_marginTop="-5dp"
259   - android:layout_marginBottom="-10dp"
260   - android:padding="0dp"
261   - android:scaleX="1.1"
262   - android:scaleY="0.8" />
  256 + android:layout_width="72dp"
  257 + android:layout_height="33dp"
  258 + android:layout_gravity="center" />
263 259  
264 260 <TextView
265 261 android:layout_width="wrap_content"
266 262 android:layout_height="wrap_content"
267 263 android:layout_gravity="center"
  264 + android:layout_marginBottom="5dp"
268 265 android:gravity="center"
269 266 android:src="@drawable/bg_tips_bottom_center"
270   - android:text=""
271 267 android:textSize="12sp" />
272 268 </FrameLayout>
273 269  
... ... @@ -280,8 +276,8 @@
280 276 android:focusable="true">
281 277  
282 278 <ImageView
283   - android:layout_width="35dp"
284   - android:layout_height="35dp"
  279 + android:layout_width="17dp"
  280 + android:layout_height="20dp"
285 281 android:layout_gravity="center"
286 282 android:layout_marginBottom="10dp"
287 283 android:background="@drawable/rt_training_button_resume"
... ... @@ -308,23 +304,20 @@
308 304 android:id="@+id/fl_stop_tip"
309 305 android:layout_width="match_parent"
310 306 android:layout_height="wrap_content"
  307 + android:layout_marginTop="5dp"
311 308 android:visibility="invisible">
312 309  
313 310 <ImageView
314   - android:layout_width="70dp"
315   - android:layout_height="50dp"
  311 + android:layout_width="72dp"
  312 + android:layout_height="33dp"
316 313 android:layout_gravity="center"
317   - android:layout_marginTop="-5dp"
318   - android:layout_marginBottom="-10dp"
319   - android:background="@drawable/bg_tips_bottom_center"
320   - android:padding="0dp"
321   - android:scaleX="1.1"
322   - android:scaleY="0.8" />
  314 + android:background="@drawable/bg_tips_bottom_center" />
323 315  
324 316 <TextView
325 317 android:layout_width="wrap_content"
326 318 android:layout_height="wrap_content"
327 319 android:layout_gravity="center"
  320 + android:layout_marginBottom="3dp"
328 321 android:gravity="center"
329 322 android:src="@drawable/bg_tips_bottom_center"
330 323 android:text="长按结束"
... ... @@ -346,8 +339,8 @@
346 339 android:visibility="gone" />
347 340  
348 341 <ImageView
349   - android:layout_width="35dp"
350   - android:layout_height="35dp"
  342 + android:layout_width="17dp"
  343 + android:layout_height="17dp"
351 344 android:layout_gravity="center"
352 345 android:layout_marginBottom="10dp"
353 346 android:background="@drawable/rt_training_button_stop"
... ... @@ -377,12 +370,12 @@
377 370 android:layout_width="85dp"
378 371 android:layout_height="85dp"
379 372 android:layout_marginBottom="12dp"
380   - android:background="@drawable/shape_gray_round"
  373 + android:background="@drawable/shape_white_round"
381 374 android:focusable="true">
382 375  
383 376 <ImageView
384   - android:layout_width="35dp"
385   - android:layout_height="35dp"
  377 + android:layout_width="15dp"
  378 + android:layout_height="18dp"
386 379 android:layout_gravity="center"
387 380 android:layout_marginBottom="10dp"
388 381 android:background="@drawable/rt_training_button_pause"
... ... @@ -408,7 +401,8 @@
408 401 android:layout_width="match_parent"
409 402 android:layout_height="match_parent"
410 403 android:background="@color/run_main_time_bg"
411   - android:gravity="center">
  404 + android:gravity="center"
  405 + android:visibility="gone">
412 406  
413 407 <TextView
414 408 android:id="@+id/tv_time_count_down"
... ...
moudle_pedometer/src/main/res/layout/fragment_run_race_detail.xml
  View file @983fa56
... ... @@ -10,7 +10,7 @@
10 10 sothree:umanoDragView="@+id/dragView"
11 11 sothree:umanoFadeColor="@color/black_20"
12 12 sothree:umanoOverlay="true"
13   - sothree:umanoPanelHeight="142dp"
  13 + sothree:umanoPanelHeight="141dp"
14 14 sothree:umanoParallaxOffset="250dp"
15 15 sothree:umanoScrollableView="@+id/scrollView"
16 16 sothree:umanoShadowHeight="0dp">
... ... @@ -89,6 +89,11 @@
89 89 android:id="@+id/include_rank"
90 90 layout="@layout/layout_run_detail_rank"
91 91 android:visibility="visible" />
  92 + <!---->
  93 + <View
  94 + android:layout_width="match_parent"
  95 + android:layout_height="20dp"
  96 + android:background="#F4F4F4" />
92 97 <!--路线介绍-->
93 98 <include
94 99 android:id="@+id/include_street_introduce"
... ...
moudle_pedometer/src/main/res/layout/layout_run_detail_person_score.xml
  View file @983fa56
... ... @@ -6,12 +6,11 @@
6 6 <!--个人最佳成绩-->
7 7 <LinearLayout
8 8 android:layout_width="match_parent"
9   - android:layout_height="150dp"
10   - android:layout_marginLeft="10dp"
11   - android:layout_marginTop="20dp"
12   - android:layout_marginRight="10dp"
13   - android:layout_marginBottom="10dp"
14   - android:background="@drawable/shape_10dp_white_raduis_bg"
  9 + android:layout_height="180dp"
  10 + android:layout_marginLeft="1dp"
  11 + android:layout_marginRight="1dp"
  12 + android:layout_marginBottom="5dp"
  13 + android:background="@drawable/layer_shadow"
15 14 android:orientation="vertical">
16 15  
17 16 <LinearLayout
... ... @@ -27,7 +26,7 @@
27 26 android:layout_marginLeft="10dp"
28 27 android:layout_weight="1"
29 28 android:text="个人最佳成绩"
30   - android:textColor="@color/black"
  29 + android:textColor="@color/text_black"
31 30 android:textSize="18sp"
32 31 android:textStyle="bold" />
33 32  
... ... @@ -37,7 +36,7 @@
37 36 android:layout_height="wrap_content"
38 37 android:layout_marginRight="10dp"
39 38 android:text="查看全部成绩 >"
40   - android:textColor="@color/black"
  39 + android:textColor="@color/text_black"
41 40 android:textSize="13sp" />
42 41 </LinearLayout>
43 42 <!---->
... ... @@ -58,7 +57,7 @@
58 57 android:layout_marginLeft="15dp"
59 58 android:text="1.53"
60 59 android:textColor="@color/black"
61   - android:textSize="25sp"
  60 + android:textSize="30sp"
62 61 android:textStyle="bold" />
63 62  
64 63 <TextView
... ... @@ -66,8 +65,8 @@
66 65 android:layout_height="wrap_content"
67 66 android:layout_marginLeft="5dp"
68 67 android:text="公里"
69   - android:textColor="@color/text_gray"
70   - android:textSize="15sp" />
  68 + android:textColor="@color/text_black"
  69 + android:textSize="12sp" />
71 70 </LinearLayout>
72 71 </LinearLayout>
73 72  
... ... @@ -88,15 +87,15 @@
88 87 android:layout_width="wrap_content"
89 88 android:layout_height="wrap_content"
90 89 android:text="步数"
91   - android:textColor="@color/text_gray"
92   - android:textSize="15sp" />
  90 + android:textColor="@color/text_black"
  91 + android:textSize="12sp" />
93 92  
94 93 <TextView
95 94 android:layout_width="wrap_content"
96 95 android:layout_height="wrap_content"
97 96 android:layout_marginTop="5dp"
98 97 android:text="1234"
99   - android:textColor="@color/black"
  98 + android:textColor="@color/text_black"
100 99 android:textSize="20sp"
101 100 android:textStyle="bold" />
102 101  
... ... @@ -113,10 +112,9 @@
113 112 <TextView
114 113 android:layout_width="wrap_content"
115 114 android:layout_height="wrap_content"
116   -
117 115 android:text="用时"
118   - android:textColor="@color/text_gray"
119   - android:textSize="15sp" />
  116 + android:textColor="@color/text_black"
  117 + android:textSize="12sp" />
120 118  
121 119 <TextView
122 120 android:layout_width="wrap_content"
... ... @@ -141,15 +139,15 @@
141 139 android:layout_width="wrap_content"
142 140 android:layout_height="wrap_content"
143 141 android:text="配速"
144   - android:textColor="@color/text_gray"
145   - android:textSize="15sp" />
  142 + android:textColor="@color/text_black"
  143 + android:textSize="12sp" />
146 144  
147 145 <TextView
148 146 android:layout_width="wrap_content"
149 147 android:layout_height="wrap_content"
150 148 android:layout_marginTop="5dp"
151 149 android:text="22'22''"
152   - android:textColor="@color/black"
  150 + android:textColor="@color/text_black"
153 151 android:textSize="20sp"
154 152 android:textStyle="bold" />
155 153  
... ...
moudle_pedometer/src/main/res/layout/layout_run_detail_rank.xml
  View file @983fa56
... ... @@ -11,8 +11,11 @@
11 11 <LinearLayout
12 12 android:layout_width="match_parent"
13 13 android:layout_height="150dp"
14   - android:layout_margin="10dp"
15   - android:background="@drawable/shape_10dp_white_raduis_bg"
  14 + android:layout_marginLeft="1dp"
  15 + android:layout_marginTop="10dp"
  16 + android:layout_marginRight="1dp"
  17 + android:layout_marginBottom="15dp"
  18 + android:background="@drawable/layer_shadow"
16 19 android:orientation="vertical">
17 20  
18 21 <LinearLayout
... ... @@ -78,7 +81,7 @@
78 81 android:layout_marginTop="5dp"
79 82 android:text="@string/layout_run_detail_rank_person_finish"
80 83 android:textColor="@color/text_gray"
81   - android:textSize="15sp" />
  84 + android:textSize="12sp" />
82 85 </LinearLayout>
83 86 </LinearLayout>
84 87 <!--右侧-->
... ... @@ -99,8 +102,8 @@
99 102 android:layout_width="wrap_content"
100 103 android:layout_height="wrap_content"
101 104 android:text="00:27:23"
102   - android:textColor="@color/black"
103   - android:textSize="20sp"
  105 + android:textColor="@color/text_black"
  106 + android:textSize="18sp"
104 107 android:textStyle="bold" />
105 108  
106 109 <TextView
... ... @@ -109,24 +112,32 @@
109 112 android:layout_marginTop="5dp"
110 113 android:text="用户昵称"
111 114 android:textColor="@color/text_gray"
112   - android:textSize="15sp" />
  115 + android:textSize="12sp" />
113 116  
114 117 <!---->
115 118 </LinearLayout>
116 119  
117   - <LinearLayout
  120 + <FrameLayout
118 121 android:layout_width="wrap_content"
119   - android:layout_height="match_parent"
120   - android:gravity="center">
  122 + android:layout_height="match_parent">
121 123  
122 124 <com.qmuiteam.qmui.widget.QMUIRadiusImageView
123 125 android:layout_width="60dp"
124 126 android:layout_height="60dp"
  127 + android:layout_gravity="center"
125 128 android:layout_marginLeft="10dp"
126 129 android:layout_marginRight="15dp"
127 130 android:background="@drawable/tc_ic_workout_level_adjust_coach"
128 131 app:qmui_corner_radius="100dp" />
129   - </LinearLayout>
  132 +
  133 + <ImageView
  134 + android:layout_width="16dp"
  135 + android:layout_height="17dp"
  136 + android:layout_gravity="right"
  137 + android:layout_marginTop="10dp"
  138 + android:layout_marginRight="10dp"
  139 + android:background="@drawable/crown" />
  140 + </FrameLayout>
130 141 <!---->
131 142 </LinearLayout>
132 143  
... ...
moudle_pedometer/src/main/res/layout/layout_run_detail_street.xml
  View file @983fa56
... ... @@ -34,6 +34,7 @@
34 34 android:layout_marginLeft="10dp"
35 35 android:layout_marginTop="10dp"
36 36 android:text="奥森南园跑道"
  37 + android:textColor="@color/text_black"
37 38 android:textSize="18sp"
38 39 android:textStyle="bold" />
39 40 <!--活动地点-->
... ... @@ -45,8 +46,8 @@
45 46 android:gravity="center_vertical">
46 47  
47 48 <ImageView
48   - android:layout_width="10dp"
49   - android:layout_height="12dp"
  49 + android:layout_width="14dp"
  50 + android:layout_height="16dp"
50 51 android:background="@drawable/sport_location" />
51 52  
52 53 <TextView
... ... @@ -70,7 +71,7 @@
70 71 android:layout_height="wrap_content"
71 72 android:layout_marginLeft="25dp"
72 73 android:text="北京"
73   - android:textColor="@color/black"
  74 + android:textColor="@color/text_black"
74 75 android:textSize="15sp" />
75 76  
76 77 <TextView
... ... @@ -78,7 +79,7 @@
78 79 android:layout_height="wrap_content"
79 80 android:layout_marginLeft="25dp"
80 81 android:text="首都师范大学"
81   - android:textColor="@color/black"
  82 + android:textColor="@color/text_black"
82 83 android:textSize="15sp" />
83 84  
84 85 <TextView
... ... @@ -86,7 +87,7 @@
86 87 android:layout_height="wrap_content"
87 88 android:layout_marginLeft="25dp"
88 89 android:text="全长4.42公里"
89   - android:textColor="@color/black"
  90 + android:textColor="@color/text_black"
90 91 android:textSize="15sp" />
91 92 </LinearLayout>
92 93 </LinearLayout>
... ... @@ -157,7 +158,7 @@
157 158 android:layout_height="wrap_content"
158 159 android:layout_marginLeft="10dp"
159 160 android:text="首都师范大学操场东门"
160   - android:textColor="@color/black"
  161 + android:textColor="@color/text_black"
161 162 android:textSize="15sp" />
162 163 </LinearLayout>
163 164 <!--终点-->
... ... @@ -188,7 +189,7 @@
188 189 android:layout_height="wrap_content"
189 190 android:layout_marginLeft="10dp"
190 191 android:text="首都师范大学操场西门"
191   - android:textColor="@color/black"
  192 + android:textColor="@color/text_black"
192 193 android:textSize="15sp" />
193 194 </LinearLayout>
194 195  
... ... @@ -198,12 +199,13 @@
198 199 android:layout_width="match_parent"
199 200 android:layout_height="wrap_content"
200 201 android:layout_marginLeft="10dp"
201   - android:layout_marginTop="10dp">
  202 + android:layout_marginTop="10dp"
  203 + android:gravity="center_vertical">
202 204  
203 205 <ImageView
204   - android:layout_width="20dp"
205   - android:layout_height="20dp"
206   - android:background="@drawable/icon_race_location_green" />
  206 + android:layout_width="14dp"
  207 + android:layout_height="14dp"
  208 + android:background="@drawable/sport_time" />
207 209  
208 210 <TextView
209 211 android:layout_width="wrap_content"
... ... @@ -225,7 +227,7 @@
225 227 android:layout_height="wrap_content"
226 228 android:layout_marginLeft="25dp"
227 229 android:text="2019.05.01"
228   - android:textColor="@color/black"
  230 + android:textColor="@color/text_black"
229 231 android:textSize="15sp" />
230 232  
231 233 <TextView
... ... @@ -233,7 +235,7 @@
233 235 android:layout_height="match_parent"
234 236 android:layout_marginLeft="5dp"
235 237 android:text="——"
236   - android:textColor="@color/black"
  238 + android:textColor="@color/text_black"
237 239 android:textSize="15sp" />
238 240  
239 241 <TextView
... ... @@ -241,26 +243,29 @@
241 243 android:layout_height="wrap_content"
242 244 android:layout_marginLeft="5dp"
243 245 android:text="2019.09.01"
244   - android:textColor="@color/black"
  246 + android:textColor="@color/text_black"
245 247 android:textSize="15sp" />
246 248 </LinearLayout>
247 249  
248 250 <View
249 251 android:layout_width="match_parent"
250 252 android:layout_height="1dp"
  253 + android:layout_marginLeft="10dp"
251 254 android:layout_marginTop="5dp"
  255 + android:layout_marginRight="10dp"
252 256 android:background="@color/line" />
253 257 <!--活动时间-->
254 258 <LinearLayout
255 259 android:layout_width="match_parent"
256 260 android:layout_height="wrap_content"
257 261 android:layout_marginLeft="10dp"
258   - android:layout_marginTop="10dp">
  262 + android:layout_marginTop="10dp"
  263 + android:gravity="center_vertical">
259 264  
260 265 <ImageView
261   - android:layout_width="20dp"
262   - android:layout_height="20dp"
263   - android:background="@drawable/icon_race_location_green" />
  266 + android:layout_width="14dp"
  267 + android:layout_height="14dp"
  268 + android:background="@drawable/sport_time" />
264 269  
265 270 <TextView
266 271 android:layout_width="wrap_content"
... ... @@ -282,7 +287,7 @@
282 287 android:layout_height="wrap_content"
283 288 android:layout_marginLeft="25dp"
284 289 android:text="2019.05.01"
285   - android:textColor="@color/black"
  290 + android:textColor="@color/text_black"
286 291 android:textSize="15sp" />
287 292  
288 293 <TextView
... ... @@ -290,7 +295,7 @@
290 295 android:layout_height="match_parent"
291 296 android:layout_marginLeft="5dp"
292 297 android:text="——"
293   - android:textColor="@color/black"
  298 + android:textColor="@color/text_black"
294 299 android:textSize="15sp" />
295 300  
296 301 <TextView
... ... @@ -298,14 +303,16 @@
298 303 android:layout_height="wrap_content"
299 304 android:layout_marginLeft="5dp"
300 305 android:text="2019.09.01"
301   - android:textColor="@color/black"
  306 + android:textColor="@color/text_black"
302 307 android:textSize="15sp" />
303 308 </LinearLayout>
304 309  
305 310 <View
306 311 android:layout_width="match_parent"
307 312 android:layout_height="1dp"
  313 + android:layout_marginLeft="10dp"
308 314 android:layout_marginTop="5dp"
  315 + android:layout_marginRight="10dp"
309 316 android:background="@color/line" />
310 317 <!--参与人数-->
311 318 <LinearLayout
... ... @@ -331,34 +338,41 @@
331 338 <!--相关的人数-->
332 339 <LinearLayout
333 340 android:layout_width="match_parent"
334   - android:layout_height="wrap_content"
  341 + android:layout_height="match_parent"
  342 + android:layout_marginBottom="20dp"
335 343 android:gravity="center_vertical">
336 344  
337   - <TextView
338   - android:layout_width="wrap_content"
  345 + <LinearLayout
  346 + android:layout_width="0dp"
339 347 android:layout_height="wrap_content"
340   - android:layout_marginLeft="25dp"
341   - android:text="123"
342   - android:textColor="@color/black"
343   - android:textSize="17sp"
344   - android:textStyle="bold" />
  348 + android:layout_weight="1">
345 349  
346   - <TextView
347   - android:layout_width="wrap_content"
348   - android:layout_height="wrap_content"
349   - android:layout_marginLeft="5dp"
350   - android:text="人参与"
351   - android:textColor="@color/black"
352   - android:textSize="15sp" />
  350 + <TextView
  351 + android:layout_width="wrap_content"
  352 + android:layout_height="wrap_content"
  353 + android:layout_marginLeft="28dp"
  354 + android:text="123"
  355 + android:textColor="@color/text_black"
  356 + android:textSize="17sp"
  357 + android:textStyle="bold" />
  358 +
  359 + <TextView
  360 + android:layout_width="wrap_content"
  361 + android:layout_height="wrap_content"
  362 + android:layout_marginLeft="5dp"
  363 + android:text="人参与"
  364 + android:textColor="@color/text_black"
  365 + android:textSize="15sp" />
  366 + </LinearLayout>
353 367  
354 368 <LinearLayout
355   - android:layout_width="match_parent"
  369 + android:layout_width="wrap_content"
356 370 android:layout_height="wrap_content"
357 371 android:gravity="right|center">
358 372  
359 373 <com.cnlive.moudle.pedometer.ui.widget.FivePersonIconView
360 374 android:id="@+id/five_join_person"
361   - android:layout_width="match_parent"
  375 + android:layout_width="180dp"
362 376 android:layout_height="40dp"
363 377 android:layout_marginRight="10dp"
364 378 FivePersonIconView:showRightFlag="true" />
... ...
moudle_pedometer/src/main/res/layout/layout_run_detail_street_introduce.xml
  View file @983fa56
... ... @@ -2,9 +2,9 @@
2 2 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3 3 android:layout_width="match_parent"
4 4 android:layout_height="wrap_content"
  5 + android:background="@color/white"
5 6 android:orientation="vertical"
6 7 android:paddingLeft="10dp"
7   - android:background="@color/white"
8 8 android:paddingRight="10dp">
9 9 <!--路线介绍-->
10 10 <TextView
... ... @@ -21,7 +21,7 @@
21 21 android:layout_height="wrap_content"
22 22 android:layout_marginTop="10dp"
23 23 android:text="路线介绍路线介绍路线介绍路线介绍路线介绍路线介绍路线介绍路线介绍路线介绍路线介绍路线介绍路线介绍路线介绍路线介绍路线介绍路线介绍路线介绍路线介绍路线介绍"
24   - android:textColor="@color/black"
  24 + android:textColor="@color/text_black"
25 25 android:textSize="15sp" />
26 26  
27 27 <!--地图-->
... ... @@ -37,7 +37,7 @@
37 37 android:layout_width="match_parent"
38 38 android:layout_height="500dp"
39 39 android:layout_marginTop="10dp"
40   - android:layout_marginBottom="10dp"
  40 + android:layout_marginBottom="60dp"
41 41 android:background="@drawable/map"
42 42 android:scaleType="center" />
43 43 </LinearLayout>
44 44 \ No newline at end of file
... ...
moudle_pedometer/src/main/res/values/colors.xml
  View file @983fa56
... ... @@ -2,8 +2,8 @@
2 2 <resources>
3 3 <color name="run_main_bg">#3D3745</color>
4 4 <color name="run_main_time_bg">#5BC4A4</color>
5   - <color name="text_gray">#8F8C95</color>
6   - <color name="green_round">#29C48A</color>
  5 + <color name="text_gray">#666666</color>
  6 + <color name="green_round">#5BC4A4</color>
7 7 <color name="red_round">#F97070</color>
8 8 <color name="gray_round">#D6D6D6</color>
9 9 <color name="circle_stop">#40000000</color>
... ... @@ -25,6 +25,6 @@
25 25  
26 26 <color name="red">#EF5544</color>
27 27  
28   -
29   - <color name="bottom_sheet_dialog_race_location_text">#C3C3C3</color>
  28 + <color name="text_black">#333333</color>
  29 + <color name="bottom_sheet_dialog_race_location_text">#999999</color>
30 30 </resources>
... ...