CNLive Android Team / ModulePedometer · Commits

Commit f58e15ecce90407801ec27dcb0ade12f2d3adf55

Authored by 杨帅
1 parent 983fa564

1.;跑步结束页面

Inline Side-by-side
Showing 24 changed files with 77 additions and 69 deletions
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/utils/StepUtil.java
  View file @f58e15e
... ... @@ -96,6 +96,7 @@ public class StepUtil {
96 96 Log.e(TAG, "clearRunData: " + list.size());
97 97 // for (int i = 0; i < list.size(); i++) {
98 98 DbCore.getDaoSession().getUserStepEntityDao().deleteByKey(list.get(0).getUuid());
  99 + DbCore.getDaoSession().getUserStepEntityDao().detachAll();
99 100 // }
100 101 }
101 102 }
... ...
moudle_pedometer/src/main/res/drawable-hdpi/icon_back.png 0 → 100644
View file @f58e15e

702 Bytes
moudle_pedometer/src/main/res/drawable-hdpi/icon_run_route.png
View file @f58e15e

1.47 KB | W: | H:

1.15 KB | W: | H:

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

974 Bytes
moudle_pedometer/src/main/res/drawable-hdpi/icon_share.webp deleted 100644 → 0
View file @983fa56
No preview for this file type
moudle_pedometer/src/main/res/drawable-hdpi/icon_step.png
View file @f58e15e

1.52 KB | W: | H:

1.22 KB | W: | H:

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

1.7 KB
moudle_pedometer/src/main/res/drawable-hdpi/rt_ic_location_blank.webp deleted 100644 → 0
View file @983fa56
No preview for this file type
moudle_pedometer/src/main/res/drawable-xhdpi/icon_back.png 0 → 100644
View file @f58e15e

855 Bytes
moudle_pedometer/src/main/res/drawable-xhdpi/icon_run_route.png 0 → 100644
View file @f58e15e

1.36 KB
moudle_pedometer/src/main/res/drawable-xhdpi/icon_share.png 0 → 100644
View file @f58e15e

1.08 KB
moudle_pedometer/src/main/res/drawable-xhdpi/icon_step.png 0 → 100644
View file @f58e15e

1.31 KB
moudle_pedometer/src/main/res/drawable-xhdpi/rt_ic_location_blank.png 0 → 100644
View file @f58e15e

2.04 KB
moudle_pedometer/src/main/res/drawable-xxhdpi/icon_back.png 0 → 100644
View file @f58e15e

1.49 KB
moudle_pedometer/src/main/res/drawable-xxhdpi/icon_run_route.png 0 → 100644
View file @f58e15e

2.61 KB
moudle_pedometer/src/main/res/drawable-xxhdpi/icon_share.png 0 → 100644
View file @f58e15e

2.09 KB
moudle_pedometer/src/main/res/drawable-xxhdpi/icon_step.png 0 → 100644
View file @f58e15e

2.81 KB
moudle_pedometer/src/main/res/drawable-xxhdpi/rt_ic_location_blank.png 0 → 100644
View file @f58e15e

3.71 KB
moudle_pedometer/src/main/res/layout/fragment_finish_run_map.xml
  View file @f58e15e
... ... @@ -26,28 +26,31 @@
26 26 android:layout_height="match_parent"></com.baidu.mapapi.map.MapView>
27 27  
28 28 <FrameLayout
29   - android:layout_width="40dp"
30   - android:layout_height="40dp"
31   - android:layout_margin="10dp"
32   - android:background="@drawable/shape_circle_50_black">
  29 + android:id="@+id/fl_back"
  30 + android:layout_width="55dp"
  31 + android:layout_height="55dp"
  32 + android:background="@drawable/button_fab_white"
  33 + android:focusable="true">
33 34  
34 35 <ImageView
35   - android:layout_width="10dp"
  36 + android:layout_width="12dp"
36 37 android:layout_height="20dp"
37 38 android:layout_gravity="center"
38   - android:background="@drawable/ic_white_back" />
  39 + android:layout_marginLeft="-2dp"
  40 + android:background="@drawable/icon_back"
  41 + android:focusable="false" />
39 42 </FrameLayout>
40 43  
41 44 <FrameLayout
42   - android:layout_width="40dp"
43   - android:layout_height="40dp"
  45 + android:layout_width="55dp"
  46 + android:layout_height="55dp"
44 47 android:layout_gravity="right"
45   - android:layout_margin="10dp"
46   - android:background="@drawable/shape_circle_50_black">
  48 + android:background="@drawable/button_fab_white"
  49 + android:focusable="true">
47 50  
48 51 <ImageView
49   - android:layout_width="15dp"
50   - android:layout_height="15dp"
  52 + android:layout_width="19dp"
  53 + android:layout_height="18dp"
