CNLive Android Team / ModulePedometer · Commits

Commit 89f69e82e165673c6af8b4c8fe5d1dfd0572f38f

Authored by 杨帅
1 parent bffe8dc3

1.赛事详情

Inline Side-by-side
Showing 11 changed files with 321 additions and 257 deletions
config.gradle
  View file @89f69e8
@@ -21,7 +21,7 @@ ext { @@ -21,7 +21,7 @@ ext {
21 //编译方式 21 //编译方式
22 debug : false, 22 debug : false,
23 //版本号 23 //版本号
24 - version: "0.0.4", 24 + version: "0.0.5",
25 //Lib库前缀 25 //Lib库前缀
26 packeg : "com.cnlive.module", 26 packeg : "com.cnlive.module",
27 //Lib库名称 27 //Lib库名称
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunRaceDetailFragmentView.java
  View file @89f69e8
@@ -10,6 +10,8 @@ import android.hardware.SensorEventListener; @@ -10,6 +10,8 @@ import android.hardware.SensorEventListener;
10 import android.hardware.SensorManager; 10 import android.hardware.SensorManager;
11 import android.util.Log; 11 import android.util.Log;
12 import android.view.View; 12 import android.view.View;
  13 +import android.view.ViewGroup;
  14 +import android.widget.LinearLayout;
13 import android.widget.Toast; 15 import android.widget.Toast;
14 16
15 import com.baidu.location.BDAbstractLocationListener; 17 import com.baidu.location.BDAbstractLocationListener;
@@ -130,9 +132,30 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener { @@ -130,9 +132,30 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
130 fragment.binding.slidingLayout.addPanelSlideListener(new SlidingUpPanelLayout.PanelSlideListener() { 132 fragment.binding.slidingLayout.addPanelSlideListener(new SlidingUpPanelLayout.PanelSlideListener() {
131 @Override 133 @Override
132 public void onPanelSlide(View panel, float slideOffset) { 134 public void onPanelSlide(View panel, float slideOffset) {
  135 + Log.e(TAG, "onPanelSlide: slideOffset" + slideOffset);
  136 + if (slideOffset >= 0 && slideOffset <= 1) {
  137 + int leakWidth = (int) (ScreenUtil.dip2px(getContext(), 30) / 0.6);
  138 + LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT);
  139 + int current = (int) (leakWidth * slideOffset)+(ScreenUtil.dip2px(getContext(), 5));
  140 +
  141 + if (leakWidth - ScreenUtil.dip2px(getContext(), current) <= ScreenUtil.dip2px(getContext(), 15)) {
  142 + if (leakWidth - ScreenUtil.dip2px(getContext(), current) >= 0) {
  143 + layoutParams.setMargins(leakWidth - ScreenUtil.dip2px(getContext(), current), 0, leakWidth - ScreenUtil.dip2px(getContext(), current), 0);
  144 + } else {
  145 + layoutParams.setMargins(0, 0, 0, 0);
  146 + }
  147 + fragment.binding.includeStreet.llFirstPanelRoot.setLayoutParams(layoutParams);
  148 + fragment.binding.includeStreet.llBottomPanel.setLayoutParams(layoutParams);
  149 + }
  150 + }
  151 +
133 if (slideOffset == 0) { 152 if (slideOffset == 0) {
134 //在初始位置 153 //在初始位置
135 fragment.binding.includeStreet.rlStartBtn.setVisibility(View.VISIBLE); 154 fragment.binding.includeStreet.rlStartBtn.setVisibility(View.VISIBLE);
  155 + LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT);
  156 + layoutParams.setMargins(ScreenUtil.dip2px(getContext(),15), 0, ScreenUtil.dip2px(getContext(),15), 0);
  157 + fragment.binding.includeStreet.llFirstPanelRoot.setLayoutParams(layoutParams);
  158 + fragment.binding.includeStreet.llBottomPanel.setLayoutParams(layoutParams);
136 } else { 159 } else {
137 //用户进行滑动 160 //用户进行滑动
138 fragment.binding.includeStreet.rlStartBtn.setVisibility(View.GONE); 161 fragment.binding.includeStreet.rlStartBtn.setVisibility(View.GONE);
@@ -176,7 +199,7 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener { @@ -176,7 +199,7 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
176 fragment.binding.tvRunNow.setText(getContext().getResources().getString(R.string.run_race_btn_sign_up)); 199 fragment.binding.tvRunNow.setText(getContext().getResources().getString(R.string.run_race_btn_sign_up));
177 fragment.binding.tvGoTip.setVisibility(View.GONE); 200 fragment.binding.tvGoTip.setVisibility(View.GONE);
178 } else { 201 } else {
179 - TipDialog tipDialog = new TipDialog(getContext(), getContext().getResources().getString(R.string.run_race_far_tip), "确定", new TipDialog.DialogInterface() { 202 + TipDialog tipDialog = new TipDialog(getContext(), getContext().getResources().getString(R.string.run_race_far_tip), "我知道了", R.color.green_round, new TipDialog.DialogInterface() {
180 @Override 203 @Override
181 public void onClick(TipDialog dialog) { 204 public void onClick(TipDialog dialog) {
182 dialog.dismiss(); 205 dialog.dismiss();
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/widget/TipDialog.java
  View file @89f69e8
@@ -30,16 +30,17 @@ public class TipDialog extends Dialog { @@ -30,16 +30,17 @@ public class TipDialog extends Dialog {
30 private DialogInterface okInterface; 30 private DialogInterface okInterface;
31 private LinearLayout.LayoutParams layoutParams; 31 private LinearLayout.LayoutParams layoutParams;
32 32
33 - public TipDialog(@NonNull Context context, String tipText, String btnOkText, DialogInterface okInterface) { 33 + public TipDialog(@NonNull Context context, String tipText, String btnOkText, int okTextColor, DialogInterface okInterface) {
34 super(context, R.style.MyDialog); 34 super(context, R.style.MyDialog);
35 this.context = context; 35 this.context = context;
36 view = LayoutInflater.from(context).inflate(R.layout.dialog_tip, null); 36 view = LayoutInflater.from(context).inflate(R.layout.dialog_tip, null);
37 initView(view); 37 initView(view);
38 - layoutParams = new LinearLayout.LayoutParams((int) (getScreenWidth(context) * 0.8), ViewGroup.LayoutParams.WRAP_CONTENT); 38 + layoutParams = new LinearLayout.LayoutParams((int) (getScreenWidth(context) * 0.75), ViewGroup.LayoutParams.WRAP_CONTENT);
39 ll_child.setLayoutParams(layoutParams); 39 ll_child.setLayoutParams(layoutParams);
40 40
41 tv_dialog_tip.setText(tipText); 41 tv_dialog_tip.setText(tipText);
42 btn_ok.setText(btnOkText); 42 btn_ok.setText(btnOkText);
  43 + btn_ok.setTextColor(context.getResources().getColor(okTextColor));
43 this.okInterface = okInterface; 44 this.okInterface = okInterface;
44 45
45 } 46 }
moudle_pedometer/src/main/res/drawable/selector_tip_dialog_btn_bottom.xml 0 → 100644
  View file @89f69e8
  1 +<?xml version="1.0" encoding="utf-8"?>
  2 +<selector xmlns:android="http://schemas.android.com/apk/res/android">
  3 + <item android:drawable="@color/transparent" android:state_pressed="false" />
  4 + <item android:drawable="@drawable/shape_tip_dialog_btn_bottom_press" android:state_pressed="true" />
  5 +
  6 +</selector>
0 \ No newline at end of file 7 \ No newline at end of file
moudle_pedometer/src/main/res/drawable/shape_tip_dialog_btn_bottom_press.xml 0 → 100644
  View file @89f69e8
  1 +<?xml version="1.0" encoding="utf-8"?>
  2 +<shape xmlns:android="http://schemas.android.com/apk/res/android">
  3 + <corners
  4 + android:bottomLeftRadius="20dp"
  5 + android:bottomRightRadius="20dp" />
  6 + <solid android:color="@color/line" />
  7 +</shape>
0 \ No newline at end of file 8 \ No newline at end of file
moudle_pedometer/src/main/res/layout/dialog_tip.xml
  View file @89f69e8
@@ -51,7 +51,7 @@ @@ -51,7 +51,7 @@
51 android:layout_width="match_parent" 51 android:layout_width="match_parent"
52 android:layout_height="match_parent" 52 android:layout_height="match_parent"
53 android:layout_gravity="center" 53 android:layout_gravity="center"
54 - android:background="@drawable/selector_dialog_btn_left" 54 + android:background="@drawable/selector_tip_dialog_btn_bottom"
55 android:text="好的" 55 android:text="好的"
56 android:textColor="@color/btn_green" 56 android:textColor="@color/btn_green"
57 android:textSize="15sp" 57 android:textSize="15sp"
moudle_pedometer/src/main/res/layout/fragment_run_race_detail.xml
  View file @89f69e8
@@ -60,7 +60,6 @@ @@ -60,7 +60,6 @@
60 android:id="@+id/dragView" 60 android:id="@+id/dragView"
61 android:layout_width="match_parent" 61 android:layout_width="match_parent"
62 android:layout_height="match_parent" 62 android:layout_height="match_parent"
63 - android:background="@drawable/shape_10dp_white_raduis_bg"  
64 android:clickable="true" 63 android:clickable="true"
65 android:focusable="false" 64 android:focusable="false"
66 android:orientation="vertical"> 65 android:orientation="vertical">
@@ -68,7 +67,8 @@ @@ -68,7 +67,8 @@
68 <ScrollView 67 <ScrollView
69 android:id="@+id/scrollView" 68 android:id="@+id/scrollView"
70 android:layout_width="match_parent" 69 android:layout_width="match_parent"
71 - android:layout_height="wrap_content"> 70 + android:layout_height="wrap_content"
  71 + android:scrollbars="none">
72 72
73 <LinearLayout 73 <LinearLayout
74 android:id="@+id/ll_root" 74 android:id="@+id/ll_root"
@@ -82,10 +82,12 @@ @@ -82,10 +82,12 @@
82 <!--成绩--> 82 <!--成绩-->
83 <include 83 <include
84 android:id="@+id/include_person_score" 84 android:id="@+id/include_person_score"
  85 + android:visibility="gone"
85 layout="@layout/layout_run_detail_person_score" /> 86 layout="@layout/layout_run_detail_person_score" />
86 <!--排行--> 87 <!--排行-->
87 <include 88 <include
88 android:id="@+id/include_rank" 89 android:id="@+id/include_rank"
  90 + android:visibility="gone"
89 layout="@layout/layout_run_detail_rank" /> 91 layout="@layout/layout_run_detail_rank" />
90 <!--路线介绍--> 92 <!--路线介绍-->
91 <include 93 <include
moudle_pedometer/src/main/res/layout/layout_run_detail_person_score.xml
  View file @89f69e8
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" 2 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3 android:layout_width="match_parent" 3 android:layout_width="match_parent"
  4 + android:background="@color/white"
4 android:layout_height="wrap_content"> 5 android:layout_height="wrap_content">
5 <!--个人最佳成绩--> 6 <!--个人最佳成绩-->
6 <LinearLayout 7 <LinearLayout
moudle_pedometer/src/main/res/layout/layout_run_detail_rank.xml
  View file @89f69e8
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
  2 +
2 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" 3 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3 xmlns:FivePersonIconView="http://schemas.android.com/apk/res-auto" 4 xmlns:FivePersonIconView="http://schemas.android.com/apk/res-auto"
4 xmlns:app="http://schemas.android.com/apk/res-auto" 5 xmlns:app="http://schemas.android.com/apk/res-auto"
  6 + android:id="@+id/ll_rank_root"
5 android:layout_width="match_parent" 7 android:layout_width="match_parent"
6 - android:layout_height="wrap_content"> 8 + android:layout_height="wrap_content"
  9 + android:background="@color/white">
7 <!--排行榜--> 10 <!--排行榜-->
8 <LinearLayout 11 <LinearLayout
9 android:layout_width="match_parent" 12 android:layout_width="match_parent"
moudle_pedometer/src/main/res/layout/layout_run_detail_street.xml
  View file @89f69e8
@@ -15,74 +15,85 @@ @@ -15,74 +15,85 @@
15 android:id="@+id/ll_bottom_first_panel" 15 android:id="@+id/ll_bottom_first_panel"
16 android:layout_width="match_parent" 16 android:layout_width="match_parent"
17 android:layout_height="wrap_content" 17 android:layout_height="wrap_content"
  18 + android:background="@color/transparent"
18 android:orientation="vertical"> 19 android:orientation="vertical">
19 - <!--活动标题-->  
20 - <TextView  
21 - android:id="@+id/tv_race_title"  
22 - android:layout_width="wrap_content"  
23 - android:layout_height="wrap_content"  
24 - android:layout_marginLeft="10dp"  
25 - android:layout_marginTop="10dp"  
26 - android:text="奥森南园跑道"  
27 - android:textSize="18sp"  
28 - android:textStyle="bold" />  
29 - <!--活动地点-->  
30 - <LinearLayout  
31 - android:layout_width="match_parent"  
32 - android:layout_height="wrap_content"  
33 - android:layout_marginLeft="10dp"  
34 - android:layout_marginTop="10dp">  
35 20
36 - <ImageView  
37 - android:layout_width="20dp"  
38 - android:layout_height="20dp"  
39 - android:background="@drawable/icon_race_location_green" />  
40 -  
41 - <TextView  
42 - android:layout_width="wrap_content"  
43 - android:layout_height="wrap_content"  
44 - android:layout_marginLeft="5dp"  
45 - android:text="@string/layout_street_active_point"  
46 - android:textColor="@color/bottom_sheet_dialog_race_location_text"  
47 - android:textSize="14sp" />  
48 - </LinearLayout>  
49 - <!--活动地点详情-->  
50 <LinearLayout 21 <LinearLayout
  22 + android:id="@+id/ll_first_panel_root"
51 android:layout_width="match_parent" 23 android:layout_width="match_parent"
52 - android:layout_height="wrap_content"  
53 - android:layout_marginLeft="10dp"  
54 - android:layout_marginTop="10dp">  
55 - 24 + android:layout_height="100dp"
  25 + android:layout_marginLeft="15dp"
  26 + android:layout_marginRight="15dp"
  27 + android:background="@color/white"
  28 + android:orientation="vertical">
  29 + <!--活动标题-->
56 <TextView 30 <TextView
  31 + android:id="@+id/tv_race_title"
57 android:layout_width="wrap_content" 32 android:layout_width="wrap_content"
58 android:layout_height="wrap_content" 33 android:layout_height="wrap_content"
59 - android:layout_marginLeft="25dp"  
60 - android:text="北京"  
61 - android:textColor="@color/black"  
62 - android:textSize="15sp" />  
63 -  
64 - <TextView  
65 - android:layout_width="wrap_content" 34 + android:layout_marginLeft="10dp"
  35 + android:layout_marginTop="10dp"
  36 + android:text="奥森南园跑道"
  37 + android:textSize="18sp"
  38 + android:textStyle="bold" />
  39 + <!--活动地点-->
  40 + <LinearLayout
  41 + android:layout_width="match_parent"
66 android:layout_height="wrap_content" 42 android:layout_height="wrap_content"
67 - android:layout_marginLeft="25dp"  
68 - android:text="首都师范大学"  
69 - android:textColor="@color/black"  
70 - android:textSize="15sp" />  
71 -  
72 - <TextView  
73 - android:layout_width="wrap_content" 43 + android:layout_marginLeft="10dp"
  44 + android:layout_marginTop="10dp">
  45 +
  46 + <ImageView
  47 + android:layout_width="20dp"
  48 + android:layout_height="20dp"
  49 + android:background="@drawable/icon_race_location_green" />
  50 +
  51 + <TextView
  52 + android:layout_width="wrap_content"
  53 + android:layout_height="wrap_content"
  54 + android:layout_marginLeft="5dp"
  55 + android:text="@string/layout_street_active_point"
  56 + android:textColor="@color/bottom_sheet_dialog_race_location_text"
  57 + android:textSize="14sp" />
  58 + </LinearLayout>
  59 + <!--活动地点详情-->
  60 + <LinearLayout
  61 + android:layout_width="match_parent"
74 android:layout_height="wrap_content" 62 android:layout_height="wrap_content"
75 - android:layout_marginLeft="25dp"  
76 - android:text="全长4.42公里"  
77 - android:textColor="@color/black"  
78 - android:textSize="15sp" /> 63 + android:layout_marginLeft="10dp"
  64 + android:layout_marginTop="10dp"
  65 + android:layout_marginBottom="10dp">
  66 +
  67 + <TextView
  68 + android:layout_width="wrap_content"
  69 + android:layout_height="wrap_content"
  70 + android:layout_marginLeft="25dp"
  71 + android:text="北京"
  72 + android:textColor="@color/black"
  73 + android:textSize="15sp" />
  74 +
  75 + <TextView
  76 + android:layout_width="wrap_content"
  77 + android:layout_height="wrap_content"
  78 + android:layout_marginLeft="25dp"
  79 + android:text="首都师范大学"
  80 + android:textColor="@color/black"
  81 + android:textSize="15sp" />
  82 +
  83 + <TextView
  84 + android:layout_width="wrap_content"
  85 + android:layout_height="wrap_content"
  86 + android:layout_marginLeft="25dp"
  87 + android:text="全长4.42公里"
  88 + android:textColor="@color/black"
  89 + android:textSize="15sp" />
  90 + </LinearLayout>
79 </LinearLayout> 91 </LinearLayout>
80 <!--按钮--> 92 <!--按钮-->
81 <RelativeLayout 93 <RelativeLayout
82 android:id="@+id/rl_start_btn" 94 android:id="@+id/rl_start_btn"
83 android:layout_width="match_parent" 95 android:layout_width="match_parent"
84 android:layout_height="40sp" 96 android:layout_height="40sp"
85 - android:layout_marginTop="10dp"  
86 android:background="@color/green_round" 97 android:background="@color/green_round"
87 android:tag="0"> 98 android:tag="0">
88 99
@@ -110,239 +121,248 @@ @@ -110,239 +121,248 @@
110 121
111 </RelativeLayout> 122 </RelativeLayout>
112 </LinearLayout> 123 </LinearLayout>
113 - <!--起点--> 124 + <!---->
114 <LinearLayout 125 <LinearLayout
  126 + android:id="@+id/ll_bottom_panel"
115 android:layout_width="match_parent" 127 android:layout_width="match_parent"
116 android:layout_height="wrap_content" 128 android:layout_height="wrap_content"
117 - android:layout_marginLeft="10dp"  
118 - android:layout_marginTop="10dp"  
119 - android:gravity="center_vertical">  
120 -  
121 - <View  
122 - android:layout_width="10dp"  
123 - android:layout_height="10dp"  
124 - android:layout_marginLeft="25dp"  
125 - android:background="@drawable/shape_circle_green" />  
126 -  
127 - <TextView  
128 - android:layout_width="wrap_content" 129 + android:layout_marginLeft="15dp"
  130 + android:layout_marginRight="15dp"
  131 + android:background="@color/white"
  132 + android:orientation="vertical">
  133 + <!--起点-->
  134 + <LinearLayout
  135 + android:layout_width="match_parent"
129 android:layout_height="wrap_content" 136 android:layout_height="wrap_content"
130 android:layout_marginLeft="10dp" 137 android:layout_marginLeft="10dp"
131 - android:text="@string/layout_street_start_point"  
132 - android:textColor="@color/bottom_sheet_dialog_race_location_text"  
133 - android:textSize="14sp" /> 138 + android:gravity="center_vertical">
134 139
135 - <TextView  
136 - android:layout_width="wrap_content"  
137 - android:layout_height="wrap_content"  
138 - android:layout_marginLeft="10dp"  
139 - android:text="首都师范大学操场东门"  
140 - android:textColor="@color/black"  
141 - android:textSize="15sp" />  
142 - </LinearLayout>  
143 - <!--终点-->  
144 - <LinearLayout  
145 - android:id="@+id/ll_end_point"  
146 - android:layout_width="match_parent"  
147 - android:layout_height="wrap_content"  
148 - android:layout_marginLeft="10dp"  
149 - android:layout_marginTop="10dp"  
150 - android:gravity="center_vertical"> 140 + <View
  141 + android:layout_width="10dp"
  142 + android:layout_height="10dp"
  143 + android:layout_marginLeft="25dp"
  144 + android:background="@drawable/shape_circle_green" />
151 145
152 - <View  
153 - android:layout_width="10dp"  
154 - android:layout_height="10dp"  
155 - android:layout_marginLeft="25dp"  
156 - android:background="@drawable/shape_circle_red" /> 146 + <TextView
  147 + android:layout_width="wrap_content"
  148 + android:layout_height="wrap_content"
  149 + android:layout_marginLeft="10dp"
  150 + android:text="@string/layout_street_start_point"
  151 + android:textColor="@color/bottom_sheet_dialog_race_location_text"
  152 + android:textSize="14sp" />
157 153
158 - <TextView  
159 - android:layout_width="wrap_content" 154 + <TextView
  155 + android:layout_width="wrap_content"
  156 + android:layout_height="wrap_content"
  157 + android:layout_marginLeft="10dp"
  158 + android:text="首都师范大学操场东门"
  159 + android:textColor="@color/black"
  160 + android:textSize="15sp" />
  161 + </LinearLayout>
  162 + <!--终点-->
  163 + <LinearLayout
  164 + android:id="@+id/ll_end_point"
  165 + android:layout_width="match_parent"
160 android:layout_height="wrap_content" 166 android:layout_height="wrap_content"
161 android:layout_marginLeft="10dp" 167 android:layout_marginLeft="10dp"
162 - android:text="@string/layout_street_end_point"  
163 - android:textColor="@color/bottom_sheet_dialog_race_location_text"  
164 - android:textSize="14sp" /> 168 + android:layout_marginTop="10dp"
  169 + android:gravity="center_vertical">
165 170
166 - <TextView  
167 - android:layout_width="wrap_content"  
168 - android:layout_height="wrap_content"  
169 - android:layout_marginLeft="10dp"  
170 - android:text="首都师范大学操场西门"  
171 - android:textColor="@color/black"  
172 - android:textSize="15sp" />  
173 - </LinearLayout> 171 + <View
  172 + android:layout_width="10dp"
  173 + android:layout_height="10dp"
  174 + android:layout_marginLeft="25dp"
  175 + android:background="@drawable/shape_circle_red" />
174 176
  177 + <TextView
  178 + android:layout_width="wrap_content"
  179 + android:layout_height="wrap_content"
  180 + android:layout_marginLeft="10dp"
  181 + android:text="@string/layout_street_end_point"
  182 + android:textColor="@color/bottom_sheet_dialog_race_location_text"
  183 + android:textSize="14sp" />
175 184
176 - <!--报名时间-->  
177 - <LinearLayout  
178 - android:layout_width="match_parent"  
179 - android:layout_height="wrap_content"  
180 - android:layout_marginLeft="10dp"  
181 - android:layout_marginTop="10dp"> 185 + <TextView
  186 + android:layout_width="wrap_content"
  187 + android:layout_height="wrap_content"
  188 + android:layout_marginLeft="10dp"
  189 + android:text="首都师范大学操场西门"
  190 + android:textColor="@color/black"
  191 + android:textSize="15sp" />
  192 + </LinearLayout>
182 193
183 - <ImageView  
184 - android:layout_width="20dp"  
185 - android:layout_height="20dp"  
186 - android:background="@drawable/icon_race_location_green" />  
187 194
188 - <TextView  
189 - android:layout_width="wrap_content" 195 + <!--报名时间-->
  196 + <LinearLayout
  197 + android:layout_width="match_parent"
190 android:layout_height="wrap_content" 198 android:layout_height="wrap_content"
191 - android:layout_marginLeft="5dp"  
192 - android:text="@string/layout_street_sign_up_time"  
193 - android:textColor="@color/bottom_sheet_dialog_race_location_text"  
194 - android:textSize="14sp" />  
195 - </LinearLayout>  
196 - <!--时间-->  
197 - <LinearLayout  
198 - android:layout_width="match_parent"  
199 - android:layout_height="wrap_content"  
200 - android:layout_marginLeft="10dp"  
201 - android:layout_marginTop="10dp"> 199 + android:layout_marginLeft="10dp"
  200 + android:layout_marginTop="10dp">
202 201
203 - <TextView  
204 - android:layout_width="wrap_content"  
205 - android:layout_height="wrap_content"  
206 - android:layout_marginLeft="25dp"  
207 - android:text="2019.05.01"  
208 - android:textColor="@color/black"  
209 - android:textSize="15sp" />  
210 -  
211 - <TextView  
212 - android:layout_width="wrap_content"  
213 - android:layout_height="match_parent"  
214 - android:layout_marginLeft="5dp"  
215 - android:text="——"  
216 - android:textColor="@color/black"  
217 - android:textSize="15sp" />  
218 -  
219 - <TextView  
220 - android:layout_width="wrap_content" 202 + <ImageView
  203 + android:layout_width="20dp"
  204 + android:layout_height="20dp"
  205 + android:background="@drawable/icon_race_location_green" />
  206 +
  207 + <TextView
  208 + android:layout_width="wrap_content"
  209 + android:layout_height="wrap_content"
  210 + android:layout_marginLeft="5dp"
  211 + android:text="@string/layout_street_sign_up_time"
  212 + android:textColor="@color/bottom_sheet_dialog_race_location_text"
  213 + android:textSize="14sp" />
  214 + </LinearLayout>
  215 + <!--时间-->
  216 + <LinearLayout
  217 + android:layout_width="match_parent"
221 android:layout_height="wrap_content" 218 android:layout_height="wrap_content"
222 - android:layout_marginLeft="5dp"  
223 - android:text="2019.09.01"  
224 - android:textColor="@color/black"  
225 - android:textSize="15sp" />  
226 - </LinearLayout> 219 + android:layout_marginLeft="10dp"
  220 + android:layout_marginTop="10dp">
227 221
228 - <View  
229 - android:layout_width="match_parent"  
230 - android:layout_height="1dp"  
231 - android:layout_marginTop="5dp"  
232 - android:background="@color/line" />  
233 - <!--活动时间-->  
234 - <LinearLayout  
235 - android:layout_width="match_parent"  
236 - android:layout_height="wrap_content"  
237 - android:layout_marginLeft="10dp"  
238 - android:layout_marginTop="10dp"> 222 + <TextView
  223 + android:layout_width="wrap_content"
  224 + android:layout_height="wrap_content"
  225 + android:layout_marginLeft="25dp"
  226 + android:text="2019.05.01"
  227 + android:textColor="@color/black"
  228 + android:textSize="15sp" />
239 229
240 - <ImageView  
241 - android:layout_width="20dp"  
242 - android:layout_height="20dp"  
243 - android:background="@drawable/icon_race_location_green" /> 230 + <TextView
  231 + android:layout_width="wrap_content"
  232 + android:layout_height="match_parent"
  233 + android:layout_marginLeft="5dp"
  234 + android:text="——"
  235 + android:textColor="@color/black"
  236 + android:textSize="15sp" />
244 237
245 - <TextView  
246 - android:layout_width="wrap_content"  
247 - android:layout_height="wrap_content"  
248 - android:layout_marginLeft="5dp"  
249 - android:text="@string/layout_street_active_time"  
250 - android:textColor="@color/bottom_sheet_dialog_race_location_text"  
251 - android:textSize="14sp" />  
252 - </LinearLayout>  
253 - <!--活动时间的具体日期-->  
254 - <LinearLayout  
255 - android:layout_width="match_parent"  
256 - android:layout_height="wrap_content"  
257 - android:layout_marginLeft="10dp"  
258 - android:layout_marginTop="10dp"> 238 + <TextView
  239 + android:layout_width="wrap_content"
  240 + android:layout_height="wrap_content"
  241 + android:layout_marginLeft="5dp"
  242 + android:text="2019.09.01"
  243 + android:textColor="@color/black"
  244 + android:textSize="15sp" />
  245 + </LinearLayout>
259 246
260 - <TextView  
261 - android:layout_width="wrap_content" 247 + <View
  248 + android:layout_width="match_parent"
  249 + android:layout_height="1dp"
  250 + android:layout_marginTop="5dp"
  251 + android:background="@color/line" />
  252 + <!--活动时间-->
  253 + <LinearLayout
  254 + android:layout_width="match_parent"
262 android:layout_height="wrap_content" 255 android:layout_height="wrap_content"
263 - android:layout_marginLeft="25dp"  
264 - android:text="2019.05.01"  
265 - android:textColor="@color/black"  
266 - android:textSize="15sp" />  
267 -  
268 - <TextView  
269 - android:layout_width="wrap_content"  
270 - android:layout_height="match_parent"  
271 - android:layout_marginLeft="5dp"  
272 - android:text="——"  
273 - android:textColor="@color/black"  
274 - android:textSize="15sp" />  
275 -  
276 - <TextView  
277 - android:layout_width="wrap_content" 256 + android:layout_marginLeft="10dp"
  257 + android:layout_marginTop="10dp">
  258 +
  259 + <ImageView
  260 + android:layout_width="20dp"
  261 + android:layout_height="20dp"
  262 + android:background="@drawable/icon_race_location_green" />
  263 +
  264 + <TextView
  265 + android:layout_width="wrap_content"
  266 + android:layout_height="wrap_content"
  267 + android:layout_marginLeft="5dp"
  268 + android:text="@string/layout_street_active_time"
  269 + android:textColor="@color/bottom_sheet_dialog_race_location_text"
  270 + android:textSize="14sp" />
  271 + </LinearLayout>
  272 + <!--活动时间的具体日期-->
  273 + <LinearLayout
  274 + android:layout_width="match_parent"
278 android:layout_height="wrap_content" 275 android:layout_height="wrap_content"
279 - android:layout_marginLeft="5dp"  
280 - android:text="2019.09.01"  
281 - android:textColor="@color/black"  
282 - android:textSize="15sp" />  
283 - </LinearLayout> 276 + android:layout_marginLeft="10dp"
  277 + android:layout_marginTop="10dp">
284 278
285 - <View  
286 - android:layout_width="match_parent"  
287 - android:layout_height="1dp"  
288 - android:layout_marginTop="5dp"  
289 - android:background="@color/line" />  
290 - <!--参与人数-->  
291 - <LinearLayout  
292 - android:layout_width="match_parent"  
293 - android:layout_height="wrap_content"  
294 - android:layout_marginLeft="10dp"  
295 - android:layout_marginTop="10dp"> 279 + <TextView
  280 + android:layout_width="wrap_content"
  281 + android:layout_height="wrap_content"
  282 + android:layout_marginLeft="25dp"
  283 + android:text="2019.05.01"
  284 + android:textColor="@color/black"
  285 + android:textSize="15sp" />
296 286
297 - <ImageView  
298 - android:layout_width="20dp"  
299 - android:layout_height="20dp"  
300 - android:background="@drawable/icon_race_location_green" /> 287 + <TextView
  288 + android:layout_width="wrap_content"
  289 + android:layout_height="match_parent"
  290 + android:layout_marginLeft="5dp"
  291 + android:text="——"
  292 + android:textColor="@color/black"
  293 + android:textSize="15sp" />
301 294
302 - <TextView  
303 - android:layout_width="wrap_content"  
304 - android:layout_height="wrap_content"  
305 - android:layout_marginLeft="5dp"  
306 - android:text="@string/layout_street_join_person_count"  
307 - android:textColor="@color/bottom_sheet_dialog_race_location_text"  
308 - android:textSize="14sp" />  
309 - </LinearLayout>  
310 - <!--相关的人数-->  
311 - <LinearLayout  
312 - android:layout_width="match_parent"  
313 - android:layout_height="wrap_content"  
314 - android:gravity="center_vertical"> 295 + <TextView
  296 + android:layout_width="wrap_content"
  297 + android:layout_height="wrap_content"
  298 + android:layout_marginLeft="5dp"
  299 + android:text="2019.09.01"
  300 + android:textColor="@color/black"
  301 + android:textSize="15sp" />
  302 + </LinearLayout>
315 303
316 - <TextView  
317 - android:layout_width="wrap_content"  
318 - android:layout_height="wrap_content"  
319 - android:layout_marginLeft="25dp"  
320 - android:text="123"  
321 - android:textColor="@color/black"  
322 - android:textSize="17sp"  
323 - android:textStyle="bold" />  
324 -  
325 - <TextView  
326 - android:layout_width="wrap_content" 304 + <View
  305 + android:layout_width="match_parent"
  306 + android:layout_height="1dp"
  307 + android:layout_marginTop="5dp"
  308 + android:background="@color/line" />
  309 + <!--参与人数-->
  310 + <LinearLayout
  311 + android:layout_width="match_parent"
327 android:layout_height="wrap_content" 312 android:layout_height="wrap_content"
328 - android:layout_marginLeft="5dp"  
329 - android:text="人参与"  
330 - android:textColor="@color/black"  
331 - android:textSize="15sp" /> 313 + android:layout_marginLeft="10dp"
  314 + android:layout_marginTop="10dp">
332 315
  316 + <ImageView
  317 + android:layout_width="20dp"
  318 + android:layout_height="20dp"
  319 + android:background="@drawable/icon_race_location_green" />
  320 +
  321 + <TextView
  322 + android:layout_width="wrap_content"
  323 + android:layout_height="wrap_content"
  324 + android:layout_marginLeft="5dp"
  325 + android:text="@string/layout_street_join_person_count"
  326 + android:textColor="@color/bottom_sheet_dialog_race_location_text"
  327 + android:textSize="14sp" />
  328 + </LinearLayout>
  329 + <!--相关的人数-->
333 <LinearLayout 330 <LinearLayout
334 android:layout_width="match_parent" 331 android:layout_width="match_parent"
335 android:layout_height="wrap_content" 332 android:layout_height="wrap_content"
336 - android:gravity="right|center"> 333 + android:gravity="center_vertical">
  334 +
  335 + <TextView
  336 + android:layout_width="wrap_content"
  337 + android:layout_height="wrap_content"
  338 + android:layout_marginLeft="25dp"
  339 + android:text="123"
  340 + android:textColor="@color/black"
  341 + android:textSize="17sp"
  342 + android:textStyle="bold" />
  343 +
  344 + <TextView
  345 + android:layout_width="wrap_content"
  346 + android:layout_height="wrap_content"
  347 + android:layout_marginLeft="5dp"
  348 + android:text="人参与"
  349 + android:textColor="@color/black"
  350 + android:textSize="15sp" />
337 351
338 - <com.cnlive.moudle.pedometer.ui.widget.FivePersonIconView  
339 - android:id="@+id/five_join_person" 352 + <LinearLayout
340 android:layout_width="match_parent" 353 android:layout_width="match_parent"
341 - android:layout_height="40dp"  
342 - android:layout_marginRight="10dp"  
343 - FivePersonIconView:showRightFlag="true" /> 354 + android:layout_height="wrap_content"
  355 + android:gravity="right|center">
  356 +
  357 + <com.cnlive.moudle.pedometer.ui.widget.FivePersonIconView
  358 + android:id="@+id/five_join_person"
  359 + android:layout_width="match_parent"
  360 + android:layout_height="40dp"
  361 + android:layout_marginRight="10dp"
  362 + FivePersonIconView:showRightFlag="true" />
344 363
345 364
  365 + </LinearLayout>
346 </LinearLayout> 366 </LinearLayout>
347 </LinearLayout> 367 </LinearLayout>
348 <!----> 368 <!---->
moudle_pedometer/src/main/res/layout/layout_run_detail_street_introduce.xml
  View file @89f69e8
@@ -4,6 +4,7 @@ @@ -4,6 +4,7 @@
4 android:layout_height="wrap_content" 4 android:layout_height="wrap_content"
5 android:orientation="vertical" 5 android:orientation="vertical"
6 android:paddingLeft="10dp" 6 android:paddingLeft="10dp"
  7 + android:background="@color/white"
7 android:paddingRight="10dp"> 8 android:paddingRight="10dp">
8 <!--路线介绍--> 9 <!--路线介绍-->
9 <TextView 10 <TextView