Преглед на файлове

1、修复可能由定位距离异常导致的打卡bug

RaoMeng преди 5 години
родител
ревизия
f557226ac7
променени са 2 файла, в които са добавени 12 реда и са изтрити 9 реда
  1. 3 3
      WeiChat/version.properties
  2. 9 6
      app_modular/applocation/src/main/java/com/uas/applocation/utils/LocationDistanceUtils.java

+ 3 - 3
WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Thu Feb 13 14:03:32 CST 2020
+#Wed May 06 16:45:37 CST 2020
 debugName=972
 debugName=972
-versionName=714
+versionName=715
 debugCode=972
 debugCode=972
-versionCode=268
+versionCode=269

+ 9 - 6
app_modular/applocation/src/main/java/com/uas/applocation/utils/LocationDistanceUtils.java

@@ -21,9 +21,9 @@ public class LocationDistanceUtils {
      */
      */
     public static float getDistance(LatLng a, LatLng b) {
     public static float getDistance(LatLng a, LatLng b) {
         try {
         try {
-            return Float.valueOf(getDistanceStr(a,b));
+            return Float.valueOf(getDistanceStr(a, b));
         } catch (Exception e) {
         } catch (Exception e) {
-            return 0;
+            return -1;
         }
         }
     }
     }
 
 
@@ -60,20 +60,22 @@ public class LocationDistanceUtils {
 
 
     /**
     /**
      * 获取距离,将第一个参数的经纬度反过来
      * 获取距离,将第一个参数的经纬度反过来
+     *
      * @param a
      * @param a
      * @param b
      * @param b
      * @return
      * @return
      */
      */
     public static float getDistanceBackFrist(LatLng a, LatLng b) {
     public static float getDistanceBackFrist(LatLng a, LatLng b) {
         try {
         try {
-            return Float.valueOf(getDistanceStr(new LatLng(a.longitude,a.latitude),b));
+            return Float.valueOf(getDistanceStr(new LatLng(a.longitude, a.latitude), b));
         } catch (Exception e) {
         } catch (Exception e) {
-            return 0;
+            return -1;
         }
         }
     }
     }
+
     public static float distanceMeBack(LatLng a) {
     public static float distanceMeBack(LatLng a) {
-        if (a==null)return -1;
-        String distance = distanceMeStr(new LatLng(a.longitude,a.latitude));
+        if (a == null) return -1;
+        String distance = distanceMeStr(new LatLng(a.longitude, a.latitude));
         try {
         try {
             return Float.valueOf(distance);
             return Float.valueOf(distance);
         } catch (ClassCastException e) {
         } catch (ClassCastException e) {
@@ -82,6 +84,7 @@ public class LocationDistanceUtils {
             return -1f;
             return -1f;
         }
         }
     }
     }
+
     public static String distanceMeStr(LatLng a) {
     public static String distanceMeStr(LatLng a) {
         if (a == null) return "";
         if (a == null) return "";
         UASLocation mUASLocation = UasLocationHelper.getInstance().getUASLocation();
         UASLocation mUASLocation = UasLocationHelper.getInstance().getUASLocation();