1 修复轨迹工具上传数据时,绘制历史轨迹闪退问题

杨帅
1 parent 2cb5ca60
Showing 14 changed files with 474 additions and 363 deletions
app/src/main/java/com/example/modulepedometer/MainActivity.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/CollRunningFinishFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/CollRunningMapFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/CollTraceListDetailFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/StartTraceFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/service/CollKeepLiveService.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/service/CollStepService.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/activity/RaceListActivity.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/fragment/CollRunningFinishFragment.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/fragment/CollTraceListDetailFragment.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/utils/CollStepUtil.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/sql/dao/DaoMaster.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/sql/dao/DaoSession.java
moudle_pedometer/src/main/res/layout/fragment_collect_running_map.xml
@@ -31,8 +31,7 @@ public class MainActivity extends AppCompatActivity {
         findViewById(R.id.tooll).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                Intent intent = new Intent(MainActivity.this, RaceListActivity.class);
-                startActivity(intent);
+                RaceListActivity.newInstance(getApplicationContext(),"10513196",null,null);
                 //跳转界面
 //                CollRunningFinishActivity.startActivity(MainActivity.this);
             }
@@ -312,6 +312,8 @@ public class CollRunningFinishFragmentView implements MvpView, OnFenceListener {
                 if (null != resultPoints) {
                     //绘制轨迹
                     MyMapUtil.drawHistoryTrack(getContext(), baiduMap, resultPoints, SortType.asc, R.color.green_round, R.drawable.icon_start, R.drawable.icon_end);
+                    MyMapUtil.setMapAutoZoom(baiduMap, resultPoints,-1.5f);
+
                 } else {
                     SelectDialog selectDialog = new SelectDialog(getContext(), "轨迹获取失败,是否重试?", "取消", new SelectDialog.DialogInterface() {
                         @Override
@@ -475,37 +477,6 @@ public class CollRunningFinishFragmentView implements MvpView, OnFenceListener {
         mUiSettings.setCompassEnabled(false);
         //显示定位图层
         baiduMap.setMyLocationEnabled(false);
-        LocationClientOption option = new LocationClientOption();
-        option.setOpenGps(true); // 打开gps
-        //可选，设置返回经纬度坐标类型，默认GCJ02
-        //GCJ02：国测局坐标；
-        //BD09ll：百度经纬度坐标；
-        //BD09：百度墨卡托坐标；
-        //海外地区定位，无需设置坐标类型，统一返回WGS84类型坐标
-        option.setCoorType("gcj02"); // 设置坐标类型
-        //可选，默认false，设置是否开启Gps定位
-        option.setOpenGps(true);
-        //设置打开自动回调位置模式，该开关打开后，期间只要定位SDK检测到位置变化就会主动回调给开发者，该模式下开发者无需再关心定位间隔是多少，定位SDK本身发现位置变化就会及时回调给开发者
-        option.setOpenAutoNotifyMode();
-        //可选，默认高精度，设置定位模式，高精度，低功耗，仅设备
-        //LocationMode.Hight_Accuracy：高精度；
-        //LocationMode. Battery_Saving：低功耗；
-        //LocationMode. Device_Sensors：仅使用设备；
-        option.setLocationMode(LocationClientOption.LocationMode.Hight_Accuracy);
-        //可选，设置是否需要地址信息，默认不需要
-        option.setIsNeedAddress(false);
-        //可选，设置是否需要地址描述
-        option.setIsNeedLocationDescribe(false);
-        //可选，设置是否需要设备方向结果
-        option.setNeedDeviceDirect(false);
-        //设置打开自动回调位置模式，该开关打开后，期间只要定位SDK检测到位置变化就会主动回调给开发者
-        //minTimeInterval - 最短定位时间间隔，单位毫秒，最小值0，开发者可以在设置希望的位置回调最短时间间隔
-        //minDistance - 最短定位距离间隔，单位米，最小值0，开发者可以设置希望的位置回调距离间隔
-        //locSensitivity - 定位变化敏感程度,LOC_SENSITIVITY_HIGHT,LOC_SENSITIVITY_MIDDLE,LOC_SENSITIVITY_LOW
-        option.setOpenAutoNotifyMode(3000, 1, LocationClientOption.LOC_SENSITIVITY_HIGHT);
-        //可选，定位SDK内部是一个service，并放到了独立进程。
-        //设置是否在stop的时候杀死这个进程，默认（建议）不杀死，即setIgnoreKillProcess(true)
-        option.setIgnoreKillProcess(true);
     }
@@ -34,6 +34,7 @@ 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.libs.base.util.AlertUtil;
 import com.cnlive.moudle.collectionTrace.model.CollectPoint;
 import com.cnlive.moudle.collectionTrace.service.CollStepService;
 import com.cnlive.moudle.collectionTrace.ui.activity.CollRunningFinishActivity;
@@ -278,15 +279,21 @@ public class CollRunningMapFragmentView implements MvpView, SensorEventListener 
         fragment.binding.flEndPoint.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                if (null != followMyLocation) {
-                    currentImportLatLng = new LatLng(followMyLocation.latitude, followMyLocation.longitude);
-                    //获取当前地点
-                    if (!TextUtils.isEmpty(currentAddress)) {
-                        endSelectDialog.setTipMessage("确定将" + "\"" + currentAddress + "\"" + "设为结束地点?");
-                        endSelectDialog.show();
-                    } else {
-                        isShowEndFollowAddress = true;
-                        Toast.makeText(getContext(), "正在获取当前地点信息,请稍后", Toast.LENGTH_SHORT).show();
+                //先获取打点数量
+                int canTakePointCount = CollStepUtil.getCollImportPointSize(getContext(), CollCommonInfo.getUserId(getContext()));
+                if (0 == canTakePointCount) {
+                    AlertUtil.showDeftToast(getContext(), "您尚未打点,请打点后结束");
+                } else {
+                    if (null != followMyLocation) {
+                        currentImportLatLng = new LatLng(followMyLocation.latitude, followMyLocation.longitude);
+                        //获取当前地点
+                        if (!TextUtils.isEmpty(currentAddress)) {
+                            endSelectDialog.setTipMessage("确定将" + "\"" + currentAddress + "\"" + "设为结束地点?");
+                            endSelectDialog.show();
+                        } else {
+                            isShowEndFollowAddress = true;
+                            Toast.makeText(getContext(), "正在获取当前地点信息,请稍后", Toast.LENGTH_SHORT).show();
+                        }
                     }
                 }
             }
@@ -2,6 +2,8 @@ package com.cnlive.moudle.collectionTrace.frame.view;
 import android.app.Activity;
 import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
 import android.os.Handler;
 import android.support.v7.widget.LinearLayoutManager;
 import android.text.TextUtils;
@@ -9,8 +11,12 @@ import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
+import com.baidu.location.LocationClient;
+import com.baidu.location.LocationClientOption;
 import com.baidu.mapapi.map.BaiduMap;
+import com.baidu.mapapi.map.BitmapDescriptorFactory;
 import com.baidu.mapapi.map.MapView;
+import com.baidu.mapapi.map.MyLocationConfiguration;
 import com.baidu.mapapi.map.Overlay;
 import com.baidu.mapapi.map.UiSettings;
 import com.baidu.mapapi.model.LatLng;
@@ -44,6 +50,7 @@ import com.cnlive.moudle.collectionTrace.utils.CollStepUtil;
 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.model.Constant;
 import com.cnlive.moudle.pedometer.ui.widget.SelectDialog;
+import com.cnlive.moudle.pedometer.utils.BitmapUtil;
 import com.cnlive.moudle.pedometer.utils.GsonUtil;
 import com.cnlive.moudle.pedometer.utils.MyMapUtil;
 import com.cnlive.moudle.pedometer.utils.NetUtil;
@@ -76,6 +83,7 @@ public class CollTraceListDetailFragmentView implements MvpView, OnFenceListener
         this.fragment = fragment;
     }
+
     public Context getContext() {
         return fragment == null ? null : fragment.getActivity();
     }
@@ -110,56 +118,56 @@ public class CollTraceListDetailFragmentView implements MvpView, OnFenceListener
         fragment.binding.rlScrollViewStartBtn.setOnTouchListener(new View.OnTouchListener() {
             @Override
             public boolean onTouch(View view, MotionEvent motionEvent) {
-               if (motionEvent.getAction()==MotionEvent.ACTION_DOWN){
-                   if ("0".equals(fragment.binding.rlScrollViewStartBtn.getTag().toString())) {
-                       return false;
-                   }
-                   if (!NetUtil.isNetworkConnected(fragment.getActivity())) {
-                       AlertUtil.showDeftToast(fragment.getActivity(), "无法连接网络");
-                       return false;
-                   }
-                   importPoints = null;
-                   //设置打的重要点
-                   if (!TextUtils.isEmpty(eventShoeLinesBean.getLatLongitude())) {
-                       List<CollectPoint> collectPoints = GsonUtil.jsonToList(eventShoeLinesBean.getLatLongitude(), CollectPoint.class);
-                       if (null != collectPoints) {
-                           importPoints = new ArrayList<>();
-                           for (CollectPoint collectPoint : collectPoints) {
-                               com.baidu.trace.model.LatLng latLng = new com.baidu.trace.model.LatLng(collectPoint.getLatitude(), collectPoint.getLongitude());
-                               importPoints.add(latLng);
-                           }
-                       }
-                   }
-                   SelectDialog selectDialog = new SelectDialog(fragment.getActivity(), "确定绑定该轨迹？", "否", new SelectDialog.DialogInterface() {
-                       @Override
-                       public void onClick(SelectDialog dialog) {
-                           dialog.cancel();
-                       }
-                   }, "是", new SelectDialog.DialogInterface() {
-                       @Override
-                       public void onClick(SelectDialog dialog) {
-                           dialog.cancel();
-                           //先判断当前是否已经绑定轨迹
-                           if (TextUtils.isEmpty(fenceEntityName)) {
-                               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(fenceEntityName);
-                           }
-
-                       }
-                   });
-                   selectDialog.setCancelable(false);
-                   selectDialog.setCanceledOnTouchOutside(false);
-                   selectDialog.show();
-                   //
-               }
+                if (motionEvent.getAction() == MotionEvent.ACTION_DOWN) {
+                    if ("0".equals(fragment.binding.rlScrollViewStartBtn.getTag().toString())) {
+                        return false;
+                    }
+                    if (!NetUtil.isNetworkConnected(fragment.getActivity())) {
+                        AlertUtil.showDeftToast(fragment.getActivity(), "无法连接网络");
+                        return false;
+                    }
+                    importPoints = null;
+                    //设置打的重要点
+                    if (!TextUtils.isEmpty(eventShoeLinesBean.getLatLongitude())) {
+                        List<CollectPoint> collectPoints = GsonUtil.jsonToList(eventShoeLinesBean.getLatLongitude(), CollectPoint.class);
+                        if (null != collectPoints) {
+                            importPoints = new ArrayList<>();
+                            for (CollectPoint collectPoint : collectPoints) {
+                                com.baidu.trace.model.LatLng latLng = new com.baidu.trace.model.LatLng(collectPoint.getLatitude(), collectPoint.getLongitude());
+                                importPoints.add(latLng);
+                            }
+                        }
+                    }
+                    SelectDialog selectDialog = new SelectDialog(fragment.getActivity(), "确定绑定该轨迹？", "否", new SelectDialog.DialogInterface() {
+                        @Override
+                        public void onClick(SelectDialog dialog) {
+                            dialog.cancel();
+                        }
+                    }, "是", new SelectDialog.DialogInterface() {
+                        @Override
+                        public void onClick(SelectDialog dialog) {
+                            dialog.cancel();
+                            //先判断当前是否已经绑定轨迹
+                            if (TextUtils.isEmpty(fenceEntityName)) {
+                                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(fenceEntityName);
+                            }
+
+                        }
+                    });
+                    selectDialog.setCancelable(false);
+                    selectDialog.setCanceledOnTouchOutside(false);
+                    selectDialog.show();
+                    //
+                }
                 return false;
             }
         });
@@ -223,7 +231,11 @@ public class CollTraceListDetailFragmentView implements MvpView, OnFenceListener
                 @Override
                 public void success(List<LatLng> resultPoints) {
                     if (null != resultPoints) {
+                        if (null == baiduMap) {
+                            return;
+                        }
                         MyMapUtil.drawHistoryTrack(getContext(), baiduMap, resultPoints, SortType.asc, R.color.green_round, R.drawable.icon_start, R.drawable.icon_end);
+                        MyMapUtil.setMapAutoZoom(baiduMap, resultPoints,-1.5f);
                     }
                 }
             });
@@ -265,6 +277,26 @@ public class CollTraceListDetailFragmentView implements MvpView, OnFenceListener
         }
     }
