1 路径工具,打点页面逻辑

杨帅
1 parent 47b15bb5
Showing 12 changed files with 477 additions and 230 deletions
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/CollRunningMapFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/StartTraceFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/model/CollectPoint.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/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/drawable-hdpi/icon_map_import.png
moudle_pedometer/src/main/res/drawable-xhdpi/icon_map_import.png
moudle_pedometer/src/main/res/drawable-xxhdpi/icon_map_import.png
moudle_pedometer/src/main/res/layout/fragment_collect_running_map.xml
@@ -32,17 +32,20 @@ import com.baidu.mapapi.map.Overlay;
 import com.baidu.mapapi.map.UiSettings;
 import com.baidu.mapapi.model.LatLng;
 import com.baidu.mapapi.utils.DistanceUtil;
+import com.baidu.trace.model.SortType;
+import com.cnlive.moudle.collectionTrace.model.CollectPoint;
+import com.cnlive.moudle.collectionTrace.service.CollStepService;
 import com.cnlive.moudle.collectionTrace.ui.fragment.CollRunningMapFragment;
 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.sql.entity.CollUserStepEntity;
+import com.cnlive.moudle.pedometer.ui.widget.SelectDialog;
 import com.cnlive.moudle.pedometer.utils.BitmapUtil;
 import com.cnlive.moudle.pedometer.utils.ButtonAnimUtil;
 import com.cnlive.moudle.collectionTrace.utils.CollStepUtil;
 import com.cnlive.moudle.pedometer.utils.GsonUtil;
 import com.cnlive.moudle.pedometer.utils.MyMapUtil;
-import com.cnlive.moudle.pedometer.utils.StepUtil;
 import com.cnlive.moudle.pedometer.utils.TimeUtil;
 import com.example.moudle_pedometer.R;
 import com.hannesdorfmann.mosby3.mvp.MvpView;
@@ -60,26 +63,27 @@ public class CollRunningMapFragmentView implements MvpView, SensorEventListener 
     private BitmapDescriptor mCurrentMarker;//定位图标
     private static int accuracyCircleFillColor;
     private static int accuracyCircleStrokeColor;
-    private static MyLocationData mylocation;
+    private MyLocationData followMyLocation;
     boolean isFirstLoc = true; // 是否首次定位
     private MarkerOptions currentMark;
-    private LatLng myCurLatLng;
     private Double lastX = 0.0;
     private int mCurrentDirection = 0;
-    private double mCurrentLat = 0.0;
-    private double mCurrentLon = 0.0;
     private float mCurrentAccracy;
     // 定位相关
     private LocationClient mLocClient;
     public MyLocationListenner myListener = new MyLocationListenner();
-    private final int DEFULT_ZOOM = 17;
+    private int DEFULT_ZOOM = 17;
     private boolean isFirstLoadMap = true;
     private Overlay currentLine;
-    private List<LatLng> currentPoints;
+    private List<LatLng> currentWalkPoints;//用户当前行走的线的集合
     private CollUserStepEntity userStepEntity;
     private String uid;
     private RunRaceDetailInfo runRaceDetailInfo;
-    private List<Overlay> overlays;
+    private List<Overlay> allMapOverlays;
+    private SelectDialog selectDialog;
+    private boolean isShowFollowAddress = false;//是否显示跟随地址
+    private String currentAddress;
+    private LatLng currentImportLatLng;
     public CollRunningMapFragmentView(CollRunningMapFragment fragment) {
         this.fragment = fragment;
@@ -90,7 +94,7 @@ public class CollRunningMapFragmentView implements MvpView, SensorEventListener 
     }
     public void initView(RunRaceDetailInfo runRaceDetailInfo) {
-        currentPoints = new ArrayList<>();
+        initSelectDialog();
         this.runRaceDetailInfo = runRaceDetailInfo;
         uid = CollCommonInfo.getUserId(getContext());
         userStepEntity = CollStepUtil.getCollUserStepData(getContext(), uid);
@@ -102,7 +106,7 @@ public class CollRunningMapFragmentView implements MvpView, SensorEventListener 
                 CollStepUtil.setCollStreetTitle(getContext(), CollCommonInfo.getUserId(getContext()), runRaceDetailInfo.getTitle());
             }
             //设置开始时间和赛事id
-            if (TextUtils.isEmpty(userStepEntity.getStreetId())) {
+            if (0 == userStepEntity.getStartTimeStamp()) {
                 CollStepUtil.setCollStepStartData(getContext(), uid, TimeUtil.getNowTimeStamp(), CollCommonInfo.getStreetId(getContext()));
             }
             //设置步数
@@ -111,26 +115,87 @@ public class CollRunningMapFragmentView implements MvpView, SensorEventListener 
                 fragment.binding.tvCurrentDiatance.setText(CollStepUtil.getWalkDistanceKM(Long.parseLong(userStepEntity.getStepCount())) + "");
             }
             //设置是否需要设置起点信息
