Commit ce801107e8c2040a3688449972344b44329ab34f
1 parent
02377c2a
1 修复轨迹工具,中活动类型不显示的问题
Showing
3 changed files
with
4 additions
and
11 deletions
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/CollRunRaceDetailFragmentView.java
| @@ -281,7 +281,10 @@ public class CollRunRaceDetailFragmentView implements MvpView, SensorEventListen | @@ -281,7 +281,10 @@ public class CollRunRaceDetailFragmentView implements MvpView, SensorEventListen | ||
| 281 | if (!TextUtils.isEmpty(TimeUtil.getStampToTime(runRaceDetailInfo.getEnd_time(), "yyyy.MM.dd"))) { | 281 | if (!TextUtils.isEmpty(TimeUtil.getStampToTime(runRaceDetailInfo.getEnd_time(), "yyyy.MM.dd"))) { |
| 282 | fragment.binding.includeStreet.tvActiveEndTime.setText(TimeUtil.getStampToTime(runRaceDetailInfo.getEnd_time(), "yyyy.MM.dd")); | 282 | fragment.binding.includeStreet.tvActiveEndTime.setText(TimeUtil.getStampToTime(runRaceDetailInfo.getEnd_time(), "yyyy.MM.dd")); |
| 283 | } | 283 | } |
| 284 | - | 284 | + //设置活动类型 |
| 285 | + if (!TextUtils.isEmpty(runRaceDetailInfo.getEventType())){ | ||
| 286 | + fragment.binding.includeStreet.tvEventType.setText(runRaceDetailInfo.getEventType()); | ||
| 287 | + } | ||
| 285 | 288 | ||
| 286 | //设置路线介绍的图片 | 289 | //设置路线介绍的图片 |
| 287 | if (!TextUtils.isEmpty(runRaceDetailInfo.getRoadmap())) { | 290 | if (!TextUtils.isEmpty(runRaceDetailInfo.getRoadmap())) { |
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/CollTraceListDetailFragmentView.java
| @@ -94,8 +94,6 @@ public class CollTraceListDetailFragmentView implements MvpView, OnFenceListener | @@ -94,8 +94,6 @@ public class CollTraceListDetailFragmentView implements MvpView, OnFenceListener | ||
| 94 | this.position = position; | 94 | this.position = position; |
| 95 | this.eventShoeLinesBean = eventShoeLinesBean; | 95 | this.eventShoeLinesBean = eventShoeLinesBean; |
| 96 | allMapOverlays = new ArrayList<>(); | 96 | allMapOverlays = new ArrayList<>(); |
| 97 | - //设置滑动卡片 | ||
| 98 | -// fragment.binding.slidingLayout.set | ||
| 99 | //添加起点 | 97 | //添加起点 |
| 100 | CollectPoint startPoint = null; | 98 | CollectPoint startPoint = null; |
| 101 | List<CollectPoint> resultCollectPoints = null; | 99 | List<CollectPoint> resultCollectPoints = null; |
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/service/CollKeepLiveService.java
| @@ -51,14 +51,6 @@ public class CollKeepLiveService extends Service implements MediaPlayer.OnComple | @@ -51,14 +51,6 @@ public class CollKeepLiveService extends Service implements MediaPlayer.OnComple | ||
| 51 | public CollKeepLiveService() { | 51 | public CollKeepLiveService() { |
| 52 | } | 52 | } |
| 53 | 53 | ||
| 54 | - public static CollKeepLiveService getInstance() { | ||
| 55 | - if (instance == null) { | ||
| 56 | - instance = new CollKeepLiveService(); | ||
| 57 | - return instance; | ||
| 58 | - } else { | ||
| 59 | - return instance; | ||
| 60 | - } | ||
| 61 | - } | ||
| 62 | 54 | ||
| 63 | @Override | 55 | @Override |
| 64 | public void onCreate() { | 56 | public void onCreate() { |