From f28f9031a5220ce84e0d19f5eb33385f8ba9360e Mon Sep 17 00:00:00 2001 From: xiaoyan Date: Wed, 17 May 2023 17:24:52 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=89=8B=E5=8A=A8?= =?UTF-8?q?=E5=8C=B9=E9=85=8D=E8=BD=A8=E8=BF=B9=E6=97=B6=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E6=97=A5=E6=9C=9F=E6=B2=A1=E6=9C=89=E8=BD=A8=E8=BF=B9=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E7=A8=8B=E5=BA=8F=E4=B8=80=E7=9B=B4loading=20?= =?UTF-8?q?=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 | 2 +- .../java/com/navinfo/outdoor/activity/PicturesActivity.java | 3 ++- .../java/com/navinfo/outdoor/fragment/GatherGetFragment.java | 2 +- app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index b933a2e..44da22c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -13,7 +13,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 ee0db9b..53f7b0f 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/PicturesActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/PicturesActivity.java @@ -843,6 +843,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()), //中心点坐标，地图目标经纬度 @@ -875,7 +876,6 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen // ); // trackRemovableList.add(marker); // } - dismissLoadingDialog(); ToastUtils.Message(PicturesActivity.this, "点选地图上的轨迹点选择起终点"); } @@ -885,6 +885,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 7c4db84..5a4c191 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/GatherGetFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/GatherGetFragment.java @@ -995,7 +995,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) { @@ -1073,6 +1072,7 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe } else { ToastUtils.Message(getActivity(),response.getMessage()); } + dismissLoadingDialog(); } @Override diff --git a/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java b/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java index e9a998b..b98eed1 100644 --- a/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java +++ b/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java @@ -3,8 +3,8 @@ package com.navinfo.outdoor.http; public class HttpInterface { // public static final String IP = "http://172.23.138.133:9999/m4";//测试接口-IP public static final String IP0 = "http://dtxbmaps.navinfo.com/dtxb/dev/m4";//开发接口-外网 - public static final String IP1 = "http://dtxbmaps.navinfo.com/dtxb/test/m4";//测试接口-外网 - public static final String IP = "http://dtxbmaps.navinfo.com/dtxb/m4";//正式接口 + public static final String IP = "http://dtxbmaps.navinfo.com/dtxb/test/m4";//测试接口-外网 + public static final String IP2 = "http://dtxbmaps.navinfo.com/dtxb/m4";//正式接口 public static final String USER_PATH = "/user/";//我的 public static final String MSG_LIST_PATH = "/msgList/";//发现 public static final String USER_LOGIN_PATH = "/userlogin/";//登录