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 3862823..e9a998b 100644 --- a/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java +++ b/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java @@ -2,9 +2,9 @@ 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 IP = "http://dtxbmaps.navinfo.com/dtxb/dev/m4";//开发接口-外网 + 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 IP2 = "http://dtxbmaps.navinfo.com/dtxb/m4";//正式接口 + public static final String IP = "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/";//登录 diff --git a/app/src/main/java/com/navinfo/outdoor/util/DataSaveUtils.java b/app/src/main/java/com/navinfo/outdoor/util/DataSaveUtils.java index 7f26bf6..735ff96 100644 --- a/app/src/main/java/com/navinfo/outdoor/util/DataSaveUtils.java +++ b/app/src/main/java/com/navinfo/outdoor/util/DataSaveUtils.java @@ -95,8 +95,14 @@ public class DataSaveUtils { .map(new Function>() { @Override public Map apply(File file) throws Exception { + // 计算按照当前分包大小切分的个数,超过200个则按照最多200个切分 + long splitFileSize = Constant.DEFAULT_CUT_SIZE; + long count = file.length()/Constant.DEFAULT_CUT_SIZE; + if (count>180) { + splitFileSize = file.length()/180L; + } // 每次执行上传都会切分数据,因为都会执行第一步,向服务器请求需要上传的分包数据 - List splitFiles = FileSpliteMergeUtils.splitFile(file, Constant.DEFAULT_CUT_SIZE); + List splitFiles = FileSpliteMergeUtils.splitFile(file, splitFileSize); poiEntity.setUploadMax(splitFiles.size()); sendRefreshItem(poiEntity); List chunkSizeList = new ArrayList<>();