-            if (TextUtils.isEmpty(userStepEntity.getCollStartLatLng())||TextUtils.isEmpty(userStepEntity.getCollStartLatLngName())) {
+            if (TextUtils.isEmpty(userStepEntity.getCollStartPointData())) {
                 //开始设置
                 if (!TextUtils.isEmpty(runRaceDetailInfo.getCollStartLatLng()) && !TextUtils.isEmpty(runRaceDetailInfo.getCollStartLntLngName())) {
-                    CollStepUtil.setCollStartPointData(getContext(), uid, runRaceDetailInfo.getCollStartLntLngName(), runRaceDetailInfo.getCollStartLatLng());
+                    CollectPoint collectPoint = new CollectPoint();
+                    LatLng latLng = GsonUtil.GsonToBean(runRaceDetailInfo.getCollStartLatLng(), LatLng.class);
+                    if (null != latLng) {
+                        collectPoint.setLatitude(latLng.latitude);
+                        collectPoint.setLongitude(latLng.longitude);
+                        collectPoint.setPointName(runRaceDetailInfo.getCollStartLntLngName());
+                        CollStepUtil.setCollStartPointData(getContext(), uid, collectPoint);
+                    }
                 }
             }
             initChrom();
             //初始化起点
-            overlays = new ArrayList<>();
+            allMapOverlays = new ArrayList<>();
             //打起点(重新获取数据)
             userStepEntity = CollStepUtil.getCollUserStepData(getContext(), uid);
-            if (!TextUtils.isEmpty(userStepEntity.getCollStartLatLng())) {
-                LatLng startLatLng = GsonUtil.GsonToBean(userStepEntity.getCollStartLatLng(), LatLng.class);
-                if (null != startLatLng) {
-                    List<Overlay> resultOverlays = MyMapUtil.setStartMarker(getContext(), baiduMap, startLatLng, R.drawable.icon_start);
-                    if (null != resultOverlays) {
-                        this.overlays.addAll(resultOverlays);
+            //查询历史轨迹(用于用户返回后再次进入,无法显示轨迹问题)
+            if (0 != userStepEntity.getStartTimeStamp()) {
+                //获取当前时间戳
+                long currentTimeStamp = TimeUtil.getNowTimeStamp();
+                //获取用户开始时间
+                long userStartTime = userStepEntity.getStartTimeStamp();
+                double result = currentTimeStamp - userStartTime;
+                //超过一分钟才进行查询
+                if (result > 1 * 60) {
+                    if (null != CollStepService.mClient) {
+                        MyMapUtil.queryHistoryTrace(getContext(), CollStepService.mClient, CollStepService.entityName, userStartTime, currentTimeStamp, 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, 0);
+                                    //将最后一个点添加到用户走的线中
+                                    currentWalkPoints = new ArrayList<>();
+                                    currentWalkPoints.add(resultPoints.get(resultPoints.size() - 1));
+                                }
+                            }
+                        });
+                    }
+                } else {
+                    //绘制起点
+                    if (!TextUtils.isEmpty(userStepEntity.getCollStartPointData())) {
+                        CollectPoint collectPoint = GsonUtil.GsonToBean(userStepEntity.getCollStartPointData(), CollectPoint.class);
+                        if (null != collectPoint) {
+                            LatLng startLatLng = new LatLng(collectPoint.getLatitude(), collectPoint.getLongitude());
+                            //把起点添加到用户走的实时轨迹中
+                            currentWalkPoints = new ArrayList<>();
+                            currentWalkPoints.add(startLatLng);
+                            List<Overlay> resultOverlays = MyMapUtil.setStartMarker(getContext(), baiduMap, startLatLng, R.drawable.icon_start);
+                            if (null != resultOverlays) {
+                                this.allMapOverlays.addAll(resultOverlays);
+                            }
+                        }
+                    }
+                    //
+                }
+                //
+            }
+
+
+            //更新可打点数量
+            int remainPointNum = updataCanTakePointCount();
+            if (remainPointNum != 0) {
+                //展示点位信息
+                List<CollectPoint> collectPoints = CollStepUtil.getCollImportPointList(getContext(), CollCommonInfo.getUserId(getContext()));
+                if (null != collectPoints) {
+                    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);
+                            }
+                        }
                     }
                 }
             }
+            //
         }
         //返回键
         fragment.binding.flBack.setOnTouchListener(new View.OnTouchListener() {
@@ -172,7 +237,83 @@ public class CollRunningMapFragmentView implements MvpView, SensorEventListener 
                 isFirstLoc = true;
             }
         });
