CNLive Android Team / ModulePedometer · Commits

Commit ee7d9587a14f07e4871462525993005e63c48d9b

Authored by 杨帅
1 parent ac7a7c28

1.对接运动赛事详情页接口

Inline Side-by-side
Showing 5 changed files with 408 additions and 311 deletions
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunRaceDetailFragmentView.java
  View file @ee7d958
... ... @@ -64,6 +64,8 @@ import com.cnlive.moudle.pedometer.utils.BitmapUtil;
64 64 import com.cnlive.moudle.pedometer.utils.GsonUtil;
65 65 import com.cnlive.moudle.pedometer.utils.MyMapUtil;
66 66 import com.cnlive.moudle.pedometer.utils.ScreenUtil;
  67 +import com.cnlive.moudle.pedometer.utils.TimeUtil;
  68 +import com.cnlive.strike.application.GlideApp;
67 69 import com.cnlive.strike.data.network.model.runAbout.RunRaceDetailInfo;
68 70 import com.example.moudle_pedometer.R;
69 71 import com.hannesdorfmann.mosby3.mvp.MvpView;
... ... @@ -128,9 +130,17 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
128 130 return;
129 131 }
130 132 this.runRaceDetailInfo = runRaceDetailInfo;
131   -// //初始化运营人员所选的关键点
132   -// trackPoints = GsonUtil.jsonToList(test, LatLng.class);
133   -// MyMapUtil.drawServerLineTrack(getContext(), baiduMap, trackPoints, SortType.asc, R.color.green_round, R.drawable.icon_start, R.drawable.icon_end);
  133 +// //初始化地图点位
  134 + if (runRaceDetailInfo.getLatLongitude() != null) {
  135 + trackPoints = GsonUtil.jsonToList(runRaceDetailInfo.getLatLongitude(), LatLng.class);
  136 + MyMapUtil.drawServerLineTrack(getContext(), baiduMap, trackPoints, SortType.asc, R.color.green_round, R.drawable.icon_start, R.drawable.icon_end);
  137 + //自动计算地图缩放
  138 + MapStatus.Builder builder = new MapStatus.Builder();
  139 + builder.target(MyMapUtil.getCenterZoomPosition(trackPoints));
  140 + builder.zoom(MyMapUtil.getZoom(trackPoints));
  141 + baiduMap.animateMapStatus(MapStatusUpdateFactory.newMapStatus(builder.build()));
  142 + }
  143 +