51 54 android:layout_gravity="center"
52 55 android:background="@drawable/icon_share" />
53 56 </FrameLayout>
... ...
moudle_pedometer/src/main/res/layout/fragment_run_main.xml
  View file @f58e15e
... ... @@ -402,7 +402,7 @@
402 402 android:layout_height="match_parent"
403 403 android:background="@color/run_main_time_bg"
404 404 android:gravity="center"
405   - android:visibility="gone">
  405 + android:visibility="visible">
406 406  
407 407 <TextView
408 408 android:id="@+id/tv_time_count_down"
... ...
moudle_pedometer/src/main/res/layout/fragment_running_map.xml
  View file @f58e15e
... ... @@ -13,17 +13,17 @@
13 13  
14 14 <FrameLayout
15 15 android:id="@+id/fl_back"
16   - android:layout_width="60dp"
17   - android:layout_height="60dp"
  16 + android:layout_width="55dp"
  17 + android:layout_height="55dp"
18 18 android:background="@drawable/button_fab_white"
19 19 android:focusable="true">
20 20  
21 21 <ImageView
22   - android:layout_width="25dp"
23   - android:layout_height="25dp"
  22 + android:layout_width="12dp"
  23 + android:layout_height="20dp"
24 24 android:layout_gravity="center"
25   - android:layout_marginLeft="2dp"
26   - android:background="@drawable/mo_ic_dialog_back"
  25 + android:layout_marginLeft="-2dp"
  26 + android:background="@drawable/icon_back"
27 27 android:focusable="false" />
28 28 </FrameLayout>
29 29  
... ... @@ -35,15 +35,15 @@
35 35  
36 36 <FrameLayout
37 37 android:id="@+id/fl_location"
38   - android:layout_width="60dp"
39   - android:layout_height="60dp"
  38 + android:layout_width="55dp"
  39 + android:layout_height="55dp"
40 40 android:layout_marginBottom="20dp"
41 41 android:background="@drawable/button_fab_white"
42 42 android:focusable="true">
43 43  
44 44 <ImageView
45   - android:layout_width="60dp"
46   - android:layout_height="60dp"
  45 + android:layout_width="20dp"
  46 + android:layout_height="20dp"
47 47 android:layout_gravity="center"
48 48 android:background="@drawable/rt_ic_location_blank"
49 49 android:focusable="false" />
... ...
moudle_pedometer/src/main/res/layout/layout_finish_running_route.xml
  View file @f58e15e
1 1 <?xml version="1.0" encoding="utf-8"?>
2 2 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3 3 android:layout_width="match_parent"
4   - android:layout_height="match_parent"
  4 + android:layout_height="wrap_content"
5 5 android:layout_margin="10dp"
6 6 android:background="@drawable/shape_10dp_white_raduis_bg"
7 7 android:orientation="vertical">
... ... @@ -13,17 +13,19 @@
13 13 android:gravity="bottom">
14 14  
15 15 <ImageView
16   - android:layout_width="30dp"
17   - android:layout_height="30dp"
  16 + android:layout_width="18dp"
  17 + android:layout_height="18dp"
18 18 android:layout_marginLeft="10dp"
19 19 android:background="@drawable/icon_run_route" />
20 20  
21 21 <TextView
22 22 android:layout_width="wrap_content"
23   - android:layout_height="wrap_content"
  23 + android:layout_height="match_parent"
  24 + android:layout_marginLeft="5dp"
24 25 android:layout_marginBottom="1dp"
  26 + android:gravity="bottom"
25 27 android:text="跑步路线"
26   - android:textColor="@color/black"
  28 + android:textColor="@color/text_black"
27 29 android:textSize="12sp" />
28 30 </LinearLayout>
29 31 <!--起点-->
... ... @@ -34,8 +36,8 @@
34 36 android:gravity="center_vertical">
35 37  
36 38 <View
37   - android:layout_width="10dp"
38   - android:layout_height="10dp"
  39 + android:layout_width="6dp"
  40 + android:layout_height="6dp"
39 41 android:layout_marginLeft="15dp"
40 42 android:background="@drawable/shape_circle_green" />
41 43  
... ... @@ -45,7 +47,7 @@
45 47 android:layout_marginLeft="10dp"
46 48 android:text="@string/layout_street_start_point"
47 49 android:textColor="@color/text_gray"
48   - android:textSize="14sp" />
  50 + android:textSize="12sp" />
49 51  
50 52 <TextView
51 53 android:id="@+id/tv_start_point"
... ... @@ -54,13 +56,13 @@
54 56 android:layout_marginLeft="10dp"
55 57 android:text="首都师范大学操场东门"
56 58 android:textColor="@color/black"
57   - android:textSize="15sp" />
  59 + android:textSize="12sp" />
