CNLive Android Team / ModulePedometer · Commits

Commit 892088328d759f6ac053bf0d76eb136af75a8c95

Authored by 杨帅
1 parent 2ea0d227

1.修改UI

Inline Side-by-side
Showing 9 changed files with 317 additions and 271 deletions
.idea/gradle.xml
  View file @8920883
... ... @@ -3,20 +3,14 @@
3 3 <component name="GradleSettings">
4 4 <option name="linkedExternalProjectsSettings">
5 5 <GradleProjectSettings>
6   - <compositeConfiguration>
7   - <compositeBuild compositeDefinitionSource="SCRIPT" />
8   - </compositeConfiguration>
9 6 <option name="distributionType" value="DEFAULT_WRAPPED" />
10 7 <option name="externalProjectPath" value="$PROJECT_DIR$" />
11 8 <option name="modules">
12 9 <set>
13 10 <option value="$PROJECT_DIR$" />
14 11 <option value="$PROJECT_DIR$/app" />
15   - <option value="$PROJECT_DIR$/app_user" />
16   - <option value="$PROJECT_DIR$/lib_network" />
17 12 <option value="$PROJECT_DIR$/library_baidumap" />
18 13 <option value="$PROJECT_DIR$/moudle_pedometer" />
19   - <option value="$PROJECT_DIR$/share" />
20 14 </set>
21 15 </option>
22 16 <option name="resolveModulePerSourceSet" value="false" />
... ...
moudle_pedometer/build.gradle
  View file @8920883
... ... @@ -109,6 +109,8 @@ dependencies {
109 109 implementation 'com.sothree.slidinguppanel:library:3.4.0'
110 110  
111 111 implementation project(':library_baidumap')
  112 + //加载动画
  113 + implementation 'com.wang.avi:library:2.1.3'
112 114  
113 115 }
114 116  
... ...
moudle_pedometer/proguard-rules.pro
  View file @8920883
... ... @@ -19,3 +19,6 @@
19 19 # If you keep the line number information, uncomment this to
20 20 # hide the original source file name.
21 21 #-renamesourcefileattribute SourceFile
  22 +#加载动画
  23 +-keep class com.wang.avi.** { *; }
  24 +-keep class com.wang.avi.indicators.** { *; }
22 25 \ No newline at end of file
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunRaceDetailFragmentView.java
  View file @8920883
... ... @@ -141,7 +141,7 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
141 141 //隐藏空视图
142 142 fragment.binding.emptyLayout.setVisibility(View.GONE);
143 143 //显示立即报名按钮
144   - fragment.binding.includeStreet.rlStartBtn.setVisibility(View.VISIBLE);
  144 +// fragment.binding.includeStreet.rlStartBtn.setVisibility(View.VISIBLE);
145 145 //设置底部卡片第一次可滑动的位置
146 146 fragment.binding.slidingLayout.setAnchorPoint(0.6f);
147 147 fragment.binding.slidingLayout.addPanelSlideListener(new SlidingUpPanelLayout.PanelSlideListener() {
... ... @@ -170,18 +170,18 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
170 170  
171 171 }
172 172  
173   - if (slideOffset == 0) {
174   - //在初始位置
175   - if (fragment.binding.includeStreet.rlStartBtn.getVisibility() == View.GONE) {
176   - fragment.binding.includeStreet.rlStartBtn.setVisibility(View.VISIBLE);
177   - }
178   -
179   - } else {
180   - //用户进行滑动
181   - if (fragment.binding.includeStreet.rlStartBtn.getVisibility() == View.VISIBLE) {
182   - fragment.binding.includeStreet.rlStartBtn.setVisibility(View.GONE);
183   - }
184   - }
  173 +// if (slideOffset == 0) {
  174 +// //在初始位置
  175 +// if (fragment.binding.includeStreet.rlStartBtn.getVisibility() == View.GONE) {
  176 +// fragment.binding.includeStreet.rlStartBtn.setVisibility(View.VISIBLE);
  177 +// }
  178 +//
  179 +// } else {
  180 +// //用户进行滑动
  181 +// if (fragment.binding.includeStreet.rlStartBtn.getVisibility() == View.VISIBLE) {
  182 +// fragment.binding.includeStreet.rlStartBtn.setVisibility(View.GONE);
  183 +// }
  184 +// }
185 185 }
186 186  
187 187 @Override
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/net/bean/RunRaceDetailInfo.java
  View file @8920883
