1 路径工具,数据上传逻辑

杨帅
1 parent 05f9cba9
Showing 14 changed files with 695 additions and 64 deletions
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/presenter/CollRunningFinishFragmetPresenter.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/CollRunningFinishFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/CollRunningMapFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/activity/CollPedometerMainActivity.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/activity/StartCollectTraceActivity.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/adapter/CollFinishDetaiAdapter.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/fragment/CollRunRaceDetailFragment.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/utils/CollStepUtil.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/model/Constant.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/net/ApiServiceRunLin.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/sql/dao/CollUserStepEntityDao.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/sql/entity/CollUserStepEntity.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/utils/MyMapUtil.java
moudle_pedometer/src/main/res/layout/fragment_coll_finish_run_map.xml
 package com.cnlive.moudle.collectionTrace.frame.presenter;
+import android.app.Activity;
+import android.os.Handler;
+import android.text.TextUtils;
+import android.util.Log;
+
+import com.baidu.mapapi.map.Overlay;
+import com.baidu.mapapi.model.LatLng;
+import com.cnlive.libs.base.logic.Logic;
+import com.cnlive.libs.base.logic.callback.DataCallback;
+import com.cnlive.libs.base.logic.callback.FailureCallback;
+import com.cnlive.libs.base.logic.callback.SuccessCallback;
+import com.cnlive.moudle.collectionTrace.commonInfo.CollCommonInfo;
 import com.cnlive.moudle.collectionTrace.frame.view.CollRunningFinishFragmentView;
+import com.cnlive.moudle.collectionTrace.model.CollectPoint;
+import com.cnlive.moudle.collectionTrace.utils.CollStepUtil;
+import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
+import com.cnlive.moudle.pedometer.net.ApiServiceRunLin;
+import com.cnlive.moudle.pedometer.net.SubscriptionRequest;
+import com.cnlive.moudle.pedometer.net.bean.BaseInfo;
+import com.cnlive.moudle.pedometer.sql.entity.CollUserStepEntity;
+import com.cnlive.moudle.pedometer.sql.entity.FailedEntity;
+import com.cnlive.moudle.pedometer.ui.activity.LineUpAgainActivity;
+import com.cnlive.moudle.pedometer.ui.widget.SelectDialog;
+import com.cnlive.moudle.pedometer.utils.GsonUtil;
+import com.cnlive.moudle.pedometer.utils.MyMapUtil;
+import com.cnlive.moudle.pedometer.utils.QMUITipDialogUtil;
+import com.cnlive.moudle.pedometer.utils.StepUtil;
+import com.example.moudle_pedometer.R;
 import com.hannesdorfmann.mosby3.mvp.MvpBasePresenter;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import io.reactivex.disposables.Disposable;
+
 public class CollRunningFinishFragmetPresenter extends MvpBasePresenter<CollRunningFinishFragmentView> {
+
+    public void uploadTraceDateToServer(Activity context, CollUserStepEntity userStepEntity, String roadmap) {
+        QMUITipDialogUtil.loadingDialog(context, "正在上传数据", false);
+        Map<String, String> paramsMap = new HashMap<>();
+        //赛事id
+        if (!TextUtils.isEmpty(userStepEntity.getStreetId())) {
+            String eventId = userStepEntity.getStreetId();
+            paramsMap.put("eventId", eventId);
+        }
+        //踩点图
+        if (!TextUtils.isEmpty(roadmap)) {
+            paramsMap.put("roadmap", roadmap);
+        }
+        //运营人员sid
+        paramsMap.put("darenId", CollCommonInfo.getUserId(context));
+        if (!TextUtils.isEmpty(userStepEntity.getImportPoint())) {
+            List<CollectPoint> collectPoints = GsonUtil.jsonToList(userStepEntity.getImportPoint(), CollectPoint.class);
+            //绘制运营打的点
+            if (null != collectPoints) {
+                //根据打点集合,自适应缩放
+                CollectPoint startPoint = null;
+                if (!TextUtils.isEmpty(userStepEntity.getCollStartPointData())) {
+                    startPoint = GsonUtil.GsonToBean(userStepEntity.getCollStartPointData(), CollectPoint.class);
+                }
+                CollectPoint endPoint = null;
+                if (!TextUtils.isEmpty(userStepEntity.getCollEndPointData())) {
+                    endPoint = GsonUtil.GsonToBean(userStepEntity.getCollEndPointData(), CollectPoint.class);
+                }
+                if (null != startPoint) {
+                    collectPoints.add(0, startPoint);
+                    //起点
+                    paramsMap.put("startLocation", startPoint.getPointName());
+                }
+                if (null != endPoint) {
+                    collectPoints.add(endPoint);
+                    // 终点
+                    paramsMap.put("endLocation", endPoint.getPointName());
+
+                }
+                // 经纬度
+                paramsMap.put("latLongitude", GsonUtil.GsonString(collectPoints));
+            }
+        }
+        //全程里数        mileage
+        if (!TextUtils.isEmpty(userStepEntity.getStepCount())) {
+            double mileage = CollStepUtil.getWalkDistanceKM(Long.parseLong(userStepEntity.getStepCount()));
+            paramsMap.put("mileage", mileage + "");
+        }
+        //开始时间
+        if (0 != userStepEntity.getStartTimeStamp()) {
+            paramsMap.put("startTime", userStepEntity.getStartTimeStamp() + "");
+        }
+        //结束时间
+        if (0 != userStepEntity.getFinishTimeStamp()) {
+            paramsMap.put("endTime", userStepEntity.getFinishTimeStamp() + "");
+        }
+        //实体名称
+        paramsMap.put("entityName", CollCommonInfo.getUserId(context));
+
+        Logic.create(paramsMap).action(new Logic.Action<Map<String, String>, BaseInfo>() {
+            @Override
+            public Disposable action(Map<String, String> stringStringMap, DataCallback<BaseInfo> dataCallback) {
+                return SubscriptionRequest.service(ApiServiceRunLin.class, api -> api.collSaveShoeLine(stringStringMap)).subscribe(context, dataCallback);
+            }
+        }).<BaseInfo>event()
+                .setFailureCallback(new FailureCallback() {
+                    @Override
+                    public void onFailure(int code, String message) {
+                        if (getView() == null) {
+                            return;
+                        }
+                        QMUITipDialogUtil.dismessDialog();
+                        SelectDialog selectDialog = new SelectDialog(context, "数据上传失败,是否重试?", "取消", new SelectDialog.DialogInterface() {
+                            @Override
+                            public void onClick(SelectDialog dialog) {
+                                dialog.dismiss();
+                            }
+                        }, "重试", new SelectDialog.DialogInterface() {
+                            @Override
+                            public void onClick(SelectDialog dialog) {
+                                dialog.dismiss();
+                                uploadTraceDateToServer(context, userStepEntity, roadmap);
+                            }
+                        });
+                        selectDialog.setCancelable(false);
+                        selectDialog.setCanceledOnTouchOutside(false);
+                        if (!selectDialog.isShowing()) {
+                            selectDialog.show();
+                        }
+                    }
+                }).setSuccessCallback(new SuccessCallback<BaseInfo>() {
+            @Override
+            public void onSuccess(BaseInfo baseInfo) {
+                if (getView() == null) {
+                    return;
+                }
+                QMUITipDialogUtil.dismessDialog();
+                QMUITipDialogUtil.successDialog(context, "数据上传成功", 1);
+                //清空数据
+                CollStepUtil.clearRunData(context, CollCommonInfo.getUserId(context));
+                CollCommonInfo.reset(context);
+                new Handler().postDelayed(new Runnable() {
+                    @Override
+                    public void run() {
+                        if (null != context) {
+                            context.finish();
+                        }
+                    }
+                }, 1000);
+            }
+        }).start();
+    }
 }
