1 实现赛事详情页中赛事结束判断

杨帅
1 parent b3f8d752
Showing 9 changed files with 262 additions and 194 deletions
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/CollRunRaceDetailFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/OnGoingFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunRaceDetailFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/net/bean/RunRaceDetailInfo.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/utils/MyMapUtil.java
moudle_pedometer/src/main/res/drawable/shape_circle_30_btn_black_green.xml
moudle_pedometer/src/main/res/layout/fragment_collect_run_race_detail.xml
moudle_pedometer/src/main/res/layout/layout_collect_run_detail_street.xml
moudle_pedometer/src/main/res/values/colors.xml
@@ -171,21 +171,21 @@ public class CollRunRaceDetailFragmentView implements MvpView, SensorEventListen
             fragment.binding.includeStreet.tvEndAddr.setText(runRaceDetailInfo.getEndLocation());
         }
         //设置起始报名时间
-        if (!TextUtils.isEmpty(TimeUtil.getStampToTime(runRaceDetailInfo.getSign_up_start_time(), "yyyy-MM-dd"))) {
-            fragment.binding.includeStreet.tvSignUpStartTime.setText(TimeUtil.getStampToTime(runRaceDetailInfo.getSign_up_start_time(), "yyyy-MM-dd"));
+        if (!TextUtils.isEmpty(TimeUtil.getStampToTime(runRaceDetailInfo.getSign_up_start_time(), "yyyy.MM.dd"))) {
+            fragment.binding.includeStreet.tvSignUpStartTime.setText(TimeUtil.getStampToTime(runRaceDetailInfo.getSign_up_start_time(), "yyyy.MM.dd"));
         }
         //设置终止报名时间
-        if (!TextUtils.isEmpty(TimeUtil.getStampToTime(runRaceDetailInfo.getSign_up_end_time(), "yyyy-MM-dd"))) {
-            fragment.binding.includeStreet.tvSignUpEndTime.setText(TimeUtil.getStampToTime(runRaceDetailInfo.getSign_up_end_time(), "yyyy-MM-dd"));
+        if (!TextUtils.isEmpty(TimeUtil.getStampToTime(runRaceDetailInfo.getSign_up_end_time(), "yyyy.MM.dd"))) {
+            fragment.binding.includeStreet.tvSignUpEndTime.setText(TimeUtil.getStampToTime(runRaceDetailInfo.getSign_up_end_time(), "yyyy.MM.dd"));
         }
         //设置活动开始时间
-        if (!TextUtils.isEmpty(TimeUtil.getStampToTime(runRaceDetailInfo.getStart_time(), "yyyy-MM-dd"))) {
-            fragment.binding.includeStreet.tvActiveStartTime.setText(TimeUtil.getStampToTime(runRaceDetailInfo.getStart_time(), "yyyy-MM-dd"));
+        if (!TextUtils.isEmpty(TimeUtil.getStampToTime(runRaceDetailInfo.getStart_time(), "yyyy.MM.dd"))) {
+            fragment.binding.includeStreet.tvActiveStartTime.setText(TimeUtil.getStampToTime(runRaceDetailInfo.getStart_time(), "yyyy.MM.dd"));
         }
         //设置活动结束时间
-        if (!TextUtils.isEmpty(TimeUtil.getStampToTime(runRaceDetailInfo.getEnd_time(), "yyyy-MM-dd"))) {
-            fragment.binding.includeStreet.tvActiveEndTime.setText(TimeUtil.getStampToTime(runRaceDetailInfo.getEnd_time(), "yyyy-MM-dd"));
+        if (!TextUtils.isEmpty(TimeUtil.getStampToTime(runRaceDetailInfo.getEnd_time(), "yyyy.MM.dd"))) {
+            fragment.binding.includeStreet.tvActiveEndTime.setText(TimeUtil.getStampToTime(runRaceDetailInfo.getEnd_time(), "yyyy.MM.dd"));
         }
@@ -195,12 +195,6 @@ public class CollRunRaceDetailFragmentView implements MvpView, SensorEventListen
             GlideApp.with(getContext()).load(runRaceDetailInfo.getRoadmap()).into(fragment.binding.includeStreetIntroduce.ivRoadMao);
         }
-        //开始按钮点击事件(用户进行滑动滑动)
-        fragment.binding.rlScrollViewStartBtn.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-            }
-        });
         //添加轨迹按钮点击事件
         fragment.binding.btnAddTrace.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -7,6 +7,7 @@ import android.graphics.BitmapFactory;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