58 60 </LinearLayout>
59 61 <!--竖线-->
60 62 <View
61 63 android:layout_width="1dp"
62   - android:layout_height="30dp"
63   - android:layout_marginLeft="19dp"
  64 + android:layout_height="18dp"
  65 + android:layout_marginLeft="17dp"
64 66 android:layout_marginTop="-3dp"
65 67 android:background="@color/vertical_line" />
66 68 <!--终点-->
... ... @@ -71,8 +73,8 @@
71 73 android:gravity="center_vertical">
72 74  
73 75 <View
74   - android:layout_width="10dp"
75   - android:layout_height="10dp"
  76 + android:layout_width="6dp"
  77 + android:layout_height="6dp"
76 78 android:layout_marginLeft="15dp"
77 79 android:background="@drawable/shape_circle_red" />
78 80  
... ... @@ -82,7 +84,7 @@
82 84 android:layout_marginLeft="10dp"
83 85 android:text="@string/layout_street_end_point"
84 86 android:textColor="@color/text_gray"
85   - android:textSize="14sp" />
  87 + android:textSize="12sp" />
86 88  
87 89 <TextView
88 90 android:id="@+id/tv_end_point"
... ... @@ -91,13 +93,13 @@
91 93 android:layout_marginLeft="10dp"
92 94 android:text="首都师范大学操场东门"
93 95 android:textColor="@color/black"
94   - android:textSize="15sp" />
  96 + android:textSize="12sp" />
95 97 </LinearLayout>
96 98 <!--竖线-->
97 99 <View
98 100 android:layout_width="1dp"
99   - android:layout_height="30dp"
100   - android:layout_marginLeft="19dp"
  101 + android:layout_height="25dp"
  102 + android:layout_marginLeft="17dp"
101 103 android:layout_marginTop="-3dp"
102 104 android:background="@color/vertical_line" />
103 105 <!--时间-->
... ... @@ -108,8 +110,8 @@
108 110 android:gravity="center_vertical">
109 111  
110 112 <View
111   - android:layout_width="7dp"
112   - android:layout_height="7dp"
  113 + android:layout_width="4dp"
  114 + android:layout_height="4dp"
113 115 android:layout_marginLeft="16dp"
114 116 android:background="@drawable/shape_circle_gray" />
115 117  
... ... @@ -123,8 +125,9 @@
123 125 android:layout_width="wrap_content"
124 126 android:layout_height="wrap_content"
125 127 android:layout_marginLeft="10dp"
  128 + android:layout_marginTop="5dp"
126 129 android:text="00:27:23"
127   - android:textColor="@color/black"
  130 + android:textColor="@color/text_black"
128 131 android:textSize="18sp"
129 132 android:textStyle="bold" />
130 133  
... ... @@ -134,15 +137,15 @@
134 137 android:layout_marginLeft="11dp"
135 138 android:text="跑步记录时长"
136 139 android:textColor="@color/text_gray"
137   - android:textSize="12sp" />
  140 + android:textSize="11sp" />
138 141 <!---->
139 142 </LinearLayout>
140 143 </LinearLayout>
141 144 <!--竖线-->
142 145 <View
143 146 android:layout_width="1dp"
144   - android:layout_height="30dp"
145   - android:layout_marginLeft="19dp"
  147 + android:layout_height="25dp"
  148 + android:layout_marginLeft="17dp"
146 149 android:layout_marginTop="-15dp"
147 150 android:background="@color/vertical_line" />
148 151 <!---->
... ... @@ -151,11 +154,12 @@
151 154 android:layout_height="wrap_content"
152 155 android:layout_marginTop="-5dp"
153 156 android:layout_marginBottom="10dp"
154   - android:gravity="center_vertical">
  157 + android:gravity="center_vertical"
  158 + android:paddingTop="5dp">
155 159  
156 160 <View
157   - android:layout_width="7dp"
158   - android:layout_height="7dp"
  161 + android:layout_width="4dp"
  162 + android:layout_height="4dp"
159 163 android:layout_marginLeft="16dp"
160 164 android:background="@drawable/shape_circle_gray" />
161 165  
... ... @@ -164,9 +168,8 @@
164 168 android:layout_height="wrap_content"
165 169 android:layout_marginLeft="10dp"
166 170 android:text="路线完成"
167   - android:textColor="@color/black"
168   - android:textSize="15sp"
169   - android:textStyle="bold" />
  171 + android:textColor="@color/text_gray"
  172 + android:textSize="11sp" />
170 173 </LinearLayout>
171 174 <!---->
172 175 </LinearLayout>
173 176 \ No newline at end of file
... ...
moudle_pedometer/src/main/res/layout/layout_finish_step.xml
  View file @f58e15e
