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

韩亚云
2 parents 26f751c3 21f98ef3
Showing 10 changed files with 412 additions and 121 deletions
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/presenter/CollRunningFinishFragmetPresenter.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/presenter/RaceNameListPresenter.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/CollRunRaceDetailFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/CollRunningMapFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/CollTraceListDetailFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/RaceNameListView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/StartTraceFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/fragment/CollTraceListDetailFragment.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/fragment/RaceNameListFragment.java
moudle_pedometer/src/main/res/layout/fragment_coll_race_detail.xml
@@ -84,6 +84,11 @@ public class CollRunningFinishFragmetPresenter extends MvpBasePresenter&lt;CollRunn
         if (!TextUtils.isEmpty(userStepEntity.getStepCount())) {
             double mileage = CollStepUtil.getWalkDistanceKM(Long.parseLong(userStepEntity.getStepCount()));
             paramsMap.put("mileage", mileage + "");
+            if (0==mileage){
+                paramsMap.put("mileage", "0");
+            }
+        }else {
+            paramsMap.put("mileage", "0");
         }
         //开始时间
         if (0 != userStepEntity.getStartTimeStamp()) {
@@ -12,6 +12,7 @@ import com.cnlive.moudle.collectionTrace.model.RaceNameListInfo;
 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.utils.QMUITipDialogUtil;
 import com.hannesdorfmann.mosby3.mvp.MvpBasePresenter;
 import java.util.HashMap;
@@ -25,11 +26,11 @@ import io.reactivex.disposables.Disposable;
 public class RaceNameListPresenter extends MvpBasePresenter<RaceNameListView> {
-    public void setData(Context context,String eventId, int pageNo, int pageSize){
+    public void setData(Context context, String eventId, int pageNo, int pageSize) {
         HashMap<String, String> map = new HashMap<>();
         map.put("eventId", eventId);
-        map.put("pageNo", pageNo+"");
-        map.put("pageSize", pageSize+"");
+        map.put("pageNo", pageNo + "");
+        map.put("pageSize", pageSize + "");
         getView().showLoading();
         Logic.create(map).action(new Logic.Action<Map<String, String>, BaseInfo<RaceNameListInfo>>() {
             @Override
@@ -47,7 +48,7 @@ public class RaceNameListPresenter extends MvpBasePresenter&lt;RaceNameListView&gt; {
         }).setSuccessCallback(new SuccessCallback<BaseInfo<RaceNameListInfo>>() {
             @Override
             public void onSuccess(BaseInfo<RaceNameListInfo> registerInfo) {
-                if (getView() != null){
+                if (getView() != null) {
                     getView().onSuccess(registerInfo);
                 }
             }
@@ -56,13 +57,14 @@ public class RaceNameListPresenter extends MvpBasePresenter&lt;RaceNameListView&gt; {
     /**
      * 轨迹删除
+     *
      * @param context
-     * @param id  轨迹id
+     * @param id      轨迹id
      */
-    public void delectShoeLine(Context context,int id,int position){
-        Map<String,String> map = new HashMap<>();
-        map.put("id",id+"");
-        Logic.create(map).action(new Logic.Action<Map<String,String>, BaseInfo>() {
+    public void delectShoeLine(Context context, int id, int position) {
+        Map<String, String> map = new HashMap<>();
+        map.put("id", id + "");
+        Logic.create(map).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.deleteShoeLineInfo(stringStringMap)).subscribe(context, dataCallback);
@@ -78,7 +80,7 @@ public class RaceNameListPresenter extends MvpBasePresenter&lt;RaceNameListView&gt; {
         }).setSuccessCallback(new SuccessCallback<BaseInfo>() {
             @Override
             public void onSuccess(BaseInfo baseInfo) {
-                if (getView() != null){
+                if (getView() != null) {
                     getView().delectShoeLine(position);
                 }
             }
@@ -86,16 +88,21 @@ public class RaceNameListPresenter extends MvpBasePresenter&lt;RaceNameListView&gt; {
     }
     /**
-     *踩点轨迹与赛事绑定
+     * 踩点轨迹与赛事绑定
+     *
      * @param context
-     * @param id  轨迹id
+     * @param id      轨迹id
      * @param eventId 赛事id
      */
-    public void bindingShoeLine(Context context,int id,String eventId,int position){
-        Map<String,String> map = new HashMap<>();
-        map.put("id",id+"");
-        map.put("eventId",eventId);
-        Logic.create(map).action(new Logic.Action<Map<String,String>, BaseInfo<BindingShoeInfo>>() {
+    public void bindingShoeLine(Context context, int id, String eventId, String fenceId, String fenceName, int position) {
+        QMUITipDialogUtil.loadingDialog(context, "正在绑定轨迹...", false);
+        Map<String, String> map = new HashMap<>();
+        map.put("id", id + "");
+        map.put("eventId", eventId);
+        map.put("fenceId", fenceId);
+        map.put("fenceName", fenceName);
+
+        Logic.create(map).action(new Logic.Action<Map<String, String>, BaseInfo<BindingShoeInfo>>() {
             @Override
             public Disposable action(Map<String, String> stringStringMap, DataCallback<BaseInfo<BindingShoeInfo>> dataCallback) {
                 return SubscriptionRequest.service(ApiServiceRunLin.class, api -> api.bindingShoeLineInfo(stringStringMap)).subscribe(context, dataCallback);
@@ -104,6 +111,7 @@ public class RaceNameListPresenter extends MvpBasePresenter&lt;RaceNameListView&gt; {
             @Override
             public void onFailure(int code, String message) {
                 if (getView() != null) {
+                    QMUITipDialogUtil.dismessDialog();
                     getView().showToast(message);
                     getView().hideLoading();
                 }
@@ -111,8 +119,9 @@ public class RaceNameListPresenter extends MvpBasePresenter&lt;RaceNameListView&gt; {
         }).setSuccessCallback(new SuccessCallback<BaseInfo<BindingShoeInfo>>() {
             @Override
             public void onSuccess(BaseInfo<BindingShoeInfo> baseInfo) {
-                if (getView() != null){
-                    getView().bindingShoeLine(position,baseInfo);
+                if (getView() != null) {
+                    QMUITipDialogUtil.dismessDialog();
+                    getView().bindingShoeLine(position, baseInfo);
                 }
             }
         }).start();
@@ -41,12 +41,16 @@ 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.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;
 import com.cnlive.moudle.pedometer.net.bean.RunRaceDetailInfo;
 import com.cnlive.moudle.pedometer.utils.BitmapUtil;
+import com.cnlive.moudle.pedometer.utils.MyMapUtil;
 import com.cnlive.moudle.pedometer.utils.ScreenUtil;
 import com.cnlive.moudle.pedometer.utils.TimeUtil;
 import com.cnlive.strike.application.GlideApp;
@@ -94,6 +98,7 @@ public class CollRunRaceDetailFragmentView implements MvpView, SensorEventListen
     private LatLng startLatLng = new LatLng(39.934733, 116.308646);//起始点
     private List<LatLng> trackPoints;
     public RunRaceDetailInfo runRaceDetailInfo;
+    private LBSTraceClient mClient = null;
     public CollRunRaceDetailFragmentView(CollRunRaceDetailFragment fragment) {
         this.fragment = fragment;
@@ -108,6 +113,9 @@ public class CollRunRaceDetailFragmentView implements MvpView, SensorEventListen
         if (fragment.getActivity() == null) {
             return;
         }
+        if (null == mClient) {
+            mClient = new LBSTraceClient(getContext());
+        }
         CollCommonInfo.setUserId(getContext(), uid);
         this.runRaceDetailInfo = runRaceDetailInfo;
         //显示地图
@@ -128,6 +136,20 @@ public class CollRunRaceDetailFragmentView implements MvpView, SensorEventListen
             }
         });
         /*************************设置相关页面数据***************************/
+        //获取轨迹开始时间
+        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());
@@ -222,7 +244,9 @@ public class CollRunRaceDetailFragmentView implements MvpView, SensorEventListen
             @Override
             public void onClick(View view) {
                 if (null != runRaceDetailInfo) {
-                    StartCollectTraceActivity.startActivity(fragment.getActivity(), runRaceDetailInfo);
+                    RaceNameListActivity.newInstance(fragment.getActivity(), CollCommonInfo.getStreetId(fragment.getActivity()),runRaceDetailInfo);
+
+//                    StartCollectTraceActivity.startActivity(fragment.getActivity(), runRaceDetailInfo);
                 }
             }
         });
 package com.cnlive.moudle.collectionTrace.frame.view;
 import android.content.Context;
+import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.hardware.Sensor;
@@ -38,8 +39,10 @@ import com.cnlive.moudle.collectionTrace.service.CollStepService;
 import com.cnlive.moudle.collectionTrace.ui.activity.CollRunningFinishActivity;
 import com.cnlive.moudle.collectionTrace.ui.fragment.CollRunningMapFragment;
 import com.cnlive.moudle.collectionTrace.commonInfo.CollCommonInfo;
+import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.model.Constant;
 import com.cnlive.moudle.pedometer.net.bean.RunRaceDetailInfo;
+import com.cnlive.moudle.pedometer.service.StepService;
 import com.cnlive.moudle.pedometer.sql.entity.CollUserStepEntity;
 import com.cnlive.moudle.pedometer.ui.widget.SelectDialog;
 import com.cnlive.moudle.pedometer.utils.BitmapUtil;
@@ -363,6 +366,7 @@ public class CollRunningMapFragmentView implements MvpView, SensorEventListener 
                     if (null == currentImportLatLng || TextUtils.isEmpty(currentAddress)) {
                         return;
                     }
+                    stopStepService();
                     //保存用户完成时间
                     CollStepUtil.setCollUserFinishTimeStamp(getContext(), CollCommonInfo.getUserId(getContext()), TimeUtil.getNowTimeStamp());
                     //设置终点信息
@@ -386,6 +390,17 @@ public class CollRunningMapFragmentView implements MvpView, SensorEventListener 
         }
     }
+    private void stopStepService() {
+        CollCommonInfo.setTsRunBaiduTraceService(getContext(), false);
+        CollCommonInfo.setIsRunKeepAliveService(getContext(), false);
+        CollCommonInfo.setIsWriteUserStep(getContext(), false);
+        CollCommonInfo.setIsFirstStepSendTraceTip(getContext(), true);
+        if (CollStepService.mClient != null) {
+            CollStepService.mClient.stopGather(StepService.traceListener);
+        }
+        fragment.getActivity().stopService(new Intent(fragment.getActivity(), CollStepService.class));
+    }
+
     private void initChrom() {
         //设置计时监听
         fragment.binding.chronometer.setOnChronometerTickListener(new Chronometer.OnChronometerTickListener() {
@@ -537,12 +552,6 @@ public class CollRunningMapFragmentView implements MvpView, SensorEventListener 
                 return;
             }
-            mCurrentAccracy = location.getRadius();
-            followMyLocation = new MyLocationData.Builder()
-                    .accuracy(location.getRadius())
-                    // 此处设置开发者获取到的方向信息，顺时针0-360
-                    .direction(mCurrentDirection).latitude(location.getLatitude())
-                    .longitude(location.getLongitude()).build();
 //            if (followMyLocation == null || followMyLocation.latitude == 0 || followMyLocation.longitude == 0) {
 //                return;
 //            }
@@ -550,8 +559,13 @@ public class CollRunningMapFragmentView implements MvpView, SensorEventListener 
             //第一次定位
             if (isFirstLoc) {
                 isFirstLoc = false;
-                if (location.getRadius() > Constant.LOCA_ACCURACY) {
-                }
+                mCurrentAccracy = location.getRadius();
+                followMyLocation = new MyLocationData.Builder()
+                        .accuracy(location.getRadius())
+                        // 此处设置开发者获取到的方向信息，顺时针0-360
+                        .direction(mCurrentDirection).latitude(location.getLatitude())
+                        .longitude(location.getLongitude()).build();
+
                 baiduMap.setMyLocationData(followMyLocation);
                 builder.target(new LatLng(followMyLocation.latitude, followMyLocation.longitude)).zoom(DEFULT_ZOOM);
                 baiduMap.animateMapStatus(MapStatusUpdateFactory.newMapStatus(builder.build()));
@@ -561,6 +575,12 @@ public class CollRunningMapFragmentView implements MvpView, SensorEventListener 
                 if (location.getRadius() > Constant.LOCA_ACCURACY) {
                     return;
                 }
+                mCurrentAccracy = location.getRadius();
+                followMyLocation = new MyLocationData.Builder()
+                        .accuracy(location.getRadius())
+                        // 此处设置开发者获取到的方向信息，顺时针0-360
+                        .direction(mCurrentDirection).latitude(location.getLatitude())
+                        .longitude(location.getLongitude()).build();
                 if (null != currentWalkPoints && currentWalkPoints.size() > 0) {
                     //进行判断
                     LatLng lastLatLng = currentWalkPoints.get(currentWalkPoints.size() - 1);
@@ -14,6 +14,7 @@ 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.model.SortType;
 import com.bumptech.glide.Glide;
 import com.cnlive.moudle.collectionTrace.model.CollectPoint;
 import com.cnlive.moudle.collectionTrace.model.RaceNameListInfo;
@@ -110,76 +111,27 @@ public class CollTraceListDetailFragmentView implements MvpView {
         if (!TextUtils.isEmpty(eventShoeLinesBean.getEndTime())) {
             fragment.binding.includeFinishUserInfo.tvDate.setText(TimeUtil.getStampToTime(Long.parseLong(eventShoeLinesBean.getEndTime()) * 1000, "yyyy-MM-dd HH:mm"));
         }
+        //设置标题
+        if (!TextUtils.isEmpty(eventShoeLinesBean.getEventName())) {
+            fragment.binding.includeFinishUserInfo.tvStreetName.setText(eventShoeLinesBean.getEventName());
+        }
 //        //查询用户历史轨迹
-//        if (0 != collUserStepEntity.getStartTimeStamp() && 0 != collUserStepEntity.getFinishTimeStamp()) {
-//            long startTime = collUserStepEntity.getStartTimeStamp();
-//            long endTime = collUserStepEntity.getFinishTimeStamp();
-//            //开始查询
-//            queryWalkTrace(startTime, endTime);
-//            if (!TextUtils.isEmpty(collUserStepEntity.getImportPoint())) {
-//                List<CollectPoint> collectPoints = GsonUtil.jsonToList(collUserStepEntity.getImportPoint(), CollectPoint.class);
-//                //绘制运营打的点
-//                if (null != collectPoints) {
-//                    //根据打点集合,自适应缩放
-//                    MyMapUtil.setCollMapAutoZoom(baiduMap, collectPoints, -1.5f);
-//                    for (CollectPoint point : collectPoints) {
-//                        LatLng markLatLng = new LatLng(point.getLatitude(), point.getLongitude());
-//                        if (null != markLatLng) {
-//                            //将点位显示到地图上
-//                            Overlay overlay = MyMapUtil.setMapMarker(getContext(), baiduMap, markLatLng, R.drawable.icon_map_import);
-//                            if (null != overlay) {
-//                                allMapOverlays.add(overlay);
-//                            }
-//                        }
-//                    }
-//                }
-//            }
-//        }
-//        //设置用户昵称
-//        String nickName = CommonInfo.getUserNickName(getContext());
-//        fragment.binding.includeFinishUserInfo.tvUserNickName.setText(nickName);
-//        //设置用户头像
-//        String faceUrl = CommonInfo.getUserIcon(getContext());
-//        if (!TextUtils.isEmpty(faceUrl)) {
-//            GlideApp.with(getContext()).load(faceUrl).into(fragment.binding.includeFinishUserInfo.qmIvIcon);
-//        }
-//        //设置标题
-//        if (!TextUtils.isEmpty(collUserStepEntity.getStreetTitle())) {
-//            fragment.binding.includeFinishUserInfo.tvStreetName.setText(collUserStepEntity.getStreetTitle());
-//        }
-//        //设置距离
-//        if (!TextUtils.isEmpty(collUserStepEntity.getStepCount())) {
-//            fragment.binding.includeFinishUserInfo.tvDistance.setText(CollStepUtil.getWalkDistanceKM(Long.parseLong(collUserStepEntity.getStepCount())) + "");
-//        } else {
-//            fragment.binding.includeFinishUserInfo.tvDistance.setText("0");
-//        }
-//        if (0 != collUserStepEntity.getFinishTimeStamp()) {
-//            //设置日期
-//            fragment.binding.includeFinishUserInfo.tvDate.setText(TimeUtil.getStampToTime(collUserStepEntity.getFinishTimeStamp() * 1000, "yyyy-MM-dd HH:mm"));
-//        }
-//        //设置适配器
-//        if (!TextUtils.isEmpty(collUserStepEntity.getImportPoint())) {
-//            List<CollectPoint> collectPoints = GsonUtil.jsonToList(collUserStepEntity.getImportPoint(), CollectPoint.class);
-//            if (null == collectPoints) {
-//                collectPoints = new ArrayList<>();
-//            }
-//            if (null != startPoint) {
-//                collectPoints.add(0, startPoint);
-//            }
-//            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()));
-//            fragment.binding.includeFinishUserInfo.rvList.setAdapter(adapter);
-//        }
+        if (!TextUtils.isEmpty(eventShoeLinesBean.getStartTime()) && !TextUtils.isEmpty(eventShoeLinesBean.getEndTime()) && !TextUtils.isEmpty(eventShoeLinesBean.getEntityName())) {
+            long startTime = Long.parseLong(eventShoeLinesBean.getStartTime());
+            long endTime = Long.parseLong(eventShoeLinesBean.getEndTime());
+            String entityName = eventShoeLinesBean.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);
+                    }
+                }
+            });
+        }
         //返回按钮点击
         fragment.binding.flBack.setOnClickListener(new View.OnClickListener() {
             @Override
 package com.cnlive.moudle.collectionTrace.frame.view;
+import android.os.Handler;
 import android.support.v7.widget.LinearLayoutManager;
+import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
 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.DeleteFenceRequest;
 import com.baidu.trace.api.fence.DeleteFenceResponse;
 import com.baidu.trace.api.fence.DeleteMonitoredPersonResponse;
+import com.baidu.trace.api.fence.FenceInfo;
 import com.baidu.trace.api.fence.FenceListRequest;
 import com.baidu.trace.api.fence.FenceListResponse;
+import com.baidu.trace.api.fence.FenceShape;
 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.PolylineFence;
 import com.baidu.trace.api.fence.UpdateFenceResponse;
 import com.baidu.trace.model.CoordType;
+import com.baidu.trace.model.LatLng;
 import com.cnlive.libs.base.util.AlertUtil;
 import com.cnlive.moudle.collectionTrace.commonInfo.CollCommonInfo;
 import com.cnlive.moudle.collectionTrace.model.BindingShoeInfo;
+import com.cnlive.moudle.collectionTrace.model.CollectPoint;
 import com.cnlive.moudle.collectionTrace.model.RaceNameListInfo;
 import com.cnlive.moudle.collectionTrace.ui.activity.CollTraceListDetailActivity;
 import com.cnlive.moudle.collectionTrace.ui.activity.StartCollectTraceActivity;
@@ -31,6 +40,8 @@ import com.cnlive.moudle.pedometer.model.Constant;
 import com.cnlive.moudle.pedometer.net.bean.BaseInfo;
 import com.cnlive.moudle.pedometer.net.bean.RunRaceDetailInfo;
 import com.cnlive.moudle.pedometer.ui.widget.SelectDialog;
+import com.cnlive.moudle.pedometer.utils.GsonUtil;
+import com.cnlive.moudle.pedometer.utils.QMUITipDialogUtil;
 import com.example.moudle_pedometer.R;
 import com.hannesdorfmann.mosby3.mvp.MvpView;
 import com.qmuiteam.qmui.widget.dialog.QMUITipDialog;
@@ -50,6 +61,9 @@ public class RaceNameListView implements MvpView, OnFenceListener {
     List<RaceNameListInfo.EventShoeLinesBean> list = new ArrayList<>();
     private RaceNameListAdapter adapter;
     private LBSTraceClient mClient = null;
+    private List<LatLng> importPoints;
+    private RaceNameListInfo.EventShoeLinesBean currentSelBean;
+    private int currentSelPos = -1;
     public RaceNameListView(RaceNameListFragment fragment) {
         this.fragment = fragment;
@@ -82,8 +96,10 @@ public class RaceNameListView implements MvpView, OnFenceListener {
     }
-    public void bindingShoeLine(int position,BaseInfo<BindingShoeInfo> baseInfo) {
-        if(baseInfo.getData().getEntityName() != null) fragment.entityName = baseInfo.getData().getEntityName();
+    public void bindingShoeLine(int position, BaseInfo<BindingShoeInfo> baseInfo) {
+        if (baseInfo.getData().getEntityName() != null) {
+            fragment.entityName = baseInfo.getData().getEntityName();
+        }
         list.get(position).setIsEnable(0);
         for (int i = 0; i < list.size(); i++) {
             if (i != position && list.get(i).getIsEnable() == 0) {
@@ -107,7 +123,8 @@ public class RaceNameListView implements MvpView, OnFenceListener {
             if (adapter == null) {
                 adapter = new RaceNameListAdapter(list, fragment.getActivity());
                 fragment.binding.raceRecy.setAdapter(adapter);
-                if(raceNameListInfoBaseInfo.getData().getEntityName() != null) fragment.entityName = raceNameListInfoBaseInfo.getData().getEntityName();
+                if (raceNameListInfoBaseInfo.getData().getEntityName() != null)
+                    fragment.entityName = raceNameListInfoBaseInfo.getData().getEntityName();
                 adapter.setOnItemClick(new RaceNameListAdapter.OnItemClick() {
                     @Override
                     public void onItemClickListener(RaceNameListInfo.EventShoeLinesBean eventShoeLinesBean, int position) {
@@ -117,7 +134,24 @@ public class RaceNameListView implements MvpView, OnFenceListener {
                 adapter.setOnAddShoeLineClick(new RaceNameListAdapter.OnAddShoeLineClick() {
                     @Override
                     public void onAddSholeLineClickListener(RaceNameListInfo.EventShoeLinesBean eventShoeLinesBean, int position) {
-                        if (list.get(position).getIsEnable() == 0) return;
+                        if (list.get(position).getIsEnable() == 0) {
+                            return;
+                        }
+                        importPoints = null;
+                        currentSelBean = eventShoeLinesBean;
+                        currentSelPos = position;
+                        //设置打的重要点
+                        if (!TextUtils.isEmpty(eventShoeLinesBean.getLatLongitude())) {
+                            List<CollectPoint> collectPoints = GsonUtil.jsonToList(eventShoeLinesBean.getLatLongitude(), CollectPoint.class);
+                            if (null != collectPoints) {
+                                importPoints = new ArrayList<>();
+                                for (CollectPoint collectPoint : collectPoints) {
+                                    LatLng latLng = new LatLng(collectPoint.getLatitude(), collectPoint.getLongitude());
+                                    importPoints.add(latLng);
+                                }
+                            }
+                        }
+
                         SelectDialog selectDialog = new SelectDialog(fragment.getActivity(), "确定绑定该轨迹？", "否", new SelectDialog.DialogInterface() {
                             @Override
                             public void onClick(SelectDialog dialog) {
@@ -127,8 +161,21 @@ public class RaceNameListView implements MvpView, OnFenceListener {
                             @Override
                             public void onClick(SelectDialog dialog) {
                                 dialog.cancel();
-                                //查询当前赛事对应的轨迹列表
-                                queryFenceList(eventShoeLinesBean.getEventId());
+                                //先判断当前是否已经绑定轨迹
+                                if (TextUtils.isEmpty(fragment.entityName)) {
+                                    Log.e(TAG, "onClick: 未绑定轨迹");
+                                    //开始绑定轨迹
+                                    //判断是否有打的点
+                                    if (null != importPoints && !TextUtils.isEmpty(eventShoeLinesBean.getDarenId()) && !TextUtils.isEmpty(eventShoeLinesBean.getEventName())) {
+                                        addFence(eventShoeLinesBean.getDarenId(), eventShoeLinesBean.getEventName(), importPoints);
+                                    }
+                                } else {
+                                    Log.e(TAG, "onClick: 已绑定轨迹");
+                                    //开始查询
+                                    queryFenceList(fragment.entityName);
+                                }
+
+//                                queryFenceList(eventShoeLinesBean.getEventId());
 //                                fragment.addShoeLine(eventShoeLinesBean, position);
                             }
                         });
@@ -184,6 +231,25 @@ public class RaceNameListView implements MvpView, OnFenceListener {
         fragment.binding.refreshLayout.finishLoadMore();
     }
+    private void addFence(String entityName, String fenceName, List<LatLng> latLngs) {
+        if (null == fragment.getActivity()) {
+            return;
+        }
+        QMUITipDialogUtil.loadingDialog(fragment.getActivity(), "正在创建地理围栏", false);
+        int offset = Constant.FENCE_OFFSET;// 偏离距离
+        int denoise = Constant.FENCE_DENOISE; //围栏去噪精度
+        if (mClient != null && !TextUtils.isEmpty(entityName)) {
+            new Handler().postDelayed(new Runnable() {
+                @Override
+                public void run() {
+                    CreateFenceRequest createFenceRequest = null;
+                    createFenceRequest = CreateFenceRequest.buildServerPolylineRequest(Constant.TAG, Constant.SERVICE_ID, fenceName, entityName, latLngs, offset, denoise, CoordType.gcj02);
+                    mClient.createFence(createFenceRequest, RaceNameListView.this);
+                }
+            }, 1000);
+        }
+    }
+
     public void showErr(String msg) {
         fragment.binding.refreshLayout.finishRefresh();
         fragment.binding.refreshLayout.finishLoadMore();
@@ -220,19 +286,26 @@ public class RaceNameListView implements MvpView, OnFenceListener {
     public void showLoading() {
-        if (loadingDiaog != null) loadingDiaog.show();
+        if (loadingDiaog != null) {
+            loadingDiaog.show();
+        }
     }
     public void hideLoading() {
-        if (loadingDiaog != null) loadingDiaog.dismiss();
+        if (loadingDiaog != null) {
+            loadingDiaog.dismiss();
+        }
     }
     /**
      * 查询地理围栏
      */
-    private void queryFenceList(String eventId) {
-        FenceListRequest fenceListRequest = FenceListRequest.buildServerRequest(Constant.TAG, Constant.SERVICE_ID, eventId, null, CoordType.gcj02, 1, 5000);
+    private void queryFenceList(String entityName) {
+        QMUITipDialogUtil.loadingDialog(fragment.getActivity(), "正在查询围栏信息...", false);
+        List<Long> fenceId = new ArrayList<>();
+        fenceId.add(0L);
+        FenceListRequest fenceListRequest = FenceListRequest.buildServerRequest(Constant.TAG, Constant.SERVICE_ID, entityName, null, CoordType.gcj02, 1, 5000);
         if (null != mClient || null != fenceListRequest) {
             mClient.queryFenceList(fenceListRequest, RaceNameListView.this);
         }
@@ -240,7 +313,23 @@ public class RaceNameListView implements MvpView, OnFenceListener {
     @Override
     public void onCreateFenceCallback(CreateFenceResponse createFenceResponse) {
-
+        //创建围栏成功
+        if (null == createFenceResponse) {
+            QMUITipDialogUtil.dismessDialog();
+            return;
+        }
+        Log.e(TAG, "onCreateFenceCallback: " + createFenceResponse.getMessage() + "状态:" + createFenceResponse.getStatus());
+        Log.e(TAG, "创建的围栏ID: " + createFenceResponse.getFenceId() + "围栏名称:" + createFenceResponse.getFenceName());
+        //围栏创建失败
+        if (5102 == createFenceResponse.getStatus()) {
+            QMUITipDialogUtil.dismessDialog();
+            QMUITipDialogUtil.failedDialog(fragment.getActivity(), createFenceResponse.getMessage(), 1);
+        } else {
+            if (null != currentSelBean && -1 != currentSelPos) {
+                QMUITipDialogUtil.dismessDialog();
+                fragment.addShoeLine(currentSelBean, createFenceResponse.getFenceId() + "", currentSelPos);
+            }
+        }
     }
     @Override
@@ -250,7 +339,18 @@ public class RaceNameListView implements MvpView, OnFenceListener {
     @Override
     public void onDeleteFenceCallback(DeleteFenceResponse deleteFenceResponse) {
-
+        //删除围栏
+        if (null == deleteFenceResponse) {
+            return;
+        }
+        Log.e(TAG, "onDeleteFenceCallback: " + deleteFenceResponse.getMessage() + ",状态:" + deleteFenceResponse.getStatus());
+        //删除成功
+        if (0 == deleteFenceResponse.getStatus()) {
+            QMUITipDialogUtil.dismessDialog();
+            addFence(currentSelBean.getDarenId(), currentSelBean.getEventName(), importPoints);
+        } else {
+            QMUITipDialogUtil.dismessDialog();
+        }
     }
     /**
@@ -264,7 +364,49 @@ public class RaceNameListView implements MvpView, OnFenceListener {
             return;
         }
         Log.e(TAG, "onFenceListCallback:围栏数量 " + fenceListResponse.getFenceInfos().size() + ",fenceListResponse:" + fenceListResponse.getTotalSize());
+        List<Long> fenceIdList = null;
+        if (null != fenceListResponse.getFenceInfos()) {
+            fenceIdList = new ArrayList<>();
+            for (FenceInfo fenceInfo : fenceListResponse.getFenceInfos()) {
+                //如果是线性围栏
+                if (fenceInfo.getFenceShape() == FenceShape.polyline) {
+                    //判断是否是当前围栏名称
+                    if (null != currentSelBean) {
+                        if (!TextUtils.isEmpty(currentSelBean.getEventName())) {
+                            String serverFenceName = fenceInfo.getPolylineFence().getFenceName();
+                            String currentFenceName = currentSelBean.getEventName();
+                            if (serverFenceName.equals(currentFenceName)) {
+                                //添加围栏id
+                                fenceIdList.add(fenceInfo.getPolylineFence().getFenceId());
+                            }
+                        }
+                    }
+                }
+            }
+            //判断围栏是否查询到
+            if (null != fenceIdList && fenceIdList.size() > 0) {
+                Log.e(TAG, "onFenceListCallback: 获取到围栏数量" + fenceIdList.size());
+                List<Long> finalFenceIdList = fenceIdList;
+                new Handler().postDelayed(new Runnable() {
+                    @Override
+                    public void run() {
+                        QMUITipDialogUtil.dismessDialog();
+                        //开始删除围栏
+                        DeleteFenceRequest deleteFenceRequest = DeleteFenceRequest.buildServerRequest(Constant.TAG, Constant.SERVICE_ID, fragment.entityName, finalFenceIdList);
+                        if (null != mClient) {
+                            QMUITipDialogUtil.loadingDialog(fragment.getActivity(), "正在删除围栏", false);
+                            mClient.deleteFence(deleteFenceRequest, RaceNameListView.this);
+                        }
+                    }
+                }, 1000);
+            } else {
+                //没有查询到围栏,直接添加
+                addFence(currentSelBean.getDarenId(), currentSelBean.getEventName(), importPoints);
+            }
+        } else {
+            QMUITipDialogUtil.dismessDialog();
+        }
     }
     @Override
@@ -210,21 +210,25 @@ public class StartTraceFragmentView implements MvpView, SensorEventListener {
     }
     private void checkBaiduServiceState() {
-        boolean isRunBaidu = CollCommonInfo.getIsRunBaiduTraceService(getContext());
-        //要运行百度
-        if (isRunBaidu) {
+
+//        boolean isRunBaidu = CollCommonInfo.getIsRunBaiduTraceService(getContext());
+//        //要运行百度
+//        if (isRunBaidu) {
             //判断百度服务是否运行
-            if (!ServiceUtils.isServiceRunning(getContext(), "com.baidu.trace.LBSTraceService")) {
+            boolean isBaiduRun = ServiceUtils.isServiceRunning(getContext(), "com.baidu.trace.LBSTraceService");
+            boolean isKeepRun = ServiceUtils.isServiceRunning(getContext(), "com.cnlive.moudle.collectionTrace.service.CollKeepLiveService");
+            boolean isStepRun = ServiceUtils.isServiceRunning(getContext(), "com.cnlive.moudle.collectionTrace.service.CollStepService");
+            if (!isBaiduRun || !isKeepRun || !isStepRun) {
                 stopStepService();
                 startStepService(getContext());
             } else {
                 CollRunningMapActivity.startActivity(fragment.getActivity(), runRaceDetailInfo);
                 fragment.getActivity().finish();
             }
-        } else {
-            CollRunningMapActivity.startActivity(fragment.getActivity(), runRaceDetailInfo);
-            fragment.getActivity().finish();
-        }
+//        } else {
+//            CollRunningMapActivity.startActivity(fragment.getActivity(), runRaceDetailInfo);
+//            fragment.getActivity().finish();
+//        }
     }
     private void stopStepService() {
@@ -232,10 +236,13 @@ public class StartTraceFragmentView implements MvpView, SensorEventListener {
         CollCommonInfo.setIsRunKeepAliveService(getContext(), false);
         CollCommonInfo.setIsWriteUserStep(getContext(), false);
         CollCommonInfo.setIsFirstStepSendTraceTip(getContext(), true);
+
         if (CollStepService.mClient != null) {
             CollStepService.mClient.stopGather(CollStepService.traceListener);
         }
         fragment.getActivity().stopService(new Intent(fragment.getActivity(), CollStepService.class));
+        fragment.getActivity().stopService(new Intent(fragment.getActivity(), CollKeepLiveService.class));
+
     }
     /**
@@ -11,13 +11,14 @@ import com.cnlive.moudle.collectionTrace.frame.view.CollTraceListDetailFragmentV
 import com.cnlive.moudle.collectionTrace.model.RaceNameListInfo;
 import com.example.moudle_pedometer.R;
 import com.example.moudle_pedometer.databinding.FragmentCollFinishRunMapBinding;
+import com.example.moudle_pedometer.databinding.FragmentCollRaceDetailBinding;
 /**
  * 轨迹列表详情页
  *
  * @author ShinnyYang
  */
-public class CollTraceListDetailFragment extends QMUIFragment<CollTraceListDetailFragmentView, CollTraceListDetailFragmentPresenter, FragmentCollFinishRunMapBinding> {
+public class CollTraceListDetailFragment extends QMUIFragment<CollTraceListDetailFragmentView, CollTraceListDetailFragmentPresenter, FragmentCollRaceDetailBinding> {
     private RaceNameListInfo.EventShoeLinesBean eventShoeLinesBean;
     public static CollTraceListDetailFragment newInstance(RaceNameListInfo.EventShoeLinesBean eventShoeLinesBean) {
@@ -40,13 +41,13 @@ public class CollTraceListDetailFragment extends QMUIFragment&lt;CollTraceListDetai
     @Override
     protected int getLayoutId() {
-        return R.layout.fragment_coll_finish_run_map;
+        return R.layout.fragment_coll_race_detail;
     }
     @Override
     public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        StatusBarUtil2.setColor(getActivity(), getResources().getColor(R.color.white), 0);
+        StatusBarUtil2.setColor(getActivity(), getResources().getColor(R.color.run_main_bg), 0);
         if (null != getArguments()) {
             eventShoeLinesBean = (RaceNameListInfo.EventShoeLinesBean) getArguments().get("eventShoeLinesBean");
@@ -69,8 +69,8 @@ public class RaceNameListFragment extends MvpBindingFragment&lt;RaceNameListView, R
     }
-    public void addShoeLine(RaceNameListInfo.EventShoeLinesBean eventShoeLinesBean, int position) {
-        getPresenter().bindingShoeLine(getActivity(), eventShoeLinesBean.getId(), eventShoeLinesBean.getEventId(), position);
+    public void addShoeLine(RaceNameListInfo.EventShoeLinesBean eventShoeLinesBean, String fenceId, int position) {
+        getPresenter().bindingShoeLine(getActivity(), eventShoeLinesBean.getId(), eventShoeLinesBean.getEventId(), fenceId, eventShoeLinesBean.getEventName(), position);
     }
     public void delectShoeLine(RaceNameListInfo.EventShoeLinesBean eventShoeLinesBean, int position) {
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <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:gravity="bottom"
+            sothree:umanoDragView="@+id/dragView"
+            sothree:umanoFadeColor="@color/black_20"
+            sothree:umanoOverlay="true"
+            sothree:umanoPanelHeight="250dp"
+            sothree:umanoParallaxOffset="0dp"
+            sothree:umanoScrollableView="@+id/rv_list"
+            sothree:umanoShadowHeight="0dp">
+
+            <!-- MAIN CONTENT -->
+            <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+                <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
+                    android:id="@+id/fl_back"
+                    android:layout_width="55dp"
+                    android:layout_height="55dp"
+                    android:background="@drawable/button_fab_white"
+                    android:focusable="true">
+
+                    <ImageView
+                        android:layout_width="12dp"
+                        android:layout_height="20dp"
+                        android:layout_gravity="center"
+                        android:layout_marginLeft="-2dp"
+                        android:background="@drawable/icon_back"
+                        android:focusable="false" />
+                </FrameLayout>
+
+                <FrameLayout
+                    android:layout_width="55dp"
+                    android:layout_height="55dp"
+                    android:layout_gravity="right"
+                    android:background="@drawable/button_fab_white"
+                    android:focusable="true"
+                    android:visibility="gone">
+
+                    <ImageView
+                        android:layout_width="19dp"
+                        android:layout_height="18dp"
+                        android:layout_gravity="center"
+                        android:background="@drawable/icon_share" />
+                </FrameLayout>
+                <!---->
+
+
+            </FrameLayout>
+
+            <!-- SLIDING LAYOUT -->
+            <FrameLayout
+                android:id="@+id/dragView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:clickable="true"
+                android:focusable="false"
+                android:orientation="vertical">
+
+
+                <LinearLayout
+                    android:id="@+id/ll_root"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="0dp"
+                    android:orientation="vertical">
+
+
+                    <!--用户个人信息-->
+                    <include
+                        android:id="@+id/include_finish_user_info"
+                        layout="@layout/layout_coll_finish_user_info" />
+                </LinearLayout>
+
+
+            </FrameLayout>
+        </com.sothree.slidinguppanel.SlidingUpPanelLayout>
+        <!--按钮-->
+        <LinearLayout
+            android:id="@+id/rl_scrollView_startBtn"
+            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">
+
+
+            <TextView
+                android:id="@+id/tv_run_now"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
+                android:layout_marginLeft="5dp"
+                android:clickable="false"
+                android:focusable="false"
+                android:focusableInTouchMode="false"
+                android:tag="0"
+                android:text="确定轨迹"
+                android:textColor="@color/white"
+                android:textSize="18sp" />
+        </LinearLayout>
+    </FrameLayout>
+</layout>
 \ No newline at end of file