From 395e189ddc066768848119c89d899f8ebdf78f27 Mon Sep 17 00:00:00 2001
From: xiaoyan <xiaoyan159@163.com>
Date: Fri, 28 Jan 2022 14:50:49 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E4=B8=80=E7=BA=A7?=
 =?UTF-8?q?=E6=83=85=E6=8A=A5=E6=97=A0=E6=B3=95=E9=87=87=E9=9B=86=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BF=AE=E6=94=B9gps=E4=BD=8D?=
 =?UTF-8?q?=E7=BD=AE=E8=AE=B0=E5=BD=95=E5=8F=AA=E5=9C=A8=E4=BF=A1=E5=8F=B7?=
 =?UTF-8?q?=E5=BC=BA=E5=BA=A6=E6=9C=89=E5=8F=98=E5=8C=96=E6=97=B6=E6=89=8D?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                                            | 6 +++---
 .../java/com/navinfo/outdoor/activity/PicturesActivity.java | 2 +-
 .../com/navinfo/outdoor/fragment/GatherGetFragment.java     | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 780590c..86ad15a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 30
     buildToolsVersion '29.0.2'
     //ndkVersion '23.0.7123448'
 
@@ -9,8 +9,8 @@ android {
         applicationId "com.navinfo.outdoor"
         minSdkVersion 22
         targetSdkVersion 30
-        versionCode 12
-        versionName "8.1211"
+        versionCode 13
+        versionName "8.220128"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     lintOptions {
diff --git a/app/src/main/java/com/navinfo/outdoor/activity/PicturesActivity.java b/app/src/main/java/com/navinfo/outdoor/activity/PicturesActivity.java
index ecb27d6..76fd80c 100644
--- a/app/src/main/java/com/navinfo/outdoor/activity/PicturesActivity.java
+++ b/app/src/main/java/com/navinfo/outdoor/activity/PicturesActivity.java
@@ -198,7 +198,6 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen
             @Override
             public void onGpsCount(int count) {
                 initCount = count;
-                gpsLocation = gpsUtils.getLocation();
             }
         });
         RadioGroup radioGroupPicture = findViewById(R.id.radio_group_picture);
@@ -811,6 +810,7 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen
             }
             sb.append(initCount);
             sb.append(",");
+            gpsLocation = gpsUtils.getLocation();
             if (gpsLocation != null) {
 //                double[] doubles = Gps.toGCJ02Point(gpsLocation.getLatitude(), gpsLocation.getLongitude());
                 sb.append(gpsLocation.getLatitude());
diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/GatherGetFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/GatherGetFragment.java
index 48c3002..2d2031a 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/GatherGetFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/GatherGetFragment.java
@@ -772,7 +772,7 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
      * @param url poi类型对应的url
      */
     private void receivedTaskByNet(String url, PoiEntity poiEntity, boolean isSaver, int statusId) {
-        if (poiEntity.getTaskId() != 0) {
+        if (poiEntity.getTaskId() == 0) {
             ToastUtils.Message(getActivity(),"无此任务");
             return;
         }