1 增加,详情页面,地图根据卡片进行缩放功能

2 修复用户进入详情页面,围栏id为空时,闪退的问题

1 增加,详情页面,地图根据卡片进行缩放功能
2 修复用户进入详情页面,围栏id为空时,闪退的问题
杨帅
1 parent bf5783f5
Showing 6 changed files with 249 additions and 249 deletions
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/CollRunRaceDetailFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/commonInfo/CommonInfo.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunRaceDetailFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/service/StepService.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/utils/MyMapUtil.java
moudle_pedometer/src/main/res/layout/fragment_collect_run_race_detail.xml
@@ -8,6 +8,7 @@ import android.hardware.SensorEvent;
 import android.hardware.SensorEventListener;
 import android.hardware.SensorManager;
 import android.text.TextUtils;
+import android.util.Log;
 import android.view.View;
 import android.view.ViewTreeObserver;
 import android.widget.Toast;
@@ -20,6 +21,7 @@ import com.baidu.mapapi.map.BaiduMap;
 import com.baidu.mapapi.map.BitmapDescriptor;
 import com.baidu.mapapi.map.BitmapDescriptorFactory;
 import com.baidu.mapapi.map.MapStatus;
+import com.baidu.mapapi.map.MapStatusUpdate;
 import com.baidu.mapapi.map.MapStatusUpdateFactory;
 import com.baidu.mapapi.map.MapView;
 import com.baidu.mapapi.map.MarkerOptions;
@@ -44,7 +46,6 @@ import com.baidu.mapapi.search.route.WalkingRouteResult;
 import com.baidu.trace.LBSTraceClient;
 import com.baidu.trace.model.SortType;
 import com.cnlive.moudle.collectionTrace.ui.activity.RaceNameListActivity;
-import com.cnlive.moudle.collectionTrace.ui.activity.StartCollectTraceActivity;
 import com.cnlive.moudle.collectionTrace.ui.fragment.CollRunRaceDetailFragment;
 import com.cnlive.moudle.collectionTrace.commonInfo.CollCommonInfo;
 import com.cnlive.moudle.pedometer.model.Constant;
@@ -91,14 +92,15 @@ public class CollRunRaceDetailFragmentView implements MvpView, SensorEventListen
     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 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 List<LatLng> trackPoints;
     public RunRaceDetailInfo runRaceDetailInfo;
     private LBSTraceClient mClient = null;
