From 82317339224c7ddecb85b25ef8aa94604c7887dd Mon Sep 17 00:00:00 2001 From: xiaoyan Date: Wed, 12 Jan 2022 13:37:06 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E4=BA=86=E6=8B=8D?= =?UTF-8?q?=E6=91=84=E6=97=B6txt=E6=96=87=E4=BB=B6=E7=BB=8F=E7=BA=AC?= =?UTF-8?q?=E5=BA=A6=E7=9A=84=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 4 +-- .../outdoor/activity/PicturesActivity.java | 6 ++--- .../outdoor/fragment/PoiVideoFragment.java | 6 +++++ .../outdoor/fragment/RoadFragment.java | 6 +++++ .../navinfo/outdoor/util/PoiSaveUtils.java | 25 +++++++++++++++++++ 5 files changed, 42 insertions(+), 5 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 2467df2..780590c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ android { applicationId "com.navinfo.outdoor" minSdkVersion 22 targetSdkVersion 30 - versionCode 11 - versionName "8.1210" + versionCode 12 + versionName "8.1211" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } lintOptions { 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 e1c84ed..ecb27d6 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/PicturesActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/PicturesActivity.java @@ -812,10 +812,10 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen sb.append(initCount); sb.append(","); if (gpsLocation != null) { - double[] doubles = Gps.toGCJ02Point(gpsLocation.getLatitude(), gpsLocation.getLongitude()); - sb.append(doubles[0]); +// double[] doubles = Gps.toGCJ02Point(gpsLocation.getLatitude(), gpsLocation.getLongitude()); + sb.append(gpsLocation.getLatitude()); sb.append(","); - sb.append(doubles[1]); + sb.append(gpsLocation.getLongitude()); } else { sb.append(0); sb.append(","); diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java index 2a59ef1..8da71b4 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java @@ -55,6 +55,7 @@ import com.navinfo.outdoor.util.AWMp4ParserHelper; import com.navinfo.outdoor.util.FlushTokenUtil; import com.navinfo.outdoor.util.Geohash; import com.navinfo.outdoor.util.GeometryTools; +import com.navinfo.outdoor.util.PoiSaveUtils; import com.navinfo.outdoor.util.PreserveUtils; import com.navinfo.outdoor.util.TimestampUtil; import com.navinfo.outdoor.util.ToastUtils; @@ -497,6 +498,11 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick if (Constant.isPresent) { if (fmPoiVideoPic.getTag() != null) { List videoFileList = (List) fmPoiVideoPic.getTag(); + boolean existsPic = PoiSaveUtils.getInstance(getActivity()).checkPicExists(videoFileList); + if (!existsPic) { + ToastUtils.Message(getActivity(), "本地不存在照片文件，无法上传数据，请确认！"); + return; + } fileZip = new File(Constant.PICTURE_FOLDER, "files" + ".zip"); new Thread(new Runnable() { @Override diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java index 18f90a2..e03f5e4 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java @@ -41,6 +41,7 @@ import com.navinfo.outdoor.activity.PicturesActivity; import com.navinfo.outdoor.api.Constant; import com.navinfo.outdoor.base.BaseDrawerFragment; import com.navinfo.outdoor.util.FlushTokenUtil; +import com.navinfo.outdoor.util.PoiSaveUtils; import com.navinfo.outdoor.util.PreserveUtils; import com.navinfo.outdoor.util.TimestampUtil; import com.navinfo.outdoor.util.ToastUtils; @@ -484,6 +485,11 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList if (Constant.isPresent) { if (fmRoadPic.getTag() != null) { List videoFileList = (List) fmRoadPic.getTag(); + boolean existsPic = PoiSaveUtils.getInstance(getActivity()).checkPicExists(videoFileList); + if (!existsPic) { + ToastUtils.Message(getActivity(), "本地不存在照片文件，无法上传数据，请确认！"); + return; + } fileZip = new File(Constant.PICTURE_FOLDER, "files" + ".zip"); new Thread(new Runnable() { @Override diff --git a/app/src/main/java/com/navinfo/outdoor/util/PoiSaveUtils.java b/app/src/main/java/com/navinfo/outdoor/util/PoiSaveUtils.java index 711bb7c..4e91a14 100644 --- a/app/src/main/java/com/navinfo/outdoor/util/PoiSaveUtils.java +++ b/app/src/main/java/com/navinfo/outdoor/util/PoiSaveUtils.java @@ -65,8 +65,10 @@ public class PoiSaveUtils { public void run() { anInt = 0; bInt = 0; + Log.d("PoiSaveUtils", "开始上传"); for (int i = 0; i < poiEntityList.size(); i++) { PoiEntity poiEntity = poiEntityList.get(i); + Log.d("PoiSaveUtils", "poiEntity.getType():"+poiEntity.getType()); if (poiEntity.getType() == 2) { // 如果是充电站数据，首先检查子充电桩的状态 if (saveChargingPileByChargingStation(poiEntity)) { if (savePoiNet(poiEntity) == 200) { // 网络保存成功 @@ -243,6 +245,11 @@ public class PoiSaveUtils { } else if (poiEntity.getType() == 3) { List videoFileList = AWMp4ParserHelper.getInstance().getFileListByUUID(poiEntity.getId()); if (videoFileList != null && !videoFileList.isEmpty()) { + boolean existsPic = PoiSaveUtils.getInstance(mContext).checkPicExists(videoFileList); + if (!existsPic) { + bInt++; + return; + } File fileZip = new File(Constant.PICTURE_FOLDER, "files" + ".zip"); ZipUtil.zipFiles(videoFileList, fileZip, null); photoFile.add(fileZip); @@ -264,6 +271,11 @@ public class PoiSaveUtils { } else if (poiEntity.getType() == 4) { List videoFileList = AWMp4ParserHelper.getInstance().getFileListByUUID(poiEntity.getId()); if (videoFileList != null && !videoFileList.isEmpty()) { + boolean existsPic = PoiSaveUtils.getInstance(mContext).checkPicExists(videoFileList); + if (!existsPic) { + bInt++; + return; + } File fileZip = new File(Constant.PICTURE_FOLDER, "files" + ".zip"); ZipUtil.zipFiles(videoFileList, fileZip, null); photoFile.add(fileZip); @@ -518,4 +530,17 @@ public class PoiSaveUtils { return 200; } + /** + * 检查传入的文件列表是否都存在 + * */ + public boolean checkPicExists(List fileList) { + boolean isExistsPic = false; // 是否记录的照片全部不存在 + for (File picFile: fileList) { + if (picFile!=null&&picFile.exists()) { + isExistsPic = true; + break; + } + } + return isExistsPic; + } }