+import android.view.ViewTreeObserver;
 import android.widget.LinearLayout;
 import com.alibaba.android.arouter.launcher.ARouter;
@@ -210,15 +211,25 @@ public class OnGoingFragmentView implements MvpView {
                 //设置围栏ID
                 CommonInfo.setFenceId(getContext(), Integer.parseInt(runRaceDetailInfo.getFenceId()));
             }
+            fragment.binding.slidingLayout.setPanelHeight(ScreenUtil.dip2px(getContext(), 140));
             //设置标题
             if (!TextUtils.isEmpty(runRaceDetailInfo.getTitle())) {
                 fragment.binding.includeStreet.tvRaceTitle.setText(runRaceDetailInfo.getTitle());
-                //根据标题字数动态设置卡片高度
-                if (runRaceDetailInfo.getTitle().length() > 19) {
-                    fragment.binding.slidingLayout.setPanelHeight(ScreenUtil.dip2px(getContext(), 162));
-                } else {
-                    fragment.binding.slidingLayout.setPanelHeight(ScreenUtil.dip2px(getContext(), 140));
-                }
+                //根据标题行数,自动调整卡片大小
+                fragment.binding.includeStreet.tvRaceTitle.getViewTreeObserver().addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener() {
+                    @Override
+                    public boolean onPreDraw() {
+                        int line = fragment.binding.includeStreet.tvRaceTitle.getLineCount();
+                        int height = fragment.binding.includeStreet.tvRaceTitle.getHeight();
+                        if (line > 1) {
+                            int avgHeight = height / line;//平局高度
+                            fragment.binding.slidingLayout.setPanelHeight(ScreenUtil.dip2px(getContext(), 140) + avgHeight * (line - 1));
+
+                        }
+                        fragment.binding.includeStreet.tvRaceTitle.getViewTreeObserver().removeOnPreDrawListener(this);
+                        return false;
+                    }
+                });
                 fragment.binding.slidingLayout.setPanelState(SlidingUpPanelLayout.PanelState.COLLAPSED);
             }
             //设置活动地点
@@ -8,13 +8,11 @@ import android.hardware.Sensor;
 import android.hardware.SensorEvent;
 import android.hardware.SensorEventListener;
 import android.hardware.SensorManager;
-import android.os.Handler;
 import android.os.SystemClock;
 import android.support.v4.content.ContextCompat;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
-import android.view.ViewGroup;
 import android.view.ViewTreeObserver;
 import android.widget.LinearLayout;
 import android.widget.Toast;
@@ -28,39 +26,18 @@ import com.baidu.mapapi.map.BaiduMap;
 import com.baidu.mapapi.map.BitmapDescriptor;
 import com.baidu.mapapi.map.BitmapDescriptorFactory;
 import com.baidu.mapapi.map.MapStatus;
-import com.baidu.mapapi.map.MapStatusUpdate;
 import com.baidu.mapapi.map.MapStatusUpdateFactory;
 import com.baidu.mapapi.map.MapView;
 import com.baidu.mapapi.map.MarkerOptions;
 import com.baidu.mapapi.map.MyLocationConfiguration;
 import com.baidu.mapapi.map.MyLocationData;
-import com.baidu.mapapi.map.Overlay;
-import com.baidu.mapapi.map.OverlayOptions;
-import com.baidu.mapapi.map.PolylineOptions;
 import com.baidu.mapapi.map.UiSettings;
 import com.baidu.mapapi.model.LatLng;