+    private List<LatLng> queryResultPoints;//查询到的历史轨迹
+    private boolean isChangeMapState = true;//上滑卡片是否缩放地图与倾斜
+    private float initZoom = 0;
+    private final float INIT_MAP_OVERLOOK = -40f;//地图倾斜角度
+    private final float DEFAULT_MAP_AUTO_ZOOM = -0.8f;//根据点位,自动缩放的比例
     public CollRunRaceDetailFragmentView(CollRunRaceDetailFragment fragment) {
         this.fragment = fragment;
@@ -110,6 +112,7 @@ public class CollRunRaceDetailFragmentView implements MvpView, SensorEventListen
     public void initView(RunRaceDetailInfo runRaceDetailInfo, String uid) {
+        queryResultPoints = new ArrayList<>();
         if (fragment.getActivity() == null) {
             return;
         }
@@ -126,6 +129,7 @@ public class CollRunRaceDetailFragmentView implements MvpView, SensorEventListen
         fragment.binding.emptyLayout.setVisibility(View.GONE);
         //设置底部卡片第一次可滑动的位置
         fragment.binding.slidingLayout.setAnchorPoint(0.6f);
+
         fragment.binding.slidingLayout.addPanelSlideListener(new SlidingUpPanelLayout.PanelSlideListener() {
             @Override
             public void onPanelSlide(View panel, float slideOffset) {
@@ -133,23 +137,39 @@ public class CollRunRaceDetailFragmentView implements MvpView, SensorEventListen
             @Override
             public void onPanelStateChanged(View panel, SlidingUpPanelLayout.PanelState previousState, SlidingUpPanelLayout.PanelState newState) {
+                if (newState == SlidingUpPanelLayout.PanelState.ANCHORED) {
+                    if (isChangeMapState) {
+                        if (null != baiduMap) {
+                            if (null != baiduMap.getMapStatus()) {
+                                MapStatus mapStatus = new MapStatus
+                                        .Builder(baiduMap.getMapStatus())
+                                        .overlook(0)
+                                        .zoom((float) (baiduMap.getMapStatus().zoom - 1.5)).build();
+                                MapStatusUpdate mapStatusUpdate = MapStatusUpdateFactory.newMapStatus(mapStatus);
+                                baiduMap.animateMapStatus(mapStatusUpdate);
+                            }
+                        }
+                    }
+                    isChangeMapState = false;
+                } else if (newState == SlidingUpPanelLayout.PanelState.COLLAPSED) {
+
+                    if (null != baiduMap) {
+                        if (0 == initZoom) {
+                            initZoom = DEFULT_ZOOM;
+                        }
+                        MapStatus mapStatus = new MapStatus
+                                .Builder(baiduMap.getMapStatus())
+                                .overlook(INIT_MAP_OVERLOOK)
+                                .zoom(initZoom)
+                                .build();
+                        MapStatusUpdate mapStatusUpdate = MapStatusUpdateFactory.newMapStatus(mapStatus);
+                        baiduMap.animateMapStatus(mapStatusUpdate);
+                        isChangeMapState = true;
+                    }
+                }
             }
         });
         /*************************设置相关页面数据***************************/
-        //获取轨迹开始时间
-        if (!TextUtils.isEmpty(runRaceDetailInfo.getStartTime()) && !TextUtils.isEmpty(runRaceDetailInfo.getEndTime()) && !TextUtils.isEmpty(runRaceDetailInfo.getEntityName())) {
-            long startTime = Long.parseLong(runRaceDetailInfo.getStartTime());
-            long endTime = Long.parseLong(runRaceDetailInfo.getEndTime());
-            String entityName = runRaceDetailInfo.getEntityName();
-            MyMapUtil.queryHistoryTrace(getContext(), mClient, entityName, startTime, endTime, new MyMapUtil.CallBack() {
-                @Override
-                public void success(List<LatLng> resultPoints) {
-                    if (null != resultPoints) {
-                        MyMapUtil.drawHistoryTrack(getContext(), baiduMap, resultPoints, SortType.asc, R.color.green_round, R.drawable.icon_start, R.drawable.icon_end);
-                    }
-                }
-            });
-        }
         //设置标题
         if (!TextUtils.isEmpty(runRaceDetailInfo.getTitle())) {
             fragment.binding.includeStreet.tvRaceTitle.setText(runRaceDetailInfo.getTitle());
@@ -213,8 +233,10 @@ public class CollRunRaceDetailFragmentView implements MvpView, SensorEventListen
                     @Override
                     public void success(List<LatLng> resultPoints) {
                         if (null != resultPoints && resultPoints.size() > 1) {
+                            queryResultPoints.clear();
+                            queryResultPoints.addAll(resultPoints);
                             MyMapUtil.drawHistoryTrack(getContext(), baiduMap, resultPoints, SortType.asc, R.color.green_round, R.drawable.icon_start, R.drawable.icon_end);
-                            MyMapUtil.setMapAutoZoom(baiduMap, resultPoints, -1.5f);
+                            initZoom = MyMapUtil.setMapAutoZoom(baiduMap, resultPoints, DEFAULT_MAP_AUTO_ZOOM);
                         }
                     }
                 });
@@ -287,12 +309,15 @@ public class CollRunRaceDetailFragmentView implements MvpView, SensorEventListen
         if (baiduMap == null) {
             baiduMap = mMapView.getMap();
         }
-        if (routePlanSearch == null) {
-            routePlanSearch = RoutePlanSearch.newInstance();
-        }
         if (mUiSettings == null) {
             mUiSettings = baiduMap.getUiSettings();
         }
+        MapStatus mapStatus = new MapStatus
+                .Builder(baiduMap.getMapStatus())
+                .overlook(INIT_MAP_OVERLOOK)
+                .build();
+        MapStatusUpdate mapStatusUpdate = MapStatusUpdateFactory.newMapStatus(mapStatus);
+        baiduMap.animateMapStatus(mapStatusUpdate);
         //设置定位模式, 默认为 LocationMode.NORMAL 普通态
         mCurrentMode = MyLocationConfiguration.LocationMode.NORMAL;
         // 设置定位图标修改为自定义marker
@@ -646,19 +671,9 @@ public class CollRunRaceDetailFragmentView implements MvpView, SensorEventListen
             }
             MapStatus.Builder builder = new MapStatus.Builder();
-
-//            if (isFirstLoc) {
-//                isFirstLoc = false;
             firstLatLng = new LatLng(location.getLatitude(),
                     location.getLongitude());
             baiduMap.setMyLocationData(followMyLocation);
-//                builder.target(firstLatLng).zoom(DEFULT_ZOOM);
-//                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);
             //根据几个关键点进行步行路径规划
 //                if (importLatLngs != null) {
@@ -279,26 +279,26 @@ public class CommonInfo {
     }
-    /**
-     * 设置赛事标题
-     *
-     * @param context
-     * @param streetTitle
-     */
-    public static void setStreetTitle(Context context, String streetTitle) {
-        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).putString("runStreetTitle", streetTitle);
-
-    }
-
-    /**
-     * 获取赛事标题
-     *
-     * @param context
-     */
-    public static String getStreetTitle(Context context) {
-        return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getString("runStreetTitle", "");
-
-    }
+//    /**
+//     * 设置赛事标题
+//     *
+//     * @param context
+//     * @param streetTitle
+//     */
+//    public static void setStreetTitle(Context context, String streetTitle) {
+//        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).putString("runStreetTitle", streetTitle);
+//
+//    }
+//
+//    /**
+//     * 获取赛事标题
+//     *
+//     * @param context
+//     */
+//    public static String getStreetTitle(Context context) {
+//        return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getString("runStreetTitle", "");
+//
+//    }
     //    /**
 //     * 设置起点经纬度
