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

fix: 修改bug

Browse Source
This commit is contained in:
xiaoyan 2023-09-27 09:28:27 +08:00
parent c40ccaece4
commit f385fb8e6c
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -37,8 +37,8 @@ android {
applicationId "com.navinfo.outdoor"
minSdkVersion 24
targetSdkVersion 30
versionCode 115
versionName "8.230926-测试版"
versionCode 116
versionName "8.230926-正式版"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
ndk {

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

@ -60,6 +60,7 @@ import java.math.RoundingMode;
import java.text.DateFormat;
import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Objects;
@ -569,7 +570,12 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
new Thread(new Runnable() {
@Override
public void run() {
List<PoiEntity> recivePolygonPoi = PoiDatabase.getInstance(requireContext()).getPoiDao().getPoiEntityByTaskStatus(1, 6);
List<PoiEntity> recivePolygonPoi = new ArrayList<>();
// 如果点击立即采集，则面状任务taskstatus可能是2，如果点击领取任务，则可能是1，所以需要查询两个状态的数据
List<PoiEntity> recivePolygonPoi1 = PoiDatabase.getInstance(requireContext()).getPoiDao().getPoiEntityByTaskStatus(1, 6);
List<PoiEntity> recivePolygonPoi2 = PoiDatabase.getInstance(requireContext()).getPoiDao().getPoiEntityByTaskStatus(2, 6);
recivePolygonPoi.addAll(recivePolygonPoi1);
recivePolygonPoi.addAll(recivePolygonPoi2);
requireActivity().runOnUiThread(new Runnable() {
@Override
public void run() {

4
app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java
View File

@ -6,8 +6,8 @@ public class HttpInterface {
// public static final String IP = "http://120.92.15.187/dtxb/test/m4";//开发接口-外网
// public static final String IP_UPLOAD = "http://120.92.109.239/dtxb/test/m4";//开发接口-外网
public static final String IP = "http://dtxbmaps.navinfo.com/dtxb/test/m4";//金山云接口地址
public static final String IP_UPLOAD = "http://dtxbmaps.navinfo.com/dtxb/test/m4";//金山云接口地址-数据上传
public static final String IP = "http://dtxbmaps.navinfo.com/dtxb/m4";//金山云接口地址
public static final String IP_UPLOAD = "http://dtxbmaps.navinfo.com/dtxb/m4";//金山云接口地址-数据上传
public static final String IP1 = "http://dtxbmaps.navinfo.com/dtxb/test/m4";//测试接口-外网
public static final String IP2 = "http://dtxbmaps.navinfo.com/dtxb/m4";//正式接口
public static final String IP4 = "http://10.130.23.166/dtxb/jinshan/m4";//心榕给的测试地址

2
app/src/main/java/com/navinfo/outdoor/util/PoiSaveUtils.java
View File

@ -89,7 +89,7 @@ public class PoiSaveUtils {
Constant.submitIdSet.add(poiEntity.getId()); // 记录全局的正在提交的数据
if (poiEntity.getType()==2) {
chargePoiEntityList.add(new AbstractMap.SimpleEntry<>(i, poiEntity));
} else if (poiEntity.getType() == 3 || poiEntity.getType() == 4) {
} else if (poiEntity.getType() == 3 || poiEntity.getType() == 4 || poiEntity.getType() == 11 || poiEntity.getType() == 12 || poiEntity.getType() == 13) {
spliteFilePoiEntityList.add(new AbstractMap.SimpleEntry<>(i, poiEntity));
} else {
otherPoiEntityList.add(new AbstractMap.SimpleEntry<>(i, poiEntity));