1 重命名资源文件

YangShuai
1 parent 9b9d783b
Showing 100 changed files with 79 additions and 206 deletions
config.gradle
moudle_pedometer/src/main/java/com/cnlive/moudle/calorie/service/CalorieService.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/presenter/CollRunningMapFragmentPresenter.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/CollRunMainFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/CollRunRaceDetailFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/CollRunningFinishFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/CollRunningMapFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/CollTraceListDetailFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/RaceListView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/StartTraceFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/adapter/CollFinishDetaiAdapter.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/adapter/RaceNameListAdapter.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/presenter/ALLScoreDetailFragmentPresenter.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/presenter/RunningFinishFragmetPresenter.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/presenter/RunningMapFragmentPresenter.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/presenter/UploadFailDetailFragmentPresenter.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/LineUpAgainView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/OnGoingFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RaceRecorView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RegistrationInfoView.java
@@ -21,7 +21,7 @@ ext {
             //编译方式
             debug  : false,
             //版本号
-            version: "1.0.15",
+            version: "1.0.16",
             //Lib库前缀
             packeg : "com.cnlive.module",
             //Lib库名称
@@ -18,35 +18,19 @@ import android.hardware.SensorManager;
 import android.os.Binder;
 import android.os.Build;
 import android.os.CountDownTimer;
-import android.os.Handler;
 import android.os.IBinder;
 import android.support.v4.app.NotificationCompat;
 import android.text.TextUtils;
 import android.util.Log;
 import android.widget.RemoteViews;
-import com.baidu.trace.LBSTraceClient;
-import com.baidu.trace.Trace;
-import com.baidu.trace.api.track.LatestPoint;
-import com.baidu.trace.api.track.LatestPointResponse;
-import com.baidu.trace.api.track.OnTrackListener;
-import com.baidu.trace.model.LocationMode;
-import com.baidu.trace.model.OnTraceListener;
-import com.baidu.trace.model.PushMessage;
-import com.baidu.trace.model.StatusCodes;
 import com.cnlive.moudle.calorie.utils.CalorieUtil;
-import com.cnlive.moudle.collectionTrace.commonInfo.CollCommonInfo;
-import com.cnlive.moudle.collectionTrace.service.CollKeepLiveService;
-import com.cnlive.moudle.collectionTrace.utils.CollStepUtil;
 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.model.Constant;
 import com.cnlive.moudle.pedometer.model.MessageEvent;
 import com.cnlive.moudle.pedometer.model.step.StepCount;
 import com.cnlive.moudle.pedometer.model.step.StepValuePassListener;
-import com.cnlive.moudle.pedometer.sql.db.DbCore;
 import com.cnlive.moudle.pedometer.sql.entity.CalorieEntity;
-import com.cnlive.moudle.pedometer.sql.entity.CollUserStepEntity;
-import com.cnlive.moudle.pedometer.utils.ServiceUtils;
 import com.example.moudle_pedometer.R;
 import org.greenrobot.eventbus.EventBus;
@@ -54,7 +38,6 @@ import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
 import java.text.SimpleDateFormat;
-import java.util.Calendar;
 import java.util.Date;
 /**
@@ -174,7 +157,7 @@ public class CalorieService extends Service implements SensorEventListener {
     private void showStartForegroundNotification() {
         if (null == remoteViews) {
             remoteViews = new RemoteViews(getPackageName(), R.layout.custom_step_notification);
-            remoteViews.setImageViewResource(R.id.iv_icon, R.drawable.ic_icon);
+            remoteViews.setImageViewResource(R.id.iv_icon, R.drawable.pedometer_ic_icon);
         }
         NotificationChannel channel = null;
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
 package com.cnlive.moudle.collectionTrace.frame.presenter;
 import android.content.Context;
-import android.os.Handler;
 import android.util.Log;
 import android.widget.Toast;
-import com.baidu.mapapi.map.Overlay;
 import com.baidu.mapapi.model.LatLng;
-import com.baidu.mapapi.utils.DistanceUtil;
-import com.baidu.trace.api.entity.AroundSearchResponse;
-import com.baidu.trace.api.entity.BoundSearchResponse;
-import com.baidu.trace.api.entity.DistrictSearchResponse;
-import com.baidu.trace.api.entity.EntityListResponse;
 import com.baidu.trace.api.entity.LocRequest;
-import com.baidu.trace.api.entity.OnEntityListener;
-import com.baidu.trace.api.entity.PolygonSearchResponse;
-import com.baidu.trace.api.entity.SearchResponse;
 import com.baidu.trace.api.fence.AddMonitoredPersonResponse;
 import com.baidu.trace.api.fence.CreateFenceRequest;
 import com.baidu.trace.api.fence.CreateFenceResponse;
 import com.baidu.trace.api.fence.DeleteFenceResponse;
 import com.baidu.trace.api.fence.DeleteMonitoredPersonResponse;
-import com.baidu.trace.api.fence.FenceListRequest;
 import com.baidu.trace.api.fence.FenceListResponse;
 import com.baidu.trace.api.fence.HistoryAlarmResponse;
 import com.baidu.trace.api.fence.ListMonitoredPersonResponse;
 import com.baidu.trace.api.fence.MonitoredStatus;
 import com.baidu.trace.api.fence.MonitoredStatusByLocationResponse;
 import com.baidu.trace.api.fence.MonitoredStatusInfo;
-import com.baidu.trace.api.fence.MonitoredStatusRequest;
 import com.baidu.trace.api.fence.MonitoredStatusResponse;
 import com.baidu.trace.api.fence.OnFenceListener;
 import com.baidu.trace.api.fence.UpdateFenceResponse;
@@ -43,7 +31,6 @@ import com.baidu.trace.model.CoordType;
 import com.baidu.trace.model.ProcessOption;
 import com.baidu.trace.model.SortType;
 import com.baidu.trace.model.StatusCodes;
-import com.baidu.trace.model.TraceLocation;
 import com.baidu.trace.model.TransportMode;
 import com.cnlive.moudle.collectionTrace.frame.view.CollRunningMapFragmentView;
 import com.cnlive.moudle.pedometer.model.Constant;
@@ -243,7 +230,7 @@ public class CollRunningMapFragmentPresenter extends MvpBasePresenter&lt;CollRunnin
 //                        }
 //                        Log.e(TAG, "结果: " + result);
 //                        Log.e(TAG, "onHistoryTrackCallback: 轨迹点:" + trackPoints.size() + ",详情" + GsonUtil.GsonString(trackPoints));
-                        MyMapUtil.drawHistoryTrack(context, getView().baiduMap, trackPoints, SortType.asc, R.color.red, R.drawable.icon_start, R.drawable.icon_end);
+                        MyMapUtil.drawHistoryTrack(context, getView().baiduMap, trackPoints, SortType.asc, R.color.red, R.drawable.pedometer_icon_start, R.drawable.pedometer_icon_end);
 //                        MyMapUtil.drawMapLineRoutePoint(context, getView().baiduMap, MyMapUtil.optimizePoints(routePoints), R.color.red);
                     }
                 }
@@ -452,7 +452,7 @@ public class CollRunMainFragmentView implements MvpView {
                 if (fragment.binding.ivGps.getTag() == null || !fragment.binding.ivGps.getTag().toString().equals("rt_training_gps_0")) {
                     fragment.binding.ivGps.setTag("rt_training_gps_0");
                     //设置图标
-                    fragment.binding.ivGps.setBackground(getContext().getResources().getDrawable(R.drawable.rt_training_gps_0));
+                    fragment.binding.ivGps.setBackground(getContext().getResources().getDrawable(R.drawable.pedometer_rt_training_gps_0));
                 }
@@ -470,7 +470,7 @@ public class CollRunMainFragmentView implements MvpView {
                 if (fragment.binding.ivGps.getTag() == null || !fragment.binding.ivGps.getTag().toString().equals("GPS_ACCURACY_BAD")) {
                     fragment.binding.ivGps.setTag("GPS_ACCURACY_BAD");
                     //设置图标
-                    fragment.binding.ivGps.setBackground(getContext().getResources().getDrawable(R.drawable.rt_training_gps_1));
+                    fragment.binding.ivGps.setBackground(getContext().getResources().getDrawable(R.drawable.pedometer_rt_training_gps_1));
                 }
             }
             //GPS 质量判断中等
@@ -481,7 +481,7 @@ public class CollRunMainFragmentView implements MvpView {
                 if (fragment.binding.ivGps.getTag() == null || !fragment.binding.ivGps.getTag().toString().equals("GPS_ACCURACY_MID")) {
                     fragment.binding.ivGps.setTag("GPS_ACCURACY_MID");
                     //设置图标
-                    fragment.binding.ivGps.setBackground(getContext().getResources().getDrawable(R.drawable.rt_training_gps_2));
+                    fragment.binding.ivGps.setBackground(getContext().getResources().getDrawable(R.drawable.pedometer_rt_training_gps_2));
                 }
             }//GPS 质量判断好
             else if (location.getGpsAccuracyStatus() == BDLocation.GPS_ACCURACY_GOOD) {
@@ -491,7 +491,7 @@ public class CollRunMainFragmentView implements MvpView {
                 if (fragment.binding.ivGps.getTag() == null || !fragment.binding.ivGps.getTag().toString().equals("GPS_ACCURACY_GOOD")) {
                     fragment.binding.ivGps.setTag("GPS_ACCURACY_GOOD");
                     //设置图标
-                    fragment.binding.ivGps.setBackground(getContext().getResources().getDrawable(R.drawable.rt_training_gps_3));
+                    fragment.binding.ivGps.setBackground(getContext().getResources().getDrawable(R.drawable.pedometer_rt_training_gps_3));
                 }
             }
@@ -9,7 +9,6 @@ import android.hardware.SensorEventListener;
 import android.hardware.SensorManager;
 import android.os.Build;
 import android.text.TextUtils;
-import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewTreeObserver;
@@ -293,7 +292,7 @@ public class CollRunRaceDetailFragmentView implements MvpView, SensorEventListen
                         if (null != resultPoints && resultPoints.size() > 1) {
                             queryResultPoints.clear();
                             queryResultPoints.addAll(resultPoints);
-                            MyMapUtil.drawHistoryTrack(getContext(), baiduMap, resultPoints, SortType.asc, R.color.green_round, R.drawable.icon_start, R.drawable.icon_end);
+                            MyMapUtil.drawHistoryTrack(getContext(), baiduMap, resultPoints, SortType.asc, R.color.green_round, R.drawable.pedometer_icon_start, R.drawable.pedometer_icon_end);
                             initZoom = MyMapUtil.setMapAutoZoom(baiduMap, resultPoints, DEFAULT_MAP_AUTO_ZOOM);
                         }
                     }
@@ -398,7 +397,7 @@ public class CollRunRaceDetailFragmentView implements MvpView, SensorEventListen
         //设置定位模式, 默认为 LocationMode.NORMAL 普通态
         mCurrentMode = MyLocationConfiguration.LocationMode.NORMAL;
         // 设置定位图标修改为自定义marker
-        Bitmap pointBitmap = BitmapUtil.getBitmapFromDp(getContext(), BitmapFactory.decodeResource(getContext().getResources(), R.drawable.rt_ic_location), 50, 50);
+        Bitmap pointBitmap = BitmapUtil.getBitmapFromDp(getContext(), BitmapFactory.decodeResource(getContext().getResources(), R.drawable.pedometer_rt_ic_location), 50, 50);
         mCurrentMarker = BitmapDescriptorFactory.fromBitmap(pointBitmap);
         //设置定位蓝点精度圆圈的填充颜色为透明色
         accuracyCircleFillColor = getContext().getResources().getColor(R.color.transparent);
@@ -520,7 +519,7 @@ public class CollRunRaceDetailFragmentView implements MvpView, SensorEventListen
                         //在地图上绘制起点
                         if (index == 0) {
                             //显示当前位置图标
-                            Bitmap pointBitmap = BitmapUtil.getBitmapFromDp(getContext(), BitmapFactory.decodeResource(getContext().getResources(), R.drawable.icon_start), 30, 30);
+                            Bitmap pointBitmap = BitmapUtil.getBitmapFromDp(getContext(), BitmapFactory.decodeResource(getContext().getResources(), R.drawable.pedometer_icon_start), 30, 30);
                             startMark = new MarkerOptions()
                                     .position(StartPoint)
                                     .icon(BitmapDescriptorFactory.fromBitmap(pointBitmap));
@@ -528,7 +527,7 @@ public class CollRunRaceDetailFragmentView implements MvpView, SensorEventListen
                             baiduMap.addOverlay(startMark);
                         } else if (index == listSize - 1) {
                             //显示当前位置图标
-                            Bitmap pointBitmap = BitmapUtil.getBitmapFromDp(getContext(), BitmapFactory.decodeResource(getContext().getResources(), R.drawable.icon_end), 30, 30);
+                            Bitmap pointBitmap = BitmapUtil.getBitmapFromDp(getContext(), BitmapFactory.decodeResource(getContext().getResources(), R.drawable.pedometer_icon_end), 30, 30);
                             endMark = new MarkerOptions()
                                     .position(points.get(points.size() - 1))
                                     .icon(BitmapDescriptorFactory.fromBitmap(pointBitmap))
@@ -648,7 +647,7 @@ public class CollRunRaceDetailFragmentView implements MvpView, SensorEventListen
         LatLng ll = new LatLng(Latitude, Longitude);
         //设置坐标
         //显示当前位置图标
-        Bitmap pointBitmap = BitmapUtil.getBitmapFromDp(fragment.getActivity(), BitmapFactory.decodeResource(fragment.getActivity().getResources(), R.drawable.run_map_icon_end), 22, 32);
+        Bitmap pointBitmap = BitmapUtil.getBitmapFromDp(fragment.getActivity(), BitmapFactory.decodeResource(fragment.getActivity().getResources(), R.drawable.pedometer_run_map_icon_end), 22, 32);
         currentMark = new MarkerOptions().position(ll).icon(BitmapDescriptorFactory.fromBitmap(pointBitmap));
         baiduMap.addOverlay(currentMark);
         MapStatus.Builder builder = new MapStatus.Builder();
@@ -8,7 +8,6 @@ import android.text.TextUtils;
 import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
-import android.widget.TextView;
 import com.baidu.mapapi.map.BaiduMap;
 import com.baidu.mapapi.map.MapView;
@@ -28,7 +27,6 @@ import com.baidu.trace.api.fence.MonitoredStatusResponse;
 import com.baidu.trace.api.fence.OnFenceListener;
 import com.baidu.trace.api.fence.UpdateFenceResponse;
 import com.baidu.trace.model.SortType;
-import com.bumptech.glide.Glide;
 import com.cnlive.libs.base.logic.Event;
 import com.cnlive.libs.base.logic.callback.FailureCallback;
 import com.cnlive.libs.base.logic.callback.SuccessCallback;
@@ -107,7 +105,7 @@ public class CollRunningFinishFragmentView implements MvpView, OnFenceListener {
                         LatLng markLatLng = new LatLng(point.getLatitude(), point.getLongitude());
                         if (null != markLatLng) {
                             //将点位显示到地图上
-                            Overlay overlay = MyMapUtil.setMapMarker(getContext(), baiduMap, markLatLng, R.drawable.icon_map_import);
+                            Overlay overlay = MyMapUtil.setMapMarker(getContext(), baiduMap, markLatLng, R.drawable.pedometer_icon_map_import);
                             if (null != overlay) {
                                 allMapOverlays.add(overlay);
                             }
@@ -327,7 +325,7 @@ public class CollRunningFinishFragmentView implements MvpView, OnFenceListener {
                 if (null != resultPoints) {
                     if (resultPoints.size() > 1) {
                         //绘制轨迹
-                        MyMapUtil.drawHistoryTrack(getContext(), baiduMap, resultPoints, SortType.asc, R.color.green_round, R.drawable.icon_start, R.drawable.icon_end);
+                        MyMapUtil.drawHistoryTrack(getContext(), baiduMap, resultPoints, SortType.asc, R.color.green_round, R.drawable.pedometer_icon_start, R.drawable.pedometer_icon_end);
                         MyMapUtil.setMapAutoZoom(baiduMap, resultPoints, -1.5f);
                     }
@@ -26,7 +26,6 @@ import com.baidu.mapapi.map.BitmapDescriptorFactory;
 import com.baidu.mapapi.map.MapStatus;
 import com.baidu.mapapi.map.MapStatusUpdateFactory;
 import com.baidu.mapapi.map.MapView;
-import com.baidu.mapapi.map.MarkerOptions;
 import com.baidu.mapapi.map.MyLocationConfiguration;
 import com.baidu.mapapi.map.MyLocationData;
 import com.baidu.mapapi.map.Overlay;
@@ -41,7 +40,6 @@ import com.cnlive.moudle.collectionTrace.service.CollStepService;
 import com.cnlive.moudle.collectionTrace.ui.activity.CollRunningFinishActivity;
 import com.cnlive.moudle.collectionTrace.ui.fragment.CollRunningMapFragment;
 import com.cnlive.moudle.collectionTrace.commonInfo.CollCommonInfo;
-import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.model.Constant;
 import com.cnlive.moudle.pedometer.model.MessageEvent;
 import com.cnlive.moudle.pedometer.net.bean.RunRaceDetailInfo;
@@ -164,7 +162,7 @@ public class CollRunningMapFragmentView implements MvpView, SensorEventListener 
                             public void success(List<LatLng> resultPoints) {
                                 if (null != resultPoints && resultPoints.size() > 1) {
                                     //绘制历史轨迹
-                                    MyMapUtil.drawHistoryTrack(getContext(), baiduMap, resultPoints, SortType.asc, R.color.green_round, R.drawable.icon_start, 0);
+                                    MyMapUtil.drawHistoryTrack(getContext(), baiduMap, resultPoints, SortType.asc, R.color.green_round, R.drawable.pedometer_icon_start, 0);
                                     //将最后一个点添加到用户走的线中
                                     currentWalkPoints = new ArrayList<>();
                                     currentWalkPoints.add(resultPoints.get(resultPoints.size() - 1));
@@ -181,7 +179,7 @@ public class CollRunningMapFragmentView implements MvpView, SensorEventListener 
                             //把起点添加到用户走的实时轨迹中
                             currentWalkPoints = new ArrayList<>();
                             currentWalkPoints.add(startLatLng);
-                            List<Overlay> resultOverlays = MyMapUtil.setStartMarker(getContext(), baiduMap, startLatLng, R.drawable.icon_start);
+                            List<Overlay> resultOverlays = MyMapUtil.setStartMarker(getContext(), baiduMap, startLatLng, R.drawable.pedometer_icon_start);
                             if (null != resultOverlays) {
                                 this.allMapOverlays.addAll(resultOverlays);
                             }
@@ -203,7 +201,7 @@ public class CollRunningMapFragmentView implements MvpView, SensorEventListener 
                         LatLng markLatLng = new LatLng(point.getLatitude(), point.getLongitude());
                         if (null != markLatLng) {
                             //将点位显示到地图上
-                            Overlay overlay = MyMapUtil.setMapMarker(getContext(), baiduMap, markLatLng, R.drawable.icon_map_import);
+                            Overlay overlay = MyMapUtil.setMapMarker(getContext(), baiduMap, markLatLng, R.drawable.pedometer_icon_map_import);
                             if (null != overlay) {
                                 allMapOverlays.add(overlay);
                             }
@@ -382,7 +380,7 @@ public class CollRunningMapFragmentView implements MvpView, SensorEventListener 
                     collectPoint.setPointName(currentAddress);
                     CollStepUtil.setCollImportPoints(getContext(), CollCommonInfo.getUserId(getContext()), collectPoint);
                     //将点位显示到地图上
-                    Overlay overlay = MyMapUtil.setMapMarker(getContext(), baiduMap, currentImportLatLng, R.drawable.icon_map_import);
+                    Overlay overlay = MyMapUtil.setMapMarker(getContext(), baiduMap, currentImportLatLng, R.drawable.pedometer_icon_map_import);
                     if (null != overlay) {
                         allMapOverlays.add(overlay);
                     }
@@ -515,7 +513,7 @@ public class CollRunningMapFragmentView implements MvpView, SensorEventListener 
         //设置定位模式, 默认为 LocationMode.NORMAL 普通态
         mCurrentMode = MyLocationConfiguration.LocationMode.NORMAL;
         // 设置定位图标修改为自定义marker
-        Bitmap pointBitmap = BitmapUtil.getBitmapFromDp(getContext(), BitmapFactory.decodeResource(getContext().getResources(), R.drawable.rt_ic_location), 40, 40);
+        Bitmap pointBitmap = BitmapUtil.getBitmapFromDp(getContext(), BitmapFactory.decodeResource(getContext().getResources(), R.drawable.pedometer_rt_ic_location), 40, 40);
         mCurrentMarker = BitmapDescriptorFactory.fromBitmap(pointBitmap);
         //设置定位蓝点精度圆圈的填充颜色为透明色
         accuracyCircleFillColor = getContext().getResources().getColor(R.color.transparent);
@@ -619,7 +617,7 @@ public class CollRunningMapFragmentView implements MvpView, SensorEventListener 
                 //设置图标
                 if (fragment.binding.ivGpsState.getTag() == null || !"GPS_ACCURACY_UNKNOWN".equals(fragment.binding.ivGpsState.getTag().toString())) {
                     fragment.binding.ivGpsState.setTag("GPS_ACCURACY_UNKNOWN");
-                    fragment.binding.ivGpsState.setBackground(getContext().getResources().getDrawable(R.drawable.rt_training_gps_0));
+                    fragment.binding.ivGpsState.setBackground(getContext().getResources().getDrawable(R.drawable.pedometer_rt_training_gps_0));
                 }
             }
             //GPS 质量判断差
@@ -633,7 +631,7 @@ public class CollRunningMapFragmentView implements MvpView, SensorEventListener 
                 //设置图标
                 if (fragment.binding.ivGpsState.getTag() == null || !"GPS_ACCURACY_BAD".equals(fragment.binding.ivGpsState.getTag().toString())) {
                     fragment.binding.ivGpsState.setTag("GPS_ACCURACY_BAD");
-                    fragment.binding.ivGpsState.setBackground(getContext().getResources().getDrawable(R.drawable.rt_training_gps_1));
+                    fragment.binding.ivGpsState.setBackground(getContext().getResources().getDrawable(R.drawable.pedometer_rt_training_gps_1));
                 }
             }
             //GPS 质量判断中等
@@ -644,7 +642,7 @@ public class CollRunningMapFragmentView implements MvpView, SensorEventListener 
                 //设置图标
                 if (fragment.binding.ivGpsState.getTag() == null || !"GPS_ACCURACY_MID".equals(fragment.binding.ivGpsState.getTag().toString())) {
                     fragment.binding.ivGpsState.setTag("GPS_ACCURACY_MID");
-                    fragment.binding.ivGpsState.setBackground(getContext().getResources().getDrawable(R.drawable.rt_training_gps_2));
+                    fragment.binding.ivGpsState.setBackground(getContext().getResources().getDrawable(R.drawable.pedometer_rt_training_gps_2));
                 }
             }//GPS 质量判断好
             else if (location.getGpsAccuracyStatus() == BDLocation.GPS_ACCURACY_GOOD) {
@@ -654,7 +652,7 @@ public class CollRunningMapFragmentView implements MvpView, SensorEventListener 
                 //设置图标
                 if (fragment.binding.ivGpsState.getTag() == null || !"GPS_ACCURACY_GOOD".equals(fragment.binding.ivGpsState.getTag().toString())) {
                     fragment.binding.ivGpsState.setTag("GPS_ACCURACY_GOOD");
-                    fragment.binding.ivGpsState.setBackground(getContext().getResources().getDrawable(R.drawable.rt_training_gps_3));
+                    fragment.binding.ivGpsState.setBackground(getContext().getResources().getDrawable(R.drawable.pedometer_rt_training_gps_3));
                 }
             }
             //过滤定位精度
 package com.cnlive.moudle.collectionTrace.frame.view;
-import android.app.Activity;
 import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
 import android.graphics.Point;
 import android.os.Handler;
 import android.support.v7.widget.LinearLayoutManager;
@@ -26,10 +23,7 @@ import com.baidu.trace.api.fence.CreateFenceResponse;
 import com.baidu.trace.api.fence.DeleteFenceRequest;
 import com.baidu.trace.api.fence.DeleteFenceResponse;
 import com.baidu.trace.api.fence.DeleteMonitoredPersonResponse;
-import com.baidu.trace.api.fence.FenceInfo;
-import com.baidu.trace.api.fence.FenceListRequest;
 import com.baidu.trace.api.fence.FenceListResponse;
-import com.baidu.trace.api.fence.FenceShape;
 import com.baidu.trace.api.fence.HistoryAlarmResponse;
 import com.baidu.trace.api.fence.ListMonitoredPersonResponse;
 import com.baidu.trace.api.fence.MonitoredStatusByLocationResponse;
@@ -38,20 +32,15 @@ import com.baidu.trace.api.fence.OnFenceListener;
 import com.baidu.trace.api.fence.UpdateFenceResponse;
 import com.baidu.trace.model.CoordType;
 import com.baidu.trace.model.SortType;
-import com.bumptech.glide.Glide;
 import com.cnlive.libs.base.util.AlertUtil;
 import com.cnlive.moudle.collectionTrace.frame.presenter.RaceNameListPresenter;
 import com.cnlive.moudle.collectionTrace.model.CollectPoint;
 import com.cnlive.moudle.collectionTrace.model.RaceNameListInfo;
 import com.cnlive.moudle.collectionTrace.ui.adapter.CollFinishDetaiAdapter;
-import com.cnlive.moudle.collectionTrace.ui.fragment.CollRunRaceDetailFragment;
 import com.cnlive.moudle.collectionTrace.ui.fragment.CollTraceListDetailFragment;
-import com.cnlive.moudle.collectionTrace.utils.CollStepUtil;
-import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.model.Constant;
 import com.cnlive.moudle.pedometer.model.MessageEvent;
 import com.cnlive.moudle.pedometer.ui.widget.SelectDialog;
-import com.cnlive.moudle.pedometer.utils.BitmapUtil;
 import com.cnlive.moudle.pedometer.utils.GsonUtil;
 import com.cnlive.moudle.pedometer.utils.MyMapUtil;
 import com.cnlive.moudle.pedometer.utils.NetUtil;
@@ -61,7 +50,6 @@ import com.cnlive.moudle.pedometer.utils.TimeUtil;
 import com.cnlive.strike.application.GlideApp;
 import com.example.moudle_pedometer.R;
 import com.hannesdorfmann.mosby3.mvp.MvpView;
-import com.sothree.slidinguppanel.SlidingUpPanelLayout;
 import org.greenrobot.eventbus.EventBus;
@@ -288,7 +276,7 @@ public class CollTraceListDetailFragmentView implements MvpView, OnFenceListener
                             return;
                         }
                         if (resultPoints.size() > 1) {
-                            MyMapUtil.drawHistoryTrack(getContext(), baiduMap, resultPoints, SortType.asc, R.color.green_round, R.drawable.icon_start, R.drawable.icon_end);
+                            MyMapUtil.drawHistoryTrack(getContext(), baiduMap, resultPoints, SortType.asc, R.color.green_round, R.drawable.pedometer_icon_start, R.drawable.pedometer_icon_end);
                             MyMapUtil.setMapAutoZoom(baiduMap, resultPoints, -0.5f);
@@ -297,7 +285,7 @@ public class CollTraceListDetailFragmentView implements MvpView, OnFenceListener
                                 //开始在地图上绘制打点信息
                                 for (int i = 0; i < finalResultCollectPoints.size(); i++) {
                                     LatLng latLng = new LatLng(finalResultCollectPoints.get(i).getLatitude(), finalResultCollectPoints.get(i).getLongitude());
-                                    MyMapUtil.setMapMarker(getContext(), baiduMap, latLng, R.drawable.icon_map_import);
+                                    MyMapUtil.setMapMarker(getContext(), baiduMap, latLng, R.drawable.pedometer_icon_map_import);
                                 }
                             }
@@ -11,7 +11,6 @@ import com.cnlive.moudle.pedometer.net.bean.BaseInfo;
 import com.cnlive.moudle.pedometer.net.bean.RunLineInfo;
 import com.example.moudle_pedometer.R;
 import com.hannesdorfmann.mosby3.mvp.MvpView;
-import com.qmuiteam.qmui.widget.dialog.QMUITipDialog;
 import com.scwang.smartrefresh.layout.footer.ClassicsFooter;
 import com.scwang.smartrefresh.layout.header.ClassicsHeader;
@@ -32,7 +31,7 @@ public class RaceListView implements MvpView {
     }
     public void initView(){
-        fragment.binding.topbar.addLeftImageButton(R.drawable.top_back_black, R.id.fragment_back).setOnClickListener(v -> {
+        fragment.binding.topbar.addLeftImageButton(R.drawable.pedometer_top_back_black, R.id.fragment_back).setOnClickListener(v -> {
             fragment.getActivity().finish();
         });
         fragment.binding.topbar.setTitle("赛事列表");
@@ -9,7 +9,6 @@ import android.hardware.SensorEvent;
 import android.hardware.SensorEventListener;
 import android.hardware.SensorManager;
 import android.os.Build;
-import android.support.v4.content.ContextCompat;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
@@ -29,16 +28,13 @@ import com.baidu.mapapi.map.MyLocationConfiguration;
 import com.baidu.mapapi.map.MyLocationData;
 import com.baidu.mapapi.map.UiSettings;
 import com.baidu.mapapi.model.LatLng;
-import com.cnlive.libs.base.util.AlertUtil;
 import com.cnlive.moudle.collectionTrace.service.CollKeepLiveService;
 import com.cnlive.moudle.collectionTrace.service.CollStepService;
-import com.cnlive.moudle.collectionTrace.ui.activity.CollRunRaceDetailActivity;
 import com.cnlive.moudle.collectionTrace.ui.activity.CollRunningFinishActivity;
 import com.cnlive.moudle.collectionTrace.ui.activity.CollRunningMapActivity;
 import com.cnlive.moudle.collectionTrace.ui.fragment.StartTraceFragment;
 import com.cnlive.moudle.collectionTrace.commonInfo.CollCommonInfo;
 import com.cnlive.moudle.collectionTrace.utils.CollStepUtil;
-import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.model.Constant;
 import com.cnlive.moudle.pedometer.net.bean.RunRaceDetailInfo;
 import com.cnlive.moudle.pedometer.sql.entity.CollUserStepEntity;
@@ -46,7 +42,6 @@ import com.cnlive.moudle.pedometer.ui.widget.SelectDialog;
 import com.cnlive.moudle.pedometer.utils.BitmapUtil;
 import com.cnlive.moudle.pedometer.utils.GsonUtil;
 import com.cnlive.moudle.pedometer.utils.MyMapUtil;
-import com.cnlive.moudle.pedometer.utils.NetUtil;
 import com.cnlive.moudle.pedometer.utils.QMUITipDialogUtil;
 import com.cnlive.moudle.pedometer.utils.ServiceUtils;
 import com.cnlive.moudle.pedometer.utils.TimeUtil;
@@ -322,7 +317,7 @@ public class StartTraceFragmentView implements MvpView, SensorEventListener {
         //设置定位模式, 默认为 LocationMode.NORMAL 普通态
         mCurrentMode = MyLocationConfiguration.LocationMode.NORMAL;
         // 设置定位图标修改为自定义marker
-        Bitmap pointBitmap = BitmapUtil.getBitmapFromDp(getContext(), BitmapFactory.decodeResource(getContext().getResources(), R.drawable.rt_ic_location), 50, 50);
+        Bitmap pointBitmap = BitmapUtil.getBitmapFromDp(getContext(), BitmapFactory.decodeResource(getContext().getResources(), R.drawable.pedometer_rt_ic_location), 50, 50);
         mCurrentMarker = BitmapDescriptorFactory.fromBitmap(pointBitmap);
         //设置定位蓝点精度圆圈的填充颜色为透明色
         accuracyCircleFillColor = getContext().getResources().getColor(R.color.transparent);
@@ -42,19 +42,19 @@ public class CollFinishDetaiAdapter extends RecyclerView.Adapter&lt;CollFinishDetai
         }
         if (0 == i) {
             //起点
-            myViewHolder.view_circle.setBackground(context.getResources().getDrawable(R.drawable.shape_circle_green));
+            myViewHolder.view_circle.setBackground(context.getResources().getDrawable(R.drawable.pedometer_shape_circle_green));
             myViewHolder.tv_point_type_tip.setText(context.getResources().getString(R.string.layout_street_start_point));
             myViewHolder.view_line.setVisibility(View.VISIBLE);
         } else if (list.size() - 1 == i) {
             //终点
-            myViewHolder.view_circle.setBackground(context.getResources().getDrawable(R.drawable.shape_circle_red));
+            myViewHolder.view_circle.setBackground(context.getResources().getDrawable(R.drawable.pedometer_shape_circle_red));
             myViewHolder.tv_point_type_tip.setText(context.getResources().getString(R.string.layout_street_end_point));
             myViewHolder.view_line.setVisibility(View.GONE);
         } else {
             myViewHolder.view_line.setVisibility(View.VISIBLE);
             //打点
-            myViewHolder.view_circle.setBackground(context.getResources().getDrawable(R.drawable.shape_circle_gray));
+            myViewHolder.view_circle.setBackground(context.getResources().getDrawable(R.drawable.pedometer_shape_circle_gray));
 //            myViewHolder.tv_point_type_tip.setText(context.getResources().getString(R.string.layout_coll_take_point_text));
             if (i > 0) {
                 myViewHolder.tv_point_type_tip.setText("(打点" + i + ")");
@@ -10,7 +10,6 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
-import com.bumptech.glide.Glide;
 import com.cnlive.moudle.collectionTrace.model.RaceNameListInfo;
 import com.cnlive.moudle.pedometer.utils.TimeUtil;
 import com.example.moudle_pedometer.R;
@@ -71,15 +70,15 @@ public class RaceNameListAdapter extends RecyclerView.Adapter&lt;RaceNameListAdapte
         if(list.get(i).getIsEnable() == 0){
             myViewHolder.has_path.setText("已绑定轨迹");
             myViewHolder.has_path.setTextColor(context.getResources().getColor(R.color.text_gray99));
-            myViewHolder.has_path.setBackground(context.getResources().getDrawable(R.drawable.gray_raduis_bg));
+            myViewHolder.has_path.setBackground(context.getResources().getDrawable(R.drawable.pedometer_gray_raduis_bg));
             myViewHolder.delect_path.setTextColor(context.getResources().getColor(R.color.text_gray99));
-            myViewHolder.delect_path.setBackground(context.getResources().getDrawable(R.drawable.gray_raduis_bg));
+            myViewHolder.delect_path.setBackground(context.getResources().getDrawable(R.drawable.pedometer_gray_raduis_bg));
         }else {
             myViewHolder.has_path.setText("绑定轨迹");
             myViewHolder.has_path.setTextColor(context.getResources().getColor(R.color.green_tx));
-            myViewHolder.has_path.setBackground(context.getResources().getDrawable(R.drawable.green_raduis_bg));
+            myViewHolder.has_path.setBackground(context.getResources().getDrawable(R.drawable.pedometer_green_raduis_bg));
             myViewHolder.delect_path.setTextColor(context.getResources().getColor(R.color.green_tx));
-            myViewHolder.delect_path.setBackground(context.getResources().getDrawable(R.drawable.green_raduis_bg));
+            myViewHolder.delect_path.setBackground(context.getResources().getDrawable(R.drawable.pedometer_green_raduis_bg));
         }
         myViewHolder.has_path.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -3,21 +3,16 @@ package com.cnlive.moudle.pedometer.frame.presenter;
 import android.app.Activity;
 import android.graphics.Point;
 import android.text.TextUtils;
-import android.widget.Toast;
 import com.baidu.mapapi.map.MapStatus;
-import com.baidu.mapapi.map.MapStatusUpdate;
 import com.baidu.mapapi.map.MapStatusUpdateFactory;
 import com.baidu.mapapi.model.LatLng;
 import com.baidu.trace.LBSTraceClient;
 import com.baidu.trace.model.SortType;
 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.frame.view.ALLScoreDetailFragmentView;
-import com.cnlive.moudle.pedometer.model.Constant;
 import com.cnlive.moudle.pedometer.model.RunningFinishBean;
-import com.cnlive.moudle.pedometer.sql.entity.FailedEntity;
 import com.cnlive.moudle.pedometer.ui.widget.SelectDialog;
-import com.cnlive.moudle.pedometer.utils.GsonUtil;
 import com.cnlive.moudle.pedometer.utils.MyMapUtil;
 import com.cnlive.moudle.pedometer.utils.QMUITipDialogUtil;
 import com.cnlive.moudle.pedometer.utils.ScreenUtil;
@@ -73,12 +68,12 @@ public class ALLScoreDetailFragmentPresenter extends MvpBasePresenter&lt;ALLScoreDe
                         if (resultPoints.size() > 1) {
                             //用户暂停了
                             if (runningFinishBean.isPause()) {
-                                MyMapUtil.drawHistoryTrack(context, getView().baiduMap, resultPoints, SortType.asc, R.color.red, R.drawable.icon_start, 0);
+                                MyMapUtil.drawHistoryTrack(context, getView().baiduMap, resultPoints, SortType.asc, R.color.red, R.drawable.pedometer_icon_start, 0);
                                 allResultList.addAll(resultPoints);
                             }
                             //用户没有暂停
                             else {
-                                MyMapUtil.drawHistoryTrack(context, getView().baiduMap, resultPoints, SortType.asc, R.color.red, R.drawable.icon_start, R.drawable.icon_end);
+                                MyMapUtil.drawHistoryTrack(context, getView().baiduMap, resultPoints, SortType.asc, R.color.red, R.drawable.pedometer_icon_start, R.drawable.pedometer_icon_end);
                                 //设置地图自动缩放
                                 MyMapUtil.setMapAutoZoom(getView().baiduMap, resultPoints, -0.8f);
                             }
@@ -108,7 +103,7 @@ public class ALLScoreDetailFragmentPresenter extends MvpBasePresenter&lt;ALLScoreDe
                             @Override
                             public void success(List<LatLng> resultPoints) {
                                 if (null != resultPoints && resultPoints.size() > 1) {
-                                    MyMapUtil.drawHistoryTrack(context, getView().baiduMap, resultPoints, SortType.asc, R.color.red, 0, R.drawable.icon_end);
+                                    MyMapUtil.drawHistoryTrack(context, getView().baiduMap, resultPoints, SortType.asc, R.color.red, 0, R.drawable.pedometer_icon_end);
                                     //设置地图自动缩放
                                     allResultList.addAll(resultPoints);
                                     MyMapUtil.setMapAutoZoom(getView().baiduMap, allResultList, -0.8f);
@@ -5,7 +5,6 @@ import android.content.Context;
 import android.graphics.Point;
 import android.text.TextUtils;
 import android.util.Log;
-import android.widget.Toast;
 import com.baidu.mapapi.map.MapStatus;
 import com.baidu.mapapi.map.MapStatusUpdateFactory;
@@ -220,7 +219,7 @@ public class RunningFinishFragmetPresenter extends MvpBasePresenter&lt;RunningFinis
                         QMUITipDialogUtil.dismessDialog();
                         //判断用户是否点击暂停按钮
                         if (userStepEntity.getPauseCount() == 0) {
-                            MyMapUtil.drawHistoryTrack(context, getView().baiduMap, resultPoints, SortType.asc, R.color.red, R.drawable.icon_start, R.drawable.icon_end);
+                            MyMapUtil.drawHistoryTrack(context, getView().baiduMap, resultPoints, SortType.asc, R.color.red, R.drawable.pedometer_icon_start, R.drawable.pedometer_icon_end);
                             MyMapUtil.setMapAutoZoom(getView().baiduMap, resultPoints, -1.5f);
                             if (null != getView()) {
                                 MapStatus.Builder builder = new MapStatus.Builder();
@@ -235,7 +234,7 @@ public class RunningFinishFragmetPresenter extends MvpBasePresenter&lt;RunningFinis
                             checkUserIsFinish(resultPoints, userStepEntity, runningFinishBean, context);
                             saveRouteData(context, userStepEntity, runningFinishBean);
                         } else {
-                            MyMapUtil.drawHistoryTrack(context, getView().baiduMap, resultPoints, SortType.asc, R.color.red, R.drawable.icon_start, 0);
+                            MyMapUtil.drawHistoryTrack(context, getView().baiduMap, resultPoints, SortType.asc, R.color.red, R.drawable.pedometer_icon_start, 0);
                         }
                         //如果点击暂停
@@ -250,7 +249,7 @@ public class RunningFinishFragmetPresenter extends MvpBasePresenter&lt;RunningFinis
                                         allResults.addAll(resultPoints);
                                         //判断用户是否完成
                                         if (importPoints != null) {
-                                            MyMapUtil.drawHistoryTrack(context, getView().baiduMap, resultPoints, SortType.asc, R.color.red, 0, R.drawable.icon_end);
+                                            MyMapUtil.drawHistoryTrack(context, getView().baiduMap, resultPoints, SortType.asc, R.color.red, 0, R.drawable.pedometer_icon_end);
                                             MyMapUtil.setMapAutoZoom(getView().baiduMap, allResults, -2f);
                                             if (null != getView()) {
                                                 MapStatus.Builder builder = new MapStatus.Builder();
@@ -40,7 +40,6 @@ import com.example.moudle_pedometer.R;
 import com.hannesdorfmann.mosby3.mvp.MvpBasePresenter;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 public class RunningMapFragmentPresenter extends MvpBasePresenter<RunningMapFragmentView> {
@@ -345,9 +344,9 @@ public class RunningMapFragmentPresenter extends MvpBasePresenter&lt;RunningMapFrag
 //
 //                            }
                             if (isPause) {
-                                MyMapUtil.drawRealTimeTrack(context, getView().baiduMap, resultPoints, SortType.asc, R.color.red, R.drawable.icon_start);
+                                MyMapUtil.drawRealTimeTrack(context, getView().baiduMap, resultPoints, SortType.asc, R.color.red, R.drawable.pedometer_icon_start);
                             } else {
-                                MyMapUtil.drawHistoryTrack(context, getView().baiduMap, resultPoints, SortType.asc, R.color.red, R.drawable.icon_start, 0);
+                                MyMapUtil.drawHistoryTrack(context, getView().baiduMap, resultPoints, SortType.asc, R.color.red, R.drawable.pedometer_icon_start, 0);
                             }
                         }
                     }
@@ -374,7 +373,7 @@ public class RunningMapFragmentPresenter extends MvpBasePresenter&lt;RunningMapFrag
                             }
                         }
                         //开始划线
-                        MyMapUtil.drawHistoryTrack(context, getView().baiduMap, resultPoints, SortType.asc, R.color.red, 0, R.drawable.icon_end);
+                        MyMapUtil.drawHistoryTrack(context, getView().baiduMap, resultPoints, SortType.asc, R.color.red, 0, R.drawable.pedometer_icon_end);
                     }
                 }
@@ -4,7 +4,6 @@ import android.app.Activity;
 import android.os.Handler;
 import android.text.TextUtils;
 import android.util.Log;
-import android.widget.Toast;
 import com.baidu.mapapi.model.LatLng;
 import com.baidu.trace.LBSTraceClient;
@@ -17,13 +16,10 @@ import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.frame.view.UploadFailDetailFragmentView;
 import com.cnlive.moudle.pedometer.model.Constant;
 import com.cnlive.moudle.pedometer.model.MessageEvent;
-import com.cnlive.moudle.pedometer.model.RunningFinishBean;
 import com.cnlive.moudle.pedometer.net.ApiServiceRunLin;
 import com.cnlive.moudle.pedometer.net.SubscriptionRequest;
 import com.cnlive.moudle.pedometer.net.bean.BaseInfo;
 import com.cnlive.moudle.pedometer.sql.entity.FailedEntity;
-import com.cnlive.moudle.pedometer.sql.entity.UserStepEntity;
-import com.cnlive.moudle.pedometer.ui.activity.LineUpAgainActivity;
 import com.cnlive.moudle.pedometer.ui.widget.SelectDialog;
 import com.cnlive.moudle.pedometer.utils.GsonUtil;
 import com.cnlive.moudle.pedometer.utils.MyMapUtil;
@@ -91,11 +87,11 @@ public class UploadFailDetailFragmentPresenter extends MvpBasePresenter&lt;UploadFa
                     //划线
                     if (resultPoints.size() > 1) {
                         if (!failedEntity.getIsPause()) {
-                            MyMapUtil.drawHistoryTrack(context, getView().baiduMap, resultPoints, SortType.asc, R.color.red, R.drawable.icon_start, R.drawable.icon_end);
+                            MyMapUtil.drawHistoryTrack(context, getView().baiduMap, resultPoints, SortType.asc, R.color.red, R.drawable.pedometer_icon_start, R.drawable.pedometer_icon_end);
                             //设置地图自动缩放
                             MyMapUtil.setMapAutoZoom(getView().baiduMap, resultPoints, -0.8f);
                         } else {
-                            MyMapUtil.drawHistoryTrack(context, getView().baiduMap, resultPoints, SortType.asc, R.color.red, R.drawable.icon_start, 0);
+                            MyMapUtil.drawHistoryTrack(context, getView().baiduMap, resultPoints, SortType.asc, R.color.red, R.drawable.pedometer_icon_start, 0);
                         }
                     }
@@ -141,7 +137,7 @@ public class UploadFailDetailFragmentPresenter extends MvpBasePresenter&lt;UploadFa
                                 public void success(List<LatLng> resultPoints) {
                                     if (resultPoints != null && resultPoints.size() > 1) {
                                         //开始画暂停到结束的轨迹
-                                        MyMapUtil.drawHistoryTrack(context, getView().baiduMap, resultPoints, SortType.asc, R.color.red, 0, R.drawable.icon_end);
+                                        MyMapUtil.drawHistoryTrack(context, getView().baiduMap, resultPoints, SortType.asc, R.color.red, 0, R.drawable.pedometer_icon_end);
                                         //开始合并查出来的数据
                                         if (allResultPoints != null) {
                                             allResultPoints.addAll(resultPoints);
@@ -15,12 +15,9 @@ import com.cnlive.moudle.pedometer.ui.widget.SelectDialog;
 import com.cnlive.moudle.pedometer.utils.StepUtil;
 import com.example.moudle_pedometer.R;
 import com.hannesdorfmann.mosby3.mvp.MvpView;
-import com.scwang.smartrefresh.layout.footer.ClassicsFooter;
-import com.scwang.smartrefresh.layout.header.ClassicsHeader;
 import org.greenrobot.eventbus.EventBus;
-import java.util.ArrayList;
 import java.util.List;
@@ -37,7 +34,7 @@ public class LineUpAgainView implements MvpView {
     }
     public void initView() {
-        fragment.binding.topbar.addLeftImageButton(R.drawable.top_back_black, R.id.fragment_back).setOnClickListener(v -> {
+        fragment.binding.topbar.addLeftImageButton(R.drawable.pedometer_top_back_black, R.id.fragment_back).setOnClickListener(v -> {
             fragment.getActivity().finish();
         });
         fragment.binding.topbar.setTitle("重新上传");
 package com.cnlive.moudle.pedometer.frame.view;
 import android.app.Activity;
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
 import android.os.Build;
 import android.text.TextUtils;
-import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.ViewTreeObserver;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.widget.LinearLayout;
 import com.alibaba.android.arouter.launcher.ARouter;
-import com.baidu.location.LocationClient;
-import com.baidu.location.LocationClientOption;
 import com.baidu.mapapi.map.BaiduMap;
-import com.baidu.mapapi.map.BitmapDescriptorFactory;
 import com.baidu.mapapi.map.MapView;
-import com.baidu.mapapi.map.MyLocationConfiguration;
 import com.baidu.mapapi.map.UiSettings;
 import com.baidu.mapapi.model.LatLng;
-import com.baidu.mapapi.search.route.RoutePlanSearch;
-import com.baidu.mapapi.utils.DistanceUtil;
 import com.baidu.trace.LBSTraceClient;
 import com.baidu.trace.model.SortType;
 import com.cnlive.libs.base.application.AppConfig;
@@ -33,17 +22,10 @@ import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.model.Constant;
 import com.cnlive.moudle.pedometer.net.bean.RunRaceDetailInfo;
 import com.cnlive.moudle.pedometer.ui.activity.RaceRecordActivity;
-import com.cnlive.moudle.pedometer.ui.activity.RegistrationInfoActivity;
 import com.cnlive.moudle.pedometer.ui.activity.TakePartActivity;
 import com.cnlive.moudle.pedometer.ui.fragment.OnGoingFragment;
-import com.cnlive.moudle.pedometer.ui.widget.SelectDialog;
-import com.cnlive.moudle.pedometer.ui.widget.TipDialog;
-import com.cnlive.moudle.pedometer.utils.BitmapUtil;
-import com.cnlive.moudle.pedometer.utils.GsonUtil;
 import com.cnlive.moudle.pedometer.utils.MyMapUtil;
-import com.cnlive.moudle.pedometer.utils.QMUITipDialogUtil;
 import com.cnlive.moudle.pedometer.utils.ScreenUtil;
-import com.cnlive.moudle.pedometer.utils.StepUtil;
 import com.cnlive.moudle.pedometer.utils.TimeUtil;
 import com.cnlive.moudle.pedometer.utils.WebViewUtil;
 import com.cnlive.strike.application.GlideApp;
@@ -126,7 +108,7 @@ public class OnGoingFragmentView implements MvpView {
                     @Override
                     public void success(List<LatLng> resultPoints) {
                         if (resultPoints != null && resultPoints.size() > 1) {
-                            MyMapUtil.drawServerLineTrack(getContext(), baiduMap, resultPoints, SortType.asc, R.color.green_round, R.drawable.icon_start, R.drawable.icon_end);
+                            MyMapUtil.drawServerLineTrack(getContext(), baiduMap, resultPoints, SortType.asc, R.color.green_round, R.drawable.pedometer_icon_start, R.drawable.pedometer_icon_end);
                             //设置地图自动缩放
                             MyMapUtil.setMapAutoZoom(baiduMap, resultPoints, -1.5f);
@@ -5,7 +5,6 @@ import android.text.TextUtils;
 import android.view.View;
 import com.cnlive.libs.base.util.AlertUtil;
-import com.cnlive.moudle.collectionTrace.ui.activity.CollRunningFinishActivity;
 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.model.RunningFinishBean;
 import com.cnlive.moudle.pedometer.net.bean.BaseInfo;
@@ -18,7 +17,6 @@ import com.cnlive.moudle.pedometer.ui.fragment.RaceRecorFragment;
 import com.cnlive.moudle.pedometer.utils.TimeUtil;
 import com.example.moudle_pedometer.R;
 import com.hannesdorfmann.mosby3.mvp.MvpView;
-import com.qmuiteam.qmui.widget.dialog.QMUITipDialog;
 import com.scwang.smartrefresh.layout.footer.ClassicsFooter;
 import com.scwang.smartrefresh.layout.header.ClassicsHeader;
@@ -39,7 +37,7 @@ public class RaceRecorView implements MvpView {
     }
     public void initView() {
-        fragment.binding.topbar.addLeftImageButton(R.drawable.top_back_black, R.id.fragment_back).setOnClickListener(v -> {
+        fragment.binding.topbar.addLeftImageButton(R.drawable.pedometer_top_back_black, R.id.fragment_back).setOnClickListener(v -> {
             fragment.getActivity().finish();
         });
         fragment.binding.topbar.setTitle("全部成绩");
@@ -107,7 +105,7 @@ public class RaceRecorView implements MvpView {
                         }
                     }
                 });
-                fragment.binding.topbar.addRightImageButton(R.drawable.share_img, R.id.fragment_more)
+                fragment.binding.topbar.addRightImageButton(R.drawable.pedometer_share_img, R.id.fragment_more)
                         .setOnClickListener(v -> {
                             //分享
                             ShareRecordActivity.newInstance(fragment.getActivity(), fragment.raceTitle, bestResultBean.getMileage(), bestResultBean.getStep(),
@@ -6,7 +6,6 @@ import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.resource.bitmap.CircleCrop;
 import com.bumptech.glide.request.RequestOptions;
 import com.cnlive.libs.base.util.AlertUtil;
-import com.cnlive.media.picker.utils.AlertDialogUtils;
 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.model.Constant;
 import com.cnlive.moudle.pedometer.model.MessageEvent;
@@ -43,7 +42,7 @@ public class RegistrationInfoView implements MvpView, OnDateSetListener {
     public void initView() {
         userId = CommonInfo.getUserId(fragment.getActivity());
-        fragment.binding.topbar.addLeftImageButton(R.drawable.top_back_black, R.id.fragment_back).setOnClickListener(v -> {
+        fragment.binding.topbar.addLeftImageButton(R.drawable.pedometer_top_back_black, R.id.fragment_back).setOnClickListener(v -> {
             fragment.getActivity().finish();
         });
         fragment.binding.topbar.setTitle("填写报名信息");
@@ -57,7 +56,7 @@ public class RegistrationInfoView implements MvpView, OnDateSetListener {
         if (CommonInfo.getUserIcon(fragment.getActivity()) != null && CommonInfo.getUserIcon(fragment.getActivity()).trim().length() > 0) {
             Glide.with(fragment.getActivity()).load(CommonInfo.getUserIcon(fragment.getActivity()))
-                    .apply(RequestOptions.bitmapTransform(new CircleCrop()).placeholder(R.drawable.ic_icon)).into(fragment.binding.userIcon);
+                    .apply(RequestOptions.bitmapTransform(new CircleCrop()).placeholder(R.drawable.pedometer_ic_icon)).into(fragment.binding.userIcon);
         }
         if(CommonInfo.getSex(fragment.getActivity(),userId) != null && CommonInfo.getSex(fragment.getActivity(),userId).trim().length() > 0){
 package com.cnlive.moudle.pedometer.frame.view;
-import android.app.Activity;
 import android.app.Service;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Handler;
 import android.os.SystemClock;
 import android.os.Vibrator;
-import android.support.v4.content.ContextCompat;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
 import android.widget.Chronometer;
-import android.widget.Toast;
 import com.baidu.location.BDAbstractLocationListener;
 import com.baidu.location.BDLocation;
 import com.baidu.location.LocationClient;
 import com.baidu.location.LocationClientOption;
-import com.baidu.mapapi.map.MapStatus;
-import com.baidu.mapapi.map.MyLocationData;
 import com.baidu.mapapi.model.LatLng;
 import com.baidu.mapapi.utils.DistanceUtil;
 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
@@ -33,8 +28,6 @@ import com.cnlive.moudle.pedometer.service.KeepLiveService;
 import com.cnlive.moudle.pedometer.service.StepService;
 import com.cnlive.moudle.pedometer.sql.entity.FailedEntity;
 import com.cnlive.moudle.pedometer.sql.entity.UserStepEntity;
-import com.cnlive.moudle.pedometer.ui.activity.LineUpAgainActivity;
-import com.cnlive.moudle.pedometer.ui.activity.RunRaceDetailActivity;
 import com.cnlive.moudle.pedometer.ui.activity.RunningFinishActivity;
 import com.cnlive.moudle.pedometer.ui.activity.RunningMapActivity;
 import com.cnlive.moudle.pedometer.ui.fragment.RunMainFragment;
@@ -43,11 +36,8 @@ import com.cnlive.moudle.pedometer.ui.widget.TipDialog;
 import com.cnlive.moudle.pedometer.utils.ButtonAnimUtil;
 import com.cnlive.moudle.pedometer.utils.ChineseToSpeechUtil;
 import com.cnlive.moudle.pedometer.utils.GsonUtil;
-import com.cnlive.moudle.pedometer.utils.MyMapUtil;
-import com.cnlive.moudle.pedometer.utils.MySpHelper;
 import com.cnlive.moudle.pedometer.utils.StepUtil;
 import com.cnlive.moudle.pedometer.utils.TimeUtil;
-import com.cnlive.strike.application.GlideApp;
 import com.example.moudle_pedometer.R;
 import com.hannesdorfmann.mosby3.mvp.MvpView;
@@ -740,7 +730,7 @@ public class RunMainFragmentView implements MvpView {
                 if (fragment.binding.ivGps.getTag() == null || !fragment.binding.ivGps.getTag().toString().equals("rt_training_gps_0")) {
                     fragment.binding.ivGps.setTag("rt_training_gps_0");
                     //设置图标
-                    fragment.binding.ivGps.setBackground(getContext().getResources().getDrawable(R.drawable.rt_training_gps_0));
+                    fragment.binding.ivGps.setBackground(getContext().getResources().getDrawable(R.drawable.pedometer_rt_training_gps_0));
                 }
@@ -758,7 +748,7 @@ public class RunMainFragmentView implements MvpView {
                 if (fragment.binding.ivGps.getTag() == null || !fragment.binding.ivGps.getTag().toString().equals("GPS_ACCURACY_BAD")) {
                     fragment.binding.ivGps.setTag("GPS_ACCURACY_BAD");
                     //设置图标
-                    fragment.binding.ivGps.setBackground(getContext().getResources().getDrawable(R.drawable.rt_training_gps_1));
+                    fragment.binding.ivGps.setBackground(getContext().getResources().getDrawable(R.drawable.pedometer_rt_training_gps_1));
                 }
             }
             //GPS 质量判断中等
@@ -769,7 +759,7 @@ public class RunMainFragmentView implements MvpView {
                 if (fragment.binding.ivGps.getTag() == null || !fragment.binding.ivGps.getTag().toString().equals("GPS_ACCURACY_MID")) {
                     fragment.binding.ivGps.setTag("GPS_ACCURACY_MID");
                     //设置图标
-                    fragment.binding.ivGps.setBackground(getContext().getResources().getDrawable(R.drawable.rt_training_gps_2));
+                    fragment.binding.ivGps.setBackground(getContext().getResources().getDrawable(R.drawable.pedometer_rt_training_gps_2));
                 }
             }//GPS 质量判断好
             else if (location.getGpsAccuracyStatus() == BDLocation.GPS_ACCURACY_GOOD) {
@@ -779,7 +769,7 @@ public class RunMainFragmentView implements MvpView {
                 if (fragment.binding.ivGps.getTag() == null || !fragment.binding.ivGps.getTag().toString().equals("GPS_ACCURACY_GOOD")) {
                     fragment.binding.ivGps.setTag("GPS_ACCURACY_GOOD");
                     //设置图标
-                    fragment.binding.ivGps.setBackground(getContext().getResources().getDrawable(R.drawable.rt_training_gps_3));
+                    fragment.binding.ivGps.setBackground(getContext().getResources().getDrawable(R.drawable.pedometer_rt_training_gps_3));
                 }
             }
@@ -15,11 +15,8 @@ import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.ViewTreeObserver;
-import android.webkit.JavascriptInterface;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
-import android.webkit.WebViewClient;
 import android.widget.LinearLayout;
 import android.widget.Toast;
@@ -31,7 +28,6 @@ import com.baidu.location.LocationClientOption;
 import com.baidu.mapapi.map.BaiduMap;
 import com.baidu.mapapi.map.BitmapDescriptor;
 import com.baidu.mapapi.map.BitmapDescriptorFactory;
-import com.baidu.mapapi.map.InfoWindow;
 import com.baidu.mapapi.map.MapStatus;
 import com.baidu.mapapi.map.MapStatusUpdate;
 import com.baidu.mapapi.map.MapStatusUpdateFactory;
@@ -46,7 +42,6 @@ import com.baidu.mapapi.utils.DistanceUtil;
 import com.baidu.trace.LBSTraceClient;
 import com.baidu.trace.model.SortType;
 import com.cnlive.libs.base.application.AppConfig;
-import com.cnlive.libs.base.util.AlertUtil;
 import com.cnlive.libs.base.util.StatusBarUtil2;
 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.model.Constant;
@@ -198,7 +193,7 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
                             queryResultPoints.addAll(resultPoints);
                             startLatLng = resultPoints.get(0);
                             endLatLng = resultPoints.get(resultPoints.size() - 1);
-                            MyMapUtil.drawServerLineTrack(getContext(), baiduMap, resultPoints, SortType.asc, R.color.green_round, R.drawable.icon_start, R.drawable.icon_end);
+                            MyMapUtil.drawServerLineTrack(getContext(), baiduMap, resultPoints, SortType.asc, R.color.green_round, R.drawable.pedometer_icon_start, R.drawable.pedometer_icon_end);
 //                        //自动计算地图缩放
                             //设置地图自动缩放
                             initZoom = MyMapUtil.setMapAutoZoom(baiduMap, resultPoints, DEFAULT_MAP_AUTO_ZOOM);
@@ -848,7 +843,7 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
         //设置定位模式, 默认为 LocationMode.NORMAL 普通态
         mCurrentMode = MyLocationConfiguration.LocationMode.NORMAL;
         // 设置定位图标修改为自定义marker
-        Bitmap pointBitmap = BitmapUtil.getBitmapFromDp(getContext(), BitmapFactory.decodeResource(getContext().getResources(), R.drawable.rt_ic_location), 50, 50);
+        Bitmap pointBitmap = BitmapUtil.getBitmapFromDp(getContext(), BitmapFactory.decodeResource(getContext().getResources(), R.drawable.pedometer_rt_ic_location), 50, 50);
         mCurrentMarker = BitmapDescriptorFactory.fromBitmap(pointBitmap);
         //设置定位蓝点精度圆圈的填充颜色为透明色
         accuracyCircleFillColor = getContext().getResources().getColor(R.color.transparent);
@@ -1098,7 +1093,7 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
         LatLng ll = new LatLng(Latitude, Longitude);
         //设置坐标
         //显示当前位置图标
-        Bitmap pointBitmap = BitmapUtil.getBitmapFromDp(fragment.getActivity(), BitmapFactory.decodeResource(fragment.getActivity().getResources(), R.drawable.run_map_icon_end), 22, 32);
+        Bitmap pointBitmap = BitmapUtil.getBitmapFromDp(fragment.getActivity(), BitmapFactory.decodeResource(fragment.getActivity().getResources(), R.drawable.pedometer_run_map_icon_end), 22, 32);
         currentMark = new MarkerOptions().position(ll).icon(BitmapDescriptorFactory.fromBitmap(pointBitmap));
         baiduMap.addOverlay(currentMark);
         MapStatus.Builder builder = new MapStatus.Builder();
@@ -2,21 +2,17 @@ package com.cnlive.moudle.pedometer.frame.view;
 import android.content.Context;
 import android.text.TextUtils;
-import android.util.Log;
 import android.view.View;
 import com.baidu.mapapi.map.BaiduMap;
 import com.baidu.mapapi.map.MapView;
 import com.baidu.mapapi.map.UiSettings;
 import com.baidu.mapapi.model.LatLng;
-import com.baidu.trace.LBSTraceClient;
 import com.baidu.trace.model.SortType;
-import com.bumptech.glide.Glide;
 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.model.RunningFinishBean;
 import com.cnlive.moudle.pedometer.sql.entity.UserStepEntity;
 import com.cnlive.moudle.pedometer.ui.fragment.RunningFinishFragment;
-import com.cnlive.moudle.pedometer.ui.fragment.RunningMapFragment;
 import com.cnlive.moudle.pedometer.ui.widget.SelectDialog;
 import com.cnlive.moudle.pedometer.utils.MyMapUtil;
 import com.cnlive.moudle.pedometer.utils.QMUITipDialogUtil;
@@ -147,7 +143,7 @@ public class RunningFinishFragmentView implements MvpView {
         if (getContext() == null) {
             return;
         }
-        MyMapUtil.drawServerLineTrack(getContext(), baiduMap, trackPoints, SortType.asc, R.color.green_50, R.drawable.icon_start, R.drawable.icon_end);
+        MyMapUtil.drawServerLineTrack(getContext(), baiduMap, trackPoints, SortType.asc, R.color.green_50, R.drawable.pedometer_icon_start, R.drawable.pedometer_icon_end);
         //设置地图自动缩放
         MyMapUtil.setMapAutoZoom(baiduMap, trackPoints, -1.5f);
     }
@@ -8,11 +8,9 @@ import android.hardware.Sensor;
 import android.hardware.SensorEvent;
 import android.hardware.SensorEventListener;
 import android.hardware.SensorManager;
-import android.os.Handler;
 import android.os.SystemClock;
 import android.os.Vibrator;
 import android.text.TextUtils;
-import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
 import android.widget.Chronometer;
@@ -26,8 +24,6 @@ import com.baidu.mapapi.map.BaiduMap;
 import com.baidu.mapapi.map.BitmapDescriptor;
 import com.baidu.mapapi.map.BitmapDescriptorFactory;
 import com.baidu.mapapi.map.MapStatus;
-import com.baidu.mapapi.map.MapStatusUpdate;
-import com.baidu.mapapi.map.MapStatusUpdateFactory;
 import com.baidu.mapapi.map.MapView;
 import com.baidu.mapapi.map.MarkerOptions;
 import com.baidu.mapapi.map.MyLocationConfiguration;
@@ -35,14 +31,12 @@ import com.baidu.mapapi.map.MyLocationData;
 import com.baidu.mapapi.map.Overlay;
 import com.baidu.mapapi.map.UiSettings;
 import com.baidu.mapapi.model.LatLng;
-import com.baidu.mapapi.model.LatLngBounds;
 import com.baidu.mapapi.utils.DistanceUtil;
 import com.baidu.trace.model.SortType;
 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.model.Constant;
 import com.cnlive.moudle.pedometer.model.MessageEvent;
 import com.cnlive.moudle.pedometer.model.RunningMapBean;
-import com.cnlive.moudle.pedometer.service.StepService;
 import com.cnlive.moudle.pedometer.sql.entity.UserStepEntity;
 import com.cnlive.moudle.pedometer.ui.fragment.RunningMapFragment;
 import com.cnlive.moudle.pedometer.ui.widget.TipDialog;
@@ -59,7 +53,6 @@ import com.hannesdorfmann.mosby3.mvp.MvpView;
 import org.greenrobot.eventbus.EventBus;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 public class RunningMapFragmentView implements MvpView, SensorEventListener {
@@ -166,7 +159,7 @@ public class RunningMapFragmentView implements MvpView, SensorEventListener {
         //设置定位模式, 默认为 LocationMode.NORMAL 普通态
         mCurrentMode = MyLocationConfiguration.LocationMode.NORMAL;
         // 设置定位图标修改为自定义marker
-        Bitmap pointBitmap = BitmapUtil.getBitmapFromDp(getContext(), BitmapFactory.decodeResource(getContext().getResources(), R.drawable.rt_ic_location), 40, 40);
+        Bitmap pointBitmap = BitmapUtil.getBitmapFromDp(getContext(), BitmapFactory.decodeResource(getContext().getResources(), R.drawable.pedometer_rt_ic_location), 40, 40);
         mCurrentMarker = BitmapDescriptorFactory.fromBitmap(pointBitmap);
         //设置定位蓝点精度圆圈的填充颜色为透明色
         accuracyCircleFillColor = getContext().getResources().getColor(R.color.transparent);
@@ -234,7 +227,7 @@ public class RunningMapFragmentView implements MvpView, SensorEventListener {
         if (getContext() == null) {
             return;
         }
-        MyMapUtil.drawServerLineTrack(getContext(), baiduMap, trackPoints, SortType.asc, R.color.green_50, R.drawable.icon_start, R.drawable.icon_end);
+        MyMapUtil.drawServerLineTrack(getContext(), baiduMap, trackPoints, SortType.asc, R.color.green_50, R.drawable.pedometer_icon_start, R.drawable.pedometer_icon_end);
         //设置地图自动缩放
         MyMapUtil.setMapAutoZoom(baiduMap, trackPoints, -1.5f);
     }
@@ -278,7 +271,7 @@ public class RunningMapFragmentView implements MvpView, SensorEventListener {
                 //设置图标
                 if (fragment.binding.ivGpsState.getTag() == null || !"GPS_ACCURACY_UNKNOWN".equals(fragment.binding.ivGpsState.getTag().toString())) {
                     fragment.binding.ivGpsState.setTag("GPS_ACCURACY_UNKNOWN");
-                    fragment.binding.ivGpsState.setBackground(getContext().getResources().getDrawable(R.drawable.rt_training_gps_0));
+                    fragment.binding.ivGpsState.setBackground(getContext().getResources().getDrawable(R.drawable.pedometer_rt_training_gps_0));
                 }
             }
             //GPS 质量判断差
@@ -292,7 +285,7 @@ public class RunningMapFragmentView implements MvpView, SensorEventListener {
                 //设置图标
                 if (fragment.binding.ivGpsState.getTag() == null || !"GPS_ACCURACY_BAD".equals(fragment.binding.ivGpsState.getTag().toString())) {
                     fragment.binding.ivGpsState.setTag("GPS_ACCURACY_BAD");
-                    fragment.binding.ivGpsState.setBackground(getContext().getResources().getDrawable(R.drawable.rt_training_gps_1));
+                    fragment.binding.ivGpsState.setBackground(getContext().getResources().getDrawable(R.drawable.pedometer_rt_training_gps_1));
                 }
             }
             //GPS 质量判断中等
@@ -303,7 +296,7 @@ public class RunningMapFragmentView implements MvpView, SensorEventListener {
                 //设置图标
                 if (fragment.binding.ivGpsState.getTag() == null || !"GPS_ACCURACY_MID".equals(fragment.binding.ivGpsState.getTag().toString())) {
                     fragment.binding.ivGpsState.setTag("GPS_ACCURACY_MID");
-                    fragment.binding.ivGpsState.setBackground(getContext().getResources().getDrawable(R.drawable.rt_training_gps_2));
+                    fragment.binding.ivGpsState.setBackground(getContext().getResources().getDrawable(R.drawable.pedometer_rt_training_gps_2));
                 }
             }//GPS 质量判断好
             else if (location.getGpsAccuracyStatus() == BDLocation.GPS_ACCURACY_GOOD) {
@@ -313,7 +306,7 @@ public class RunningMapFragmentView implements MvpView, SensorEventListener {
                 //设置图标
                 if (fragment.binding.ivGpsState.getTag() == null || !"GPS_ACCURACY_GOOD".equals(fragment.binding.ivGpsState.getTag().toString())) {
                     fragment.binding.ivGpsState.setTag("GPS_ACCURACY_GOOD");
-                    fragment.binding.ivGpsState.setBackground(getContext().getResources().getDrawable(R.drawable.rt_training_gps_3));
+                    fragment.binding.ivGpsState.setBackground(getContext().getResources().getDrawable(R.drawable.pedometer_rt_training_gps_3));
                 }
             }
@@ -11,7 +11,6 @@ import com.cnlive.moudle.pedometer.ui.adapter.TakePartAdapter;
 import com.cnlive.moudle.pedometer.ui.fragment.TakePartFragment;
 import com.example.moudle_pedometer.R;
 import com.hannesdorfmann.mosby3.mvp.MvpView;
-import com.qmuiteam.qmui.widget.dialog.QMUITipDialog;
 import com.scwang.smartrefresh.layout.footer.ClassicsFooter;
 import com.scwang.smartrefresh.layout.header.ClassicsHeader;
@@ -32,7 +31,7 @@ public class TakePartView implements MvpView {
     }
     public void initView(){
-        fragment.binding.topbar.addLeftImageButton(R.drawable.top_back_black, R.id.fragment_back).setOnClickListener(v -> {
+        fragment.binding.topbar.addLeftImageButton(R.drawable.pedometer_top_back_black, R.id.fragment_back).setOnClickListener(v -> {
             fragment.getActivity().finish();
         });
         fragment.binding.topbar.setTitle("已参与");
@@ -105,7 +104,7 @@ public class TakePartView implements MvpView {
     public void showEmpty(){
         fragment.binding.empty.setVisibility(View.VISIBLE);
         fragment.binding.refreshLayout.setVisibility(View.GONE);
-        fragment.binding.empty.show("暂无参与", "", R.drawable.bmcg_tak);
+        fragment.binding.empty.show("暂无参与", "", R.drawable.pedometer_bmcg_tak);
     }
 }
@@ -62,7 +62,7 @@ public class MyRecordActivity extends AppCompatActivity {
         viewPager = findViewById(R.id.viewpager);
         topBar.setTitle("我的活动");
-        topBar.addLeftImageButton(R.drawable.top_back_black, R.id.fragment_back).setOnClickListener(v -> {
+        topBar.addLeftImageButton(R.drawable.pedometer_top_back_black, R.id.fragment_back).setOnClickListener(v -> {
             finish();
         });
@@ -35,10 +35,6 @@ import com.qmuiteam.qmui.util.QMUIDrawableHelper;
 import org.json.JSONObject;
 import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.ObjectOutputStream;
-
-import static android.provider.Contacts.SettingsColumns.KEY;
 /**
  * Created by hanyayun 019/05/30.
@@ -91,7 +87,7 @@ public class ShareRecordActivity extends AppCompatActivity {
         if (CommonInfo.getUserIcon(this) != null && CommonInfo.getUserIcon(this).trim().length() > 0) {
             Glide.with(this).load(CommonInfo.getUserIcon(this))
-                    .apply(RequestOptions.bitmapTransform(new CircleCrop()).placeholder(R.drawable.ic_icon)).into(record_icon);
+                    .apply(RequestOptions.bitmapTransform(new CircleCrop()).placeholder(R.drawable.pedometer_ic_icon)).into(record_icon);
         }
         share_back.setOnClickListener(v -> finish());
@@ -44,10 +44,10 @@ public class TakePartAdapter extends RecyclerView.Adapter&lt;TakePartAdapter.MyHold
     public void onBindViewHolder(@NonNull TakePartAdapter.MyHolder myViewHolder, int i) {
         if (!TextUtils.isEmpty(list.get(i).getImage())) {
             Glide.with(context).load(list.get(i).getImage())
-                    .apply(RequestOptions.bitmapTransform(new CircleCrop()).placeholder(R.drawable.ic_icon)).into(myViewHolder.icon_img);
+                    .apply(RequestOptions.bitmapTransform(new CircleCrop()).placeholder(R.drawable.pedometer_ic_icon)).into(myViewHolder.icon_img);
         } else {
             Glide.with(context).load(context.getResources().getString(R.string.default_face_url))
-                    .apply(RequestOptions.bitmapTransform(new CircleCrop()).placeholder(R.drawable.ic_icon)).into(myViewHolder.icon_img);
+                    .apply(RequestOptions.bitmapTransform(new CircleCrop()).placeholder(R.drawable.pedometer_ic_icon)).into(myViewHolder.icon_img);
         }
         myViewHolder.nickname.setText(list.get(i).getNickName());
         myViewHolder.ry_part.setOnClickListener(v -> {
@@ -2,10 +2,7 @@ package com.cnlive.moudle.pedometer.ui.widget;
 import android.content.Context;
 import android.content.res.TypedArray;
-import android.os.Build;
-import android.support.annotation.Nullable;
 import android.util.AttributeSet;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.ImageView;
@@ -58,11 +55,11 @@ public class FivePersonIconView extends LinearLayout {
         qr4.setVisibility(GONE);
         qr5.setVisibility(GONE);
         //设置默认显示图片
-        GlideApp.with(context).load(getResources().getDrawable(R.drawable.tc_ic_workout_level_adjust_coach)).into(qr1);
-        GlideApp.with(context).load(getResources().getDrawable(R.drawable.tc_ic_workout_level_adjust_coach)).into(qr2);
-        GlideApp.with(context).load(getResources().getDrawable(R.drawable.tc_ic_workout_level_adjust_coach)).into(qr3);
-        GlideApp.with(context).load(getResources().getDrawable(R.drawable.tc_ic_workout_level_adjust_coach)).into(qr4);
-        GlideApp.with(context).load(getResources().getDrawable(R.drawable.tc_ic_workout_level_adjust_coach)).into(qr5);
+        GlideApp.with(context).load(getResources().getDrawable(R.drawable.pedometer_tc_ic_workout_level_adjust_coach)).into(qr1);
+        GlideApp.with(context).load(getResources().getDrawable(R.drawable.pedometer_tc_ic_workout_level_adjust_coach)).into(qr2);
+        GlideApp.with(context).load(getResources().getDrawable(R.drawable.pedometer_tc_ic_workout_level_adjust_coach)).into(qr3);
+        GlideApp.with(context).load(getResources().getDrawable(R.drawable.pedometer_tc_ic_workout_level_adjust_coach)).into(qr4);
+        GlideApp.with(context).load(getResources().getDrawable(R.drawable.pedometer_tc_ic_workout_level_adjust_coach)).into(qr5);
         //获取自定义属性
         TypedArray attributes = context.obtainStyledAttributes(attrs, R.styleable.FivePersonIconView);
         isShowRight = attributes.getBoolean(R.styleable.FivePersonIconView_showRightFlag, true);
@@ -24,7 +24,6 @@ import com.baidu.mapapi.map.PolylineOptions;
 import com.baidu.mapapi.model.LatLng;
 import com.baidu.mapapi.model.LatLngBounds;
 import com.baidu.mapapi.search.core.PoiInfo;
-import com.baidu.mapapi.search.geocode.GeoCodeResult;
 import com.baidu.mapapi.search.geocode.GeoCoder;
 import com.baidu.mapapi.search.geocode.OnGetGeoCoderResultListener;
 import com.baidu.mapapi.search.geocode.ReverseGeoCodeOption;
@@ -35,8 +34,6 @@ import com.baidu.trace.api.analysis.DrivingBehaviorRequest;
 import com.baidu.trace.api.analysis.DrivingBehaviorResponse;
 import com.baidu.trace.api.analysis.OnAnalysisListener;
 import com.baidu.trace.api.analysis.StayPointResponse;
-import com.baidu.trace.api.track.DistanceRequest;
-import com.baidu.trace.api.track.DistanceResponse;
 import com.baidu.trace.api.track.HistoryTrackRequest;
 import com.baidu.trace.api.track.HistoryTrackResponse;
 import com.baidu.trace.api.track.OnTrackListener;
@@ -50,7 +47,6 @@ import com.baidu.trace.model.TransportMode;
 import com.cnlive.moudle.collectionTrace.model.CollectPoint;
 import com.cnlive.moudle.pedometer.model.Constant;
 import com.cnlive.moudle.pedometer.model.RoutePoint;
-import com.cnlive.moudle.pedometer.service.StepService;
 import com.example.moudle_pedometer.R;
 import java.util.ArrayList;
@@ -312,7 +308,7 @@ public class MyMapUtil {
             }
             // 添加圆形范围
-            Bitmap startCircleBitmap = BitmapUtil.getBitmapFromDp(context, BitmapFactory.decodeResource(context.getResources(), R.drawable.circle_point_raduis), 60, 60);
+            Bitmap startCircleBitmap = BitmapUtil.getBitmapFromDp(context, BitmapFactory.decodeResource(context.getResources(), R.drawable.pedometer_circle_point_raduis), 60, 60);
             OverlayOptions startCircleOptions = null;
             if (startCircleBitmap != null) {
                 startCircleOptions = new MarkerOptions()
@@ -824,7 +820,7 @@ public class MyMapUtil {
                         .animateType(MarkerOptions.MarkerAnimateType.grow);
             }
             // 添加圆形范围
-            Bitmap startCircleBitmap = BitmapUtil.getBitmapFromDp(context, BitmapFactory.decodeResource(context.getResources(), R.drawable.circle_point_raduis), 60, 60);
+            Bitmap startCircleBitmap = BitmapUtil.getBitmapFromDp(context, BitmapFactory.decodeResource(context.getResources(), R.drawable.pedometer_circle_point_raduis), 60, 60);
             OverlayOptions startCircleOptions = null;
             OverlayOptions endCircleOptions = null;
             if (startCircleBitmap != null) {