1 修改暂停后,实时轨迹显示逻辑

杨帅
1 parent 79e8a818
Showing 20 changed files with 497 additions and 228 deletions
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/CollRunRaceDetailFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/CollRunningMapFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/StartTraceFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/commonInfo/CommonInfo.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/RunningMapFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/model/Constant.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/net/bean/RunRaceDetailInfo.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/service/StepService.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/sql/dao/FailedEntityDao.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/sql/dao/UserStepEntityDao.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/sql/entity/FailedEntity.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/sql/entity/UserStepEntity.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/RunningMapFragment.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/widget/TipDialog.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/utils/StepUtil.java
moudle_pedometer/src/main/res/values/strings.xml
@@ -47,6 +47,7 @@ import com.cnlive.moudle.collectionTrace.service.CollKeepLiveService;
 import com.cnlive.moudle.collectionTrace.ui.activity.StartCollectTraceActivity;
 import com.cnlive.moudle.collectionTrace.ui.fragment.CollRunRaceDetailFragment;
 import com.cnlive.moudle.pedometer.commonInfo.CollCommonInfo;
+import com.cnlive.moudle.pedometer.model.Constant;
 import com.cnlive.moudle.pedometer.net.bean.RunRaceDetailInfo;
 import com.cnlive.moudle.pedometer.utils.BitmapUtil;
 import com.cnlive.moudle.pedometer.utils.GsonUtil;
