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

feat:增加获取测量结果接口

develop
白凤吉 2 months ago
parent
303fb06617
commit
dd21434af1
4 changed files with 60 additions and 39 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      app/src/main/assets/web/asset-manifest.json
  2. 2
      app/src/main/assets/web/index.html
  3. 13
      app/src/main/java/com/iflytop/profilometer/api/measure/MeasureApi.java
  4. 12
      app/src/main/java/com/iflytop/profilometer/api/record/RecordApi.java

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

@ -1,7 +1,7 @@
{ {
"files": { "files": {
"main.css": "/static/css/main.85138b91.css", "main.css": "/static/css/main.85138b91.css",
"main.js": "/static/js/main.2487922d.js",
"main.js": "/static/js/main.deeffa60.js",
"static/js/453.e7f11a48.chunk.js": "/static/js/453.e7f11a48.chunk.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_leftR.svg": "/static/media/icon_leftR.76cd3e03bb846b0bacb0a84808f24c36.svg",
"static/media/icon_tab3_u.svg": "/static/media/icon_tab3_u.6d18cbd7c4dc6a54f745fdfcc7716050.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/power.svg": "/static/media/power.544f6ce9a5b3e930a515cf130f9f9551.svg",
"static/media/icon_check_s_u.svg": "/static/media/icon_check_s_u.2c5e20bec088338dc1cb2161b5cba37d.svg", "static/media/icon_check_s_u.svg": "/static/media/icon_check_s_u.2c5e20bec088338dc1cb2161b5cba37d.svg",
"main.85138b91.css.map": "/static/css/main.85138b91.css.map", "main.85138b91.css.map": "/static/css/main.85138b91.css.map",
"main.2487922d.js.map": "/static/js/main.2487922d.js.map",
"main.deeffa60.js.map": "/static/js/main.deeffa60.js.map",
"453.e7f11a48.chunk.js.map": "/static/js/453.e7f11a48.chunk.js.map" "453.e7f11a48.chunk.js.map": "/static/js/453.e7f11a48.chunk.js.map"
}, },
"entrypoints": [ "entrypoints": [
"static/css/main.85138b91.css", "static/css/main.85138b91.css",
"static/js/main.2487922d.js"
"static/js/main.deeffa60.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.2487922d.js"></script><link href="/static/css/main.85138b91.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.deeffa60.js"></script><link href="/static/css/main.85138b91.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>

13
app/src/main/java/com/iflytop/profilometer/api/measure/MeasureApi.java
View File

@ -19,6 +19,7 @@ import com.iflytop.profilometer.core.migration.algo.type.RailProfileMeasureTaskS
import com.iflytop.profilometer.core.migration.algo.type.XYPoint; import com.iflytop.profilometer.core.migration.algo.type.XYPoint;
import com.iflytop.profilometer.core.migration.type.DeviceAppearance; import com.iflytop.profilometer.core.migration.type.DeviceAppearance;
import com.iflytop.profilometer.core.system.SystemService; import com.iflytop.profilometer.core.system.SystemService;
import com.iflytop.profilometer.core.websocket.WebSocketManager;
import com.iflytop.profilometer.dao.BaseProfileRecordPointSetDao; import com.iflytop.profilometer.dao.BaseProfileRecordPointSetDao;
import com.iflytop.profilometer.dao.ProfileRecordDao; import com.iflytop.profilometer.dao.ProfileRecordDao;
import com.iflytop.profilometer.dao.ProfileRecordPointSetDao; import com.iflytop.profilometer.dao.ProfileRecordPointSetDao;
@ -31,7 +32,9 @@ import com.iflytop.profilometer.service.RailProfileDrawerService;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.UUID; import java.util.UUID;
import cn.hutool.json.JSONArray; import cn.hutool.json.JSONArray;
@ -194,6 +197,7 @@ public class MeasureApi {
} }
public String record() { public String record() {
try {
RailProfileDrawerService railProfileDrawerService = SystemService.getInstance().getRailProfileDrawerService(); RailProfileDrawerService railProfileDrawerService = SystemService.getInstance().getRailProfileDrawerService();
RailProfileMeasureTaskState taskState = SystemService.getInstance().getTaskState(); RailProfileMeasureTaskState taskState = SystemService.getInstance().getTaskState();
ProfilometerRecorder profilometerRecorder = railProfileDrawerService.getProfilometerRecorder(); ProfilometerRecorder profilometerRecorder = railProfileDrawerService.getProfilometerRecorder();
@ -228,6 +232,15 @@ public class MeasureApi {
} }
Log.i(LogTag.PROFILOMENTER, "本次测量一共" + allList.size() + "个点"); Log.i(LogTag.PROFILOMENTER, "本次测量一共" + allList.size() + "个点");
return Result.success(allList); return Result.success(allList);
} catch (Exception e) {
Log.e(LogTag.PROFILOMENTER, "获取测量结果失败，请重新测量。", e);
Map<String, Object> toastMap = new HashMap<>();
toastMap.put("type", "msg-toast");
toastMap.put("data", "获取测量结果失败，请重新测量。");
WebSocketManager.send(JSONUtil.toJsonStr(toastMap));
return Result.failed("获取测量结果失败，请重新测量。");
}
} }
} }

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

@ -164,9 +164,13 @@ public class RecordApi {
} }
Map<String, Object> toastMap = new HashMap<>(); Map<String, Object> toastMap = new HashMap<>();
toastMap.put("type", "msg-toast"); toastMap.put("type", "msg-toast");
toastMap.put("data", "导出成功\n" + "/Download/廓形导出/\n" + zipName);
toastMap.put("data", "导出成功" + "/Download/廓形导出/" + zipName);
WebSocketManager.send(JSONUtil.toJsonStr(toastMap)); WebSocketManager.send(JSONUtil.toJsonStr(toastMap));
} catch (Exception e) { } catch (Exception e) {
Map<String, Object> toastMap = new HashMap<>();
toastMap.put("type", "msg-toast");
toastMap.put("data", "导出失败");
WebSocketManager.send(JSONUtil.toJsonStr(toastMap));
throw new RuntimeException(e); throw new RuntimeException(e);
} }
} else { } else {
@ -183,9 +187,13 @@ public class RecordApi {
FileUtil.writeTextToDownloadSubDir("廓形导出", fileName, sb.toString()); FileUtil.writeTextToDownloadSubDir("廓形导出", fileName, sb.toString());
Map<String, Object> toastMap = new HashMap<>(); Map<String, Object> toastMap = new HashMap<>();
toastMap.put("type", "msg-toast"); toastMap.put("type", "msg-toast");
toastMap.put("data", "导出成功\n" + "/Download/廓形导出/\n" + fileName);
toastMap.put("data", "导出成功" + "/Download/廓形导出/" + fileName);
WebSocketManager.send(JSONUtil.toJsonStr(toastMap)); WebSocketManager.send(JSONUtil.toJsonStr(toastMap));
} catch (IOException e) { } catch (IOException e) {
Map<String, Object> toastMap = new HashMap<>();
toastMap.put("type", "msg-toast");
toastMap.put("data", "导出失败");
WebSocketManager.send(JSONUtil.toJsonStr(toastMap));
throw new RuntimeException(e); throw new RuntimeException(e);
} }
} }

Write Preview
Loading…
Cancel
Save