CNLive Android Team / ModulePedometer · Commits

Commit 323d386ef61f608de401eac079c1a9a2c1b62fb1

Authored by YangShuai
1 parent 9b9d783b

1 重命名资源文件

Inline Side-by-side
Showing 100 changed files with 79 additions and 206 deletions

Too many changes to show.
Reload with full diff Plain diff Email patch

To preserve performance only 100 of 284 files are displayed.

config.gradle
  View file @323d386
... ... @@ -21,7 +21,7 @@ ext {
21 21 //编译方式
22 22 debug : false,
23 23 //版本号
24   - version: "1.0.15",
  24 + version: "1.0.16",
25 25 //Lib库前缀
26 26 packeg : "com.cnlive.module",
27 27 //Lib库名称
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/calorie/service/CalorieService.java
  View file @323d386
... ... @@ -18,35 +18,19 @@ import android.hardware.SensorManager;
18 18 import android.os.Binder;
19 19 import android.os.Build;
20 20 import android.os.CountDownTimer;
21   -import android.os.Handler;
22 21 import android.os.IBinder;
23 22 import android.support.v4.app.NotificationCompat;
24 23 import android.text.TextUtils;
25 24 import android.util.Log;
26 25 import android.widget.RemoteViews;
27 26  
28   -import com.baidu.trace.LBSTraceClient;
29   -import com.baidu.trace.Trace;
30   -import com.baidu.trace.api.track.LatestPoint;
31   -import com.baidu.trace.api.track.LatestPointResponse;
32   -import com.baidu.trace.api.track.OnTrackListener;
33   -import com.baidu.trace.model.LocationMode;
34   -import com.baidu.trace.model.OnTraceListener;
35   -import com.baidu.trace.model.PushMessage;
36   -import com.baidu.trace.model.StatusCodes;
37 27 import com.cnlive.moudle.calorie.utils.CalorieUtil;
38   -import com.cnlive.moudle.collectionTrace.commonInfo.CollCommonInfo;
39   -import com.cnlive.moudle.collectionTrace.service.CollKeepLiveService;
40   -import com.cnlive.moudle.collectionTrace.utils.CollStepUtil;
41 28 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
42 29 import com.cnlive.moudle.pedometer.model.Constant;
43 30 import com.cnlive.moudle.pedometer.model.MessageEvent;
44 31 import com.cnlive.moudle.pedometer.model.step.StepCount;
45 32 import com.cnlive.moudle.pedometer.model.step.StepValuePassListener;
46   -import com.cnlive.moudle.pedometer.sql.db.DbCore;
47 33 import com.cnlive.moudle.pedometer.sql.entity.CalorieEntity;
48   -import com.cnlive.moudle.pedometer.sql.entity.CollUserStepEntity;
49   -import com.cnlive.moudle.pedometer.utils.ServiceUtils;
50 34 import com.example.moudle_pedometer.R;
51 35  
52 36 import org.greenrobot.eventbus.EventBus;
... ... @@ -54,7 +38,6 @@ import org.greenrobot.eventbus.Subscribe;
54 38 import org.greenrobot.eventbus.ThreadMode;
55 39  
56 40 import java.text.SimpleDateFormat;
57   -import java.util.Calendar;
58 41 import java.util.Date;
59 42  
60 43 /**
... ... @@ -174,7 +157,7 @@ public class CalorieService extends Service implements SensorEventListener {
174 157 private void showStartForegroundNotification() {
175 158 if (null == remoteViews) {
176 159 remoteViews = new RemoteViews(getPackageName(), R.layout.custom_step_notification);
177   - remoteViews.setImageViewResource(R.id.iv_icon, R.drawable.ic_icon);
  160 + remoteViews.setImageViewResource(R.id.iv_icon, R.drawable.pedometer_ic_icon);
178 161 }
179 162 NotificationChannel channel = null;
180 163 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/presenter/CollRunningMapFragmentPresenter.java
  View file @323d386
1 1 package com.cnlive.moudle.collectionTrace.frame.presenter;
2 2  
3 3 import android.content.Context;
4   -import android.os.Handler;
5 4 import android.util.Log;
6 5 import android.widget.Toast;
7 6  
8   -import com.baidu.mapapi.map.Overlay;
9 7 import com.baidu.mapapi.model.LatLng;
10   -import com.baidu.mapapi.utils.DistanceUtil;
11   -import com.baidu.trace.api.entity.AroundSearchResponse;
12   -import com.baidu.trace.api.entity.BoundSearchResponse;
13   -import com.baidu.trace.api.entity.DistrictSearchResponse;
14   -import com.baidu.trace.api.entity.EntityListResponse;
15 8 import com.baidu.trace.api.entity.LocRequest;
16   -import com.baidu.trace.api.entity.OnEntityListener;
17   -import com.baidu.trace.api.entity.PolygonSearchResponse;
18   -import com.baidu.trace.api.entity.SearchResponse;
19 9 import com.baidu.trace.api.fence.AddMonitoredPersonResponse;
20 10 import com.baidu.trace.api.fence.CreateFenceRequest;
21 11 import com.baidu.trace.api.fence.CreateFenceResponse;
22 12 import com.baidu.trace.api.fence.DeleteFenceResponse;
23 13 import com.baidu.trace.api.fence.DeleteMonitoredPersonResponse;
24   -import com.baidu.trace.api.fence.FenceListRequest;
25 14 import com.baidu.trace.api.fence.FenceListResponse;
26 15 import com.baidu.trace.api.fence.HistoryAlarmResponse;
27 16 import com.baidu.trace.api.fence.ListMonitoredPersonResponse;
28 17 import com.baidu.trace.api.fence.MonitoredStatus;
29 18 import com.baidu.trace.api.fence.MonitoredStatusByLocationResponse;
30 19 import com.baidu.trace.api.fence.MonitoredStatusInfo;
31   -import com.baidu.trace.api.fence.MonitoredStatusRequest;
32 20 import com.baidu.trace.api.fence.MonitoredStatusResponse;
33 21 import com.baidu.trace.api.fence.OnFenceListener;
34 22 import com.baidu.trace.api.fence.UpdateFenceResponse;
... ... @@ -43,7 +31,6 @@ import com.baidu.trace.model.CoordType;
43 31 import com.baidu.trace.model.ProcessOption;
44 32 import com.baidu.trace.model.SortType;
45 33 import com.baidu.trace.model.StatusCodes;
46   -import com.baidu.trace.model.TraceLocation;
47 34 import com.baidu.trace.model.TransportMode;
48 35 import com.cnlive.moudle.collectionTrace.frame.view.CollRunningMapFragmentView;
49 36 import com.cnlive.moudle.pedometer.model.Constant;
... ... @@ -243,7 +230,7 @@ public class CollRunningMapFragmentPresenter extends MvpBasePresenter<CollRunnin
243 230 // }
244 231 // Log.e(TAG, "结果: " + result);
245 232 // Log.e(TAG, "onHistoryTrackCallback: 轨迹点:" + trackPoints.size() + ",详情" + GsonUtil.GsonString(trackPoints));
246   - MyMapUtil.drawHistoryTrack(context, getView().baiduMap, trackPoints, SortType.asc, R.color.red, R.drawable.icon_start, R.drawable.icon_end);
  233 + MyMapUtil.drawHistoryTrack(context, getView().baiduMap, trackPoints, SortType.asc, R.color.red, R.drawable.pedometer_icon_start, R.drawable.pedometer_icon_end);
247 234 // MyMapUtil.drawMapLineRoutePoint(context, getView().baiduMap, MyMapUtil.optimizePoints(routePoints), R.color.red);
248 235 }
249 236 }
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/CollRunMainFragmentView.java
  View file @323d386
... ... @@ -452,7 +452,7 @@ public class CollRunMainFragmentView implements MvpView {
452 452 if (fragment.binding.ivGps.getTag() == null || !fragment.binding.ivGps.getTag().toString().equals("rt_training_gps_0")) {
453 453 fragment.binding.ivGps.setTag("rt_training_gps_0");
454 454 //设置图标
455   - fragment.binding.ivGps.setBackground(getContext().getResources().getDrawable(R.drawable.rt_training_gps_0));
  455 + fragment.binding.ivGps.setBackground(getContext().getResources().getDrawable(R.drawable.pedometer_rt_training_gps_0));
456 456 }
457 457  
458 458  
... ... @@ -470,7 +470,7 @@ public class CollRunMainFragmentView implements MvpView {
470 470 if (fragment.binding.ivGps.getTag() == null || !fragment.binding.ivGps.getTag().toString().equals("GPS_ACCURACY_BAD")) {
471 471 fragment.binding.ivGps.setTag("GPS_ACCURACY_BAD");
472 472 //设置图标
473   - fragment.binding.ivGps.setBackground(getContext().getResources().getDrawable(R.drawable.rt_training_gps_1));
  473 + fragment.binding.ivGps.setBackground(getContext().getResources().getDrawable(R.drawable.pedometer_rt_training_gps_1));
474 474 }
475 475 }
476 476 //GPS 质量判断中等
... ... @@ -481,7 +481,7 @@ public class CollRunMainFragmentView implements MvpView {
481 481 if (fragment.binding.ivGps.getTag() == null || !fragment.binding.ivGps.getTag().toString().equals("GPS_ACCURACY_MID")) {
482 482 fragment.binding.ivGps.setTag("GPS_ACCURACY_MID");
483 483 //设置图标
484   - fragment.binding.ivGps.setBackground(getContext().getResources().getDrawable(R.drawable.rt_training_gps_2));
  484 + fragment.binding.ivGps.setBackground(getContext().getResources().getDrawable(R.drawable.pedometer_rt_training_gps_2));
485 485 }
486 486 }//GPS 质量判断好
487 487 else if (location.getGpsAccuracyStatus() == BDLocation.GPS_ACCURACY_GOOD) {
... ... @@ -491,7 +491,7 @@ public class CollRunMainFragmentView implements MvpView {
491 491 if (fragment.binding.ivGps.getTag() == null || !fragment.binding.ivGps.getTag().toString().equals("GPS_ACCURACY_GOOD")) {
492 492 fragment.binding.ivGps.setTag("GPS_ACCURACY_GOOD");
493 493 //设置图标
494   - fragment.binding.ivGps.setBackground(getContext().getResources().getDrawable(R.drawable.rt_training_gps_3));
  494 + fragment.binding.ivGps.setBackground(getContext().getResources().getDrawable(R.drawable.pedometer_rt_training_gps_3));
495 495 }
496 496 }
497 497  
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/CollRunRaceDetailFragmentView.java
  View file @323d386
... ... @@ -9,7 +9,6 @@ import android.hardware.SensorEventListener;
9 9 import android.hardware.SensorManager;
10 10 import android.os.Build;
11 11 import android.text.TextUtils;
12   -import android.util.Log;
13 12 import android.view.View;
14 13 import android.view.ViewGroup;
15 14 import android.view.ViewTreeObserver;
... ... @@ -293,7 +292,7 @@ public class CollRunRaceDetailFragmentView implements MvpView, SensorEventListen
293 292 if (null != resultPoints && resultPoints.size() > 1) {
294 293 queryResultPoints.clear();
295 294 queryResultPoints.addAll(resultPoints);
296   - MyMapUtil.drawHistoryTrack(getContext(), baiduMap, resultPoints, SortType.asc, R.color.green_round, R.drawable.icon_start, R.drawable.icon_end);
  295 + MyMapUtil.drawHistoryTrack(getContext(), baiduMap, resultPoints, SortType.asc, R.color.green_round, R.drawable.pedometer_icon_start, R.drawable.pedometer_icon_end);
297 296 initZoom = MyMapUtil.setMapAutoZoom(baiduMap, resultPoints, DEFAULT_MAP_AUTO_ZOOM);
298 297 }
299 298 }
... ... @@ -398,7 +397,7 @@ public class CollRunRaceDetailFragmentView implements MvpView, SensorEventListen
398 397 //设置定位模式, 默认为 LocationMode.NORMAL 普通态
399 398 mCurrentMode = MyLocationConfiguration.LocationMode.NORMAL;
400 399 // 设置定位图标修改为自定义marker
401   - Bitmap pointBitmap = BitmapUtil.getBitmapFromDp(getContext(), BitmapFactory.decodeResource(getContext().getResources(), R.drawable.rt_ic_location), 50, 50);
  400 + Bitmap pointBitmap = BitmapUtil.getBitmapFromDp(getContext(), BitmapFactory.decodeResource(getContext().getResources(), R.drawable.pedometer_rt_ic_location), 50, 50);
402 401 mCurrentMarker = BitmapDescriptorFactory.fromBitmap(pointBitmap);
403 402 //设置定位蓝点精度圆圈的填充颜色为透明色
404 403 accuracyCircleFillColor = getContext().getResources().getColor(R.color.transparent);
... ... @@ -520,7 +519,7 @@ public class CollRunRaceDetailFragmentView implements MvpView, SensorEventListen
520 519 //在地图上绘制起点
521 520 if (index == 0) {
522 521 //显示当前位置图标
523   - Bitmap pointBitmap = BitmapUtil.getBitmapFromDp(getContext(), BitmapFactory.decodeResource(getContext().getResources(), R.drawable.icon_start), 30, 30);
  522 + Bitmap pointBitmap = BitmapUtil.getBitmapFromDp(getContext(), BitmapFactory.decodeResource(getContext().getResources(), R.drawable.pedometer_icon_start), 30, 30);
524 523 startMark = new MarkerOptions()
525 524 .position(StartPoint)
526 525 .icon(BitmapDescriptorFactory.fromBitmap(pointBitmap));
... ... @@ -528,7 +527,7 @@ public class CollRunRaceDetailFragmentView implements MvpView, SensorEventListen
528 527 baiduMap.addOverlay(startMark);
529 528 } else if (index == listSize - 1) {
530 529 //显示当前位置图标
531   - Bitmap pointBitmap = BitmapUtil.getBitmapFromDp(getContext(), BitmapFactory.decodeResource(getContext().getResources(), R.drawable.icon_end), 30, 30);
  530 + Bitmap pointBitmap = BitmapUtil.getBitmapFromDp(getContext(), BitmapFactory.decodeResource(getContext().getResources(), R.drawable.pedometer_icon_end), 30, 30);
532 531 endMark = new MarkerOptions()
533 532 .position(points.get(points.size() - 1))
534 533 .icon(BitmapDescriptorFactory.fromBitmap(pointBitmap))
... ... @@ -648,7 +647,7 @@ public class CollRunRaceDetailFragmentView implements MvpView, SensorEventListen
648 647 LatLng ll = new LatLng(Latitude, Longitude);
649 648 //设置坐标
650 649 //显示当前位置图标
651   - Bitmap pointBitmap = BitmapUtil.getBitmapFromDp(fragment.getActivity(), BitmapFactory.decodeResource(fragment.getActivity().getResources(), R.drawable.run_map_icon_end), 22, 32);
  650 + Bitmap pointBitmap = BitmapUtil.getBitmapFromDp(fragment.getActivity(), BitmapFactory.decodeResource(fragment.getActivity().getResources(), R.drawable.pedometer_run_map_icon_end), 22, 32);
652 651 currentMark = new MarkerOptions().position(ll).icon(BitmapDescriptorFactory.fromBitmap(pointBitmap));
653 652 baiduMap.addOverlay(currentMark);
654 653 MapStatus.Builder builder = new MapStatus.Builder();
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/CollRunningFinishFragmentView.java
  View file @323d386
... ... @@ -8,7 +8,6 @@ import android.text.TextUtils;
8 8 import android.util.Log;
9 9 import android.view.MotionEvent;
10 10 import android.view.View;
11   -import android.widget.TextView;
12 11  
13 12 import com.baidu.mapapi.map.BaiduMap;
14 13 import com.baidu.mapapi.map.MapView;
... ... @@ -28,7 +27,6 @@ import com.baidu.trace.api.fence.MonitoredStatusResponse;
28 27 import com.baidu.trace.api.fence.OnFenceListener;
29 28 import com.baidu.trace.api.fence.UpdateFenceResponse;
30 29 import com.baidu.trace.model.SortType;
31   -import com.bumptech.glide.Glide;
32 30 import com.cnlive.libs.base.logic.Event;
33 31 import com.cnlive.libs.base.logic.callback.FailureCallback;
34 32 import com.cnlive.libs.base.logic.callback.SuccessCallback;
... ... @@ -107,7 +105,7 @@ public class CollRunningFinishFragmentView implements MvpView, OnFenceListener {
107 105 LatLng markLatLng = new LatLng(point.getLatitude(), point.getLongitude());
108 106 if (null != markLatLng) {
109 107 //将点位显示到地图上
110   - Overlay overlay = MyMapUtil.setMapMarker(getContext(), baiduMap, markLatLng, R.drawable.icon_map_import);
  108 + Overlay overlay = MyMapUtil.setMapMarker(getContext(), baiduMap, markLatLng, R.drawable.pedometer_icon_map_import);
111 109 if (null != overlay) {
112 110 allMapOverlays.add(overlay);
113 111 }
... ... @@ -327,7 +325,7 @@ public class CollRunningFinishFragmentView implements MvpView, OnFenceListener {
327 325 if (null != resultPoints) {
328 326 if (resultPoints.size() > 1) {
329 327 //绘制轨迹
330   - MyMapUtil.drawHistoryTrack(getContext(), baiduMap, resultPoints, SortType.asc, R.color.green_round, R.drawable.icon_start, R.drawable.icon_end);
  328 + MyMapUtil.drawHistoryTrack(getContext(), baiduMap, resultPoints, SortType.asc, R.color.green_round, R.drawable.pedometer_icon_start, R.drawable.pedometer_icon_end);
331 329 MyMapUtil.setMapAutoZoom(baiduMap, resultPoints, -1.5f);
332 330 }
333 331  
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/CollRunningMapFragmentView.java
  View file @323d386
... ... @@ -26,7 +26,6 @@ import com.baidu.mapapi.map.BitmapDescriptorFactory;
26 26 import com.baidu.mapapi.map.MapStatus;
27 27 import com.baidu.mapapi.map.MapStatusUpdateFactory;
28 28 import com.baidu.mapapi.map.MapView;
29   -import com.baidu.mapapi.map.MarkerOptions;
30 29 import com.baidu.mapapi.map.MyLocationConfiguration;
31 30 import com.baidu.mapapi.map.MyLocationData;
32 31 import com.baidu.mapapi.map.Overlay;
... ... @@ -41,7 +40,6 @@ import com.cnlive.moudle.collectionTrace.service.CollStepService;
41 40 import com.cnlive.moudle.collectionTrace.ui.activity.CollRunningFinishActivity;
42 41 import com.cnlive.moudle.collectionTrace.ui.fragment.CollRunningMapFragment;
43 42 import com.cnlive.moudle.collectionTrace.commonInfo.CollCommonInfo;
44   -import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
45 43 import com.cnlive.moudle.pedometer.model.Constant;
46 44 import com.cnlive.moudle.pedometer.model.MessageEvent;
47 45 import com.cnlive.moudle.pedometer.net.bean.RunRaceDetailInfo;
... ... @@ -164,7 +162,7 @@ public class CollRunningMapFragmentView implements MvpView, SensorEventListener
164 162 public void success(List<LatLng> resultPoints) {
165 163 if (null != resultPoints && resultPoints.size() > 1) {
166 164 //绘制历史轨迹
167   - MyMapUtil.drawHistoryTrack(getContext(), baiduMap, resultPoints, SortType.asc, R.color.green_round, R.drawable.icon_start, 0);
  165 + MyMapUtil.drawHistoryTrack(getContext(), baiduMap, resultPoints, SortType.asc, R.color.green_round, R.drawable.pedometer_icon_start, 0);
168 166 //将最后一个点添加到用户走的线中
169 167 currentWalkPoints = new ArrayList<>();
170 168 currentWalkPoints.add(resultPoints.get(resultPoints.size() - 1));
... ... @@ -181,7 +179,7 @@ public class CollRunningMapFragmentView implements MvpView, SensorEventListener
181 179 //把起点添加到用户走的实时轨迹中
182 180 currentWalkPoints = new ArrayList<>();
183 181 currentWalkPoints.add(startLatLng);
184   - List<Overlay> resultOverlays = MyMapUtil.setStartMarker(getContext(), baiduMap, startLatLng, R.drawable.icon_start);
  182 + List<Overlay> resultOverlays = MyMapUtil.setStartMarker(getContext(), baiduMap, startLatLng, R.drawable.pedometer_icon_start);
185 183 if (null != resultOverlays) {
186 184 this.allMapOverlays.addAll(resultOverlays);
187 185 }
... ... @@ -203,7 +201,7 @@ public class CollRunningMapFragmentView implements MvpView, SensorEventListener
203 201 LatLng markLatLng = new LatLng(point.getLatitude(), point.getLongitude());
204 202 if (null != markLatLng) {
205 203 //将点位显示到地图上
206   - Overlay overlay = MyMapUtil.setMapMarker(getContext(), baiduMap, markLatLng, R.drawable.icon_map_import);
  204 + Overlay overlay = MyMapUtil.setMapMarker(getContext(), baiduMap, markLatLng, R.drawable.pedometer_icon_map_import);
207 205 if (null != overlay) {
208 206 allMapOverlays.add(overlay);
209 207 }
... ... @@ -382,7 +380,7 @@ public class CollRunningMapFragmentView implements MvpView, SensorEventListener
382 380 collectPoint.setPointName(currentAddress);
383 381 CollStepUtil.setCollImportPoints(getContext(), CollCommonInfo.getUserId(getContext()), collectPoint);
384 382 //将点位显示到地图上
385   - Overlay overlay = MyMapUtil.setMapMarker(getContext(), baiduMap, currentImportLatLng, R.drawable.icon_map_import);
  383 + Overlay overlay = MyMapUtil.setMapMarker(getContext(), baiduMap, currentImportLatLng, R.drawable.pedometer_icon_map_import);
386 384 if (null != overlay) {
387 385 allMapOverlays.add(overlay);
388 386 }
... ... @@ -515,7 +513,7 @@ public class CollRunningMapFragmentView implements MvpView, SensorEventListener
515 513 //设置定位模式, 默认为 LocationMode.NORMAL 普通态
516 514 mCurrentMode = MyLocationConfiguration.LocationMode.NORMAL;
517 515 // 设置定位图标修改为自定义marker
518   - Bitmap pointBitmap = BitmapUtil.getBitmapFromDp(getContext(), BitmapFactory.decodeResource(getContext().getResources(), R.drawable.rt_ic_location), 40, 40);
  516 + Bitmap pointBitmap = BitmapUtil.getBitmapFromDp(getContext(), BitmapFactory.decodeResource(getContext().getResources(), R.drawable.pedometer_rt_ic_location), 40, 40);
519 517 mCurrentMarker = BitmapDescriptorFactory.fromBitmap(pointBitmap);
520 518 //设置定位蓝点精度圆圈的填充颜色为透明色
521 519 accuracyCircleFillColor = getContext().getResources().getColor(R.color.transparent);
... ... @@ -619,7 +617,7 @@ public class CollRunningMapFragmentView implements MvpView, SensorEventListener
619 617 //设置图标
620 618 if (fragment.binding.ivGpsState.getTag() == null || !"GPS_ACCURACY_UNKNOWN".equals(fragment.binding.ivGpsState.getTag().toString())) {
621 619 fragment.binding.ivGpsState.setTag("GPS_ACCURACY_UNKNOWN");
622   - fragment.binding.ivGpsState.setBackground(getContext().getResources().getDrawable(R.drawable.rt_training_gps_0));
  620 + fragment.binding.ivGpsState.setBackground(getContext().getResources().getDrawable(R.drawable.pedometer_rt_training_gps_0));
623 621 }
624 622 }
625 623 //GPS 质量判断差
... ... @@ -633,7 +631,7 @@ public class CollRunningMapFragmentView implements MvpView, SensorEventListener
633 631 //设置图标
634 632 if (fragment.binding.ivGpsState.getTag() == null || !"GPS_ACCURACY_BAD".equals(fragment.binding.ivGpsState.getTag().toString())) {
635 633 fragment.binding.ivGpsState.setTag("GPS_ACCURACY_BAD");
636   - fragment.binding.ivGpsState.setBackground(getContext().getResources().getDrawable(R.drawable.rt_training_gps_1));
  634 + fragment.binding.ivGpsState.setBackground(getContext().getResources().getDrawable(R.drawable.pedometer_rt_training_gps_1));
637 635 }
638 636 }
639 637 //GPS 质量判断中等
... ... @@ -644,7 +642,7 @@ public class CollRunningMapFragmentView implements MvpView, SensorEventListener
644 642 //设置图标
645 643 if (fragment.binding.ivGpsState.getTag() == null || !"GPS_ACCURACY_MID".equals(fragment.binding.ivGpsState.getTag().toString())) {
646 644 fragment.binding.ivGpsState.setTag("GPS_ACCURACY_MID");
647   - fragment.binding.ivGpsState.setBackground(getContext().getResources().getDrawable(R.drawable.rt_training_gps_2));
  645 + fragment.binding.ivGpsState.setBackground(getContext().getResources().getDrawable(R.drawable.pedometer_rt_training_gps_2));
648 646 }
649 647 }//GPS 质量判断好
650 648 else if (location.getGpsAccuracyStatus() == BDLocation.GPS_ACCURACY_GOOD) {
... ... @@ -654,7 +652,7 @@ public class CollRunningMapFragmentView implements MvpView, SensorEventListener
654 652 //设置图标
655 653 if (fragment.binding.ivGpsState.getTag() == null || !"GPS_ACCURACY_GOOD".equals(fragment.binding.ivGpsState.getTag().toString())) {
656 654 fragment.binding.ivGpsState.setTag("GPS_ACCURACY_GOOD");
657   - fragment.binding.ivGpsState.setBackground(getContext().getResources().getDrawable(R.drawable.rt_training_gps_3));
  655 + fragment.binding.ivGpsState.setBackground(getContext().getResources().getDrawable(R.drawable.pedometer_rt_training_gps_3));
658 656 }
659 657 }
660 658 //过滤定位精度
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/CollTraceListDetailFragmentView.java
  View file @323d386
1 1 package com.cnlive.moudle.collectionTrace.frame.view;
2 2  
3   -import android.app.Activity;
4 3 import android.content.Context;
5   -import android.graphics.Bitmap;
6   -import android.graphics.BitmapFactory;
7 4 import android.graphics.Point;
8 5 import android.os.Handler;
9 6 import android.support.v7.widget.LinearLayoutManager;
... ... @@ -26,10 +23,7 @@ import com.baidu.trace.api.fence.CreateFenceResponse;
26 23 import com.baidu.trace.api.fence.DeleteFenceRequest;
27 24 import com.baidu.trace.api.fence.DeleteFenceResponse;
28 25 import com.baidu.trace.api.fence.DeleteMonitoredPersonResponse;
29   -import com.baidu.trace.api.fence.FenceInfo;
30   -import com.baidu.trace.api.fence.FenceListRequest;
31 26 import com.baidu.trace.api.fence.FenceListResponse;
32   -import com.baidu.trace.api.fence.FenceShape;
33 27 import com.baidu.trace.api.fence.HistoryAlarmResponse;
34 28 import com.baidu.trace.api.fence.ListMonitoredPersonResponse;
35 29 import com.baidu.trace.api.fence.MonitoredStatusByLocationResponse;
... ... @@ -38,20 +32,15 @@ import com.baidu.trace.api.fence.OnFenceListener;
38 32 import com.baidu.trace.api.fence.UpdateFenceResponse;
39 33 import com.baidu.trace.model.CoordType;
40 34 import com.baidu.trace.model.SortType;
41   -import com.bumptech.glide.Glide;
42 35 import com.cnlive.libs.base.util.AlertUtil;
43 36 import com.cnlive.moudle.collectionTrace.frame.presenter.RaceNameListPresenter;
44 37 import com.cnlive.moudle.collectionTrace.model.CollectPoint;
45 38 import com.cnlive.moudle.collectionTrace.model.RaceNameListInfo;
46 39 import com.cnlive.moudle.collectionTrace.ui.adapter.CollFinishDetaiAdapter;
47   -import com.cnlive.moudle.collectionTrace.ui.fragment.CollRunRaceDetailFragment;
48 40 import com.cnlive.moudle.collectionTrace.ui.fragment.CollTraceListDetailFragment;
49   -import com.cnlive.moudle.collectionTrace.utils.CollStepUtil;
50   -import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
51 41 import com.cnlive.moudle.pedometer.model.Constant;
52 42 import com.cnlive.moudle.pedometer.model.MessageEvent;
53 43 import com.cnlive.moudle.pedometer.ui.widget.SelectDialog;
54   -import com.cnlive.moudle.pedometer.utils.BitmapUtil;
55 44 import com.cnlive.moudle.pedometer.utils.GsonUtil;
56 45 import com.cnlive.moudle.pedometer.utils.MyMapUtil;
57 46 import com.cnlive.moudle.pedometer.utils.NetUtil;
... ... @@ -61,7 +50,6 @@ import com.cnlive.moudle.pedometer.utils.TimeUtil;
61 50 import com.cnlive.strike.application.GlideApp;
62 51 import com.example.moudle_pedometer.R;
63 52 import com.hannesdorfmann.mosby3.mvp.MvpView;
64   -import com.sothree.slidinguppanel.SlidingUpPanelLayout;
65 53  
66 54 import org.greenrobot.eventbus.EventBus;
67 55  
... ... @@ -288,7 +276,7 @@ public class CollTraceListDetailFragmentView implements MvpView, OnFenceListener
288 276 return;
289 277 }
290 278 if (resultPoints.size() > 1) {
291   - MyMapUtil.drawHistoryTrack(getContext(), baiduMap, resultPoints, SortType.asc, R.color.green_round, R.drawable.icon_start, R.drawable.icon_end);
  279 + MyMapUtil.drawHistoryTrack(getContext(), baiduMap, resultPoints, SortType.asc, R.color.green_round, R.drawable.pedometer_icon_start, R.drawable.pedometer_icon_end);
292 280 MyMapUtil.setMapAutoZoom(baiduMap, resultPoints, -0.5f);
293 281  
294 282  
... ... @@ -297,7 +285,7 @@ public class CollTraceListDetailFragmentView implements MvpView, OnFenceListener
297 285 //开始在地图上绘制打点信息
298 286 for (int i = 0; i < finalResultCollectPoints.size(); i++) {
299 287 LatLng latLng = new LatLng(finalResultCollectPoints.get(i).getLatitude(), finalResultCollectPoints.get(i).getLongitude());
300   - MyMapUtil.setMapMarker(getContext(), baiduMap, latLng, R.drawable.icon_map_import);
  288 + MyMapUtil.setMapMarker(getContext(), baiduMap, latLng, R.drawable.pedometer_icon_map_import);
301 289 }
302 290  
303 291 }
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/RaceListView.java
  View file @323d386
... ... @@ -11,7 +11,6 @@ import com.cnlive.moudle.pedometer.net.bean.BaseInfo;
11 11 import com.cnlive.moudle.pedometer.net.bean.RunLineInfo;
12 12 import com.example.moudle_pedometer.R;
13 13 import com.hannesdorfmann.mosby3.mvp.MvpView;
14   -import com.qmuiteam.qmui.widget.dialog.QMUITipDialog;
15 14 import com.scwang.smartrefresh.layout.footer.ClassicsFooter;
16 15 import com.scwang.smartrefresh.layout.header.ClassicsHeader;
17 16  
... ... @@ -32,7 +31,7 @@ public class RaceListView implements MvpView {
32 31 }
33 32  
34 33 public void initView(){
35   - fragment.binding.topbar.addLeftImageButton(R.drawable.top_back_black, R.id.fragment_back).setOnClickListener(v -> {
  34 + fragment.binding.topbar.addLeftImageButton(R.drawable.pedometer_top_back_black, R.id.fragment_back).setOnClickListener(v -> {
36 35 fragment.getActivity().finish();
37 36 });
38 37 fragment.binding.topbar.setTitle("赛事列表");
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/StartTraceFragmentView.java
  View file @323d386
... ... @@ -9,7 +9,6 @@ import android.hardware.SensorEvent;
9 9 import android.hardware.SensorEventListener;
10 10 import android.hardware.SensorManager;
11 11 import android.os.Build;
12   -import android.support.v4.content.ContextCompat;
13 12 import android.text.TextUtils;
14 13 import android.util.Log;
15 14 import android.view.View;
... ... @@ -29,16 +28,13 @@ import com.baidu.mapapi.map.MyLocationConfiguration;
29 28 import com.baidu.mapapi.map.MyLocationData;
30 29 import com.baidu.mapapi.map.UiSettings;
31 30 import com.baidu.mapapi.model.LatLng;
32   -import com.cnlive.libs.base.util.AlertUtil;
33 31 import com.cnlive.moudle.collectionTrace.service.CollKeepLiveService;
34 32 import com.cnlive.moudle.collectionTrace.service.CollStepService;
35   -import com.cnlive.moudle.collectionTrace.ui.activity.CollRunRaceDetailActivity;
36 33 import com.cnlive.moudle.collectionTrace.ui.activity.CollRunningFinishActivity;
37 34 import com.cnlive.moudle.collectionTrace.ui.activity.CollRunningMapActivity;
38 35 import com.cnlive.moudle.collectionTrace.ui.fragment.StartTraceFragment;
39 36 import com.cnlive.moudle.collectionTrace.commonInfo.CollCommonInfo;
40 37 import com.cnlive.moudle.collectionTrace.utils.CollStepUtil;
41   -import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
42 38 import com.cnlive.moudle.pedometer.model.Constant;
43 39 import com.cnlive.moudle.pedometer.net.bean.RunRaceDetailInfo;
44 40 import com.cnlive.moudle.pedometer.sql.entity.CollUserStepEntity;
... ... @@ -46,7 +42,6 @@ import com.cnlive.moudle.pedometer.ui.widget.SelectDialog;
46 42 import com.cnlive.moudle.pedometer.utils.BitmapUtil;
47 43 import com.cnlive.moudle.pedometer.utils.GsonUtil;
48 44 import com.cnlive.moudle.pedometer.utils.MyMapUtil;
49   -import com.cnlive.moudle.pedometer.utils.NetUtil;
50 45 import com.cnlive.moudle.pedometer.utils.QMUITipDialogUtil;
51 46 import com.cnlive.moudle.pedometer.utils.ServiceUtils;
52 47 import com.cnlive.moudle.pedometer.utils.TimeUtil;
... ... @@ -322,7 +317,7 @@ public class StartTraceFragmentView implements MvpView, SensorEventListener {
322 317 //设置定位模式, 默认为 LocationMode.NORMAL 普通态
323 318 mCurrentMode = MyLocationConfiguration.LocationMode.NORMAL;
324 319 // 设置定位图标修改为自定义marker
325   - Bitmap pointBitmap = BitmapUtil.getBitmapFromDp(getContext(), BitmapFactory.decodeResource(getContext().getResources(), R.drawable.rt_ic_location), 50, 50);
  320 + Bitmap pointBitmap = BitmapUtil.getBitmapFromDp(getContext(), BitmapFactory.decodeResource(getContext().getResources(), R.drawable.pedometer_rt_ic_location), 50, 50);
326 321 mCurrentMarker = BitmapDescriptorFactory.fromBitmap(pointBitmap);
327 322 //设置定位蓝点精度圆圈的填充颜色为透明色
328 323 accuracyCircleFillColor = getContext().getResources().getColor(R.color.transparent);
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/adapter/CollFinishDetaiAdapter.java
  View file @323d386
... ... @@ -42,19 +42,19 @@ public class CollFinishDetaiAdapter extends RecyclerView.Adapter&lt;CollFinishDetai
42 42 }
43 43 if (0 == i) {
44 44 //起点
45   - myViewHolder.view_circle.setBackground(context.getResources().getDrawable(R.drawable.shape_circle_green));
  45 + myViewHolder.view_circle.setBackground(context.getResources().getDrawable(R.drawable.pedometer_shape_circle_green));
46 46 myViewHolder.tv_point_type_tip.setText(context.getResources().getString(R.string.layout_street_start_point));
47 47 myViewHolder.view_line.setVisibility(View.VISIBLE);
48 48  
49 49 } else if (list.size() - 1 == i) {
50 50 //终点
51   - myViewHolder.view_circle.setBackground(context.getResources().getDrawable(R.drawable.shape_circle_red));
  51 + myViewHolder.view_circle.setBackground(context.getResources().getDrawable(R.drawable.pedometer_shape_circle_red));
52 52 myViewHolder.tv_point_type_tip.setText(context.getResources().getString(R.string.layout_street_end_point));
53 53 myViewHolder.view_line.setVisibility(View.GONE);
54 54 } else {
55 55 myViewHolder.view_line.setVisibility(View.VISIBLE);
56 56 //打点
57   - myViewHolder.view_circle.setBackground(context.getResources().getDrawable(R.drawable.shape_circle_gray));
  57 + myViewHolder.view_circle.setBackground(context.getResources().getDrawable(R.drawable.pedometer_shape_circle_gray));
58 58 // myViewHolder.tv_point_type_tip.setText(context.getResources().getString(R.string.layout_coll_take_point_text));
59 59 if (i > 0) {
60 60 myViewHolder.tv_point_type_tip.setText("(打点" + i + ")");
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/adapter/RaceNameListAdapter.java
  View file @323d386
... ... @@ -10,7 +10,6 @@ import android.widget.ImageView;
10 10 import android.widget.LinearLayout;
11 11 import android.widget.TextView;
12 12  
13   -import com.bumptech.glide.Glide;
14 13 import com.cnlive.moudle.collectionTrace.model.RaceNameListInfo;
15 14 import com.cnlive.moudle.pedometer.utils.TimeUtil;
16 15 import com.example.moudle_pedometer.R;
... ... @@ -71,15 +70,15 @@ public class RaceNameListAdapter extends RecyclerView.Adapter&lt;RaceNameListAdapte
71 70 if(list.get(i).getIsEnable() == 0){
72 71 myViewHolder.has_path.setText("已绑定轨迹");
73 72 myViewHolder.has_path.setTextColor(context.getResources().getColor(R.color.text_gray99));
74   - myViewHolder.has_path.setBackground(context.getResources().getDrawable(R.drawable.gray_raduis_bg));
  73 + myViewHolder.has_path.setBackground(context.getResources().getDrawable(R.drawable.pedometer_gray_raduis_bg));
75 74 myViewHolder.delect_path.setTextColor(context.getResources().getColor(R.color.text_gray99));
76   - myViewHolder.delect_path.setBackground(context.getResources().getDrawable(R.drawable.gray_raduis_bg));
  75 + myViewHolder.delect_path.setBackground(context.getResources().getDrawable(R.drawable.pedometer_gray_raduis_bg));
77 76 }else {
78 77 myViewHolder.has_path.setText("绑定轨迹");
79 78 myViewHolder.has_path.setTextColor(context.getResources().getColor(R.color.green_tx));
80   - myViewHolder.has_path.setBackground(context.getResources().getDrawable(R.drawable.green_raduis_bg));
  79 + myViewHolder.has_path.setBackground(context.getResources().getDrawable(R.drawable.pedometer_green_raduis_bg));
81 80 myViewHolder.delect_path.setTextColor(context.getResources().getColor(R.color.green_tx));
82   - myViewHolder.delect_path.setBackground(context.getResources().getDrawable(R.drawable.green_raduis_bg));
  81 + myViewHolder.delect_path.setBackground(context.getResources().getDrawable(R.drawable.pedometer_green_raduis_bg));
83 82 }
84 83 myViewHolder.has_path.setOnClickListener(new View.OnClickListener() {
85 84 @Override
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/presenter/ALLScoreDetailFragmentPresenter.java
  View file @323d386
... ... @@ -3,21 +3,16 @@ package com.cnlive.moudle.pedometer.frame.presenter;
3 3 import android.app.Activity;
4 4 import android.graphics.Point;
5 5 import android.text.TextUtils;
6   -import android.widget.Toast;
7 6  
8 7 import com.baidu.mapapi.map.MapStatus;
9   -import com.baidu.mapapi.map.MapStatusUpdate;
10 8 import com.baidu.mapapi.map.MapStatusUpdateFactory;
11 9 import com.baidu.mapapi.model.LatLng;
12 10 import com.baidu.trace.LBSTraceClient;
13 11 import com.baidu.trace.model.SortType;
14 12 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
15 13 import com.cnlive.moudle.pedometer.frame.view.ALLScoreDetailFragmentView;
16   -import com.cnlive.moudle.pedometer.model.Constant;
17 14 import com.cnlive.moudle.pedometer.model.RunningFinishBean;
18   -import com.cnlive.moudle.pedometer.sql.entity.FailedEntity;
19 15 import com.cnlive.moudle.pedometer.ui.widget.SelectDialog;
20   -import com.cnlive.moudle.pedometer.utils.GsonUtil;
21 16 import com.cnlive.moudle.pedometer.utils.MyMapUtil;
22 17 import com.cnlive.moudle.pedometer.utils.QMUITipDialogUtil;
23 18 import com.cnlive.moudle.pedometer.utils.ScreenUtil;
... ... @@ -73,12 +68,12 @@ public class ALLScoreDetailFragmentPresenter extends MvpBasePresenter&lt;ALLScoreDe
73 68 if (resultPoints.size() > 1) {
74 69 //用户暂停了
75 70 if (runningFinishBean.isPause()) {
76   - MyMapUtil.drawHistoryTrack(context, getView().baiduMap, resultPoints, SortType.asc, R.color.red, R.drawable.icon_start, 0);
  71 + MyMapUtil.drawHistoryTrack(context, getView().baiduMap, resultPoints, SortType.asc, R.color.red, R.drawable.pedometer_icon_start, 0);
77 72 allResultList.addAll(resultPoints);
78 73 }
79 74 //用户没有暂停
80 75 else {
81   - MyMapUtil.drawHistoryTrack(context, getView().baiduMap, resultPoints, SortType.asc, R.color.red, R.drawable.icon_start, R.drawable.icon_end);
  76 + MyMapUtil.drawHistoryTrack(context, getView().baiduMap, resultPoints, SortType.asc, R.color.red, R.drawable.pedometer_icon_start, R.drawable.pedometer_icon_end);
82 77 //设置地图自动缩放
83 78 MyMapUtil.setMapAutoZoom(getView().baiduMap, resultPoints, -0.8f);
84 79 }
... ... @@ -108,7 +103,7 @@ public class ALLScoreDetailFragmentPresenter extends MvpBasePresenter&lt;ALLScoreDe
108 103 @Override
109 104 public void success(List<LatLng> resultPoints) {
110 105 if (null != resultPoints && resultPoints.size() > 1) {
111   - MyMapUtil.drawHistoryTrack(context, getView().baiduMap, resultPoints, SortType.asc, R.color.red, 0, R.drawable.icon_end);
  106 + MyMapUtil.drawHistoryTrack(context, getView().baiduMap, resultPoints, SortType.asc, R.color.red, 0, R.drawable.pedometer_icon_end);
112 107 //设置地图自动缩放
113 108 allResultList.addAll(resultPoints);
114 109 MyMapUtil.setMapAutoZoom(getView().baiduMap, allResultList, -0.8f);
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/presenter/RunningFinishFragmetPresenter.java
  View file @323d386
... ... @@ -5,7 +5,6 @@ import android.content.Context;
5 5 import android.graphics.Point;
6 6 import android.text.TextUtils;
7 7 import android.util.Log;
8   -import android.widget.Toast;
9 8  
10 9 import com.baidu.mapapi.map.MapStatus;
11 10 import com.baidu.mapapi.map.MapStatusUpdateFactory;
... ... @@ -220,7 +219,7 @@ public class RunningFinishFragmetPresenter extends MvpBasePresenter&lt;RunningFinis
220 219 QMUITipDialogUtil.dismessDialog();
221 220 //判断用户是否点击暂停按钮
222 221 if (userStepEntity.getPauseCount() == 0) {
223   - MyMapUtil.drawHistoryTrack(context, getView().baiduMap, resultPoints, SortType.asc, R.color.red, R.drawable.icon_start, R.drawable.icon_end);
  222 + MyMapUtil.drawHistoryTrack(context, getView().baiduMap, resultPoints, SortType.asc, R.color.red, R.drawable.pedometer_icon_start, R.drawable.pedometer_icon_end);
224 223 MyMapUtil.setMapAutoZoom(getView().baiduMap, resultPoints, -1.5f);
225 224 if (null != getView()) {
226 225 MapStatus.Builder builder = new MapStatus.Builder();
... ... @@ -235,7 +234,7 @@ public class RunningFinishFragmetPresenter extends MvpBasePresenter&lt;RunningFinis
235 234 checkUserIsFinish(resultPoints, userStepEntity, runningFinishBean, context);
236 235 saveRouteData(context, userStepEntity, runningFinishBean);
237 236 } else {
238   - MyMapUtil.drawHistoryTrack(context, getView().baiduMap, resultPoints, SortType.asc, R.color.red, R.drawable.icon_start, 0);
  237 + MyMapUtil.drawHistoryTrack(context, getView().baiduMap, resultPoints, SortType.asc, R.color.red, R.drawable.pedometer_icon_start, 0);
239 238 }
240 239  
241 240 //如果点击暂停
... ... @@ -250,7 +249,7 @@ public class RunningFinishFragmetPresenter extends MvpBasePresenter&lt;RunningFinis
250 249 allResults.addAll(resultPoints);
251 250 //判断用户是否完成
252 251 if (importPoints != null) {
253   - MyMapUtil.drawHistoryTrack(context, getView().baiduMap, resultPoints, SortType.asc, R.color.red, 0, R.drawable.icon_end);
  252 + MyMapUtil.drawHistoryTrack(context, getView().baiduMap, resultPoints, SortType.asc, R.color.red, 0, R.drawable.pedometer_icon_end);
254 253 MyMapUtil.setMapAutoZoom(getView().baiduMap, allResults, -2f);
255 254 if (null != getView()) {
256 255 MapStatus.Builder builder = new MapStatus.Builder();
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/presenter/RunningMapFragmentPresenter.java
  View file @323d386
... ... @@ -40,7 +40,6 @@ import com.example.moudle_pedometer.R;
40 40 import com.hannesdorfmann.mosby3.mvp.MvpBasePresenter;
41 41  
42 42 import java.util.ArrayList;
43   -import java.util.HashMap;
44 43 import java.util.List;
45 44  
46 45 public class RunningMapFragmentPresenter extends MvpBasePresenter<RunningMapFragmentView> {
... ... @@ -345,9 +344,9 @@ public class RunningMapFragmentPresenter extends MvpBasePresenter&lt;RunningMapFrag
345 344 //
346 345 // }
347 346 if (isPause) {
348   - MyMapUtil.drawRealTimeTrack(context, getView().baiduMap, resultPoints, SortType.asc, R.color.red, R.drawable.icon_start);
  347 + MyMapUtil.drawRealTimeTrack(context, getView().baiduMap, resultPoints, SortType.asc, R.color.red, R.drawable.pedometer_icon_start);
349 348 } else {
350   - MyMapUtil.drawHistoryTrack(context, getView().baiduMap, resultPoints, SortType.asc, R.color.red, R.drawable.icon_start, 0);
  349 + MyMapUtil.drawHistoryTrack(context, getView().baiduMap, resultPoints, SortType.asc, R.color.red, R.drawable.pedometer_icon_start, 0);
351 350 }
352 351 }
353 352 }
... ... @@ -374,7 +373,7 @@ public class RunningMapFragmentPresenter extends MvpBasePresenter&lt;RunningMapFrag
374 373 }
375 374 }
376 375 //开始划线
377   - MyMapUtil.drawHistoryTrack(context, getView().baiduMap, resultPoints, SortType.asc, R.color.red, 0, R.drawable.icon_end);
  376 + MyMapUtil.drawHistoryTrack(context, getView().baiduMap, resultPoints, SortType.asc, R.color.red, 0, R.drawable.pedometer_icon_end);
378 377  
379 378 }
380 379 }
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/presenter/UploadFailDetailFragmentPresenter.java
  View file @323d386
... ... @@ -4,7 +4,6 @@ import android.app.Activity;
4 4 import android.os.Handler;
5 5 import android.text.TextUtils;
6 6 import android.util.Log;
7   -import android.widget.Toast;
8 7  
9 8 import com.baidu.mapapi.model.LatLng;
10 9 import com.baidu.trace.LBSTraceClient;
... ... @@ -17,13 +16,10 @@ import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
17 16 import com.cnlive.moudle.pedometer.frame.view.UploadFailDetailFragmentView;
18 17 import com.cnlive.moudle.pedometer.model.Constant;
19 18 import com.cnlive.moudle.pedometer.model.MessageEvent;
20   -import com.cnlive.moudle.pedometer.model.RunningFinishBean;
21 19 import com.cnlive.moudle.pedometer.net.ApiServiceRunLin;
22 20 import com.cnlive.moudle.pedometer.net.SubscriptionRequest;
23 21 import com.cnlive.moudle.pedometer.net.bean.BaseInfo;
24 22 import com.cnlive.moudle.pedometer.sql.entity.FailedEntity;
25   -import com.cnlive.moudle.pedometer.sql.entity.UserStepEntity;
26   -import com.cnlive.moudle.pedometer.ui.activity.LineUpAgainActivity;
27 23 import com.cnlive.moudle.pedometer.ui.widget.SelectDialog;
28 24 import com.cnlive.moudle.pedometer.utils.GsonUtil;
29 25 import com.cnlive.moudle.pedometer.utils.MyMapUtil;
... ... @@ -91,11 +87,11 @@ public class UploadFailDetailFragmentPresenter extends MvpBasePresenter&lt;UploadFa
91 87 //划线
92 88 if (resultPoints.size() > 1) {
93 89 if (!failedEntity.getIsPause()) {
94   - MyMapUtil.drawHistoryTrack(context, getView().baiduMap, resultPoints, SortType.asc, R.color.red, R.drawable.icon_start, R.drawable.icon_end);
  90 + MyMapUtil.drawHistoryTrack(context, getView().baiduMap, resultPoints, SortType.asc, R.color.red, R.drawable.pedometer_icon_start, R.drawable.pedometer_icon_end);
95 91 //设置地图自动缩放
96 92 MyMapUtil.setMapAutoZoom(getView().baiduMap, resultPoints, -0.8f);
97 93 } else {
98   - MyMapUtil.drawHistoryTrack(context, getView().baiduMap, resultPoints, SortType.asc, R.color.red, R.drawable.icon_start, 0);
  94 + MyMapUtil.drawHistoryTrack(context, getView().baiduMap, resultPoints, SortType.asc, R.color.red, R.drawable.pedometer_icon_start, 0);
99 95  
100 96 }
101 97 }
... ... @@ -141,7 +137,7 @@ public class UploadFailDetailFragmentPresenter extends MvpBasePresenter&lt;UploadFa
141 137 public void success(List<LatLng> resultPoints) {
142 138 if (resultPoints != null && resultPoints.size() > 1) {
143 139 //开始画暂停到结束的轨迹
144   - MyMapUtil.drawHistoryTrack(context, getView().baiduMap, resultPoints, SortType.asc, R.color.red, 0, R.drawable.icon_end);
  140 + MyMapUtil.drawHistoryTrack(context, getView().baiduMap, resultPoints, SortType.asc, R.color.red, 0, R.drawable.pedometer_icon_end);
145 141 //开始合并查出来的数据
146 142 if (allResultPoints != null) {
147 143 allResultPoints.addAll(resultPoints);
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/LineUpAgainView.java
  View file @323d386
... ... @@ -15,12 +15,9 @@ import com.cnlive.moudle.pedometer.ui.widget.SelectDialog;
15 15 import com.cnlive.moudle.pedometer.utils.StepUtil;
16 16 import com.example.moudle_pedometer.R;
17 17 import com.hannesdorfmann.mosby3.mvp.MvpView;
18   -import com.scwang.smartrefresh.layout.footer.ClassicsFooter;
19   -import com.scwang.smartrefresh.layout.header.ClassicsHeader;
20 18  
21 19 import org.greenrobot.eventbus.EventBus;
22 20  
23   -import java.util.ArrayList;
24 21 import java.util.List;
25 22  
26 23  
... ... @@ -37,7 +34,7 @@ public class LineUpAgainView implements MvpView {
37 34 }
38 35  
39 36 public void initView() {
40   - fragment.binding.topbar.addLeftImageButton(R.drawable.top_back_black, R.id.fragment_back).setOnClickListener(v -> {
  37 + fragment.binding.topbar.addLeftImageButton(R.drawable.pedometer_top_back_black, R.id.fragment_back).setOnClickListener(v -> {
41 38 fragment.getActivity().finish();
42 39 });
43 40 fragment.binding.topbar.setTitle("重新上传");
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/OnGoingFragmentView.java
  View file @323d386
1 1 package com.cnlive.moudle.pedometer.frame.view;
2 2  
3 3 import android.app.Activity;
4   -import android.content.Context;
5   -import android.graphics.Bitmap;
6   -import android.graphics.BitmapFactory;
7 4 import android.os.Build;
8 5 import android.text.TextUtils;
9   -import android.util.Log;
10 6 import android.view.View;
11 7 import android.view.ViewGroup;
12   -import android.view.ViewTreeObserver;
13 8 import android.webkit.WebSettings;
14 9 import android.webkit.WebView;
15 10 import android.widget.LinearLayout;
16 11  
17 12 import com.alibaba.android.arouter.launcher.ARouter;
18   -import com.baidu.location.LocationClient;
19   -import com.baidu.location.LocationClientOption;
20 13 import com.baidu.mapapi.map.BaiduMap;
21   -import com.baidu.mapapi.map.BitmapDescriptorFactory;
22 14 import com.baidu.mapapi.map.MapView;
23   -import com.baidu.mapapi.map.MyLocationConfiguration;
24 15 import com.baidu.mapapi.map.UiSettings;
25 16 import com.baidu.mapapi.model.LatLng;
26   -import com.baidu.mapapi.search.route.RoutePlanSearch;
27   -import com.baidu.mapapi.utils.DistanceUtil;
28 17 import com.baidu.trace.LBSTraceClient;
29 18 import com.baidu.trace.model.SortType;
30 19 import com.cnlive.libs.base.application.AppConfig;
... ... @@ -33,17 +22,10 @@ import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
33 22 import com.cnlive.moudle.pedometer.model.Constant;
34 23 import com.cnlive.moudle.pedometer.net.bean.RunRaceDetailInfo;
35 24 import com.cnlive.moudle.pedometer.ui.activity.RaceRecordActivity;
36   -import com.cnlive.moudle.pedometer.ui.activity.RegistrationInfoActivity;
37 25 import com.cnlive.moudle.pedometer.ui.activity.TakePartActivity;
38 26 import com.cnlive.moudle.pedometer.ui.fragment.OnGoingFragment;
39   -import com.cnlive.moudle.pedometer.ui.widget.SelectDialog;
40   -import com.cnlive.moudle.pedometer.ui.widget.TipDialog;
41   -import com.cnlive.moudle.pedometer.utils.BitmapUtil;
42   -import com.cnlive.moudle.pedometer.utils.GsonUtil;
43 27 import com.cnlive.moudle.pedometer.utils.MyMapUtil;
44   -import com.cnlive.moudle.pedometer.utils.QMUITipDialogUtil;
45 28 import com.cnlive.moudle.pedometer.utils.ScreenUtil;
46   -import com.cnlive.moudle.pedometer.utils.StepUtil;
47 29 import com.cnlive.moudle.pedometer.utils.TimeUtil;
48 30 import com.cnlive.moudle.pedometer.utils.WebViewUtil;
49 31 import com.cnlive.strike.application.GlideApp;
... ... @@ -126,7 +108,7 @@ public class OnGoingFragmentView implements MvpView {
126 108 @Override
127 109 public void success(List<LatLng> resultPoints) {
128 110 if (resultPoints != null && resultPoints.size() > 1) {
129   - MyMapUtil.drawServerLineTrack(getContext(), baiduMap, resultPoints, SortType.asc, R.color.green_round, R.drawable.icon_start, R.drawable.icon_end);
  111 + MyMapUtil.drawServerLineTrack(getContext(), baiduMap, resultPoints, SortType.asc, R.color.green_round, R.drawable.pedometer_icon_start, R.drawable.pedometer_icon_end);
130 112 //设置地图自动缩放
131 113 MyMapUtil.setMapAutoZoom(baiduMap, resultPoints, -1.5f);
132 114  
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RaceRecorView.java
  View file @323d386
... ... @@ -5,7 +5,6 @@ import android.text.TextUtils;
5 5 import android.view.View;
6 6  
7 7 import com.cnlive.libs.base.util.AlertUtil;
8   -import com.cnlive.moudle.collectionTrace.ui.activity.CollRunningFinishActivity;
9 8 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
10 9 import com.cnlive.moudle.pedometer.model.RunningFinishBean;
11 10 import com.cnlive.moudle.pedometer.net.bean.BaseInfo;
... ... @@ -18,7 +17,6 @@ import com.cnlive.moudle.pedometer.ui.fragment.RaceRecorFragment;
18 17 import com.cnlive.moudle.pedometer.utils.TimeUtil;
19 18 import com.example.moudle_pedometer.R;
20 19 import com.hannesdorfmann.mosby3.mvp.MvpView;
21   -import com.qmuiteam.qmui.widget.dialog.QMUITipDialog;
22 20 import com.scwang.smartrefresh.layout.footer.ClassicsFooter;
23 21 import com.scwang.smartrefresh.layout.header.ClassicsHeader;
24 22  
... ... @@ -39,7 +37,7 @@ public class RaceRecorView implements MvpView {
39 37 }
40 38  
41 39 public void initView() {
42   - fragment.binding.topbar.addLeftImageButton(R.drawable.top_back_black, R.id.fragment_back).setOnClickListener(v -> {
  40 + fragment.binding.topbar.addLeftImageButton(R.drawable.pedometer_top_back_black, R.id.fragment_back).setOnClickListener(v -> {
43 41 fragment.getActivity().finish();
44 42 });
45 43 fragment.binding.topbar.setTitle("全部成绩");
... ... @@ -107,7 +105,7 @@ public class RaceRecorView implements MvpView {
107 105 }
108 106 }
109 107 });
110   - fragment.binding.topbar.addRightImageButton(R.drawable.share_img, R.id.fragment_more)
  108 + fragment.binding.topbar.addRightImageButton(R.drawable.pedometer_share_img, R.id.fragment_more)
111 109 .setOnClickListener(v -> {
112 110 //分享
113 111 ShareRecordActivity.newInstance(fragment.getActivity(), fragment.raceTitle, bestResultBean.getMileage(), bestResultBean.getStep(),
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RegistrationInfoView.java
  View file @323d386
... ... @@ -6,7 +6,6 @@ import com.bumptech.glide.Glide;
6 6 import com.bumptech.glide.load.resource.bitmap.CircleCrop;
7 7 import com.bumptech.glide.request.RequestOptions;
8 8 import com.cnlive.libs.base.util.AlertUtil;
9   -import com.cnlive.media.picker.utils.AlertDialogUtils;
10 9 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
11 10 import com.cnlive.moudle.pedometer.model.Constant;
12 11 import com.cnlive.moudle.pedometer.model.MessageEvent;
... ... @@ -43,7 +42,7 @@ public class RegistrationInfoView implements MvpView, OnDateSetListener {
43 42  
44 43 public void initView() {
45 44 userId = CommonInfo.getUserId(fragment.getActivity());
46   - fragment.binding.topbar.addLeftImageButton(R.drawable.top_back_black, R.id.fragment_back).setOnClickListener(v -> {
  45 + fragment.binding.topbar.addLeftImageButton(R.drawable.pedometer_top_back_black, R.id.fragment_back).setOnClickListener(v -> {
47 46 fragment.getActivity().finish();
48 47 });
49 48 fragment.binding.topbar.setTitle("填写报名信息");
... ... @@ -57,7 +56,7 @@ public class RegistrationInfoView implements MvpView, OnDateSetListener {
57 56  
58 57 if (CommonInfo.getUserIcon(fragment.getActivity()) != null && CommonInfo.getUserIcon(fragment.getActivity()).trim().length() > 0) {
59 58 Glide.with(fragment.getActivity()).load(CommonInfo.getUserIcon(fragment.getActivity()))
60   - .apply(RequestOptions.bitmapTransform(new CircleCrop()).placeholder(R.drawable.ic_icon)).into(fragment.binding.userIcon);
  59 + .apply(RequestOptions.bitmapTransform(new CircleCrop()).placeholder(R.drawable.pedometer_ic_icon)).into(fragment.binding.userIcon);
61 60 }
62 61  
63 62 if(CommonInfo.getSex(fragment.getActivity(),userId) != null && CommonInfo.getSex(fragment.getActivity(),userId).trim().length() > 0){
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunMainFragmentView.java
  View file @323d386
1 1 package com.cnlive.moudle.pedometer.frame.view;
2 2  
3   -import android.app.Activity;
4 3 import android.app.Service;
5 4 import android.content.Context;
6 5 import android.content.Intent;
7 6 import android.os.Handler;
8 7 import android.os.SystemClock;
9 8 import android.os.Vibrator;
10   -import android.support.v4.content.ContextCompat;
11 9 import android.text.TextUtils;
12 10 import android.util.Log;
13 11 import android.view.MotionEvent;
14 12 import android.view.View;
15 13 import android.widget.Chronometer;
16   -import android.widget.Toast;
17 14  
18 15 import com.baidu.location.BDAbstractLocationListener;
19 16 import com.baidu.location.BDLocation;
20 17 import com.baidu.location.LocationClient;
21 18 import com.baidu.location.LocationClientOption;
22   -import com.baidu.mapapi.map.MapStatus;
23   -import com.baidu.mapapi.map.MyLocationData;
24 19 import com.baidu.mapapi.model.LatLng;
25 20 import com.baidu.mapapi.utils.DistanceUtil;
26 21 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
... ... @@ -33,8 +28,6 @@ import com.cnlive.moudle.pedometer.service.KeepLiveService;
33 28 import com.cnlive.moudle.pedometer.service.StepService;
34 29 import com.cnlive.moudle.pedometer.sql.entity.FailedEntity;
35 30 import com.cnlive.moudle.pedometer.sql.entity.UserStepEntity;
36   -import com.cnlive.moudle.pedometer.ui.activity.LineUpAgainActivity;
37   -import com.cnlive.moudle.pedometer.ui.activity.RunRaceDetailActivity;
38 31 import com.cnlive.moudle.pedometer.ui.activity.RunningFinishActivity;
39 32 import com.cnlive.moudle.pedometer.ui.activity.RunningMapActivity;
40 33 import com.cnlive.moudle.pedometer.ui.fragment.RunMainFragment;
... ... @@ -43,11 +36,8 @@ import com.cnlive.moudle.pedometer.ui.widget.TipDialog;
43 36 import com.cnlive.moudle.pedometer.utils.ButtonAnimUtil;
44 37 import com.cnlive.moudle.pedometer.utils.ChineseToSpeechUtil;
45 38 import com.cnlive.moudle.pedometer.utils.GsonUtil;
46   -import com.cnlive.moudle.pedometer.utils.MyMapUtil;
47   -import com.cnlive.moudle.pedometer.utils.MySpHelper;
48 39 import com.cnlive.moudle.pedometer.utils.StepUtil;
49 40 import com.cnlive.moudle.pedometer.utils.TimeUtil;
50   -import com.cnlive.strike.application.GlideApp;
51 41 import com.example.moudle_pedometer.R;
52 42 import com.hannesdorfmann.mosby3.mvp.MvpView;
53 43  
... ... @@ -740,7 +730,7 @@ public class RunMainFragmentView implements MvpView {
740 730 if (fragment.binding.ivGps.getTag() == null || !fragment.binding.ivGps.getTag().toString().equals("rt_training_gps_0")) {
741 731 fragment.binding.ivGps.setTag("rt_training_gps_0");
742 732 //设置图标
743   - fragment.binding.ivGps.setBackground(getContext().getResources().getDrawable(R.drawable.rt_training_gps_0));
  733 + fragment.binding.ivGps.setBackground(getContext().getResources().getDrawable(R.drawable.pedometer_rt_training_gps_0));
744 734 }
745 735  
746 736  
... ... @@ -758,7 +748,7 @@ public class RunMainFragmentView implements MvpView {
758 748 if (fragment.binding.ivGps.getTag() == null || !fragment.binding.ivGps.getTag().toString().equals("GPS_ACCURACY_BAD")) {
759 749 fragment.binding.ivGps.setTag("GPS_ACCURACY_BAD");
760 750 //设置图标
761   - fragment.binding.ivGps.setBackground(getContext().getResources().getDrawable(R.drawable.rt_training_gps_1));
  751 + fragment.binding.ivGps.setBackground(getContext().getResources().getDrawable(R.drawable.pedometer_rt_training_gps_1));
762 752 }
763 753 }
764 754 //GPS 质量判断中等
... ... @@ -769,7 +759,7 @@ public class RunMainFragmentView implements MvpView {
769 759 if (fragment.binding.ivGps.getTag() == null || !fragment.binding.ivGps.getTag().toString().equals("GPS_ACCURACY_MID")) {
770 760 fragment.binding.ivGps.setTag("GPS_ACCURACY_MID");
771 761 //设置图标
772   - fragment.binding.ivGps.setBackground(getContext().getResources().getDrawable(R.drawable.rt_training_gps_2));
  762 + fragment.binding.ivGps.setBackground(getContext().getResources().getDrawable(R.drawable.pedometer_rt_training_gps_2));
773 763 }
774 764 }//GPS 质量判断好
775 765 else if (location.getGpsAccuracyStatus() == BDLocation.GPS_ACCURACY_GOOD) {
... ... @@ -779,7 +769,7 @@ public class RunMainFragmentView implements MvpView {
779 769 if (fragment.binding.ivGps.getTag() == null || !fragment.binding.ivGps.getTag().toString().equals("GPS_ACCURACY_GOOD")) {
780 770 fragment.binding.ivGps.setTag("GPS_ACCURACY_GOOD");
781 771 //设置图标
782   - fragment.binding.ivGps.setBackground(getContext().getResources().getDrawable(R.drawable.rt_training_gps_3));
  772 + fragment.binding.ivGps.setBackground(getContext().getResources().getDrawable(R.drawable.pedometer_rt_training_gps_3));
783 773 }
784 774 }
785 775  
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunRaceDetailFragmentView.java
  View file @323d386
... ... @@ -15,11 +15,8 @@ import android.text.TextUtils;
15 15 import android.util.Log;
16 16 import android.view.View;
17 17 import android.view.ViewGroup;
18   -import android.view.ViewTreeObserver;
19   -import android.webkit.JavascriptInterface;
20 18 import android.webkit.WebSettings;
21 19 import android.webkit.WebView;
22   -import android.webkit.WebViewClient;
23 20 import android.widget.LinearLayout;
24 21 import android.widget.Toast;
25 22  
... ... @@ -31,7 +28,6 @@ import com.baidu.location.LocationClientOption;
31 28 import com.baidu.mapapi.map.BaiduMap;
32 29 import com.baidu.mapapi.map.BitmapDescriptor;
33 30 import com.baidu.mapapi.map.BitmapDescriptorFactory;
34   -import com.baidu.mapapi.map.InfoWindow;
35 31 import com.baidu.mapapi.map.MapStatus;
36 32 import com.baidu.mapapi.map.MapStatusUpdate;
37 33 import com.baidu.mapapi.map.MapStatusUpdateFactory;
... ... @@ -46,7 +42,6 @@ import com.baidu.mapapi.utils.DistanceUtil;
46 42 import com.baidu.trace.LBSTraceClient;
47 43 import com.baidu.trace.model.SortType;
48 44 import com.cnlive.libs.base.application.AppConfig;
49   -import com.cnlive.libs.base.util.AlertUtil;
50 45 import com.cnlive.libs.base.util.StatusBarUtil2;
51 46 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
52 47 import com.cnlive.moudle.pedometer.model.Constant;
... ... @@ -198,7 +193,7 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
198 193 queryResultPoints.addAll(resultPoints);
199 194 startLatLng = resultPoints.get(0);
200 195 endLatLng = resultPoints.get(resultPoints.size() - 1);
201   - MyMapUtil.drawServerLineTrack(getContext(), baiduMap, resultPoints, SortType.asc, R.color.green_round, R.drawable.icon_start, R.drawable.icon_end);
  196 + MyMapUtil.drawServerLineTrack(getContext(), baiduMap, resultPoints, SortType.asc, R.color.green_round, R.drawable.pedometer_icon_start, R.drawable.pedometer_icon_end);
202 197 // //自动计算地图缩放
203 198 //设置地图自动缩放
204 199 initZoom = MyMapUtil.setMapAutoZoom(baiduMap, resultPoints, DEFAULT_MAP_AUTO_ZOOM);
... ... @@ -848,7 +843,7 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
848 843 //设置定位模式, 默认为 LocationMode.NORMAL 普通态
849 844 mCurrentMode = MyLocationConfiguration.LocationMode.NORMAL;
850 845 // 设置定位图标修改为自定义marker
851   - Bitmap pointBitmap = BitmapUtil.getBitmapFromDp(getContext(), BitmapFactory.decodeResource(getContext().getResources(), R.drawable.rt_ic_location), 50, 50);
  846 + Bitmap pointBitmap = BitmapUtil.getBitmapFromDp(getContext(), BitmapFactory.decodeResource(getContext().getResources(), R.drawable.pedometer_rt_ic_location), 50, 50);
852 847 mCurrentMarker = BitmapDescriptorFactory.fromBitmap(pointBitmap);
853 848 //设置定位蓝点精度圆圈的填充颜色为透明色
854 849 accuracyCircleFillColor = getContext().getResources().getColor(R.color.transparent);
... ... @@ -1098,7 +1093,7 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
1098 1093 LatLng ll = new LatLng(Latitude, Longitude);
1099 1094 //设置坐标
1100 1095 //显示当前位置图标
1101   - Bitmap pointBitmap = BitmapUtil.getBitmapFromDp(fragment.getActivity(), BitmapFactory.decodeResource(fragment.getActivity().getResources(), R.drawable.run_map_icon_end), 22, 32);
  1096 + Bitmap pointBitmap = BitmapUtil.getBitmapFromDp(fragment.getActivity(), BitmapFactory.decodeResource(fragment.getActivity().getResources(), R.drawable.pedometer_run_map_icon_end), 22, 32);
1102 1097 currentMark = new MarkerOptions().position(ll).icon(BitmapDescriptorFactory.fromBitmap(pointBitmap));
1103 1098 baiduMap.addOverlay(currentMark);
1104 1099 MapStatus.Builder builder = new MapStatus.Builder();
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunningFinishFragmentView.java
  View file @323d386
... ... @@ -2,21 +2,17 @@ package com.cnlive.moudle.pedometer.frame.view;
2 2  
3 3 import android.content.Context;
4 4 import android.text.TextUtils;
5   -import android.util.Log;
6 5 import android.view.View;
7 6  
8 7 import com.baidu.mapapi.map.BaiduMap;
9 8 import com.baidu.mapapi.map.MapView;
10 9 import com.baidu.mapapi.map.UiSettings;
11 10 import com.baidu.mapapi.model.LatLng;
12   -import com.baidu.trace.LBSTraceClient;
13 11 import com.baidu.trace.model.SortType;
14   -import com.bumptech.glide.Glide;
15 12 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
16 13 import com.cnlive.moudle.pedometer.model.RunningFinishBean;
17 14 import com.cnlive.moudle.pedometer.sql.entity.UserStepEntity;
18 15 import com.cnlive.moudle.pedometer.ui.fragment.RunningFinishFragment;
19   -import com.cnlive.moudle.pedometer.ui.fragment.RunningMapFragment;
20 16 import com.cnlive.moudle.pedometer.ui.widget.SelectDialog;
21 17 import com.cnlive.moudle.pedometer.utils.MyMapUtil;
22 18 import com.cnlive.moudle.pedometer.utils.QMUITipDialogUtil;
... ... @@ -147,7 +143,7 @@ public class RunningFinishFragmentView implements MvpView {
147 143 if (getContext() == null) {
148 144 return;
149 145 }
150   - MyMapUtil.drawServerLineTrack(getContext(), baiduMap, trackPoints, SortType.asc, R.color.green_50, R.drawable.icon_start, R.drawable.icon_end);
  146 + MyMapUtil.drawServerLineTrack(getContext(), baiduMap, trackPoints, SortType.asc, R.color.green_50, R.drawable.pedometer_icon_start, R.drawable.pedometer_icon_end);
151 147 //设置地图自动缩放
152 148 MyMapUtil.setMapAutoZoom(baiduMap, trackPoints, -1.5f);
153 149 }
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunningMapFragmentView.java
  View file @323d386
... ... @@ -8,11 +8,9 @@ import android.hardware.Sensor;
8 8 import android.hardware.SensorEvent;
9 9 import android.hardware.SensorEventListener;
10 10 import android.hardware.SensorManager;
11   -import android.os.Handler;
12 11 import android.os.SystemClock;
13 12 import android.os.Vibrator;
14 13 import android.text.TextUtils;
15   -import android.util.Log;
16 14 import android.view.MotionEvent;
17 15 import android.view.View;
18 16 import android.widget.Chronometer;
... ... @@ -26,8 +24,6 @@ import com.baidu.mapapi.map.BaiduMap;
26 24 import com.baidu.mapapi.map.BitmapDescriptor;
27 25 import com.baidu.mapapi.map.BitmapDescriptorFactory;
28 26 import com.baidu.mapapi.map.MapStatus;
29   -import com.baidu.mapapi.map.MapStatusUpdate;
30   -import com.baidu.mapapi.map.MapStatusUpdateFactory;
31 27 import com.baidu.mapapi.map.MapView;
32 28 import com.baidu.mapapi.map.MarkerOptions;
33 29 import com.baidu.mapapi.map.MyLocationConfiguration;
... ... @@ -35,14 +31,12 @@ import com.baidu.mapapi.map.MyLocationData;
35 31 import com.baidu.mapapi.map.Overlay;
36 32 import com.baidu.mapapi.map.UiSettings;
37 33 import com.baidu.mapapi.model.LatLng;
38   -import com.baidu.mapapi.model.LatLngBounds;
39 34 import com.baidu.mapapi.utils.DistanceUtil;
40 35 import com.baidu.trace.model.SortType;
41 36 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
42 37 import com.cnlive.moudle.pedometer.model.Constant;
43 38 import com.cnlive.moudle.pedometer.model.MessageEvent;
44 39 import com.cnlive.moudle.pedometer.model.RunningMapBean;
45   -import com.cnlive.moudle.pedometer.service.StepService;
46 40 import com.cnlive.moudle.pedometer.sql.entity.UserStepEntity;
47 41 import com.cnlive.moudle.pedometer.ui.fragment.RunningMapFragment;
48 42 import com.cnlive.moudle.pedometer.ui.widget.TipDialog;
... ... @@ -59,7 +53,6 @@ import com.hannesdorfmann.mosby3.mvp.MvpView;
59 53 import org.greenrobot.eventbus.EventBus;
60 54  
61 55 import java.util.ArrayList;
62   -import java.util.HashMap;
63 56 import java.util.List;
64 57  
65 58 public class RunningMapFragmentView implements MvpView, SensorEventListener {
... ... @@ -166,7 +159,7 @@ public class RunningMapFragmentView implements MvpView, SensorEventListener {
166 159 //设置定位模式, 默认为 LocationMode.NORMAL 普通态
167 160 mCurrentMode = MyLocationConfiguration.LocationMode.NORMAL;
168 161 // 设置定位图标修改为自定义marker
169   - Bitmap pointBitmap = BitmapUtil.getBitmapFromDp(getContext(), BitmapFactory.decodeResource(getContext().getResources(), R.drawable.rt_ic_location), 40, 40);
  162 + Bitmap pointBitmap = BitmapUtil.getBitmapFromDp(getContext(), BitmapFactory.decodeResource(getContext().getResources(), R.drawable.pedometer_rt_ic_location), 40, 40);
170 163 mCurrentMarker = BitmapDescriptorFactory.fromBitmap(pointBitmap);
171 164 //设置定位蓝点精度圆圈的填充颜色为透明色
172 165 accuracyCircleFillColor = getContext().getResources().getColor(R.color.transparent);
... ... @@ -234,7 +227,7 @@ public class RunningMapFragmentView implements MvpView, SensorEventListener {
234 227 if (getContext() == null) {
235 228 return;
236 229 }
237   - MyMapUtil.drawServerLineTrack(getContext(), baiduMap, trackPoints, SortType.asc, R.color.green_50, R.drawable.icon_start, R.drawable.icon_end);
  230 + MyMapUtil.drawServerLineTrack(getContext(), baiduMap, trackPoints, SortType.asc, R.color.green_50, R.drawable.pedometer_icon_start, R.drawable.pedometer_icon_end);
238 231 //设置地图自动缩放
239 232 MyMapUtil.setMapAutoZoom(baiduMap, trackPoints, -1.5f);
240 233 }
... ... @@ -278,7 +271,7 @@ public class RunningMapFragmentView implements MvpView, SensorEventListener {
278 271 //设置图标
279 272 if (fragment.binding.ivGpsState.getTag() == null || !"GPS_ACCURACY_UNKNOWN".equals(fragment.binding.ivGpsState.getTag().toString())) {
280 273 fragment.binding.ivGpsState.setTag("GPS_ACCURACY_UNKNOWN");
281   - fragment.binding.ivGpsState.setBackground(getContext().getResources().getDrawable(R.drawable.rt_training_gps_0));
  274 + fragment.binding.ivGpsState.setBackground(getContext().getResources().getDrawable(R.drawable.pedometer_rt_training_gps_0));
282 275 }
283 276 }
284 277 //GPS 质量判断差
... ... @@ -292,7 +285,7 @@ public class RunningMapFragmentView implements MvpView, SensorEventListener {
292 285 //设置图标
293 286 if (fragment.binding.ivGpsState.getTag() == null || !"GPS_ACCURACY_BAD".equals(fragment.binding.ivGpsState.getTag().toString())) {
294 287 fragment.binding.ivGpsState.setTag("GPS_ACCURACY_BAD");
295   - fragment.binding.ivGpsState.setBackground(getContext().getResources().getDrawable(R.drawable.rt_training_gps_1));
  288 + fragment.binding.ivGpsState.setBackground(getContext().getResources().getDrawable(R.drawable.pedometer_rt_training_gps_1));
296 289 }
297 290 }
298 291 //GPS 质量判断中等
... ... @@ -303,7 +296,7 @@ public class RunningMapFragmentView implements MvpView, SensorEventListener {
303 296 //设置图标
304 297 if (fragment.binding.ivGpsState.getTag() == null || !"GPS_ACCURACY_MID".equals(fragment.binding.ivGpsState.getTag().toString())) {
305 298 fragment.binding.ivGpsState.setTag("GPS_ACCURACY_MID");
306   - fragment.binding.ivGpsState.setBackground(getContext().getResources().getDrawable(R.drawable.rt_training_gps_2));
  299 + fragment.binding.ivGpsState.setBackground(getContext().getResources().getDrawable(R.drawable.pedometer_rt_training_gps_2));
307 300 }
308 301 }//GPS 质量判断好
309 302 else if (location.getGpsAccuracyStatus() == BDLocation.GPS_ACCURACY_GOOD) {
... ... @@ -313,7 +306,7 @@ public class RunningMapFragmentView implements MvpView, SensorEventListener {
313 306 //设置图标
314 307 if (fragment.binding.ivGpsState.getTag() == null || !"GPS_ACCURACY_GOOD".equals(fragment.binding.ivGpsState.getTag().toString())) {
315 308 fragment.binding.ivGpsState.setTag("GPS_ACCURACY_GOOD");
316   - fragment.binding.ivGpsState.setBackground(getContext().getResources().getDrawable(R.drawable.rt_training_gps_3));
  309 + fragment.binding.ivGpsState.setBackground(getContext().getResources().getDrawable(R.drawable.pedometer_rt_training_gps_3));
317 310 }
318 311 }
319 312  
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/TakePartView.java
  View file @323d386
... ... @@ -11,7 +11,6 @@ import com.cnlive.moudle.pedometer.ui.adapter.TakePartAdapter;
11 11 import com.cnlive.moudle.pedometer.ui.fragment.TakePartFragment;
12 12 import com.example.moudle_pedometer.R;
13 13 import com.hannesdorfmann.mosby3.mvp.MvpView;
14   -import com.qmuiteam.qmui.widget.dialog.QMUITipDialog;
15 14 import com.scwang.smartrefresh.layout.footer.ClassicsFooter;
16 15 import com.scwang.smartrefresh.layout.header.ClassicsHeader;
17 16  
... ... @@ -32,7 +31,7 @@ public class TakePartView implements MvpView {
32 31 }
33 32  
34 33 public void initView(){
35   - fragment.binding.topbar.addLeftImageButton(R.drawable.top_back_black, R.id.fragment_back).setOnClickListener(v -> {
  34 + fragment.binding.topbar.addLeftImageButton(R.drawable.pedometer_top_back_black, R.id.fragment_back).setOnClickListener(v -> {
36 35 fragment.getActivity().finish();
37 36 });
38 37 fragment.binding.topbar.setTitle("已参与");
... ... @@ -105,7 +104,7 @@ public class TakePartView implements MvpView {
105 104 public void showEmpty(){
106 105 fragment.binding.empty.setVisibility(View.VISIBLE);
107 106 fragment.binding.refreshLayout.setVisibility(View.GONE);
108   - fragment.binding.empty.show("暂无参与", "", R.drawable.bmcg_tak);
  107 + fragment.binding.empty.show("暂无参与", "", R.drawable.pedometer_bmcg_tak);
109 108 }
110 109  
111 110 }
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/MyRecordActivity.java
  View file @323d386
... ... @@ -62,7 +62,7 @@ public class MyRecordActivity extends AppCompatActivity {
62 62 viewPager = findViewById(R.id.viewpager);
63 63  
64 64 topBar.setTitle("我的活动");
65   - topBar.addLeftImageButton(R.drawable.top_back_black, R.id.fragment_back).setOnClickListener(v -> {
  65 + topBar.addLeftImageButton(R.drawable.pedometer_top_back_black, R.id.fragment_back).setOnClickListener(v -> {
66 66 finish();
67 67 });
68 68  
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/ShareRecordActivity.java
  View file @323d386
... ... @@ -35,10 +35,6 @@ import com.qmuiteam.qmui.util.QMUIDrawableHelper;
35 35 import org.json.JSONObject;
36 36  
37 37 import java.io.ByteArrayOutputStream;
38   -import java.io.IOException;
39   -import java.io.ObjectOutputStream;
40   -
41   -import static android.provider.Contacts.SettingsColumns.KEY;
42 38  
43 39 /**
44 40 * Created by hanyayun 019/05/30.
... ... @@ -91,7 +87,7 @@ public class ShareRecordActivity extends AppCompatActivity {
91 87  
92 88 if (CommonInfo.getUserIcon(this) != null && CommonInfo.getUserIcon(this).trim().length() > 0) {
93 89 Glide.with(this).load(CommonInfo.getUserIcon(this))
94   - .apply(RequestOptions.bitmapTransform(new CircleCrop()).placeholder(R.drawable.ic_icon)).into(record_icon);
  90 + .apply(RequestOptions.bitmapTransform(new CircleCrop()).placeholder(R.drawable.pedometer_ic_icon)).into(record_icon);
95 91 }
96 92  
97 93 share_back.setOnClickListener(v -> finish());
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/adapter/TakePartAdapter.java
  View file @323d386
... ... @@ -44,10 +44,10 @@ public class TakePartAdapter extends RecyclerView.Adapter&lt;TakePartAdapter.MyHold
44 44 public void onBindViewHolder(@NonNull TakePartAdapter.MyHolder myViewHolder, int i) {
45 45 if (!TextUtils.isEmpty(list.get(i).getImage())) {
46 46 Glide.with(context).load(list.get(i).getImage())
47   - .apply(RequestOptions.bitmapTransform(new CircleCrop()).placeholder(R.drawable.ic_icon)).into(myViewHolder.icon_img);
  47 + .apply(RequestOptions.bitmapTransform(new CircleCrop()).placeholder(R.drawable.pedometer_ic_icon)).into(myViewHolder.icon_img);
48 48 } else {
49 49 Glide.with(context).load(context.getResources().getString(R.string.default_face_url))
50   - .apply(RequestOptions.bitmapTransform(new CircleCrop()).placeholder(R.drawable.ic_icon)).into(myViewHolder.icon_img);
  50 + .apply(RequestOptions.bitmapTransform(new CircleCrop()).placeholder(R.drawable.pedometer_ic_icon)).into(myViewHolder.icon_img);
51 51 }
52 52 myViewHolder.nickname.setText(list.get(i).getNickName());
53 53 myViewHolder.ry_part.setOnClickListener(v -> {
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/widget/FivePersonIconView.java
  View file @323d386
... ... @@ -2,10 +2,7 @@ package com.cnlive.moudle.pedometer.ui.widget;
2 2  
3 3 import android.content.Context;
4 4 import android.content.res.TypedArray;
5   -import android.os.Build;
6   -import android.support.annotation.Nullable;
7 5 import android.util.AttributeSet;
8   -import android.util.Log;
9 6 import android.view.LayoutInflater;
10 7 import android.view.View;
11 8 import android.widget.ImageView;
... ... @@ -58,11 +55,11 @@ public class FivePersonIconView extends LinearLayout {
58 55 qr4.setVisibility(GONE);
59 56 qr5.setVisibility(GONE);
60 57 //设置默认显示图片
61   - GlideApp.with(context).load(getResources().getDrawable(R.drawable.tc_ic_workout_level_adjust_coach)).into(qr1);
62   - GlideApp.with(context).load(getResources().getDrawable(R.drawable.tc_ic_workout_level_adjust_coach)).into(qr2);
63   - GlideApp.with(context).load(getResources().getDrawable(R.drawable.tc_ic_workout_level_adjust_coach)).into(qr3);
64   - GlideApp.with(context).load(getResources().getDrawable(R.drawable.tc_ic_workout_level_adjust_coach)).into(qr4);
65   - GlideApp.with(context).load(getResources().getDrawable(R.drawable.tc_ic_workout_level_adjust_coach)).into(qr5);
  58 + GlideApp.with(context).load(getResources().getDrawable(R.drawable.pedometer_tc_ic_workout_level_adjust_coach)).into(qr1);
  59 + GlideApp.with(context).load(getResources().getDrawable(R.drawable.pedometer_tc_ic_workout_level_adjust_coach)).into(qr2);
  60 + GlideApp.with(context).load(getResources().getDrawable(R.drawable.pedometer_tc_ic_workout_level_adjust_coach)).into(qr3);
  61 + GlideApp.with(context).load(getResources().getDrawable(R.drawable.pedometer_tc_ic_workout_level_adjust_coach)).into(qr4);
  62 + GlideApp.with(context).load(getResources().getDrawable(R.drawable.pedometer_tc_ic_workout_level_adjust_coach)).into(qr5);
66 63 //获取自定义属性
67 64 TypedArray attributes = context.obtainStyledAttributes(attrs, R.styleable.FivePersonIconView);
68 65 isShowRight = attributes.getBoolean(R.styleable.FivePersonIconView_showRightFlag, true);
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/utils/MyMapUtil.java
  View file @323d386
... ... @@ -24,7 +24,6 @@ import com.baidu.mapapi.map.PolylineOptions;
24 24 import com.baidu.mapapi.model.LatLng;
25 25 import com.baidu.mapapi.model.LatLngBounds;
26 26 import com.baidu.mapapi.search.core.PoiInfo;
27   -import com.baidu.mapapi.search.geocode.GeoCodeResult;
28 27 import com.baidu.mapapi.search.geocode.GeoCoder;
29 28 import com.baidu.mapapi.search.geocode.OnGetGeoCoderResultListener;
30 29 import com.baidu.mapapi.search.geocode.ReverseGeoCodeOption;
... ... @@ -35,8 +34,6 @@ import com.baidu.trace.api.analysis.DrivingBehaviorRequest;
35 34 import com.baidu.trace.api.analysis.DrivingBehaviorResponse;
36 35 import com.baidu.trace.api.analysis.OnAnalysisListener;
37 36 import com.baidu.trace.api.analysis.StayPointResponse;
38   -import com.baidu.trace.api.track.DistanceRequest;
39   -import com.baidu.trace.api.track.DistanceResponse;
40 37 import com.baidu.trace.api.track.HistoryTrackRequest;
41 38 import com.baidu.trace.api.track.HistoryTrackResponse;
42 39 import com.baidu.trace.api.track.OnTrackListener;
... ... @@ -50,7 +47,6 @@ import com.baidu.trace.model.TransportMode;
50 47 import com.cnlive.moudle.collectionTrace.model.CollectPoint;
51 48 import com.cnlive.moudle.pedometer.model.Constant;
52 49 import com.cnlive.moudle.pedometer.model.RoutePoint;
53   -import com.cnlive.moudle.pedometer.service.StepService;
54 50 import com.example.moudle_pedometer.R;
55 51  
56 52 import java.util.ArrayList;
... ... @@ -312,7 +308,7 @@ public class MyMapUtil {
312 308 }
313 309  
314 310 // 添加圆形范围
315   - Bitmap startCircleBitmap = BitmapUtil.getBitmapFromDp(context, BitmapFactory.decodeResource(context.getResources(), R.drawable.circle_point_raduis), 60, 60);
  311 + Bitmap startCircleBitmap = BitmapUtil.getBitmapFromDp(context, BitmapFactory.decodeResource(context.getResources(), R.drawable.pedometer_circle_point_raduis), 60, 60);
316 312 OverlayOptions startCircleOptions = null;
317 313 if (startCircleBitmap != null) {
318 314 startCircleOptions = new MarkerOptions()
... ... @@ -824,7 +820,7 @@ public class MyMapUtil {
824 820 .animateType(MarkerOptions.MarkerAnimateType.grow);
825 821 }
826 822 // 添加圆形范围
827   - Bitmap startCircleBitmap = BitmapUtil.getBitmapFromDp(context, BitmapFactory.decodeResource(context.getResources(), R.drawable.circle_point_raduis), 60, 60);
  823 + Bitmap startCircleBitmap = BitmapUtil.getBitmapFromDp(context, BitmapFactory.decodeResource(context.getResources(), R.drawable.pedometer_circle_point_raduis), 60, 60);
828 824 OverlayOptions startCircleOptions = null;
829 825 OverlayOptions endCircleOptions = null;
830 826 if (startCircleBitmap != null) {
... ...
moudle_pedometer/src/main/res/drawable-hdpi/backg.webp renamed to moudle_pedometer/src/main/res/drawable-hdpi/pedometer_backg.webp
View file @323d386
No preview for this file type
moudle_pedometer/src/main/res/drawable-hdpi/bg_bg.webp renamed to moudle_pedometer/src/main/res/drawable-hdpi/pedometer_bg_bg.webp
View file @323d386
No preview for this file type
moudle_pedometer/src/main/res/drawable-hdpi/bg_tips_bottom_center.webp renamed to moudle_pedometer/src/main/res/drawable-hdpi/pedometer_bg_tips_bottom_center.webp
View file @323d386
No preview for this file type
moudle_pedometer/src/main/res/drawable-hdpi/bmcg.webp renamed to moudle_pedometer/src/main/res/drawable-hdpi/pedometer_bmcg.webp
View file @323d386
No preview for this file type
moudle_pedometer/src/main/res/drawable-hdpi/bmcg_has.webp renamed to moudle_pedometer/src/main/res/drawable-hdpi/pedometer_bmcg_has.webp
View file @323d386
No preview for this file type
moudle_pedometer/src/main/res/drawable-hdpi/bmcg_no.webp renamed to moudle_pedometer/src/main/res/drawable-hdpi/pedometer_bmcg_no.webp
View file @323d386
No preview for this file type
moudle_pedometer/src/main/res/drawable-hdpi/bmcg_tak.webp renamed to moudle_pedometer/src/main/res/drawable-hdpi/pedometer_bmcg_tak.webp
View file @323d386
No preview for this file type
moudle_pedometer/src/main/res/drawable-hdpi/button_fab_white.webp renamed to moudle_pedometer/src/main/res/drawable-hdpi/pedometer_button_fab_white.webp
View file @323d386
No preview for this file type
moudle_pedometer/src/main/res/drawable-hdpi/circle_point_raduis.webp renamed to moudle_pedometer/src/main/res/drawable-hdpi/pedometer_circle_point_raduis.webp
View file @323d386
No preview for this file type
moudle_pedometer/src/main/res/drawable-hdpi/circle_white_shadow_bg.webp renamed to moudle_pedometer/src/main/res/drawable-hdpi/pedometer_circle_white_shadow_bg.webp
View file @323d386
No preview for this file type
moudle_pedometer/src/main/res/drawable-hdpi/crown.webp renamed to moudle_pedometer/src/main/res/drawable-hdpi/pedometer_crown.webp
View file @323d386
No preview for this file type
moudle_pedometer/src/main/res/drawable-hdpi/defaults.webp renamed to moudle_pedometer/src/main/res/drawable-hdpi/pedometer_defaults.webp
View file @323d386
No preview for this file type
moudle_pedometer/src/main/res/drawable-hdpi/erwe.webp renamed to moudle_pedometer/src/main/res/drawable-hdpi/pedometer_erwe.webp
View file @323d386
No preview for this file type
moudle_pedometer/src/main/res/drawable-hdpi/gps_tip_bg.webp renamed to moudle_pedometer/src/main/res/drawable-hdpi/pedometer_gps_tip_bg.webp
View file @323d386
No preview for this file type
moudle_pedometer/src/main/res/drawable-hdpi/gps_white_shadow.webp renamed to moudle_pedometer/src/main/res/drawable-hdpi/pedometer_gps_white_shadow.webp
View file @323d386
No preview for this file type
moudle_pedometer/src/main/res/drawable-hdpi/ic_icon.webp renamed to moudle_pedometer/src/main/res/drawable-hdpi/pedometer_ic_icon.webp
View file @323d386
No preview for this file type
moudle_pedometer/src/main/res/drawable-hdpi/ic_portrait_training_left_on.webp renamed to moudle_pedometer/src/main/res/drawable-hdpi/pedometer_ic_portrait_training_left_on.webp
View file @323d386
No preview for this file type
moudle_pedometer/src/main/res/drawable-hdpi/ic_white_back.webp renamed to moudle_pedometer/src/main/res/drawable-hdpi/pedometer_ic_white_back.webp
View file @323d386
No preview for this file type
moudle_pedometer/src/main/res/drawable-hdpi/icon_back.webp renamed to moudle_pedometer/src/main/res/drawable-hdpi/pedometer_icon_back.webp
View file @323d386
No preview for this file type
moudle_pedometer/src/main/res/drawable-hdpi/icon_end.png renamed to moudle_pedometer/src/main/res/drawable-hdpi/pedometer_icon_end.png
View file @323d386

2.54 KB
moudle_pedometer/src/main/res/drawable-hdpi/icon_map_import.webp renamed to moudle_pedometer/src/main/res/drawable-hdpi/pedometer_icon_map_import.webp
View file @323d386
No preview for this file type
moudle_pedometer/src/main/res/drawable-hdpi/icon_no_fail_line.webp renamed to moudle_pedometer/src/main/res/drawable-hdpi/pedometer_icon_no_fail_line.webp
View file @323d386
No preview for this file type
moudle_pedometer/src/main/res/drawable-hdpi/icon_race_location_green.webp renamed to moudle_pedometer/src/main/res/drawable-hdpi/pedometer_icon_race_location_green.webp
View file @323d386
No preview for this file type
moudle_pedometer/src/main/res/drawable-hdpi/icon_right_close.webp renamed to moudle_pedometer/src/main/res/drawable-hdpi/pedometer_icon_right_close.webp
View file @323d386
No preview for this file type
moudle_pedometer/src/main/res/drawable-hdpi/icon_run_route.webp renamed to moudle_pedometer/src/main/res/drawable-hdpi/pedometer_icon_run_route.webp
View file @323d386
No preview for this file type
moudle_pedometer/src/main/res/drawable-hdpi/icon_run_white_back.png renamed to moudle_pedometer/src/main/res/drawable-hdpi/pedometer_icon_run_white_back.png
View file @323d386

542 Bytes
moudle_pedometer/src/main/res/drawable-hdpi/icon_search.webp renamed to moudle_pedometer/src/main/res/drawable-hdpi/pedometer_icon_search.webp
View file @323d386
No preview for this file type
moudle_pedometer/src/main/res/drawable-hdpi/icon_share.webp renamed to moudle_pedometer/src/main/res/drawable-hdpi/pedometer_icon_share.webp
View file @323d386
No preview for this file type
moudle_pedometer/src/main/res/drawable-hdpi/icon_slide_up.webp renamed to moudle_pedometer/src/main/res/drawable-hdpi/pedometer_icon_slide_up.webp
View file @323d386
No preview for this file type
moudle_pedometer/src/main/res/drawable-hdpi/icon_start.png renamed to moudle_pedometer/src/main/res/drawable-hdpi/pedometer_icon_start.png
View file @323d386

3.18 KB
moudle_pedometer/src/main/res/drawable-hdpi/icon_step.webp renamed to moudle_pedometer/src/main/res/drawable-hdpi/pedometer_icon_step.webp
View file @323d386
No preview for this file type
moudle_pedometer/src/main/res/drawable-hdpi/icon_white_back.png renamed to moudle_pedometer/src/main/res/drawable-hdpi/pedometer_icon_white_back.png
View file @323d386

542 Bytes
moudle_pedometer/src/main/res/drawable-hdpi/location_message.webp renamed to moudle_pedometer/src/main/res/drawable-hdpi/pedometer_location_message.webp
View file @323d386
No preview for this file type
moudle_pedometer/src/main/res/drawable-hdpi/map.webp renamed to moudle_pedometer/src/main/res/drawable-hdpi/pedometer_map.webp
View file @323d386
No preview for this file type
moudle_pedometer/src/main/res/drawable-hdpi/mo_ic_dialog_back.webp renamed to moudle_pedometer/src/main/res/drawable-hdpi/pedometer_mo_ic_dialog_back.webp
View file @323d386
No preview for this file type
moudle_pedometer/src/main/res/drawable-hdpi/more.webp renamed to moudle_pedometer/src/main/res/drawable-hdpi/pedometer_more.webp
View file @323d386
No preview for this file type
moudle_pedometer/src/main/res/drawable-hdpi/no_selected.webp renamed to moudle_pedometer/src/main/res/drawable-hdpi/pedometer_no_selected.webp
View file @323d386
No preview for this file type
moudle_pedometer/src/main/res/drawable-hdpi/rt_ic_home_map.webp renamed to moudle_pedometer/src/main/res/drawable-hdpi/pedometer_rt_ic_home_map.webp
View file @323d386
No preview for this file type
moudle_pedometer/src/main/res/drawable-hdpi/rt_ic_location.png renamed to moudle_pedometer/src/main/res/drawable-hdpi/pedometer_rt_ic_location.png
View file @323d386

5.19 KB
moudle_pedometer/src/main/res/drawable-hdpi/rt_ic_location_blank.webp renamed to moudle_pedometer/src/main/res/drawable-hdpi/pedometer_rt_ic_location_blank.webp
View file @323d386
No preview for this file type
moudle_pedometer/src/main/res/drawable-hdpi/rt_outdoor_video_cal.webp renamed to moudle_pedometer/src/main/res/drawable-hdpi/pedometer_rt_outdoor_video_cal.webp
View file @323d386
No preview for this file type
moudle_pedometer/src/main/res/drawable-hdpi/rt_outdoor_video_pace.webp renamed to moudle_pedometer/src/main/res/drawable-hdpi/pedometer_rt_outdoor_video_pace.webp
View file @323d386
No preview for this file type
moudle_pedometer/src/main/res/drawable-hdpi/rt_outdoor_video_time.webp renamed to moudle_pedometer/src/main/res/drawable-hdpi/pedometer_rt_outdoor_video_time.webp
View file @323d386
No preview for this file type
moudle_pedometer/src/main/res/drawable-hdpi/rt_training_button_pause.webp renamed to moudle_pedometer/src/main/res/drawable-hdpi/pedometer_rt_training_button_pause.webp
View file @323d386
No preview for this file type
moudle_pedometer/src/main/res/drawable-hdpi/rt_training_button_resume.png renamed to moudle_pedometer/src/main/res/drawable-hdpi/pedometer_rt_training_button_resume.png
View file @323d386

443 Bytes
moudle_pedometer/src/main/res/drawable-hdpi/rt_training_button_stop.webp renamed to moudle_pedometer/src/main/res/drawable-hdpi/pedometer_rt_training_button_stop.webp
View file @323d386
No preview for this file type
moudle_pedometer/src/main/res/drawable-hdpi/rt_training_gps_0.webp renamed to moudle_pedometer/src/main/res/drawable-hdpi/pedometer_rt_training_gps_0.webp
View file @323d386
No preview for this file type
moudle_pedometer/src/main/res/drawable-hdpi/rt_training_gps_1.webp renamed to moudle_pedometer/src/main/res/drawable-hdpi/pedometer_rt_training_gps_1.webp
View file @323d386
No preview for this file type
moudle_pedometer/src/main/res/drawable-hdpi/rt_training_gps_2.webp renamed to moudle_pedometer/src/main/res/drawable-hdpi/pedometer_rt_training_gps_2.webp
View file @323d386
No preview for this file type
moudle_pedometer/src/main/res/drawable-hdpi/rt_training_gps_3.webp renamed to moudle_pedometer/src/main/res/drawable-hdpi/pedometer_rt_training_gps_3.webp
View file @323d386
No preview for this file type
moudle_pedometer/src/main/res/drawable-hdpi/run_map_icon_end.webp renamed to moudle_pedometer/src/main/res/drawable-hdpi/pedometer_run_map_icon_end.webp
View file @323d386
No preview for this file type
moudle_pedometer/src/main/res/drawable-hdpi/run_map_icon_start.webp renamed to moudle_pedometer/src/main/res/drawable-hdpi/pedometer_run_map_icon_start.webp
View file @323d386
No preview for this file type
moudle_pedometer/src/main/res/drawable-hdpi/selected.webp renamed to moudle_pedometer/src/main/res/drawable-hdpi/pedometer_selected.webp
View file @323d386
No preview for this file type
moudle_pedometer/src/main/res/drawable-hdpi/share_background.webp renamed to moudle_pedometer/src/main/res/drawable-hdpi/pedometer_share_background.webp
View file @323d386
No preview for this file type
moudle_pedometer/src/main/res/drawable-hdpi/share_img.webp renamed to moudle_pedometer/src/main/res/drawable-hdpi/pedometer_share_img.webp
View file @323d386
No preview for this file type
moudle_pedometer/src/main/res/drawable-hdpi/share_logo.webp renamed to moudle_pedometer/src/main/res/drawable-hdpi/pedometer_share_logo.webp
View file @323d386
No preview for this file type
moudle_pedometer/src/main/res/drawable-hdpi/speed.webp renamed to moudle_pedometer/src/main/res/drawable-hdpi/pedometer_speed.webp
View file @323d386
No preview for this file type
moudle_pedometer/src/main/res/drawable-hdpi/sport_dropdown.webp renamed to moudle_pedometer/src/main/res/drawable-hdpi/pedometer_sport_dropdown.webp
View file @323d386
No preview for this file type
moudle_pedometer/src/main/res/drawable-hdpi/sport_location.webp renamed to moudle_pedometer/src/main/res/drawable-hdpi/pedometer_sport_location.webp
View file @323d386
No preview for this file type
moudle_pedometer/src/main/res/drawable-hdpi/sport_people.webp renamed to moudle_pedometer/src/main/res/drawable-hdpi/pedometer_sport_people.webp
View file @323d386
No preview for this file type
moudle_pedometer/src/main/res/drawable-hdpi/sport_speed.webp renamed to moudle_pedometer/src/main/res/drawable-hdpi/pedometer_sport_speed.webp
View file @323d386
No preview for this file type
moudle_pedometer/src/main/res/drawable-hdpi/sport_step.webp renamed to moudle_pedometer/src/main/res/drawable-hdpi/pedometer_sport_step.webp
View file @323d386
No preview for this file type
moudle_pedometer/src/main/res/drawable-hdpi/sport_time.webp renamed to moudle_pedometer/src/main/res/drawable-hdpi/pedometer_sport_time.webp
View file @323d386
No preview for this file type
moudle_pedometer/src/main/res/drawable-hdpi/sport_time_cost.webp renamed to moudle_pedometer/src/main/res/drawable-hdpi/pedometer_sport_time_cost.webp
View file @323d386
No preview for this file type
moudle_pedometer/src/main/res/drawable-hdpi/sport_type.webp renamed to moudle_pedometer/src/main/res/drawable-hdpi/pedometer_sport_type.webp
View file @323d386
No preview for this file type
moudle_pedometer/src/main/res/drawable-hdpi/step.webp renamed to moudle_pedometer/src/main/res/drawable-hdpi/pedometer_step.webp
View file @323d386
No preview for this file type
moudle_pedometer/src/main/res/drawable-hdpi/tc_bg_body_record_add_menu.9.png renamed to moudle_pedometer/src/main/res/drawable-hdpi/pedometer_tc_bg_body_record_add_menu.9.png
View file @323d386

1.03 KB
moudle_pedometer/src/main/res/drawable-hdpi/tc_ic_workout_level_adjust_coach.webp renamed to moudle_pedometer/src/main/res/drawable-hdpi/pedometer_tc_ic_workout_level_adjust_coach.webp
View file @323d386
No preview for this file type
moudle_pedometer/src/main/res/drawable-hdpi/tc_suit_right_arrow.webp renamed to moudle_pedometer/src/main/res/drawable-hdpi/pedometer_tc_suit_right_arrow.webp
View file @323d386
No preview for this file type
moudle_pedometer/src/main/res/drawable-hdpi/time_cost.webp renamed to moudle_pedometer/src/main/res/drawable-hdpi/pedometer_time_cost.webp
View file @323d386
No preview for this file type