@@ -3,9 +3,13 @@ package com.cnlive.moudle.collectionTrace.frame.view;
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
+import android.os.Handler;
 import android.support.v7.widget.LinearLayoutManager;
 import android.text.TextUtils;
+import android.util.Log;
+import android.view.MotionEvent;
 import android.view.View;
+import android.widget.Toast;
 import com.baidu.location.LocationClient;
 import com.baidu.location.LocationClientOption;
@@ -17,27 +21,55 @@ import com.baidu.mapapi.map.Overlay;
 import com.baidu.mapapi.map.UiSettings;
 import com.baidu.mapapi.model.LatLng;
 import com.baidu.trace.LBSTraceClient;
+import com.baidu.trace.api.fence.AddMonitoredPersonResponse;
+import com.baidu.trace.api.fence.CreateFenceRequest;
+import com.baidu.trace.api.fence.CreateFenceResponse;
+import com.baidu.trace.api.fence.DeleteFenceResponse;
+import com.baidu.trace.api.fence.DeleteMonitoredPersonResponse;
+import com.baidu.trace.api.fence.FenceListResponse;
+import com.baidu.trace.api.fence.HistoryAlarmResponse;
+import com.baidu.trace.api.fence.ListMonitoredPersonResponse;
+import com.baidu.trace.api.fence.MonitoredStatusByLocationResponse;
+import com.baidu.trace.api.fence.MonitoredStatusResponse;
+import com.baidu.trace.api.fence.OnFenceListener;
+import com.baidu.trace.api.fence.UpdateFenceResponse;
+import com.baidu.trace.model.CoordType;
 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.moudle.collectionTrace.commonInfo.CollCommonInfo;
 import com.cnlive.moudle.collectionTrace.model.CollectPoint;
 import com.cnlive.moudle.collectionTrace.ui.adapter.CollFinishDetaiAdapter;
 import com.cnlive.moudle.collectionTrace.ui.fragment.CollRunningFinishFragment;
 import com.cnlive.moudle.collectionTrace.utils.CollStepUtil;
 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
+import com.cnlive.moudle.pedometer.model.Constant;
 import com.cnlive.moudle.pedometer.model.RunningFinishBean;
 import com.cnlive.moudle.pedometer.sql.entity.CollUserStepEntity;
 import com.cnlive.moudle.pedometer.ui.fragment.RunningFinishFragment;
+import com.cnlive.moudle.pedometer.ui.widget.SelectDialog;
+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;
+import com.cnlive.moudle.pedometer.utils.QMUITipDialogUtil;
+import com.cnlive.moudle.pedometer.utils.ScreenUtil;
 import com.cnlive.moudle.pedometer.utils.TimeUtil;
 import com.cnlive.strike.application.GlideApp;
 import com.example.moudle_pedometer.R;
 import com.hannesdorfmann.mosby3.mvp.MvpView;
