From 95b21695d0cefc4b71d035fec95f8c6aca2c4a0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E5=87=A4=E5=90=89?= Date: Fri, 18 Jul 2025 18:02:14 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E8=B0=83=E6=95=B4=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 4 ++-- app/src/main/assets/web/asset-manifest.json | 6 +++--- app/src/main/assets/web/index.html | 2 +- .../java/com/iflytop/profilometer/api/basic/BasicApi.java | 7 +++++++ .../java/com/iflytop/profilometer/api/record/RecordApi.java | 11 +++++++++-- 5 files changed, 22 insertions(+), 8 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 33db359..d0febc3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -14,9 +14,9 @@ android { minSdk 26 targetSdk 35 // 指定应用内部版本号 - versionCode 31 + versionCode 33 // 指定展示给用户的版本号 - versionName "1.1.31" + versionName "1.1.33" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/assets/web/asset-manifest.json b/app/src/main/assets/web/asset-manifest.json index b439831..7e99ea1 100644 --- a/app/src/main/assets/web/asset-manifest.json +++ b/app/src/main/assets/web/asset-manifest.json @@ -1,7 +1,7 @@ { "files": { "main.css": "/static/css/main.e3637504.css", - "main.js": "/static/js/main.eb3940a2.js", + "main.js": "/static/js/main.361bc5ca.js", "static/js/453.e7f11a48.chunk.js": "/static/js/453.e7f11a48.chunk.js", "static/media/icon_leftR.svg": "/static/media/icon_leftR.76cd3e03bb846b0bacb0a84808f24c36.svg", "static/media/icon_tab3_u.svg": "/static/media/icon_tab3_u.6d18cbd7c4dc6a54f745fdfcc7716050.svg", @@ -27,11 +27,11 @@ "static/media/power.svg": "/static/media/power.544f6ce9a5b3e930a515cf130f9f9551.svg", "static/media/icon_check_s_u.svg": "/static/media/icon_check_s_u.2c5e20bec088338dc1cb2161b5cba37d.svg", "main.e3637504.css.map": "/static/css/main.e3637504.css.map", - "main.eb3940a2.js.map": "/static/js/main.eb3940a2.js.map", + "main.361bc5ca.js.map": "/static/js/main.361bc5ca.js.map", "453.e7f11a48.chunk.js.map": "/static/js/453.e7f11a48.chunk.js.map" }, "entrypoints": [ "static/css/main.e3637504.css", - "static/js/main.eb3940a2.js" + "static/js/main.361bc5ca.js" ] } \ No newline at end of file diff --git a/app/src/main/assets/web/index.html b/app/src/main/assets/web/index.html index 30487d3..93cdc49 100644 --- a/app/src/main/assets/web/index.html +++ b/app/src/main/assets/web/index.html @@ -1 +1 @@ -廓形仪
\ No newline at end of file +廓形仪
\ No newline at end of file diff --git a/app/src/main/java/com/iflytop/profilometer/api/basic/BasicApi.java b/app/src/main/java/com/iflytop/profilometer/api/basic/BasicApi.java index 7c091db..9ef3937 100644 --- a/app/src/main/java/com/iflytop/profilometer/api/basic/BasicApi.java +++ b/app/src/main/java/com/iflytop/profilometer/api/basic/BasicApi.java @@ -1,9 +1,11 @@ package com.iflytop.profilometer.api.basic; import android.content.Context; +import android.util.Log; import com.iflytop.profilometer.api.ws.UpdateKtjWebsocketManager; import com.iflytop.profilometer.common.constant.BaseDataType; +import com.iflytop.profilometer.common.constant.LogTag; import com.iflytop.profilometer.common.constant.SystemConfigType; import com.iflytop.profilometer.common.result.Result; import com.iflytop.profilometer.common.utils.HttpUtil; @@ -76,7 +78,9 @@ public class BasicApi { * 科天健 更新基础数据 */ public String ktjUpdate() { + Log.i(LogTag.PROFILOMENTER, "开始同步基础数据"); if (isSync) { + Log.i(LogTag.PROFILOMENTER, "正在同步基础数据，请勿重复调用"); return Result.success(); } isSync = true; @@ -95,6 +99,7 @@ public class BasicApi { String dictUrl = "/KTJData/services/dictionaryListService"; String dictJson = HttpUtil.getInstance().get(serverPath + dictUrl); if (dictJson != null) { + Log.i(LogTag.PROFILOMENTER, "dictJson != null"); JSONObject dictJsonObject = JSONUtil.parseObj(dictJson); Integer dictJsonCode = dictJsonObject.getInt("code"); if (dictJsonCode == 0) { @@ -119,6 +124,7 @@ public class BasicApi { String orgUrl = "/KTJData/services/getOrgListService"; String orgJson = HttpUtil.getInstance().get(serverPath + orgUrl); if (orgJson != null) { + Log.i(LogTag.PROFILOMENTER, "orgJson != null"); JSONObject orgJsonObject = JSONUtil.parseObj(orgJson); Integer orgJsonCode = orgJsonObject.getInt("code"); if (orgJsonCode == 0) { @@ -185,6 +191,7 @@ public class BasicApi { } finally { isSync = false; } + Log.i(LogTag.PROFILOMENTER, "同步完毕"); return true; }); return Result.success(); diff --git a/app/src/main/java/com/iflytop/profilometer/api/record/RecordApi.java b/app/src/main/java/com/iflytop/profilometer/api/record/RecordApi.java index 98addd0..fad90fc 100644 --- a/app/src/main/java/com/iflytop/profilometer/api/record/RecordApi.java +++ b/app/src/main/java/com/iflytop/profilometer/api/record/RecordApi.java @@ -29,6 +29,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; import java.util.zip.ZipEntry; +import java.util.zip.ZipException; import java.util.zip.ZipOutputStream; import cn.hutool.json.JSONArray; @@ -152,7 +153,7 @@ public class RecordApi { ProfileRecordPointSet ps = pointSetDao.getProfileRecordPointSetByUuid(desc.getUuid()); List pts = JSONUtil.toList(ps.getAlignPoints(), XYPoint.class); - String entryName = "export-" + desc.getName() + "." + downloadFileType; + String entryName = desc.getName() + "." + downloadFileType; zos.putNextEntry(new ZipEntry(entryName)); for (XYPoint pt : pts) { @@ -166,6 +167,12 @@ public class RecordApi { toastMap.put("type", "msg-toast"); toastMap.put("data", "导出成功" + "/Download/廓形导出/" + zipName); WebSocketManager.send(JSONUtil.toJsonStr(toastMap)); + } catch (ZipException e) { + Map toastMap = new HashMap<>(); + toastMap.put("type", "msg-toast"); + toastMap.put("data", "导出文件不能同名，请重新选择"); + WebSocketManager.send(JSONUtil.toJsonStr(toastMap)); + throw new RuntimeException(e); } catch (Exception e) { Map toastMap = new HashMap<>(); toastMap.put("type", "msg-toast"); @@ -182,7 +189,7 @@ public class RecordApi { for (XYPoint pt : pts) { sb.append(String.format(Locale.US, "%1$.6f %2$.6f%n", pt.getX(), -pt.getY())); } - String fileName = "export-" + desc.getName() + "." + downloadFileType; + String fileName = desc.getName() + "." + downloadFileType; try { FileUtil.writeTextToDownloadSubDir("廓形导出", fileName, sb.toString()); Map toastMap = new HashMap<>();