Commit 03203b739a87cb9e03c876f8fde2e55b02a7d997
1 parent
23a53aad
1.赛事详情
Showing
6 changed files
with
11 additions
and
6 deletions
.idea/gradle.xml
| @@ -3,9 +3,6 @@ | @@ -3,9 +3,6 @@ | ||
| 3 | <component name="GradleSettings"> | 3 | <component name="GradleSettings"> |
| 4 | <option name="linkedExternalProjectsSettings"> | 4 | <option name="linkedExternalProjectsSettings"> |
| 5 | <GradleProjectSettings> | 5 | <GradleProjectSettings> |
| 6 | - <compositeConfiguration> | ||
| 7 | - <compositeBuild compositeDefinitionSource="SCRIPT" /> | ||
| 8 | - </compositeConfiguration> | ||
| 9 | <option name="distributionType" value="DEFAULT_WRAPPED" /> | 6 | <option name="distributionType" value="DEFAULT_WRAPPED" /> |
| 10 | <option name="externalProjectPath" value="$PROJECT_DIR$" /> | 7 | <option name="externalProjectPath" value="$PROJECT_DIR$" /> |
| 11 | <option name="modules"> | 8 | <option name="modules"> |
config.gradle
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunningMapFragmentView.java
| @@ -23,6 +23,7 @@ import com.baidu.mapapi.map.BaiduMap; | @@ -23,6 +23,7 @@ import com.baidu.mapapi.map.BaiduMap; | ||
| 23 | import com.baidu.mapapi.map.BitmapDescriptor; | 23 | import com.baidu.mapapi.map.BitmapDescriptor; |
| 24 | import com.baidu.mapapi.map.BitmapDescriptorFactory; | 24 | import com.baidu.mapapi.map.BitmapDescriptorFactory; |
| 25 | import com.baidu.mapapi.map.MapStatus; | 25 | import com.baidu.mapapi.map.MapStatus; |
| 26 | +import com.baidu.mapapi.map.MapStatusUpdateFactory; | ||
| 26 | import com.baidu.mapapi.map.MapView; | 27 | import com.baidu.mapapi.map.MapView; |
| 27 | import com.baidu.mapapi.map.MarkerOptions; | 28 | import com.baidu.mapapi.map.MarkerOptions; |
| 28 | import com.baidu.mapapi.map.MyLocationConfiguration; | 29 | import com.baidu.mapapi.map.MyLocationConfiguration; |
| @@ -131,14 +132,19 @@ public class RunningMapFragmentView implements MvpView, SensorEventListener { | @@ -131,14 +132,19 @@ public class RunningMapFragmentView implements MvpView, SensorEventListener { | ||
| 131 | baiduMap.setOnMapLoadedCallback(new BaiduMap.OnMapLoadedCallback() { | 132 | baiduMap.setOnMapLoadedCallback(new BaiduMap.OnMapLoadedCallback() { |
| 132 | @Override | 133 | @Override |
| 133 | public void onMapLoaded() { | 134 | public void onMapLoaded() { |
| 135 | + //自动计算地图缩放 | ||
| 136 | + MapStatus.Builder builder = new MapStatus.Builder(); | ||
| 137 | + builder.target(MyMapUtil.getCenterZoomPosition(trackPoints)); | ||
| 138 | + builder.zoom(MyMapUtil.getZoom(trackPoints)); | ||
| 139 | + baiduMap.animateMapStatus(MapStatusUpdateFactory.newMapStatus(builder.build())); | ||
| 134 | if (isFirstLoadMap) { | 140 | if (isFirstLoadMap) { |
| 135 | isFirstLoadMap = false; | 141 | isFirstLoadMap = false; |
| 136 | new Handler().postDelayed(new Runnable() { | 142 | new Handler().postDelayed(new Runnable() { |
| 137 | @Override | 143 | @Override |
| 138 | public void run() { | 144 | public void run() { |
| 139 | - MyMapUtil.drawMapLine(getContext(), baiduMap, trackPoints, R.color.green); | 145 | + MyMapUtil.drawMapLine(getContext(), baiduMap, trackPoints, R.color.green_50); |
| 140 | } | 146 | } |
| 141 | - }, 3000); | 147 | + }, 1500); |
| 142 | } | 148 | } |
| 143 | } | 149 | } |
| 144 | }); | 150 | }); |
moudle_pedometer/src/main/res/drawable-hdpi/rt_training_button_stop.png
0 → 100644
98 Bytes
moudle_pedometer/src/main/res/drawable-hdpi/rt_training_button_stop.webp deleted
100644 → 0
No preview for this file type
moudle_pedometer/src/main/res/values/colors.xml
| @@ -18,6 +18,8 @@ | @@ -18,6 +18,8 @@ | ||
| 18 | <color name="white_50">#80FFFFFF</color> | 18 | <color name="white_50">#80FFFFFF</color> |
| 19 | 19 | ||
| 20 | <color name="green">#23D026</color> | 20 | <color name="green">#23D026</color> |
| 21 | + <color name="green_50">#8023D026</color> | ||
| 22 | + | ||
| 21 | <color name="red">#EF5544</color> | 23 | <color name="red">#EF5544</color> |
| 22 | 24 | ||
| 23 | 25 |