CNLive Android Team / ModulePedometer · Commits

Commit 23a53aad0d753f14edb0c5b797d055a89f52714b

Authored by 杨帅
1 parent 94059d05

1.赛事详情

Inline Side-by-side
Showing 13 changed files with 253 additions and 71 deletions
moudle_pedometer/src/main/AndroidManifest.xml
  View file @23a53aa
@@ -107,6 +107,9 @@ @@ -107,6 +107,9 @@
107 <activity 107 <activity
108 android:name="com.cnlive.moudle.pedometer.ui.activity.RunRaceDetailActivity" 108 android:name="com.cnlive.moudle.pedometer.ui.activity.RunRaceDetailActivity"
109 android:process=":step" /> 109 android:process=":step" />
  110 + <activity
  111 + android:name="com.cnlive.moudle.pedometer.ui.activity.FinishRuningMapActivity"
  112 + android:process=":step" />
110 </application> 113 </application>
111 114
112 </manifest> 115 </manifest>
113 \ No newline at end of file 116 \ No newline at end of file
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunRaceDetailFragmentView.java
  View file @23a53aa
@@ -108,7 +108,6 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener { @@ -108,7 +108,6 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
108 private LatLng startLatLng = new LatLng(39.934733, 116.308646);//起始点 108 private LatLng startLatLng = new LatLng(39.934733, 116.308646);//起始点
109 private List<LatLng> trackPoints; 109 private List<LatLng> trackPoints;
110 110
111 -  
112 public RunRaceDetailFragmentView(RunRaceDetailFragment fragment) { 111 public RunRaceDetailFragmentView(RunRaceDetailFragment fragment) {
113 this.fragment = fragment; 112 this.fragment = fragment;
114 } 113 }
@@ -128,37 +127,45 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener { @@ -128,37 +127,45 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
128 //设置底部卡片第一次可滑动的位置 127 //设置底部卡片第一次可滑动的位置
129 fragment.binding.slidingLayout.setAnchorPoint(0.6f); 128 fragment.binding.slidingLayout.setAnchorPoint(0.6f);
130 //设置底部卡片初始位置 129 //设置底部卡片初始位置
131 - fragment.binding.slidingLayout.setPanelHeight(ScreenUtil.dip2px(fragment.getActivity(), 140)); 130 +// fragment.binding.slidingLayout.setPanelHeight(ScreenUtil.dip2px(fragment.getActivity(), 140));
  131 + fragment.binding.includeStreet.rlStartBtn.setVisibility(View.VISIBLE);
132 fragment.binding.slidingLayout.addPanelSlideListener(new SlidingUpPanelLayout.PanelSlideListener() { 132 fragment.binding.slidingLayout.addPanelSlideListener(new SlidingUpPanelLayout.PanelSlideListener() {
133 @Override 133 @Override
134 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) { 135 if (slideOffset >= 0 && slideOffset <= 1) {
137 - int leakWidth = (int) (ScreenUtil.dip2px(getContext(), 30) / 0.6); 136 + int leakWidth = (int) (ScreenUtil.dip2px(getContext(), 15) / 0.6);
138 LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT); 137 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 - 138 + int current = (int) (leakWidth * slideOffset);
  139 +// Log.e(TAG, "current: " + current + ",leakWidth:" + leakWidth + ",ScreenUtil:" + ScreenUtil.dip2px(getContext(), 15));
  140 + if (slideOffset == 0) {
  141 + layoutParams.setMargins(ScreenUtil.dip2px(getContext(), 15), 0, ScreenUtil.dip2px(getContext(), 15), 0);
  142 + fragment.binding.includeStreet.llFirstPanelRoot.setLayoutParams(layoutParams);
  143 + fragment.binding.includeStreet.llBottomPanel.setLayoutParams(layoutParams);
  144 + }
141 if (leakWidth - ScreenUtil.dip2px(getContext(), current) <= ScreenUtil.dip2px(getContext(), 15)) { 145 if (leakWidth - ScreenUtil.dip2px(getContext(), current) <= ScreenUtil.dip2px(getContext(), 15)) {
142 if (leakWidth - ScreenUtil.dip2px(getContext(), current) >= 0) { 146 if (leakWidth - ScreenUtil.dip2px(getContext(), current) >= 0) {
143 layoutParams.setMargins(leakWidth - ScreenUtil.dip2px(getContext(), current), 0, leakWidth - ScreenUtil.dip2px(getContext(), current), 0); 147 layoutParams.setMargins(leakWidth - ScreenUtil.dip2px(getContext(), current), 0, leakWidth - ScreenUtil.dip2px(getContext(), current), 0);
144 } else { 148 } else {
145 layoutParams.setMargins(0, 0, 0, 0); 149 layoutParams.setMargins(0, 0, 0, 0);
146 } 150 }
  151 +
147 fragment.binding.includeStreet.llFirstPanelRoot.setLayoutParams(layoutParams); 152 fragment.binding.includeStreet.llFirstPanelRoot.setLayoutParams(layoutParams);
148 fragment.binding.includeStreet.llBottomPanel.setLayoutParams(layoutParams); 153 fragment.binding.includeStreet.llBottomPanel.setLayoutParams(layoutParams);
149 } 154 }
  155 +
150 } 156 }
151 157
152 if (slideOffset == 0) { 158 if (slideOffset == 0) {
153 //在初始位置 159 //在初始位置
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); 160 + if (fragment.binding.includeStreet.rlStartBtn.getVisibility() == View.GONE) {
  161 + fragment.binding.includeStreet.rlStartBtn.setVisibility(View.VISIBLE);
  162 + }
  163 +
159 } else { 164 } else {
160 //用户进行滑动 165 //用户进行滑动
161 - fragment.binding.includeStreet.rlStartBtn.setVisibility(View.GONE); 166 + if (fragment.binding.includeStreet.rlStartBtn.getVisibility() == View.VISIBLE) {
  167 + fragment.binding.includeStreet.rlStartBtn.setVisibility(View.GONE);
  168 + }
162 } 169 }
163 } 170 }
164 171
@@ -302,7 +309,7 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener { @@ -302,7 +309,7 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
302 //可选，设置是否需要地址描述 309 //可选，设置是否需要地址描述
303 option.setIsNeedLocationDescribe(true); 310 option.setIsNeedLocationDescribe(true);
304 //可选，设置是否需要设备方向结果 311 //可选，设置是否需要设备方向结果
305 - option.setNeedDeviceDirect(true); 312 + option.setNeedDeviceDirect(false);
306 //设置打开自动回调位置模式，该开关打开后，期间只要定位SDK检测到位置变化就会主动回调给开发者 313 //设置打开自动回调位置模式，该开关打开后，期间只要定位SDK检测到位置变化就会主动回调给开发者
307 option.setOpenAutoNotifyMode(3000, 1, LocationClientOption.LOC_SENSITIVITY_HIGHT); 314 option.setOpenAutoNotifyMode(3000, 1, LocationClientOption.LOC_SENSITIVITY_HIGHT);
308 mLocClient.setLocOption(option); 315 mLocClient.setLocOption(option);
@@ -610,11 +617,10 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener { @@ -610,11 +617,10 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
610 return; 617 return;
611 } 618 }
612 } 619 }
613 - mCurrentAccracy = location.getRadius();  
614 followMyLocation = new MyLocationData.Builder() 620 followMyLocation = new MyLocationData.Builder()
615 .accuracy(location.getRadius()) 621 .accuracy(location.getRadius())
616 // 此处设置开发者获取到的方向信息，顺时针0-360 622 // 此处设置开发者获取到的方向信息，顺时针0-360
617 - .direction(mCurrentDirection).latitude(location.getLatitude()) 623 + .direction(location.getDirection()).latitude(location.getLatitude())
618 .longitude(location.getLongitude()).build(); 624 .longitude(location.getLongitude()).build();
619 if (followMyLocation == null || followMyLocation.latitude == 0 || followMyLocation.longitude == 0) { 625 if (followMyLocation == null || followMyLocation.latitude == 0 || followMyLocation.longitude == 0) {
620 return; 626 return;
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunningMapFragmentView.java
  View file @23a53aa
@@ -194,7 +194,6 @@ public class RunningMapFragmentView implements MvpView, SensorEventListener { @@ -194,7 +194,6 @@ public class RunningMapFragmentView implements MvpView, SensorEventListener {
194 194
195 @Override 195 @Override
196 public void onReceiveLocation(BDLocation location) { 196 public void onReceiveLocation(BDLocation location) {
197 - Toast.makeText(getContext(), "aa", Toast.LENGTH_SHORT).show();  
198 Log.e(TAG, "onReceiveLocation: 状态" + location.getGpsAccuracyStatus()); 197 Log.e(TAG, "onReceiveLocation: 状态" + location.getGpsAccuracyStatus());
199 // map view 销毁后不在处理新接收的位置 198 // map view 销毁后不在处理新接收的位置
200 if (location == null || mMapView == null) { 199 if (location == null || mMapView == null) {
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/FinishRuningMapActivity.java 0 → 100644
  View file @23a53aa
  1 +package com.cnlive.moudle.pedometer.ui.activity;
  2 +
  3 +import com.cnlive.libs.base.ui.QMUIFragmentActivity;
  4 +import com.example.moudle_pedometer.R;
  5 +
  6 +public class FinishRuningMapActivity extends QMUIFragmentActivity {
  7 + @Override
  8 + protected int getContextViewId() {
  9 + return R.id.fragment_finish_run_map;
  10 + }
  11 +}
moudle_pedometer/src/main/res/drawable/shape_circle_50_white.xml 0 → 100644
  View file @23a53aa
  1 +<?xml version="1.0" encoding="utf-8"?>
  2 +<shape xmlns:android="http://schemas.android.com/apk/res/android">
  3 + <corners android:radius="100dp" />
  4 + <solid android:color="@color/black_50" />
  5 +</shape>
0 \ No newline at end of file 6 \ No newline at end of file
moudle_pedometer/src/main/res/drawable/shape_left_right_10dp_white_raduis_bg.xml 0 → 100644
  View file @23a53aa
  1 +<?xml version="1.0" encoding="utf-8"?>
  2 +<shape xmlns:android="http://schemas.android.com/apk/res/android">
  3 + <solid android:color="@color/white" />
  4 + <corners
  5 + android:topLeftRadius="10dp"
  6 + android:topRightRadius="10dp" />
  7 +</shape>
0 \ No newline at end of file 8 \ No newline at end of file
moudle_pedometer/src/main/res/layout/fragment_finish_run_map.xml 0 → 100644
  View file @23a53aa
  1 +<?xml version="1.0" encoding="utf-8"?>
  2 +<layout xmlns:android="http://schemas.android.com/apk/res/android"
  3 + xmlns:app="http://schemas.android.com/apk/res-auto">
  4 +
  5 + <com.sothree.slidinguppanel.SlidingUpPanelLayout xmlns:sothree="http://schemas.android.com/apk/res-auto"
  6 + android:id="@+id/sliding_layout"
  7 + android:layout_width="match_parent"
  8 + android:layout_height="match_parent"
  9 + android:gravity="bottom"
  10 + sothree:umanoDragView="@+id/dragView"
  11 + sothree:umanoOverlay="true"
  12 + sothree:umanoPanelHeight="100dp"
  13 + sothree:umanoParallaxOffset="100dp"
  14 + sothree:umanoScrollableView="@+id/scrollView"
  15 + sothree:umanoShadowHeight="0dp">
  16 +
  17 + <!-- MAIN CONTENT -->
  18 + <FrameLayout
  19 + android:layout_width="match_parent"
  20 + android:layout_height="match_parent">
  21 +
  22 + <com.baidu.mapapi.map.MapView
  23 + android:id="@+id/mapView"
  24 + android:layout_width="match_parent"
  25 + android:layout_height="match_parent"></com.baidu.mapapi.map.MapView>
  26 +
  27 + <FrameLayout
  28 + android:layout_width="40dp"
  29 + android:layout_height="40dp"
  30 + android:layout_margin="10dp"
  31 + android:background="@drawable/shape_circle_50_black">
  32 +
  33 + <ImageView
  34 + android:layout_width="10dp"
  35 + android:layout_height="20dp"
  36 + android:layout_gravity="center"
  37 + android:background="@drawable/ic_white_back" />
  38 + </FrameLayout>
  39 +
  40 + <FrameLayout
  41 + android:layout_width="40dp"
  42 + android:layout_height="40dp"
  43 + android:layout_gravity="right"
  44 + android:layout_margin="10dp"
  45 + android:background="@drawable/shape_circle_50_black">
  46 +
  47 + <ImageView
  48 + android:layout_width="15dp"
  49 + android:layout_height="15dp"
  50 + android:layout_gravity="center"
  51 + android:background="@drawable/icon_share" />
  52 + </FrameLayout>
  53 + <!---->
  54 +
  55 +
  56 + </FrameLayout>
  57 +
  58 + <!-- SLIDING LAYOUT -->
  59 + <FrameLayout
  60 + android:id="@+id/dragView"
  61 + android:layout_width="match_parent"
  62 + android:layout_height="match_parent"
  63 + android:clickable="true"
  64 + android:focusable="false"
  65 + android:orientation="vertical">
  66 +
  67 + <ScrollView
  68 + android:id="@+id/scrollView"
  69 + android:layout_width="match_parent"
  70 + android:layout_height="wrap_content"
  71 + android:scrollbars="none">
  72 +
  73 + <LinearLayout
  74 + android:id="@+id/ll_root"
  75 + android:layout_width="match_parent"
  76 + android:layout_height="wrap_content"
  77 + android:orientation="vertical">
  78 + <!--跑道-->
  79 + <include
  80 + android:id="@+id/include_street"
  81 + layout="@layout/layout_run_detail_street" />
  82 + <!--成绩-->
  83 + <include
  84 + android:id="@+id/include_person_score"
  85 + android:visibility="visible"
  86 + layout="@layout/layout_run_detail_person_score" />
  87 + <!--排行-->
  88 + <include
  89 + android:id="@+id/include_rank"
  90 + android:visibility="visible"
  91 + layout="@layout/layout_run_detail_rank" />
  92 + <!--路线介绍-->
  93 + <include
  94 + android:id="@+id/include_street_introduce"
  95 + layout="@layout/layout_run_detail_street_introduce" />
  96 + </LinearLayout>
  97 +
  98 + </ScrollView>
  99 + <!--按钮-->
  100 + <RelativeLayout
  101 + android:id="@+id/rl_scrollView_startBtn"
  102 + android:layout_width="match_parent"
  103 + android:layout_height="40sp"
  104 + android:layout_gravity="bottom"
  105 + android:background="@color/green_round"
  106 + android:tag="0">
  107 +
  108 + <TextView
  109 + android:id="@+id/tv_run_now"
  110 + android:layout_width="wrap_content"
  111 + android:layout_height="wrap_content"
  112 + android:layout_centerInParent="true"
  113 + android:tag="0"
  114 + android:text="@string/run_race_btn_sign_up"
  115 + android:textColor="@color/white"
  116 + android:textSize="18sp" />
  117 +
  118 + <TextView
  119 + android:id="@+id/tv_go_tip"
  120 + android:layout_width="wrap_content"
  121 + android:layout_height="wrap_content"
  122 + android:layout_alignParentRight="true"
  123 + android:layout_centerInParent="true"
  124 + android:layout_centerVertical="true"
  125 + android:layout_marginRight="10dp"
  126 + android:text="Go!"
  127 + android:textColor="@color/white"
  128 + android:textSize="18sp"
  129 + android:visibility="gone" />
  130 +
  131 + </RelativeLayout>
  132 + </FrameLayout>
  133 + </com.sothree.slidinguppanel.SlidingUpPanelLayout>
  134 +
  135 +
  136 +</layout>
0 \ No newline at end of file 137 \ No newline at end of file
moudle_pedometer/src/main/res/layout/fragment_run_race_detail.xml
  View file @23a53aa
@@ -8,9 +8,10 @@ @@ -8,9 +8,10 @@
8 android:layout_height="match_parent" 8 android:layout_height="match_parent"
9 android:gravity="bottom" 9 android:gravity="bottom"
10 sothree:umanoDragView="@+id/dragView" 10 sothree:umanoDragView="@+id/dragView"
  11 + sothree:umanoFadeColor="@color/transparent"
11 sothree:umanoOverlay="true" 12 sothree:umanoOverlay="true"
12 - sothree:umanoPanelHeight="100dp"  
13 - sothree:umanoParallaxOffset="100dp" 13 + sothree:umanoPanelHeight="142dp"
  14 + sothree:umanoParallaxOffset="250dp"
14 sothree:umanoScrollableView="@+id/scrollView" 15 sothree:umanoScrollableView="@+id/scrollView"
15 sothree:umanoShadowHeight="0dp"> 16 sothree:umanoShadowHeight="0dp">
16 17
@@ -60,14 +61,13 @@ @@ -60,14 +61,13 @@
60 android:id="@+id/dragView" 61 android:id="@+id/dragView"
61 android:layout_width="match_parent" 62 android:layout_width="match_parent"
62 android:layout_height="match_parent" 63 android:layout_height="match_parent"
63 - android:clickable="true"  
64 - android:focusable="false"  
65 - android:orientation="vertical"> 64 + android:clickable="false"
  65 + android:focusable="false">
66 66
67 <ScrollView 67 <ScrollView
68 android:id="@+id/scrollView" 68 android:id="@+id/scrollView"
69 android:layout_width="match_parent" 69 android:layout_width="match_parent"
70 - android:layout_height="wrap_content" 70 + android:layout_height="match_parent"
71 android:scrollbars="none"> 71 android:scrollbars="none">
72 72
73 <LinearLayout 73 <LinearLayout
@@ -82,13 +82,13 @@ @@ -82,13 +82,13 @@
82 <!--成绩--> 82 <!--成绩-->
83 <include 83 <include
84 android:id="@+id/include_person_score" 84 android:id="@+id/include_person_score"
85 - android:visibility="gone"  
86 - layout="@layout/layout_run_detail_person_score" /> 85 + layout="@layout/layout_run_detail_person_score"
  86 + android:visibility="visible" />
87 <!--排行--> 87 <!--排行-->
88 <include 88 <include
89 android:id="@+id/include_rank" 89 android:id="@+id/include_rank"
90 - android:visibility="gone"  
91 - layout="@layout/layout_run_detail_rank" /> 90 + layout="@layout/layout_run_detail_rank"
  91 + android:visibility="visible" />
92 <!--路线介绍--> 92 <!--路线介绍-->
93 <include 93 <include
94 android:id="@+id/include_street_introduce" 94 android:id="@+id/include_street_introduce"
moudle_pedometer/src/main/res/layout/layout_run_detail_person_score.xml
  View file @23a53aa
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"  
5 - android:layout_height="wrap_content"> 4 + android:layout_height="wrap_content"
  5 + android:background="@color/white">
6 <!--个人最佳成绩--> 6 <!--个人最佳成绩-->
7 <LinearLayout 7 <LinearLayout
8 android:layout_width="match_parent" 8 android:layout_width="match_parent"
@@ -43,32 +43,39 @@ @@ -43,32 +43,39 @@
43 <!----> 43 <!---->
44 <LinearLayout 44 <LinearLayout
45 android:layout_width="match_parent" 45 android:layout_width="match_parent"
46 - android:layout_height="match_parent"> 46 + android:layout_height="wrap_content"
  47 + android:layout_marginTop="10dp">
47 48
48 <LinearLayout 49 <LinearLayout
49 android:layout_width="0dp" 50 android:layout_width="0dp"
50 android:layout_height="match_parent" 51 android:layout_height="match_parent"
51 android:layout_weight="1" 52 android:layout_weight="1"
52 - android:gravity="center"  
53 - android:orientation="vertical"> 53 + android:gravity="left|bottom">
54 54
55 <TextView 55 <TextView
56 android:layout_width="wrap_content" 56 android:layout_width="wrap_content"
57 android:layout_height="wrap_content" 57 android:layout_height="wrap_content"
  58 + android:layout_marginLeft="15dp"
58 android:text="1.53" 59 android:text="1.53"
59 android:textColor="@color/black" 60 android:textColor="@color/black"
60 - android:textSize="20sp" 61 + android:textSize="25sp"
61 android:textStyle="bold" /> 62 android:textStyle="bold" />
62 63
63 <TextView 64 <TextView
64 android:layout_width="wrap_content" 65 android:layout_width="wrap_content"
65 android:layout_height="wrap_content" 66 android:layout_height="wrap_content"
66 - android:layout_marginTop="10dp" 67 + android:layout_marginLeft="5dp"
67 android:text="公里" 68 android:text="公里"
68 android:textColor="@color/text_gray" 69 android:textColor="@color/text_gray"
69 - android:textSize="15sp"  
70 - android:textStyle="bold" /> 70 + android:textSize="15sp" />
71 </LinearLayout> 71 </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">
72 79
73 <LinearLayout 80 <LinearLayout
74 android:layout_width="0dp" 81 android:layout_width="0dp"
@@ -80,19 +87,20 @@ @@ -80,19 +87,20 @@
80 <TextView 87 <TextView
81 android:layout_width="wrap_content" 88 android:layout_width="wrap_content"
82 android:layout_height="wrap_content" 89 android:layout_height="wrap_content"
83 - android:text="1234"  
84 - android:textColor="@color/black"  
85 - android:textSize="20sp"  
86 - android:textStyle="bold" /> 90 + android:text="步数"
  91 + android:textColor="@color/text_gray"
  92 + android:textSize="15sp" />
87 93
88 <TextView 94 <TextView
89 android:layout_width="wrap_content" 95 android:layout_width="wrap_content"
90 android:layout_height="wrap_content" 96 android:layout_height="wrap_content"
91 - android:layout_marginTop="10dp"  
92 - android:text="步数"  
93 - android:textColor="@color/text_gray"  
94 - android:textSize="15sp" 97 + android:layout_marginTop="5dp"
  98 + android:text="1234"
  99 + android:textColor="@color/black"
  100 + android:textSize="20sp"
95 android:textStyle="bold" /> 101 android:textStyle="bold" />
  102 +
  103 +
96 </LinearLayout> 104 </LinearLayout>
97 105
98 <LinearLayout 106 <LinearLayout
@@ -105,19 +113,21 @@ @@ -105,19 +113,21 @@
105 <TextView 113 <TextView
106 android:layout_width="wrap_content" 114 android:layout_width="wrap_content"
107 android:layout_height="wrap_content" 115 android:layout_height="wrap_content"
108 - android:text="00:27:23"  
109 - android:textColor="@color/black"  
110 - android:textSize="20sp"  
111 - android:textStyle="bold" /> 116 +
  117 + android:text="用时"
  118 + android:textColor="@color/text_gray"
  119 + android:textSize="15sp" />
112 120
113 <TextView 121 <TextView
114 android:layout_width="wrap_content" 122 android:layout_width="wrap_content"
115 android:layout_height="wrap_content" 123 android:layout_height="wrap_content"
116 - android:layout_marginTop="10dp"  
117 - android:text="用时"  
118 - android:textColor="@color/text_gray"  
119 - android:textSize="15sp" 124 + android:layout_marginTop="5dp"
  125 + android:text="00:27:23"
  126 + android:textColor="@color/black"
  127 + android:textSize="20sp"
120 android:textStyle="bold" /> 128 android:textStyle="bold" />
  129 +
  130 +
121 </LinearLayout> 131 </LinearLayout>
122 132
123 <LinearLayout 133 <LinearLayout
@@ -130,19 +140,20 @@ @@ -130,19 +140,20 @@
130 <TextView 140 <TextView
131 android:layout_width="wrap_content" 141 android:layout_width="wrap_content"
132 android:layout_height="wrap_content" 142 android:layout_height="wrap_content"
133 - android:text="99"  
134 - android:textColor="@color/black"  
135 - android:textSize="20sp"  
136 - android:textStyle="bold" /> 143 + android:text="配速"
  144 + android:textColor="@color/text_gray"
  145 + android:textSize="15sp" />
137 146
138 <TextView 147 <TextView
139 android:layout_width="wrap_content" 148 android:layout_width="wrap_content"
140 android:layout_height="wrap_content" 149 android:layout_height="wrap_content"
141 - android:layout_marginTop="10dp"  
142 - android:text="千卡"  
143 - android:textColor="@color/text_gray"  
144 - android:textSize="15sp" 150 + android:layout_marginTop="5dp"
  151 + android:text="22'22''"
  152 + android:textColor="@color/black"
  153 + android:textSize="20sp"
145 android:textStyle="bold" /> 154 android:textStyle="bold" />
  155 +
  156 +
146 </LinearLayout> 157 </LinearLayout>
147 </LinearLayout> 158 </LinearLayout>
148 </LinearLayout> 159 </LinearLayout>
moudle_pedometer/src/main/res/layout/layout_run_detail_rank.xml
  View file @23a53aa
@@ -48,7 +48,7 @@ @@ -48,7 +48,7 @@
48 <LinearLayout 48 <LinearLayout
49 android:layout_width="0dp" 49 android:layout_width="0dp"
50 android:layout_height="match_parent" 50 android:layout_height="match_parent"
51 - android:layout_weight="1" 51 + android:layout_weight="1.2"
52 android:gravity="center" 52 android:gravity="center"
53 android:orientation="vertical"> 53 android:orientation="vertical">
54 54
@@ -85,13 +85,12 @@ @@ -85,13 +85,12 @@
85 <LinearLayout 85 <LinearLayout
86 android:layout_width="0dp" 86 android:layout_width="0dp"
87 android:layout_height="match_parent" 87 android:layout_height="match_parent"
88 - android:layout_weight="1"  
89 - android:gravity="center"> 88 + android:layout_weight="1.2"
  89 + android:gravity="center|right">
90 90
91 <LinearLayout 91 <LinearLayout
92 - android:layout_width="0dp" 92 + android:layout_width="wrap_content"
93 android:layout_height="match_parent" 93 android:layout_height="match_parent"
94 - android:layout_weight="1"  
95 android:gravity="center" 94 android:gravity="center"
96 android:orientation="vertical"> 95 android:orientation="vertical">
97 96
@@ -99,7 +98,7 @@ @@ -99,7 +98,7 @@
99 <TextView 98 <TextView
100 android:layout_width="wrap_content" 99 android:layout_width="wrap_content"
101 android:layout_height="wrap_content" 100 android:layout_height="wrap_content"
102 - android:text="1234步" 101 + android:text="00:27:23"
103 android:textColor="@color/black" 102 android:textColor="@color/black"
104 android:textSize="20sp" 103 android:textSize="20sp"
105 android:textStyle="bold" /> 104 android:textStyle="bold" />
@@ -107,7 +106,7 @@ @@ -107,7 +106,7 @@
107 <TextView 106 <TextView
108 android:layout_width="wrap_content" 107 android:layout_width="wrap_content"
109 android:layout_height="wrap_content" 108 android:layout_height="wrap_content"
110 - android:layout_marginTop="15dp" 109 + android:layout_marginTop="5dp"
111 android:text="用户昵称" 110 android:text="用户昵称"
112 android:textColor="@color/text_gray" 111 android:textColor="@color/text_gray"
113 android:textSize="15sp" /> 112 android:textSize="15sp" />
@@ -116,14 +115,15 @@ @@ -116,14 +115,15 @@
116 </LinearLayout> 115 </LinearLayout>
117 116
118 <LinearLayout 117 <LinearLayout
119 - android:layout_width="0dp" 118 + android:layout_width="wrap_content"
120 android:layout_height="match_parent" 119 android:layout_height="match_parent"
121 - android:layout_weight="1"  
122 android:gravity="center"> 120 android:gravity="center">
123 121
124 <com.qmuiteam.qmui.widget.QMUIRadiusImageView 122 <com.qmuiteam.qmui.widget.QMUIRadiusImageView
125 android:layout_width="60dp" 123 android:layout_width="60dp"
126 android:layout_height="60dp" 124 android:layout_height="60dp"
  125 + android:layout_marginLeft="10dp"
  126 + android:layout_marginRight="15dp"
127 android:background="@drawable/tc_ic_workout_level_adjust_coach" 127 android:background="@drawable/tc_ic_workout_level_adjust_coach"
128 app:qmui_corner_radius="100dp" /> 128 app:qmui_corner_radius="100dp" />
129 </LinearLayout> 129 </LinearLayout>
moudle_pedometer/src/main/res/layout/layout_run_detail_street.xml
  View file @23a53aa
@@ -21,10 +21,10 @@ @@ -21,10 +21,10 @@
21 <LinearLayout 21 <LinearLayout
22 android:id="@+id/ll_first_panel_root" 22 android:id="@+id/ll_first_panel_root"
23 android:layout_width="match_parent" 23 android:layout_width="match_parent"
24 - android:layout_height="100dp" 24 + android:layout_height="wrap_content"
25 android:layout_marginLeft="15dp" 25 android:layout_marginLeft="15dp"
26 android:layout_marginRight="15dp" 26 android:layout_marginRight="15dp"
27 - android:background="@color/white" 27 + android:background="@drawable/shape_left_right_10dp_white_raduis_bg"
28 android:orientation="vertical"> 28 android:orientation="vertical">
29 <!--活动标题--> 29 <!--活动标题-->
30 <TextView 30 <TextView
moudle_pedometer/src/main/res/values/colors.xml
  View file @23a53aa
@@ -15,6 +15,8 @@ @@ -15,6 +15,8 @@
15 <!--圆形shape --> 15 <!--圆形shape -->
16 <!--半透明黑色--> 16 <!--半透明黑色-->
17 <color name="black_50">#80000000</color> 17 <color name="black_50">#80000000</color>
  18 + <color name="white_50">#80FFFFFF</color>
  19 +
18 <color name="green">#23D026</color> 20 <color name="green">#23D026</color>
19 <color name="red">#EF5544</color> 21 <color name="red">#EF5544</color>
20 22
moudle_pedometer/src/main/res/values/ids.xml
  View file @23a53aa
@@ -3,6 +3,8 @@ @@ -3,6 +3,8 @@
3 <item name="fragment_run_main" type="id" /> 3 <item name="fragment_run_main" type="id" />
4 <item name="fragment_running_map" type="id" /> 4 <item name="fragment_running_map" type="id" />
5 <item name="fragment_run_trace_detail" type="id" /> 5 <item name="fragment_run_trace_detail" type="id" />
6 - <item name="fragment_back" type="id"/> 6 + <item name="fragment_back" type="id" />
7 <item name="fragment_more" type="id" /> 7 <item name="fragment_more" type="id" />
  8 + <item name="fragment_finish_run_map" type="id" />
  9 +
8 </resources> 10 </resources>