+        //开始打点
+        fragment.binding.flTakeImportPoint.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                //更新可打点数量
+                int remainNum = updataCanTakePointCount();
+                if (remainNum != 0) {
+                    //获取当前地点
+                    if (!TextUtils.isEmpty(currentAddress)) {
+                        if (null != followMyLocation) {
+                            currentImportLatLng = new LatLng(followMyLocation.latitude, followMyLocation.longitude);
+                        }
+                        selectDialog.setTipMessage("确定在" + "\"" + currentAddress + "\"" + "打点?");
+                        selectDialog.show();
+                    } else {
+                        isShowFollowAddress = true;
+                        Toast.makeText(getContext(), "正在获取当前地点信息,请稍后", Toast.LENGTH_SHORT).show();
+                    }
+                } else {
+                    Toast.makeText(getContext(), "打点数量超过最大限制,无法打点!", Toast.LENGTH_SHORT).show();
+                }
+            }
+        });
+
+    }
+    /**
+     * 更新可打点位数量
+     *
+     * @return
+     */
+    private int updataCanTakePointCount() {
+        //获取用户可打点的数量
+        int canTakePointCount = CollStepUtil.getCollImportPointSize(getContext(), CollCommonInfo.getUserId(getContext()));
+        if (canTakePointCount < 98) {
+            canTakePointCount = 98 - canTakePointCount;
+        } else {
+            canTakePointCount = 0;
+        }
+        fragment.binding.tvCanTakePointSize.setText("可打点数量:" + canTakePointCount + "个");
+        return canTakePointCount;
+    }
+
+    private void initSelectDialog() {
+        if (selectDialog == null) {
+            selectDialog = new SelectDialog(getContext(), "标题", "否", new SelectDialog.DialogInterface() {
+                @Override
+                public void onClick(SelectDialog dialog) {
+                    dialog.dismiss();
+                    isShowFollowAddress = false;
+                }
+            }, "是", new SelectDialog.DialogInterface() {
+                @Override
+                public void onClick(SelectDialog dialog) {
+                    dialog.dismiss();
+                    isShowFollowAddress = false;
+                    if (null == currentImportLatLng || TextUtils.isEmpty(currentAddress)) {
+                        return;
+                    }
+                    //将点位保存在数据库中
+                    CollectPoint collectPoint = new CollectPoint();
+                    collectPoint.setLatitude(currentImportLatLng.latitude);
+                    collectPoint.setLongitude(currentImportLatLng.longitude);
+                    collectPoint.setPointName(currentAddress);
+                    CollStepUtil.setCollImportPoints(getContext(), CollCommonInfo.getUserId(getContext()), collectPoint);
+                    //将点位显示到地图上
+                    Overlay overlay = MyMapUtil.setMapMarker(getContext(), baiduMap, currentImportLatLng, R.drawable.icon_map_import);
+                    if (null != overlay) {
+                        allMapOverlays.add(overlay);
+                    }
+                    //更新可打点数量
+                    updataCanTakePointCount();
+                }
+            });
+            selectDialog.setCancelable(false);
+            selectDialog.setCanceledOnTouchOutside(false);
+        }
     }
     private void initChrom() {
@@ -272,9 +413,9 @@ public class CollRunningMapFragmentView implements MvpView, SensorEventListener 
         //LocationMode. Device_Sensors：仅使用设备；
         option.setLocationMode(LocationClientOption.LocationMode.Hight_Accuracy);
         //可选，设置是否需要地址信息，默认不需要
-        option.setIsNeedAddress(false);
+        option.setIsNeedAddress(true);
         //可选，设置是否需要地址描述
-        option.setIsNeedLocationDescribe(false);
+        option.setIsNeedLocationDescribe(true);
         //可选，设置是否需要设备方向结果
         option.setNeedDeviceDirect(false);
         //设置打开自动回调位置模式，该开关打开后，期间只要定位SDK检测到位置变化就会主动回调给开发者
@@ -320,9 +461,80 @@ public class CollRunningMapFragmentView implements MvpView, SensorEventListener 
         @Override
         public void onReceiveLocation(BDLocation location) {
             // map view 销毁后不在处理新接收的位置
-            if (location == null || mMapView == null) {
+            if (location == null || mMapView == null || getContext() == null) {
                 return;
             }
+            Log.e(TAG, "onReceiveLocation: 定位地点" + location.getAddress().address);
+
+            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;
+//            }
+            MapStatus.Builder builder = new MapStatus.Builder();
+            //第一次定位
+            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;
+                }
+                if (null != currentWalkPoints && currentWalkPoints.size() > 0) {
+                    //进行判断
+                    LatLng lastLatLng = currentWalkPoints.get(currentWalkPoints.size() - 1);
+                    LatLng curLatLng = new LatLng(location.getLatitude(),
+                            location.getLongitude());
+                    if (DistanceUtil.getDistance(lastLatLng, curLatLng) > 0.5) {
+                        currentWalkPoints.add(curLatLng);
+                    }
+                } else {
+                    currentWalkPoints.add(new LatLng(location.getLatitude(),
+                            location.getLongitude()));
+                }
+
+                //判断当前集合列表是否可以划线(至少两个点)
+                if (currentWalkPoints != null && currentWalkPoints.size() > 1) {
+                    //判断当前是否已经在地图上画点
+                    if (currentLine != null) {
+                        currentLine.remove();
+                    }
+                    currentLine = MyMapUtil.drawMapLine(getContext(), baiduMap, currentWalkPoints, R.color.green_round);
+                }
+            }
+            Log.e(TAG, "onReceiveLocation: 运行");
+            currentAddress = location.getLocationDescribe();
+            if (TextUtils.isEmpty(currentAddress)) {
+                if (null != location.getAddress()) {
+                    currentAddress = location.getAddress().address;
+                }
+            }
+
+            if (isShowFollowAddress && !TextUtils.isEmpty(currentAddress)) {
+                //设置当前打点经纬度
+                currentImportLatLng = new LatLng(location.getLatitude(), location.getLongitude());
+                if (isShowFollowAddress && selectDialog != null && !selectDialog.isShowing()) {
+                    if (!TextUtils.isEmpty(currentAddress)) {
+                        selectDialog.setTipMessage("确定将" + "\"" + currentAddress + "\"" + "设置开始地点?");
+                        if (!selectDialog.isShowing()) {
+                            selectDialog.show();
+                        }
+                        isShowFollowAddress = false;
+                    }
+                }
+            }
             //正在搜索GPS信号
             if (location.getGpsAccuracyStatus() == BDLocation.GPS_ACCURACY_UNKNOWN) {
@@ -373,66 +585,9 @@ public class CollRunningMapFragmentView implements MvpView, SensorEventListener 
                     fragment.binding.ivGpsState.setBackground(getContext().getResources().getDrawable(R.drawable.rt_training_gps_3));
                 }
             }
