diff --git a/app/build.gradle b/app/build.gradle index 5988a41..4cb3121 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -38,7 +38,7 @@ android { minSdkVersion 24 targetSdkVersion 30 versionCode 54 - versionName "8.230512-正式版" + versionName "8.230517-正式版" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" ndk { 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 4648e32..97c942b 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/PicturesActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/PicturesActivity.java @@ -875,6 +875,7 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen public void accept(List locationRecorderByTime) throws Exception { if (locationRecorderByTime==null||locationRecorderByTime.isEmpty()) { ToastUtils.Message(PicturesActivity.this, "该时间段内没有可用的轨迹数据"); + imgTrackSelectRange.setSelected(!imgTrackSelectRange.isSelected()); } else { tencentMap.animateCamera(CameraUpdateFactory.newCameraPosition(new CameraPosition( new LatLng(locationRecorderByTime.get(0).getTencentLocationY(), locationRecorderByTime.get(0).getTencentLocationX()), //中心点坐标,地图目标经纬度 @@ -907,7 +908,6 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen // ); // trackRemovableList.add(marker); // } - dismissLoadingDialog(); ToastUtils.Message(PicturesActivity.this, "点选地图上的轨迹点选择起终点"); } @@ -917,6 +917,7 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen } }); //目标旋转角 0~360° (正北方为0)); } + dismissLoadingDialog(); } }); } 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 81767a2..76e27af 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/GatherGetFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/GatherGetFragment.java @@ -1002,7 +1002,6 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe okGoBuilder.getRequest(new Callback() { @Override public void onSuccess(TaskByNetBean response, int id) { - dismissLoadingDialog(); if (response.getCode() == 200) { TaskByNetBean.BodyBean listBean = response.getBody(); if (listBean != null) { @@ -1080,6 +1079,7 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe } else { ToastUtils.Message(getActivity(),response.getMessage()); } + dismissLoadingDialog(); } @Override