baifengji
/
profilometer_android
1
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity
Browse Source

fix:调整导出文件名称

develop
白凤吉 3 weeks ago
parent
1c774b90e5
commit
95b21695d0
5 changed files with 22 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      app/build.gradle
  2. 6
      app/src/main/assets/web/asset-manifest.json
  3. 2
      app/src/main/assets/web/index.html
  4. 7
      app/src/main/java/com/iflytop/profilometer/api/basic/BasicApi.java
  5. 11
      app/src/main/java/com/iflytop/profilometer/api/record/RecordApi.java

4
app/build.gradle
View File

@ -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"
}

6
app/src/main/assets/web/asset-manifest.json
View File

@ -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"
]
}

2
app/src/main/assets/web/index.html
View File

@ -1 +1 @@
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=no"/><title>廓形仪</title><script defer="defer" src="/static/js/main.eb3940a2.js"></script><link href="/static/css/main.e3637504.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>function setupWebViewJavascriptBridge(e){if(window.WebViewJavascriptBridge)return e(WebViewJavascriptBridge);if(/android/i.test(navigator.userAgent))document.addEventListener("WebViewJavascriptBridgeReady",(function(){e(WebViewJavascriptBridge)}),!1);else{if(window.WVJBCallbacks)return window.WVJBCallbacks.push(e);window.WVJBCallbacks=[e];var i=document.createElement("iframe");i.style.display="none",i.src="https://__bridge_loaded__",document.documentElement.appendChild(i),setTimeout((function(){document.documentElement.removeChild(i)}),0)}}setupWebViewJavascriptBridge((function(e){window.bridge=e}));var SyncBridgeJS={call:function(e,i){return prompt("sync/syncBridge/"+e,i)}}</script></body></html>
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=no"/><title>廓形仪</title><script defer="defer" src="/static/js/main.361bc5ca.js"></script><link href="/static/css/main.e3637504.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>function setupWebViewJavascriptBridge(e){if(window.WebViewJavascriptBridge)return e(WebViewJavascriptBridge);if(/android/i.test(navigator.userAgent))document.addEventListener("WebViewJavascriptBridgeReady",(function(){e(WebViewJavascriptBridge)}),!1);else{if(window.WVJBCallbacks)return window.WVJBCallbacks.push(e);window.WVJBCallbacks=[e];var i=document.createElement("iframe");i.style.display="none",i.src="https://__bridge_loaded__",document.documentElement.appendChild(i),setTimeout((function(){document.documentElement.removeChild(i)}),0)}}setupWebViewJavascriptBridge((function(e){window.bridge=e}));var SyncBridgeJS={call:function(e,i){return prompt("sync/syncBridge/"+e,i)}}</script></body></html>

7
app/src/main/java/com/iflytop/profilometer/api/basic/BasicApi.java
View File

@ -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();

11
app/src/main/java/com/iflytop/profilometer/api/record/RecordApi.java
View File

@ -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<XYPoint> 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<String, Object> toastMap = new HashMap<>();
toastMap.put("type", "msg-toast");
toastMap.put("data", "导出文件不能同名，请重新选择");
WebSocketManager.send(JSONUtil.toJsonStr(toastMap));
throw new RuntimeException(e);
} catch (Exception e) {
Map<String, Object> 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<String, Object> toastMap = new HashMap<>();

Write Preview
Loading…
Cancel
Save