+        }
-            if (isFirstLoc) {
-                isFirstLoc = false;
-                if (location.getRadius() > Constant.LOCA_ACCURACY) {
-                    Toast.makeText(getContext(), "当前定位精度为:" + location.getRadius() + "米,请您移动至空旷地带!", Toast.LENGTH_SHORT).show();
-                }
-
-
-            } else {
-                //过滤定位精度
-                if (location.getRadius() > Constant.LOCA_ACCURACY) {
-                    return;
-                }
-            }
-            mCurrentAccracy = location.getRadius();
-            mylocation = new MyLocationData.Builder()
-                    .accuracy(location.getRadius())
-                    // 此处设置开发者获取到的方向信息，顺时针0-360
-                    .direction(mCurrentDirection).latitude(location.getLatitude())
-                    .longitude(location.getLongitude()).build();
-            if (mylocation == null || mylocation.latitude == 0 || mylocation.longitude == 0) {
-                return;
-            }
-            MapStatus.Builder builder = new MapStatus.Builder();
-            //不是第一次定位状态
-            if (!isFirstLoc) {
-                baiduMap.setMyLocationData(mylocation);
-                builder.target(new LatLng(mylocation.latitude, mylocation.longitude)).zoom(DEFULT_ZOOM);
-                baiduMap.animateMapStatus(MapStatusUpdateFactory.newMapStatus(builder.build()));
-                if (currentPoints.size() > 0) {
-                    //进行判断
-                    LatLng lastLatLng = currentPoints.get(currentPoints.size() - 1);
-                    LatLng curLatLng = new LatLng(location.getLatitude(),
-                            location.getLongitude());
-                    if (DistanceUtil.getDistance(lastLatLng, curLatLng) > 0.5) {
-                        currentPoints.add(curLatLng);
-                    }
-                } else {
-                    currentPoints.add(new LatLng(location.getLatitude(),
-                            location.getLongitude()));
-                }
-
-                //判断当前集合列表是否可以划线(至少两个点)
-                if (currentPoints != null && currentPoints.size() > 1) {
-                    //判断当前是否已经在地图上画点
-                    if (currentLine != null) {
-                        currentLine.remove();
-                    }
-                    //开始划线
-                    if (getContext() == null) {
-                        return;
-                    }
-                    currentLine = MyMapUtil.drawMapLine(getContext(), baiduMap, currentPoints, R.color.red);
-                }
-            }
-            myCurLatLng = new LatLng(location.getLatitude(),
-                    location.getLongitude());
-            baiduMap.setMyLocationData(mylocation);
-        }
     }
