1 修改轨迹工具打点判断逻辑

杨帅
1 parent 884e14b8
Showing 3 changed files with 14 additions and 12 deletions
config.gradle
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
@@ -21,7 +21,7 @@ ext {
             //编译方式
             debug  : false,
             //版本号
-            version: "0.7.5",
+            version: "0.7.6",
             //Lib库前缀
             packeg : "com.cnlive.module",
             //Lib库名称
@@ -303,8 +303,8 @@ public class CollRunningMapFragmentView implements MvpView, SensorEventListener 
             public void onClick(View view) {
                 //先获取打点数量
                 int canTakePointCount = CollStepUtil.getCollImportPointSize(getContext(), CollCommonInfo.getUserId(getContext()));
-                if (0 == canTakePointCount) {
-                    AlertUtil.showDeftToast(getContext(), "您尚未打点,请打点后结束");
+                if (canTakePointCount<2) {
+                    AlertUtil.showDeftToast(getContext(), "请至少打两个点后结束");
                 } else {
                     if (null != followMyLocation) {
                         currentImportLatLng = new LatLng(followMyLocation.latitude, followMyLocation.longitude);
@@ -653,7 +653,10 @@ public class CollRunningMapFragmentView implements MvpView, SensorEventListener 
                     fragment.binding.ivGpsState.setBackground(getContext().getResources().getDrawable(R.drawable.rt_training_gps_3));
                 }
             }
-
+            //过滤定位精度
+            if (location.getRadius() > Constant.LOCA_ACCURACY) {
+                return;
+            }
             //第一次定位
             if (isFirstLoc) {
                 isFirstLoc = false;
@@ -669,10 +672,6 @@ public class CollRunningMapFragmentView implements MvpView, SensorEventListener 
                 baiduMap.animateMapStatus(MapStatusUpdateFactory.newMapStatus(builder.build()));
             } else {
                 //不是第一次定位状态
-                //过滤定位精度
-                if (location.getRadius() > Constant.LOCA_ACCURACY) {
-                    return;
-                }
                 mCurrentAccracy = location.getRadius();
                 followMyLocation = new MyLocationData.Builder()
                         .accuracy(location.getRadius())
@@ -204,7 +204,7 @@ public class CollTraceListDetailFragmentView implements MvpView, OnFenceListener
             startLocation.setPointName(eventShoeLinesBean.getStartLocation());
             startLocation.setLatitude(0);
             startLocation.setLongitude(0);
-        }else {
+        } else {
             startLocation = new CollectPoint();
             startLocation.setPointName("");
             startLocation.setLatitude(0);
@@ -217,7 +217,7 @@ public class CollTraceListDetailFragmentView implements MvpView, OnFenceListener
             endLocation.setPointName(eventShoeLinesBean.getEndLocation());
             endLocation.setLatitude(0);
             endLocation.setLongitude(0);
-        }else {
+        } else {
             endLocation = new CollectPoint();
             endLocation.setPointName("");
             endLocation.setLatitude(0);
@@ -253,7 +253,7 @@ public class CollTraceListDetailFragmentView implements MvpView, OnFenceListener
         //设置用户头像
         if (!TextUtils.isEmpty(eventShoeLinesBean.getUserMsg().getImage())) {
             GlideApp.with(getContext()).load(eventShoeLinesBean.getUserMsg().getImage()).into(fragment.binding.includeFinishUserInfo.qmIvIcon);
-        }else {
+        } else {
             GlideApp.with(getContext()).load(getContext().getResources().getString(R.string.default_face_url)).into(fragment.binding.includeFinishUserInfo.qmIvIcon);
         }
         //设置用户行走公里
@@ -414,7 +414,7 @@ public class CollTraceListDetailFragmentView implements MvpView, OnFenceListener
         if (5102 == createFenceResponse.getStatus()) {
             QMUITipDialogUtil.dismessDialog();
             QMUITipDialogUtil.failedDialog(fragment.getActivity(), createFenceResponse.getMessage(), 1);
-        } else {
+        } else if (0 == createFenceResponse.getStatus()) {
             if (null != eventShoeLinesBean) {
                 QMUITipDialogUtil.dismessDialog();
                 if (null == fragment.getPresenter() || null == getContext()) {
@@ -422,6 +422,9 @@ public class CollTraceListDetailFragmentView implements MvpView, OnFenceListener
                 }
                 fragment.getPresenter().bindingShoeLine(getContext(), eventShoeLinesBean.getId(), eventShoeLinesBean.getEventId(), createFenceResponse.getFenceId() + "", eventShoeLinesBean.getEventName(), position);
             }
+        } else {
+            QMUITipDialogUtil.dismessDialog();
+            QMUITipDialogUtil.failedDialog(fragment.getActivity(), createFenceResponse.getMessage(), 1);
         }
     }