+    public void initMap() {
+        this.mMapView = fragment.binding.mapView;
+        if (baiduMap == null) {
+            baiduMap = mMapView.getMap();
+        }
+        if (mUiSettings == null) {
+            mUiSettings = baiduMap.getUiSettings();
+        }
+        //启动所有手势
+        mUiSettings.setAllGesturesEnabled(true);
+        //通过设置enable为true或false 选择是否显示缩放按钮
+        mMapView.showZoomControls(false);
+        mUiSettings.setEnlargeCenterWithDoubleClickEnable(true);
+        //隐藏自带的指南针，改用自定义指南针 杨帅
+        mUiSettings.setCompassEnabled(false);
+        //显示定位图层
+        baiduMap.setMyLocationEnabled(false);
+
+    }
+
     /**
      * 查询地理围栏
      */
@@ -10,6 +10,7 @@ import android.hardware.SensorEventListener;
 import android.hardware.SensorManager;
 import android.support.v4.content.ContextCompat;
 import android.text.TextUtils;
+import android.util.Log;
 import android.view.View;
 import android.widget.Toast;
@@ -27,9 +28,11 @@ import com.baidu.mapapi.map.MyLocationConfiguration;
 import com.baidu.mapapi.map.MyLocationData;
 import com.baidu.mapapi.map.UiSettings;
 import com.baidu.mapapi.model.LatLng;