@@ -26,6 +26,7 @@ import com.baidu.mapapi.map.BaiduMap;
 import com.baidu.mapapi.map.BitmapDescriptor;
 import com.baidu.mapapi.map.BitmapDescriptorFactory;
 import com.baidu.mapapi.map.MapStatus;
+import com.baidu.mapapi.map.MapStatusUpdate;
 import com.baidu.mapapi.map.MapStatusUpdateFactory;
 import com.baidu.mapapi.map.MapView;
 import com.baidu.mapapi.map.MarkerOptions;
@@ -105,6 +106,11 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
     private boolean isDifferentStreet = false;
     private LBSTraceClient mClient = null;
     public LatLng endLatLng;//用于终点判断
+    private boolean isChangeMapState = true;//上滑卡片是否缩放地图与倾斜
+    private float initZoom = 0;
+    private final float INIT_MAP_OVERLOOK = -40f;//地图倾斜角度
+    private final float DEFAULT_MAP_AUTO_ZOOM = -0.8f;//根据点位,自动缩放的比例
+    private List<LatLng> queryResultPoints;//查询到的历史轨迹
     public RunRaceDetailFragmentView(RunRaceDetailFragment fragment) {
         this.fragment = fragment;
@@ -116,57 +122,10 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
     public void initView(RunRaceDetailInfo runRaceDetailInfo) {
-        Log.e(TAG, "initView: " + TimeUtil.getNowTimeStamp());
-//       new Handler().postDelayed(new Runnable() {
-//           @Override
-//           public void run() {
-//               baiduMap.snapshot(new BaiduMap.SnapshotReadyCallback() {
-//                   @Override
-//                   public void onSnapshotReady(Bitmap bitmap) {
-//                       SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
-//                       if (null == bitmap) {
-//                           return;
-//                       }
-//                       QMUITipDialogUtil.loadingDialog(getContext(), "上传", false);
-//                       //开始保存截屏
-//                       try {
-//                           File image = new File(getContext().getExternalCacheDir() + "/location_screenshot_" + sdf.format(new Date()) + ".jpeg");
-//                           FileOutputStream fos = new FileOutputStream(image);
-//                           boolean b = bitmap.compress(Bitmap.CompressFormat.PNG, 100, fos);
-//                           fos.flush();
-//                           fos.close();
-//                           List<String> imagePaths = new ArrayList<>();
-//                           imagePaths.add(image.getAbsolutePath());
-//                           Log.e(TAG, "onSnapshotReady: "+image.getAbsolutePath() );
-//
-//                           UploadLogic.uploadAddressPicInfo(getContext(), imagePaths, new Event<String>()
-//                                   .setFailureCallback(new FailureCallback() {
-//                                       @Override
-//                                       public void onFailure(int i, String s) {
-//                                           QMUITipDialogUtil.dismessDialog();
-//                                           Log.e(TAG, "onFailure: " + s);
-//                                       }
-//                                   })
-//                                   .setSuccessCallback(new SuccessCallback<String>() {
-//                                       @Override
-//                                       public void onSuccess(String data) {
-//                                           QMUITipDialogUtil.dismessDialog();
-//                                           Log.e(TAG, "onSuccess: " + data);
-//                                       }
-//                                   })
-//                           );
-//                       } catch (Exception e) {
-//                           e.printStackTrace();
-//                       }
-//                   }
-//               });
-//               //
-//           }
-//       },2000);
-
         if (fragment.getActivity() == null) {
             return;
         }
+        queryResultPoints = new ArrayList<>();
         this.runRaceDetailInfo = runRaceDetailInfo;
         //轨迹开始时间
         long startTime = 0;
@@ -184,17 +143,14 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
                     @Override
                     public void success(List<LatLng> resultPoints) {
                         if (resultPoints != null && resultPoints.size() > 1) {
+                            queryResultPoints.clear();
+                            queryResultPoints.addAll(resultPoints);
                             startLatLng = resultPoints.get(0);
                             endLatLng = resultPoints.get(resultPoints.size() - 1);
                             MyMapUtil.drawServerLineTrack(getContext(), baiduMap, resultPoints, SortType.asc, R.color.green_round, R.drawable.icon_start, R.drawable.icon_end);
 //                        //自动计算地图缩放
-//                        MapStatus.Builder builder = new MapStatus.Builder();
-//                        builder.target(MyMapUtil.getCenterZoomPosition(resultPoints));
-//                        builder.zoom(MyMapUtil.getZoom(resultPoints));
-//                        baiduMap.animateMapStatus(MapStatusUpdateFactory.newMapStatus(builder.build()));
-
                             //设置地图自动缩放
-                            MyMapUtil.setMapAutoZoom(baiduMap, resultPoints, -1.5f);
+                            initZoom = MyMapUtil.setMapAutoZoom(baiduMap, resultPoints, -1.5f);
                         }
                     }
@@ -258,23 +214,10 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
                 }
-//                if (slideOffset == 0) {
-//                    //在初始位置
-//                    if (fragment.binding.includeStreet.rlStartBtn.getVisibility() == View.GONE) {
-//                        fragment.binding.includeStreet.rlStartBtn.setVisibility(View.VISIBLE);
-//                    }
-//
-//                } else {
-//                    //用户进行滑动
-//                    if (fragment.binding.includeStreet.rlStartBtn.getVisibility() == View.VISIBLE) {
-//                        fragment.binding.includeStreet.rlStartBtn.setVisibility(View.GONE);
-//                    }
-//                }
             }
             @Override
             public void onPanelStateChanged(View panel, SlidingUpPanelLayout.PanelState previousState, SlidingUpPanelLayout.PanelState newState) {
-//                Log.e(TAG, "previousState: " + previousState + ",newState:" + newState);
                 if (previousState == SlidingUpPanelLayout.PanelState.ANCHORED && newState == SlidingUpPanelLayout.PanelState.DRAGGING) {
                     if (fragment.binding.flTop.getVisibility() != View.VISIBLE) {
                         QMUIStatusBarHelper.setStatusBarDarkMode(fragment.getActivity());
@@ -303,6 +246,39 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
                         fragment.binding.flTop.setVisibility(View.GONE);
                     }
                 }
+                //设置地图缩放
+                if (newState == SlidingUpPanelLayout.PanelState.ANCHORED) {
+                    if (isChangeMapState) {
+                        if (null != baiduMap) {
+                            if (null != baiduMap.getMapStatus()) {
+                                MapStatus mapStatus = new MapStatus
+                                        .Builder(baiduMap.getMapStatus())
+                                        .overlook(0)
+                                        .zoom((float) (baiduMap.getMapStatus().zoom - 1.5)).build();
+                                MapStatusUpdate mapStatusUpdate = MapStatusUpdateFactory.newMapStatus(mapStatus);
+                                baiduMap.animateMapStatus(mapStatusUpdate);
+                            }
+                        }
+                    }
+                    isChangeMapState = false;
+                } else if (newState == SlidingUpPanelLayout.PanelState.COLLAPSED) {
+
+                    if (null != baiduMap) {
+                        if (0 == initZoom) {
+                            initZoom = DEFULT_ZOOM;
+                        }
+                        MapStatus mapStatus = new MapStatus
+                                .Builder(baiduMap.getMapStatus())
+                                .overlook(INIT_MAP_OVERLOOK)
+                                .zoom(initZoom)
+                                .build();
+                        MapStatusUpdate mapStatusUpdate = MapStatusUpdateFactory.newMapStatus(mapStatus);
+                        baiduMap.animateMapStatus(mapStatusUpdate);
+                        isChangeMapState = true;
+                    }
+                }
+
+                //
             }
         });