... ... @@ -14,15 +14,16 @@
14 14 android:gravity="bottom">
15 15  
16 16 <ImageView
17   - android:layout_width="25dp"
18   - android:layout_height="25dp"
  17 + android:layout_width="16dp"
  18 + android:layout_height="18dp"
19 19 android:background="@drawable/icon_step" />
20 20  
21 21 <TextView
22 22 android:layout_width="wrap_content"
23 23 android:layout_height="wrap_content"
24 24 android:layout_marginLeft="10dp"
25   - android:text="总步数" />
  25 + android:text="总步数"
  26 + android:textSize="12sp" />
26 27 </LinearLayout>
27 28 <!---->
28 29 <LinearLayout
... ... @@ -37,7 +38,7 @@
37 38 android:layout_height="wrap_content"
38 39 android:text="1233"
39 40 android:textColor="@color/green_round"
40   - android:textSize="25sp"
  41 + android:textSize="28sp"
41 42 android:textStyle="bold" />
42 43  
43 44 <TextView
... ... @@ -46,9 +47,8 @@
46 47 android:layout_marginLeft="10dp"
47 48 android:layout_marginTop="4dp"
48 49 android:text="步"
49   - android:textColor="@color/black"
50   - android:textSize="12sp"
51   - android:textStyle="bold" />
  50 + android:textColor="@color/text_black"
  51 + android:textSize="12sp" />
52 52 </LinearLayout>
53 53 <!---->
54 54 </LinearLayout>
55 55 \ No newline at end of file
... ...
moudle_pedometer/src/main/res/layout/layout_finish_user_info.xml
  View file @f58e15e
... ... @@ -19,8 +19,8 @@
19 19 android:layout_marginLeft="80dp"
20 20 android:layout_marginTop="10dp"
21 21 android:text="用户昵称"
22   - android:textColor="@color/black"
23   - android:textSize="15sp" />
  22 + android:textColor="@color/text_black"
  23 + android:textSize="13sp" />
24 24 <!---->
25 25 <LinearLayout
26 26 android:layout_width="match_parent"
... ... @@ -40,7 +40,7 @@
40 40 android:layout_marginLeft="15dp"
41 41 android:layout_marginTop="15dp"
42 42 android:text="奥森公园南路"
43   - android:textColor="@color/black"
  43 + android:textColor="@color/text_black"
44 44 android:textSize="15sp" />
45 45  
46 46 <TextView
... ... @@ -50,6 +50,7 @@
50 50 android:layout_marginLeft="15dp"
51 51 android:layout_marginTop="5dp"
52 52 android:text="2019/06/10 9:51"
  53 + android:textSize="10sp"
53 54 android:textColor="@color/text_gray" />
54 55 </LinearLayout>
55 56 <!---->
... ... @@ -65,8 +66,8 @@
65 66 android:layout_height="wrap_content"
66 67 android:layout_marginRight="10dp"
67 68 android:text="1.53"
68   - android:textColor="@color/black"
69   - android:textSize="35sp"
  69 + android:textColor="@color/text_black"
  70 + android:textSize="45sp"
70 71 android:textStyle="bold" />
71 72  
72 73 <TextView
... ... @@ -74,7 +75,7 @@
74 75 android:layout_height="wrap_content"
75 76 android:layout_marginRight="15dp"
76 77 android:text="公里"
77   - android:textColor="@color/black"
  78 + android:textColor="@color/text_black"
78 79 android:textSize="15sp" />
79 80 </LinearLayout>
80 81 <!---->
... ... @@ -103,7 +104,7 @@
103 104 android:layout_width="wrap_content"
104 105 android:layout_height="wrap_content"
105 106 android:text="34'33''"
106   - android:textColor="@color/black"
  107 + android:textColor="@color/text_black"
107 108 android:textSize="20sp"
108 109 android:textStyle="bold" />
109 110  
... ... @@ -112,7 +113,7 @@
112 113 android:layout_height="wrap_content"
113 114 android:layout_marginTop="5dp"
114 115 android:text="配速"
115   - android:textColor="@color/black"
  116 + android:textColor="@color/text_black"
116 117 android:textSize="15sp" />
117 118 </LinearLayout>
118 119 <!---->
... ... @@ -128,7 +129,7 @@
128 129 android:layout_width="wrap_content"
129 130 android:layout_height="wrap_content"
130 131 android:text="00:00:00"
131   - android:textColor="@color/black"
  132 + android:textColor="@color/text_black"
132 133 android:textSize="20sp"
133 134 android:textStyle="bold" />
134 135  
... ... @@ -137,7 +138,7 @@
137 138 android:layout_height="wrap_content"
138 139 android:layout_marginTop="5dp"
139 140 android:text="用时"
140   - android:textColor="@color/black"
  141 + android:textColor="@color/text_black"
141 142 android:textSize="15sp" />
142 143 </LinearLayout>
143 144 <!---->
... ...