134 144 //显示地图
135 145 fragment.binding.mapView.setVisibility(View.VISIBLE);
136 146 //隐藏底部滑动卡片
... ... @@ -207,11 +217,82 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
207 217 fragment.binding.includeStreet.tvEndAddr.setText(runRaceDetailInfo.getEndLocation());
208 218 }
209 219 //设置起始报名时间
210   - if (!TextUtils.isEmpty(runRaceDetailInfo.getEndLocation())) {
211   - fragment.binding.includeStreet.tvEndAddr.setText(runRaceDetailInfo.getEndLocation());
  220 + if (!TextUtils.isEmpty(TimeUtil.getStampToTime(runRaceDetailInfo.getSign_up_start_time(), "yyyy-MM-dd"))) {
  221 + fragment.binding.includeStreet.tvSignUpStartTime.setText(TimeUtil.getStampToTime(runRaceDetailInfo.getSign_up_start_time(), "yyyy-MM-dd"));
  222 +
  223 + }
  224 + //设置终止报名时间
  225 + if (!TextUtils.isEmpty(TimeUtil.getStampToTime(runRaceDetailInfo.getSign_up_end_time(), "yyyy-MM-dd"))) {
  226 + fragment.binding.includeStreet.tvSignUpEndTime.setText(TimeUtil.getStampToTime(runRaceDetailInfo.getSign_up_end_time(), "yyyy-MM-dd"));
  227 + }
  228 + //设置活动开始时间
  229 + if (!TextUtils.isEmpty(TimeUtil.getStampToTime(runRaceDetailInfo.getStart_time(), "yyyy-MM-dd"))) {
  230 + fragment.binding.includeStreet.tvActiveStartTime.setText(TimeUtil.getStampToTime(runRaceDetailInfo.getStart_time(), "yyyy-MM-dd"));
  231 + }
  232 + //设置活动结束时间
  233 + if (!TextUtils.isEmpty(TimeUtil.getStampToTime(runRaceDetailInfo.getEnd_time(), "yyyy-MM-dd"))) {
  234 + fragment.binding.includeStreet.tvActiveEndTime.setText(TimeUtil.getStampToTime(runRaceDetailInfo.getEnd_time(), "yyyy-MM-dd"));
  235 + }
  236 + //设置参加人数
  237 + fragment.binding.includeStreet.tvSignPerson.setText(runRaceDetailInfo.getSignupNum() + "");
  238 + //设置报名完成的头像
  239 + List<String> joinFaceIcon = runRaceDetailInfo.getFaceUrl();
  240 + if (joinFaceIcon != null && joinFaceIcon.size() > 0) {
  241 + fragment.binding.includeStreet.fiveJoinPerson.setVisibility(View.VISIBLE);
  242 + //设置头像数据
  243 + fragment.binding.includeStreet.fiveJoinPerson.initIconData(joinFaceIcon);
  244 + } else {
  245 + fragment.binding.includeStreet.fiveJoinPerson.setVisibility(View.INVISIBLE);
212 246 }
213 247  
214   - //设置
  248 + //判断是否显示个人排行榜
  249 + if (!TextUtils.isEmpty(runRaceDetailInfo.getUserMileage())) {
  250 + //显示
  251 + fragment.binding.includePersonScore.llPersonScoreRoot.setVisibility(View.VISIBLE);
  252 + //设置个人行走距离
  253 + if (!TextUtils.isEmpty(runRaceDetailInfo.getUserMileage())) {
  254 + fragment.binding.includePersonScore.tvUserDistance.setText(runRaceDetailInfo.getUserMileage());
  255 + }
  256 + //设置行走步数
  257 + if (!TextUtils.isEmpty(runRaceDetailInfo.getStep())) {
  258 + fragment.binding.includePersonScore.tvStep.setText(runRaceDetailInfo.getStep());
  259 + }
  260 + //设置用时
  261 + if (!TextUtils.isEmpty(runRaceDetailInfo.getEmployTime())) {
  262 + fragment.binding.includePersonScore.tvEmployTime.setText(runRaceDetailInfo.getEmployTime());
  263 + }
  264 + //设置配速
  265 + if (!TextUtils.isEmpty(runRaceDetailInfo.getPace())) {
  266 + fragment.binding.includePersonScore.tvSpeed.setText(runRaceDetailInfo.getPace());
  267 + }
  268 + } else {
  269 + //隐藏
  270 + fragment.binding.includePersonScore.llPersonScoreRoot.setVisibility(View.GONE);
  271 + }
  272 + //设置是否显示排行榜
  273 + if (!TextUtils.isEmpty(runRaceDetailInfo.getFirstFaceUrl())) {
  274 + fragment.binding.includeRank.llRankRoot.setVisibility(View.VISIBLE);
  275 + //设置第一名头像
  276 + GlideApp.with(getContext()).load(runRaceDetailInfo.getFirstFaceUrl()).into(fragment.binding.includeRank.ivFirstPersonUrl);
  277 + //设置排行榜头像
  278 + List<String> finishFaceUrl = runRaceDetailInfo.getFinishFaceUrl();
  279 + if (finishFaceUrl != null && finishFaceUrl.size() > 0) {
  280 + fragment.binding.includeRank.fiveRankPerson.initIconData(finishFaceUrl);
  281 + }
  282 + //设置第一名昵称
  283 + if (!TextUtils.isEmpty(runRaceDetailInfo.getFirstName())) {
  284 + fragment.binding.includeRank.tvKingNickName.setText(runRaceDetailInfo.getFirstName());
  285 + }
  286 + } else {
  287 + fragment.binding.includeRank.llRankRoot.setVisibility(View.GONE);
  288 +
  289 + }
  290 + //设置路线介绍的图片
  291 + if (!TextUtils.isEmpty(runRaceDetailInfo.getRoadmap())) {
  292 + //设置路线图
  293 + GlideApp.with(getContext()).load(runRaceDetailInfo.getRoadmap()).into(fragment.binding.includeStreetIntroduce.ivRoadMao);
  294 +
  295 + }
215 296 //开始按钮点击事件(未滑动)
216 297 fragment.binding.includeStreet.rlStartBtn.setOnClickListener(new View.OnClickListener() {
217 298 @Override
... ... @@ -289,7 +370,7 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
289 370 }
290 371 });
291 372 //查看全部成绩点击事件
292   - fragment.binding.includePersonScore.findViewById(R.id.check_all_cord).setOnClickListener(v -> {
  373 + fragment.binding.includePersonScore.checkAllCord.setOnClickListener(v -> {
293 374 RaceRecordActivity.newInstance(fragment.getActivity());
294 375 });
295 376  
... ... @@ -376,11 +457,7 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
376 457 baiduMap.setOnMapLoadedCallback(new BaiduMap.OnMapLoadedCallback() {
377 458 @Override
378 459 public void onMapLoaded() {
379   -// //自动计算地图缩放
380   -// MapStatus.Builder builder = new MapStatus.Builder();
381   -// builder.target(MyMapUtil.getCenterZoomPosition(trackPoints));
382   -// builder.zoom(MyMapUtil.getZoom(trackPoints));
383   -// baiduMap.animateMapStatus(MapStatusUpdateFactory.newMapStatus(builder.build()));
  460 +//
384 461  
385 462 }
386 463 });
... ...
moudle_pedometer/src/main/res/layout/layout_run_detail_person_score.xml
  View file @ee7d958
1 1 <?xml version="1.0" encoding="utf-8"?>
2   -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3   - android:layout_width="match_parent"
4   - android:layout_height="wrap_content"
5   - android:background="@color/white">
6   - <!--个人最佳成绩-->
  2 +<layout xmlns:android="http://schemas.android.com/apk/res/android">
  3 +
7 4 <LinearLayout
  5 + android:id="@+id/ll_person_score_root"
8 6 android:layout_width="match_parent"
9   - android:layout_height="180dp"
10   - android:background="@drawable/white_shadow_bg"
11   - android:orientation="vertical"
12   - android:paddingLeft="15dp"
13   - android:paddingTop="5dp"
14   - android:paddingRight="15dp"
15   - android:paddingBottom="15dp">
16   -
17   - <LinearLayout
18   - android:layout_width="match_parent"
19   - android:layout_height="wrap_content"
20   - android:layout_marginTop="15dp"
21   - android:gravity="bottom">
22   -
23   - <TextView
24   - android:id="@+id/tv_score_title"
25   - android:layout_width="0dp"
26   - android:layout_height="wrap_content"
27   - android:layout_marginLeft="10dp"
28   - android:layout_weight="1"
29   - android:text="个人最佳成绩"
30   - android:textColor="@color/text_black"
31   - android:textSize="18sp"
32   - android:textStyle="bold" />
33   -
34   - <TextView
35   - android:id="@+id/check_all_cord"
36   - android:layout_width="wrap_content"
37   - android:layout_height="wrap_content"
38   - android:layout_marginRight="10dp"
39   - android:text="查看全部成绩 >"
40   - android:textColor="@color/text_black"
41   - android:textSize="13sp" />
42   - </LinearLayout>
43   - <!---->
  7 + android:layout_height="wrap_content"
  8 + android:background="@color/white">
  9 + <!--个人最佳成绩-->
44 10 <LinearLayout
45 11 android:layout_width="match_parent"
46   - android:layout_height="wrap_content"
47   - android:layout_marginTop="10dp">
  12 + android:layout_height="180dp"
  13 + android:background="@drawable/white_shadow_bg"
  14 + android:orientation="vertical"
  15 + android:paddingLeft="15dp"
  16 + android:paddingTop="5dp"
  17 + android:paddingRight="15dp"
  18 + android:paddingBottom="15dp">
48 19  
49 20 <LinearLayout
50   - android:layout_width="0dp"
51   - android:layout_height="match_parent"
52   - android:layout_weight="1"
53   - android:gravity="left|bottom">
  21 + android:layout_width="match_parent"
  22 + android:layout_height="wrap_content"
  23 + android:layout_marginTop="15dp"
  24 + android:gravity="bottom">
54 25  
55 26 <TextView
56   - android:layout_width="wrap_content"
  27 + android:id="@+id/tv_score_title"
  28 + android:layout_width="0dp"
57 29 android:layout_height="wrap_content"
58   - android:layout_marginLeft="15dp"
59   - android:text="1.53"
60   - android:textColor="@color/black"
61   - android:textSize="30sp"
  30 + android:layout_marginLeft="10dp"
  31 + android:layout_weight="1"
  32 + android:text="个人最佳成绩"
  33 + android:textColor="@color/text_black"
  34 + android:textSize="18sp"
62 35 android:textStyle="bold" />
63 36  
64 37 <TextView
  38 + android:id="@+id/check_all_cord"
65 39 android:layout_width="wrap_content"
66 40 android:layout_height="wrap_content"
67   - android:layout_marginLeft="5dp"
68   - android:text="公里"
  41 + android:layout_marginRight="10dp"
  42 + android:text="查看全部成绩 >"
69 43 android:textColor="@color/text_black"
70   - android:textSize="12sp" />
  44 + android:textSize="13sp" />
71 45 </LinearLayout>
72   - </LinearLayout>
73   -
74   - <LinearLayout
75   - android:layout_width="match_parent"
76   - android:layout_height="wrap_content"
77   - android:layout_marginTop="10dp"
78   - android:layout_marginBottom="10dp">
79   -
  46 + <!---->
80 47 <LinearLayout
81   - android:layout_width="0dp"
82   - android:layout_height="match_parent"
83   - android:layout_weight="1"
84   - android:gravity="center"
85   - android:orientation="vertical">
86   -
87   - <TextView
88   - android:layout_width="wrap_content"
89   - android:layout_height="wrap_content"
90   - android:text="步数"
91   - android:textColor="@color/text_black"
92   - android:textSize="12sp" />
93   -
94   - <TextView
95   - android:layout_width="wrap_content"
96   - android:layout_height="wrap_content"
97   - android:layout_marginTop="5dp"
98   - android:text="1234"
99   - android:textColor="@color/text_black"
100   - android:textSize="20sp"
101   - android:textStyle="bold" />
102   -
103   -
104   - </LinearLayout>
105   -
106   - <LinearLayout
107   - android:layout_width="0dp"
108   - android:layout_height="match_parent"
109   - android:layout_weight="1.5"
110   - android:gravity="center"
111   - android:orientation="vertical">
112   -
113   - <TextView
114   - android:layout_width="wrap_content"
115   - android:layout_height="wrap_content"
116   - android:text="用时"
117   - android:textColor="@color/text_black"
118   - android:textSize="12sp" />
119   -
120   - <TextView
121   - android:layout_width="wrap_content"
122   - android:layout_height="wrap_content"
123   - android:layout_marginTop="5dp"
124   - android:text="00:27:23"
125   - android:textColor="@color/black"
126   - android:textSize="20sp"
127   - android:textStyle="bold" />
128   -
129   -
  48 + android:layout_width="match_parent"
  49 + android:layout_height="wrap_content"
  50 + android:layout_marginTop="10dp">
  51 +
  52 + <LinearLayout
  53 + android:layout_width="0dp"
  54 + android:layout_height="match_parent"
  55 + android:layout_weight="1"
  56 + android:gravity="left|bottom">
  57 +
  58 + <TextView
  59 + android:id="@+id/tv_user_distance"
  60 + android:layout_width="wrap_content"
  61 + android:layout_height="wrap_content"
  62 + android:layout_marginLeft="15dp"
  63 + android:text="--"
  64 + android:textColor="@color/black"
  65 + android:textSize="30sp"
  66 + android:textStyle="bold" />
  67 +
  68 + <TextView
  69 + android:layout_width="wrap_content"
  70 + android:layout_height="wrap_content"
  71 + android:layout_marginLeft="5dp"
  72 + android:text="公里"
  73 + android:textColor="@color/text_black"
  74 + android:textSize="12sp" />
  75 + </LinearLayout>
130 76 </LinearLayout>
131 77  
132 78 <LinearLayout
133   - android:layout_width="0dp"
134   - android:layout_height="match_parent"
135   - android:layout_weight="1"
136   - android:gravity="center"
137   - android:orientation="vertical">
138   -
139   - <TextView
140   - android:layout_width="wrap_content"
141   - android:layout_height="wrap_content"
142   - android:text="配速"
143   - android:textColor="@color/text_black"
144   - android:textSize="12sp" />
145   -
146   - <TextView
147   - android:layout_width="wrap_content"
148   - android:layout_height="wrap_content"
149   - android:layout_marginTop="5dp"
150   - android:text="22'22''"
151   - android:textColor="@color/text_black"
152   - android:textSize="20sp"
153   - android:textStyle="bold" />
154   -
155   -
  79 + android:layout_width="match_parent"
  80 + android:layout_height="wrap_content"
  81 + android:layout_marginTop="10dp"
  82 + android:layout_marginBottom="10dp">
  83 +
  84 + <LinearLayout
  85 + android:layout_width="0dp"
  86 + android:layout_height="match_parent"
  87 + android:layout_weight="1"
  88 + android:gravity="center"
  89 + android:orientation="vertical">
  90 +
  91 + <TextView
  92 + android:layout_width="wrap_content"
  93 + android:layout_height="wrap_content"
  94 + android:text="步数"
  95 + android:textColor="@color/text_black"
  96 + android:textSize="12sp" />
  97 +
  98 + <TextView
  99 + android:id="@+id/tv_step"
  100 + android:layout_width="wrap_content"
  101 + android:layout_height="wrap_content"
  102 + android:layout_marginTop="5dp"
  103 + android:text="--"
  104 + android:textColor="@color/text_black"
  105 + android:textSize="20sp"
  106 + android:textStyle="bold" />
  107 +
  108 +
  109 + </LinearLayout>
  110 +
  111 + <LinearLayout
  112 + android:layout_width="0dp"
  113 + android:layout_height="match_parent"
  114 + android:layout_weight="1.5"
  115 + android:gravity="center"
  116 + android:orientation="vertical">
  117 +
  118 + <TextView
  119 + android:layout_width="wrap_content"
  120 + android:layout_height="wrap_content"
  121 + android:text="用时"
  122 + android:textColor="@color/text_black"
  123 + android:textSize="12sp" />
  124 +
  125 + <TextView
  126 + android:id="@+id/tv_employTime"
  127 + android:layout_width="wrap_content"
  128 + android:layout_height="wrap_content"
  129 + android:layout_marginTop="5dp"
  130 + android:text="--"
  131 + android:textColor="@color/black"
  132 + android:textSize="20sp"
  133 + android:textStyle="bold" />
  134 +
  135 +
  136 + </LinearLayout>
  137 +
  138 + <LinearLayout
  139 + android:layout_width="0dp"
  140 + android:layout_height="match_parent"
  141 + android:layout_weight="1"
  142 + android:gravity="center"
  143 + android:orientation="vertical">
  144 +
  145 + <TextView
  146 + android:layout_width="wrap_content"
  147 + android:layout_height="wrap_content"
  148 + android:text="配速"
  149 + android:textColor="@color/text_black"
  150 + android:textSize="12sp" />
  151 +
  152 + <TextView
  153 + android:id="@+id/tv_speed"
  154 + android:layout_width="wrap_content"
  155 + android:layout_height="wrap_content"
  156 + android:layout_marginTop="5dp"
  157 + android:text="--"
  158 + android:textColor="@color/text_black"
  159 + android:textSize="20sp"
  160 + android:textStyle="bold" />
  161 +
  162 +
  163 + </LinearLayout>
156 164 </LinearLayout>
157 165 </LinearLayout>
158 166 </LinearLayout>
159   -</LinearLayout>
160 167 \ No newline at end of file
  168 +</layout>
161 169 \ No newline at end of file
... ...
moudle_pedometer/src/main/res/layout/layout_run_detail_rank.xml
  View file @ee7d958
1 1 <?xml version="1.0" encoding="utf-8"?>
  2 +<layout xmlns:android="http://schemas.android.com/apk/res/android">
2 3  
3   -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
4   - xmlns:FivePersonIconView="http://schemas.android.com/apk/res-auto"
5   - xmlns:app="http://schemas.android.com/apk/res-auto"
6   - android:id="@+id/ll_rank_root"
7   - android:layout_width="match_parent"
8   - android:layout_height="wrap_content"
9   - android:background="@color/white">
10   - <!--排行榜-->
11   - <LinearLayout
  4 + <LinearLayout xmlns:FivePersonIconView="http://schemas.android.com/apk/res-auto"
  5 + xmlns:app="http://schemas.android.com/apk/res-auto"
  6 + android:id="@+id/ll_rank_root"
12 7 android:layout_width="match_parent"
13   - android:layout_height="150dp"
14   - android:paddingLeft="15dp"
15   - android:paddingTop="5dp"
16   - android:paddingRight="15dp"
17   - android:paddingBottom="15dp"
18   - android:background="@drawable/white_shadow_bg"
19   - android:orientation="vertical">
20   -
21   - <LinearLayout
22   - android:layout_width="match_parent"
23   - android:layout_height="wrap_content"
24   - android:layout_marginTop="15dp"
25   - android:gravity="bottom">
26   -
27   - <TextView
28   - android:id="@+id/tv_rank_title"
29   - android:layout_width="0dp"
30   - android:layout_height="wrap_content"
31   - android:layout_marginLeft="10dp"
32   - android:layout_weight="1"
33   - android:text="@string/layout_run_detail_rank_title"
34   - android:textColor="@color/black"
35   - android:textSize="18sp"
36   - android:textStyle="bold" />
37   -
38   - <TextView
39   - android:layout_width="wrap_content"
40   - android:layout_height="wrap_content"
41   - android:layout_marginRight="10dp"
42   - android:text="@string/layout_run_detail_rank_see_rank"
43   - android:textColor="@color/black"
44   - android:textSize="13sp" />
45   - </LinearLayout>
46   - <!---->
  8 + android:layout_height="wrap_content"
  9 + android:background="@color/white">
  10 + <!--排行榜-->
47 11 <LinearLayout
48 12 android:layout_width="match_parent"
49   - android:layout_height="match_parent">
  13 + android:layout_height="150dp"
  14 + android:background="@drawable/white_shadow_bg"
  15 + android:orientation="vertical"
  16 + android:paddingLeft="15dp"
  17 + android:paddingTop="5dp"
  18 + android:paddingRight="15dp"
  19 + android:paddingBottom="15dp">
50 20  
51 21 <LinearLayout
52   - android:layout_width="0dp"
53   - android:layout_height="match_parent"
54   - android:layout_weight="1.2"
55   - android:gravity="center"
56   - android:orientation="vertical">
57   -
58   - <com.cnlive.moudle.pedometer.ui.widget.FivePersonIconView
59   - android:id="@+id/five_rank_person"
60   - android:layout_width="wrap_content"
61   - android:layout_height="35dp"
62   - FivePersonIconView:showRightFlag="false"></com.cnlive.moudle.pedometer.ui.widget.FivePersonIconView>
  22 + android:layout_width="match_parent"
  23 + android:layout_height="wrap_content"
  24 + android:layout_marginTop="15dp"
  25 + android:gravity="bottom">
63 26  
64   - <LinearLayout
  27 + <TextView
  28 + android:id="@+id/tv_rank_title"
  29 + android:layout_width="0dp"
  30 + android:layout_height="wrap_content"
  31 + android:layout_marginLeft="10dp"
  32 + android:layout_weight="1"
  33 + android:text="@string/layout_run_detail_rank_title"
  34 + android:textColor="@color/black"
  35 + android:textSize="18sp"
  36 + android:textStyle="bold" />
  37 +
  38 + <TextView
65 39 android:layout_width="wrap_content"
66 40 android:layout_height="wrap_content"
67   - android:layout_marginTop="5dp"
68   - android:gravity="bottom">
69   -
70   - <TextView
71   - android:layout_width="wrap_content"
72   - android:layout_height="wrap_content"
73   - android:text="1234"
74   - android:textColor="@color/black"
75   - android:textSize="15sp"
76   - android:textStyle="bold" />
77   -
78   - <TextView
79   - android:layout_width="wrap_content"
80   - android:layout_height="wrap_content"
81   - android:layout_marginTop="5dp"
82   - android:text="@string/layout_run_detail_rank_person_finish"
83   - android:textColor="@color/text_gray"
84   - android:textSize="12sp" />
85   - </LinearLayout>
  41 + android:layout_marginRight="10dp"
  42 + android:text="@string/layout_run_detail_rank_see_rank"
  43 + android:textColor="@color/black"
  44 + android:textSize="13sp" />
86 45 </LinearLayout>
87   - <!--右侧-->
  46 + <!---->
88 47 <LinearLayout
89   - android:layout_width="0dp"
90   - android:layout_height="match_parent"
91   - android:layout_weight="1.2"
92   - android:gravity="center|right">
  48 + android:layout_width="match_parent"
  49 + android:layout_height="match_parent">
93 50  
94 51 <LinearLayout
95   - android:layout_width="wrap_content"
  52 + android:layout_width="0dp"
96 53 android:layout_height="match_parent"
  54 + android:layout_weight="1.2"
97 55 android:gravity="center"
98 56 android:orientation="vertical">
99 57  
100   -
101   - <TextView
  58 + <com.cnlive.moudle.pedometer.ui.widget.FivePersonIconView
  59 + android:id="@+id/five_rank_person"
102 60 android:layout_width="wrap_content"
103   - android:layout_height="wrap_content"
104   - android:text="00:27:23"
105   - android:textColor="@color/text_black"
106   - android:textSize="18sp"
107   - android:textStyle="bold" />
  61 + android:layout_height="35dp"
  62 + FivePersonIconView:showRightFlag="false"></com.cnlive.moudle.pedometer.ui.widget.FivePersonIconView>
108 63  
109   - <TextView
  64 + <LinearLayout
110 65 android:layout_width="wrap_content"
111 66 android:layout_height="wrap_content"
112 67 android:layout_marginTop="5dp"
113   - android:text="用户昵称"
114   - android:textColor="@color/text_gray"
115   - android:textSize="12sp" />
  68 + android:gravity="bottom">
  69 +
  70 + <TextView
  71 + android:id="@+id/tv_finish_person"
  72 + android:layout_width="wrap_content"
  73 + android:layout_height="wrap_content"
  74 + android:text="--"
  75 + android:textColor="@color/black"
  76 + android:textSize="15sp"
  77 + android:textStyle="bold" />
  78 +
  79 + <TextView
  80 + android:layout_width="wrap_content"
  81 + android:layout_height="wrap_content"
  82 + android:layout_marginTop="5dp"
  83 + android:text="@string/layout_run_detail_rank_person_finish"
  84 + android:textColor="@color/text_gray"
  85 + android:textSize="12sp" />
  86 + </LinearLayout>
  87 + </LinearLayout>
  88 + <!--右侧-->
  89 + <LinearLayout
  90 + android:layout_width="0dp"
  91 + android:layout_height="match_parent"
  92 + android:layout_weight="1.2"
  93 + android:gravity="center|right">
116 94  
  95 + <LinearLayout
  96 + android:layout_width="wrap_content"
  97 + android:layout_height="match_parent"
  98 + android:gravity="center"
  99 + android:orientation="vertical">
  100 +
  101 +
  102 + <TextView
  103 + android:layout_width="wrap_content"
  104 + android:layout_height="wrap_content"
  105 + android:text="--"
  106 + android:textColor="@color/text_black"
  107 + android:textSize="18sp"
  108 + android:textStyle="bold" />
  109 +
  110 + <TextView
  111 + android:id="@+id/tv_king_nick_name"
  112 + android:layout_width="wrap_content"
  113 + android:layout_height="wrap_content"
  114 + android:layout_marginTop="5dp"
  115 + android:layout_marginBottom="5dp"
  116 + android:text="用户昵称"
  117 + android:textColor="@color/text_gray"
  118 + android:textSize="12sp" />
  119 +
  120 + <!---->
  121 + </LinearLayout>
  122 +
  123 + <FrameLayout
  124 + android:layout_width="wrap_content"
  125 + android:layout_height="match_parent">
  126 +
  127 + <com.qmuiteam.qmui.widget.QMUIRadiusImageView
  128 + android:id="@+id/iv_first_person_url"
  129 + android:layout_width="60dp"
  130 + android:layout_height="60dp"
  131 + android:layout_gravity="center"
  132 + android:layout_marginLeft="10dp"
  133 + android:layout_marginRight="15dp"
  134 + android:layout_marginBottom="5dp"
  135 + android:background="@drawable/tc_ic_workout_level_adjust_coach"
  136 + app:qmui_corner_radius="100dp" />
  137 +
  138 + <ImageView
  139 + android:layout_width="16dp"
  140 + android:layout_height="17dp"
  141 + android:layout_gravity="right"
  142 + android:layout_marginTop="10dp"
  143 + android:layout_marginRight="10dp"
  144 + android:background="@drawable/crown" />
  145 + </FrameLayout>
117 146 <!---->
118 147 </LinearLayout>
119 148  
120   - <FrameLayout
121   - android:layout_width="wrap_content"
122   - android:layout_height="match_parent">
123   -
124   - <com.qmuiteam.qmui.widget.QMUIRadiusImageView
125   - android:layout_width="60dp"
126   - android:layout_height="60dp"
127   - android:layout_gravity="center"
128   - android:layout_marginLeft="10dp"
129   - android:layout_marginRight="15dp"
130   - android:background="@drawable/tc_ic_workout_level_adjust_coach"
131   - app:qmui_corner_radius="100dp" />
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>
141   - <!---->
142 149 </LinearLayout>
143   -
144 150 </LinearLayout>
145 151 </LinearLayout>
146   -</LinearLayout>
147 152 \ No newline at end of file
  153 +</layout>
148 154 \ No newline at end of file
... ...
moudle_pedometer/src/main/res/layout/layout_run_detail_street.xml
  View file @ee7d958
... ... @@ -33,7 +33,7 @@
33 33 android:layout_height="wrap_content"
34 34 android:layout_marginLeft="10dp"
35 35 android:layout_marginTop="10dp"
36   - android:text="奥森南园跑道"
  36 + android:text="--"
37 37 android:textColor="@color/text_black"
38 38 android:textSize="18sp"
39 39 android:textStyle="bold" />
... ... @@ -72,7 +72,7 @@
72 72 android:layout_width="wrap_content"
73 73 android:layout_height="wrap_content"
74 74 android:layout_marginLeft="25dp"
75   - android:text="首都师范大学"
  75 + android:text="--"
76 76 android:textColor="@color/text_black"
77 77 android:textSize="15sp" />
78 78  
... ... @@ -81,7 +81,7 @@
81 81 android:layout_width="wrap_content"
82 82 android:layout_height="wrap_content"
83 83 android:layout_marginLeft="25dp"
84   - android:text="全长4.42公里"
  84 + android:text="-"
85 85 android:textColor="@color/text_black"
86 86 android:textSize="15sp" />
87 87 </LinearLayout>
... ... @@ -153,7 +153,7 @@
153 153 android:layout_width="wrap_content"
154 154 android:layout_height="wrap_content"
155 155 android:layout_marginLeft="10dp"
156   - android:text="首都师范大学操场东门"
  156 + android:text="--"
157 157 android:textColor="@color/text_black"
158 158 android:textSize="15sp" />
159 159 </LinearLayout>
... ... @@ -185,7 +185,7 @@
185 185 android:layout_width="wrap_content"
186 186 android:layout_height="wrap_content"
187 187 android:layout_marginLeft="10dp"
188   - android:text="首都师范大学操场西门"
  188 + android:text="--"
189 189 android:textColor="@color/text_black"
190 190 android:textSize="15sp" />
191 191 </LinearLayout>
... ... @@ -224,7 +224,7 @@
224 224 android:layout_width="wrap_content"
225 225 android:layout_height="wrap_content"
226 226 android:layout_marginLeft="25dp"
227   - android:text="2019.05.01"
  227 + android:text="--"
228 228 android:textColor="@color/text_black"
229 229 android:textSize="15sp" />
230 230  
... ... @@ -241,7 +241,7 @@
241 241 android:layout_width="wrap_content"
242 242 android:layout_height="wrap_content"
243 243 android:layout_marginLeft="5dp"
244   - android:text="2019.09.01"
  244 + android:text="--"
245 245 android:textColor="@color/text_black"
246 246 android:textSize="15sp" />
247 247 </LinearLayout>
... ... @@ -282,10 +282,11 @@
282 282 android:layout_marginTop="10dp">
283 283  
284 284 <TextView
  285 + android:id="@+id/tv_active_start_time"
285 286 android:layout_width="wrap_content"
286 287 android:layout_height="wrap_content"
287 288 android:layout_marginLeft="25dp"
288   - android:text="2019.05.01"
  289 + android:text="--"
289 290 android:textColor="@color/text_black"
290 291 android:textSize="15sp" />
291 292  
... ... @@ -298,10 +299,11 @@
298 299 android:textSize="15sp" />
299 300  
300 301 <TextView
  302 + android:id="@+id/tv_active_end_time"
301 303 android:layout_width="wrap_content"
302 304 android:layout_height="wrap_content"
303 305 android:layout_marginLeft="5dp"
304   - android:text="2019.09.01"
  306 + android:text="--"
305 307 android:textColor="@color/text_black"
306 308 android:textSize="15sp" />
307 309 </LinearLayout>
... ... @@ -385,10 +387,11 @@
385 387 android:layout_weight="1">
386 388  
387 389 <TextView
  390 + android:id="@+id/tv_sign_person"
388 391 android:layout_width="wrap_content"
389 392 android:layout_height="wrap_content"
390 393 android:layout_marginLeft="33dp"
391   - android:text="123"
  394 + android:text="0"
392 395 android:textColor="@color/text_black"
393 396 android:textSize="17sp"
394 397 android:textStyle="bold" />
... ...
moudle_pedometer/src/main/res/layout/layout_run_detail_street_introduce.xml
  View file @ee7d958
1 1 <?xml version="1.0" encoding="utf-8"?>
2   -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3   - android:layout_width="match_parent"
4   - android:layout_height="wrap_content"
5   - android:background="@color/white"
6   - android:orientation="vertical"
7   - android:paddingLeft="10dp"
8   - android:paddingRight="10dp">
9   - <!--路线介绍-->
10   - <TextView
11   - android:id="@+id/tv_race_title"
12   - android:layout_width="wrap_content"
13   - android:layout_height="wrap_content"
14   - android:layout_marginTop="10dp"
15   - android:text="@string/layout_run_detail_street_introduce_title"
16   - android:textSize="18sp"
17   - android:textStyle="bold" />
  2 +<layout xmlns:android="http://schemas.android.com/apk/res/android">
18 3  
19   - <TextView
20   - android:layout_width="wrap_content"
  4 + <LinearLayout
  5 + android:layout_width="match_parent"
21 6 android:layout_height="wrap_content"
22   - android:layout_marginTop="10dp"
23   - android:text="路线介绍路线介绍路线介绍路线介绍路线介绍路线介绍路线介绍路线介绍路线介绍路线介绍路线介绍路线介绍路线介绍路线介绍路线介绍路线介绍路线介绍路线介绍路线介绍"
24   - android:textColor="@color/text_black"
25   - android:textSize="15sp" />
  7 + android:background="@color/white"
  8 + android:orientation="vertical"
  9 + android:paddingLeft="10dp"
  10 + android:paddingRight="10dp">
  11 + <!--路线介绍-->
  12 + <TextView
  13 + android:id="@+id/tv_race_title"
  14 + android:layout_width="wrap_content"
  15 + android:layout_height="wrap_content"
  16 + android:layout_marginTop="10dp"
  17 + android:text="@string/layout_run_detail_street_introduce_title"
  18 + android:textSize="18sp"
  19 + android:textStyle="bold" />
26 20  
27   - <!--地图-->
28   - <TextView
29   - android:layout_width="wrap_content"
30   - android:layout_height="wrap_content"
31   - android:layout_marginTop="10dp"
32   - android:text="@string/layout_run_detail_street_introduce_map"
33   - android:textSize="18sp"
34   - android:textStyle="bold" />
  21 + <TextView
  22 + android:layout_width="wrap_content"
  23 + android:layout_height="wrap_content"
  24 + android:layout_marginTop="10dp"
  25 + android:text="--"
  26 + android:textColor="@color/text_black"
  27 + android:textSize="15sp" />
35 28  
36   - <ImageView
37   - android:layout_width="match_parent"
38   - android:layout_height="500dp"
39   - android:layout_marginTop="10dp"
40   - android:layout_marginBottom="60dp"
41   - android:background="@drawable/map"
42   - android:scaleType="center" />
43   -</LinearLayout>
44 29 \ No newline at end of file
  30 + <!--地图-->
  31 + <TextView
  32 + android:layout_width="wrap_content"
  33 + android:layout_height="wrap_content"
  34 + android:layout_marginTop="10dp"
  35 + android:text="@string/layout_run_detail_street_introduce_map"
  36 + android:textSize="18sp"
  37 + android:textStyle="bold" />
  38 +
  39 + <ImageView
  40 + android:id="@+id/iv_road_mao"
  41 + android:layout_width="match_parent"
  42 + android:layout_height="500dp"
  43 + android:layout_marginTop="10dp"
  44 + android:layout_marginBottom="60dp"
  45 + android:scaleType="center" />
  46 + </LinearLayout>
  47 +</layout>
45 48 \ No newline at end of file
... ...