@@ -317,13 +293,12 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
             }
         });
         /*************************设置相关页面数据***************************/
-        if (runRaceDetailInfo.getFenceId() != null&&!TextUtils.isEmpty(runRaceDetailInfo.getFenceId())) {
+        if (runRaceDetailInfo.getFenceId() != null && !TextUtils.isEmpty(runRaceDetailInfo.getFenceId())) {
             //设置围栏ID
             CommonInfo.setFenceId(getContext(), Integer.parseInt(runRaceDetailInfo.getFenceId()));
         }
         //设置标题
         if (!TextUtils.isEmpty(runRaceDetailInfo.getTitle())) {
-            CommonInfo.setStreetTitle(getContext(),runRaceDetailInfo.getTitle());
             fragment.binding.includeStreet.tvRaceTitle.setText(runRaceDetailInfo.getTitle());
             fragment.binding.includeStreet.tvRaceTitle.getViewTreeObserver().addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener() {
                 @Override
@@ -356,7 +331,7 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
             fragment.binding.includeStreet.tvAddress.setText(runRaceDetailInfo.getAddress());
             //设置活动距离
             if (!TextUtils.isEmpty(runRaceDetailInfo.getMileage())) {
-                fragment.binding.includeStreet.tvAddress.append("\t\t全长" + runRaceDetailInfo.getMileage()+"公里");
+                fragment.binding.includeStreet.tvAddress.append("\t\t全长" + runRaceDetailInfo.getMileage() + "公里");
             }
         }
@@ -444,7 +419,7 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
                 fragment.binding.includeRank.tvKingNickName.setText(runRaceDetailInfo.getFirstName());
             }
             //第一名用时
-            if (!TextUtils.isEmpty(runRaceDetailInfo.getFirstEmployTime())){
+            if (!TextUtils.isEmpty(runRaceDetailInfo.getFirstEmployTime())) {
                 fragment.binding.includeRank.tvFirstTime.setText(TimeUtil.stampToChronometer(Long.parseLong(runRaceDetailInfo.getFirstEmployTime())));
             }
         } else {
@@ -1132,6 +1107,7 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
                 if (location.getRadius() > Constant.LOCA_ACCURACY) {
                     Toast.makeText(getContext(), "当前定位精度为:" + location.getRadius() + "米,请您移动至空旷地带!", Toast.LENGTH_SHORT).show();
                 }
+
             } else {
                 //过滤定位精度
                 if (location.getRadius() > Constant.LOCA_ACCURACY) {
@@ -1148,14 +1124,15 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
             }
             MapStatus.Builder builder = new MapStatus.Builder();
-
-//            if (isFirstLoc) {
-//                isFirstLoc = false;
             firstLatLng = new LatLng(location.getLatitude(),
                     location.getLongitude());
             baiduMap.setMyLocationData(followMyLocation);
-//                builder.target(firstLatLng).zoom(DEFULT_ZOOM);
-//                baiduMap.animateMapStatus(MapStatusUpdateFactory.newMapStatus(builder.build()));
+            //没有获取到轨迹
+            if (0 == initZoom && null != firstLatLng) {
+                builder.target(firstLatLng).zoom(DEFULT_ZOOM);
+                baiduMap.animateMapStatus(MapStatusUpdateFactory.newMapStatus(builder.build()));
+            }
+//
 //                //显示当前位置图标
 //                Bitmap pointBitmap = BitmapUtil.getBitmapFromDp(getContext(), BitmapFactory.decodeResource(getContext().getResources(), R.drawable.rt_ic_location), 40, 40);
@@ -372,7 +372,7 @@ public class StepService extends Service implements SensorEventListener {
                 if (null == userStepEntity) {
                     return;
                 }
-                if (alarmPushInfo.getFenceId() == userStepEntity.getFenceId() && alarmPushInfo.getFenceName().equals(userStepEntity.getStreetTitle())) {
+                if (alarmPushInfo.getFenceId() == userStepEntity.getFenceId()) {
                     //超出范围
                     if (alarmPushInfo.getMonitoredAction() == MonitoredAction.exit) {
                         EventBus.getDefault().post(new MessageEvent(Constant.EXIT_RANGE, ""));
@@ -530,9 +530,6 @@ public class StepService extends Service implements SensorEventListener {
                 Log.e(TAG, "onStartTraceCallback: 保存的围栏id" + fenceId);
                 //设置围栏id
                 StepUtil.setFenceId(getApplicationContext(), CommonInfo.getUserId(getApplicationContext()), fenceId);
-                //设置赛事标题
-                String streetTitle = CommonInfo.getStreetTitle(getApplicationContext());
-                StepUtil.setStreetTitle(getApplicationContext(), CommonInfo.getUserId(getApplicationContext()), streetTitle);
             }
             entityName = userId;
             initTodayData(userId);
@@ -150,7 +150,7 @@ public class MyMapUtil {
      * @param trackPoints
      * @param zoomBy
      */
-    public static void setMapAutoZoom(BaiduMap baiduMap, List<LatLng> trackPoints, float zoomBy) {
+    public static float setMapAutoZoom(BaiduMap baiduMap, List<LatLng> trackPoints, float zoomBy) {
         LatLngBounds.Builder builder = new LatLngBounds.Builder();
         for (LatLng latLng : trackPoints) {
             builder.include(latLng);
@@ -158,7 +158,11 @@ public class MyMapUtil {
         MapStatusUpdate mapStatusUpdate = MapStatusUpdateFactory.newLatLngBounds(builder.build());
         baiduMap.setMapStatus(mapStatusUpdate);
         MapStatusUpdate msu = MapStatusUpdateFactory.zoomBy(zoomBy);
-        baiduMap.setMapStatus(msu);
+        baiduMap.animateMapStatus(msu);
+        if (null != baiduMap.getMapStatus()) {
+            return baiduMap.getMapStatus().zoom;
+        }
+        return 0;
         //自动计算地图缩放
 //        MapStatus.Builder builder = new MapStatus.Builder();
 //        builder.target(MyMapUtil.getCenterZoomPosition(trackPoints));
@@ -2,139 +2,146 @@
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
-    <FrameLayout
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:orientation="vertical">
-        <com.sothree.slidinguppanel.SlidingUpPanelLayout xmlns:sothree="http://schemas.android.com/apk/res-auto"
-            android:id="@+id/sliding_layout"
+        <com.qmuiteam.qmui.widget.QMUITopBar
+            android:id="@+id/topbar"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:gravity="bottom"
-            sothree:umanoDragView="@+id/dragView"
-            sothree:umanoFadeColor="@color/black_20"
-            sothree:umanoOverlay="true"
-            sothree:umanoParallaxOffset="250dp"
-            sothree:umanoScrollableView="@+id/scrollView"
-            sothree:umanoShadowHeight="0dp">
-
-            <!-- MAIN CONTENT -->
-            <LinearLayout
+            android:layout_height="?attr/qmui_topbar_height"
+            app:qmui_topbar_text_btn_color_state_list="@color/text_black" />
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <com.sothree.slidinguppanel.SlidingUpPanelLayout xmlns:sothree="http://schemas.android.com/apk/res-auto"
+                android:id="@+id/sliding_layout"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:orientation="vertical">
-
-                <com.qmuiteam.qmui.widget.QMUITopBar
-                    android:id="@+id/topbar"
+                android:gravity="bottom"
+                sothree:umanoDragView="@+id/dragView"
+                sothree:umanoFadeColor="@color/black_20"
+                sothree:umanoOverlay="true"
+                sothree:umanoParallaxOffset="300dp"
+                sothree:umanoScrollableView="@+id/scrollView"
+                sothree:umanoShadowHeight="0dp">
+
+                <!-- MAIN CONTENT -->
+                <LinearLayout
                     android:layout_width="match_parent"
-                    android:layout_height="?attr/qmui_topbar_height"
-                    app:qmui_topbar_text_btn_color_state_list="@color/text_black" />
+                    android:layout_height="match_parent"
+                    android:orientation="vertical">
-                <FrameLayout
-                    android:id="@+id/fl_root"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent">
-                    <com.baidu.mapapi.map.MapView
-                        android:id="@+id/mapView"
+                    <FrameLayout
+                        android:id="@+id/fl_root"
                         android:layout_width="match_parent"
-                        android:layout_height="match_parent"></com.baidu.mapapi.map.MapView>
+                        android:layout_height="match_parent">
-                    <!--地图上面加一层类似于全透明黑色蒙版-->
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:background="#0D000000"
-                        android:clickable="false"
-                        android:focusable="false"
-                        android:focusableInTouchMode="false"></LinearLayout>
+                        <com.baidu.mapapi.map.MapView
+                            android:id="@+id/mapView"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"></com.baidu.mapapi.map.MapView>
-                    <!---->
+                        <!--地图上面加一层类似于全透明黑色蒙版-->
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:background="#0D000000"
+                            android:clickable="false"
+                            android:focusable="false"
+                            android:focusableInTouchMode="false"></LinearLayout>
+                        <!---->
-                </FrameLayout>
-            </LinearLayout>
-            <!-- SLIDING LAYOUT -->
-            <FrameLayout
-                android:id="@+id/dragView"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:background="@color/white"
-                android:clickable="false"
-                android:focusable="false">
-                <ScrollView
-                    android:id="@+id/scrollView"
+                    </FrameLayout>
+                </LinearLayout>
+                <!-- SLIDING LAYOUT -->
+                <FrameLayout
+                    android:id="@+id/dragView"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:scrollbars="none">
+                    android:background="@color/white"
+                    android:clickable="false"
+                    android:focusable="false">
-                    <LinearLayout
-                        android:id="@+id/ll_root"
+                    <ScrollView
+                        android:id="@+id/scrollView"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="vertical">
-                        <!--跑道-->
-                        <include
-                            android:id="@+id/include_street"
-                            layout="@layout/layout_collect_run_detail_street" />
-                        <!---->
-                        <View
+                        android:layout_height="match_parent"
+                        android:scrollbars="none">
+
+                        <LinearLayout
+                            android:id="@+id/ll_root"
                             android:layout_width="match_parent"
-                            android:layout_height="10dp"
-                            android:background="#F4F4F4" />
-                        <!--路线介绍-->
-                        <include
-                            android:id="@+id/include_street_introduce"
-                            layout="@layout/layout_run_detail_street_introduce" />
-                    </LinearLayout>
-
-                </ScrollView>
-            </FrameLayout>
-        </com.sothree.slidinguppanel.SlidingUpPanelLayout>
-        <!--按钮-->
-        <RelativeLayout
-            android:id="@+id/rl_scrollView_add_trace"
-            android:layout_width="match_parent"
-            android:layout_height="40sp"
-            android:layout_gravity="bottom"
-            android:background="@color/green_round"
-            android:tag="0">
-
-            <TextView
-                android:id="@+id/tv_run_now"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerInParent="true"
-                android:tag="0"
-                android:text="@string/layout_collect_bind_trace"
-                android:textColor="@color/white"
-                android:textSize="18sp" />
-
-            <TextView
-                android:id="@+id/tv_go_tip"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
-                android:layout_centerInParent="true"
-                android:layout_centerVertical="true"
-                android:layout_marginRight="10dp"
-                android:text="Go!"
-                android:textColor="@color/white"
-                android:textSize="18sp"
+                            android:layout_height="wrap_content"
+                            android:orientation="vertical">
+                            <!--跑道-->
+                            <include
+                                android:id="@+id/include_street"
+                                layout="@layout/layout_collect_run_detail_street" />
+                            <!---->
+                            <View
+                                android:layout_width="match_parent"
+                                android:layout_height="10dp"
+                                android:background="#F4F4F4" />
+                            <!--路线介绍-->
+                            <include
+                                android:id="@+id/include_street_introduce"
+                                layout="@layout/layout_run_detail_street_introduce" />
+                        </LinearLayout>
+
+                    </ScrollView>
+                </FrameLayout>
+            </com.sothree.slidinguppanel.SlidingUpPanelLayout>
+            <!--按钮-->
+            <RelativeLayout
+                android:id="@+id/rl_scrollView_add_trace"
+                android:layout_width="match_parent"
+                android:layout_height="40sp"
+                android:layout_gravity="bottom"
+                android:background="@color/green_round"
+                android:tag="0">
+
+                <TextView
+                    android:id="@+id/tv_run_now"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerInParent="true"
+                    android:tag="0"
+                    android:text="@string/layout_collect_bind_trace"
+                    android:textColor="@color/white"
+                    android:textSize="18sp" />
+
+                <TextView
+                    android:id="@+id/tv_go_tip"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerInParent="true"
+                    android:layout_centerVertical="true"
+                    android:layout_marginRight="10dp"
+                    android:text="Go!"
+                    android:textColor="@color/white"
+                    android:textSize="18sp"
+                    android:visibility="gone" />
+
+            </RelativeLayout>
+
+
+            <com.cnlive.strike.ui.widget.UIEmptyView
+                android:id="@+id/empty_layout"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@color/color_fff"
+                android:focusable="true"
+                android:focusableInTouchMode="true"
                 android:visibility="gone" />
-
-        </RelativeLayout>
-
-        <com.cnlive.strike.ui.widget.UIEmptyView
-            android:id="@+id/empty_layout"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="@color/color_fff"
-            android:focusable="true"
-            android:focusableInTouchMode="true"
-            android:visibility="gone" />
-    </FrameLayout>
-
+        </FrameLayout>
+    </LinearLayout>
 </layout>
 \ No newline at end of file