From d6b917fb722874151b1c0728994a0c24009c7d0b Mon Sep 17 00:00:00 2001 From: xiaoyan Date: Fri, 21 Jul 2023 15:52:48 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E8=AF=AF=E5=88=A0?= =?UTF-8?q?=E7=85=A7=E7=89=87=E7=9B=AE=E5=BD=95=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 | 4 ++-- .../main/java/com/navinfo/outdoor/fragment/RoadFragment.java | 4 ++-- app/src/main/java/com/navinfo/outdoor/util/DataSaveUtils.java | 2 +- app/src/main/java/com/navinfo/outdoor/util/PoiSaveUtils.java | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 5bd70e1..7784dc1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -37,8 +37,8 @@ android { applicationId "com.navinfo.outdoor" minSdkVersion 24 targetSdkVersion 30 - versionCode 109 - versionName "8.230720-正式版-OCR" + versionCode 111 + versionName "8.230721-正式版-OCR-BUGFIX" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" ndk { 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 898fb44..fa06488 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java @@ -406,7 +406,7 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList if (rgRoadStatus!=null) { for (int i = 0; i < rgRoadStatus.getChildCount(); i++) { RadioButton childAt = (RadioButton) rgRoadStatus.getChildAt(i); - if (childAt.getTag().equals(showPoiEntity.getExistence())) { + if (Integer.parseInt(childAt.getTag().toString())==showPoiEntity.getExistence()) { childAt.setChecked(true); break; } @@ -640,7 +640,7 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList ToastUtils.Message(getActivity(), poiCheckResult.getMsg()); return; } - if (existence == 0) { + if (existence == 0&&showPoiEntity.getGeoWkt()!=null) { DataSaveUtils.checkRoadPoiPicture(showPoiEntity, (List) fmRoadPic.getTag(), new DataSaveUtils.RoadPercentCheckCallback() { @Override public void callback(double percent) { 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 6d04e90..a79b63b 100644 --- a/app/src/main/java/com/navinfo/outdoor/util/DataSaveUtils.java +++ b/app/src/main/java/com/navinfo/outdoor/util/DataSaveUtils.java @@ -222,7 +222,7 @@ public class DataSaveUtils { poiEntity.setUploadProgress(poiEntity.getUploadMax()); PoiDatabase.getInstance(mContext).getPoiDao().updatePoiEntity(poiEntity); // 同时删除关联的照片文件和压缩包文件 - if (zipFile.getParentFile().exists()) { + if (zipFile.getParentFile().exists()&&!zipFile.getParentFile().getName().endsWith("picture")) { // 删除对应的文件夹 FileUtils.deleteFile(zipFile.getParentFile().getAbsolutePath()); } 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 e61db92..b961359 100644 --- a/app/src/main/java/com/navinfo/outdoor/util/PoiSaveUtils.java +++ b/app/src/main/java/com/navinfo/outdoor/util/PoiSaveUtils.java @@ -503,7 +503,7 @@ public class PoiSaveUtils { poiEntity.setTaskStatus(100); PoiDatabase.getInstance(mContext).getPoiDao().updatePoiEntity(poiEntity); // 同时删除关联的照片文件和压缩包文件 - if (!list.isEmpty()&&list.get(0).getParentFile().exists()) { + if (!list.isEmpty()&&list.get(0).getParentFile().exists()&&!list.get(0).getParentFile().getName().endsWith("picture")) { // 删除对应的文件夹 FileUtils.deleteFile(list.get(0).getParentFile().getAbsolutePath()); }