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; }