Merge branch 'master' of bj.gitlab.cnlive.com:cnlive-team/ModulePedometer

# Conflicts: # moudle_pedometer/src/main/res/drawable-hdpi/more.png # moudle_pedometer/src/main/res/drawable-xhdpi/more.png # moudle_pedometer/src/main/res/drawable-xxhdpi/more.png

Merge branch 'master' of bj.gitlab.cnlive.com:cnlive-team/ModulePedometer
# Conflicts: # moudle_pedometer/src/main/res/drawable-hdpi/more.png # moudle_pedometer/src/main/res/drawable-xhdpi/more.png # moudle_pedometer/src/main/res/drawable-xxhdpi/more.png
韩亚云
2 parents c7e206f4 d21f413b
Showing 100 changed files with 1306 additions and 638 deletions
.idea/gradle.xml
app/build.gradle
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/presenter/RunningMapFragmentPresenter.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunMainFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunRaceDetailFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunningFinishFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunningMapFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/model/Constant.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/model/RoutePoint.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/model/RunningFinishBean.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/service/StepService.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/PedometerMainActivity.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/RunLineActivity.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/RunRaceDetailActivity.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/RunningFinishActivity.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/RunMainFragment.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/RunRaceDetailFragment.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/RunningFinishFragment.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/RunningMapFragment.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/utils/ButtonAnimUtil.java
@@ -3,6 +3,9 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
+        <compositeConfiguration>
+          <compositeBuild compositeDefinitionSource="SCRIPT" />
+        </compositeConfiguration>
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">
@@ -28,15 +28,16 @@ android {
             buildConfigField("String", "APP_ID", stringValue("802_jhbqccxw08"))
             buildConfigField("String", "APP_KEY", stringValue("9c5619e9be747bb3b925dd215ca5923d86f12c09b9394f"))
             buildConfigField("String", "APP_SCERET", stringValue("1e6380cb347255e777f72b5aa60f41daa68443a132aaea"))
-            //                    BAIDU_MAP_APP_KEY : "2IIsTtvX2FA88yvDrPZedc2ZvMhxyDbN"
+//            BAIDU_MAP_APP_KEY: "OeotXc38bbnU7WmyKGA0VMahk4v35VG2"
             manifestPlaceholders = [
-                    BAIDU_MAP_APP_KEY: "OeotXc38bbnU7WmyKGA0VMahk4v35VG2"
+                    BAIDU_MAP_APP_KEY: "2IIsTtvX2FA88yvDrPZedc2ZvMhxyDbN"
             ]
         }
 //        BAIDU_MAP_APP_KEY: "Q7y9SGcZVs0tmhbNTiaz0jHm4S1xGzE2"
+//        BAIDU_MAP_APP_KEY: "0bWeo04KKKHqTwozcqgyLZVd0oVhv3rZ"
         release {
             resValue("string", "app_name", "网++")
@@ -44,7 +45,7 @@ android {
             buildConfigField("String", "APP_KEY", stringValue("0d57b045ec0c3988a682d94c644e66b9b8e0d2b8ef937d"))
             buildConfigField("String", "APP_SCERET", stringValue("275e8dc29274a1186d82f65bc607c231d02bcb3bfd8976"))
             manifestPlaceholders = [
-                    BAIDU_MAP_APP_KEY: "0bWeo04KKKHqTwozcqgyLZVd0oVhv3rZ"
+                    BAIDU_MAP_APP_KEY: "Q7y9SGcZVs0tmhbNTiaz0jHm4S1xGzE2"
             ]
         }
     }
@@ -59,6 +59,7 @@ import com.baidu.trace.model.TraceLocation;
 import com.baidu.trace.model.TransportMode;
 import com.cnlive.moudle.pedometer.frame.view.RunningMapFragmentView;
 import com.cnlive.moudle.pedometer.model.Constant;
+import com.cnlive.moudle.pedometer.model.RoutePoint;
 import com.cnlive.moudle.pedometer.service.StepService;
 import com.cnlive.moudle.pedometer.utils.BitmapUtil;
 import com.cnlive.moudle.pedometer.utils.CommonUtil;
@@ -127,9 +128,9 @@ public class RunningMapFragmentPresenter extends MvpBasePresenter&lt;RunningMapFrag
             //去噪：可设置是否需要去除角度、速度和方向异常的轨迹点
             processOption.setNeedDenoise(true);
             //绑路：设置是否将轨迹点绑定至路网道路
-            processOption.setNeedMapMatch(true);
+            processOption.setNeedMapMatch(false);
             //抽稀：设置是否进行抽稀处理，对冗余的轨迹点进行抽稀去除处理，如一条直线上除起终点外的多个轨迹点
-//            processOption.setNeedVacuate(true);
+            processOption.setNeedVacuate(true);
             //自动判断交通方式
             processOption.setTransportMode(TransportMode.walking);
             // 设置精度过滤值(定位精度大于100米的过滤掉)
@@ -172,14 +173,12 @@ public class RunningMapFragmentPresenter extends MvpBasePresenter&lt;RunningMapFrag
                     queryHistoryTrace(context, entityName, startTime, endTime);
                 } else {
                     if (getView() != null) {
-                        List<com.baidu.trace.model.LatLng> fenceLatLngs = new ArrayList<>();
-//                        for (LatLng latLng:trackPoints){
-//                            com.baidu.trace.model.LatLng tempLatLng=new com.baidu.trace.model.LatLng(latLng.latitude,latLng.longitude);
-//                            fenceLatLngs.add(tempLatLng);
-//                        }
-//                        Log.e(TAG, "onHistoryTrackCallback: "+trackPoints.size()+","+ GsonUtil.GsonString(trackPoints));
-//                        createFence(context, fenceLatLngs);
+                        List<RoutePoint> routePoints = new ArrayList<>();
+                        for (LatLng latLng : trackPoints) {
+                            routePoints.add(new RoutePoint(latLng.latitude, latLng.longitude));
+                        }
                         MyMapUtil.drawHistoryTrack(context, getView().baiduMap, trackPoints, SortType.asc, R.color.red, R.drawable.icon_start, R.drawable.icon_end);
+//                        MyMapUtil.drawMapLineRoutePoint(context, getView().baiduMap, MyMapUtil.optimizePoints(routePoints), R.color.red);
                     }
                 }
             }
@@ -335,9 +334,13 @@ public class RunningMapFragmentPresenter extends MvpBasePresenter&lt;RunningMapFrag
             // 监控状态回调
             @Override
             public void onMonitoredStatusCallback(MonitoredStatusResponse monitoredStatusResponse) {
-                Toast.makeText(context, "围栏列表回调成功:onMonitoredStatusCallback", Toast.LENGTH_SHORT).show();
-                //查询监控对象状态响应结果
+                if (monitoredStatusResponse.getMonitoredStatusInfos() != null) {
+                    Toast.makeText(context, "围栏列表回调成功:个数:" + monitoredStatusResponse.getMonitoredStatusInfos().size(), Toast.LENGTH_SHORT).show();
+                } //查询监控对象状态响应结果
                 List<MonitoredStatusInfo> monitoredStatusInfos = monitoredStatusResponse.getMonitoredStatusInfos();
+                if (monitoredStatusInfos == null) {
+                    return;
+                }
                 for (MonitoredStatusInfo monitoredStatusInfo : monitoredStatusInfos) {
                     monitoredStatusInfo.getFenceId();
                     MonitoredStatus status = monitoredStatusInfo.getMonitoredStatus();//获取状态
@@ -406,7 +409,7 @@ public class RunningMapFragmentPresenter extends MvpBasePresenter&lt;RunningMapFrag
         }
         List<Long> fenid = new ArrayList<>();
-        fenid.add(111L);
+        fenid.add(1L);
         MonitoredStatusRequest request1 = MonitoredStatusRequest.buildServerRequest(1,
                 StepService.serviceId, "yangshuai", fenid);
         Handler handler = new Handler();
@@ -414,7 +417,6 @@ public class RunningMapFragmentPresenter extends MvpBasePresenter&lt;RunningMapFrag
             @Override
             public void run() {
                 StepService.mClient.queryMonitoredStatus(request1, onFenceListener);
-//                handler.postDelayed(this, 5000);
             }
         };
         handler.postDelayed(runnable, 5000);
@@ -11,6 +11,7 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.widget.Chronometer;
+import com.cnlive.moudle.pedometer.model.RunningFinishBean;
 import com.cnlive.moudle.pedometer.model.RunningMapBean;
 import com.cnlive.moudle.pedometer.model.Constant;
 import com.cnlive.moudle.pedometer.model.MessageEvent;