@@ -559,12 +560,12 @@ public class CollRunRaceDetailFragmentView implements MvpView, SensorEventListen
             }
             if (isFirstLoc) {
                 isFirstLoc = false;
-                if (location.getRadius() > 20) {
+                if (location.getRadius() > Constant.LOCA_ACCURACY) {
                     Toast.makeText(getContext(), "当前定位精度为:" + location.getRadius() + "米,请您移动至空旷地带!", Toast.LENGTH_SHORT).show();
                 }
             } else {
                 //过滤定位精度
-                if (location.getRadius() > 20) {
+                if (location.getRadius() > Constant.LOCA_ACCURACY) {
                     return;
                 }
             }
@@ -34,6 +34,7 @@ import com.baidu.mapapi.model.LatLng;
 import com.baidu.mapapi.utils.DistanceUtil;
 import com.baidu.trace.model.SortType;
 import com.cnlive.moudle.collectionTrace.ui.fragment.CollRunningMapFragment;
+import com.cnlive.moudle.pedometer.model.Constant;
 import com.cnlive.moudle.pedometer.model.RunningMapBean;
 import com.cnlive.moudle.pedometer.ui.fragment.RunningMapFragment;
 import com.cnlive.moudle.pedometer.utils.BitmapUtil;
@@ -298,14 +299,14 @@ public class CollRunningMapFragmentView implements MvpView, SensorEventListener 
             if (isFirstLoc) {
                 isFirstLoc = false;
-                if (location.getRadius() > 20) {
+                if (location.getRadius() > Constant.LOCA_ACCURACY) {
                     Toast.makeText(getContext(), "当前定位精度为:" + location.getRadius() + "米,请您移动至空旷地带!", Toast.LENGTH_SHORT).show();
                 }
             } else {
                 //过滤定位精度
-                if (location.getRadius() > 20) {
+                if (location.getRadius() > Constant.LOCA_ACCURACY) {
                     return;
                 }
             }
@@ -34,6 +34,7 @@ import com.cnlive.moudle.collectionTrace.ui.activity.CollRunRaceDetailActivity;
 import com.cnlive.moudle.collectionTrace.ui.fragment.CollRunRaceDetailFragment;
 import com.cnlive.moudle.collectionTrace.ui.fragment.StartTraceFragment;
 import com.cnlive.moudle.pedometer.commonInfo.CollCommonInfo;
+import com.cnlive.moudle.pedometer.model.Constant;
 import com.cnlive.moudle.pedometer.ui.widget.SelectDialog;
 import com.cnlive.moudle.pedometer.ui.widget.TipDialog;
 import com.cnlive.moudle.pedometer.utils.BitmapUtil;
@@ -254,12 +255,12 @@ public class StartTraceFragmentView implements MvpView, SensorEventListener {
             }
             if (isFirstLoc) {
                 isFirstLoc = false;
-                if (location.getRadius() > 20) {
+                if (location.getRadius() > Constant.LOCA_ACCURACY) {
                     Toast.makeText(getContext(), "当前定位精度为:" + location.getRadius() + "米,请您移动至空旷地带!", Toast.LENGTH_SHORT).show();
                 }
             } else {
                 //过滤定位精度
-                if (location.getRadius() > 20) {
+                if (location.getRadius() > Constant.LOCA_ACCURACY) {
                     return;
                 }
             }
@@ -279,11 +279,27 @@ public class CommonInfo {
     }
-
-
-
-
-
+//    /**
+//     * 设置起点经纬度
+//     *
+//     * @param context
+//     * @param startLatLng
+//     */
+//    public static void setStartLatLng(Context context, String startLatLng) {
+//        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).putString("runStartLatLng", startLatLng);
+//
+//    }
+//
+//    /**
+//     * 设置终点经纬度
+//     *
+//     * @param context
+//     * @param endLatLng
+//     */
+//    public static void setEndLatLng(Context context, String endLatLng) {
+//        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).putString("runEndLatLng", endLatLng);
+//
+//    }
     /*重置
      * @param context
      */
@@ -39,6 +39,7 @@ import com.cnlive.moudle.pedometer.ui.fragment.RunMainFragment;
 import com.cnlive.moudle.pedometer.ui.widget.SelectDialog;
 import com.cnlive.moudle.pedometer.ui.widget.TipDialog;
 import com.cnlive.moudle.pedometer.utils.ButtonAnimUtil;
+import com.cnlive.moudle.pedometer.utils.GsonUtil;
 import com.cnlive.moudle.pedometer.utils.MyMapUtil;
 import com.cnlive.moudle.pedometer.utils.MySpHelper;
 import com.cnlive.moudle.pedometer.utils.StepUtil;
@@ -69,6 +70,8 @@ public class RunMainFragmentView implements MvpView {
     private LocationClient mLocClient;
     public MyLocationListenner myListener = new MyLocationListenner();
     private String employTime = "";
+    private LatLng endLatLng;//终点坐标
+    private TipDialog tipDialog;
     public RunMainFragmentView(RunMainFragment fragment) {
         this.fragment = fragment;
@@ -144,7 +147,19 @@ public class RunMainFragmentView implements MvpView {
             if (TextUtils.isEmpty(userStepEntity.getStreetId())) {
                 StepUtil.setStepStartData(getContext(), uid, TimeUtil.getNowTimeStamp(), CommonInfo.getStreetId(getContext()));
             }
-
+            //设置终点经纬度
+            if (TextUtils.isEmpty(userStepEntity.getEndLatLng())) {
+                if (null != runRaceDetailInfo.getEndLatLng()) {
+                    //设置终点坐标
+                    userStepEntity.setEndLatLng(GsonUtil.GsonString(runRaceDetailInfo.getEndLatLng()));
+                    //更新数据
+                    StepUtil.updateStepData(getContext(), userStepEntity);
+                }
+            }
+            //设置终点经纬度
+            if (!TextUtils.isEmpty(userStepEntity.getEndLatLng())) {
+                endLatLng = GsonUtil.GsonToBean(userStepEntity.getEndLatLng(), LatLng.class);
+            }
         }
         initLocationClient();
         fragment.binding.llRunMainRoot.setVisibility(View.GONE);
@@ -661,7 +676,8 @@ public class RunMainFragmentView implements MvpView {
         @Override
         public void onReceiveLocation(BDLocation location) {
-            if (location == null) {
+            // map view 销毁后不在处理新接收的位置
+            if (location == null || getContext() == null) {
                 return;
             }
             //正在搜索GPS信号
@@ -718,6 +734,52 @@ public class RunMainFragmentView implements MvpView {
                     fragment.binding.ivGps.setBackground(getContext().getResources().getDrawable(R.drawable.rt_training_gps_3));
                 }
             }
+
+            //进行精度过滤
+            if (location.getRadius() > Constant.LOCA_ACCURACY) {
+                return;
+            }
+            //进行数据比较(先看看数据库是否有数据)
+            if (null == endLatLng) {
+                if (null == userStepEntity) {
+                    userStepEntity = StepUtil.getUserStepData(getContext(), CommonInfo.getUserId(getContext()));
+                }
+                if (null != userStepEntity) {
+                    if (!TextUtils.isEmpty(userStepEntity.getEndLatLng())) {
+                        endLatLng = GsonUtil.GsonToBean(userStepEntity.getEndLatLng(), LatLng.class);
+                    }
+                }
+            }
+            //开始比较
+            if (null != endLatLng) {
+                LatLng current = new LatLng(location.getLatitude(), location.getLongitude());
+                if (null != current) {
+                    //开始比较数据
+                    double distance = DistanceUtil.getDistance(current, endLatLng);
+                    if (distance < Constant.LOCA_END_POINT_ACCURACY) {
+                        //设置数据
+                        if (userStepEntity != null) {
+                            userStepEntity.setIsArriveEndPoint(true);
+                            //更新数据
+                            StepUtil.updateStepData(getContext(), userStepEntity);
+                        }
+                        //进行提示
+                        if (null == tipDialog) {
+                            tipDialog = new TipDialog(getContext(), getContext().getResources().getString(R.string.run_race_arrive_end_tip), "好的", R.color.green_round, new TipDialog.DialogInterface() {
+                                @Override
+                                public void onClick(TipDialog dialog) {
+                                    dialog.dismiss();
+                                }
+                            });
+                            tipDialog.setCancelable(false);
+                            tipDialog.setCanceledOnTouchOutside(false);
+                        }
+                        if (!tipDialog.isShowing()) {
+                            tipDialog.show();
+                        }
+                    }
+                }
+            }
         }
     }
@@ -122,21 +122,14 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
     public MyLocationListenner myListener = new MyLocationListenner();
     private final int DEFULT_ZOOM = 17;
     private RoutePlanSearch routePlanSearch = null;    // 路线规划
-    private LatLng endLatLng;
     private final int START_MARK = 0;//起始点
     private final int END_MARK = 1;//终止点
-
-    private String startPoint = "首都师范大学南门";
-    private String endPoint = "首都师范大学篮球场";
-    //    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}]";
-    private LinkedList<LatLng> importLatLngs;//关键点
-    private LatLng startLatLng = new LatLng(39.934733, 116.308646);//起始点
+    private LatLng startLatLng;//起始点
     public RunRaceDetailInfo runRaceDetailInfo;
     private UserStepEntity userStepEntity;
     private boolean isDifferentStreet = false;
     private LBSTraceClient mClient = null;
-    private List<LatLng> resultStreetPoints;
-    public List<LatLng> importStreetPoints;//运营打的重要的点
+    public LatLng endLatLng;//用于终点判断
     public RunRaceDetailFragmentView(RunRaceDetailFragment fragment) {
         this.fragment = fragment;
@@ -200,10 +193,6 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
             return;
         }
         this.runRaceDetailInfo = runRaceDetailInfo;
-//        //初始化地图点位
-        if (runRaceDetailInfo.getLatLongitude() != null) {
-            importStreetPoints = GsonUtil.jsonToList(runRaceDetailInfo.getLatLongitude().trim(), LatLng.class);
-        }
         //轨迹开始时间
         long startTime = 0;
         //轨迹结束时间
@@ -220,8 +209,8 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
                     @Override
                     public void success(List<LatLng> resultPoints) {
                         if (resultPoints != null && resultPoints.size() > 1) {
-                            resultStreetPoints = resultPoints;
-                            Log.e(TAG, "resultPoints: " + resultPoints.size());
+                            startLatLng = resultPoints.get(0);
+                            endLatLng = resultPoints.get(resultPoints.size() - 1);
                             MyMapUtil.drawServerLineTrack(getContext(), baiduMap, resultPoints, SortType.asc, R.color.green_round, R.drawable.icon_start, R.drawable.icon_end);
 //                        //自动计算地图缩放
 //                        MapStatus.Builder builder = new MapStatus.Builder();
@@ -486,8 +475,28 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
                 //现在开始
                 else if ("1".equals(fragment.binding.rlScrollViewStartBtn.getTag())) {
                     //先判断是否从百度查询到赛事轨迹
-                    if (resultStreetPoints != null) {
-                        startStepService(getContext());
+                    if (null != endLatLng && null != startLatLng) {
+                        //开始比较距离
+                        if (null != firstLatLng) {
+                            double currentDiatance = DistanceUtil.getDistance(firstLatLng, startLatLng);
+                            if (currentDiatance < Constant.LOCA_START_POINT_ACCURACY) {
+                                //设置终点坐标
+                                runRaceDetailInfo.setEndLatLng(endLatLng);
+                                startStepService(getContext());
+                            } else {
+                                //进行提示
+                                TipDialog tipDialog = new TipDialog(getContext(), getContext().getResources().getString(R.string.run_race_far_tip), "好的", R.color.green_round, new TipDialog.DialogInterface() {
+                                    @Override
+                                    public void onClick(TipDialog dialog) {
+                                        dialog.dismiss();
+                                    }
+                                });
+                                tipDialog.setCancelable(false);
+                                tipDialog.setCanceledOnTouchOutside(false);
+                                tipDialog.show();
+                            }
+                        }
+
                     } else {
                         QMUITipDialogUtil.textDialog(getContext(), "正在获取轨迹请稍后...", 1);
                     }
@@ -653,188 +662,188 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
         });
     }
-    /**
-     * 开始路线规划
-     */
-    public void searchRouteResult(LatLng StartPoint, LatLng EndPoint, int index, int listSize) {
-//        Log.e(TAG, "searchRouteResult: ");
-        float currentZoom = baiduMap.getMapStatus().zoom;
-        // 设置起终点信息，对于tranist search 来说，城市名无意义
-        PlanNode stNode = PlanNode.withLocation(StartPoint);
-        PlanNode enNode = PlanNode.withLocation(EndPoint);
-        routePlanSearch.setOnGetRoutePlanResultListener(new OnGetRoutePlanResultListener() {
-            @Override
-            public void onGetWalkingRouteResult(WalkingRouteResult walkingRouteResult) {
-                if (fragment.getActivity() == null) {
-                    return;
-                }
-                if (walkingRouteResult == null || walkingRouteResult.error != SearchResult.ERRORNO.NO_ERROR) {
-                    Toast.makeText(fragment.getActivity(), "抱歉，无法获取路线!", Toast.LENGTH_SHORT).show();
-                }
-                if (walkingRouteResult.error == SearchResult.ERRORNO.AMBIGUOUS_ROURE_ADDR) {
-                    // 起终点或途经点地址有岐义，通过以下接口获取建议查询信息
-                    return;
-                }
-                List<LatLng> points = new ArrayList<LatLng>();
-                if (walkingRouteResult.getRouteLines() != null) {
-                    if (walkingRouteResult.getRouteLines().get(0).getAllStep().get(0).getWayPoints().size() > 0) {
-                        //添加起点坐标
-                        if (index == 0) {
-                            points.add(StartPoint);
-                        }
-                        for (int i = 0; i < walkingRouteResult.getRouteLines().get(0).getAllStep().size(); i++) {
-                            for (int j = 0; j < walkingRouteResult.getRouteLines().get(0).getAllStep().get(i).getWayPoints().size(); j++) {
-                                points.add(walkingRouteResult.getRouteLines().get(0).getAllStep().get(i).getWayPoints().get(j));
-                            }
-                        }
-                    }
-                    //添加终点坐标
-                    if (endLatLng != null) {
+//    /**
+//     * 开始路线规划
+//     */
+//    public void searchRouteResult(LatLng StartPoint, LatLng EndPoint, int index, int listSize) {
+////        Log.e(TAG, "searchRouteResult: ");
+//        float currentZoom = baiduMap.getMapStatus().zoom;
+//        // 设置起终点信息，对于tranist search 来说，城市名无意义
+//        PlanNode stNode = PlanNode.withLocation(StartPoint);
+//        PlanNode enNode = PlanNode.withLocation(EndPoint);
+//        routePlanSearch.setOnGetRoutePlanResultListener(new OnGetRoutePlanResultListener() {
+//            @Override
+//            public void onGetWalkingRouteResult(WalkingRouteResult walkingRouteResult) {
+//                if (fragment.getActivity() == null) {
+//                    return;
+//                }
+//                if (walkingRouteResult == null || walkingRouteResult.error != SearchResult.ERRORNO.NO_ERROR) {
+//                    Toast.makeText(fragment.getActivity(), "抱歉，无法获取路线!", Toast.LENGTH_SHORT).show();
+//                }
+//                if (walkingRouteResult.error == SearchResult.ERRORNO.AMBIGUOUS_ROURE_ADDR) {
+//                    // 起终点或途经点地址有岐义，通过以下接口获取建议查询信息
+//                    return;
+//                }
+//                List<LatLng> points = new ArrayList<LatLng>();
+//                if (walkingRouteResult.getRouteLines() != null) {
+//                    if (walkingRouteResult.getRouteLines().get(0).getAllStep().get(0).getWayPoints().size() > 0) {
+//                        //添加起点坐标
+//                        if (index == 0) {
+//                            points.add(StartPoint);
+//                        }
+//                        for (int i = 0; i < walkingRouteResult.getRouteLines().get(0).getAllStep().size(); i++) {
+//                            for (int j = 0; j < walkingRouteResult.getRouteLines().get(0).getAllStep().get(i).getWayPoints().size(); j++) {
+//                                points.add(walkingRouteResult.getRouteLines().get(0).getAllStep().get(i).getWayPoints().get(j));
+//                            }
+//                        }
+//                    }
+//                    //添加终点坐标
+//                    if (endLatLng != null) {
+////                        points.add(endLatLng);
+//                    }
+//
+//                    ArrayList<Integer> traffics = new ArrayList<Integer>();
+//                    for (int i = 0; i < points.size(); i++) {
+//                        if (i % 2 == 0) {
+//                            traffics.add(i);
+//                        }
+//                    }
+//
+//
+//                    if (points.size() > 0) {
+////                            if (baiduMap != null) {
+////                                baiduMap.clear();
+////                                if (endLatLng != null) {
+////                                    markPoi(endLatLng.latitude, endLatLng.longitude);
+////                                }
+////                            }
+//
+//                        //设置折线的属性
+////                        OverlayOptions mOverlayOptions = new PolylineOptions()
+////                                .width(10)
+////                                .color(0xAAFF0000)
+////                                .points(points);
+//                        //设置折线的属性
+//                        OverlayOptions mOverlayOptions = new PolylineOptions()
+//                                .width(10)
+//                                .dottedLine(true)
+//                                .points(points)
+//                                .customTextureList(getCustomTextureList())
+//                                .textureIndex(traffics);//设置纹理列表
+//                        //在地图上绘制起点
+//                        if (index == 0) {
+//                            //显示当前位置图标
+//                            Bitmap pointBitmap = BitmapUtil.getBitmapFromDp(getContext(), BitmapFactory.decodeResource(getContext().getResources(), R.drawable.icon_start), 30, 30);
+//                            startMark = new MarkerOptions()
+//                                    .position(StartPoint)
+//                                    .icon(BitmapDescriptorFactory.fromBitmap(pointBitmap));
+////                            startMark.anchor(0.5f, 0.55f);
+//                            baiduMap.addOverlay(startMark);
+//                        } else if (index == listSize - 1) {
+//                            //显示当前位置图标
+//                            Bitmap pointBitmap = BitmapUtil.getBitmapFromDp(getContext(), BitmapFactory.decodeResource(getContext().getResources(), R.drawable.icon_end), 30, 30);
+//                            endMark = new MarkerOptions()
+//                                    .position(points.get(points.size() - 1))
+//                                    .icon(BitmapDescriptorFactory.fromBitmap(pointBitmap))
+//                                    .perspective(true)
+////                            endMark.anchor(0.5f, 0.5f)
+//                                    .perspective(true);
+//                            baiduMap.addOverlay(endMark);
+//                        }
+//                        //mPloyline 折线对象
+//                        Overlay mPolyline = baiduMap.addOverlay(mOverlayOptions);
+//                        MapStatus.Builder builder = new MapStatus.Builder();
+//                        builder.zoom(currentZoom);
+//                        baiduMap.animateMapStatus(MapStatusUpdateFactory.newMapStatus(builder.build()));
+//
+//                    }
+//                }
+//            }
+//
+//            @Override
+//            public void onGetTransitRouteResult(TransitRouteResult transitRouteResult) {
+//
+//            }
+//
+//            @Override
+//            public void onGetMassTransitRouteResult(MassTransitRouteResult massTransitRouteResult) {
+//
+//            }
+//
+//            @Override
+//            public void onGetDrivingRouteResult(DrivingRouteResult drivingRouteResult) {
+//                if (fragment.getActivity() == null) {
+//                    return;
+//                }
+//
+//                if (drivingRouteResult == null || drivingRouteResult.error != SearchResult.ERRORNO.NO_ERROR) {
+//                    Toast.makeText(fragment.getActivity(), "抱歉，无法获取路线!", Toast.LENGTH_SHORT).show();
+//                }
+//                if (drivingRouteResult.error == SearchResult.ERRORNO.AMBIGUOUS_ROURE_ADDR) {
+//                    // 起终点或途经点地址有岐义，通过以下接口获取建议查询信息
+//                    return;
+//                }
+//                List<LatLng> points = new ArrayList<LatLng>();
+//                if (drivingRouteResult.getRouteLines() != null) {
+//                    if (drivingRouteResult.getRouteLines().get(0).getAllStep().get(0).getWayPoints().size() > 0) {
+//                        //添加起点坐标
+//                        if (followMyLocation != null) {
+//                            points.add(new LatLng(followMyLocation.latitude, followMyLocation.longitude));
+//                        }
+//                        for (int i = 0; i < drivingRouteResult.getRouteLines().get(0).getAllStep().size(); i++) {
+//                            for (int j = 0; j < drivingRouteResult.getRouteLines().get(0).getAllStep().get(i).getWayPoints().size(); j++) {
+//                                points.add(drivingRouteResult.getRouteLines().get(0).getAllStep().get(i).getWayPoints().get(j));
+//                            }
+//                        }
+//                    }
+//                    //添加终点坐标
+//                    if (endLatLng != null) {
 //                        points.add(endLatLng);
-                    }
-
-                    ArrayList<Integer> traffics = new ArrayList<Integer>();
-                    for (int i = 0; i < points.size(); i++) {
-                        if (i % 2 == 0) {
-                            traffics.add(i);
-                        }
-                    }
-
-
-                    if (points.size() > 0) {
-//                            if (baiduMap != null) {
-//                                baiduMap.clear();
-//                                if (endLatLng != null) {
-//                                    markPoi(endLatLng.latitude, endLatLng.longitude);
-//                                }
+//                    }
+//                    if (points.size() > 0) {
+//                        if (baiduMap != null) {
+//                            baiduMap.clear();
+//                            if (endLatLng != null) {
+//                                markPoi(endLatLng.latitude, endLatLng.longitude);
 //                            }
-
-                        //设置折线的属性
+//                        }
+//
+//                        //设置折线的属性
 //                        OverlayOptions mOverlayOptions = new PolylineOptions()
 //                                .width(10)
 //                                .color(0xAAFF0000)
 //                                .points(points);
-                        //设置折线的属性
-                        OverlayOptions mOverlayOptions = new PolylineOptions()
-                                .width(10)
-                                .dottedLine(true)
-                                .points(points)
-                                .customTextureList(getCustomTextureList())
-                                .textureIndex(traffics);//设置纹理列表
-                        //在地图上绘制起点
-                        if (index == 0) {
-                            //显示当前位置图标
-                            Bitmap pointBitmap = BitmapUtil.getBitmapFromDp(getContext(), BitmapFactory.decodeResource(getContext().getResources(), R.drawable.icon_start), 30, 30);
-                            startMark = new MarkerOptions()
-                                    .position(StartPoint)
-                                    .icon(BitmapDescriptorFactory.fromBitmap(pointBitmap));
-//                            startMark.anchor(0.5f, 0.55f);
-                            baiduMap.addOverlay(startMark);
-                        } else if (index == listSize - 1) {
-                            //显示当前位置图标
-                            Bitmap pointBitmap = BitmapUtil.getBitmapFromDp(getContext(), BitmapFactory.decodeResource(getContext().getResources(), R.drawable.icon_end), 30, 30);
-                            endMark = new MarkerOptions()
-                                    .position(points.get(points.size() - 1))
-                                    .icon(BitmapDescriptorFactory.fromBitmap(pointBitmap))
-                                    .perspective(true)
-//                            endMark.anchor(0.5f, 0.5f)
-                                    .perspective(true);
-                            baiduMap.addOverlay(endMark);
-                        }
-                        //mPloyline 折线对象
-                        Overlay mPolyline = baiduMap.addOverlay(mOverlayOptions);
-                        MapStatus.Builder builder = new MapStatus.Builder();
-                        builder.zoom(currentZoom);
-                        baiduMap.animateMapStatus(MapStatusUpdateFactory.newMapStatus(builder.build()));
-
-                    }
-                }
-            }
-
-            @Override
-            public void onGetTransitRouteResult(TransitRouteResult transitRouteResult) {
-
-            }
-
-            @Override
-            public void onGetMassTransitRouteResult(MassTransitRouteResult massTransitRouteResult) {
-
-            }
-
-            @Override
-            public void onGetDrivingRouteResult(DrivingRouteResult drivingRouteResult) {
-                if (fragment.getActivity() == null) {
-                    return;
-                }
-
-                if (drivingRouteResult == null || drivingRouteResult.error != SearchResult.ERRORNO.NO_ERROR) {
-                    Toast.makeText(fragment.getActivity(), "抱歉，无法获取路线!", Toast.LENGTH_SHORT).show();
-                }
-                if (drivingRouteResult.error == SearchResult.ERRORNO.AMBIGUOUS_ROURE_ADDR) {
-                    // 起终点或途经点地址有岐义，通过以下接口获取建议查询信息
-                    return;
-                }
-                List<LatLng> points = new ArrayList<LatLng>();
-                if (drivingRouteResult.getRouteLines() != null) {
-                    if (drivingRouteResult.getRouteLines().get(0).getAllStep().get(0).getWayPoints().size() > 0) {
-                        //添加起点坐标
-                        if (followMyLocation != null) {
-                            points.add(new LatLng(followMyLocation.latitude, followMyLocation.longitude));
-                        }
-                        for (int i = 0; i < drivingRouteResult.getRouteLines().get(0).getAllStep().size(); i++) {
-                            for (int j = 0; j < drivingRouteResult.getRouteLines().get(0).getAllStep().get(i).getWayPoints().size(); j++) {
-                                points.add(drivingRouteResult.getRouteLines().get(0).getAllStep().get(i).getWayPoints().get(j));
-                            }
-                        }
-                    }
-                    //添加终点坐标
-                    if (endLatLng != null) {
-                        points.add(endLatLng);
-                    }
-                    if (points.size() > 0) {
-                        if (baiduMap != null) {
-                            baiduMap.clear();
-                            if (endLatLng != null) {
-                                markPoi(endLatLng.latitude, endLatLng.longitude);
-                            }
-                        }
-
-                        //设置折线的属性
-                        OverlayOptions mOverlayOptions = new PolylineOptions()
-                                .width(10)
-                                .color(0xAAFF0000)
-                                .points(points);
-                        //在地图上绘制折线
-                        //mPloyline 折线对象
-                        Overlay mPolyline = baiduMap.addOverlay(mOverlayOptions);
-                        MapStatus.Builder builder = new MapStatus.Builder();
-                        builder.zoom(currentZoom);
-                        baiduMap.animateMapStatus(MapStatusUpdateFactory.newMapStatus(builder.build()));
-
-                    }
-                }
-            }
-
-            @Override
-            public void onGetIndoorRouteResult(IndoorRouteResult indoorRouteResult) {
-
-            }
-
-            @Override
-            public void onGetBikingRouteResult(BikingRouteResult bikingRouteResult) {
-
-            }
-        });
-        //开始检索
+//                        //在地图上绘制折线
+//                        //mPloyline 折线对象
+//                        Overlay mPolyline = baiduMap.addOverlay(mOverlayOptions);
+//                        MapStatus.Builder builder = new MapStatus.Builder();
+//                        builder.zoom(currentZoom);
+//                        baiduMap.animateMapStatus(MapStatusUpdateFactory.newMapStatus(builder.build()));
+//
+//                    }
+//                }
+//            }
+//
+//            @Override
+//            public void onGetIndoorRouteResult(IndoorRouteResult indoorRouteResult) {
+//
+//            }
+//
+//            @Override
+//            public void onGetBikingRouteResult(BikingRouteResult bikingRouteResult) {
+//
+//            }
+//        });
+    //开始检索
 //            routePlanSearch.drivingSearch((new DrivingRoutePlanOption())
 //                    .from(stNode).to(enNode).policy(DrivingRoutePlanOption.DrivingPolicy.ECAR_DIS_FIRST)
 //                    .trafficPolicy(DrivingRoutePlanOption.DrivingTrafficPolicy.ROUTE_PATH_AND_TRAFFIC));
-        //开始步行检索
-        routePlanSearch.walkingSearch((new WalkingRoutePlanOption())
-                .from(stNode)
-                .to(enNode));
-    }
+    //开始步行检索
+//        routePlanSearch.walkingSearch((new WalkingRoutePlanOption())
+//                .from(stNode)
+//                .to(enNode));
+//    }
 //        showProgressDialog();
     /**
@@ -989,12 +998,12 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
             }
             if (isFirstLoc) {
                 isFirstLoc = false;
-                if (location.getRadius() > 20) {
+                if (location.getRadius() > Constant.LOCA_ACCURACY) {
                     Toast.makeText(getContext(), "当前定位精度为:" + location.getRadius() + "米,请您移动至空旷地带!", Toast.LENGTH_SHORT).show();
                 }
             } else {
                 //过滤定位精度
-                if (location.getRadius() > 20) {
+                if (location.getRadius() > Constant.LOCA_ACCURACY) {
                     return;
                 }
             }
@@ -9,6 +9,7 @@ import android.hardware.SensorEventListener;
 import android.hardware.SensorManager;
 import android.os.Handler;
 import android.os.SystemClock;
+import android.text.TextUtils;
 import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
@@ -35,8 +36,12 @@ import com.baidu.mapapi.model.LatLng;
 import com.baidu.mapapi.model.LatLngBounds;
 import com.baidu.mapapi.utils.DistanceUtil;
 import com.baidu.trace.model.SortType;
+import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
+import com.cnlive.moudle.pedometer.model.Constant;
 import com.cnlive.moudle.pedometer.model.RunningMapBean;
+import com.cnlive.moudle.pedometer.sql.entity.UserStepEntity;
 import com.cnlive.moudle.pedometer.ui.fragment.RunningMapFragment;
+import com.cnlive.moudle.pedometer.ui.widget.TipDialog;
 import com.cnlive.moudle.pedometer.utils.BitmapUtil;
 import com.cnlive.moudle.pedometer.utils.ButtonAnimUtil;
 import com.cnlive.moudle.pedometer.utils.GsonUtil;
@@ -75,6 +80,9 @@ public class RunningMapFragmentView implements MvpView, SensorEventListener {
     private boolean isFirstLoadMap = true;
     private Overlay currentLine;
     private List<LatLng> currentPoints;
+    private LatLng endLatLng;//终点坐标
+    private UserStepEntity userStepEntity;
+    private TipDialog tipDialog;
     public RunningMapFragmentView(RunningMapFragment fragment) {
         this.fragment = fragment;
@@ -85,6 +93,10 @@ public class RunningMapFragmentView implements MvpView, SensorEventListener {
     }
     public void initView() {
+        if (getContext() == null) {
+            return;
+        }
+        userStepEntity = StepUtil.getUserStepData(getContext(), CommonInfo.getUserId(getContext()));
         currentPoints = new ArrayList<>();
         initMap();
         //返回键
@@ -237,7 +249,7 @@ public class RunningMapFragmentView implements MvpView, SensorEventListener {
         @Override
         public void onReceiveLocation(BDLocation location) {
             // map view 销毁后不在处理新接收的位置
-            if (location == null || mMapView == null) {
+            if (location == null || mMapView == null || getContext() == null) {
                 return;
             }
@@ -293,17 +305,60 @@ public class RunningMapFragmentView implements MvpView, SensorEventListener {
             if (isFirstLoc) {
                 isFirstLoc = false;
-                if (location.getRadius() > 20) {
+                if (location.getRadius() > Constant.LOCA_ACCURACY) {
                     Toast.makeText(getContext(), "当前定位精度为:" + location.getRadius() + "米,请您移动至空旷地带!", Toast.LENGTH_SHORT).show();
                 }
             } else {
                 //过滤定位精度
-                if (location.getRadius() > 20) {
+                if (location.getRadius() > Constant.LOCA_ACCURACY) {
                     return;
                 }
             }
+
+            //进行数据比较(先看看数据库是否有数据)
+            if (null == endLatLng) {
+                if (null == userStepEntity) {
+                    userStepEntity = StepUtil.getUserStepData(getContext(), CommonInfo.getUserId(getContext()));
+                }
+                if (null != userStepEntity) {
+                    if (!TextUtils.isEmpty(userStepEntity.getEndLatLng())) {
+                        endLatLng = GsonUtil.GsonToBean(userStepEntity.getEndLatLng(), LatLng.class);
+                    }
+                }
+            }
+            //开始比较
+            if (null != endLatLng) {
+                LatLng current = new LatLng(location.getLatitude(), location.getLongitude());
+                if (null != current) {
+                    //开始比较数据
+                    double distance = DistanceUtil.getDistance(current, endLatLng);
+                    if (distance < Constant.LOCA_END_POINT_ACCURACY) {
+                        //设置数据
+                        if (userStepEntity != null) {
+                            userStepEntity.setIsArriveEndPoint(true);
+                            //更新数据
+                            StepUtil.updateStepData(getContext(), userStepEntity);
+                        }
+                        //进行提示
+                        if (null == tipDialog) {
+                            tipDialog = new TipDialog(getContext(), getContext().getResources().getString(R.string.run_race_arrive_end_tip), "好的", R.color.green_round, new TipDialog.DialogInterface() {
+                                @Override
+                                public void onClick(TipDialog dialog) {
+                                    dialog.dismiss();
+                                }
+                            });
+                            tipDialog.setCancelable(false);
+                            tipDialog.setCanceledOnTouchOutside(false);
+                        }
+                        if (!tipDialog.isShowing()) {
+                            tipDialog.show();
+                        }
+                    }
+                }
+            }
+
             mCurrentAccracy = location.getRadius();
             mylocation = new MyLocationData.Builder()
                     .accuracy(location.getRadius())
@@ -20,4 +20,8 @@ public class Constant {
     public static final int REGISTRATION_SUCCESS = 11;//用户报名成功
     public static final double PASS_RATE = 0.7;//通过率70%
     public static final int CHECK_ACCURACY = 50;//判断用户是否完成的精度范围
+    public static final int LOCA_ACCURACY = 20;//定位过滤精度
+    public static final int LOCA_END_POINT_ACCURACY = 20;//终点位置比较精度
+    public static final int LOCA_START_POINT_ACCURACY = 20;//起点位置比较精度
+
 }
 package com.cnlive.moudle.pedometer.net.bean;
+import com.baidu.mapapi.model.LatLng;
+
 import java.io.Serializable;
 import java.util.List;
@@ -84,6 +86,15 @@ public class RunRaceDetailInfo implements Serializable {
     private String userMileage;
     private List<String> faceUrl;
     private List<String> finishFaceUrl;
+    private LatLng endLatLng;//终点坐标,后加的,不是后台返回,这是从百度历史轨迹查出来的
+
+    public LatLng getEndLatLng() {
+        return endLatLng;
+    }
+
+    public void setEndLatLng(LatLng endLatLng) {
+        this.endLatLng = endLatLng;
+    }
     public String getAddress() {
         return address;
@@ -369,7 +369,10 @@ public class StepService extends Service implements SensorEventListener {
                     return;
                 }
                 UserStepEntity userStepEntity = StepUtil.getUserStepData(getApplicationContext(), CommonInfo.getUserId(getApplicationContext()));
-                if (userStepEntity == null) {
+                if (null == userStepEntity) {
+                    return;
+                }
+                if (userStepEntity.getFenceId() == 0) {
                     return;
                 }
                 if (alarmPushInfo.getFenceId() == userStepEntity.getFenceId()) {
@@ -45,6 +45,7 @@ public class FailedEntityDao extends AbstractDao&lt;FailedEntity, String&gt; {
         public final static Property StreetId = new Property(18, String.class, "streetId", false, "STREET_ID");
         public final static Property StreetTitle = new Property(19, String.class, "streetTitle", false, "STREET_TITLE");
         public final static Property CreatTimeStamp = new Property(20, long.class, "creatTimeStamp", false, "CREAT_TIME_STAMP");
+        public final static Property IsArriveEndPoint = new Property(21, boolean.class, "isArriveEndPoint", false, "IS_ARRIVE_END_POINT");
     }
@@ -80,7 +81,8 @@ public class FailedEntityDao extends AbstractDao&lt;FailedEntity, String&gt; {
                 "\"IMPORT_POINT\" TEXT," + // 17: importPoint
                 "\"STREET_ID\" TEXT," + // 18: streetId
                 "\"STREET_TITLE\" TEXT," + // 19: streetTitle
-                "\"CREAT_TIME_STAMP\" INTEGER NOT NULL );"); // 20: creatTimeStamp
+                "\"CREAT_TIME_STAMP\" INTEGER NOT NULL ," + // 20: creatTimeStamp
+                "\"IS_ARRIVE_END_POINT\" INTEGER NOT NULL );"); // 21: isArriveEndPoint
     }
     /** Drops the underlying database table. */
@@ -165,6 +167,7 @@ public class FailedEntityDao extends AbstractDao&lt;FailedEntity, String&gt; {
             stmt.bindString(20, streetTitle);
         }
         stmt.bindLong(21, entity.getCreatTimeStamp());
+        stmt.bindLong(22, entity.getIsArriveEndPoint() ? 1L: 0L);
     }
     @Override
@@ -243,6 +246,7 @@ public class FailedEntityDao extends AbstractDao&lt;FailedEntity, String&gt; {
             stmt.bindString(20, streetTitle);
         }
         stmt.bindLong(21, entity.getCreatTimeStamp());
+        stmt.bindLong(22, entity.getIsArriveEndPoint() ? 1L: 0L);
     }
     @Override
@@ -273,7 +277,8 @@ public class FailedEntityDao extends AbstractDao&lt;FailedEntity, String&gt; {
             cursor.isNull(offset + 17) ? null : cursor.getString(offset + 17), // importPoint
             cursor.isNull(offset + 18) ? null : cursor.getString(offset + 18), // streetId
             cursor.isNull(offset + 19) ? null : cursor.getString(offset + 19), // streetTitle
-            cursor.getLong(offset + 20) // creatTimeStamp
+            cursor.getLong(offset + 20), // creatTimeStamp
+            cursor.getShort(offset + 21) != 0 // isArriveEndPoint
         );
         return entity;
     }
@@ -301,6 +306,7 @@ public class FailedEntityDao extends AbstractDao&lt;FailedEntity, String&gt; {
         entity.setStreetId(cursor.isNull(offset + 18) ? null : cursor.getString(offset + 18));
         entity.setStreetTitle(cursor.isNull(offset + 19) ? null : cursor.getString(offset + 19));
         entity.setCreatTimeStamp(cursor.getLong(offset + 20));
+        entity.setIsArriveEndPoint(cursor.getShort(offset + 21) != 0);
      }
     @Override
@@ -45,6 +45,8 @@ public class UserStepEntityDao extends AbstractDao&lt;UserStepEntity, String&gt; {
         public final static Property FenceId = new Property(18, long.class, "fenceId", false, "FENCE_ID");
         public final static Property ImportPoint = new Property(19, String.class, "importPoint", false, "IMPORT_POINT");
         public final static Property StreetTitle = new Property(20, String.class, "streetTitle", false, "STREET_TITLE");
+        public final static Property EndLatLng = new Property(21, String.class, "endLatLng", false, "END_LAT_LNG");
+        public final static Property IsArriveEndPoint = new Property(22, boolean.class, "isArriveEndPoint", false, "IS_ARRIVE_END_POINT");
     }
@@ -80,7 +82,9 @@ public class UserStepEntityDao extends AbstractDao&lt;UserStepEntity, String&gt; {
                 "\"CONTINUE_TIME\" INTEGER NOT NULL ," + // 17: continueTime
                 "\"FENCE_ID\" INTEGER NOT NULL ," + // 18: fenceId
                 "\"IMPORT_POINT\" TEXT," + // 19: importPoint
-                "\"STREET_TITLE\" TEXT);"); // 20: streetTitle
+                "\"STREET_TITLE\" TEXT," + // 20: streetTitle
+                "\"END_LAT_LNG\" TEXT," + // 21: endLatLng
+                "\"IS_ARRIVE_END_POINT\" INTEGER NOT NULL );"); // 22: isArriveEndPoint
     }
     /** Drops the underlying database table. */
@@ -153,6 +157,12 @@ public class UserStepEntityDao extends AbstractDao&lt;UserStepEntity, String&gt; {
         if (streetTitle != null) {
             stmt.bindString(21, streetTitle);
         }
+ 
+        String endLatLng = entity.getEndLatLng();
+        if (endLatLng != null) {
+            stmt.bindString(22, endLatLng);
+        }
+        stmt.bindLong(23, entity.getIsArriveEndPoint() ? 1L: 0L);
     }
     @Override
@@ -219,6 +229,12 @@ public class UserStepEntityDao extends AbstractDao&lt;UserStepEntity, String&gt; {
         if (streetTitle != null) {
             stmt.bindString(21, streetTitle);
         }
+ 
+        String endLatLng = entity.getEndLatLng();
+        if (endLatLng != null) {
+            stmt.bindString(22, endLatLng);
+        }
+        stmt.bindLong(23, entity.getIsArriveEndPoint() ? 1L: 0L);
     }
     @Override
@@ -249,7 +265,9 @@ public class UserStepEntityDao extends AbstractDao&lt;UserStepEntity, String&gt; {
             cursor.getLong(offset + 17), // continueTime
             cursor.getLong(offset + 18), // fenceId
             cursor.isNull(offset + 19) ? null : cursor.getString(offset + 19), // importPoint
-            cursor.isNull(offset + 20) ? null : cursor.getString(offset + 20) // streetTitle
+            cursor.isNull(offset + 20) ? null : cursor.getString(offset + 20), // streetTitle
+            cursor.isNull(offset + 21) ? null : cursor.getString(offset + 21), // endLatLng
+            cursor.getShort(offset + 22) != 0 // isArriveEndPoint
         );
         return entity;
     }
@@ -277,6 +295,8 @@ public class UserStepEntityDao extends AbstractDao&lt;UserStepEntity, String&gt; {
         entity.setFenceId(cursor.getLong(offset + 18));
         entity.setImportPoint(cursor.isNull(offset + 19) ? null : cursor.getString(offset + 19));
         entity.setStreetTitle(cursor.isNull(offset + 20) ? null : cursor.getString(offset + 20));
+        entity.setEndLatLng(cursor.isNull(offset + 21) ? null : cursor.getString(offset + 21));
+        entity.setIsArriveEndPoint(cursor.getShort(offset + 22) != 0);
      }
     @Override
@@ -36,13 +36,13 @@ public class FailedEntity implements Serializable {
     private String streetId;//赛事id
     private String streetTitle;//赛道标题
     private long creatTimeStamp;//数据创建的时间
+    private boolean isArriveEndPoint;//是否到达终点
-    @Generated(hash = 458367844)
-    public FailedEntity(String uuid, String uid, boolean isPause, long userPauseTime, long usrContinueTime,
-            String isFinish, String time, String speed, String step, String distance, String startPoint,
-            String endPoint, long streetTraceStartTime, long streetTraceEndTime, String entityName,
-            long userStartTime, long userEndTime, String importPoint, String streetId, String streetTitle,
-            long creatTimeStamp) {
+    @Generated(hash = 1057412546)
+    public FailedEntity(String uuid, String uid, boolean isPause, long userPauseTime, long usrContinueTime, String isFinish,
+            String time, String speed, String step, String distance, String startPoint, String endPoint,
+            long streetTraceStartTime, long streetTraceEndTime, String entityName, long userStartTime, long userEndTime,
+            String importPoint, String streetId, String streetTitle, long creatTimeStamp, boolean isArriveEndPoint) {
         this.uuid = uuid;
         this.uid = uid;
         this.isPause = isPause;
@@ -64,6 +64,7 @@ public class FailedEntity implements Serializable {
         this.streetId = streetId;
         this.streetTitle = streetTitle;
         this.creatTimeStamp = creatTimeStamp;
+        this.isArriveEndPoint = isArriveEndPoint;
     }
     @Generated(hash = 1639581354)
@@ -238,6 +239,13 @@ public class FailedEntity implements Serializable {
         this.distance = distance;
     }
+    public boolean getIsArriveEndPoint() {
+        return this.isArriveEndPoint;
+    }
+
+    public void setIsArriveEndPoint(boolean isArriveEndPoint) {
+        this.isArriveEndPoint = isArriveEndPoint;
+    }
 }
 package com.cnlive.moudle.pedometer.sql.entity;
+import com.baidu.mapapi.model.LatLng;
+
 import org.greenrobot.greendao.annotation.Entity;
 import org.greenrobot.greendao.annotation.Generated;
 import org.greenrobot.greendao.annotation.Id;
@@ -28,11 +30,12 @@ public class UserStepEntity {
     private long fenceId;//围栏id
     private String importPoint;//关键点
     private String streetTitle;//赛事标题
-
-    @Generated(hash = 281426159)
+    private String endLatLng;//终点坐标
+    private boolean isArriveEndPoint;//是否到达终点
+    @Generated(hash = 434792384)
     public UserStepEntity(String userId, String date, String stepCount, long recordTime, double caloriesCount, String serverTraceData, String startPoint, String endPoint,
             long startTimeStamp, long finishTimeStamp, String streetId, int pauseCount, long userPauseTimeStamp, long chronometerBase, long queryTraceStartTime, long queryTraceEndTime,
-            String queryEntityName, long continueTime, long fenceId, String importPoint, String streetTitle) {
+            String queryEntityName, long continueTime, long fenceId, String importPoint, String streetTitle, String endLatLng, boolean isArriveEndPoint) {
         this.userId = userId;
         this.date = date;
         this.stepCount = stepCount;
@@ -54,6 +57,8 @@ public class UserStepEntity {
         this.fenceId = fenceId;
         this.importPoint = importPoint;
         this.streetTitle = streetTitle;
+        this.endLatLng = endLatLng;
+        this.isArriveEndPoint = isArriveEndPoint;
     }
     @Generated(hash = 273857141)
@@ -229,5 +234,21 @@ public class UserStepEntity {
         this.streetTitle = streetTitle;
     }
+    public boolean getIsArriveEndPoint() {
+        return this.isArriveEndPoint;
+    }
+
+    public void setIsArriveEndPoint(boolean isArriveEndPoint) {
+        this.isArriveEndPoint = isArriveEndPoint;
+    }
+
+    public String getEndLatLng() {
+        return this.endLatLng;
+    }
+
+    public void setEndLatLng(String endLatLng) {
+        this.endLatLng = endLatLng;
+    }
+
 }
@@ -2,6 +2,7 @@ package com.cnlive.moudle.pedometer.ui.fragment;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.Vibrator;
 import android.support.annotation.Nullable;
 import android.text.TextUtils;
 import android.util.Log;
@@ -18,6 +19,8 @@ import com.cnlive.moudle.pedometer.model.Constant;
 import com.cnlive.moudle.pedometer.model.MessageEvent;
 import com.cnlive.moudle.pedometer.net.bean.RunRaceDetailInfo;
 import com.cnlive.moudle.pedometer.sql.entity.UserStepEntity;
+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.StepUtil;
 import com.example.moudle_pedometer.R;
@@ -34,6 +37,9 @@ import java.util.List;
 public class RunMainFragment extends QMUIFragment<RunMainFragmentView, RunMainFragmentPresenter, FragmentRunMainBinding> {
     private final String TAG = "RunMainFragment";
     private RunRaceDetailInfo runRaceDetailInfo;
+    //创建震动服务对象
+    private Vibrator mVibrator;
+    private TipDialog tipDialog;
     public static RunMainFragment newInstance(RunRaceDetailInfo runRaceDetailInfo) {
         Bundle bundle = new Bundle();
@@ -50,6 +56,7 @@ public class RunMainFragment extends QMUIFragment&lt;RunMainFragmentView, RunMainFr
         StatusBarUtil2.setColor(getActivity(), getResources().getColor(R.color.run_main_bg), 0);
         EventBus.getDefault().register(this);
         if (getArguments() != null) {
+            initTipDialog();
             runRaceDetailInfo = (RunRaceDetailInfo) getArguments().getSerializable("runRaceDetailInfo");
             UserStepEntity userStepEntity = StepUtil.getUserStepData(getActivity(), CommonInfo.getUserId(getActivity()));
             if (userStepEntity != null) {
@@ -129,6 +136,19 @@ public class RunMainFragment extends QMUIFragment&lt;RunMainFragmentView, RunMainFr
         return R.layout.fragment_run_main;
     }
+    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);
+        }
+    }
+
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void Event(MessageEvent messageEvent) {
         //更新步数
@@ -143,6 +163,32 @@ public class RunMainFragment extends QMUIFragment&lt;RunMainFragmentView, RunMainFr
                 getMvpView().resetSpeed();
             }
         }
+        //超出范围
+        else if (messageEvent.getMessageType() == Constant.EXIT_RANGE) {
+            ChineseToSpeechUtil.speech(getActivity().getApplicationContext(), getString(R.string.exit_range_tip));
+            if (mVibrator != null) {
+                //设置震动周期，数组表示时间：等待+执行，单位是毫秒，下面操作代表:等待100，执行100，等待100，执行1000，
+                //后面的数字如果为-1代表不重复，之执行一次，其他代表会重复，0代表从数组的第0个位置开始
+                mVibrator.vibrate(new long[]{100, 1000, 100, 1000}, -1);
+            }
+            if (tipDialog != null) {
+                tipDialog.setTipMsg("您已偏离路径轨迹\n请您计时回归路径!");
+                tipDialog.show();
+            }
+        }
+        //进入范围
+        else if (messageEvent.getMessageType() == Constant.ENTER_RANGE) {
+            ChineseToSpeechUtil.speech(getActivity().getApplicationContext(), getString(R.string.enter_range_tip));
+            if (mVibrator != null) {
+                //设置震动周期，数组表示时间：等待+执行，单位是毫秒，下面操作代表:等待100，执行100，等待100，执行1000，
+                //后面的数字如果为-1代表不重复，之执行一次，其他代表会重复，0代表从数组的第0个位置开始
+                mVibrator.vibrate(new long[]{100, 1000, 100, 1000}, -1);
+            }
+            if (tipDialog != null) {
+                tipDialog.setTipMsg("您已回归轨迹\n继续参与运动吧");
+                tipDialog.show();
+            }
+        }
     }
     /**
@@ -178,7 +178,6 @@ public class RunRaceDetailFragment extends QMUIFragment&lt;RunRaceDetailFragmentVie
         //启动鹰眼成功
         if (messageEvent.getMessageType() == Constant.START_TRACE_GATHER_SUCCESS) {
             if (getMvpView() != null) {
-                Log.e(TAG, "跳转: " + getMvpView().importStreetPoints.size());
                 QMUITipDialogUtil.dismessDialog();
                 PedometerMainActivity.startActivity(getActivity(), getMvpView().runRaceDetailInfo);
             }
@@ -199,6 +199,7 @@ public class RunningMapFragment extends QMUIFragment&lt;RunningMapFragmentView, Run
                 mVibrator.vibrate(new long[]{100, 1000, 100, 1000}, -1);
             }
             if (tipDialog != null) {
+                tipDialog.setTipMsg("您已偏离路径轨迹\n请您计时回归路径!");
                 tipDialog.show();
             }
         }
@@ -211,6 +212,7 @@ public class RunningMapFragment extends QMUIFragment&lt;RunningMapFragmentView, Run
                 mVibrator.vibrate(new long[]{100, 1000, 100, 1000}, -1);
             }
             if (tipDialog != null) {
+                tipDialog.setTipMsg("您已回归轨迹\n继续参与运动吧");
                 tipDialog.show();
             }
         }
@@ -54,12 +54,14 @@ public class TipDialog extends Dialog {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-
-
         //显示视图
         this.setContentView(view);
     }
+    public void setTipMsg(String tipMsg) {
+        tv_dialog_tip.setText(tipMsg);
+    }
+
     private void initView(View rootView) {
         this.tv_dialog_tip = (TextView) rootView.findViewById(R.id.tv_dialog_tip);
         this.btn_ok = (Button) rootView.findViewById(R.id.btn_ok);
@@ -32,6 +32,7 @@ public class StepUtil {
         return UUID.randomUUID().toString().replace("-", "");
     }
+
     /**
      * 删除临时保存数据
      *
@@ -31,7 +31,6 @@
     <!--赛事详情-->
     <string name="run_race_btn_sign_up">立即报名</string>
     <string name="run_race_btn_start_now">现在开始</string>
-    <string name="run_race_far_tip">您距离起点较远\n请到达起点附近再开始!</string>
     <!--layout_street-->
     <string name="layout_street_active_point">活动地点</string>
     <string name="layout_street_start_point">(起)</string>
@@ -81,14 +80,16 @@
     <string name="again_up">重新上传</string>
     <string name="myrecord">我的记录</string>
     <string name="up_fail">上传失败</string>
-    <string name="enter_range_tip">您已回归轨迹 继续参与运动吧</string>
-    <string name="exit_range_tip">您已偏离路径轨迹 请您计时回归路径!</string>
-    <string name="more_than_pause_count_tip">您已超过最大暂停次数,无法继续比赛!</string>
+    <string name="enter_range_tip">您已回归轨迹继续参与运动吧</string>
+    <string name="exit_range_tip">您已偏离路径轨迹请您计时回归路径</string>
+    <string name="more_than_pause_count_tip">您已超过最大暂停次数,无法继续比赛</string>
     <string name="run_pause_tip">固定赛事只可暂停一次\n是否确定使用?</string>
     <string name="add_path">添加轨迹</string>
     <string name="addpath">绑定轨迹</string>
     <string name="delect">删除</string>
     <string name="no_fail_line_text_tip">没有上传失败的路线哦</string>
+    <string name="run_race_far_tip">您距离起点较远\n请到达起点附近再开始</string>
+    <string name="run_race_arrive_end_tip">您已到达终点附近\n可以结束运动了</string>
 </resources>