@@ -483,13 +638,13 @@ public class CollRunningMapFragmentView implements MvpView, SensorEventListener 
         double x = sensorEvent.values[SensorManager.DATA_X];
         if (Math.abs(x - lastX) > 1.0) {
             mCurrentDirection = (int) x;
-            if (mylocation != null) {
-                mylocation = new MyLocationData.Builder()
+            if (followMyLocation != null) {
+                followMyLocation = new MyLocationData.Builder()
                         .accuracy(mCurrentAccracy)
                         // 此处设置开发者获取到的方向信息，顺时针0-360
-                        .direction(mCurrentDirection).latitude(mylocation.latitude)
-                        .longitude(mylocation.longitude).build();
-                baiduMap.setMyLocationData(mylocation);
+                        .direction(mCurrentDirection).latitude(followMyLocation.latitude)
+                        .longitude(followMyLocation.longitude).build();
+                baiduMap.setMyLocationData(followMyLocation);
             }
         }
         lastX = x;
@@ -506,12 +661,12 @@ public class CollRunningMapFragmentView implements MvpView, SensorEventListener 
      * @param lastPoint
      */
     public void setHistoryLastPoint(LatLng lastPoint) {
-        if (currentPoints != null) {
-            currentPoints.clear();
-            currentPoints.add(lastPoint);
+        if (currentWalkPoints != null) {
+            currentWalkPoints.clear();
+            currentWalkPoints.add(lastPoint);
         } else {
-            currentPoints = new ArrayList<>();
-            currentPoints.add(lastPoint);
+            currentWalkPoints = new ArrayList<>();
+            currentWalkPoints.add(lastPoint);
         }
     }
@@ -108,12 +108,12 @@ public class StartTraceFragmentView implements MvpView, SensorEventListener {
         fragment.binding.btnIdentify.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                isShowFollowAddress = true;
                 //获取当前地点
                 if (!TextUtils.isEmpty(currentAddress)) {
                     selectDialog.setTipMessage("确定将" + "\"" + currentAddress + "\"" + "设置开始地点?");
                     selectDialog.show();
                 } else {
+                    isShowFollowAddress = true;
                     Toast.makeText(getContext(), "正在获取当前地点信息,请稍后", Toast.LENGTH_SHORT).show();
                 }
             }
@@ -305,13 +305,12 @@ public class StartTraceFragmentView implements MvpView, SensorEventListener {
                     .longitude(location.getLongitude()).build();
 //            currentAddress = location.getAddrStr();
             currentAddress = location.getLocationDescribe();
-            if (selectDialog != null && selectDialog.isShowing()) {
-                selectDialog.setTipMessage(currentAddress);
-            }
             if (isShowFollowAddress && selectDialog != null && !selectDialog.isShowing()) {
                 if (!TextUtils.isEmpty(currentAddress)) {
                     selectDialog.setTipMessage("确定将" + "\"" + currentAddress + "\"" + "设置开始地点?");
-                    selectDialog.show();
+                    if (!selectDialog.isShowing()) {
+                        selectDialog.show();
+                    }
                 }
             }
             if (followMyLocation == null || followMyLocation.latitude == 0 || followMyLocation.longitude == 0) {
@@ -3,24 +3,24 @@ package com.cnlive.moudle.collectionTrace.model;
 import com.baidu.mapapi.model.LatLng;
 public class CollectPoint {
-    private double lat;
-    private double lng;
+    private double latitude;
+    private double longitude;
     private String pointName;
-    public double getLat() {
-        return lat;
+    public double getLatitude() {
+        return latitude;
     }
-    public void setLat(double lat) {
-        this.lat = lat;
+    public void setLatitude(double latitude) {
+        this.latitude = latitude;
     }
-    public double getLng() {
-        return lng;
+    public double getLongitude() {
+        return longitude;
     }
-    public void setLng(double lng) {
-        this.lng = lng;
+    public void setLongitude(double longitude) {
+        this.longitude = longitude;
     }
     public String getPointName() {
@@ -33,6 +33,61 @@ public class CollStepUtil {
     }
     /**
+     * 获取打点详细
+     *
+     * @param context
+     * @param uid
+     */
+    public static List<CollectPoint> getCollImportPointList(Context context, String uid) {
+        //先获取有没有
+        if (getCollUserStepData(context, uid) != null) {
+            CollUserStepEntity entity = getCollUserStepData(context, uid);
+            if (null != entity) {
+                //判断有没有打过点
+                if (!TextUtils.isEmpty(entity.getImportPoint())) {
+                    //已经打过点,先把打的点取出来
+                    List<CollectPoint> lngs = GsonUtil.jsonToList(entity.getImportPoint(), CollectPoint.class);
+                    if (null != lngs) {
+                        return lngs;
+                    } else {
+                        return null;
+                    }
+                }
+            }
+        }
+        return null;
+    }
+
+
+    /**
+     * 获取打点数量重要点
+     *
+     * @param context
+     * @param uid
+     */
+    public static int getCollImportPointSize(Context context, String uid) {
+        //先获取有没有
+        if (getCollUserStepData(context, uid) != null) {
+            CollUserStepEntity entity = getCollUserStepData(context, uid);
+            if (null != entity) {
+                //判断有没有打过点
+                if (!TextUtils.isEmpty(entity.getImportPoint())) {
+                    //已经打过点,先把打的点取出来
+                    List<CollectPoint> lngs = GsonUtil.jsonToList(entity.getImportPoint(), CollectPoint.class);
+                    if (null != lngs) {
+                        return lngs.size();
+                    } else {
+                        return 98;
+                    }
+                } else {
+                    return 0;
+                }
+            }
+        }
+        return 98;
+    }
+
+    /**
      * 初始化数据库
      *
      * @param context
@@ -53,16 +108,13 @@ public class CollStepUtil {
      *
      * @param context
      * @param uid
-     * @param startPointName
-     * @param startPointLatLng
      */
-    public static void setCollStartPointData(Context context, String uid, String startPointName, String startPointLatLng) {
+    public static void setCollStartPointData(Context context, String uid, CollectPoint collectPoint) {
         //先获取有没有
         if (getCollUserStepData(context, uid) != null) {
             CollUserStepEntity entity = getCollUserStepData(context, uid);
             if (null != entity) {
-                entity.setCollStartLatLngName(startPointName);
-                entity.setCollStartLatLng(startPointLatLng);
+                entity.setCollStartPointData(GsonUtil.GsonString(collectPoint));
                 //更新数据
                 updateCollStepData(context, entity);
             }
@@ -74,9 +126,9 @@ public class CollStepUtil {
      *
      * @param context
      * @param uid
-     * @param latLng
+     * @param collectPoint
      */
-    public static void setImportPoints(Context context, String uid, LatLng latLng) {
+    public static void setCollImportPoints(Context context, String uid, CollectPoint collectPoint) {
         //先获取有没有
         if (getCollUserStepData(context, uid) != null) {
             CollUserStepEntity entity = getCollUserStepData(context, uid);
@@ -84,11 +136,11 @@ public class CollStepUtil {
                 //判断有没有打过点
                 if (!TextUtils.isEmpty(entity.getImportPoint())) {
                     //已经打过点,先把打的点取出来
-                    List<LatLng> lngs = GsonUtil.jsonToList(entity.getImportPoint(), LatLng.class);
+                    List<CollectPoint> lngs = GsonUtil.jsonToList(entity.getImportPoint(), CollectPoint.class);
                     if (null != lngs) {
                         //加入新打的点
-                        if (!lngs.contains(latLng)) {
-                            lngs.add(latLng);
+                        if (!lngs.contains(collectPoint)) {
+                            lngs.add(collectPoint);
                             //重新设置打的点
                             entity.setImportPoint(GsonUtil.GsonString(lngs));
                             //更新数据
@@ -100,8 +152,8 @@ public class CollStepUtil {
                 //没有打过点
                 else {
                     //则设置一个
-                    List<LatLng> lngs = new ArrayList<>();
-                    lngs.add(latLng);
+                    List<CollectPoint> lngs = new ArrayList<>();
+                    lngs.add(collectPoint);
                     //重新设置打的点
                     entity.setImportPoint(GsonUtil.GsonString(lngs));
                     //更新数据
 package com.cnlive.moudle.pedometer.model;
 public class Constant {
-//    public static final long SERVICE_ID = 213511;//公司账号
+    //    public static final long SERVICE_ID = 213511;//公司账号
     public static final long SERVICE_ID = 213553;
     public static final int TAG = 1;
@@ -15,6 +15,9 @@ public class Constant {
     public static final int FRAGMENT_RUN_CHRONOMETER = 4;//同步计时器
     public static final int EXIT_RANGE = 5;//超出范围
     public static final int ENTER_RANGE = 6;//进入范围
+
+
+    /*****************************************运营工具****************************************************/
     public static final int COLL_SERVICE_STEP_COUNT_RESET_SPEED = 3;//重置速度
     public static final int COLL_SERVICE_STEP_COUNT_UPDATE = 0;//步数更新
     public static final int COLL_START_TRACE_GATHER_SUCCESS = 7;//启动轨迹服务成功(运营)
@@ -45,8 +45,7 @@ public class CollUserStepEntityDao extends AbstractDao&lt;CollUserStepEntity, Strin
         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");
         public final static Property IsArriveEndPoint = new Property(20, boolean.class, "isArriveEndPoint", false, "IS_ARRIVE_END_POINT");
-        public final static Property CollStartLatLngName = new Property(21, String.class, "collStartLatLngName", false, "COLL_START_LAT_LNG_NAME");
-        public final static Property CollStartLatLng = new Property(22, String.class, "collStartLatLng", false, "COLL_START_LAT_LNG");
+        public final static Property CollStartPointData = new Property(21, String.class, "collStartPointData", false, "COLL_START_POINT_DATA");
     }
@@ -83,8 +82,7 @@ public class CollUserStepEntityDao extends AbstractDao&lt;CollUserStepEntity, Strin
                 "\"STREET_TITLE\" TEXT," + // 18: streetTitle
                 "\"END_LAT_LNG\" TEXT," + // 19: endLatLng
                 "\"IS_ARRIVE_END_POINT\" INTEGER NOT NULL ," + // 20: isArriveEndPoint
-                "\"COLL_START_LAT_LNG_NAME\" TEXT," + // 21: collStartLatLngName
-                "\"COLL_START_LAT_LNG\" TEXT);"); // 22: collStartLatLng
+                "\"COLL_START_POINT_DATA\" TEXT);"); // 21: collStartPointData
     }
     /** Drops the underlying database table. */
@@ -154,14 +152,9 @@ public class CollUserStepEntityDao extends AbstractDao&lt;CollUserStepEntity, Strin
         }
         stmt.bindLong(21, entity.getIsArriveEndPoint() ? 1L: 0L);
-        String collStartLatLngName = entity.getCollStartLatLngName();
-        if (collStartLatLngName != null) {
-            stmt.bindString(22, collStartLatLngName);
-        }
- 
-        String collStartLatLng = entity.getCollStartLatLng();
-        if (collStartLatLng != null) {
-            stmt.bindString(23, collStartLatLng);
+        String collStartPointData = entity.getCollStartPointData();
+        if (collStartPointData != null) {
+            stmt.bindString(22, collStartPointData);
         }
     }
@@ -226,14 +219,9 @@ public class CollUserStepEntityDao extends AbstractDao&lt;CollUserStepEntity, Strin
         }
         stmt.bindLong(21, entity.getIsArriveEndPoint() ? 1L: 0L);
-        String collStartLatLngName = entity.getCollStartLatLngName();
-        if (collStartLatLngName != null) {
-            stmt.bindString(22, collStartLatLngName);
-        }
- 
-        String collStartLatLng = entity.getCollStartLatLng();
-        if (collStartLatLng != null) {
-            stmt.bindString(23, collStartLatLng);
+        String collStartPointData = entity.getCollStartPointData();
+        if (collStartPointData != null) {
+            stmt.bindString(22, collStartPointData);
         }
     }
@@ -266,8 +254,7 @@ public class CollUserStepEntityDao extends AbstractDao&lt;CollUserStepEntity, Strin
             cursor.isNull(offset + 18) ? null : cursor.getString(offset + 18), // streetTitle
             cursor.isNull(offset + 19) ? null : cursor.getString(offset + 19), // endLatLng
             cursor.getShort(offset + 20) != 0, // isArriveEndPoint
-            cursor.isNull(offset + 21) ? null : cursor.getString(offset + 21), // collStartLatLngName
-            cursor.isNull(offset + 22) ? null : cursor.getString(offset + 22) // collStartLatLng
+            cursor.isNull(offset + 21) ? null : cursor.getString(offset + 21) // collStartPointData
         );
         return entity;
     }
@@ -295,8 +282,7 @@ public class CollUserStepEntityDao extends AbstractDao&lt;CollUserStepEntity, Strin
         entity.setStreetTitle(cursor.isNull(offset + 18) ? null : cursor.getString(offset + 18));
         entity.setEndLatLng(cursor.isNull(offset + 19) ? null : cursor.getString(offset + 19));
         entity.setIsArriveEndPoint(cursor.getShort(offset + 20) != 0);
-        entity.setCollStartLatLngName(cursor.isNull(offset + 21) ? null : cursor.getString(offset + 21));
-        entity.setCollStartLatLng(cursor.isNull(offset + 22) ? null : cursor.getString(offset + 22));
+        entity.setCollStartPointData(cursor.isNull(offset + 21) ? null : cursor.getString(offset + 21));
      }
     @Override
@@ -28,15 +28,14 @@ public class CollUserStepEntity {
     private String streetTitle;//赛事标题
     private String endLatLng;//终点坐标
     private boolean isArriveEndPoint;//是否到达终点
-    private String collStartLatLngName;//运营打点名称
-    private String collStartLatLng;//运营打点名称
+    private String collStartPointData;//运营打点名称和经纬度
-    @Generated(hash = 1127995406)
+    @Generated(hash = 1720877205)
     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 collStartLatLngName, String collStartLatLng) {
+            String endLatLng, boolean isArriveEndPoint, String collStartPointData) {
         this.userId = userId;
         this.date = date;
         this.stepCount = stepCount;
@@ -58,8 +57,7 @@ public class CollUserStepEntity {
         this.streetTitle = streetTitle;
         this.endLatLng = endLatLng;
         this.isArriveEndPoint = isArriveEndPoint;
-        this.collStartLatLngName = collStartLatLngName;
-        this.collStartLatLng = collStartLatLng;
+        this.collStartPointData = collStartPointData;
     }
     @Generated(hash = 681143087)
@@ -235,20 +233,13 @@ public class CollUserStepEntity {
         this.isArriveEndPoint = isArriveEndPoint;
     }
-    public String getCollStartLatLngName() {
-        return this.collStartLatLngName;
-    }
-
-    public void setCollStartLatLngName(String collStartLatLngName) {
-        this.collStartLatLngName = collStartLatLngName;
-    }
-    public String getCollStartLatLng() {
-        return this.collStartLatLng;
+    public String getCollStartPointData() {
+        return this.collStartPointData;
     }
-    public void setCollStartLatLng(String collStartLatLng) {
-        this.collStartLatLng = collStartLatLng;
+    public void setCollStartPointData(String collStartPointData) {
+        this.collStartPointData = collStartPointData;
     }
@@ -52,6 +52,48 @@ public class MyMapUtil {
     private static int pageIndex = 1;
     private static List<LatLng> trackPoints;
+
+    /**
+     * 在地图上进行打点
+     *
+     * @param context
+     * @param baiduMap
+     * @param startLatLng
+     * @param startIconRes
+     * @return
+     */
+    public static Overlay setMapMarker(Context context, BaiduMap baiduMap, LatLng startLatLng, int startIconRes) {
+        if (0 == startIconRes || null == startLatLng || null == context || null == baiduMap) {
+            return null;
+        }
+        try {
+            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));
+            }
+
+            if (startOptions != null) {
+                return baiduMap.addOverlay(startOptions);
+
+            } else {
+                return null;
+            }
+        } catch (
+                Exception e) {
+            return null;
+        }
+    }
+
+    /**
+     * 打上运营选择的开始点
+     *
+     * @param context
+     * @param baiduMap
+     * @param startLatLng
+     * @param startIconRes
+     * @return
+     */
     public static List<Overlay> setStartMarker(Context context, BaiduMap baiduMap, LatLng startLatLng, int startIconRes) {
         if (0 == startIconRes || null == startLatLng || null == context || null == baiduMap) {
             return null;
@@ -50,9 +50,9 @@
                 android:layout_width="80dp"
                 android:layout_height="35dp"
                 android:layout_gravity="right"
-                android:scaleType="fitXY"
                 android:background="@drawable/gps_white_shadow"
-                android:gravity="center">
+                android:gravity="center"
+                android:scaleType="fitXY">
                 <TextView
                     android:layout_width="wrap_content"
@@ -121,6 +121,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:layout_marginBottom="5dp"
+                android:focusable="false"
                 android:text="打点"
                 android:textColor="@color/text_black"
                 android:textSize="15sp" />
@@ -148,90 +149,108 @@
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="130dp"
+            android:layout_height="140dp"
             android:layout_gravity="bottom"
             android:layout_marginBottom="10dp"
             android:background="@drawable/white_shadow_bg"
+            android:orientation="vertical"
             android:scaleX="1.02">
+            <TextView
+                android:id="@+id/tv_can_take_point_size"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="30dp"
+                android:layout_marginTop="10dp"
+                android:text="可打点数量"
+                android:textColor="@color/text_black"
+                android:textSize="12sp"
+                android:textStyle="bold" />
+
             <LinearLayout
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1.2"
-                android:gravity="center"
-                android:orientation="vertical"
-                android:paddingLeft="5dp"
-                android:paddingRight="5dp">
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
-                <TextView
-                    android:id="@+id/tv_current_speed"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="--"
-                    android:textColor="@color/black"
-                    android:textSize="20sp"
-                    android:textStyle="bold" />
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1.2"
+                    android:gravity="center"
+                    android:orientation="vertical"
+                    android:paddingLeft="5dp"
+                    android:paddingRight="5dp">
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="10dp"
-                    android:text="配速"
-                    android:textColor="@color/black"
-                    android:textSize="15sp" />
-            </LinearLayout>
+                    <TextView
+                        android:id="@+id/tv_current_speed"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="--"
+                        android:textColor="@color/black"
+                        android:textSize="20sp"
+                        android:textStyle="bold" />
-            <LinearLayout
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1.2"
-                android:gravity="center"
-                android:orientation="vertical">
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="10dp"
+                        android:text="配速"
+                        android:textColor="@color/black"
+                        android:textSize="15sp" />
+                </LinearLayout>
-                <Chronometer
-                    android:id="@+id/chronometer"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:format="00:00:00"
-                    android:textColor="@color/black"
-                    android:textSize="20sp"
-                    android:textStyle="bold" />
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1.2"
+                    android:gravity="center"
+                    android:orientation="vertical">
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="10dp"
-                    android:text="用时"
-                    android:textColor="@color/black"
-                    android:textSize="15sp" />
-            </LinearLayout>
+                    <Chronometer
+                        android:id="@+id/chronometer"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:format="00:00:00"
+                        android:textColor="@color/black"
+                        android:textSize="20sp"
+                        android:textStyle="bold" />
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="10dp"
+                        android:text="用时"
+                        android:textColor="@color/black"
+                        android:textSize="15sp" />
+                </LinearLayout>
-            <LinearLayout
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:gravity="center"
-                android:orientation="vertical"
-                android:paddingLeft="5dp"
-                android:paddingRight="5dp">
-                <TextView
-                    android:id="@+id/tv_current_diatance"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="--"
-                    android:textColor="@color/black"
-                    android:textSize="20sp"
-                    android:textStyle="bold" />
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_marginRight="10dp"
+                    android:layout_weight="1"
+                    android:gravity="center"
+                    android:orientation="vertical"
+                    android:paddingLeft="5dp"
+                    android:paddingRight="5dp">
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="10dp"
-                    android:text="距离(km)"
-                    android:textColor="@color/black"
-                    android:textSize="15sp" />
+                    <TextView
+                        android:id="@+id/tv_current_diatance"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="--"
+                        android:textColor="@color/black"
+                        android:textSize="20sp"
+                        android:textStyle="bold" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="10dp"
+                        android:text="距离(km)"
+                        android:textColor="@color/black"
+                        android:textSize="15sp" />
+                </LinearLayout>
             </LinearLayout>
         </LinearLayout>