+import com.cnlive.libs.base.util.AlertUtil;
 import com.cnlive.moudle.collectionTrace.service.CollKeepLiveService;
 import com.cnlive.moudle.collectionTrace.service.CollStepService;
 import com.cnlive.moudle.collectionTrace.ui.activity.CollRunRaceDetailActivity;
+import com.cnlive.moudle.collectionTrace.ui.activity.CollRunningFinishActivity;
 import com.cnlive.moudle.collectionTrace.ui.activity.CollRunningMapActivity;
 import com.cnlive.moudle.collectionTrace.ui.fragment.StartTraceFragment;
 import com.cnlive.moudle.collectionTrace.commonInfo.CollCommonInfo;
@@ -41,6 +44,7 @@ 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.GsonUtil;
+import com.cnlive.moudle.pedometer.utils.NetUtil;
 import com.cnlive.moudle.pedometer.utils.QMUITipDialogUtil;
 import com.cnlive.moudle.pedometer.utils.ServiceUtils;
 import com.cnlive.moudle.pedometer.utils.TimeUtil;
@@ -112,15 +116,19 @@ public class StartTraceFragmentView implements MvpView, SensorEventListener {
         fragment.binding.btnIdentify.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                //获取当前地点
-                if (!TextUtils.isEmpty(currentAddress)) {
-                    selectDialog.setTipMessage("确定将" + "\"" + currentAddress + "\"" + "设置开始地点?");
-                    selectDialog.show();
-                } else {
-                    isShowFollowAddress = true;
-                    Toast.makeText(getContext(), "正在获取当前地点信息,请稍后", Toast.LENGTH_SHORT).show();
+//                if (!NetUtil.isNetworkConnected(getContext())) {
+//                    AlertUtil.showDeftToast(getContext(), "无法连接网络,请稍后重试");
+//                } else {
+                    //获取当前地点
+                    if (!TextUtils.isEmpty(currentAddress)) {
+                        selectDialog.setTipMessage("确定将" + "\"" + currentAddress + "\"" + "设置开始地点?");
+                        selectDialog.show();
+                    } else {
+                        isShowFollowAddress = true;
+                        Toast.makeText(getContext(), "正在获取当前地点信息,请稍后", Toast.LENGTH_SHORT).show();
+                    }
                 }
-            }
+//            }
         });
     }