... ... @@ -17,6 +17,9 @@ public class RunRaceDetailInfo {
17 17 * endLocation : 首都师范大学操场西门
18 18 * end_time : 1571140800000
19 19 * eventType : 徒步
  20 + * ranking : true
  21 + * individualAchievement : true
  22 + * signResult : false
20 23 * faceUrl : ["http://yweb0.cnliveimg.com/images/headImg/2019/0505/1557039035723_small.jpg","http://yweb0.cnliveimg.com/images/headImg/2019/0505/1557034319038_small.jpg","http://yweb0.cnliveimg.com/images/headImg/2018/0902/1535858459612_small.jpg"]
21 24 * finishFaceUrl : ["http://yweb0.cnliveimg.com/images/headImg/2019/0505/1557039035723_small.jpg","http://yweb0.cnliveimg.com/images/headImg/2019/0523/1558599016203_small.jpg","http://yweb0.cnliveimg.com/images/headImg/2019/0523/1558599016203_small.jpg","http://yweb0.cnliveimg.com/images/headImg/2019/0523/1558599016203_small.jpg","http://yweb0.cnliveimg.com/images/headImg/2019/0523/1558599016203_small.jpg"]
22 25 * finishNum : 33
... ... @@ -44,6 +47,9 @@ public class RunRaceDetailInfo {
44 47 private String endLocation;
45 48 private long end_time;
46 49 private String eventType;
  50 + private boolean ranking;
  51 + private boolean individualAchievement;
  52 + private boolean signResult;
47 53 private String finishNum;
48 54 private String firstEmployTime;
49 55 private String firstFaceUrl;
... ... @@ -112,6 +118,30 @@ public class RunRaceDetailInfo {
112 118 this.eventType = eventType;
113 119 }
114 120  
  121 + public boolean isRanking() {
  122 + return ranking;
  123 + }
  124 +
  125 + public void setRanking(boolean ranking) {
  126 + this.ranking = ranking;
  127 + }
  128 +
  129 + public boolean isIndividualAchievement() {
  130 + return individualAchievement;
  131 + }
  132 +
  133 + public void setIndividualAchievement(boolean individualAchievement) {
  134 + this.individualAchievement = individualAchievement;
  135 + }
  136 +
  137 + public boolean isSignResult() {
  138 + return signResult;
  139 + }
  140 +
  141 + public void setSignResult(boolean signResult) {
  142 + this.signResult = signResult;
  143 + }
  144 +
115 145 public String getFinishNum() {
116 146 return finishNum;
117 147 }
... ...
moudle_pedometer/src/main/res/layout/fragment_finish_run_map.xml
  View file @8920883
... ... @@ -2,132 +2,142 @@
2 2 <layout xmlns:android="http://schemas.android.com/apk/res/android"
3 3 xmlns:app="http://schemas.android.com/apk/res-auto">
4 4  
5   - <com.sothree.slidinguppanel.SlidingUpPanelLayout xmlns:sothree="http://schemas.android.com/apk/res-auto"
6   - android:id="@+id/sliding_layout"
  5 + <FrameLayout
7 6 android:layout_width="match_parent"
8   - android:layout_height="match_parent"
9   - android:gravity="bottom"
10   - sothree:umanoDragView="@+id/dragView"
11   - sothree:umanoFadeColor="@color/black_20"
12   - sothree:umanoOverlay="true"
13   - sothree:umanoPanelHeight="360dp"
14   - sothree:umanoParallaxOffset="100dp"
15   - sothree:umanoScrollableView="@+id/scrollView"
16   - sothree:umanoShadowHeight="0dp">
17   -
18   - <!-- MAIN CONTENT -->
19   - <FrameLayout
20   - android:layout_width="match_parent"
21   - android:layout_height="match_parent">
22   -
23   - <com.baidu.mapapi.map.MapView
24   - android:id="@+id/mapView"
25   - android:layout_width="match_parent"
26   - android:layout_height="match_parent"></com.baidu.mapapi.map.MapView>
27   - <!--地图上面加一层类似于全透明黑色蒙版-->
28   - <LinearLayout
29   - android:layout_width="match_parent"
30   - android:layout_height="match_parent"
31   - android:background="#0D000000"
32   - android:clickable="false"
33   - android:focusable="false"
34   - android:focusableInTouchMode="false"></LinearLayout>
35   -
36   - <FrameLayout
37   - android:id="@+id/fl_back"
38   - android:layout_width="55dp"
39   - android:layout_height="55dp"
40   - android:background="@drawable/button_fab_white"
41   - android:focusable="true">
42   -
43   - <ImageView
44   - android:layout_width="12dp"
45   - android:layout_height="20dp"
46   - android:layout_gravity="center"
47   - android:layout_marginLeft="-2dp"
48   - android:background="@drawable/icon_back"
49   - android:focusable="false" />
50   - </FrameLayout>
  7 + android:layout_height="match_parent">
51 8  
  9 + <com.sothree.slidinguppanel.SlidingUpPanelLayout xmlns:sothree="http://schemas.android.com/apk/res-auto"
  10 + android:id="@+id/sliding_layout"
  11 + android:layout_width="match_parent"
  12 + android:layout_height="match_parent"
  13 + android:gravity="bottom"
  14 + sothree:umanoDragView="@+id/dragView"
  15 + sothree:umanoFadeColor="@color/black_20"
  16 + sothree:umanoOverlay="true"
  17 + sothree:umanoPanelHeight="310dp"
  18 + sothree:umanoParallaxOffset="100dp"
  19 + sothree:umanoScrollableView="@+id/scrollView"
  20 + sothree:umanoShadowHeight="0dp">
  21 +
  22 + <!-- MAIN CONTENT -->
52 23 <FrameLayout
53   - android:layout_width="55dp"
54   - android:layout_height="55dp"
55   - android:layout_gravity="right"
56   - android:background="@drawable/button_fab_white"
57   - android:focusable="true">
58   -
59   - <ImageView
60   - android:layout_width="19dp"
61   - android:layout_height="18dp"
62   - android:layout_gravity="center"
63   - android:background="@drawable/icon_share" />
64   - </FrameLayout>
65   - <!---->
  24 + android:layout_width="match_parent"
  25 + android:layout_height="match_parent">
66 26  
  27 + <com.baidu.mapapi.map.MapView
  28 + android:id="@+id/mapView"
  29 + android:layout_width="match_parent"
  30 + android:layout_height="match_parent"></com.baidu.mapapi.map.MapView>
  31 + <!--地图上面加一层类似于全透明黑色蒙版-->
  32 + <LinearLayout
  33 + android:layout_width="match_parent"
  34 + android:layout_height="match_parent"
  35 + android:background="#0D000000"
  36 + android:clickable="false"
  37 + android:focusable="false"
  38 + android:focusableInTouchMode="false"></LinearLayout>
  39 +
  40 + <FrameLayout
  41 + android:id="@+id/fl_back"
  42 + android:layout_width="55dp"
  43 + android:layout_height="55dp"
  44 + android:background="@drawable/button_fab_white"
  45 + android:focusable="true">
  46 +
  47 + <ImageView
  48 + android:layout_width="12dp"
  49 + android:layout_height="20dp"
  50 + android:layout_gravity="center"
  51 + android:layout_marginLeft="-2dp"
  52 + android:background="@drawable/icon_back"
  53 + android:focusable="false" />
  54 + </FrameLayout>
  55 +
  56 + <FrameLayout
  57 + android:layout_width="55dp"
  58 + android:layout_height="55dp"
  59 + android:layout_gravity="right"
  60 + android:background="@drawable/button_fab_white"
  61 + android:focusable="true">
  62 +
  63 + <ImageView
  64 + android:layout_width="19dp"
  65 + android:layout_height="18dp"
  66 + android:layout_gravity="center"
  67 + android:background="@drawable/icon_share" />
  68 + </FrameLayout>
  69 + <!---->
67 70  
68   - </FrameLayout>
69 71  
70   - <!-- SLIDING LAYOUT -->
71   - <FrameLayout
72   - android:id="@+id/dragView"
73   - android:layout_width="match_parent"
74   - android:layout_height="wrap_content"
75   - android:clickable="true"
76   - android:focusable="false"
77   - android:orientation="vertical">
  72 + </FrameLayout>
78 73  
79   - <ScrollView
80   - android:id="@+id/scrollView"
  74 + <!-- SLIDING LAYOUT -->
  75 + <FrameLayout
  76 + android:id="@+id/dragView"
81 77 android:layout_width="match_parent"
82 78 android:layout_height="wrap_content"
83   - android:layout_marginBottom="60dp"
84   - android:scrollbars="none">
  79 + android:clickable="true"
  80 + android:focusable="false"
  81 + android:orientation="vertical">
85 82  
86   - <LinearLayout
87   - android:id="@+id/ll_root"
  83 + <ScrollView
  84 + android:id="@+id/scrollView"
88 85 android:layout_width="match_parent"
89 86 android:layout_height="wrap_content"
90   - android:orientation="vertical">
91   - <!--用户个人信息-->
92   - <include
93   - android:id="@+id/include_finish_user_info"
94   - layout="@layout/layout_finish_user_info" />
95   - <!--总步数-->
96   - <include
97   - android:id="@+id/include_finish_step"
98   - layout="@layout/layout_finish_step"
99   - android:visibility="visible" />
100   - <!--跑步路线-->
101   - <include
102   - android:id="@+id/include_finish_run_route"
103   - layout="@layout/layout_finish_running_route"
104   - android:visibility="visible" />
105   - </LinearLayout>
106   -
107   - </ScrollView>
108   - <!--按钮-->
109   - <RelativeLayout
110   - android:id="@+id/rl_scrollView_startBtn"
111   - android:layout_width="match_parent"
112   - android:layout_height="40sp"
113   - android:layout_gravity="bottom"
114   - android:background="@color/green_round"
115   - android:tag="0">
116   -
117   - <TextView
118   - android:id="@+id/tv_run_now"
119   - android:layout_width="wrap_content"
120   - android:layout_height="wrap_content"
121   - android:layout_centerInParent="true"
122   - android:tag="0"
123   - android:text="保存中"
124   - android:textColor="@color/white"
125   - android:textSize="18sp" />
126   -
127   -
128   - </RelativeLayout>
129   - </FrameLayout>
130   - </com.sothree.slidinguppanel.SlidingUpPanelLayout>
131   -
  87 + android:layout_marginBottom="60dp"
  88 + android:scrollbars="none">
  89 +
  90 + <LinearLayout
  91 + android:id="@+id/ll_root"
  92 + android:layout_width="match_parent"
  93 + android:layout_height="wrap_content"
  94 + android:orientation="vertical">
  95 + <!--用户个人信息-->
  96 + <include
  97 + android:id="@+id/include_finish_user_info"
  98 + layout="@layout/layout_finish_user_info" />
  99 + <!--总步数-->
  100 + <include
  101 + android:id="@+id/include_finish_step"
  102 + layout="@layout/layout_finish_step"
  103 + android:visibility="visible" />
  104 + <!--跑步路线-->
  105 + <include
  106 + android:id="@+id/include_finish_run_route"
  107 + layout="@layout/layout_finish_running_route"
  108 + android:visibility="visible" />
  109 + </LinearLayout>
  110 +
  111 + </ScrollView>
132 112  
  113 + </FrameLayout>
  114 + </com.sothree.slidinguppanel.SlidingUpPanelLayout>
  115 + <!--按钮-->
  116 + <LinearLayout
  117 + android:id="@+id/rl_scrollView_startBtn"
  118 + android:layout_width="match_parent"
  119 + android:layout_height="40sp"
  120 + android:layout_gravity="bottom"
  121 + android:background="@color/green_round"
  122 + android:gravity="center"
  123 + android:tag="0">
  124 +
  125 + <com.wang.avi.AVLoadingIndicatorView
  126 + android:layout_width="20dp"
  127 + android:layout_height="20dp"
  128 + app:indicatorColor="@color/white"
  129 + app:indicatorName="BallSpinFadeLoaderIndicator" />
  130 +
  131 + <TextView
  132 + android:id="@+id/tv_run_now"
  133 + android:layout_width="wrap_content"
  134 + android:layout_height="wrap_content"
  135 + android:layout_centerInParent="true"
  136 + android:layout_marginLeft="5dp"
  137 + android:tag="0"
  138 + android:text="保存中"
  139 + android:textColor="@color/white"
  140 + android:textSize="18sp" />
  141 + </LinearLayout>
  142 + </FrameLayout>
133 143 </layout>
134 144 \ No newline at end of file
... ...
moudle_pedometer/src/main/res/layout/fragment_run_main.xml
  View file @8920883
... ... @@ -33,7 +33,7 @@
33 33 <LinearLayout
34 34 android:layout_width="match_parent"
35 35 android:layout_height="0dp"
36   - android:layout_weight="1.5"
  36 + android:layout_weight="1"
37 37 android:gravity="center"
38 38 android:paddingLeft="50dp">
39 39  
... ... @@ -260,19 +260,21 @@
260 260 android:id="@+id/ll_two_bottom_button"
261 261 android:layout_width="match_parent"
262 262 android:layout_height="match_parent"
263   - android:gravity="center"
264   - android:visibility="gone">
  263 + android:gravity="center_horizontal"
  264 + android:visibility="gone"
  265 +
  266 + >
265 267  
266 268 <LinearLayout
267 269 android:layout_width="wrap_content"
268 270 android:layout_height="match_parent"
269   - android:layout_marginRight="70dp"
  271 + android:layout_marginRight="50dp"
270 272 android:orientation="vertical">
271 273  
272 274 <FrameLayout
273 275 android:layout_width="match_parent"
274 276 android:layout_height="wrap_content"
275   - android:layout_marginTop="5dp"
  277 + android:layout_marginTop="10dp"
276 278 android:visibility="invisible">
277 279  
278 280 <ImageView
... ... @@ -327,7 +329,7 @@
327 329 android:id="@+id/fl_stop_tip"
328 330 android:layout_width="match_parent"
329 331 android:layout_height="wrap_content"
330   - android:layout_marginTop="5dp"
  332 + android:layout_marginTop="10dp"
331 333 android:visibility="invisible">
332 334  
333 335 <ImageView
... ...
moudle_pedometer/src/main/res/layout/fragment_run_race_detail.xml
  View file @8920883
... ... @@ -2,147 +2,151 @@
2 2 <layout xmlns:android="http://schemas.android.com/apk/res/android"
3 3 xmlns:app="http://schemas.android.com/apk/res-auto">
4 4  
5   - <com.sothree.slidinguppanel.SlidingUpPanelLayout xmlns:sothree="http://schemas.android.com/apk/res-auto"
6   - android:id="@+id/sliding_layout"
  5 + <FrameLayout
7 6 android:layout_width="match_parent"
8   - android:layout_height="match_parent"
9   - android:gravity="bottom"
10   - sothree:umanoDragView="@+id/dragView"
11   - sothree:umanoFadeColor="@color/black_20"
12   - sothree:umanoOverlay="true"
13   - sothree:umanoPanelHeight="141dp"
14   - sothree:umanoParallaxOffset="250dp"
15   - sothree:umanoScrollableView="@+id/scrollView"
16   - sothree:umanoShadowHeight="0dp">
17   -
18   - <!-- MAIN CONTENT -->
19   - <FrameLayout
20   - android:id="@+id/fl_root"
21   - android:layout_width="match_parent"
22   - android:layout_height="match_parent">
  7 + android:layout_height="match_parent">
23 8  
24   - <com.baidu.mapapi.map.MapView
25   - android:id="@+id/mapView"
  9 + <com.sothree.slidinguppanel.SlidingUpPanelLayout xmlns:sothree="http://schemas.android.com/apk/res-auto"
  10 + android:id="@+id/sliding_layout"
  11 + android:layout_width="match_parent"
  12 + android:layout_height="match_parent"
  13 + android:gravity="bottom"
  14 + sothree:umanoDragView="@+id/dragView"
  15 + sothree:umanoFadeColor="@color/black_20"
  16 + sothree:umanoOverlay="true"
  17 + sothree:umanoPanelHeight="141dp"
  18 + sothree:umanoParallaxOffset="250dp"
  19 + sothree:umanoScrollableView="@+id/scrollView"
  20 + sothree:umanoShadowHeight="0dp">
  21 +
  22 + <!-- MAIN CONTENT -->
  23 + <FrameLayout
  24 + android:id="@+id/fl_root"
26 25 android:layout_width="match_parent"
27   - android:layout_height="match_parent"></com.baidu.mapapi.map.MapView>
  26 + android:layout_height="match_parent">
28 27  
29   - <!--地图上面加一层类似于全透明黑色蒙版-->
30   - <LinearLayout
31   - android:layout_width="match_parent"
32   - android:layout_height="match_parent"
33   - android:background="#0D000000"
34   - android:clickable="false"
35   - android:focusable="false"
36   - android:focusableInTouchMode="false"></LinearLayout>
37   -
38   - <ImageView
39   - android:id="@+id/iv_back"
40   - android:layout_width="35dp"
41   - android:layout_height="35dp"
42   - android:layout_margin="10dp"
43   - android:background="@drawable/xqy_return" />
44   -
45   -
46   - <ImageView
47   - android:id="@+id/iv_share"
48   - android:layout_width="35dp"
49   - android:layout_height="35dp"
50   - android:layout_gravity="right"
51   - android:layout_margin="10dp"
52   - android:background="@drawable/xqt_share"
53   - android:visibility="gone" />
54   - <!---->
55   - <com.cnlive.strike.ui.widget.UIEmptyView
56   - android:id="@+id/empty_layout"
57   - android:layout_width="match_parent"
58   - android:layout_height="match_parent"
59   - android:background="@color/color_fff"
60   - android:focusable="true"
61   - android:focusableInTouchMode="true"
62   - android:visibility="gone" />
  28 + <com.baidu.mapapi.map.MapView
  29 + android:id="@+id/mapView"
  30 + android:layout_width="match_parent"
  31 + android:layout_height="match_parent"></com.baidu.mapapi.map.MapView>
63 32  
64   - </FrameLayout>
  33 + <!--地图上面加一层类似于全透明黑色蒙版-->
  34 + <LinearLayout
  35 + android:layout_width="match_parent"
  36 + android:layout_height="match_parent"
  37 + android:background="#0D000000"
  38 + android:clickable="false"
  39 + android:focusable="false"
  40 + android:focusableInTouchMode="false"></LinearLayout>
  41 +
  42 + <ImageView
  43 + android:id="@+id/iv_back"
  44 + android:layout_width="35dp"
  45 + android:layout_height="35dp"
  46 + android:layout_margin="10dp"
  47 + android:background="@drawable/xqy_return" />
  48 +
  49 +
  50 + <ImageView
  51 + android:id="@+id/iv_share"
  52 + android:layout_width="35dp"
  53 + android:layout_height="35dp"
  54 + android:layout_gravity="right"
  55 + android:layout_margin="10dp"
  56 + android:background="@drawable/xqt_share"
  57 + android:visibility="gone" />
  58 + <!---->
  59 + <com.cnlive.strike.ui.widget.UIEmptyView
  60 + android:id="@+id/empty_layout"
  61 + android:layout_width="match_parent"
  62 + android:layout_height="match_parent"
  63 + android:background="@color/color_fff"
  64 + android:focusable="true"
  65 + android:focusableInTouchMode="true"
  66 + android:visibility="gone" />
65 67  
66   - <!-- SLIDING LAYOUT -->
67   - <FrameLayout
68   - android:id="@+id/dragView"
69   - android:layout_width="match_parent"
70   - android:layout_height="match_parent"
71   - android:clickable="false"
72   - android:focusable="false">
  68 + </FrameLayout>
73 69  
74   - <ScrollView
75   - android:id="@+id/scrollView"
  70 + <!-- SLIDING LAYOUT -->
  71 + <FrameLayout
  72 + android:id="@+id/dragView"
76 73 android:layout_width="match_parent"
77 74 android:layout_height="match_parent"
78   - android:scrollbars="none">
  75 + android:clickable="false"
  76 + android:focusable="false">
79 77  
80   - <LinearLayout
81   - android:id="@+id/ll_root"
  78 + <ScrollView
  79 + android:id="@+id/scrollView"
82 80 android:layout_width="match_parent"
83   - android:layout_height="wrap_content"
84   - android:orientation="vertical">
85   - <!--跑道-->
86   - <include
87   - android:id="@+id/include_street"
88   - layout="@layout/layout_run_detail_street" />
89   - <!--成绩-->
90   - <include
91   - android:id="@+id/include_person_score"
92   - layout="@layout/layout_run_detail_person_score"
93   - android:visibility="visible" />
94   - <!--排行-->
95   - <include
96   - android:id="@+id/include_rank"
97   - layout="@layout/layout_run_detail_rank"
98   - android:visibility="visible" />
99   - <!---->
100   - <View
101   - android:layout_width="match_parent"
102   - android:layout_height="20dp"
103   - android:background="#F4F4F4" />
104   - <!--路线介绍-->
105   - <include
106   - android:id="@+id/include_street_introduce"
107   - layout="@layout/layout_run_detail_street_introduce" />
108   - </LinearLayout>
109   -
110   - </ScrollView>
111   - <!--按钮-->
112   - <RelativeLayout
113   - android:id="@+id/rl_scrollView_startBtn"
114   - android:layout_width="match_parent"
115   - android:layout_height="40sp"
116   - android:layout_gravity="bottom"
117   - android:background="@color/green_round"
118   - android:tag="0">
119   -
120   - <TextView
121   - android:id="@+id/tv_run_now"
122   - android:layout_width="wrap_content"
123   - android:layout_height="wrap_content"
124   - android:layout_centerInParent="true"
125   - android:tag="0"
126   - android:text="@string/run_race_btn_sign_up"
127   - android:textColor="@color/white"
128   - android:textSize="18sp" />
129   -
130   - <TextView
131   - android:id="@+id/tv_go_tip"
132   - android:layout_width="wrap_content"
133   - android:layout_height="wrap_content"
134   - android:layout_alignParentRight="true"
135   - android:layout_centerInParent="true"
136   - android:layout_centerVertical="true"
137   - android:layout_marginRight="10dp"
138   - android:text="Go!"
139   - android:textColor="@color/white"
140   - android:textSize="18sp"
141   - android:visibility="gone" />
142   -
143   - </RelativeLayout>
144   - </FrameLayout>
145   - </com.sothree.slidinguppanel.SlidingUpPanelLayout>
  81 + android:layout_height="match_parent"
  82 + android:scrollbars="none">
146 83  
  84 + <LinearLayout
  85 + android:id="@+id/ll_root"
  86 + android:layout_width="match_parent"
  87 + android:layout_height="wrap_content"
  88 + android:orientation="vertical">
  89 + <!--跑道-->
  90 + <include
  91 + android:id="@+id/include_street"
  92 + layout="@layout/layout_run_detail_street" />
  93 + <!--成绩-->
  94 + <include
  95 + android:id="@+id/include_person_score"
  96 + layout="@layout/layout_run_detail_person_score"
  97 + android:visibility="visible" />
  98 + <!--排行-->
  99 + <include
  100 + android:id="@+id/include_rank"
  101 + layout="@layout/layout_run_detail_rank"
  102 + android:visibility="visible" />
  103 + <!---->
  104 + <View
  105 + android:layout_width="match_parent"
  106 + android:layout_height="20dp"
  107 + android:background="#F4F4F4" />
  108 + <!--路线介绍-->
  109 + <include
  110 + android:id="@+id/include_street_introduce"
  111 + layout="@layout/layout_run_detail_street_introduce" />
  112 + </LinearLayout>
  113 +
  114 + </ScrollView>
  115 +
  116 + </FrameLayout>
  117 + </com.sothree.slidinguppanel.SlidingUpPanelLayout>
  118 + <!--按钮-->
  119 + <RelativeLayout
  120 + android:id="@+id/rl_scrollView_startBtn"
  121 + android:layout_width="match_parent"
  122 + android:layout_height="40sp"
  123 + android:layout_gravity="bottom"
  124 + android:background="@color/green_round"
  125 + android:tag="0">
  126 +
  127 + <TextView
  128 + android:id="@+id/tv_run_now"
  129 + android:layout_width="wrap_content"
  130 + android:layout_height="wrap_content"
  131 + android:layout_centerInParent="true"
  132 + android:tag="0"
  133 + android:text="@string/run_race_btn_sign_up"
  134 + android:textColor="@color/white"
  135 + android:textSize="18sp" />
  136 +
  137 + <TextView
  138 + android:id="@+id/tv_go_tip"
  139 + android:layout_width="wrap_content"
  140 + android:layout_height="wrap_content"
  141 + android:layout_alignParentRight="true"
  142 + android:layout_centerInParent="true"
  143 + android:layout_centerVertical="true"
  144 + android:layout_marginRight="10dp"
  145 + android:text="Go!"
  146 + android:textColor="@color/white"
  147 + android:textSize="18sp"
  148 + android:visibility="gone" />
147 149  
  150 + </RelativeLayout>
  151 + </FrameLayout>
148 152 </layout>
149 153 \ No newline at end of file
... ...
moudle_pedometer/src/main/res/layout/layout_run_detail_street.xml
  View file @8920883
... ... @@ -84,7 +84,8 @@
84 84 android:layout_width="match_parent"
85 85 android:layout_height="40sp"
86 86 android:background="@color/green_round"
87   - android:tag="0">
  87 + android:tag="0"
  88 + android:visibility="gone">
88 89  
89 90 <TextView
90 91 android:id="@+id/tv_run_now"
... ...