@@ -75,6 +76,9 @@ public class RunMainFragmentView implements MvpView {
         runnable = new Runnable() {
             @Override
             public void run() {
+                if (fragment.getActivity() == null) {
+                    return;
+                }
                 if (timeCountDown > 1) {
                     timeCountDown--;
                     fragment.binding.tvTimeCountDown.setVisibility(View.VISIBLE);
@@ -180,7 +184,7 @@ public class RunMainFragmentView implements MvpView {
             public void onClick(View view) {
                 //继续记录轨迹
                 if (StepService.mClient != null && StepService.traceListener != null) {
-                    StepService.mClient.startGather(StepService.traceListener);
+                    StepService.mClient.startTrace(StepService.mTrace, StepService.traceListener);
                 }
                 needWriteDataFlag = true;
                 //将当前计时器时间戳写入数据库
@@ -245,6 +249,7 @@ public class RunMainFragmentView implements MvpView {
                                             SelectDialog selectDialog = new SelectDialog(fragment.getActivity(), "确定结束运动吗?", "确定", new SelectDialog.DialogInterface() {
                                                 @Override
                                                 public void onClick(SelectDialog dialog) {
+                                                    MySpHelper.getInstance(getContext(), Context.MODE_MULTI_PROCESS).putBoolean("writeUserStep:" + uid, false);
                                                     fragment.binding.cpCurrent.setVisibility(View.GONE);
                                                     ButtonAnimUtil.setViewDefault(fragment.binding.flStop);
                                                     //清空数据
@@ -256,8 +261,16 @@ public class RunMainFragmentView implements MvpView {
                                                     MySpHelper.getInstance(getContext(), Context.MODE_MULTI_PROCESS).putLong("stepStartTime", 0);
                                                     fragment.getActivity().stopService(new Intent(fragment.getActivity(), StepService.class));
                                                     MySpHelper.getInstance(getContext(), Context.MODE_MULTI_PROCESS).putString("userId", "");
-                                                    RunningFinishActivity.startActivity(fragment.getActivity());
-                                                    //  fragment.getActivity().finish();
+                                                    RunningFinishBean runningFinishBean = new RunningFinishBean();
+                                                    runningFinishBean.setStartPoint("开始地点");
+                                                    runningFinishBean.setEndPoint("结束地点");
+                                                    runningFinishBean.setRunDistance(fragment.binding.tvRunDistance.getText().toString());
+                                                    runningFinishBean.setSpeed(fragment.binding.tvSpeed.getText().toString());
+                                                    runningFinishBean.setStep(fragment.binding.tvStepCount.getText().toString());
+                                                    runningFinishBean.setTime(fragment.binding.chronometer.getText().toString());
+                                                    runningFinishBean.setDate(TimeUtil.getFormatNowTime());
+                                                    RunningFinishActivity.startActivity(fragment.getActivity(), runningFinishBean);
+                                                    fragment.getActivity().finish();
                                                 }
                                             }, "取消", new SelectDialog.DialogInterface() {
                                                 @Override
@@ -334,7 +347,7 @@ public class RunMainFragmentView implements MvpView {
                 //暂停计步
                 EventBus.getDefault().post(new MessageEvent(Constant.SERVICE_STEP_COUNT_PAUSE, ""));
                 //重置速度
-                resetSpeed();
+//                resetSpeed();
             }
         });
         //gps点击事件
@@ -406,7 +419,7 @@ public class RunMainFragmentView implements MvpView {
         //设置行走公里
         fragment.binding.tvRunDistance.setText(StepUtil.getWalkDistanceKM(step) + "");
         //设置行走步数
-        fragment.binding.tvStepCount.setText(step + "步");
+        fragment.binding.tvStepCount.setText(step+"");
         //设置S速度
         int second = (int) ((SystemClock.elapsedRealtime() - fragment.binding.chronometer.getBase()) / 1000);
         if (second != 0) {
@@ -257,6 +257,16 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
         fragment.binding.includeStreet.fiveJoinPerson.setOnClickListener(v -> {
             TakePartActivity.newInstance(fragment.getActivity());
         });
+        //返回按钮
+        fragment.binding.ivBack.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (fragment.getActivity()==null){
+                    return;
+                }
+                fragment.getActivity().finish();
+            }
+        });
     }
     private void initMap() {
 package com.cnlive.moudle.pedometer.frame.view;
 import android.content.Context;
+import android.view.View;
+import com.cnlive.moudle.pedometer.model.RunningFinishBean;
 import com.cnlive.moudle.pedometer.ui.fragment.RunningFinishFragment;
 import com.cnlive.moudle.pedometer.ui.fragment.RunningMapFragment;
 import com.hannesdorfmann.mosby3.mvp.MvpView;
@@ -16,4 +18,33 @@ public class RunningFinishFragmentView implements MvpView {
     public Context getContext() {
         return fragment == null ? null : fragment.getActivity();
     }
+
+    public void initView(RunningFinishBean runningFinishBean) {
+        //设置距离
+        fragment.binding.includeFinishUserInfo.tvDistance.setText(runningFinishBean.getRunDistance());
+        //设置配速
+        fragment.binding.includeFinishUserInfo.tvSpeed.setText(runningFinishBean.getSpeed());
+        //设置用时
+        fragment.binding.includeFinishUserInfo.tvTimer.setText(runningFinishBean.getTime());
+        //设置日期
+        fragment.binding.includeFinishUserInfo.tvDate.setText(runningFinishBean.getDate());
+        //设置步数
+        fragment.binding.includeFinishStep.tvStep.setText(runningFinishBean.getStep());
+        //设置起点位置
+        fragment.binding.includeFinishRunRoute.tvStartPoint.setText(runningFinishBean.getStartPoint());
+        //设置终点位置
+        fragment.binding.includeFinishRunRoute.tvEndPoint.setText(runningFinishBean.getEndPoint());
+        //设置时间
+        fragment.binding.includeFinishRunRoute.tvTimer.setText(runningFinishBean.getTime());
+        //返回按钮点击
+        fragment.binding.flBack.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (fragment.getActivity() == null) {
+                    return;
+                }
+                fragment.getActivity().finish();
+            }
+        });
+    }
 }
@@ -28,8 +28,11 @@ 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;
 import com.baidu.mapapi.map.UiSettings;
 import com.baidu.mapapi.model.LatLng;
+import com.baidu.mapapi.utils.DistanceUtil;
+import com.baidu.trace.model.SortType;
 import com.cnlive.moudle.pedometer.model.RunningMapBean;
 import com.cnlive.moudle.pedometer.ui.fragment.RunningMapFragment;
 import com.cnlive.moudle.pedometer.utils.BitmapUtil;
@@ -39,6 +42,7 @@ import com.cnlive.moudle.pedometer.utils.StepUtil;
 import com.example.moudle_pedometer.R;
 import com.hannesdorfmann.mosby3.mvp.MvpView;
+import java.util.ArrayList;
 import java.util.List;
 public class RunningMapFragmentView implements MvpView, SensorEventListener {
@@ -54,7 +58,7 @@ public class RunningMapFragmentView implements MvpView, SensorEventListener {
     private static MyLocationData mylocation;
     boolean isFirstLoc = true; // 是否首次定位
     private MarkerOptions currentMark;
-    private LatLng firstLatLng;
+    private LatLng myCurLatLng;
     private Double lastX = 0.0;
     private int mCurrentDirection = 0;
     private double mCurrentLat = 0.0;
@@ -66,6 +70,8 @@ public class RunningMapFragmentView implements MvpView, SensorEventListener {
     private final int DEFULT_ZOOM = 17;
     private boolean isFirstLoadMap = true;
     private List<LatLng> trackPoints;
+    private Overlay currentLine;
+    private List<LatLng> currentPoints;
     public RunningMapFragmentView(RunningMapFragment fragment) {
         this.fragment = fragment;
@@ -76,6 +82,7 @@ public class RunningMapFragmentView implements MvpView, SensorEventListener {
     }
     public void initView(List<LatLng> trackPoints) {
+        currentPoints = new ArrayList<>();
         this.trackPoints = trackPoints;
         this.mMapView = fragment.binding.mapView;
         if (baiduMap == null) {
@@ -103,7 +110,7 @@ public class RunningMapFragmentView implements MvpView, SensorEventListener {
         mMapView.showZoomControls(false);
         mUiSettings.setEnlargeCenterWithDoubleClickEnable(true);
         //隐藏自带的指南针，改用自定义指南针 杨帅
-        baiduMap.getUiSettings().setCompassEnabled(true);
+        mUiSettings.setCompassEnabled(false);
         //显示定位图层
         baiduMap.setMyLocationEnabled(true);
         // 定位初始化
@@ -111,21 +118,36 @@ public class RunningMapFragmentView implements MvpView, SensorEventListener {
         mLocClient.registerLocationListener(myListener);
         LocationClientOption option = new LocationClientOption();
         option.setOpenGps(true); // 打开gps
+        //可选，设置返回经纬度坐标类型，默认GCJ02
+        //GCJ02：国测局坐标；
+        //BD09ll：百度经纬度坐标；
+        //BD09：百度墨卡托坐标；
+        //海外地区定位，无需设置坐标类型，统一返回WGS84类型坐标
         option.setCoorType("gcj02"); // 设置坐标类型
         //可选，默认false，设置是否开启Gps定位
         option.setOpenGps(true);
         //设置打开自动回调位置模式，该开关打开后，期间只要定位SDK检测到位置变化就会主动回调给开发者，该模式下开发者无需再关心定位间隔是多少，定位SDK本身发现位置变化就会及时回调给开发者
         option.setOpenAutoNotifyMode();
         //可选，默认高精度，设置定位模式，高精度，低功耗，仅设备
+        //LocationMode.Hight_Accuracy：高精度；
+        //LocationMode. Battery_Saving：低功耗；
+        //LocationMode. Device_Sensors：仅使用设备；
         option.setLocationMode(LocationClientOption.LocationMode.Hight_Accuracy);
         //可选，设置是否需要地址信息，默认不需要
-        option.setIsNeedAddress(true);
+        option.setIsNeedAddress(false);
         //可选，设置是否需要地址描述
-        option.setIsNeedLocationDescribe(true);
+        option.setIsNeedLocationDescribe(false);
         //可选，设置是否需要设备方向结果
         option.setNeedDeviceDirect(false);
         //设置打开自动回调位置模式，该开关打开后，期间只要定位SDK检测到位置变化就会主动回调给开发者
+        //minTimeInterval - 最短定位时间间隔，单位毫秒，最小值0，开发者可以在设置希望的位置回调最短时间间隔
+        //minDistance - 最短定位距离间隔，单位米，最小值0，开发者可以设置希望的位置回调距离间隔
+        //locSensitivity - 定位变化敏感程度,LOC_SENSITIVITY_HIGHT,LOC_SENSITIVITY_MIDDLE,LOC_SENSITIVITY_LOW
         option.setOpenAutoNotifyMode(3000, 1, LocationClientOption.LOC_SENSITIVITY_HIGHT);
+        //可选，定位SDK内部是一个service，并放到了独立进程。
+        //设置是否在stop的时候杀死这个进程，默认（建议）不杀死，即setIgnoreKillProcess(true)
+        option.setIgnoreKillProcess(true);
+
         mLocClient.setLocOption(option);
         mLocClient.start();
         //地图加载完毕监听
@@ -142,7 +164,11 @@ public class RunningMapFragmentView implements MvpView, SensorEventListener {
                     new Handler().postDelayed(new Runnable() {
                         @Override
                         public void run() {
-                            MyMapUtil.drawMapLine(getContext(), baiduMap, trackPoints, R.color.green_50);
+                            //绘制赛道轨迹
+                            if (getContext() == null) {
+                                return;
+                            }
+                            MyMapUtil.drawServerLineTrack(getContext(), baiduMap, trackPoints, SortType.asc, R.color.green_50, R.drawable.icon_start, R.drawable.icon_end);
                         }
                     }, 1500);
                 }
@@ -197,6 +223,20 @@ public class RunningMapFragmentView implements MvpView, SensorEventListener {
      * 定位SDK监听函数
      */
     public class MyLocationListenner extends BDAbstractLocationListener {
+        @Override
+        public void onLocDiagnosticMessage(int i, int i1, String s) {
+            super.onLocDiagnosticMessage(i, i1, s);
+            if (getContext() == null) {
+                return;
+            }
+            if (i == 67) {
+                Toast.makeText(getContext(), getContext().getString(R.string.loc_check_internet), Toast.LENGTH_SHORT).show();
+            } else if (i == 161 && i1 == 1) {
+                Toast.makeText(getContext(), getContext().getString(R.string.loc_open_gps), Toast.LENGTH_SHORT).show();
+            } else if (i == 161 && i1 == 2) {
+                Toast.makeText(getContext(), getContext().getString(R.string.loc_open_wifi), Toast.LENGTH_SHORT).show();
+            }
+        }
         @Override
         public void onReceiveLocation(BDLocation location) {
@@ -228,31 +268,37 @@ public class RunningMapFragmentView implements MvpView, SensorEventListener {
                 return;
             }
             MapStatus.Builder builder = new MapStatus.Builder();
+            //不是第一次定位
+            if (!isFirstLoc) {
+                if (currentPoints.size() > 0) {
+                    //进行判断
+                    LatLng lastLatLng = currentPoints.get(currentPoints.size() - 1);
+                    LatLng curLatLng = new LatLng(location.getLatitude(),
+                            location.getLongitude());
+                    if (DistanceUtil.getDistance(lastLatLng, curLatLng) > 0.5) {
+                        currentPoints.add(curLatLng);
+                    }
+                } else {
+                    currentPoints.add(new LatLng(location.getLatitude(),
+                            location.getLongitude()));
+                }
-//            if (isFirstLoc) {
-//                isFirstLoc = false;
-            firstLatLng = new LatLng(location.getLatitude(),
+                //判断当前集合列表是否可以划线(至少两个点)
+                if (currentPoints != null && currentPoints.size() > 1) {
+                    //判断当前是否已经在地图上画点
+                    if (currentLine != null) {
+                        currentLine.remove();
+                    }
+                    //开始划线
+                    if (getContext() == null) {
+                        return;
+                    }
+                    currentLine = MyMapUtil.drawMapLine(getContext(), baiduMap, currentPoints, R.color.red);
+                }
+            }
+            myCurLatLng = new LatLng(location.getLatitude(),
                     location.getLongitude());
             baiduMap.setMyLocationData(mylocation);
-//            if (trackPoints!=null){
-//                Log.e(TAG, "trackPoints: "+MyMapUtil.isInPolygon(firstLatLng,trackPoints) );
-//            }
-//            if (isFirstLoc) {
-//                builder.target(firstLatLng).zoom(DEFULT_ZOOM);
-//                isFirstLoc = false;
-//            } else {
-//                float current = baiduMap.getMapStatus().zoom;
-//                builder.target(firstLatLng).zoom(current);
-//
-//            }
-//            baiduMap.animateMapStatus(MapStatusUpdateFactory.newMapStatus(builder.build()));
-//                //显示当前位置图标
-//                Bitmap pointBitmap = BitmapUtil.getBitmapFromDp(getContext(), BitmapFactory.decodeResource(getContext().getResources(), R.drawable.rt_ic_location), 40, 40);
-//                currentMark = new MarkerOptions().position(firstLatLng).icon(BitmapDescriptorFactory.fromBitmap(pointBitmap));
-//                baiduMap.addOverlay(currentMark);
-
-
-//            }
         }
     }
@@ -342,6 +388,7 @@ public class RunningMapFragmentView implements MvpView, SensorEventListener {
     }
+
     public void onResume() {
         if (mMapView != null) {
             mMapView.onResume();
@@ -6,5 +6,7 @@ public class Constant {
     public static final int SERVICE_STEP_COUNT_CONTINUE = 2;//继续计步
     public static final int SERVICE_STEP_COUNT_RESET_SPEED = 3;//重置速度
     public static final int FRAGMENT_RUN_CHRONOMETER = 4;//同步计时器
+    public static final int EXIT_RANGE = 5;//超出范围
+    public static final int ENTER_RANGE = 6;//进入范围
 }
+package com.cnlive.moudle.pedometer.model;
+
+public class RoutePoint {
+    private double lat;
+    private double lng;
+
+    public RoutePoint() {
+    }
+
+    public RoutePoint(double lat, double lng) {
+        this.lat = lat;
+        this.lng = lng;
+    }
+
+    public double getLat() {
+        return lat;
+    }
+
+    public void setLat(double lat) {
+        this.lat = lat;
+    }
+
+    public double getLng() {
+        return lng;
+    }
+
+    public void setLng(double lng) {
+        this.lng = lng;
+    }
+}
+package com.cnlive.moudle.pedometer.model;
+
+import java.io.Serializable;
+
+/**
+ * 跑步结束相关数据
+ *
+ * @author ShinnyYang
+ */
+public class RunningFinishBean implements Serializable {
+    private String runDistance;
+    private String speed;
+    private String time;
+    private String step;
+    private String startPoint;
+    private String endPoint;
+    private String date;
+
+    public String getRunDistance() {
+        return runDistance;
+    }
+
+    public void setRunDistance(String runDistance) {
+        this.runDistance = runDistance;
+    }
+
+    public String getSpeed() {
+        return speed;
+    }
+
+    public void setSpeed(String speed) {
+        this.speed = speed;
+    }
+
+    public String getTime() {
+        return time;
+    }
+
+    public void setTime(String time) {
+        this.time = time;
+    }
+
+    public String getStep() {
+        return step;
+    }
+
+    public void setStep(String step) {
+        this.step = step;
+    }
+
+    public String getStartPoint() {
+        return startPoint;
+    }
+
+    public void setStartPoint(String startPoint) {
+        this.startPoint = startPoint;
+    }
+
+    public String getEndPoint() {
+        return endPoint;
+    }
+
+    public void setEndPoint(String endPoint) {
+        this.endPoint = endPoint;
+    }
+
+    public String getDate() {
+        return date;
+    }
+
+    public void setDate(String date) {
+        this.date = date;
+    }
+}
@@ -147,9 +147,8 @@ public class StepService extends Service implements SensorEventListener {
     //打包周期
     private int packInterval = 10;
     // 轨迹服务ID
-//    public static final long serviceId = 213511;
-//杨帅
-    public static final long serviceId = 213553;
+    public static final long serviceId = 213511;//杨帅
+//    public static final long serviceId = 213553;
     // 设备标识
     public static String entityName = "";
@@ -161,7 +160,7 @@ public class StepService extends Service implements SensorEventListener {
     /**
      * 轨迹服务
      */
-    public Trace mTrace = null;
+    public static Trace mTrace = null;
     public StepService() {
@@ -170,7 +169,6 @@ public class StepService extends Service implements SensorEventListener {
     @Override
     public void onCreate() {
-        Log.e("执行onCreate", "onCreate");
         super.onCreate();
         init();
         showStartForegroundNotification();
@@ -325,11 +323,11 @@ public class StepService extends Service implements SensorEventListener {
                 }
                 //超出范围
                 if (alarmPushInfo.getMonitoredAction() == MonitoredAction.exit) {
-
+                    EventBus.getDefault().post(new MessageEvent(Constant.EXIT_RANGE, ""));
                 }
                 //进入范围
                 else if (alarmPushInfo.getMonitoredAction() == MonitoredAction.enter) {
-
+                    EventBus.getDefault().post(new MessageEvent(Constant.ENTER_RANGE, ""));
                 }
                 Toast.makeText(getApplicationContext(), "onPushCallback:" + alarmPushInfo.getMonitoredAction(), Toast.LENGTH_SHORT).show();
@@ -362,12 +360,13 @@ public class StepService extends Service implements SensorEventListener {
 //        userId=intent.getExtras().getString("userId");
         userId = MySpHelper.getInstance(getApplicationContext(), Context.MODE_MULTI_PROCESS).getString("userId", "");
         if (userId != null && !TextUtils.isEmpty(userId)) {
-            entityName = userId;
-            initTodayData(userId);
-            initTrace();
             if (!EventBus.getDefault().isRegistered(this)) {
                 EventBus.getDefault().register(this);
             }
+            MySpHelper.getInstance(getApplicationContext(), Context.MODE_MULTI_PROCESS).putBoolean("writeUserStep:" + userId, true);
+            entityName = userId;
+            initTodayData(userId);
+            initTrace();
             //显示计步通知
             showStartForegroundNotification();
             new Thread(new Runnable() {
@@ -534,7 +533,7 @@ public class StepService extends Service implements SensorEventListener {
         if (userId == null || CURRENT_DATE == null) {
             return;
         }
-//        //获取当天的数据，用于展示 CURRENT_DATE
+        //获取当天的数据，用于展示 CURRENT_DATE
         List<UserStepEntity> list = DbCore.getDaoSession().getUserStepEntityDao().queryBuilder().where(UserStepEntityDao.Properties.UserId.eq(userId), UserStepEntityDao.Properties.Date.eq(CURRENT_DATE)).list();
         if (list == null) {
             return;
@@ -897,10 +896,10 @@ public class StepService extends Service implements SensorEventListener {
      * 保存记步数据
      */
     private void save() {
-//        boolean isWriteUserStep = MySpHelper.getInstance(getApplicationContext(), Context.MODE_MULTI_PROCESS).getBoolean("writeUserStep:" + userId, false);
-//        if (!isWriteUserStep) {
-//            return;
-//        }
+        boolean isWriteUserStep = MySpHelper.getInstance(getApplicationContext(), Context.MODE_MULTI_PROCESS).getBoolean("writeUserStep:" + userId, false);
+        if (!isWriteUserStep) {
+            return;
+        }
         int tempStep = CURRENT_STEP;
         List<UserStepEntity> list = DbCore.getDaoSession().getUserStepEntityDao().queryBuilder().where(UserStepEntityDao.Properties.UserId.eq(userId), UserStepEntityDao.Properties.Date.eq(CURRENT_DATE)).list();
         if (list.size() == 0 || list.isEmpty()) {
 package com.cnlive.moudle.pedometer.ui.activity;
 import android.Manifest;
+import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageInfo;
@@ -13,6 +14,7 @@ import android.support.annotation.NonNull;
 import android.support.v4.app.NotificationManagerCompat;
 import android.support.v4.content.ContextCompat;
 import android.util.Log;
+import android.view.KeyEvent;
 import android.widget.Toast;
 import com.alibaba.android.arouter.facade.annotation.Route;
@@ -40,6 +42,7 @@ public class PedometerMainActivity extends QMUIFragmentActivity {
     private NotificationManagerCompat notificationManagerCompat;
     private boolean isOpen;
     private PermissionsUtils mPermissionsUtils = new PermissionsUtils();//权限申请
+    private RunMainFragment fragment;
     @Override
     protected int getContextViewId() {
@@ -149,7 +152,7 @@ public class PedometerMainActivity extends QMUIFragmentActivity {
     }
     private void addFragment() {
-        QMUIFragment fragment = new RunMainFragment();
+        fragment = new RunMainFragment();
         getSupportFragmentManager().beginTransaction()
                 .add(getContextViewId(), fragment, fragment.getClass().getSimpleName())
                 .addToBackStack(fragment.getClass().getSimpleName())
@@ -236,4 +239,11 @@ public class PedometerMainActivity extends QMUIFragmentActivity {
         super.onRequestPermissionsResult(requestCode, permissions, grantResults);
         mPermissionsUtils.dealResult(requestCode, permissions, grantResults);
     }
+
+
+
+    @Override
+    public void onBackPressed() {
+        return;
+    }
 }
@@ -23,6 +23,7 @@ public class RunLineActivity extends AppCompatActivity {
         setContentView(R.layout.activity_run_line);
         getSupportFragmentManager().beginTransaction().replace(R.id.run_line_container, new RunLineFragment()).commit();
+//        getSupportFragmentManager().beginTransaction().replace(R.id.run_line_container, new RunningFinishFragment()).commit();
     }
 }
@@ -16,9 +16,12 @@ import com.cnlive.libs.base.ui.QMUIFragment;
 import com.cnlive.libs.base.ui.QMUIFragmentActivity;
 import com.cnlive.libs.base.util.StatusBarUtil2;
 import com.cnlive.moudle.pedometer.model.RunningMapBean;
+import com.cnlive.moudle.pedometer.sql.entity.UserStepEntity;
+import com.cnlive.moudle.pedometer.ui.fragment.RunMainFragment;
 import com.cnlive.moudle.pedometer.ui.fragment.RunRaceDetailFragment;
 import com.cnlive.moudle.pedometer.ui.fragment.RunningMapFragment;
 import com.cnlive.moudle.pedometer.ui.widget.FivePersonIconView;
+import com.cnlive.moudle.pedometer.utils.StepUtil;
 import com.example.moudle_pedometer.R;
 import java.util.ArrayList;
@@ -41,12 +44,20 @@ public class RunRaceDetailActivity extends QMUIFragmentActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         StatusBarUtil2.setColor(this, getResources().getColor(R.color.run_main_bg), 0);
-        addFragment();
-
+        //判断用户是否结束运动
+        String uid = "yangshuai";
+        UserStepEntity userStepEntity = StepUtil.getUserStepData(getApplicationContext(), uid);
+        //没有在数据库中找到相关记录
+        if (userStepEntity == null) {
+            addFragment(new RunRaceDetailFragment());
+        }
+        //找到记录
+        else {
+            addFragment(new RunMainFragment());
+        }
     }
-    private void addFragment() {
-        QMUIFragment fragment = new RunRaceDetailFragment();
+    private void addFragment(QMUIFragment fragment) {
         getSupportFragmentManager().beginTransaction()
                 .add(getContextViewId(), fragment, fragment.getClass().getSimpleName())
                 .addToBackStack(fragment.getClass().getSimpleName())
@@ -56,7 +67,7 @@ public class RunRaceDetailActivity extends QMUIFragmentActivity {
     @Override
     protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
-        if(resultCode == 1002){
+        if (resultCode == 1002) {
         }
     }
@@ -9,6 +9,7 @@ import com.alibaba.android.arouter.facade.annotation.Route;
 import com.cnlive.libs.base.ui.QMUIFragment;
 import com.cnlive.libs.base.ui.QMUIFragmentActivity;
 import com.cnlive.libs.base.util.StatusBarUtil2;
+import com.cnlive.moudle.pedometer.model.RunningFinishBean;
 import com.cnlive.moudle.pedometer.model.RunningMapBean;
 import com.cnlive.moudle.pedometer.ui.fragment.RunRaceDetailFragment;
 import com.cnlive.moudle.pedometer.ui.fragment.RunningFinishFragment;
@@ -31,12 +32,15 @@ public class RunningFinishActivity extends QMUIFragmentActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         StatusBarUtil2.setColor(this, getResources().getColor(R.color.run_main_bg), 0);
-        addFragment();
+        if (getIntent().getSerializableExtra("runningFinishBean") != null) {
+            addFragment((RunningFinishBean) getIntent().getSerializableExtra("runningFinishBean"));
+        }
+
     }
-    private void addFragment() {
-        QMUIFragment fragment = new RunningFinishFragment();
+    private void addFragment(RunningFinishBean runningFinishBean) {
+        QMUIFragment fragment = RunningFinishFragment.instance(runningFinishBean);
         getSupportFragmentManager().beginTransaction()
                 .add(getContextViewId(), fragment, fragment.getClass().getSimpleName())
                 .addToBackStack(fragment.getClass().getSimpleName())
@@ -51,8 +55,9 @@ public class RunningFinishActivity extends QMUIFragmentActivity {
         }
     }
-    public static void startActivity(Activity activity) {
+    public static void startActivity(Activity activity, RunningFinishBean runningFinishBean) {
         Intent intent = new Intent(activity, RunningFinishActivity.class);
+        intent.putExtra("runningFinishBean", runningFinishBean);
         activity.startActivity(intent);
     }
 }
@@ -100,5 +100,4 @@ public class RunMainFragment extends QMUIFragment&lt;RunMainFragmentView, RunMainFr
             }
         }
     }
-
 }
@@ -15,8 +15,11 @@ import android.widget.LinearLayout;
 import com.cnlive.libs.base.ui.QMUIFragment;
 import com.cnlive.moudle.pedometer.frame.presenter.RunRaceDetailFragmentPresenter;
 import com.cnlive.moudle.pedometer.frame.view.RunRaceDetailFragmentView;
+import com.cnlive.moudle.pedometer.sql.entity.UserStepEntity;
 import com.cnlive.moudle.pedometer.ui.widget.FivePersonIconView;
+import com.cnlive.moudle.pedometer.utils.ChineseToSpeechUtil;
 import com.cnlive.moudle.pedometer.utils.ScreenUtil;
+import com.cnlive.moudle.pedometer.utils.StepUtil;
 import com.example.moudle_pedometer.R;
 import com.example.moudle_pedometer.databinding.FragmentRunRaceDetailBinding;
 import com.sothree.slidinguppanel.SlidingUpPanelLayout;
@@ -36,6 +39,7 @@ import static android.content.Context.SENSOR_SERVICE;
 public class RunRaceDetailFragment extends QMUIFragment<RunRaceDetailFragmentView, RunRaceDetailFragmentPresenter, FragmentRunRaceDetailBinding> {
     private static final String TAG = "RunRaceDetailFragment";
     private SensorManager mSensorManager;
+
     @Override
     protected int getToolbarId() {
         return 0;
@@ -54,12 +58,14 @@ public class RunRaceDetailFragment extends QMUIFragment&lt;RunRaceDetailFragmentVie
     @Override
     public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        mSensorManager = (SensorManager) getActivity().getSystemService(SENSOR_SERVICE);//获取传感器管理服务
+        mSensorManager = (SensorManager) getActivity().getSystemService(SENSOR_SERVICE);//获取传感器管理服务
         if (getMvpView() != null) {
             getMvpView().initView();
         }
+
     }
+
     @Override
     public void onResume() {
         super.onResume();
@@ -96,6 +102,7 @@ public class RunRaceDetailFragment extends QMUIFragment&lt;RunRaceDetailFragmentVie
         if (getMvpView() != null) {
             getMvpView().onDestroy();
         }
+
     }
 //    private void test() {
 //        BottomSheetDialog bottomSheetDialog = new BottomSheetDialog(getActivity());
 package com.cnlive.moudle.pedometer.ui.fragment;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.view.View;
+
 import com.cnlive.libs.base.ui.QMUIFragment;
 import com.cnlive.moudle.pedometer.frame.presenter.RunningFinishFragmetPresenter;
 import com.cnlive.moudle.pedometer.frame.view.RunningFinishFragmentView;
+import com.cnlive.moudle.pedometer.model.RunningFinishBean;
 import com.example.moudle_pedometer.R;
 import com.example.moudle_pedometer.databinding.FragmentFinishRunMapBinding;
 public class RunningFinishFragment extends QMUIFragment<RunningFinishFragmentView, RunningFinishFragmetPresenter, FragmentFinishRunMapBinding> {
+    private RunningFinishBean runningFinishBean;
+
+    public static RunningFinishFragment instance(RunningFinishBean runningFinishBean) {
+        RunningFinishFragment fragment = new RunningFinishFragment();
+        Bundle bundle = null;
+        if (runningFinishBean != null) {
+            bundle = new Bundle();
+            bundle.putSerializable("runningFinishBean", runningFinishBean);
+        }
+        fragment.setArguments(bundle);
+        return fragment;
+    }
+
     @Override
     protected int getToolbarId() {
         return 0;
@@ -21,4 +39,17 @@ public class RunningFinishFragment extends QMUIFragment&lt;RunningFinishFragmentVie
     protected int getLayoutId() {
         return R.layout.fragment_finish_run_map;
     }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        if (getArguments() != null) {
+            runningFinishBean = (RunningFinishBean) getArguments().getSerializable("runningFinishBean");
+            if (runningFinishBean != null) {
+                if (getMvpView() != null) {
+                    getMvpView().initView(runningFinishBean);
+                }
+            }
+        }
+    }
 }
 package com.cnlive.moudle.pedometer.ui.fragment;
+import android.app.Service;
 import android.content.Context;
 import android.hardware.Sensor;
 import android.hardware.SensorManager;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.SystemClock;
+import android.os.Vibrator;
 import android.support.annotation.Nullable;
 import android.text.TextUtils;
 import android.util.Log;
@@ -20,6 +22,8 @@ import com.cnlive.moudle.pedometer.model.RunningMapBean;
 import com.cnlive.moudle.pedometer.model.Constant;
 import com.cnlive.moudle.pedometer.model.MessageEvent;
 import com.cnlive.moudle.pedometer.service.StepService;
+import com.cnlive.moudle.pedometer.ui.widget.TipDialog;
+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;
@@ -46,6 +50,9 @@ public class RunningMapFragment extends QMUIFragment&lt;RunningMapFragmentView, Run
     private RunningMapBean runningMapBean;
     private SensorManager mSensorManager;
     private String test = "[{\"latitude\":39.933889208848,\"latitudeE6\":3.9933889208848E7,\"longitude\":116.30900265517,\"longitudeE6\":1.1630900265517001E8},{\"latitude\":39.933868507347,\"latitudeE6\":3.9933868507347E7,\"longitude\":116.30865416508,\"longitudeE6\":1.1630865416508E8},{\"latitude\":39.934756505077,\"latitudeE6\":3.9934756505077E7,\"longitude\":116.30860516469,\"longitudeE6\":1.1630860516468999E8},{\"latitude\":39.934781620502,\"latitudeE6\":3.9934781620502E7,\"longitude\":116.30961013007,\"longitudeE6\":1.1630961013007E8},{\"latitude\":39.934881620374,\"latitudeE6\":3.9934881620374E7,\"longitude\":116.30960513008,\"longitudeE6\":1.1630960513008E8},{\"latitude\":39.934077623132,\"latitudeE6\":3.9934077623132E7,\"longitude\":116.30965812942,\"longitudeE6\":1.1630965812942E8},{\"latitude\":39.933972618463,\"latitudeE6\":3.9933972618463E7,\"longitude\":116.30962113087,\"longitudeE6\":1.1630962113087E8},{\"latitude\":39.933932608856,\"latitudeE6\":3.9933932608856E7,\"longitude\":116.30953913383,\"longitudeE6\":1.1630953913383E8},{\"latitude\":39.933903844942,\"latitudeE6\":3.9933903844942E7,\"longitude\":116.30918357649,\"longitudeE6\":1.1630918357649E8}]";
+    //创建震动服务对象
+    private Vibrator mVibrator;
+    private TipDialog tipDialog;
     @Override
     protected int getToolbarId() {
@@ -82,7 +89,12 @@ public class RunningMapFragment extends QMUIFragment&lt;RunningMapFragmentView, Run
     public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
         EventBus.getDefault().register(this);
-        mSensorManager = (SensorManager) getActivity().getSystemService(SENSOR_SERVICE);//获取传感器管理服务
+        //获取传感器管理服务
+        mSensorManager = (SensorManager) getActivity().getSystemService(SENSOR_SERVICE);
+        //获取手机震动服务
+        mVibrator = (Vibrator) getActivity().getSystemService(Service.VIBRATOR_SERVICE);
+        //初始化提示框
+        initTipDialog();
         List<LatLng> trackPoints = GsonUtil.jsonToList(test, LatLng.class);
         if (getArguments() != null) {
             runningMapBean = (RunningMapBean) getArguments().getSerializable("runningMapBean");
@@ -113,6 +125,7 @@ public class RunningMapFragment extends QMUIFragment&lt;RunningMapFragmentView, Run
             getPresenter().queryHistoryTrace(getActivity(), StepService.entityName, startTime, endTime);
             //查询实时轨迹
             getPresenter().queryRealTimeTrace(getActivity(), StepService.entityName, startTime);
+
         }
@@ -144,6 +157,8 @@ public class RunningMapFragment extends QMUIFragment&lt;RunningMapFragmentView, Run
             //取消注册传感器监听
             mSensorManager.unregisterListener(getMvpView());
         }
+        ChineseToSpeechUtil.destroy();
+
     }
     @Override
@@ -152,6 +167,7 @@ public class RunningMapFragment extends QMUIFragment&lt;RunningMapFragmentView, Run
         if (getMvpView() != null) {
             getMvpView().onPause();
         }
+
     }
     @Override
@@ -179,5 +195,32 @@ public class RunningMapFragment extends QMUIFragment&lt;RunningMapFragmentView, Run
                 getMvpView().resetSpeed();
             }
         }
+        //超出范围
+        else if (messageEvent.getMessageType() == Constant.EXIT_RANGE) {
+            ChineseToSpeechUtil.speech(getActivity().getApplicationContext(), "您已偏离预定轨迹!");
+            if (mVibrator != null) {
+                //设置震动周期，数组表示时间：等待+执行，单位是毫秒，下面操作代表:等待100，执行100，等待100，执行1000，
+                //后面的数字如果为-1代表不重复，之执行一次，其他代表会重复，0代表从数组的第0个位置开始
+                mVibrator.vibrate(new long[]{100, 1000, 100, 1000}, -1);
+            }
+            if (tipDialog != null) {
+                tipDialog.show();
+            }
+        }
     }
+
+    private void initTipDialog() {
+        if (tipDialog == null) {
+            tipDialog = new TipDialog(getActivity(), "您已偏离预定轨迹!", "我知道了", R.color.green_round, new TipDialog.DialogInterface() {
+                @Override
+                public void onClick(TipDialog dialog) {
+                    dialog.dismiss();
+                }
+            });
+            tipDialog.setCancelable(false);
+            tipDialog.setCanceledOnTouchOutside(false);
+        }
+    }
+
+
 }
@@ -21,106 +21,132 @@ public class ButtonAnimUtil {
     //设置控件放大动画
     public static void setViewZoomIn(View view) {
-        AnimatorSet animatorSetsuofang = new AnimatorSet();//组合动画
-        ObjectAnimator scaleX = ObjectAnimator.ofFloat(view, "scaleX", 1, 1.2f);
-        ObjectAnimator scaleY = ObjectAnimator.ofFloat(view, "scaleY", 1, 1.2f);
-        animatorSetsuofang.setDuration(DEFAULT_ZOOM_DURATION);
-        animatorSetsuofang.setInterpolator(new DecelerateInterpolator());
-        animatorSetsuofang.play(scaleX).with(scaleY);//两个动画同时开始
-        animatorSetsuofang.start();
+        try {
+            AnimatorSet animatorSetsuofang = new AnimatorSet();//组合动画
+            ObjectAnimator scaleX = ObjectAnimator.ofFloat(view, "scaleX", 1, 1.2f);
+            ObjectAnimator scaleY = ObjectAnimator.ofFloat(view, "scaleY", 1, 1.2f);
+            animatorSetsuofang.setDuration(DEFAULT_ZOOM_DURATION);
+            animatorSetsuofang.setInterpolator(new DecelerateInterpolator());
+            animatorSetsuofang.play(scaleX).with(scaleY);//两个动画同时开始
+            animatorSetsuofang.start();
+        } catch (Exception e) {
+        }
     }
     //设置控件缩小动画
     public static void setViewZoomOut(View view) {
-        AnimatorSet animatorSetsuofang = new AnimatorSet();//组合动画
-        ObjectAnimator scaleX = ObjectAnimator.ofFloat(view, "scaleX", 1.2f, 1);
-        ObjectAnimator scaleY = ObjectAnimator.ofFloat(view, "scaleY", 1.2f, 1);
-        animatorSetsuofang.setDuration(DEFAULT_ZOOM_DURATION);
-        animatorSetsuofang.setInterpolator(new DecelerateInterpolator());
-        animatorSetsuofang.play(scaleX).with(scaleY);//两个动画同时开始
-        animatorSetsuofang.start();
+        try {
+            AnimatorSet animatorSetsuofang = new AnimatorSet();//组合动画
+            ObjectAnimator scaleX = ObjectAnimator.ofFloat(view, "scaleX", 1.2f, 1);
+            ObjectAnimator scaleY = ObjectAnimator.ofFloat(view, "scaleY", 1.2f, 1);
+            animatorSetsuofang.setDuration(DEFAULT_ZOOM_DURATION);
+            animatorSetsuofang.setInterpolator(new DecelerateInterpolator());
+            animatorSetsuofang.play(scaleX).with(scaleY);//两个动画同时开始
+            animatorSetsuofang.start();
+        } catch (Exception e) {
+        }
     }
     //设置控件缩小动画
     public static void setViewDefault(View view) {
-        AnimatorSet animatorSetsuofang = new AnimatorSet();//组合动画
-        ObjectAnimator scaleX = ObjectAnimator.ofFloat(view, "scaleX", 1f, 1);
-        ObjectAnimator scaleY = ObjectAnimator.ofFloat(view, "scaleY", 1f, 1);
-        animatorSetsuofang.setDuration(DEFAULT_ZOOM_DURATION);
-        animatorSetsuofang.setInterpolator(new DecelerateInterpolator());
-        animatorSetsuofang.play(scaleX).with(scaleY);//两个动画同时开始
-        animatorSetsuofang.start();
+        try {
+            AnimatorSet animatorSetsuofang = new AnimatorSet();//组合动画
+            ObjectAnimator scaleX = ObjectAnimator.ofFloat(view, "scaleX", 1f, 1);
+            ObjectAnimator scaleY = ObjectAnimator.ofFloat(view, "scaleY", 1f, 1);
+            animatorSetsuofang.setDuration(DEFAULT_ZOOM_DURATION);
+            animatorSetsuofang.setInterpolator(new DecelerateInterpolator());
+            animatorSetsuofang.play(scaleX).with(scaleY);//两个动画同时开始
+            animatorSetsuofang.start();
+        } catch (Exception e) {
+        }
     }
     //设置控件显示放大动画
     public static void setViewShowZoomIn(View view) {
-        AnimatorSet animatorSetsuofang = new AnimatorSet();//组合动画
-        ObjectAnimator scaleX = ObjectAnimator.ofFloat(view, "scaleX", 0, 1.2f);
-        ObjectAnimator scaleY = ObjectAnimator.ofFloat(view, "scaleY", 0, 1.2f);
-        animatorSetsuofang.setDuration(SHOW_VIEW_ZOOM_DURATION);
-        animatorSetsuofang.setInterpolator(new DecelerateInterpolator());
-        animatorSetsuofang.play(scaleX).with(scaleY);//两个动画同时开始
-        animatorSetsuofang.start();
-        new Handler().postDelayed(new Runnable() {
-            @Override
-            public void run() {
-                AnimatorSet animatorSetsuofang = new AnimatorSet();//组合动画
-                ObjectAnimator scaleX = ObjectAnimator.ofFloat(view, "scaleX", 1.2f, 1);
-                ObjectAnimator scaleY = ObjectAnimator.ofFloat(view, "scaleY", 1.2f, 1);
-                animatorSetsuofang.setDuration(SHOW_VIEW_ZOOM_DURATION);
-                animatorSetsuofang.setInterpolator(new DecelerateInterpolator());
-                animatorSetsuofang.play(scaleX).with(scaleY);//两个动画同时开始
-                animatorSetsuofang.start();
-            }
-        }, SHOW_VIEW_ZOOM_DURATION);
+        try {
+            AnimatorSet animatorSetsuofang = new AnimatorSet();//组合动画
+            ObjectAnimator scaleX = ObjectAnimator.ofFloat(view, "scaleX", 0, 1.2f);
+            ObjectAnimator scaleY = ObjectAnimator.ofFloat(view, "scaleY", 0, 1.2f);
+            animatorSetsuofang.setDuration(SHOW_VIEW_ZOOM_DURATION);
+            animatorSetsuofang.setInterpolator(new DecelerateInterpolator());
+            animatorSetsuofang.play(scaleX).with(scaleY);//两个动画同时开始
+            animatorSetsuofang.start();
+            new Handler().postDelayed(new Runnable() {
+                @Override
+                public void run() {
+                    if (view == null) {
+                        return;
+                    }
+                    AnimatorSet animatorSetsuofang = new AnimatorSet();//组合动画
+                    ObjectAnimator scaleX = ObjectAnimator.ofFloat(view, "scaleX", 1.2f, 1);
+                    ObjectAnimator scaleY = ObjectAnimator.ofFloat(view, "scaleY", 1.2f, 1);
+                    animatorSetsuofang.setDuration(SHOW_VIEW_ZOOM_DURATION);
+                    animatorSetsuofang.setInterpolator(new DecelerateInterpolator());
+                    animatorSetsuofang.play(scaleX).with(scaleY);//两个动画同时开始
+                    animatorSetsuofang.start();
+                }
+            }, SHOW_VIEW_ZOOM_DURATION);
+        } catch (Exception e) {
+        }
     }
     //设置控件隐藏缩小动画
     public static void setViewHideZoomOut(View view) {
-        AnimatorSet animatorSetsuofang = new AnimatorSet();//组合动画
-        ObjectAnimator scaleX = ObjectAnimator.ofFloat(view, "scaleX", 1, 0);
-        ObjectAnimator scaleY = ObjectAnimator.ofFloat(view, "scaleY", 1, 0);
-        animatorSetsuofang.setDuration(HIDE_VIEW_ZOOM_DURATION);
-        animatorSetsuofang.setInterpolator(new DecelerateInterpolator());
-        animatorSetsuofang.play(scaleX).with(scaleY);//两个动画同时开始
-        animatorSetsuofang.start();
+        try {
+            AnimatorSet animatorSetsuofang = new AnimatorSet();//组合动画
+            ObjectAnimator scaleX = ObjectAnimator.ofFloat(view, "scaleX", 1, 0);
+            ObjectAnimator scaleY = ObjectAnimator.ofFloat(view, "scaleY", 1, 0);
+            animatorSetsuofang.setDuration(HIDE_VIEW_ZOOM_DURATION);
+            animatorSetsuofang.setInterpolator(new DecelerateInterpolator());
+            animatorSetsuofang.play(scaleX).with(scaleY);//两个动画同时开始
+            animatorSetsuofang.start();
+        } catch (Exception e) {
+        }
     }
     //设置时间显示放大动画
     public static void setTimeShowZoomIn(View view) {
-        ObjectAnimator scaleX = ObjectAnimator.ofFloat(view, "scaleX", 0, 1.4f);
-        ObjectAnimator scaleY = ObjectAnimator.ofFloat(view, "scaleY", 0, 1.4f);
-        ObjectAnimator scaleX1 = ObjectAnimator.ofFloat(view, "scaleX", 1.4f, 1);
-        ObjectAnimator scaleY1 = ObjectAnimator.ofFloat(view, "scaleY", 1.4f, 1);
-        ObjectAnimator scaleX2 = ObjectAnimator.ofFloat(view, "scaleX", 1, 0);
-        ObjectAnimator scaleY2 = ObjectAnimator.ofFloat(view, "scaleY", 1, 0);
-        AnimatorSet animatorSetsuofang = new AnimatorSet();//组合动画
-        animatorSetsuofang.setDuration(100);
-        animatorSetsuofang.setInterpolator(new DecelerateInterpolator());
-        animatorSetsuofang.play(scaleX).with(scaleY);
-        animatorSetsuofang.start();
-        new Handler().postDelayed(new Runnable() {
-            @Override
-            public void run() {
-                AnimatorSet animatorSetsuofang2 = new AnimatorSet();//组合动画
-                animatorSetsuofang2.setDuration(100);
-                animatorSetsuofang2.setInterpolator(new DecelerateInterpolator());
-                animatorSetsuofang2.play(scaleX1).with(scaleY1);
-                animatorSetsuofang2.start();
-            }
-        }, 100);
-
-        new Handler().postDelayed(new Runnable() {
-            @Override
-            public void run() {
-                AnimatorSet animatorSetsuofang3 = new AnimatorSet();//组合动画
-                animatorSetsuofang3.setDuration(10);
-                animatorSetsuofang3.setInterpolator(new DecelerateInterpolator());
-                animatorSetsuofang3.play(scaleX2).with(scaleY2);
-                animatorSetsuofang3.start();
-            }
-        }, 300);
+        try {
+            ObjectAnimator scaleX = ObjectAnimator.ofFloat(view, "scaleX", 0, 1.4f);
+            ObjectAnimator scaleY = ObjectAnimator.ofFloat(view, "scaleY", 0, 1.4f);
+            ObjectAnimator scaleX1 = ObjectAnimator.ofFloat(view, "scaleX", 1.4f, 1);
+            ObjectAnimator scaleY1 = ObjectAnimator.ofFloat(view, "scaleY", 1.4f, 1);
+            ObjectAnimator scaleX2 = ObjectAnimator.ofFloat(view, "scaleX", 1, 0);
+            ObjectAnimator scaleY2 = ObjectAnimator.ofFloat(view, "scaleY", 1, 0);
+            AnimatorSet animatorSetsuofang = new AnimatorSet();//组合动画
+            animatorSetsuofang.setDuration(100);
+            animatorSetsuofang.setInterpolator(new DecelerateInterpolator());
+            animatorSetsuofang.play(scaleX).with(scaleY);
+            animatorSetsuofang.start();
+            new Handler().postDelayed(new Runnable() {
+                @Override
+                public void run() {
+                    if (view == null) {
+                        return;
+                    }
+                    AnimatorSet animatorSetsuofang2 = new AnimatorSet();//组合动画
+                    animatorSetsuofang2.setDuration(100);
+                    animatorSetsuofang2.setInterpolator(new DecelerateInterpolator());
+                    animatorSetsuofang2.play(scaleX1).with(scaleY1);
+                    animatorSetsuofang2.start();
+                }
+            }, 100);
+            new Handler().postDelayed(new Runnable() {
+                @Override
+                public void run() {
+                    if (view == null) {
+                        return;
+                    }
+                    AnimatorSet animatorSetsuofang3 = new AnimatorSet();//组合动画
+                    animatorSetsuofang3.setDuration(10);
+                    animatorSetsuofang3.setInterpolator(new DecelerateInterpolator());
+                    animatorSetsuofang3.play(scaleX2).with(scaleY2);
+                    animatorSetsuofang3.start();
+                }
+            }, 300);
+        } catch (Exception e) {
+        }
     }
@@ -131,46 +157,49 @@ public class ButtonAnimUtil {
      * @param closeFlag
      */
     public static void startAnimation(View view, boolean closeFlag) {
-        //因为CircularReveal动画是api21之后才有的,所以加个判断语句,免得崩溃
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            int cicular_R = view.getHeight() / 2 > view.getWidth() / 2 ? view.getHeight() / 2 : view.getWidth() / 2;
-            Animator animator = null;
-            if (!closeFlag) {
-                animator = ViewAnimationUtils.createCircularReveal(view, (int) view.getWidth() / 2, (int) view.getHeight() / 2, 0, cicular_R);
-            } else {
-                animator = ViewAnimationUtils.createCircularReveal(view, (int) view.getWidth() / 2, (int) view.getHeight() / 2, cicular_R, 0);
-            }
-            animator.addListener(new Animator.AnimatorListener() {
-                @Override
-                public void onAnimationStart(Animator animator) {
-
+        try {
+            //因为CircularReveal动画是api21之后才有的,所以加个判断语句,免得崩溃
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                int cicular_R = view.getHeight() / 2 > view.getWidth() / 2 ? view.getHeight() / 2 : view.getWidth() / 2;
+                Animator animator = null;
+                if (!closeFlag) {
+                    animator = ViewAnimationUtils.createCircularReveal(view, (int) view.getWidth() / 2, (int) view.getHeight() / 2, 0, cicular_R);
+                } else {
+                    animator = ViewAnimationUtils.createCircularReveal(view, (int) view.getWidth() / 2, (int) view.getHeight() / 2, cicular_R, 0);
                 }
+                animator.addListener(new Animator.AnimatorListener() {
+                    @Override
+                    public void onAnimationStart(Animator animator) {
-                @Override
-                public void onAnimationEnd(Animator animator) {
-                    if (closeFlag) {
-                        view.setVisibility(View.GONE);
                     }
-                }
-                @Override
-                public void onAnimationCancel(Animator animator) {
+                    @Override
+                    public void onAnimationEnd(Animator animator) {
+                        if (closeFlag) {
+                            view.setVisibility(View.GONE);
+                        }
+                    }
-                }
+                    @Override
+                    public void onAnimationCancel(Animator animator) {
-                @Override
-                public void onAnimationRepeat(Animator animator) {
+                    }
+
+                    @Override
+                    public void onAnimationRepeat(Animator animator) {
+                    }
+                });
+                animator.setDuration(350);
+                animator.start();
+            } else {
+                if (closeFlag) {
+                    view.setVisibility(View.GONE);
                 }
-            });
-            animator.setDuration(350);
-            animator.start();
-        } else {
-            if (closeFlag) {
-                view.setVisibility(View.GONE);
             }
-        }
+        } catch (Exception e) {
+        }
     }
 }
+package com.cnlive.moudle.pedometer.utils;
+
+import android.app.Application;
+import android.content.Context;
+import android.speech.tts.TextToSpeech;
+
+import java.util.Locale;
+
+public class ChineseToSpeechUtil {
+    private static TextToSpeech textToSpeech;
+
+
+    public static void speech(Context context, String text) {
+        if (textToSpeech == null) {
+            textToSpeech = new TextToSpeech(context, new TextToSpeech.OnInitListener() {
+                @Override
+                public void onInit(int status) {
+                    if (status == TextToSpeech.SUCCESS) {
+                        int result = textToSpeech.setLanguage(Locale.CHINA);
+                        if (result == TextToSpeech.LANG_MISSING_DATA
+                                || result == TextToSpeech.LANG_NOT_SUPPORTED) {
+//                            new CoolToast(Application.getContext()).show("不支持朗读功能");
+                        } else {
+                            // 设置音调，值越大声音越尖（女生），值越小则变成男声,1.0是常规
+                            textToSpeech.setPitch(1.0f);
+                            // 设置语速
+                            textToSpeech.setSpeechRate(1f);
+                            textToSpeech.speak(text, TextToSpeech.QUEUE_FLUSH, null);
+                        }
+                    }
+                }
+            });
+        }else {
+            textToSpeech.speak(text, TextToSpeech.QUEUE_FLUSH, null);
+        }
+
+
+
+    }
+
+    public static void destroy() {
+        if (textToSpeech != null) {
+            textToSpeech.stop();
+            textToSpeech.shutdown();
+            textToSpeech=null;
+        }
+    }
+
+}
@@ -13,7 +13,9 @@ import com.baidu.mapapi.map.PolylineOptions;
 import com.baidu.mapapi.model.LatLng;
 import com.baidu.mapapi.utils.DistanceUtil;
 import com.baidu.trace.model.SortType;
+import com.cnlive.moudle.pedometer.model.RoutePoint;
+import java.util.ArrayList;
 import java.util.List;
 /**
@@ -35,16 +37,19 @@ public class MyMapUtil {
      */
     public static Overlay drawHistoryTrack(Context context, BaiduMap baiduMap, List<LatLng> points, SortType sortType, int lineColor, int startIconRes, int endIconRes) {
         // 绘制新覆盖物前，清空之前的覆盖物
-        baiduMap.clear();
         if (points == null || points.size() == 0) {
             return null;
         }
         //只有一个点
         if (points.size() == 1) {
-            Bitmap pointBitmap = BitmapUtil.getBitmapFromDp(context, BitmapFactory.decodeResource(context.getResources(), startIconRes), 40, 40);
-            OverlayOptions startOptions = new MarkerOptions().position(points.get(0)).icon(BitmapDescriptorFactory.fromBitmap(pointBitmap));
+            if (startIconRes != 0) {
+                Bitmap pointBitmap = BitmapUtil.getBitmapFromDp(context, BitmapFactory.decodeResource(context.getResources(), startIconRes), 40, 40);
+                OverlayOptions startOptions = new MarkerOptions().position(points.get(0)).icon(BitmapDescriptorFactory.fromBitmap(pointBitmap));
 //                    .zIndex(9).draggable(true);
-            return baiduMap.addOverlay(startOptions);
+                return baiduMap.addOverlay(startOptions);
+            } else {
+                return null;
+            }
         }
         LatLng startPoint;
@@ -58,22 +63,33 @@ public class MyMapUtil {
         }
         // 添加起点图标
-        Bitmap startPointBitmap = BitmapUtil.getBitmapFromDp(context, BitmapFactory.decodeResource(context.getResources(), startIconRes), 40, 40);
-        OverlayOptions startOptions = new MarkerOptions()
-                .position(startPoint).icon(BitmapDescriptorFactory.fromBitmap(startPointBitmap));
+        Bitmap startPointBitmap = null;
+        OverlayOptions startOptions = null;
+        if (startIconRes != 0) {
+            startPointBitmap = BitmapUtil.getBitmapFromDp(context, BitmapFactory.decodeResource(context.getResources(), startIconRes), 40, 40);
+            startOptions = new MarkerOptions().perspective(false).animateType(MarkerOptions.MarkerAnimateType.grow)
+                    .position(startPoint).icon(BitmapDescriptorFactory.fromBitmap(startPointBitmap));
+        }
 //                .zIndex(9).draggable(true);
         // 添加终点图标
-        Bitmap endPointBitmap = BitmapUtil.getBitmapFromDp(context, BitmapFactory.decodeResource(context.getResources(), endIconRes), 40, 40);
-        OverlayOptions endOptions = new MarkerOptions().position(endPoint)
-                .icon(BitmapDescriptorFactory.fromBitmap(endPointBitmap));
+        Bitmap endPointBitmap = null;
+        OverlayOptions endOptions = null;
+        if (endIconRes != 0) {
+            endPointBitmap = BitmapUtil.getBitmapFromDp(context, BitmapFactory.decodeResource(context.getResources(), endIconRes), 40, 40);
+            endOptions = new MarkerOptions().position(endPoint).perspective(false).animateType(MarkerOptions.MarkerAnimateType.grow)
+                    .icon(BitmapDescriptorFactory.fromBitmap(endPointBitmap));
+        }
 //                .zIndex(9).draggable(true);
         // 添加路线（轨迹）
         OverlayOptions polylineOptions = new PolylineOptions().width(10)
                 .color(context.getResources().getColor(lineColor)).points(points);
-
-        baiduMap.addOverlay(startOptions);
-        baiduMap.addOverlay(endOptions);
+        if (startOptions != null) {
+            baiduMap.addOverlay(startOptions);
+        }
+        if (endOptions != null) {
+            baiduMap.addOverlay(endOptions);
+        }
         return baiduMap.addOverlay(polylineOptions);
     }
@@ -82,7 +98,6 @@ public class MyMapUtil {
      */
     public static Overlay drawServerLineTrack(Context context, BaiduMap baiduMap, List<LatLng> points, SortType sortType, int lineColor, int startIconRes, int endIconRes) {
         // 绘制新覆盖物前，清空之前的覆盖物
-        baiduMap.clear();
         if (points == null || points.size() == 0) {
             return null;
         }
@@ -107,12 +122,19 @@ public class MyMapUtil {
         // 添加起点图标
         Bitmap startPointBitmap = BitmapUtil.getBitmapFromDp(context, BitmapFactory.decodeResource(context.getResources(), startIconRes), 40, 40);
         OverlayOptions startOptions = new MarkerOptions()
-                .position(startPoint).icon(BitmapDescriptorFactory.fromBitmap(startPointBitmap));
+                .position(startPoint)
+                .icon(BitmapDescriptorFactory.fromBitmap(startPointBitmap))
+                .perspective(false)
+                .animateType(MarkerOptions.MarkerAnimateType.grow)
+                ;
 //                .zIndex(9).draggable(true);
         // 添加终点图标
         Bitmap endPointBitmap = BitmapUtil.getBitmapFromDp(context, BitmapFactory.decodeResource(context.getResources(), endIconRes), 40, 40);
-        OverlayOptions endOptions = new MarkerOptions().position(endPoint)
-                .icon(BitmapDescriptorFactory.fromBitmap(endPointBitmap));
+        OverlayOptions endOptions = new MarkerOptions()
+                .position(endPoint)
+                .icon(BitmapDescriptorFactory.fromBitmap(endPointBitmap))
+                .perspective(false)
+                .animateType(MarkerOptions.MarkerAnimateType.grow);
 //                .zIndex(9).draggable(true);
         // 添加路线（轨迹）
@@ -131,6 +153,18 @@ public class MyMapUtil {
         return baiduMap.addOverlay(polylineOptions);
     }
+    public static Overlay drawMapLineRoutePoint(Context context, BaiduMap baiduMap, List<RoutePoint> points, int lineColor) {
+        List<LatLng> latLngs = new ArrayList<>();
+        for (RoutePoint routePoint : points) {
+            if (routePoint != null && routePoint.getLat() != 0 && routePoint.getLng() != 0) {
+                latLngs.add(new LatLng(routePoint.getLat(), routePoint.getLng()));
+            }
+        }
+        OverlayOptions polylineOptions = new PolylineOptions().width(10)
+                .color(context.getResources().getColor(lineColor)).points(latLngs);
+        return baiduMap.addOverlay(polylineOptions);
+    }
+
     public static double pi = 3.1415926535897932384626;
     public static double a = 6378245.0;
     public static double ee = 0.00669342162296594323;
@@ -257,7 +291,6 @@ public class MyMapUtil {
     }
-
     /*****************************************************地理围栏***************************************************************/
     /**
      * 地球半径
@@ -437,36 +470,38 @@ public class MyMapUtil {
     /**
      * luming
      * 点到边的最短距离
+     *
      * @param pointP
      * @param pointA
      * @param pointB
      * @return
      */
-    public static double minDistanceToLine(LatLng pointP, LatLng pointA, LatLng pointB){
-        double pa = getDistance(pointP,pointA);
-        double pb = getDistance(pointP,pointB);
-        double ab = getDistance(pointA,pointB);
+    public static double minDistanceToLine(LatLng pointP, LatLng pointA, LatLng pointB) {
+        double pa = getDistance(pointP, pointA);
+        double pb = getDistance(pointP, pointB);
+        double ab = getDistance(pointA, pointB);
-        if((Math.pow(pa,2) + Math.pow(ab,2)) <= Math.pow(pb,2) ){
+        if ((Math.pow(pa, 2) + Math.pow(ab, 2)) <= Math.pow(pb, 2)) {
             return pa;
         }
-        if((Math.pow(pb,2) + Math.pow(ab,2)) <= Math.pow(pa,2) ){
+        if ((Math.pow(pb, 2) + Math.pow(ab, 2)) <= Math.pow(pa, 2)) {
             return pb;
         }
-        double p = (pa + pb + ab) / 2 ;
-        double s = Math.sqrt(p*(p-pa)*(p-pb)*(p-ab));
+        double p = (pa + pb + ab) / 2;
+        double s = Math.sqrt(p * (p - pa) * (p - pb) * (p - ab));
-        return (2*s/ab);
+        return (2 * s / ab);
     }
     /**
      * 通过经纬度获取距离(单位：米)
+     *
      * @param location1
      * @param location2
      * @return
      */
-    public static double getDistance(LatLng location1,LatLng location2) {
+    public static double getDistance(LatLng location1, LatLng location2) {
         double lat1 = location1.latitude;
         double lat2 = location2.latitude;
         double lng1 = location1.longitude;
@@ -480,7 +515,67 @@ public class MyMapUtil {
                 * Math.pow(Math.sin(b / 2), 2)));
         s = s * EARTH_RADIUS;
         s = Math.round(s * 10000d) / 10000d;
-        s = s*1000;
+        s = s * 1000;
         return s;
     }
+
+
+    /**
+     * 地图平滑算法
+     *
+     * @param inPoint
+     * @return
+     */
+    public static List<RoutePoint> optimizePoints(List<RoutePoint> inPoint) {
+        int size = inPoint.size();
+        List<RoutePoint> outPoint;
+
+        int i;
+        if (size < 5) {
+            return inPoint;
+        } else {
+            // Latitude
+            inPoint.get(0)
+                    .setLat((3.0 * inPoint.get(0).getLat() + 2.0
+                            * inPoint.get(1).getLat() + inPoint.get(2).getLat() - inPoint
+                            .get(4).getLat()) / 5.0);
+            inPoint.get(1)
+                    .setLat((4.0 * inPoint.get(0).getLat() + 3.0
+                            * inPoint.get(1).getLat() + 2
+                            * inPoint.get(2).getLat() + inPoint.get(3).getLat()) / 10.0);
+
+            inPoint.get(size - 2).setLat(
+                    (4.0 * inPoint.get(size - 1).getLat() + 3.0
+                            * inPoint.get(size - 2).getLat() + 2
+                            * inPoint.get(size - 3).getLat() + inPoint.get(
+                            size - 4).getLat()) / 10.0);
+            inPoint.get(size - 1).setLat(
+                    (3.0 * inPoint.get(size - 1).getLat() + 2.0
+                            * inPoint.get(size - 2).getLat()
+                            + inPoint.get(size - 3).getLat() - inPoint.get(
+                            size - 5).getLat()) / 5.0);
+
+            // Longitude
+            inPoint.get(0)
+                    .setLng((3.0 * inPoint.get(0).getLng() + 2.0
+                            * inPoint.get(1).getLng() + inPoint.get(2).getLng() - inPoint
+                            .get(4).getLng()) / 5.0);
+            inPoint.get(1)
+                    .setLng((4.0 * inPoint.get(0).getLng() + 3.0
+                            * inPoint.get(1).getLng() + 2
+                            * inPoint.get(2).getLng() + inPoint.get(3).getLng()) / 10.0);
+
+            inPoint.get(size - 2).setLng(
+                    (4.0 * inPoint.get(size - 1).getLng() + 3.0
+                            * inPoint.get(size - 2).getLng() + 2
+                            * inPoint.get(size - 3).getLng() + inPoint.get(
+                            size - 4).getLng()) / 10.0);
+            inPoint.get(size - 1).setLng(
+                    (3.0 * inPoint.get(size - 1).getLng() + 2.0
+                            * inPoint.get(size - 2).getLng()
+                            + inPoint.get(size - 3).getLng() - inPoint.get(
+                            size - 5).getLng()) / 5.0);
+        }
+        return inPoint;
+    }
 }
@@ -95,9 +95,8 @@ public class StepUtil {
         if (list != null && list.size() > 0) {
             Log.e(TAG, "clearRunData: " + list.size());
 //            for (int i = 0; i < list.size(); i++) {
-            DbCore.getDaoSession().getUserStepEntityDao().deleteInTx(list);
+            DbCore.getDaoSession().getUserStepEntityDao().deleteByKey(list.get(0).getUuid());
             DbCore.getDaoSession().getUserStepEntityDao().detachAll();
-            DbCore.getDaoSession().clear();
 //            }
         }
     }
 package com.cnlive.moudle.pedometer.utils;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+/**
+ * @author ShinnyYang
+ */
 public class TimeUtil {
     /**
      * 获取当前时间戳(单位：秒)
@@ -10,4 +17,84 @@ public class TimeUtil {
         return System.currentTimeMillis() / 1000;
     }
+    /**
+     * 日期格式字符串转换成时间戳
+     *
+     * @param dateStr 字符串日期
+     * @return
+     */
+    public static long DateToTimeStamp(String dateStr) {
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        try {
+            Date date = simpleDateFormat.parse(dateStr);
+            long ts = date.getTime() / 1000;
+            return ts;
+        } catch (ParseException e) {
+            return 0;
+        }
+    }
+
+    /**
+     * 取得当前时间戳（精确到秒）
+     *
+     * @return time(long型的时间)
+     */
+    public static long getNowTimeStamp() {
+        long time = System.currentTimeMillis() / 1000;
+        return time;
+    }
+
+
+    /**
+     * 取得当前格式化的时间戳
+     *
+     * @return 格式化后的日期
+     */
+    public static String getFormatNowTime() {
+        SimpleDateFormat df = new SimpleDateFormat("yyyy/MM/dd HH:mm");
+        long time = System.currentTimeMillis();
+        return df.format(time);
+    }
+
+    /**
+     * 取得指定时间的格式化的时间戳（精确到秒）
+     *
+     * @return 格式化后的日期
+     */
+    public static String getFormatTimeStamp(String timeType) {
+        SimpleDateFormat df = new SimpleDateFormat(timeType);
+        long time = System.currentTimeMillis();
+        return df.format(time);
+    }
+
+    /**
+     * 取得指定时间的格式化的时间戳（精确到秒）
+     *
+     * @return 格式化后的日期
+     */
+    public static String getStampToTime(long time) {
+        String res;
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        long lt = new Long(time * 1000);
+        Date date = new Date(lt);
+        res = simpleDateFormat.format(date);
+        return res;
+    }
+
+    /**
+     * 计算时间差
+     *
+     * @return
+     */
+    public static String getWorkTime(long startTime, long workTime) {
+        int days = (int) ((workTime - startTime) / (1000 * 60 * 60 * 24));
+        int hours = (int) ((workTime - startTime) / (1000 * 60 * 60));
+        int minute = (int) ((workTime - startTime) / (1000 * 60));
+        return "据上班时间还有：" + hours + "小时," + minute + "分钟";
+    }
+
+    public static String getCurrentTimeStr(String formate) {
+        SimpleDateFormat df = new SimpleDateFormat(formate);
+        return df.format(new Date());
+    }
 }
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <!--边-->
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="7px"
+                android:left="7px"
+                android:right="7px"
+                android:top="5px" />
+
+            <solid android:color="#00eeeeee" />
+
+            <corners android:radius="5dp" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="7px"
+                android:left="7px"
+                android:right="7px"
+                android:top="5px" />
+
+            <solid android:color="#0Deeeeee" />
+
+            <corners android:radius="5dp" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="7px"
+                android:left="7px"
+                android:right="7px"
+                android:top="5px" />
+            <solid android:color="#0Deeeeee" />
+            <corners android:radius="5dp" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="7px"
+                android:left="7px"
+                android:right="7px"
+                android:top="5px" />
+            <solid android:color="#0Deeeeee" />
+            <corners android:radius="5dp" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="7px"
+                android:left="7px"
+                android:right="7px"
+                android:top="5px" />
+
+            <solid android:color="#0Deeeeee" />
+            <corners android:radius="5dp" />
+        </shape>
+    </item>
+
+    <!--中心背景 -->
+    <item>
+        <shape
+            android:shape="rectangle"
+            android:useLevel="false">
+            <!--实心 -->
+            <solid android:color="@color/white" />
+            <corners android:radius="5dp" />
+            <size
+                android:width="32dp"
+                android:height="32dp" />
+
+        </shape>
+    </item>
+
+</layer-list>
 \ No newline at end of file
@@ -2,7 +2,4 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <solid android:color="@color/white" />
     <corners android:radius="10dp" />
-    <stroke
-        android:width="1dp"
-        android:color="@color/line" />
 </shape>
 \ No newline at end of file
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <corners android:radius="100dp" />
-    <solid android:color="@color/gray_round" />
+    <solid android:color="@color/white" />
 </shape>
 \ No newline at end of file
@@ -51,5 +51,5 @@
         android:layout_width="9dp"
         android:layout_height="15dp"
         android:layout_marginLeft="5dp"
-        android:background="@drawable/tc_suit_right_arrow" />
+        android:background="@drawable/more" />
 </LinearLayout>
 \ No newline at end of file
@@ -10,7 +10,7 @@
         sothree:umanoDragView="@+id/dragView"
         sothree:umanoFadeColor="@color/black_20"
         sothree:umanoOverlay="true"
-        sothree:umanoPanelHeight="220dp"
+        sothree:umanoPanelHeight="360dp"
         sothree:umanoParallaxOffset="100dp"
         sothree:umanoScrollableView="@+id/scrollView"
         sothree:umanoShadowHeight="0dp">
@@ -26,28 +26,31 @@
                 android:layout_height="match_parent"></com.baidu.mapapi.map.MapView>
             <FrameLayout
-                android:layout_width="40dp"
-                android:layout_height="40dp"
-                android:layout_margin="10dp"
-                android:background="@drawable/shape_circle_50_black">
+                android:id="@+id/fl_back"
+                android:layout_width="55dp"
+                android:layout_height="55dp"
+                android:background="@drawable/button_fab_white"
+                android:focusable="true">
                 <ImageView
-                    android:layout_width="10dp"
+                    android:layout_width="12dp"
                     android:layout_height="20dp"
                     android:layout_gravity="center"
-                    android:background="@drawable/ic_white_back" />
+                    android:layout_marginLeft="-2dp"
+                    android:background="@drawable/icon_back"
+                    android:focusable="false" />
             </FrameLayout>
             <FrameLayout
-                android:layout_width="40dp"
-                android:layout_height="40dp"
+                android:layout_width="55dp"
+                android:layout_height="55dp"
                 android:layout_gravity="right"
-                android:layout_margin="10dp"
-                android:background="@drawable/shape_circle_50_black">
+                android:background="@drawable/button_fab_white"
+                android:focusable="true">
                 <ImageView
-                    android:layout_width="15dp"
-                    android:layout_height="15dp"
+                    android:layout_width="19dp"
+                    android:layout_height="18dp"
                     android:layout_gravity="center"
                     android:background="@drawable/icon_share" />
             </FrameLayout>
@@ -51,10 +51,10 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="10dp"
-                        android:layout_marginTop="15dp"
+                        android:layout_marginTop="20dp"
                         android:text="公里"
                         android:textColor="@color/white"
-                        android:textSize="25sp" />
+                        android:textSize="15sp" />
                 </LinearLayout>
                 <!--GPS信息-->
                 <LinearLayout
@@ -73,10 +73,10 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_centerVertical="true"
-                            android:layout_marginLeft="15dp"
+                            android:layout_marginLeft="20dp"
                             android:text="GPS"
                             android:textColor="@color/white"
-                            android:textSize="20sp"
+                            android:textSize="18sp"
                             android:textStyle="bold" />
                         <TextView
@@ -88,7 +88,7 @@
                             android:layout_toRightOf="@id/tv_gps"
                             android:text="(点击查看轨迹)"
                             android:textColor="@color/text_gray"
-                            android:textSize="15sp"
+                            android:textSize="12sp"
                             android:textStyle="bold" />
                         <ImageView
@@ -102,7 +102,7 @@
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="15dp">
+                        android:layout_marginTop="35dp">
                         <LinearLayout
                             android:layout_width="0dp"
@@ -112,10 +112,10 @@
                             android:orientation="vertical">
                             <ImageView
-                                android:layout_width="30dp"
-                                android:layout_height="30dp"
+                                android:layout_width="26dp"
+                                android:layout_height="23dp"
                                 android:layout_marginBottom="5dp"
-                                android:src="@drawable/rt_outdoor_video_pace" />
+                                android:src="@drawable/sport_speed" />
                             <LinearLayout
                                 android:layout_width="match_parent"
@@ -138,9 +138,9 @@
                                 android:layout_height="wrap_content"
                                 android:layout_marginTop="5dp"
                                 android:gravity="center"
-                                android:text="时速"
+                                android:text="配速"
                                 android:textColor="@color/text_gray"
-                                android:textSize="17sp"
+                                android:textSize="15sp"
                                 android:textStyle="bold" />
                         </LinearLayout>
                         <!--用时-->
@@ -152,10 +152,10 @@
                             android:orientation="vertical">
                             <ImageView
-                                android:layout_width="30dp"
-                                android:layout_height="30dp"
+                                android:layout_width="23dp"
+                                android:layout_height="25dp"
                                 android:layout_marginBottom="5dp"
-                                android:src="@drawable/rt_outdoor_video_time" />
+                                android:src="@drawable/sport_time_cost" />
                             <Chronometer
                                 android:id="@+id/chronometer"
@@ -173,7 +173,7 @@
                                 android:gravity="center"
                                 android:text="用时"
                                 android:textColor="@color/text_gray"
-                                android:textSize="17sp"
+                                android:textSize="15sp"
                                 android:textStyle="bold" />
                         </LinearLayout>
                         <!--热量-->
@@ -185,10 +185,10 @@
                             android:orientation="vertical">
                             <ImageView
-                                android:layout_width="30dp"
-                                android:layout_height="30dp"
+                                android:layout_width="26dp"
+                                android:layout_height="24dp"
                                 android:layout_marginBottom="5dp"
-                                android:src="@drawable/rt_outdoor_video_cal" />
+                                android:src="@drawable/sport_step" />
                             <TextView
                                 android:id="@+id/tv_step_count"
@@ -205,9 +205,9 @@
                                 android:layout_height="wrap_content"
                                 android:layout_marginTop="5dp"
                                 android:gravity="center"
-                                android:text="步数"
+                                android:text="步"
                                 android:textColor="@color/text_gray"
-                                android:textSize="17sp"
+                                android:textSize="15sp"
                                 android:textStyle="bold" />
                         </LinearLayout>
                     </LinearLayout>
@@ -248,26 +248,22 @@
                                 <FrameLayout
                                     android:layout_width="match_parent"
-                                    android:layout_height="wrap_content">
-
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginTop="5dp"
+                                    android:visibility="invisible">
                                     <ImageView
-                                        android:layout_width="70dp"
-                                        android:layout_height="50dp"
-                                        android:layout_gravity="center"
-                                        android:layout_marginTop="-5dp"
-                                        android:layout_marginBottom="-10dp"
-                                        android:padding="0dp"
-                                        android:scaleX="1.1"
-                                        android:scaleY="0.8" />
+                                        android:layout_width="72dp"
+                                        android:layout_height="33dp"
+                                        android:layout_gravity="center" />
                                     <TextView
                                         android:layout_width="wrap_content"
                                         android:layout_height="wrap_content"
                                         android:layout_gravity="center"
+                                        android:layout_marginBottom="5dp"
                                         android:gravity="center"
                                         android:src="@drawable/bg_tips_bottom_center"
-                                        android:text=""
                                         android:textSize="12sp" />
                                 </FrameLayout>
@@ -280,8 +276,8 @@
                                     android:focusable="true">
                                     <ImageView
-                                        android:layout_width="35dp"
-                                        android:layout_height="35dp"
+                                        android:layout_width="17dp"
+                                        android:layout_height="20dp"
                                         android:layout_gravity="center"
                                         android:layout_marginBottom="10dp"
                                         android:background="@drawable/rt_training_button_resume"
@@ -308,23 +304,20 @@
                                     android:id="@+id/fl_stop_tip"
                                     android:layout_width="match_parent"
                                     android:layout_height="wrap_content"
+                                    android:layout_marginTop="5dp"
                                     android:visibility="invisible">
                                     <ImageView
-                                        android:layout_width="70dp"
-                                        android:layout_height="50dp"
+                                        android:layout_width="72dp"
+                                        android:layout_height="33dp"
                                         android:layout_gravity="center"
-                                        android:layout_marginTop="-5dp"
-                                        android:layout_marginBottom="-10dp"
-                                        android:background="@drawable/bg_tips_bottom_center"
-                                        android:padding="0dp"
-                                        android:scaleX="1.1"
-                                        android:scaleY="0.8" />
+                                        android:background="@drawable/bg_tips_bottom_center" />
                                     <TextView
                                         android:layout_width="wrap_content"
                                         android:layout_height="wrap_content"
                                         android:layout_gravity="center"
+                                        android:layout_marginBottom="3dp"
                                         android:gravity="center"
                                         android:src="@drawable/bg_tips_bottom_center"
                                         android:text="长按结束"
@@ -346,8 +339,8 @@
                                         android:visibility="gone" />
                                     <ImageView
-                                        android:layout_width="35dp"
-                                        android:layout_height="35dp"
+                                        android:layout_width="17dp"
+                                        android:layout_height="17dp"
                                         android:layout_gravity="center"
                                         android:layout_marginBottom="10dp"
                                         android:background="@drawable/rt_training_button_stop"
@@ -377,12 +370,12 @@
                                 android:layout_width="85dp"
                                 android:layout_height="85dp"
                                 android:layout_marginBottom="12dp"
-                                android:background="@drawable/shape_gray_round"
+                                android:background="@drawable/shape_white_round"
                                 android:focusable="true">
                                 <ImageView
-                                    android:layout_width="35dp"
-                                    android:layout_height="35dp"
+                                    android:layout_width="15dp"
+                                    android:layout_height="18dp"
                                     android:layout_gravity="center"
                                     android:layout_marginBottom="10dp"
                                     android:background="@drawable/rt_training_button_pause"
@@ -408,7 +401,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:background="@color/run_main_time_bg"
-                android:gravity="center">
+                android:gravity="center"
+                android:visibility="visible">
                 <TextView
                     android:id="@+id/tv_time_count_down"
@@ -10,7 +10,7 @@
         sothree:umanoDragView="@+id/dragView"
         sothree:umanoFadeColor="@color/black_20"
         sothree:umanoOverlay="true"
-        sothree:umanoPanelHeight="142dp"
+        sothree:umanoPanelHeight="141dp"
         sothree:umanoParallaxOffset="250dp"
         sothree:umanoScrollableView="@+id/scrollView"
         sothree:umanoShadowHeight="0dp">
@@ -25,32 +25,22 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"></com.baidu.mapapi.map.MapView>
-            <FrameLayout
-                android:layout_width="40dp"
-                android:layout_height="40dp"
+
+            <ImageView
+                android:id="@+id/iv_back"
+                android:layout_width="35dp"
+                android:layout_height="35dp"
                 android:layout_margin="10dp"
-                android:background="@drawable/shape_circle_50_black">
-
-                <ImageView
-                    android:layout_width="10dp"
-                    android:layout_height="20dp"
-                    android:layout_gravity="center"
-                    android:background="@drawable/ic_white_back" />
-            </FrameLayout>
-
-            <FrameLayout
-                android:layout_width="40dp"
-                android:layout_height="40dp"
+                android:background="@drawable/xqy_return" />
+
+
+            <ImageView
+                android:id="@+id/iv_share"
+                android:layout_width="35dp"
+                android:layout_height="35dp"
                 android:layout_gravity="right"
                 android:layout_margin="10dp"
-                android:background="@drawable/shape_circle_50_black">
-
-                <ImageView
-                    android:layout_width="15dp"
-                    android:layout_height="15dp"
-                    android:layout_gravity="center"
-                    android:background="@drawable/icon_share" />
-            </FrameLayout>
+                android:background="@drawable/xqt_share" />
             <!---->
@@ -89,6 +79,11 @@
                         android:id="@+id/include_rank"
                         layout="@layout/layout_run_detail_rank"
                         android:visibility="visible" />
+                    <!---->
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="20dp"
+                        android:background="#F4F4F4" />
                     <!--路线介绍-->
                     <include
                         android:id="@+id/include_street_introduce"
@@ -13,17 +13,17 @@
         <FrameLayout
             android:id="@+id/fl_back"
-            android:layout_width="60dp"
-            android:layout_height="60dp"
+            android:layout_width="55dp"
+            android:layout_height="55dp"
             android:background="@drawable/button_fab_white"
             android:focusable="true">
             <ImageView
-                android:layout_width="25dp"
-                android:layout_height="25dp"
+                android:layout_width="12dp"
+                android:layout_height="20dp"
                 android:layout_gravity="center"
-                android:layout_marginLeft="2dp"
-                android:background="@drawable/mo_ic_dialog_back"
+                android:layout_marginLeft="-2dp"
+                android:background="@drawable/icon_back"
                 android:focusable="false" />
         </FrameLayout>
@@ -35,15 +35,15 @@
             <FrameLayout
                 android:id="@+id/fl_location"
-                android:layout_width="60dp"
-                android:layout_height="60dp"
+                android:layout_width="55dp"
+                android:layout_height="55dp"
                 android:layout_marginBottom="20dp"
                 android:background="@drawable/button_fab_white"
                 android:focusable="true">
                 <ImageView
-                    android:layout_width="60dp"
-                    android:layout_height="60dp"
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
                     android:layout_gravity="center"
                     android:background="@drawable/rt_ic_location_blank"
                     android:focusable="false" />
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:layout_margin="10dp"
-    android:background="@drawable/shape_10dp_white_raduis_bg"
-    android:orientation="vertical">
-    <!--跑步路线-->
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
-        android:gravity="bottom">
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
-        <ImageView
-            android:layout_width="30dp"
-            android:layout_height="30dp"
-            android:layout_marginLeft="10dp"
-            android:background="@drawable/icon_run_route" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="1dp"
-            android:text="跑步路线"
-            android:textColor="@color/black"
-            android:textSize="12sp" />
-    </LinearLayout>
-    <!--起点-->
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
-        android:gravity="center_vertical">
-
-        <View
-            android:layout_width="10dp"
-            android:layout_height="10dp"
-            android:layout_marginLeft="15dp"
-            android:background="@drawable/shape_circle_green" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="10dp"
-            android:text="@string/layout_street_start_point"
-            android:textColor="@color/text_gray"
-            android:textSize="14sp" />
-
-        <TextView
-            android:layout_width="wrap_content"
+        android:layout_margin="10dp"
+        android:background="@drawable/shape_10dp_white_raduis_bg"
+        android:orientation="vertical">
+        <!--跑步路线-->
+        <LinearLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="10dp"
-            android:text="首都师范大学操场东门"
-            android:textColor="@color/black"
-            android:textSize="15sp" />
-    </LinearLayout>
-    <!--竖线-->
-    <View
-        android:layout_width="1dp"
-        android:layout_height="30dp"
-        android:layout_marginLeft="19dp"
-        android:layout_marginTop="-3dp"
-        android:background="@color/vertical_line" />
-    <!--终点-->
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="-3dp"
-        android:gravity="center_vertical">
+            android:layout_marginTop="10dp"
+            android:gravity="bottom">
-        <View
-            android:layout_width="10dp"
-            android:layout_height="10dp"
-            android:layout_marginLeft="15dp"
-            android:background="@drawable/shape_circle_red" />
+            <ImageView
+                android:layout_width="18dp"
+                android:layout_height="18dp"
+                android:layout_marginLeft="10dp"
+                android:background="@drawable/icon_run_route" />
-        <TextView
-            android:layout_width="wrap_content"
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_marginLeft="5dp"
+                android:layout_marginBottom="1dp"
+                android:gravity="bottom"
+                android:text="跑步路线"
+                android:textColor="@color/text_black"
+                android:textSize="12sp" />
+        </LinearLayout>
+        <!--起点-->
+        <LinearLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="10dp"
-            android:text="@string/layout_street_end_point"
-            android:textColor="@color/text_gray"
-            android:textSize="14sp" />
+            android:layout_marginTop="10dp"
+            android:gravity="center_vertical">
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="10dp"
-            android:text="首都师范大学操场东门"
-            android:textColor="@color/black"
-            android:textSize="15sp" />
-    </LinearLayout>
-    <!--竖线-->
-    <View
-        android:layout_width="1dp"
-        android:layout_height="30dp"
-        android:layout_marginLeft="19dp"
-        android:layout_marginTop="-3dp"
-        android:background="@color/vertical_line" />
-    <!--时间-->
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="-17dp"
-        android:gravity="center_vertical">
+            <View
+                android:layout_width="6dp"
+                android:layout_height="6dp"
+                android:layout_marginLeft="15dp"
+                android:background="@drawable/shape_circle_green" />
-        <View
-            android:layout_width="7dp"
-            android:layout_height="7dp"
-            android:layout_marginLeft="16dp"
-            android:background="@drawable/shape_circle_gray" />
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10dp"
+                android:text="@string/layout_street_start_point"
+                android:textColor="@color/text_gray"
+                android:textSize="12sp" />
+            <TextView
+                android:id="@+id/tv_start_point"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10dp"
+                android:text="首都师范大学操场东门"
+                android:textColor="@color/black"
+                android:textSize="12sp" />
+        </LinearLayout>
+        <!--竖线-->
+        <View
+            android:layout_width="1dp"
+            android:layout_height="18dp"
+            android:layout_marginLeft="17dp"
+            android:layout_marginTop="-3dp"
+            android:background="@color/vertical_line" />
+        <!--终点-->
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
+            android:layout_marginTop="-3dp"
+            android:gravity="center_vertical">
+
+            <View
+                android:layout_width="6dp"
+                android:layout_height="6dp"
+                android:layout_marginLeft="15dp"
+                android:background="@drawable/shape_circle_red" />
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="10dp"
-                android:text="00:27:23"
-                android:textColor="@color/black"
-                android:textSize="18sp"
-                android:textStyle="bold" />
+                android:text="@string/layout_street_end_point"
+                android:textColor="@color/text_gray"
+                android:textSize="12sp" />
             <TextView
+                android:id="@+id/tv_end_point"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="10dp"
-                android:text="跑步记录时长"
-                android:textColor="@color/text_gray"
+                android:text="首都师范大学操场东门"
+                android:textColor="@color/black"
                 android:textSize="12sp" />
-            <!---->
         </LinearLayout>
-    </LinearLayout>
-    <!--竖线-->
-    <View
-        android:layout_width="1dp"
-        android:layout_height="30dp"
-        android:layout_marginLeft="19dp"
-        android:layout_marginTop="-15dp"
-        android:background="@color/vertical_line" />
-    <!---->
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="-5dp"
-        android:layout_marginBottom="10dp"
-        android:gravity="center_vertical">
-
+        <!--竖线-->
         <View
-            android:layout_width="7dp"
-            android:layout_height="7dp"
-            android:layout_marginLeft="16dp"
-            android:background="@drawable/shape_circle_gray" />
+            android:layout_width="1dp"
+            android:layout_height="25dp"
+            android:layout_marginLeft="17dp"
+            android:layout_marginTop="-3dp"
+            android:background="@color/vertical_line" />
+        <!--时间-->
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="-15dp"
+            android:gravity="center_vertical">
+
+            <View
+                android:layout_width="4dp"
+                android:layout_height="4dp"
+                android:layout_marginLeft="16dp"
+                android:background="@drawable/shape_circle_gray" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
-        <TextView
-            android:layout_width="wrap_content"
+                <TextView
+                    android:id="@+id/tv_timer"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="10dp"
+                    android:layout_marginTop="5dp"
+                    android:text="00:27:23"
+                    android:textColor="@color/text_black"
+                    android:textSize="18sp"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="11dp"
+                    android:text="跑步记录时长"
+                    android:textColor="@color/text_gray"
+                    android:textSize="11sp" />
+                <!---->
+            </LinearLayout>
+        </LinearLayout>
+        <!--竖线-->
+        <View
+            android:layout_width="1dp"
+            android:layout_height="25dp"
+            android:layout_marginLeft="17dp"
+            android:layout_marginTop="-15dp"
+            android:background="@color/vertical_line" />
+        <!---->
+        <LinearLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="10dp"
-            android:text="路线完成"
-            android:textColor="@color/black"
-            android:textSize="15sp"
-            android:textStyle="bold" />
+            android:layout_marginTop="-5dp"
+            android:layout_marginBottom="10dp"
+            android:gravity="center_vertical"
+            android:paddingTop="5dp">
+
+            <View
+                android:layout_width="4dp"
+                android:layout_height="4dp"
+                android:layout_marginLeft="16dp"
+                android:background="@drawable/shape_circle_gray" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10dp"
+                android:text="路线完成"
+                android:textColor="@color/text_gray"
+                android:textSize="11sp" />
+        </LinearLayout>
+        <!---->
     </LinearLayout>
-    <!---->
-</LinearLayout>
 \ No newline at end of file
+</layout>
 \ No newline at end of file
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="80dp"
-    android:layout_margin="10dp"
-    android:background="@drawable/shape_10dp_white_raduis_bg"
-    android:orientation="vertical">
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
     <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="10dp"
-        android:layout_marginTop="10dp"
-        android:gravity="bottom">
-
-        <ImageView
-            android:layout_width="25dp"
-            android:layout_height="25dp"
-            android:background="@drawable/icon_step" />
+        android:layout_width="match_parent"
+        android:layout_height="80dp"
+        android:layout_margin="10dp"
+        android:background="@drawable/shape_10dp_white_raduis_bg"
+        android:orientation="vertical">
-        <TextView
+        <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="10dp"
-            android:text="总步数" />
-    </LinearLayout>
-    <!---->
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:paddingBottom="10dp"
-        android:gravity="center">
+            android:layout_marginTop="10dp"
+            android:gravity="bottom">
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="1233"
-            android:textColor="@color/green_round"
-            android:textSize="25sp"
-            android:textStyle="bold" />
+            <ImageView
+                android:layout_width="16dp"
+                android:layout_height="18dp"
+                android:background="@drawable/icon_step" />
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="10dp"
-            android:layout_marginTop="4dp"
-            android:text="步"
-            android:textColor="@color/black"
-            android:textSize="12sp"
-            android:textStyle="bold" />
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10dp"
+                android:text="总步数"
+                android:textSize="12sp" />
+        </LinearLayout>
+        <!---->
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:gravity="center"
+            android:paddingBottom="10dp">
+
+            <TextView
+                android:id="@+id/tv_step"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="1233"
+                android:textColor="@color/green_round"
+                android:textSize="28sp"
+                android:textStyle="bold" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10dp"
+                android:layout_marginTop="4dp"
+                android:text="步"
+                android:textColor="@color/text_black"
+                android:textSize="12sp" />
+        </LinearLayout>
+        <!---->
     </LinearLayout>
-    <!---->
-</LinearLayout>
 \ No newline at end of file
+</layout>
 \ No newline at end of file
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:layout_margin="10dp">
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
-    <LinearLayout
+    <FrameLayout xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
-        android:layout_height="170dp"
-        android:layout_marginTop="30dp"
-        android:background="@drawable/shape_10dp_white_raduis_bg"
-        android:orientation="vertical">
+        android:layout_height="match_parent"
+        android:layout_margin="10dp">
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="80dp"
-            android:layout_marginTop="10dp"
-            android:text="用户昵称"
-            android:textColor="@color/black"
-            android:textSize="15sp" />
-        <!---->
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center_vertical">
+            android:layout_height="170dp"
+            android:layout_marginTop="30dp"
+            android:background="@drawable/shape_10dp_white_raduis_bg"
+            android:orientation="vertical">
-            <LinearLayout
-                android:layout_width="0dp"
+            <TextView
+                android:id="@+id/tv_user_nickName"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:orientation="vertical">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="15dp"
-                    android:layout_marginTop="15dp"
-                    android:text="奥森公园南路"
-                    android:textColor="@color/black"
-                    android:textSize="15sp" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="15dp"
-                    android:layout_marginTop="5dp"
-                    android:text="2019/06/10 9:51"
-                    android:textColor="@color/text_gray" />
-            </LinearLayout>
+                android:layout_marginLeft="80dp"
+                android:layout_marginTop="10dp"
+                android:text="用户昵称"
+                android:textColor="@color/text_black"
+                android:textSize="13sp" />
             <!---->
             <LinearLayout
-                android:layout_width="0dp"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:gravity="right|bottom">
+                android:gravity="center_vertical">
-                <TextView
-                    android:layout_width="wrap_content"
+                <LinearLayout
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginRight="10dp"
-                    android:text="1.53"
-                    android:textColor="@color/black"
-                    android:textSize="35sp"
-                    android:textStyle="bold" />
+                    android:layout_weight="1"
+                    android:orientation="vertical">
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginRight="15dp"
-                    android:text="公里"
-                    android:textColor="@color/black"
-                    android:textSize="15sp" />
-            </LinearLayout>
-            <!---->
-        </LinearLayout>
-        <!--横线-->
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_marginTop="10dp"
-            android:background="@color/line" />
-        <!--配速和用时-->
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="10sp">
-            <!---->
-            <LinearLayout
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:gravity="center"
-                android:orientation="vertical">
+                    <TextView
+                        android:id="@+id/tv_street_name"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="15dp"
+                        android:layout_marginTop="15dp"
+                        android:text="奥森公园南路"
+                        android:textColor="@color/text_black"
+                        android:textSize="15sp" />
-                <TextView
-                    android:layout_width="wrap_content"
+                    <TextView
+                        android:id="@+id/tv_date"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="15dp"
+                        android:layout_marginTop="5dp"
+                        android:text="2019/06/10 9:51"
+                        android:textColor="@color/text_gray"
+                        android:textSize="10sp" />
+                </LinearLayout>
+                <!---->
+                <LinearLayout
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:text="34'33''"
-                    android:textColor="@color/black"
-                    android:textSize="20sp"
-                    android:textStyle="bold" />
+                    android:layout_weight="1"
+                    android:gravity="right|bottom">
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="5dp"
-                    android:text="配速"
-                    android:textColor="@color/black"
-                    android:textSize="15sp" />
+                    <TextView
+                        android:id="@+id/tv_distance"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="10dp"
+                        android:text="1.53"
+                        android:textColor="@color/text_black"
+                        android:textSize="45sp"
+                        android:textStyle="bold" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="15dp"
+                        android:text="公里"
+                        android:textColor="@color/text_black"
+                        android:textSize="15sp" />
+                </LinearLayout>
+                <!---->
             </LinearLayout>
-            <!---->
+            <!--横线-->
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginTop="10dp"
+                android:background="@color/line" />
+            <!--配速和用时-->
             <LinearLayout
-                android:layout_width="0dp"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:gravity="center"
-                android:orientation="vertical">
-
-                <TextView
-                    android:layout_width="wrap_content"
+                android:layout_marginTop="10sp">
+                <!---->
+                <LinearLayout
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:text="00:00:00"
-                    android:textColor="@color/black"
-                    android:textSize="20sp"
-                    android:textStyle="bold" />
+                    android:layout_weight="1"
+                    android:gravity="center"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:id="@+id/tv_speed"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="34'33''"
+                        android:textColor="@color/text_black"
+                        android:textSize="20sp"
+                        android:textStyle="bold" />
-                <TextView
-                    android:layout_width="wrap_content"
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="5dp"
+                        android:text="配速"
+                        android:textColor="@color/text_black"
+                        android:textSize="15sp" />
+                </LinearLayout>
+                <!---->
+                <LinearLayout
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="5dp"
-                    android:text="用时"
-                    android:textColor="@color/black"
-                    android:textSize="15sp" />
+                    android:layout_weight="1"
+                    android:gravity="center"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:id="@+id/tv_timer"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="00:00:00"
+                        android:textColor="@color/text_black"
+                        android:textSize="20sp"
+                        android:textStyle="bold" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="5dp"
+                        android:text="用时"
+                        android:textColor="@color/text_black"
+                        android:textSize="15sp" />
+                </LinearLayout>
+                <!---->
             </LinearLayout>
             <!---->
         </LinearLayout>
-        <!---->
-    </LinearLayout>
-    <com.qmuiteam.qmui.widget.QMUIRadiusImageView
-        android:id="@+id/qm_iv1"
-        android:layout_width="60dp"
-        android:layout_height="60dp"
-        android:layout_marginLeft="10dp"
-        android:background="@drawable/tc_ic_workout_level_adjust_coach"
-        app:qmui_corner_radius="100dp" />
-</FrameLayout>
 \ No newline at end of file
+        <com.qmuiteam.qmui.widget.QMUIRadiusImageView
+            android:id="@+id/qm_iv_icon"
+            android:layout_width="60dp"
+            android:layout_height="60dp"
+            android:layout_marginLeft="10dp"
+            android:background="@drawable/tc_ic_workout_level_adjust_coach"
+            app:qmui_corner_radius="100dp" />
+    </FrameLayout>
+</layout>
 \ No newline at end of file
@@ -6,12 +6,11 @@
     <!--个人最佳成绩-->
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="150dp"
-        android:layout_marginLeft="10dp"
-        android:layout_marginTop="20dp"
-        android:layout_marginRight="10dp"
-        android:layout_marginBottom="10dp"
-        android:background="@drawable/shape_10dp_white_raduis_bg"
+        android:layout_height="180dp"
+        android:layout_marginLeft="1dp"
+        android:layout_marginRight="1dp"
+        android:layout_marginBottom="5dp"
+        android:background="@drawable/layer_shadow"
         android:orientation="vertical">
         <LinearLayout
@@ -27,7 +26,7 @@
                 android:layout_marginLeft="10dp"
                 android:layout_weight="1"
                 android:text="个人最佳成绩"
-                android:textColor="@color/black"
+                android:textColor="@color/text_black"
                 android:textSize="18sp"
                 android:textStyle="bold" />
@@ -37,7 +36,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginRight="10dp"
                 android:text="查看全部成绩 >"
-                android:textColor="@color/black"
+                android:textColor="@color/text_black"
                 android:textSize="13sp" />
         </LinearLayout>
         <!---->
@@ -58,7 +57,7 @@
                     android:layout_marginLeft="15dp"
                     android:text="1.53"
                     android:textColor="@color/black"
-                    android:textSize="25sp"
+                    android:textSize="30sp"
                     android:textStyle="bold" />
                 <TextView
@@ -66,8 +65,8 @@
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="5dp"
                     android:text="公里"
-                    android:textColor="@color/text_gray"
-                    android:textSize="15sp" />
+                    android:textColor="@color/text_black"
+                    android:textSize="12sp" />
             </LinearLayout>
         </LinearLayout>
@@ -88,15 +87,15 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="步数"
-                    android:textColor="@color/text_gray"
-                    android:textSize="15sp" />
+                    android:textColor="@color/text_black"
+                    android:textSize="12sp" />
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="5dp"
                     android:text="1234"
-                    android:textColor="@color/black"
+                    android:textColor="@color/text_black"
                     android:textSize="20sp"
                     android:textStyle="bold" />
@@ -113,10 +112,9 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-
                     android:text="用时"
-                    android:textColor="@color/text_gray"
-                    android:textSize="15sp" />
+                    android:textColor="@color/text_black"
+                    android:textSize="12sp" />
                 <TextView
                     android:layout_width="wrap_content"
@@ -141,15 +139,15 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="配速"
-                    android:textColor="@color/text_gray"
-                    android:textSize="15sp" />
+                    android:textColor="@color/text_black"
+                    android:textSize="12sp" />
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="5dp"
                     android:text="22'22''"
-                    android:textColor="@color/black"
+                    android:textColor="@color/text_black"
                     android:textSize="20sp"
                     android:textStyle="bold" />