-import com.baidu.mapapi.model.LatLngBounds;
-import com.baidu.mapapi.search.core.SearchResult;
-import com.baidu.mapapi.search.route.BikingRouteResult;
-import com.baidu.mapapi.search.route.DrivingRouteResult;
-import com.baidu.mapapi.search.route.IndoorRouteResult;
-import com.baidu.mapapi.search.route.MassTransitRouteResult;
-import com.baidu.mapapi.search.route.OnGetRoutePlanResultListener;
-import com.baidu.mapapi.search.route.PlanNode;
 import com.baidu.mapapi.search.route.RoutePlanSearch;
-import com.baidu.mapapi.search.route.TransitRouteResult;
-import com.baidu.mapapi.search.route.WalkingRoutePlanOption;
-import com.baidu.mapapi.search.route.WalkingRouteResult;
 import com.baidu.mapapi.utils.DistanceUtil;
 import com.baidu.trace.LBSTraceClient;
-import com.baidu.trace.Trace;
-import com.baidu.trace.model.LocationMode;
 import com.baidu.trace.model.SortType;
-import com.cnlive.libs.base.logic.Event;
-import com.cnlive.libs.base.logic.callback.FailureCallback;
-import com.cnlive.libs.base.logic.callback.SuccessCallback;
 import com.cnlive.libs.base.util.StatusBarUtil2;
-import com.cnlive.moudle.pedometer.commonInfo.CollCommonInfo;
 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.model.Constant;
 import com.cnlive.moudle.pedometer.net.bean.RunRaceDetailInfo;
@@ -74,7 +51,6 @@ import com.cnlive.moudle.pedometer.ui.activity.TakePartActivity;
 import com.cnlive.moudle.pedometer.ui.fragment.RunRaceDetailFragment;
 import com.cnlive.moudle.pedometer.ui.widget.SelectDialog;
 import com.cnlive.moudle.pedometer.ui.widget.TipDialog;
-import com.cnlive.moudle.pedometer.upload.UploadLogic;
 import com.cnlive.moudle.pedometer.utils.BitmapUtil;
 import com.cnlive.moudle.pedometer.utils.GsonUtil;
 import com.cnlive.moudle.pedometer.utils.MyMapUtil;
@@ -89,13 +65,7 @@ import com.hannesdorfmann.mosby3.mvp.MvpView;
 import com.qmuiteam.qmui.util.QMUIStatusBarHelper;
 import com.sothree.slidinguppanel.SlidingUpPanelLayout;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.LineNumberReader;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Date;
-import java.util.LinkedList;
 import java.util.List;
 public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
@@ -353,20 +323,30 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
         //设置标题
         if (!TextUtils.isEmpty(runRaceDetailInfo.getTitle())) {
             fragment.binding.includeStreet.tvRaceTitle.setText(runRaceDetailInfo.getTitle());
-             fragment.binding.includeStreet.tvRaceTitle.getViewTreeObserver().addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener() {
-                 @Override
-                 public boolean onPreDraw() {
-                     Log.e(TAG, "initView: "+ fragment.binding.includeStreet.tvRaceTitle.getLineCount() );
-                     fragment.binding.includeStreet.tvRaceTitle.getViewTreeObserver().removeOnPreDrawListener(this);
-                     return false;
-                 }
-             });
-            //根据标题字数动态设置卡片高度
-            if (runRaceDetailInfo.getTitle().length() > 19) {
-                fragment.binding.slidingLayout.setPanelHeight(ScreenUtil.dip2px(getContext(), 200));
-            } else {
-                fragment.binding.slidingLayout.setPanelHeight(ScreenUtil.dip2px(getContext(), 181));
-            }
+            fragment.binding.includeStreet.tvRaceTitle.getViewTreeObserver().addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener() {
+                @Override
+                public boolean onPreDraw() {
+                    Log.e(TAG, "initView: " + fragment.binding.includeStreet.tvRaceTitle.getLineCount());
+                    fragment.binding.includeStreet.tvRaceTitle.getViewTreeObserver().removeOnPreDrawListener(this);
+                    return false;
+                }
+            });
+            fragment.binding.slidingLayout.setPanelHeight(ScreenUtil.dip2px(getContext(), 181) );
+            //根据标题行数,自动调整卡片大小
+            fragment.binding.includeStreet.tvRaceTitle.getViewTreeObserver().addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener() {
+                @Override
+                public boolean onPreDraw() {
+                    int line = fragment.binding.includeStreet.tvRaceTitle.getLineCount();
+                    int height = fragment.binding.includeStreet.tvRaceTitle.getHeight();
+                    if (line > 1) {
+                        int avgHeight = height / line;//平局高度
+                        fragment.binding.slidingLayout.setPanelHeight(ScreenUtil.dip2px(getContext(), 181) + avgHeight * (line - 1));
+
+                    }
+                    fragment.binding.includeStreet.tvRaceTitle.getViewTreeObserver().removeOnPreDrawListener(this);
+                    return false;
+                }
+            });
             fragment.binding.slidingLayout.setPanelState(SlidingUpPanelLayout.PanelState.COLLAPSED);
         }
         //设置活动地点