+import com.qmuiteam.qmui.widget.dialog.QMUITipDialog;
+import com.sothree.slidinguppanel.SlidingUpPanelLayout;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
-public class CollRunningFinishFragmentView implements MvpView {
+public class CollRunningFinishFragmentView implements MvpView, OnFenceListener {
     private CollRunningFinishFragment fragment;
     private CollFinishDetaiAdapter adapter;
     public BaiduMap baiduMap;
@@ -45,6 +77,9 @@ public class CollRunningFinishFragmentView implements MvpView {
     private UiSettings mUiSettings;
     private LBSTraceClient mClient = null;
     private List<Overlay> allMapOverlays;
+    private List<LatLng> queryResultPoints;
+    private List<com.baidu.trace.model.LatLng> collectLatLngs;
+    private CollUserStepEntity collUserStepEntity;
     public CollRunningFinishFragmentView(CollRunningFinishFragment fragment) {
         this.fragment = fragment;
@@ -55,21 +90,25 @@ public class CollRunningFinishFragmentView implements MvpView {
     }
     public void initView(CollUserStepEntity collUserStepEntity) {
+        this.collUserStepEntity = collUserStepEntity;
         allMapOverlays = new ArrayList<>();
+        //设置滑动卡片
+//        fragment.binding.slidingLayout.set
+        //添加起点
+        CollectPoint startPoint = null;
+        if (!TextUtils.isEmpty(collUserStepEntity.getCollStartPointData())) {
+            startPoint = GsonUtil.GsonToBean(collUserStepEntity.getCollStartPointData(), CollectPoint.class);
+        }
+        CollectPoint endPoint = null;
+        if (!TextUtils.isEmpty(collUserStepEntity.getCollEndPointData())) {
+            endPoint = GsonUtil.GsonToBean(collUserStepEntity.getCollEndPointData(), CollectPoint.class);
+        }
         //查询用户历史轨迹
         if (0 != collUserStepEntity.getStartTimeStamp() && 0 != collUserStepEntity.getFinishTimeStamp()) {
             long startTime = collUserStepEntity.getStartTimeStamp();
             long endTime = collUserStepEntity.getFinishTimeStamp();
             //开始查询
-            MyMapUtil.queryHistoryTrace(getContext(), mClient, CommonInfo.getUserId(getContext()), startTime, endTime, new MyMapUtil.CallBack() {
-                @Override
-                public void success(List<LatLng> resultPoints) {
-                    if (null != resultPoints && resultPoints.size() > 1) {
-                        //绘制轨迹
-                        MyMapUtil.drawHistoryTrack(getContext(), baiduMap, resultPoints, SortType.asc, R.color.green_round, R.drawable.icon_start, R.drawable.icon_end);
-                    }
-                }
-            });
+            queryWalkTrace(startTime, endTime);
             if (!TextUtils.isEmpty(collUserStepEntity.getImportPoint())) {
                 List<CollectPoint> collectPoints = GsonUtil.jsonToList(collUserStepEntity.getImportPoint(), CollectPoint.class);
                 //绘制运营打的点
@@ -114,15 +153,6 @@ public class CollRunningFinishFragmentView implements MvpView {
         //设置适配器
         if (!TextUtils.isEmpty(collUserStepEntity.getImportPoint())) {
             List<CollectPoint> collectPoints = GsonUtil.jsonToList(collUserStepEntity.getImportPoint(), CollectPoint.class);
-            //添加起点
-            CollectPoint startPoint = null;
-            if (!TextUtils.isEmpty(collUserStepEntity.getCollStartPointData())) {
-                startPoint = GsonUtil.GsonToBean(collUserStepEntity.getCollStartPointData(), CollectPoint.class);
-            }
-            CollectPoint endPoint = null;
-            if (!TextUtils.isEmpty(collUserStepEntity.getCollEndPointData())) {
-                endPoint = GsonUtil.GsonToBean(collUserStepEntity.getCollEndPointData(), CollectPoint.class);
-            }
             if (null == collectPoints) {
                 collectPoints = new ArrayList<>();
             }
@@ -132,7 +162,11 @@ public class CollRunningFinishFragmentView implements MvpView {
             if (null != endPoint) {
                 collectPoints.add(endPoint);
             }
-
+            //格式化打的点
+            collectLatLngs = new ArrayList<>();
+            for (CollectPoint collectPoint : collectPoints) {
+                collectLatLngs.add(new com.baidu.trace.model.LatLng(collectPoint.getLatitude(), collectPoint.getLongitude()));
+            }
             adapter = new CollFinishDetaiAdapter(fragment.getActivity(), collectPoints);
             //设置
             fragment.binding.includeFinishUserInfo.rvList.setLayoutManager(new LinearLayoutManager(fragment.getActivity()));
@@ -148,9 +182,262 @@ public class CollRunningFinishFragmentView implements MvpView {
                 fragment.getActivity().finish();
             }
         });
+        fragment.binding.rlScrollViewStartBtn.setOnTouchListener(new View.OnTouchListener() {
+            @Override
+            public boolean onTouch(View view, MotionEvent motionEvent) {
+                if (motionEvent.getAction() == MotionEvent.ACTION_DOWN) {
+                    //判断是否成功查询到轨迹点
+                    if (null == queryResultPoints) {
+                        QMUITipDialogUtil.textDialog(getContext(), "正在获取轨迹信息,请稍后...", 1);
+                    } else {
+                        //隐藏面板视图
+//                    fragment.binding.slidingLayout.setPanelState(SlidingUpPanelLayout.PanelState.HIDDEN);
+                        fragment.binding.slidingLayout.setPanelHeight(ScreenUtil.dip2px(getContext(), 100));
+                        fragment.binding.slidingLayout.setPanelState(SlidingUpPanelLayout.PanelState.COLLAPSED);
+                        //让运营选择最佳的截图
+                        SelectDialog selectDialog = new SelectDialog(getContext(), "当前赛事图是否\n已经调整到最佳效果?", "否", new SelectDialog.DialogInterface() {
+                            @Override
+                            public void onClick(SelectDialog dialog) {
+                                dialog.dismiss();
+                            }
+                        }, "是", new SelectDialog.DialogInterface() {
+                            @Override
+                            public void onClick(SelectDialog dialog) {
+                                if (null != allMapOverlays) {
+                                    for (Overlay overlay : allMapOverlays) {
+                                        overlay.remove();
+                                    }
+                                }
+                                dialog.dismiss();
+                                QMUITipDialogUtil.loadingDialog(getContext(), "正在截取赛事图片,请稍后", false);
+                                //延迟一秒进行截图,以免把打的点都截取到
+                                new Handler().postDelayed(new Runnable() {
+                                    @Override
+                                    public void run() {
+                                        if (null != collectLatLngs && collectLatLngs.size() > 1) {
+                                            getBaiDuSnap();
+                                        }
+                                    }
+                                }, 1000);
+                            }
+                        });
+                        selectDialog.setCanceledOnTouchOutside(false);
+                        selectDialog.setCancelable(false);
+                        selectDialog.show();
+                    }
+                }
+                return false;
+            }
+        });
+//        //确定轨迹按钮点击事件
+//        fragment.binding.rlScrollViewStartBtn.setOnClickListener(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View view) {
+//                Log.e("aaa", "onClick: ");
+//                //开始整合数据
+//                //判断是否成功查询到轨迹点
+//                if (null == queryResultPoints) {
+//                    QMUITipDialogUtil.textDialog(getContext(), "正在获取轨迹信息,请稍后...", 1);
+//                } else {
+//                    //隐藏面板视图
+////                    fragment.binding.slidingLayout.setPanelState(SlidingUpPanelLayout.PanelState.HIDDEN);
+//                    fragment.binding.slidingLayout.setPanelHeight(ScreenUtil.dip2px(getContext(),100));
+//                    fragment.binding.slidingLayout.setPanelState(SlidingUpPanelLayout.PanelState.COLLAPSED);
+//                    //让运营选择最佳的截图
+//                    SelectDialog selectDialog = new SelectDialog(getContext(), "当前赛事图是否\n已经调整到最佳效果?", "否", new SelectDialog.DialogInterface() {
+//                        @Override
+//                        public void onClick(SelectDialog dialog) {
+//                            dialog.dismiss();
+//                        }
+//                    }, "是", new SelectDialog.DialogInterface() {
+//                        @Override
+//                        public void onClick(SelectDialog dialog) {
+//                            if (null != allMapOverlays) {
+//                                for (Overlay overlay : allMapOverlays) {
+//                                    overlay.remove();
+//                                }
+//                            }
+//                            dialog.dismiss();
+//                            QMUITipDialogUtil.textDialog(getContext(), "正在截取赛事图片,请稍后", 1);
+//                            //延迟一秒进行截图,以免把打的点都截取到
+//                            new Handler().postDelayed(new Runnable() {
+//                                @Override
+//                                public void run() {
+//                                    baiduMap.snapshot(new BaiduMap.SnapshotReadyCallback() {
+//                                        @Override
+//                                        public void onSnapshotReady(Bitmap bitmap) {
+//                                            if (null == bitmap) {
+//                                                QMUITipDialogUtil.dismessDialog();
+//                                                QMUITipDialogUtil.failedDialog(getContext(), "赛事图片截取失败,请重试", 2);
+//                                                return;
+//                                            }
+//
+//                                            //开始保存截屏
+//                                            try {
+//                                                SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
+//                                                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();
+//                                                //获取保存截图地址
+////                                        image.getAbsolutePath()
+//                                            } catch (Exception e) {
+//                                                QMUITipDialogUtil.dismessDialog();
+//                                                QMUITipDialogUtil.failedDialog(getContext(), "赛事图片截取失败,请重试", 2);
+//                                                e.printStackTrace();
+//                                            }
+//                                        }
+//                                    });
+//                                }
+//                            }, 1000);
+//                        }
+//                    });
+//                    selectDialog.setCanceledOnTouchOutside(false);
+//                    selectDialog.setCancelable(false);
+//                    selectDialog.show();
+//                }
+//            }
+//        });
+
     }
+    private void queryWalkTrace(long startTime, long endTime) {
+        MyMapUtil.queryHistoryTrace(getContext(), mClient, CommonInfo.getUserId(getContext()), startTime, endTime, new MyMapUtil.CallBack() {
+            @Override
+            public void success(List<LatLng> resultPoints) {
+                queryResultPoints = resultPoints;
+                if (null != resultPoints) {
+                    //绘制轨迹
+                    MyMapUtil.drawHistoryTrack(getContext(), baiduMap, resultPoints, SortType.asc, R.color.green_round, R.drawable.icon_start, R.drawable.icon_end);
+                }else {
+                    SelectDialog selectDialog = new SelectDialog(getContext(), "轨迹获取失败,是否重试?", "取消", new SelectDialog.DialogInterface() {
+                        @Override
+                        public void onClick(SelectDialog dialog) {
+                            dialog.dismiss();
+                        }
+                    }, "重试", new SelectDialog.DialogInterface() {
+                        @Override
+                        public void onClick(SelectDialog dialog) {
+                            dialog.dismiss();
+                            queryWalkTrace(startTime,endTime);
+                        }
+                    });
+                    selectDialog.setCancelable(false);
+                    selectDialog.setCanceledOnTouchOutside(false);
+                    if (!selectDialog.isShowing()) {
+                        selectDialog.show();
+                    }
+                }
+            }
+        });
+    }
+
+    private void getBaiDuSnap() {
+        baiduMap.snapshot(new BaiduMap.SnapshotReadyCallback() {
+            @Override
+            public void onSnapshotReady(Bitmap bitmap) {
+                QMUITipDialogUtil.dismessDialog();
+                if (null == bitmap) {
+                    QMUITipDialogUtil.failedDialog(getContext(), "赛事图片截取失败,请重试", 2);
+                    return;
+                }
+                //开始保存截屏
+                try {
+                    SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
+                    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();
+                    //获取保存截图地址
+                    String roadMapPath = image.getAbsolutePath();
+                    //开始上传
+                    uploadRoadMapPic(roadMapPath);
+                } catch (Exception e) {
+                    QMUITipDialogUtil.dismessDialog();
+                    QMUITipDialogUtil.failedDialog(getContext(), "赛事图片截取失败,请重试", 2);
+                    e.printStackTrace();
+                }
+            }
+        });
+    }
+
+    /**
+     * 上传赛事图片
+     *
+     * @param roadMapPath
+     */
+    private void uploadRoadMapPic(String roadMapPath) {
+        if (!TextUtils.isEmpty(roadMapPath)) {
+            QMUITipDialogUtil.loadingDialog(getContext(), "正在上传赛事图片,请稍后", false);
+            List<String> imagePaths = new ArrayList<>();
+            imagePaths.add(roadMapPath);
+            UploadLogic.uploadAddressPicInfo(getContext(), imagePaths, new Event<String>()
+                    .setFailureCallback(new FailureCallback() {
+                        @Override
+                        public void onFailure(int i, String s) {
+                            QMUITipDialogUtil.dismessDialog();
+                            SelectDialog selectDialog = new SelectDialog(getContext(), "赛事图片上传失败,是否重试?", "取消", new SelectDialog.DialogInterface() {
+                                @Override
+                                public void onClick(SelectDialog dialog) {
+                                    dialog.dismiss();
+                                }
+                            }, "重试", new SelectDialog.DialogInterface() {
+                                @Override
+                                public void onClick(SelectDialog dialog) {
+                                    dialog.dismiss();
+                                    uploadRoadMapPic(roadMapPath);
+                                }
+                            });
+                            selectDialog.setCancelable(false);
+                            selectDialog.setCanceledOnTouchOutside(false);
+                            if (!selectDialog.isShowing()) {
+                                selectDialog.show();
+                            }
+
+                        }
+                    })
+                    .setSuccessCallback(new SuccessCallback<String>() {
+                        @Override
+                        public void onSuccess(String data) {
+                            QMUITipDialogUtil.dismessDialog();
+                            //开始把数据传到服务端
+                            collUserStepEntity = CollStepUtil.getCollUserStepData(getContext(), CollCommonInfo.getUserId(getContext()));
+                            if (null != fragment.getPresenter() || null == fragment.getActivity() || null == collUserStepEntity || TextUtils.isEmpty(data)) {
+                                fragment.getPresenter().uploadTraceDateToServer(fragment.getActivity(), collUserStepEntity, data);
+                            }
+                        }
+                    })
+            );
+            //
+        }
+    }
+    //    //判断地理围栏是否创建成功
+//                                        if (null != collUserStepEntity) {
+//        if (TextUtils.isEmpty(collUserStepEntity.getFenceId())) {
+//            //开始创建地理围栏
+//            QMUITipDialogUtil.loadingDialog(getContext(), "正在创建地理围栏", false);
+//            CreateFenceRequest createFenceRequest = null;
+//            int offset = Constant.FENCE_OFFSET;// 偏离距离
+//            int denoise = Constant.FENCE_DENOISE; //围栏去噪精度
+//            if (null != collUserStepEntity) {
+//                //赛事标题作为围栏名称
+//                String fenceName = collUserStepEntity.getStreetTitle();
+//                if (mClient != null && !TextUtils.isEmpty(fenceName) && null != collectLatLngs) {
+//                    if (createFenceRequest == null) {
+//                        createFenceRequest = CreateFenceRequest.buildServerPolylineRequest(Constant.TAG, Constant.SERVICE_ID, fenceName, "", collectLatLngs, offset, denoise, CoordType.gcj02);
+//                        mClient.createFence(createFenceRequest, CollRunningFinishFragmentView.this);
+//                    }
+//                }
+//            }
+//        } else {
+//            //已经存在地理围栏(直接将数据传给服务器)
+//
+//        }
+//    }
     public void initMap() {
         this.mMapView = fragment.binding.mapView;
         if (baiduMap == null) {
@@ -231,4 +518,79 @@ public class CollRunningFinishFragmentView implements MvpView {
             mMapView = null;
         }
     }
+
+    /**
+     * 常见围栏成功回调
+     *
+     * @param createFenceResponse
+     */
+    @Override
+    public void onCreateFenceCallback(CreateFenceResponse createFenceResponse) {
+        if (null == getContext() || null == createFenceResponse) {
+            return;
+        }
+        Log.e("地理围栏", "状态: " + createFenceResponse.getStatus() + ",返回信息:" + createFenceResponse.getMessage());
+        //关闭提示框
+        QMUITipDialogUtil.dismessDialog();
+        //判断是否成功
+        if (0 == createFenceResponse.getStatus()) {
+            //获取围栏id
+            long fenceId = createFenceResponse.getFenceId();
+            Log.e("地理围栏", "创建围栏成功ID: " + fenceId + ",围栏名称" + createFenceResponse.getFenceName());
+            //保存到数据库中
+            CollStepUtil.setFenceId(getContext(), CollCommonInfo.getUserId(getContext()), fenceId + "");
+            //提交到后台
+
+        } else {
+            //创建围栏失败
+            //创建提示信息
+            QMUITipDialogUtil.failedDialog(getContext(), createFenceResponse.getMessage(), 2);
+        }
+
+    }
+
+    @Override
+    public void onUpdateFenceCallback(UpdateFenceResponse updateFenceResponse) {
+
+    }
+
+    @Override
+    public void onDeleteFenceCallback(DeleteFenceResponse deleteFenceResponse) {
+
+    }
+
+    @Override
+    public void onFenceListCallback(FenceListResponse fenceListResponse) {
+
+    }
+
+    @Override
+    public void onMonitoredStatusCallback(MonitoredStatusResponse monitoredStatusResponse) {
+
+    }
+
+    @Override
+    public void onMonitoredStatusByLocationCallback(MonitoredStatusByLocationResponse monitoredStatusByLocationResponse) {
+
+    }
+
+    @Override
+    public void onHistoryAlarmCallback(HistoryAlarmResponse historyAlarmResponse) {
+
+    }
+
+    @Override
+    public void onAddMonitoredPersonCallback(AddMonitoredPersonResponse addMonitoredPersonResponse) {
+
+    }
+
+    @Override
+    public void onDeleteMonitoredPersonCallback(DeleteMonitoredPersonResponse deleteMonitoredPersonResponse) {
+
+    }
+
+    @Override
+    public void onListMonitoredPersonCallback(ListMonitoredPersonResponse listMonitoredPersonResponse) {
+
+    }
 }
@@ -535,7 +535,6 @@ public class CollRunningMapFragmentView implements MvpView, SensorEventListener 
             if (location == null || mMapView == null || getContext() == null) {
                 return;
             }
-            Log.e(TAG, "onReceiveLocation: 定位地点" + location.getAddress().address);
             mCurrentAccracy = location.getRadius();
             followMyLocation = new MyLocationData.Builder()
@@ -551,14 +550,12 @@ public class CollRunningMapFragmentView implements MvpView, SensorEventListener 
             if (isFirstLoc) {
                 isFirstLoc = false;
                 if (location.getRadius() > Constant.LOCA_ACCURACY) {
-                    Toast.makeText(getContext(), "当前定位精度为:" + location.getRadius() + "米,请您移动至空旷地带!", Toast.LENGTH_SHORT).show();
                 }
                 baiduMap.setMyLocationData(followMyLocation);
                 builder.target(new LatLng(followMyLocation.latitude, followMyLocation.longitude)).zoom(DEFULT_ZOOM);
                 baiduMap.animateMapStatus(MapStatusUpdateFactory.newMapStatus(builder.build()));
             } else {
                 //不是第一次定位状态
-                Log.e(TAG, "onReceiveLocation: 当前精度" + location.getRadius());
                 //过滤定位精度
                 if (location.getRadius() > Constant.LOCA_ACCURACY) {
                     return;
@@ -68,9 +68,7 @@ public class CollPedometerMainActivity extends QMUIFragmentActivity {
         notificationManagerCompat = NotificationManagerCompat.from(this);
         isOpen = notificationManagerCompat.areNotificationsEnabled();
         if (isOpen) {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-//                ContextCompat.startForegroundService(CollPedometerMainActivity.this, new Intent(CollPedometerMainActivity.this, CollStepService.class));
-            }
+            getPermissionsWithTip();
         } else {
             goToSettingNo();
         }
@@ -118,7 +116,7 @@ public class CollPedometerMainActivity extends QMUIFragmentActivity {
     protected void onResume() {
         super.onResume();
         check();
-        getPermissionsWithTip();
+
     }
     private void addFragment(RunRaceDetailInfo runRaceDetailInfo) {
 package com.cnlive.moudle.collectionTrace.ui.activity;
+import android.Manifest;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.provider.Settings;
+import android.support.annotation.NonNull;
+import android.util.Log;
+import android.widget.Toast;
 import com.cnlive.libs.base.ui.QMUIFragment;
 import com.cnlive.libs.base.ui.QMUIFragmentActivity;
@@ -11,10 +16,15 @@ import com.cnlive.libs.base.util.StatusBarUtil;
 import com.cnlive.libs.base.util.StatusBarUtil2;
 import com.cnlive.moudle.collectionTrace.ui.fragment.StartTraceFragment;
 import com.cnlive.moudle.pedometer.net.bean.RunRaceDetailInfo;
+import com.cnlive.moudle.pedometer.utils.MyMapUtil;
+import com.cnlive.moudle.pedometer.utils.lib_permisshelper.PermissionsListener;
+import com.cnlive.moudle.pedometer.utils.lib_permisshelper.PermissionsUtils;
 import com.example.moudle_pedometer.R;
 public class StartCollectTraceActivity extends QMUIFragmentActivity {
+    private PermissionsUtils mPermissionsUtils;//权限申请
+    private RunRaceDetailInfo runRaceDetailInfo;
     public static void newInstance(Context context, String eventId) {
         Intent intent = new Intent(context, StartCollectTraceActivity.class);
@@ -30,13 +40,18 @@ public class StartCollectTraceActivity extends QMUIFragmentActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        mPermissionsUtils = new PermissionsUtils();
         StatusBarUtil.setStatusBarWrite(this);
         StatusBarUtil2.setColor(this, getResources().getColor(R.color.white), 0);
-        RunRaceDetailInfo runRaceDetailInfo = (RunRaceDetailInfo) getIntent().getExtras().getSerializable("runRaceDetailInfo");
-        if (null != runRaceDetailInfo) {
-            addFragment(StartTraceFragment.newInstance(runRaceDetailInfo));
-        }
+        runRaceDetailInfo = (RunRaceDetailInfo) getIntent().getExtras().getSerializable("runRaceDetailInfo");
+
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        getPermissionsWithTip();
     }
     private void addFragment(QMUIFragment fragment) {
@@ -51,4 +66,69 @@ public class StartCollectTraceActivity extends QMUIFragmentActivity {
         intent.putExtra("runRaceDetailInfo", runRaceDetailInfo);
         activity.startActivity(intent);
     }
+
+
+    /**
+     * 一次申请一组权限（使用拒绝弹框）点击事件
+     */
+    public void getPermissionsWithTip() {
+        mPermissionsUtils
+                .setPermissionsListener(new PermissionsListener() {
+                    @Override
+                    public void onDenied(String[] deniedPermissions) {
+                        getPermissionsWithTip();
+                    }
+
+                    @Override
+                    public void onGranted() {
+
+                        //判断GPS是否开启
+                        if (!MyMapUtil.isOPenGps(getApplicationContext())) {
+                            //开启GPS
+                            Intent intent = new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS);
+                            startActivityForResult(intent, 10);
+                            Toast.makeText(getApplicationContext(), getString(R.string.open_gps_tip), Toast.LENGTH_LONG).show();
+                        } else {
+                            if (getCurrentFragment() == null) {
+                                if (null != runRaceDetailInfo) {
+                                    addFragment(StartTraceFragment.newInstance(runRaceDetailInfo));
+                                }
+                            }
+                        }
+                    }
+                })
+                .withActivity(StartCollectTraceActivity.this)
+                .getPermissions(StartCollectTraceActivity.this
+                        , 100
+                        , Manifest.permission.INTERNET
+                        , Manifest.permission.READ_EXTERNAL_STORAGE
+                        , Manifest.permission.WRITE_EXTERNAL_STORAGE
+                        , Manifest.permission.ACCESS_FINE_LOCATION
+                        , Manifest.permission.ACCESS_COARSE_LOCATION
+                );
+//                .getPermissionsWithTips(MainActivity.this
+//                        ,100
+//                        , new String[]{"人家要录音","我们需要读取你的信息，磨磨唧唧的","我要上网","我要读内存卡","我要看日历","我要定位"}
+//                        , Manifest.permission.RECORD_AUDIO
+//                        , Manifest.permission.READ_SMS
+//                        , Manifest.permission.INTERNET
+//                        , Manifest.permission.READ_EXTERNAL_STORAGE
+//                        , Manifest.permission.READ_CALENDAR
+//                        , Manifest.permission.ACCESS_FINE_LOCATION);
+    }
+
+
+    /**
+     * 权限回调
+     *
+     * @param requestCode
+     * @param permissions
+     * @param grantResults
+     */
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions,
+                                           @NonNull int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+        mPermissionsUtils.dealResult(requestCode, permissions, grantResults);
+    }
 }
@@ -44,12 +44,15 @@ public class CollFinishDetaiAdapter extends RecyclerView.Adapter&lt;CollFinishDetai
             //起点
             myViewHolder.view_circle.setBackground(context.getResources().getDrawable(R.drawable.shape_circle_green));
             myViewHolder.tv_point_type_tip.setText(context.getResources().getString(R.string.layout_street_start_point));
+            myViewHolder.view_line.setVisibility(View.VISIBLE);
+
         } else if (list.size() - 1 == i) {
             //终点
             myViewHolder.view_circle.setBackground(context.getResources().getDrawable(R.drawable.shape_circle_red));
             myViewHolder.tv_point_type_tip.setText(context.getResources().getString(R.string.layout_street_end_point));
             myViewHolder.view_line.setVisibility(View.GONE);
         } else {
+            myViewHolder.view_line.setVisibility(View.VISIBLE);
             //打点
             myViewHolder.view_circle.setBackground(context.getResources().getDrawable(R.drawable.shape_circle_gray));
 //            myViewHolder.tv_point_type_tip.setText(context.getResources().getString(R.string.layout_coll_take_point_text));
@@ -9,8 +9,10 @@ import android.view.View;
 import android.widget.Button;
 import com.cnlive.libs.base.ui.QMUIFragment;
+import com.cnlive.moudle.collectionTrace.commonInfo.CollCommonInfo;
 import com.cnlive.moudle.collectionTrace.frame.presenter.CollRunRaceDetailFragmentPresenter;
 import com.cnlive.moudle.collectionTrace.frame.view.CollRunRaceDetailFragmentView;
+import com.cnlive.moudle.collectionTrace.ui.activity.RaceNameListActivity;
 import com.cnlive.moudle.collectionTrace.ui.activity.StartCollectTraceActivity;
 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.model.Constant;
@@ -60,8 +62,7 @@ public class CollRunRaceDetailFragment extends QMUIFragment&lt;CollRunRaceDetailFra
             @Override
             public void onClick(View view) {
                 //todo 自己测试用
-                getActivity().finish();
-                RunLineActivity.newInstance(getActivity(),null,null,null,null);
+                RaceNameListActivity.newInstance(getActivity(), CollCommonInfo.getStreetId(getActivity()));
             }
         });
     }
@@ -177,5 +178,4 @@ public class CollRunRaceDetailFragment extends QMUIFragment&lt;CollRunRaceDetailFra
 //    }
-
 }
@@ -34,6 +34,26 @@ public class CollStepUtil {
     }
     /**
+     * 设置围栏id
+     *
+     * @param context
+     * @param uid
+     * @param fenceID
+     */
+    public static void setFenceId(Context context, String uid, String fenceID) {
+        //先获取有没有
+        if (getCollUserStepData(context, uid) != null) {
+            CollUserStepEntity entity = getCollUserStepData(context, uid);
+            if (null != entity) {
+                //设置围栏id
+                entity.setFenceId(fenceID);
+                //更新数据
+                updateCollStepData(context, entity);
+            }
+        }
+    }
+
+    /**
      * 设置用户整个赛事用时
      *
      * @param context
@@ -30,5 +30,7 @@ public class Constant {
     public static final int LOCA_ACCURACY = 20;//定位过滤精度
     public static final int LOCA_END_POINT_ACCURACY = 20;//终点位置比较精度
     public static final int LOCA_START_POINT_ACCURACY = 200;//起点位置比较精度
+    public static final int FENCE_OFFSET=70;//围栏偏离距离
+    public static final int FENCE_DENOISE=70;//围栏去噪精度
 }
@@ -66,6 +66,15 @@ public interface ApiServiceRunLin {
     @POST("Daren/event/getRouteRecordList.action")
     Observable<Result<BaseInfo<SelfRecordInfo>>> getSelfRecordInfo(@QueryMap() Map<String, String> maps);
+
+    /**
+     * 保存个人约跑路线记录
+     */
+    @POST("Daren/event/routeRecord.action")
+    Observable<Result<BaseInfo>> saveRouteData(@QueryMap() Map<String, String> maps);
+
+
+/***********************************************运营人员接口*****************************************************************/
     /**
      * 踩点轨迹列表
      */
@@ -84,15 +93,11 @@ public interface ApiServiceRunLin {
     @POST("Daren/event/bindingShoeLine.action")
     Observable<Result<BaseInfo>> bindingShoeLineInfo(@QueryMap() Map<String, String> maps);
-
     /**
-     * 保存个人约跑路线记录
+     * http://apiwjjtest.cnlive.com/Daren/event/saveShoeLine.action
+     * 运营路线踩点
      */
-    @POST("Daren/event/routeRecord.action")
-    Observable<Result<BaseInfo>> saveRouteData(@QueryMap() Map<String, String> maps);
-
-
-
-
+    @POST("Daren/event/saveShoeLine.action")
+    Observable<Result<BaseInfo>> collSaveShoeLine(@QueryMap() Map<String, String> maps);
 }
@@ -40,7 +40,7 @@ public class CollUserStepEntityDao extends AbstractDao&lt;CollUserStepEntity, Strin
         public final static Property QueryTraceEndTime = new Property(13, long.class, "queryTraceEndTime", false, "QUERY_TRACE_END_TIME");
         public final static Property QueryEntityName = new Property(14, String.class, "queryEntityName", false, "QUERY_ENTITY_NAME");
         public final static Property ContinueTime = new Property(15, long.class, "continueTime", false, "CONTINUE_TIME");
-        public final static Property FenceId = new Property(16, long.class, "fenceId", false, "FENCE_ID");
+        public final static Property FenceId = new Property(16, String.class, "fenceId", false, "FENCE_ID");
         public final static Property ImportPoint = new Property(17, String.class, "importPoint", false, "IMPORT_POINT");
         public final static Property StreetTitle = new Property(18, String.class, "streetTitle", false, "STREET_TITLE");
         public final static Property EndLatLng = new Property(19, String.class, "endLatLng", false, "END_LAT_LNG");
@@ -79,7 +79,7 @@ public class CollUserStepEntityDao extends AbstractDao&lt;CollUserStepEntity, Strin
                 "\"QUERY_TRACE_END_TIME\" INTEGER NOT NULL ," + // 13: queryTraceEndTime
                 "\"QUERY_ENTITY_NAME\" TEXT," + // 14: queryEntityName
                 "\"CONTINUE_TIME\" INTEGER NOT NULL ," + // 15: continueTime
-                "\"FENCE_ID\" INTEGER NOT NULL ," + // 16: fenceId
+                "\"FENCE_ID\" TEXT," + // 16: fenceId
                 "\"IMPORT_POINT\" TEXT," + // 17: importPoint
                 "\"STREET_TITLE\" TEXT," + // 18: streetTitle
                 "\"END_LAT_LNG\" TEXT," + // 19: endLatLng
@@ -138,7 +138,11 @@ public class CollUserStepEntityDao extends AbstractDao&lt;CollUserStepEntity, Strin
             stmt.bindString(15, queryEntityName);
         }
         stmt.bindLong(16, entity.getContinueTime());
-        stmt.bindLong(17, entity.getFenceId());
+ 
+        String fenceId = entity.getFenceId();
+        if (fenceId != null) {
+            stmt.bindString(17, fenceId);
+        }
         String importPoint = entity.getImportPoint();
         if (importPoint != null) {
@@ -215,7 +219,11 @@ public class CollUserStepEntityDao extends AbstractDao&lt;CollUserStepEntity, Strin
             stmt.bindString(15, queryEntityName);
         }
         stmt.bindLong(16, entity.getContinueTime());
-        stmt.bindLong(17, entity.getFenceId());
+ 
+        String fenceId = entity.getFenceId();
+        if (fenceId != null) {
+            stmt.bindString(17, fenceId);
+        }
         String importPoint = entity.getImportPoint();
         if (importPoint != null) {
@@ -273,7 +281,7 @@ public class CollUserStepEntityDao extends AbstractDao&lt;CollUserStepEntity, Strin
             cursor.getLong(offset + 13), // queryTraceEndTime
             cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14), // queryEntityName
             cursor.getLong(offset + 15), // continueTime
-            cursor.getLong(offset + 16), // fenceId
+            cursor.isNull(offset + 16) ? null : cursor.getString(offset + 16), // fenceId
             cursor.isNull(offset + 17) ? null : cursor.getString(offset + 17), // importPoint
             cursor.isNull(offset + 18) ? null : cursor.getString(offset + 18), // streetTitle
             cursor.isNull(offset + 19) ? null : cursor.getString(offset + 19), // endLatLng
@@ -303,7 +311,7 @@ public class CollUserStepEntityDao extends AbstractDao&lt;CollUserStepEntity, Strin
         entity.setQueryTraceEndTime(cursor.getLong(offset + 13));
         entity.setQueryEntityName(cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14));
         entity.setContinueTime(cursor.getLong(offset + 15));
-        entity.setFenceId(cursor.getLong(offset + 16));
+        entity.setFenceId(cursor.isNull(offset + 16) ? null : cursor.getString(offset + 16));
         entity.setImportPoint(cursor.isNull(offset + 17) ? null : cursor.getString(offset + 17));
         entity.setStreetTitle(cursor.isNull(offset + 18) ? null : cursor.getString(offset + 18));
         entity.setEndLatLng(cursor.isNull(offset + 19) ? null : cursor.getString(offset + 19));
@@ -23,7 +23,7 @@ public class CollUserStepEntity {
     private long queryTraceEndTime;//从服务器获取的结束时间呢
     private String queryEntityName;//从服务器获取的运营人员的实体名称
     private long continueTime;//继续运动时间
-    private long fenceId;//围栏id
+    private String fenceId;//围栏id
     private String importPoint;//关键点
     private String streetTitle;//赛事标题
     private String endLatLng;//终点坐标
@@ -32,11 +32,11 @@ public class CollUserStepEntity {
     private String collEndPointData;//运营结束打点名称和经纬度
     private String employTime;//用时时间戳
-    @Generated(hash = 148375276)
-    public CollUserStepEntity(String userId, String date, String stepCount, long recordTime, double caloriesCount, String serverTraceData,
-                              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 endLatLng, boolean isArriveEndPoint, String collStartPointData, String collEndPointData, String employTime) {
+    @Generated(hash = 297618082)
+    public CollUserStepEntity(String userId, String date, String stepCount, long recordTime, double caloriesCount, String serverTraceData, long startTimeStamp,
+            long finishTimeStamp, String streetId, int pauseCount, long userPauseTimeStamp, long chronometerBase, long queryTraceStartTime, long queryTraceEndTime,
+            String queryEntityName, long continueTime, String fenceId, String importPoint, String streetTitle, String endLatLng, boolean isArriveEndPoint,
+            String collStartPointData, String collEndPointData, String employTime) {
         this.userId = userId;
         this.date = date;
         this.stepCount = stepCount;
@@ -196,13 +196,6 @@ public class CollUserStepEntity {
         this.continueTime = continueTime;
     }
-    public long getFenceId() {
-        return this.fenceId;
-    }
-
-    public void setFenceId(long fenceId) {
-        this.fenceId = fenceId;
-    }
     public String getImportPoint() {
         return this.importPoint;
@@ -261,5 +254,13 @@ public class CollUserStepEntity {
         this.employTime = employTime;
     }
+    public String getFenceId() {
+        return this.fenceId;
+    }
+
+    public void setFenceId(String fenceId) {
+        this.fenceId = fenceId;
+    }
+
 }
@@ -71,7 +71,10 @@ public class MyMapUtil {
             Bitmap pointBitmap = BitmapUtil.getBitmapFromDp(context, BitmapFactory.decodeResource(context.getResources(), startIconRes), 17, 30);
             OverlayOptions startOptions = null;
             if (pointBitmap != null) {
-                startOptions = new MarkerOptions().position(startLatLng).icon(BitmapDescriptorFactory.fromBitmap(pointBitmap));
+                startOptions = new MarkerOptions()
+                        .position(startLatLng)
+                        .icon(BitmapDescriptorFactory.fromBitmap(pointBitmap))
+                        .animateType(MarkerOptions.MarkerAnimateType.grow);
             }
             if (startOptions != null) {
@@ -104,7 +107,10 @@ public class MyMapUtil {
             Bitmap pointBitmap = BitmapUtil.getBitmapFromDp(context, BitmapFactory.decodeResource(context.getResources(), startIconRes), 24, 30);
             OverlayOptions startOptions = null;
             if (pointBitmap != null) {
-                startOptions = new MarkerOptions().position(startLatLng).icon(BitmapDescriptorFactory.fromBitmap(pointBitmap));
+                startOptions = new MarkerOptions()
+                        .position(startLatLng)
+                        .icon(BitmapDescriptorFactory.fromBitmap(pointBitmap))
+                        .animateType(MarkerOptions.MarkerAnimateType.grow);
             }
             // 添加圆形范围
@@ -14,7 +14,7 @@
             sothree:umanoDragView="@+id/dragView"
             sothree:umanoFadeColor="@color/black_20"
             sothree:umanoOverlay="true"
-            sothree:umanoPanelHeight="310dp"
+            sothree:umanoPanelHeight="250dp"
             sothree:umanoParallaxOffset="0dp"
             sothree:umanoScrollableView="@+id/rv_list"
             sothree:umanoShadowHeight="0dp">
@@ -105,6 +105,9 @@
             android:layout_width="match_parent"
             android:layout_height="40sp"
             android:layout_gravity="bottom"
+            android:focusable="true"
+            android:clickable="true"
+            android:focusableInTouchMode="true"
             android:background="@color/green_round"
             android:gravity="center"
             android:tag="0">
@@ -117,6 +120,7 @@
                 android:layout_centerInParent="true"
                 android:layout_marginLeft="5dp"
                 android:clickable="false"
+                android:focusable="false"
                 android:focusableInTouchMode="false"
                 android:tag="0"
                 android:text="确定轨迹"