@@ -132,40 +140,67 @@ public class StartTraceFragmentView implements MvpView, SensorEventListener {
         //先判断有没有数据
         CollUserStepEntity userStepEntity = CollStepUtil.getCollUserStepData(getContext(), CommonInfo.getUserId(getContext()));
         if (null != userStepEntity) {
-            String eventId = CollCommonInfo.getStreetId(getContext());
-            //判断赛事id是否相同
-            String runStreetId = userStepEntity.getStreetId();
-            //是相同赛事id
-            if (eventId.equals(runStreetId)) {
-                //赛事相同(询问用户是否继续
-                SelectDialog selectDialog = new SelectDialog(getContext(), "是否继续运动", "否", new SelectDialog.DialogInterface() {
-                    @Override
-                    public void onClick(SelectDialog dialog) {
-                        //删除数据
-                        CollStepUtil.clearRunData(getContext(), CollCommonInfo.getUserId(getContext()));
-                        stopStepService();
-                        //清除数据
-                        CollCommonInfo.reset(getContext());
-                        dialog.dismiss();
-                    }
-                }, "是", new SelectDialog.DialogInterface() {
-                    @Override
-                    public void onClick(SelectDialog dialog) {
-                        //继续运动
-                        dialog.dismiss();
-                        //检查百度是否正在运行
-                        checkBaiduServiceState();
+            //判断用户是否点击wanc
+            if (0 == userStepEntity.getFinishTimeStamp()) {
+                String eventId = CollCommonInfo.getStreetId(getContext());
+                //判断赛事id是否相同
+                String runStreetId = userStepEntity.getStreetId();
+                //是相同赛事id
+                if (eventId.equals(runStreetId)) {
+                    //赛事相同(询问用户是否继续
+                    SelectDialog selectDialog = new SelectDialog(getContext(), "是否继续运动", "否", new SelectDialog.DialogInterface() {
+                        @Override
+                        public void onClick(SelectDialog dialog) {
+                            //删除数据
+                            CollStepUtil.clearRunData(getContext(), CollCommonInfo.getUserId(getContext()));
+                            stopStepService();
+                            //清除数据
+                            CollCommonInfo.reset(getContext());
+                            dialog.dismiss();
+                        }
+                    }, "是", new SelectDialog.DialogInterface() {
+                        @Override
+                        public void onClick(SelectDialog dialog) {
+                            //继续运动
+                            dialog.dismiss();
+                            //检查百度是否正在运行
+                            checkBaiduServiceState();
-                    }
-                });
-                selectDialog.setCancelable(false);
-                selectDialog.setCanceledOnTouchOutside(false);
-                selectDialog.show();
-            }
-            //赛事id不同,但是有正在进行的赛事
-            else {
-                //询问用户
-                SelectDialog selectDialog = new SelectDialog(getContext(), "你正在进行另一赛事,是否回到该赛事?", "否", new SelectDialog.DialogInterface() {
+                        }
+                    });
+                    selectDialog.setCancelable(false);
+                    selectDialog.setCanceledOnTouchOutside(false);
+                    selectDialog.show();
+                }
+                //赛事id不同,但是有正在进行的赛事
+                else {
+                    //询问用户
+                    SelectDialog selectDialog = new SelectDialog(getContext(), "你正在进行另一赛事,是否回到该赛事?", "否", new SelectDialog.DialogInterface() {
+                        @Override
+                        public void onClick(SelectDialog dialog) {
+                            //删除数据
+                            CollStepUtil.clearRunData(getContext(), CollCommonInfo.getUserId(getContext()));
+                            stopStepService();
+                            //清除数据
+                            CollCommonInfo.reset(getContext());
+                            dialog.dismiss();
+                        }
+                    }, "是", new SelectDialog.DialogInterface() {
+                        @Override
+                        public void onClick(SelectDialog dialog) {
+                            //继续运动
+                            dialog.dismiss();
+                            //检查百度是否正在运行
+                            checkBaiduServiceState();
+                        }
+                    });
+                    selectDialog.setCancelable(false);
+                    selectDialog.setCanceledOnTouchOutside(false);
+                    selectDialog.show();
+                }
+            } else {
+                //已经完成,但是没有上传
+                SelectDialog selectDialog = new SelectDialog(getContext(), "您还有未上传成功的数据,是否重新上传?", "取消", new SelectDialog.DialogInterface() {
                     @Override
                     public void onClick(SelectDialog dialog) {
                         //删除数据
@@ -174,17 +209,18 @@ public class StartTraceFragmentView implements MvpView, SensorEventListener {
                         //清除数据
                         CollCommonInfo.reset(getContext());
                         dialog.dismiss();
+                        Log.e("取消", "onClick: " );
                     }
-                }, "是", new SelectDialog.DialogInterface() {
+                }, "上传", new SelectDialog.DialogInterface() {
                     @Override
                     public void onClick(SelectDialog dialog) {
-                        //继续运动
                         dialog.dismiss();
-                        //检查百度是否正在运行
-                        checkBaiduServiceState();
+                        //直接跳转页面
+                        CollRunningFinishActivity.startActivity(fragment.getActivity());
+                        fragment.getActivity().finish();
                     }
                 });
-                selectDialog.setCancelable(false);
+                selectDialog.setCanceledOnTouchOutside(false);
                 selectDialog.setCanceledOnTouchOutside(false);
                 selectDialog.show();
             }
@@ -210,21 +246,24 @@ public class StartTraceFragmentView implements MvpView, SensorEventListener {
     }
     private void checkBaiduServiceState() {
-
+        CollCommonInfo.setTsRunBaiduTraceService(getContext(), true);
+        CollCommonInfo.setIsRunKeepAliveService(getContext(), true);
+        CollCommonInfo.setIsWriteUserStep(getContext(), true);
+        CollCommonInfo.setIsFirstStepSendTraceTip(getContext(), true);
 //        boolean isRunBaidu = CollCommonInfo.getIsRunBaiduTraceService(getContext());
 //        //要运行百度
 //        if (isRunBaidu) {
-            //判断百度服务是否运行
-            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();
-            }
+        //判断百度服务是否运行
+        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();
@@ -232,10 +271,7 @@ public class StartTraceFragmentView 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(CollStepService.traceListener);
@@ -217,11 +217,10 @@ public class CollKeepLiveService extends Service implements MediaPlayer.OnComple
     @Override
     public void onDestroy() {
         super.onDestroy();
-        if (myReceiver != null) {
-            unregisterReceiver(myReceiver);
-        }
         try {
-//            stopForeground(true);
+            if (myReceiver != null) {
+                unregisterReceiver(myReceiver);
+            }
         } catch (Exception e) {
         }
         stopPlaySong();
@@ -167,6 +167,7 @@ public class CollStepService extends Service implements SensorEventListener {
     private static int retryIndex = 0;
     private void initTrace() {
+        Log.e(TAG, "initTrace: ");
         if (mClient == null) {
             mClient = new LBSTraceClient(getApplicationContext());
             // 设置定位和打包周期
@@ -222,6 +223,7 @@ public class CollStepService extends Service implements SensorEventListener {
              */
             @Override
             public void onStartTraceCallback(int errorNo, String message) {
+                Log.e(TAG, "onStartTraceCallback: " + message + "," + errorNo);
                 if (StatusCodes.SUCCESS == errorNo || StatusCodes.START_TRACE_NETWORK_CONNECT_FAILED <= errorNo) {
                     //开始进行采集
                     if (mClient != null) {
@@ -233,8 +235,6 @@ public class CollStepService extends Service implements SensorEventListener {
                             CollCommonInfo.setIsFirstStepSendTraceTip(getApplicationContext(), false);
                             EventBus.getDefault().post(new MessageEvent(Constant.COLL_START_TRACE_GATHER_SUCCESS, ""));
                         }
-
-
                     }
                 } else {
@@ -243,6 +243,8 @@ public class CollStepService extends Service implements SensorEventListener {
                         if (mClient != null) {
                             mClient.startTrace(mTrace, traceListener);
                             retryIndex++;
+                        } else {
+                            Log.e(TAG, "onStartTraceCallback: 失败");
                         }
                     } else {
                         boolean isFirstSendNotification = CollCommonInfo.getIsFirstStepSendTraceTip(getApplicationContext());
@@ -272,7 +274,6 @@ public class CollStepService extends Service implements SensorEventListener {
                     if (mClient != null) {
                         mClient.stopTrace(mTrace, traceListener);
                         Toast.makeText(getApplicationContext(), "停止轨迹服务", Toast.LENGTH_LONG).show();
-
                     }
                 }
             }
@@ -289,6 +290,7 @@ public class CollStepService extends Service implements SensorEventListener {
              */
             @Override
             public void onStartGatherCallback(int errorNo, String message) {
+                Log.e(TAG, "onStartGatherCallback: " + message + "," + errorNo);
                 if (StatusCodes.SUCCESS == errorNo || StatusCodes.GATHER_STARTED == errorNo) {
                     retryIndex = 0;
                     Toast.makeText(getApplicationContext(), "开始采集", Toast.LENGTH_LONG).show();
@@ -299,6 +301,8 @@ public class CollStepService extends Service implements SensorEventListener {
                             mClient.startGather(traceListener);
                         }
                         retryIndex++;
+                    } else {
+                        Log.e(TAG, "onStartGatherCallback: 失败");
                     }
                 }
             }
@@ -362,13 +366,13 @@ public class CollStepService extends Service implements SensorEventListener {
     @SuppressLint("WrongConstant")
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
+        if (!EventBus.getDefault().isRegistered(this)) {
+            EventBus.getDefault().register(this);
+        }
         userId = CollCommonInfo.getUserId(getApplicationContext());
         if (userId != null && !TextUtils.isEmpty(userId)) {
             //初始化数据库
             CollStepUtil.initCollDataBase(getApplicationContext(), userId);
-            if (!EventBus.getDefault().isRegistered(this)) {
-                EventBus.getDefault().register(this);
-            }
             entityName = userId;
             initTodayData(userId);
             initTrace();
@@ -384,20 +388,6 @@ public class CollStepService extends Service implements SensorEventListener {
         } else {
             EventBus.getDefault().post(new MessageEvent(Constant.START_TRACE_GATHER_FAIL, ""));
         }
-//        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.LOLLIPOP) {
-//            //开始配置JobInfo
-//            mServieComponent = new ComponentName(this, CollJobSchedulerService.class);// 获取到我们自己的jobservice，同时启动该service
-//            JobInfo.Builder builder = new JobInfo.Builder(mJobId++, mServieComponent);
-////            builder.setOverrideDeadline(Long.valueOf(2) * 1000);
-//            //设置任务每隔intervalMillis运行一次
-//            builder.setPeriodic(Long.valueOf(2) * 1000);
-//            //你的任务只有当用户没有在使用该设备且有一段时间没有使用时才会启动该任务。
-////            builder.setRequiresDeviceIdle(true);
-////            builder.setRequiredNetworkType(JobInfo.NETWORK_TYPE_ANY);
-//            JobScheduler mJobScheduler = (JobScheduler) getSystemService(Context.JOB_SCHEDULER_SERVICE);
-//            mJobScheduler.schedule(builder.build());
-//
-//        }
         flags = START_STICKY;
         return super.onStartCommand(intent, flags, startId);
@@ -934,9 +924,8 @@ public class CollStepService extends Service implements SensorEventListener {
         if (userStepEntity == null) {
             CollUserStepEntity data = new CollUserStepEntity();
             data.setUserId(userId);
-            data.setDate(CURRENT_DATE);
             data.setStepCount(tempStep + "");
-            CollStepUtil.insertCollStepData(getApplicationContext(), data);
+            CollStepUtil.insertCollStepData(getApplicationContext(), CollCommonInfo.getUserId(getApplicationContext()), data);
         } else {
             userStepEntity.setStepCount(tempStep + "");
             CollStepUtil.updateCollStepData(getApplicationContext(), userStepEntity);
@@ -7,6 +7,7 @@ import android.os.Bundle;
 import com.cnlive.libs.base.util.StatusBarUtil;
 import com.cnlive.libs.base.util.StatusBarUtil2;
+import com.cnlive.moudle.collectionTrace.commonInfo.CollCommonInfo;
 import com.cnlive.moudle.collectionTrace.ui.fragment.RaceListFragment;
 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.example.moudle_pedometer.R;
@@ -18,6 +19,7 @@ import com.example.moudle_pedometer.R;
 public class RaceListActivity extends AppCompatActivity {
     public static void newInstance(Context context,String userId,String userName,String userIcon){
+        CollCommonInfo.setUserId(context, userId);
         Intent intent = new Intent(context,RaceListActivity.class);
         intent.putExtra("userId",userId);
         intent.putExtra("userName",userName);
@@ -54,6 +54,7 @@ public class CollRunningFinishFragment extends QMUIFragment&lt;CollRunningFinishFra
         CollUserStepEntity collUserStepEntity = CollStepUtil.getCollUserStepData(getContext(), CommonInfo.getUserId(getContext()));
         if (collUserStepEntity != null) {
             if (getMvpView() != null) {
+                getMvpView().initMap();
                 getMvpView().initView(collUserStepEntity);
             }
         }
@@ -58,7 +58,8 @@ public class CollTraceListDetailFragment extends QMUIFragment&lt;CollTraceListDetai
             position = getArguments().getString("position");
             if (null != eventShoeLinesBean) {
                 if (null != getMvpView()) {
-                    getMvpView().initView(eventShoeLinesBean, fenceEntityName,position);
+                    getMvpView().initMap();
+                    getMvpView().initView(eventShoeLinesBean, fenceEntityName, position);
                 }
             }
         }
@@ -41,16 +41,21 @@ public class CollStepUtil {
      * @param fenceID
      */
     public static void setFenceId(Context context, String uid, String fenceID) {
-        //先获取有没有
-        if (getCollUserStepData(context, uid) != null) {
-            CollUserStepEntity entity = getCollUserStepData(context, uid);
-            if (null != entity) {
-                //设置围栏id
-                entity.setFenceId(fenceID);
-                //更新数据
-                updateCollStepData(context, entity);
+        try {
+            //先获取有没有
+            if (getCollUserStepData(context, uid) != null) {
+                CollUserStepEntity entity = getCollUserStepData(context, uid);
+                if (null != entity) {
+                    //设置围栏id
+                    entity.setFenceId(fenceID);
+                    //更新数据
+                    updateCollStepData(context, entity);
+                }
             }
+        } catch (Exception e) {
+            Log.e(TAG, "setFenceId: " + e.getMessage());
         }
+
     }
     /**
@@ -60,16 +65,21 @@ public class CollStepUtil {
      * @param uid
      */
     public static void setEmployTimeStamp(Context context, String uid, String employTime) {
-        //先获取有没有
-        if (getCollUserStepData(context, uid) != null) {
-            CollUserStepEntity entity = getCollUserStepData(context, uid);
-            if (null != entity) {
-                //设置用户完成时间
-                entity.setEmployTime(employTime);
-                //更新数据
-                updateCollStepData(context, entity);
+        try {
+            //先获取有没有
+            if (getCollUserStepData(context, uid) != null) {
+                CollUserStepEntity entity = getCollUserStepData(context, uid);
+                if (null != entity) {
+                    //设置用户完成时间
+                    entity.setEmployTime(employTime);
+                    //更新数据
+                    updateCollStepData(context, entity);
+                }
             }
+        } catch (Exception e) {
+            Log.e(TAG, "setEmployTimeStamp: " + e.getMessage());
         }
+
     }
     /**
@@ -80,16 +90,21 @@ public class CollStepUtil {
      * @param collectPoint
      */
     public static void setCollEndPointData(Context context, String uid, CollectPoint collectPoint) {
-        //先获取有没有
-        if (getCollUserStepData(context, uid) != null) {
-            CollUserStepEntity entity = getCollUserStepData(context, uid);
-            if (null != entity) {
-                //设置用户结束数据
-                entity.setCollEndPointData(GsonUtil.GsonString(collectPoint));
-                //更新数据
-                updateCollStepData(context, entity);
+        try {
+            //先获取有没有
+            if (getCollUserStepData(context, uid) != null) {
+                CollUserStepEntity entity = getCollUserStepData(context, uid);
+                if (null != entity) {
+                    //设置用户结束数据
+                    entity.setCollEndPointData(GsonUtil.GsonString(collectPoint));
+                    //更新数据
+                    updateCollStepData(context, entity);
+                }
             }
+        } catch (Exception e) {
+            Log.e(TAG, "setCollEndPointData: " + e.getMessage());
         }
+
     }
@@ -101,16 +116,21 @@ public class CollStepUtil {
      * @param userFinishTime
      */
     public static void setCollUserFinishTimeStamp(Context context, String uid, long userFinishTime) {
-        //先获取有没有
-        if (getCollUserStepData(context, uid) != null) {
-            CollUserStepEntity entity = getCollUserStepData(context, uid);
-            if (null != entity) {
-                //设置用户完成时间
-                entity.setFinishTimeStamp(userFinishTime);
-                //更新数据
-                updateCollStepData(context, entity);
+        try {
+            //先获取有没有
+            if (getCollUserStepData(context, uid) != null) {
+                CollUserStepEntity entity = getCollUserStepData(context, uid);
+                if (null != entity) {
+                    //设置用户完成时间
+                    entity.setFinishTimeStamp(userFinishTime);
+                    //更新数据
+                    updateCollStepData(context, entity);
+                }
             }
+        } catch (Exception e) {
+            Log.e(TAG, "setCollUserFinishTimeStamp: " + e.getMessage());
         }
+
     }
     /**
@@ -120,23 +140,29 @@ public class CollStepUtil {
      * @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;
+        try {
+            //先获取有没有
+            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;
+        } catch (Exception e) {
+            Log.e(TAG, "getCollImportPointList: " + e.getMessage());
+            return null;
         }
-        return null;
+
     }
@@ -147,25 +173,29 @@ public class CollStepUtil {
      * @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();
+        try {
+            //先获取有没有
+            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;
+                        return 0;
                     }
-                } else {
-                    return 0;
                 }
             }
+            return 98;
+        } catch (Exception e) {
+            Log.e(TAG, "getCollImportPointSize: " + e.getMessage());
+            return 98;
         }
-        return 98;
+
     }
     /**
@@ -175,12 +205,17 @@ public class CollStepUtil {
      * @param uid
      */
     public static void initCollDataBase(Context context, String uid) {
-        if (null == getCollUserStepData(context, uid)) {
-            CollUserStepEntity entity = new CollUserStepEntity();
-            entity.setUserId(uid);
-            insertCollStepData(context, entity);
+        try {
+            if (null == getCollUserStepData(context, uid)) {
+                CollUserStepEntity entity = new CollUserStepEntity();
+                entity.setUserId(uid);
+                insertCollStepData(context,uid, entity);
+            }
+        } catch (Exception e) {
+            Log.e(TAG, "initCollDataBase: " + e.getMessage());
         }
+
     }
@@ -191,15 +226,20 @@ public class CollStepUtil {
      * @param uid
      */
     public static void setCollStartPointData(Context context, String uid, CollectPoint collectPoint) {
-        //先获取有没有
-        if (getCollUserStepData(context, uid) != null) {
-            CollUserStepEntity entity = getCollUserStepData(context, uid);
-            if (null != entity) {
-                entity.setCollStartPointData(GsonUtil.GsonString(collectPoint));
-                //更新数据
-                updateCollStepData(context, entity);
+        try {
+            //先获取有没有
+            if (getCollUserStepData(context, uid) != null) {
+                CollUserStepEntity entity = getCollUserStepData(context, uid);
+                if (null != entity) {
+                    entity.setCollStartPointData(GsonUtil.GsonString(collectPoint));
+                    //更新数据
+                    updateCollStepData(context, entity);
+                }
             }
+        } catch (Exception e) {
+            Log.e(TAG, "setCollStartPointData: " + e.getMessage());
         }
+
     }
     /**
@@ -210,38 +250,43 @@ public class CollStepUtil {
      * @param collectPoint
      */
     public static void setCollImportPoints(Context context, String uid, CollectPoint collectPoint) {
-        //先获取有没有
-        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) {
-                        //加入新打的点
-                        if (!lngs.contains(collectPoint)) {
-                            lngs.add(collectPoint);
-                            //重新设置打的点
-                            entity.setImportPoint(GsonUtil.GsonString(lngs));
-                            //更新数据
-                            updateCollStepData(context, entity);
-                        }
+        try {
+            //先获取有没有
+            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) {
+                            //加入新打的点
+                            if (!lngs.contains(collectPoint)) {
+                                lngs.add(collectPoint);
+                                //重新设置打的点
+                                entity.setImportPoint(GsonUtil.GsonString(lngs));
+                                //更新数据
+                                updateCollStepData(context, entity);
+                            }
+                        }
+                    }
+                    //没有打过点
+                    else {
+                        //则设置一个
+                        List<CollectPoint> lngs = new ArrayList<>();
+                        lngs.add(collectPoint);
+                        //重新设置打的点
+                        entity.setImportPoint(GsonUtil.GsonString(lngs));
+                        //更新数据
+                        updateCollStepData(context, entity);
                     }
-                }
-                //没有打过点
-                else {
-                    //则设置一个
-                    List<CollectPoint> lngs = new ArrayList<>();
-                    lngs.add(collectPoint);
-                    //重新设置打的点
-                    entity.setImportPoint(GsonUtil.GsonString(lngs));
-                    //更新数据
-                    updateCollStepData(context, entity);
                 }
             }
+        } catch (Exception e) {
+            Log.e(TAG, "setCollImportPoints: " + e.getMessage());
         }
+
     }
     /**
@@ -252,12 +297,17 @@ public class CollStepUtil {
      * @param streetTitle
      */
     public static void setCollStreetTitle(Context context, String uid, String streetTitle) {
-        if (getCollUserStepData(context, uid) != null) {
-            CollUserStepEntity entity = getCollUserStepData(context, uid);
-            entity.setStreetTitle(streetTitle);
-            //更新数据
-            updateCollStepData(context, entity);
+        try {
+            if (getCollUserStepData(context, uid) != null) {
+                CollUserStepEntity entity = getCollUserStepData(context, uid);
+                entity.setStreetTitle(streetTitle);
+                //更新数据
+                updateCollStepData(context, entity);
+            }
+        } catch (Exception e) {
+            Log.e(TAG, "setCollStreetTitle: " + e.getMessage());
         }
+
     }
     /**
@@ -267,11 +317,16 @@ public class CollStepUtil {
      * @param userStepEntity
      */
     public static void updateCollStepData(Context context, CollUserStepEntity userStepEntity) {
-        if (userStepEntity != null) {
-            DbCore.init(context, dbName);
-            DbCore.getDaoSession().getCollUserStepEntityDao().update(userStepEntity);
+        try {
+            if (userStepEntity != null) {
+                DbCore.init(context, dbName);
+                DbCore.getDaoSession().getCollUserStepEntityDao().update(userStepEntity);
+            }
+        } catch (Exception e) {
+            Log.e(TAG, "updateCollStepData: " + e.getMessage());
         }
+
     }
     /**
@@ -280,9 +335,21 @@ public class CollStepUtil {
      * @param context
      * @param userStepEntity
      */
-    public static void insertCollStepData(Context context, CollUserStepEntity userStepEntity) {
-        DbCore.init(context, dbName);
-        DbCore.getDaoSession().getCollUserStepEntityDao().insert(userStepEntity);
+    public static void insertCollStepData(Context context, String uid, CollUserStepEntity userStepEntity) {
+
+        try {
+            if (null == getCollUserStepData(context, uid)) {
+                DbCore.init(context, dbName);
+                DbCore.getDaoSession().getCollUserStepEntityDao().insert(userStepEntity);
+            } else {
+                DbCore.init(context, dbName);
+                DbCore.getDaoSession().getCollUserStepEntityDao().update(userStepEntity);
+            }
+        } catch (
+                Exception e) {
+            Log.e(TAG, "insertCollStepData: " + e.getMessage());
+        }
+
     }
     /**
@@ -293,18 +360,23 @@ public class CollStepUtil {
      * @param time
      */
     public static void setCollChronometerBase(Context context, String uid, long time) {
-        if (getCollUserStepData(context, uid) != null) {
-            CollUserStepEntity entity = getCollUserStepData(context, uid);
-            entity.setChronometerBase(time);
-            //更新数据
-            updateCollStepData(context, entity);
-        } else {
-            //创建数据
-            CollUserStepEntity userStepEntity = new CollUserStepEntity();
-            userStepEntity.setUserId(uid);
-            userStepEntity.setChronometerBase(time);
-            insertCollStepData(context, userStepEntity);
+        try {
+            if (getCollUserStepData(context, uid) != null) {
+                CollUserStepEntity entity = getCollUserStepData(context, uid);
+                entity.setChronometerBase(time);
+                //更新数据
+                updateCollStepData(context, entity);
+            } else {
+                //创建数据
+                CollUserStepEntity userStepEntity = new CollUserStepEntity();
+                userStepEntity.setUserId(uid);
+                userStepEntity.setChronometerBase(time);
+                insertCollStepData(context, uid, userStepEntity);
+            }
+        } catch (Exception e) {
+            Log.e(TAG, "setCollChronometerBase: " + e.getMessage());
         }
+
     }
     /**
@@ -316,20 +388,25 @@ public class CollStepUtil {
      * @param streetId
      */
     public static void setCollStepStartData(Context context, String uid, long startStamp, String streetId) {
-        if (getCollUserStepData(context, uid) != null) {
-            CollUserStepEntity entity = getCollUserStepData(context, uid);
-            entity.setStartTimeStamp(startStamp);
-            entity.setStreetId(streetId);
-            //更新数据
-            updateCollStepData(context, entity);
-        } else {
-            //创建数据
-            CollUserStepEntity userStepEntity = new CollUserStepEntity();
-            userStepEntity.setUserId(uid);
-            userStepEntity.setStartTimeStamp(startStamp);
-            userStepEntity.setStreetId(streetId);
-            insertCollStepData(context, userStepEntity);
+        try {
+            if (getCollUserStepData(context, uid) != null) {
+                CollUserStepEntity entity = getCollUserStepData(context, uid);
+                entity.setStartTimeStamp(startStamp);
+                entity.setStreetId(streetId);
+                //更新数据
+                updateCollStepData(context, entity);
+            } else {
+                //创建数据
+                CollUserStepEntity userStepEntity = new CollUserStepEntity();
+                userStepEntity.setUserId(uid);
+                userStepEntity.setStartTimeStamp(startStamp);
+                userStepEntity.setStreetId(streetId);
+                insertCollStepData(context,uid, userStepEntity);
+            }
+        } catch (Exception e) {
+            Log.e(TAG, "setCollStepStartData: " + e.getMessage());
         }
+
     }
     /**
@@ -383,14 +460,19 @@ public class CollStepUtil {
      * @param uid
      */
     public static void clearRunData(Context context, String uid) {
-        DbCore.init(context, dbName);
-        String CURRENT_DATE = getTodayDate();
-        List<CollUserStepEntity> list = DbCore.getDaoSession().getCollUserStepEntityDao().queryBuilder().where(CollUserStepEntityDao.Properties.UserId.eq(uid)).list();
-        if (list != null && list.size() > 0) {
-            Log.e(TAG, "clearRunData: " + list.size());
-            DbCore.getDaoSession().getCollUserStepEntityDao().deleteByKey(list.get(0).getUserId());
-            DbCore.getDaoSession().getCollUserStepEntityDao().detachAll();
+        try {
+            DbCore.init(context, dbName);
+            String CURRENT_DATE = getTodayDate();
+            List<CollUserStepEntity> list = DbCore.getDaoSession().getCollUserStepEntityDao().queryBuilder().where(CollUserStepEntityDao.Properties.UserId.eq(uid)).list();
+            if (list != null && list.size() > 0) {
+                Log.e(TAG, "clearRunData: " + list.size());
+                DbCore.getDaoSession().getCollUserStepEntityDao().deleteByKey(list.get(0).getUserId());
+                DbCore.getDaoSession().getCollUserStepEntityDao().detachAll();
+            }
+        } catch (Exception e) {
+            Log.e(TAG, "clearRunData: " + e.getMessage());
         }
+
     }
     /**
@@ -401,36 +483,28 @@ public class CollStepUtil {
      * @return
      */
     public static CollUserStepEntity getCollUserStepData(Context context, String uid) {
-        if (!TextUtils.isEmpty(uid)) {
-            DbCore.init(context, dbName);
-            DbCore.getDaoSession().getCollUserStepEntityDao().detachAll();
-            DbCore.getDaoSession().clear();
-            List<CollUserStepEntity> list = DbCore.getDaoSession().getCollUserStepEntityDao().queryBuilder().where(CollUserStepEntityDao.Properties.UserId.eq(uid)).list();
-            if (list != null && list.size() > 0) {
-                return list.get(0);
+        try {
+            if (!TextUtils.isEmpty(uid)) {
+                DbCore.init(context, dbName);
+                DbCore.getDaoSession().getCollUserStepEntityDao().detachAll();
+                DbCore.getDaoSession().clear();
+                List<CollUserStepEntity> list = DbCore.getDaoSession().getCollUserStepEntityDao().queryBuilder().where(CollUserStepEntityDao.Properties.UserId.eq(uid)).list();
+                if (list != null && list.size() > 0) {
+                    return list.get(0);
+                } else {
+                    return null;
+                }
             } else {
                 return null;
             }
-        } else {
+        } catch (Exception e) {
+            Log.e(TAG, "getCollUserStepData: " + e.getMessage());
             return null;
         }
-    }
-    /**
-     * 获取用户数据
-     *
-     * @param context
-     * @param uid
-     * @return
-     */
-    public static void setServerTraceData(Context context, String uid, CollUserStepEntity userStepEntity) {
-        if (getCollUserStepData(context, uid) != null) {
-            CollUserStepEntity entity = getCollUserStepData(context, uid);
-        } else {
-
-        }
     }
+
     /**
      * 获取当天日期
      *
@@ -21,18 +21,18 @@ public class DaoMaster extends AbstractDaoMaster {
     /** Creates underlying database table using DAOs. */
     public static void createAllTables(Database db, boolean ifNotExists) {
+        CollFailedEntityDao.createTable(db, ifNotExists);
         CollUserStepEntityDao.createTable(db, ifNotExists);
         FailedEntityDao.createTable(db, ifNotExists);
         UserStepEntityDao.createTable(db, ifNotExists);
-        CollFailedEntityDao.createTable(db, ifNotExists);
     }
     /** Drops underlying database table using DAOs. */
     public static void dropAllTables(Database db, boolean ifExists) {
+        CollFailedEntityDao.dropTable(db, ifExists);
         CollUserStepEntityDao.dropTable(db, ifExists);
         FailedEntityDao.dropTable(db, ifExists);
         UserStepEntityDao.dropTable(db, ifExists);
-        CollFailedEntityDao.dropTable(db, ifExists);
     }
     /**
@@ -51,10 +51,10 @@ public class DaoMaster extends AbstractDaoMaster {
     public DaoMaster(Database db) {
         super(db, SCHEMA_VERSION);
+        registerDaoClass(CollFailedEntityDao.class);
         registerDaoClass(CollUserStepEntityDao.class);
         registerDaoClass(FailedEntityDao.class);
         registerDaoClass(UserStepEntityDao.class);
-        registerDaoClass(CollFailedEntityDao.class);
     }
     public DaoSession newSession() {
@@ -8,15 +8,15 @@ import org.greenrobot.greendao.database.Database;
 import org.greenrobot.greendao.identityscope.IdentityScopeType;
 import org.greenrobot.greendao.internal.DaoConfig;
+import com.cnlive.moudle.pedometer.sql.entity.CollFailedEntity;
 import com.cnlive.moudle.pedometer.sql.entity.CollUserStepEntity;
 import com.cnlive.moudle.pedometer.sql.entity.FailedEntity;
 import com.cnlive.moudle.pedometer.sql.entity.UserStepEntity;
-import com.cnlive.moudle.pedometer.sql.entity.CollFailedEntity;
+import com.cnlive.moudle.pedometer.sql.dao.CollFailedEntityDao;
 import com.cnlive.moudle.pedometer.sql.dao.CollUserStepEntityDao;
 import com.cnlive.moudle.pedometer.sql.dao.FailedEntityDao;
 import com.cnlive.moudle.pedometer.sql.dao.UserStepEntityDao;
-import com.cnlive.moudle.pedometer.sql.dao.CollFailedEntityDao;
 // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
@@ -27,20 +27,23 @@ import com.cnlive.moudle.pedometer.sql.dao.CollFailedEntityDao;
  */
 public class DaoSession extends AbstractDaoSession {
+    private final DaoConfig collFailedEntityDaoConfig;
     private final DaoConfig collUserStepEntityDaoConfig;
     private final DaoConfig failedEntityDaoConfig;
     private final DaoConfig userStepEntityDaoConfig;
-    private final DaoConfig collFailedEntityDaoConfig;
+    private final CollFailedEntityDao collFailedEntityDao;
     private final CollUserStepEntityDao collUserStepEntityDao;
     private final FailedEntityDao failedEntityDao;
     private final UserStepEntityDao userStepEntityDao;
-    private final CollFailedEntityDao collFailedEntityDao;
     public DaoSession(Database db, IdentityScopeType type, Map<Class<? extends AbstractDao<?, ?>>, DaoConfig>
             daoConfigMap) {
         super(db);
+        collFailedEntityDaoConfig = daoConfigMap.get(CollFailedEntityDao.class).clone();
+        collFailedEntityDaoConfig.initIdentityScope(type);
+
         collUserStepEntityDaoConfig = daoConfigMap.get(CollUserStepEntityDao.class).clone();
         collUserStepEntityDaoConfig.initIdentityScope(type);
@@ -50,25 +53,26 @@ public class DaoSession extends AbstractDaoSession {
         userStepEntityDaoConfig = daoConfigMap.get(UserStepEntityDao.class).clone();
         userStepEntityDaoConfig.initIdentityScope(type);
-        collFailedEntityDaoConfig = daoConfigMap.get(CollFailedEntityDao.class).clone();
-        collFailedEntityDaoConfig.initIdentityScope(type);
-
+        collFailedEntityDao = new CollFailedEntityDao(collFailedEntityDaoConfig, this);
         collUserStepEntityDao = new CollUserStepEntityDao(collUserStepEntityDaoConfig, this);
         failedEntityDao = new FailedEntityDao(failedEntityDaoConfig, this);
         userStepEntityDao = new UserStepEntityDao(userStepEntityDaoConfig, this);
-        collFailedEntityDao = new CollFailedEntityDao(collFailedEntityDaoConfig, this);
+        registerDao(CollFailedEntity.class, collFailedEntityDao);
         registerDao(CollUserStepEntity.class, collUserStepEntityDao);
         registerDao(FailedEntity.class, failedEntityDao);
         registerDao(UserStepEntity.class, userStepEntityDao);
-        registerDao(CollFailedEntity.class, collFailedEntityDao);
     }
     public void clear() {
+        collFailedEntityDaoConfig.clearIdentityScope();
         collUserStepEntityDaoConfig.clearIdentityScope();
         failedEntityDaoConfig.clearIdentityScope();
         userStepEntityDaoConfig.clearIdentityScope();
-        collFailedEntityDaoConfig.clearIdentityScope();
+    }
+
+    public CollFailedEntityDao getCollFailedEntityDao() {
+        return collFailedEntityDao;
     }
     public CollUserStepEntityDao getCollUserStepEntityDao() {
@@ -83,8 +87,4 @@ public class DaoSession extends AbstractDaoSession {
         return userStepEntityDao;
     }
-    public CollFailedEntityDao getCollFailedEntityDao() {
-        return collFailedEntityDao;
-    }
-
 }
@@ -160,12 +160,12 @@
                 android:id="@+id/tv_can_take_point_size"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="30dp"
+                android:layout_gravity="right"
                 android:layout_marginTop="10dp"
+                android:layout_marginRight="30dp"
                 android:text="可打点数量"
-                android:textColor="@color/text_black"
-                android:textSize="12sp"
-                android:textStyle="bold" />
+                android:textColor="@color/text_gray"
+                android:textSize="12sp" />
             <LinearLayout
                 android:layout_width="match_parent"