@@ -1056,6 +1036,57 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
             fragment.binding.tvRunNow.setText("立即开始");
             fragment.binding.rlScrollViewStartBtn.setTag("1");
         }
+        //判断赛事是否已经结束
+        checkTheRaceIsEnd();
+
+    }
+
+    /**
+     * 判断赛事是否已经结束
+     */
+    private void checkTheRaceIsEnd() {
+        //判断赛事是否结束
+        if (null != userStepEntity) {
+            if (null != runRaceDetailInfo) {
+                //判断赛事id是否一致
+                if (!TextUtils.isEmpty(userStepEntity.getStreetId())) {
+                    if (userStepEntity.getStreetId().equals(CommonInfo.getStreetId(getContext()))) {
+                        //判断赛事是否结束
+                        if (runRaceDetailInfo.isEndState()) {
+                            //结束清除数据
+                            //清空上次保存数据
+                            StepUtil.clearRunData(getContext(), CommonInfo.getUserId(getContext()));
+                            //停止服务
+                            stopStepService();
+                            //清除数据
+                            CommonInfo.resetRace(getContext());
+                            //设置按钮状态
+                            fragment.binding.rlScrollViewStartBtn.setTag("3");
+                            fragment.binding.rlScrollViewStartBtn.setBackgroundColor(getContext().getResources().getColor(R.color.red_round));
+                            fragment.binding.tvRunNow.setText("赛事已结束");
+                            fragment.binding.tvGoTip.setVisibility(View.GONE);
+                        }
+                    }
+                }
+            }
+        } else {
+            //如果数据库中没有数据,即,用户在当前赛事已经结束
+            if (null != runRaceDetailInfo) {
+                if (runRaceDetailInfo.isEndState()) {
+                    //设置按钮状态
+                    fragment.binding.rlScrollViewStartBtn.setTag("3");
+                    fragment.binding.rlScrollViewStartBtn.setBackgroundColor(getContext().getResources().getColor(R.color.red_round));
+                    fragment.binding.tvRunNow.setText("赛事已结束");
+                    fragment.binding.tvGoTip.setVisibility(View.GONE);
+                }
+            }
+        }
+    }
+
+    /**
+     * 赛事已经结束
+     */
+    private void raceHasEnd() {
     }
