xiaoyan159/NavinfoOutDoor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev_track' into dev_ocr

Browse Source
This commit is contained in:
xiaoyan
2023-05-17 17:25:25 +08:00
parent 53ce6e1c2e f28f9031a5
commit edd91c8ad3
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@@ -38,7 +38,7 @@ android {
minSdkVersion 24 minSdkVersion 24
targetSdkVersion 30 targetSdkVersion 30
versionCode 54 versionCode 54
versionName "8.230512-正式版" versionName "8.230517-正式版"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
ndk { ndk {

3
app/src/main/java/com/navinfo/outdoor/activity/PicturesActivity.java
View File

@@ -875,6 +875,7 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen
public void accept(List<LocationRecorder> locationRecorderByTime) throws Exception { public void accept(List<LocationRecorder> locationRecorderByTime) throws Exception {
if (locationRecorderByTime==null||locationRecorderByTime.isEmpty()) { if (locationRecorderByTime==null||locationRecorderByTime.isEmpty()) {
ToastUtils.Message(PicturesActivity.this, "该时间段内没有可用的轨迹数据"); ToastUtils.Message(PicturesActivity.this, "该时间段内没有可用的轨迹数据");
imgTrackSelectRange.setSelected(!imgTrackSelectRange.isSelected());
} else { } else {
tencentMap.animateCamera(CameraUpdateFactory.newCameraPosition(new CameraPosition( tencentMap.animateCamera(CameraUpdateFactory.newCameraPosition(new CameraPosition(
new LatLng(locationRecorderByTime.get(0).getTencentLocationY(), locationRecorderByTime.get(0).getTencentLocationX()), //中心点坐标，地图目标经纬度 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); // trackRemovableList.add(marker);
// } // }
dismissLoadingDialog();
ToastUtils.Message(PicturesActivity.this, "点选地图上的轨迹点选择起终点"); ToastUtils.Message(PicturesActivity.this, "点选地图上的轨迹点选择起终点");
} }
@@ -917,6 +917,7 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen
} }
}); //目标旋转角 0~360° (正北方为0)); }); //目标旋转角 0~360° (正北方为0));
} }
dismissLoadingDialog();
} }
}); });
} }

2
app/src/main/java/com/navinfo/outdoor/fragment/GatherGetFragment.java
View File

@@ -1002,7 +1002,6 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
okGoBuilder.getRequest(new Callback<TaskByNetBean>() { okGoBuilder.getRequest(new Callback<TaskByNetBean>() {
@Override @Override
public void onSuccess(TaskByNetBean response, int id) { public void onSuccess(TaskByNetBean response, int id) {
dismissLoadingDialog();
if (response.getCode() == 200) { if (response.getCode() == 200) {
TaskByNetBean.BodyBean listBean = response.getBody(); TaskByNetBean.BodyBean listBean = response.getBody();
if (listBean != null) { if (listBean != null) {
@@ -1080,6 +1079,7 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
} else { } else {
ToastUtils.Message(getActivity(),response.getMessage()); ToastUtils.Message(getActivity(),response.getMessage());
} }
dismissLoadingDialog();
} }
@Override @Override