@@ -87,6 +87,15 @@ public class RunRaceDetailInfo implements Serializable {
     private List<String> faceUrl;
     private List<String> finishFaceUrl;
     private String endLatLng;//终点坐标,后加的,不是后台返回,这是从百度历史轨迹查出来的
+    private boolean endState;//活动是否结束(true 结束 false 未结束 )
+
+    public boolean isEndState() {
+        return endState;
+    }
+
+    public void setEndState(boolean endState) {
+        this.endState = endState;
+    }
     public String getEndLatLng() {
         return endLatLng;
@@ -331,7 +331,7 @@ public class MyMapUtil {
      */
     public static Overlay drawRealTimeTrack(Context context, BaiduMap baiduMap, List<LatLng> points, SortType sortType, int lineColor, int startIconRes) {
         // 绘制新覆盖物前，清空之前的覆盖物
-        if (points == null || points.size() == 0 || lineColor == 0 ) {
+        if (points == null || points.size() == 0 || lineColor == 0) {
             return null;
         }
         //只有一个点
@@ -378,114 +378,120 @@ public class MyMapUtil {
      * 绘制服务器传过来的轨迹
      */
     public static List<Overlay> drawServerLineTrack(Context context, BaiduMap baiduMap, List<LatLng> points, SortType sortType, int lineColor, int startIconRes, int endIconRes) {
-        // 绘制新覆盖物前，清空之前的覆盖物
-        if (points == null || points.size() == 0) {
-            return null;
-        }
-        List<Overlay> resultOverlays = new ArrayList<>();
-        //只有一个点
-        if (points.size() == 1) {
-            Bitmap pointBitmap = BitmapUtil.getBitmapFromDp(context, BitmapFactory.decodeResource(context.getResources(), startIconRes), 24, 30);
-            OverlayOptions startOptions = null;
-            if (pointBitmap != null) {
-                startOptions = new MarkerOptions().position(points.get(0)).icon(BitmapDescriptorFactory.fromBitmap(pointBitmap));
-                if (startOptions != null) {
-                    resultOverlays.add(baiduMap.addOverlay(startOptions));
+        try {
+            // 绘制新覆盖物前，清空之前的覆盖物
+            if (points == null || points.size() == 0) {
+                return null;
+            }
+            List<Overlay> resultOverlays = new ArrayList<>();
+            //只有一个点
+            if (points.size() == 1) {
+                Bitmap pointBitmap = BitmapUtil.getBitmapFromDp(context, BitmapFactory.decodeResource(context.getResources(), startIconRes), 24, 30);
+                OverlayOptions startOptions = null;
+                if (pointBitmap != null) {
+                    startOptions = new MarkerOptions().position(points.get(0)).icon(BitmapDescriptorFactory.fromBitmap(pointBitmap));
+                    if (startOptions != null) {
+                        resultOverlays.add(baiduMap.addOverlay(startOptions));
+                    }
+                    return resultOverlays;
                 }
-                return resultOverlays;
             }
-        }
-        LatLng startPoint;
-        LatLng endPoint;
-        if (sortType == SortType.asc) {
-            startPoint = points.get(0);
-            endPoint = points.get(points.size() - 1);
-        } else {
-            startPoint = points.get(points.size() - 1);
-            endPoint = points.get(0);
-        }
-        // 添加起点图标
-        Bitmap startPointBitmap = null;
-        if (null != context.getResources()) {
-            startPointBitmap = BitmapUtil.getBitmapFromDp(context, BitmapFactory.decodeResource(context.getResources(), startIconRes), 24, 30);
-        }
-        OverlayOptions startOptions = null;
-        if (startPointBitmap != null) {
-            startOptions = new MarkerOptions()
-                    .position(startPoint)
-                    .icon(BitmapDescriptorFactory.fromBitmap(startPointBitmap))
-                    .perspective(false)
-                    .animateType(MarkerOptions.MarkerAnimateType.grow);
-        }
-        // 添加终点图标
-        Bitmap endPointBitmap = BitmapUtil.getBitmapFromDp(context, BitmapFactory.decodeResource(context.getResources(), endIconRes), 24, 30);
-        OverlayOptions endOptions = null;
-        if (endPointBitmap != null) {
-            endOptions = new MarkerOptions()
-                    .position(endPoint)
-                    .icon(BitmapDescriptorFactory.fromBitmap(endPointBitmap))
-                    .perspective(false)
-                    .anchor(0.6f, 0.96f)
-                    .animateType(MarkerOptions.MarkerAnimateType.grow);
-        }
-        // 添加圆形范围
-        Bitmap startCircleBitmap = BitmapUtil.getBitmapFromDp(context, BitmapFactory.decodeResource(context.getResources(), R.drawable.circle_point_raduis), 60, 60);
-        OverlayOptions startCircleOptions = null;
-        OverlayOptions endCircleOptions = null;
-        if (startCircleBitmap != null) {
-            startCircleOptions = new MarkerOptions()
-                    .position(startPoint)
-                    .icon(BitmapDescriptorFactory.fromBitmap(startCircleBitmap))
-                    .perspective(false)
-                    .anchor(0.5f, 0.6f)
-                    .animateType(MarkerOptions.MarkerAnimateType.grow);
-
-            endCircleOptions = new MarkerOptions()
-                    .position(endPoint)
-                    .icon(BitmapDescriptorFactory.fromBitmap(startCircleBitmap))
-                    .perspective(false)
-                    .anchor(0.5f, 0.6f)
-                    .animateType(MarkerOptions.MarkerAnimateType.grow);
-        }
-        // 添加路线（轨迹）
-        OverlayOptions polylineOptions = null;
-        if (points != null && points.size() > 1) {
-            polylineOptions = new PolylineOptions().width(10)
-                    .color(context.getResources().getColor(lineColor)).points(points);
-        }
-        if (endCircleOptions != null) {
-            resultOverlays.add(baiduMap.addOverlay(endCircleOptions));
-        }
-        if (startCircleOptions != null) {
-            resultOverlays.add(baiduMap.addOverlay(startCircleOptions));
-        }
-        if (startOptions != null) {
-            resultOverlays.add(baiduMap.addOverlay(startOptions));
+            LatLng startPoint;
+            LatLng endPoint;
+            if (sortType == SortType.asc) {
+                startPoint = points.get(0);
+                endPoint = points.get(points.size() - 1);
+            } else {
+                startPoint = points.get(points.size() - 1);
+                endPoint = points.get(0);
+            }
+            // 添加起点图标
+            Bitmap startPointBitmap = null;
+            if (null != context.getResources()) {
+                startPointBitmap = BitmapUtil.getBitmapFromDp(context, BitmapFactory.decodeResource(context.getResources(), startIconRes), 24, 30);
+            }
+            OverlayOptions startOptions = null;
+            if (startPointBitmap != null) {
+                startOptions = new MarkerOptions()
+                        .position(startPoint)
+                        .icon(BitmapDescriptorFactory.fromBitmap(startPointBitmap))
+                        .perspective(false)
+                        .animateType(MarkerOptions.MarkerAnimateType.grow);
+            }
+            // 添加终点图标
+            Bitmap endPointBitmap = BitmapUtil.getBitmapFromDp(context, BitmapFactory.decodeResource(context.getResources(), endIconRes), 24, 30);
+            OverlayOptions endOptions = null;
+            if (endPointBitmap != null) {
+                endOptions = new MarkerOptions()
+                        .position(endPoint)
+                        .icon(BitmapDescriptorFactory.fromBitmap(endPointBitmap))
+                        .perspective(false)
+                        .anchor(0.6f, 0.96f)
+                        .animateType(MarkerOptions.MarkerAnimateType.grow);
+            }
+            // 添加圆形范围
+            Bitmap startCircleBitmap = BitmapUtil.getBitmapFromDp(context, BitmapFactory.decodeResource(context.getResources(), R.drawable.circle_point_raduis), 60, 60);
+            OverlayOptions startCircleOptions = null;
+            OverlayOptions endCircleOptions = null;
+            if (startCircleBitmap != null) {
+                startCircleOptions = new MarkerOptions()
+                        .position(startPoint)
+                        .icon(BitmapDescriptorFactory.fromBitmap(startCircleBitmap))
+                        .perspective(false)
+                        .anchor(0.5f, 0.6f)
+                        .animateType(MarkerOptions.MarkerAnimateType.grow);
+
+                endCircleOptions = new MarkerOptions()
+                        .position(endPoint)
+                        .icon(BitmapDescriptorFactory.fromBitmap(startCircleBitmap))
+                        .perspective(false)
+                        .anchor(0.5f, 0.6f)
+                        .animateType(MarkerOptions.MarkerAnimateType.grow);
+            }
+            // 添加路线（轨迹）
+            OverlayOptions polylineOptions = null;
+            if (points != null && points.size() > 1) {
+                polylineOptions = new PolylineOptions().width(10)
+                        .color(context.getResources().getColor(lineColor)).points(points);
+            }
+            if (endCircleOptions != null) {
+                resultOverlays.add(baiduMap.addOverlay(endCircleOptions));
+            }
+            if (startCircleOptions != null) {
+                resultOverlays.add(baiduMap.addOverlay(startCircleOptions));
+            }
+            if (startOptions != null) {
+                resultOverlays.add(baiduMap.addOverlay(startOptions));
-        }
-        if (endOptions != null) {
-            resultOverlays.add(baiduMap.addOverlay(endOptions));
-        }
-        if (polylineOptions != null) {
-            resultOverlays.add(baiduMap.addOverlay(polylineOptions));
+            }
+            if (endOptions != null) {
+                resultOverlays.add(baiduMap.addOverlay(endOptions));
+            }
+            if (polylineOptions != null) {
+                resultOverlays.add(baiduMap.addOverlay(polylineOptions));
-        }
-        if (resultOverlays != null) {
-            return resultOverlays;
-        } else {
+            }
+            if (resultOverlays != null) {
+                return resultOverlays;
+            } else {
+                return null;
+            }
+        } catch (Exception e) {
             return null;
         }
     }
-    public static Overlay drawMapLine(Context context, BaiduMap baiduMap, List<LatLng> points, int lineColor) {
+    public static Overlay drawMapLine(Context context, BaiduMap
+            baiduMap, List<LatLng> points, int lineColor) {
         OverlayOptions polylineOptions = new PolylineOptions().width(10)
                 .color(context.getResources().getColor(lineColor)).points(points);
         return baiduMap.addOverlay(polylineOptions);
     }
-    public static Overlay drawMapLineRoutePoint(Context context, BaiduMap baiduMap, List<RoutePoint> points, int lineColor) {
+    public static Overlay drawMapLineRoutePoint(Context context, BaiduMap
+            baiduMap, List<RoutePoint> points, int lineColor) {
         List<LatLng> latLngs = new ArrayList<>();
         for (RoutePoint routePoint : points) {
             if (routePoint != null && routePoint.getLat() != 0 && routePoint.getLng() != 0) {
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="100dp" />
+    <stroke
+        android:width="1dp"
+        android:color="@color/green_round" />
+    <solid android:color="@color/black_20" />
+</shape>
 \ No newline at end of file
@@ -48,12 +48,15 @@
                 <Button
                     android:id="@+id/btn_add_trace"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:layout_width="90dp"
+                    android:layout_height="35dp"
                     android:layout_gravity="center"
                     android:layout_marginBottom="100dp"
+                    android:background="@drawable/shape_circle_30_btn_black_green"
                     android:text="@string/layout_collect_bind_trace"
-                    android:textSize="15sp" />
+                    android:textColor="@color/green_round"
+                    android:textSize="15sp"
+                    android:textStyle="bold" />
                 <!---->
                 <com.cnlive.strike.ui.widget.UIEmptyView
                     android:id="@+id/empty_layout"
@@ -71,6 +74,7 @@
             android:id="@+id/dragView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:background="@drawable/shape_left_right_10dp_white_raduis_bg"
             android:clickable="false"
             android:focusable="false">
@@ -92,7 +96,7 @@
                     <!---->
                     <View
                         android:layout_width="match_parent"
-                        android:layout_height="20dp"
+                        android:layout_height="10dp"
                         android:background="#F4F4F4" />
                     <!--路线介绍-->
                     <include
@@ -101,27 +105,6 @@
                 </LinearLayout>
             </ScrollView>
-            <!--按钮-->
-            <RelativeLayout
-                android:id="@+id/rl_scrollView_startBtn"
-                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" />
-
-
-            </RelativeLayout>
         </FrameLayout>
     </com.sothree.slidinguppanel.SlidingUpPanelLayout>
@@ -22,7 +22,6 @@
                     android:id="@+id/ll_first_panel_root"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:background="@drawable/shape_left_right_10dp_white_raduis_bg"
                     android:orientation="vertical">
                     <!--活动标题-->
                     <TextView
@@ -76,6 +75,15 @@
                     </LinearLayout>
                 </LinearLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:layout_marginLeft="35dp"
+                    android:layout_marginTop="-5dp"
+                    android:layout_marginRight="35dp"
+                    android:layout_marginBottom="5dp"
+                    android:background="@color/line" />
             </LinearLayout>
             <!---->
             <LinearLayout
@@ -92,8 +100,8 @@
                     android:gravity="center_vertical">
                     <View
-                        android:layout_width="10dp"
-                        android:layout_height="10dp"
+                        android:layout_width="6dp"
+                        android:layout_height="6dp"
                         android:layout_marginLeft="25dp"
                         android:background="@drawable/shape_circle_green" />
@@ -114,6 +122,14 @@
                         android:textColor="@color/text_black"
                         android:textSize="15sp" />
                 </LinearLayout>
+                <!--竖线-->
+                <View
+                    android:layout_width="1dp"
+                    android:layout_height="20dp"
+                    android:layout_marginLeft="37dp"
+                    android:layout_marginTop="-3dp"
+                    android:layout_marginBottom="-13dp"
+                    android:background="@color/vertical_line" />
                 <!--终点-->
                 <LinearLayout
                     android:id="@+id/ll_end_point"
@@ -124,8 +140,8 @@
                     android:gravity="center_vertical">
                     <View
-                        android:layout_width="10dp"
-                        android:layout_height="10dp"
+                        android:layout_width="6dp"
+                        android:layout_height="6dp"
                         android:layout_marginLeft="25dp"
                         android:background="@drawable/shape_circle_red" />
@@ -189,7 +205,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="match_parent"
                         android:layout_marginLeft="5dp"
-                        android:text="——"
+                        android:text="一"
                         android:textColor="@color/text_black"
                         android:textSize="15sp" />
@@ -206,9 +222,9 @@
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="1dp"
-                    android:layout_marginLeft="10dp"
+                    android:layout_marginLeft="35dp"
                     android:layout_marginTop="5dp"
-                    android:layout_marginRight="10dp"
+                    android:layout_marginRight="35dp"
                     android:background="@color/line" />
                 <!--活动时间-->
                 <LinearLayout
@@ -251,7 +267,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="match_parent"
                         android:layout_marginLeft="5dp"
-                        android:text="——"
+                        android:text="一"
                         android:textColor="@color/text_black"
                         android:textSize="15sp" />
@@ -268,9 +284,9 @@
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="1dp"
-                    android:layout_marginLeft="10dp"
+                    android:layout_marginLeft="35dp"
                     android:layout_marginTop="5dp"
-                    android:layout_marginRight="10dp"
+                    android:layout_marginRight="35dp"
                     android:background="@color/line" />
                 <!--活动类型-->
                 <LinearLayout
@@ -311,6 +327,15 @@
                         android:textStyle="bold" />
                 </LinearLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:layout_marginLeft="35dp"
+                    android:layout_marginTop="5dp"
+                    android:layout_marginRight="35dp"
+                    android:layout_marginBottom="15dp"
+                    android:background="@color/line" />
             </LinearLayout>
             <!---->
         </LinearLayout>
@@ -20,6 +20,7 @@
     <color name="black_50">#80000000</color>
     <color name="black_20">#33000000</color>
+
     <color name="white_50">#80FFFFFF</color>
     <color name="green">#23D026</color>