修复保存问题

增加全局日志捕获
测量数据抛弃重叠部分
上传改为获取对齐后的点
修复hutool转换json的错误
更新前端代码

app/build.gradle

@@ -14,9 +14,9 @@ android {
         minSdk 26
         targetSdk 35
         // 指定应用内部版本号
-        versionCode 13
+        versionCode 18
         // 指定展示给用户的版本号
-        versionName "1.1.13"
+        versionName "1.1.18"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

app/src/main/assets/web/asset-manifest.json

@@ -1,27 +1,36 @@
 {
   "files": {
-    "main.css": "./static/css/main.4ee465da.css",
-    "main.js": "./static/js/main.ce23cd9f.js",
-    "static/js/206.d71bd05f.chunk.js": "./static/js/206.d71bd05f.chunk.js",
-    "static/media/icon_tab3_u.svg": "./static/media/icon_tab3_u.6d18cbd7c4dc6a54f745fdfcc7716050.svg",
-    "static/media/icon_tab3_s.svg": "./static/media/icon_tab3_s.b0a9cbf5ecee59829c9de63a2e9de169.svg",
-    "static/media/icon_tab1_u.svg": "./static/media/icon_tab1_u.242e54b7c6bc6d5751e513a1371fb444.svg",
-    "static/media/icon_tab1_s.svg": "./static/media/icon_tab1_s.51c4a29ff60d8149b73a6da870a0dc9d.svg",
-    "index.html": "./index.html",
-    "static/media/icon_arr_down.svg": "./static/media/icon_arr_down.8c0d93eb792dae2a61e6b1cb7a0be24f.svg",
-    "static/media/icon_upload_0.svg": "./static/media/icon_upload_0.d6d28ba6d84bea497a3bbbcfa49848da.svg",
-    "static/media/icon_upload_1.svg": "./static/media/icon_upload_1.d809d5e1d6b2ec770ad20985973345c9.svg",
-    "static/media/icon_upload_2.svg": "./static/media/icon_upload_2.0977cb5f7c7c49169934f022278585ac.svg",
-    "static/media/icon_arr_p_r.svg": "./static/media/icon_arr_p_r.18732bf39132eaf80eb97478e2dfe49e.svg",
-    "static/media/icon_arr_s_r.svg": "./static/media/icon_arr_s_r.e4c65b0e5f36f1ae695df9453eb6bfd9.svg",
-    "static/media/icon_check_s_s.svg": "./static/media/icon_check_s_s.1aa205f14263037f7945d9da81958069.svg",
-    "static/media/icon_tab4_s.svg": "./static/media/icon_tab4_s.0f67ddc554b55cdcf7f678a0820bc9e4.svg",
-    "static/media/icon_tab4_u.svg": "./static/media/icon_tab4_u.43586d94d1ed2577d962f54171ad0160.svg",
-    "static/media/icon_bluetooth.svg": "./static/media/icon_bluetooth.a48021d03233ba0570bf3960cddf6a65.svg",
-    "static/media/icon_check_s_u.svg": "./static/media/icon_check_s_u.2c5e20bec088338dc1cb2161b5cba37d.svg"
+    "main.css": "/static/css/main.b5101f43.css",
+    "main.js": "/static/js/main.31b6ee2e.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",
+    "static/media/icon_tab3_s.svg": "/static/media/icon_tab3_s.b0a9cbf5ecee59829c9de63a2e9de169.svg",
+    "static/media/icon_rightR.svg": "/static/media/icon_rightR.c1fd246e41f0d82d1747361be8bdc7fe.svg",
+    "static/media/icon_up.svg": "/static/media/icon_up.949fab143d0df7615a7bcb321a785702.svg",
+    "static/media/icon_down.svg": "/static/media/icon_down.2b7e3bf8e9cb31de99dc0c5c36557ef9.svg",
+    "static/media/icon_right.svg": "/static/media/icon_right.5e2aec5aa252c542beb49dced257b935.svg",
+    "static/media/icon_left.svg": "/static/media/icon_left.d80a07713085d7d71fe4aa8442431b5f.svg",
+    "static/media/icon_tab1_u.svg": "/static/media/icon_tab1_u.242e54b7c6bc6d5751e513a1371fb444.svg",
+    "static/media/icon_tab1_s.svg": "/static/media/icon_tab1_s.51c4a29ff60d8149b73a6da870a0dc9d.svg",
+    "index.html": "/index.html",
+    "static/media/icon_arr_down.svg": "/static/media/icon_arr_down.8c0d93eb792dae2a61e6b1cb7a0be24f.svg",
+    "static/media/icon_upload_0.svg": "/static/media/icon_upload_0.d6d28ba6d84bea497a3bbbcfa49848da.svg",
+    "static/media/icon_upload_1.svg": "/static/media/icon_upload_1.d809d5e1d6b2ec770ad20985973345c9.svg",
+    "static/media/icon_upload_2.svg": "/static/media/icon_upload_2.0977cb5f7c7c49169934f022278585ac.svg",
+    "static/media/icon_arr_p_r.svg": "/static/media/icon_arr_p_r.18732bf39132eaf80eb97478e2dfe49e.svg",
+    "static/media/icon_arr_s_r.svg": "/static/media/icon_arr_s_r.e4c65b0e5f36f1ae695df9453eb6bfd9.svg",
+    "static/media/icon_check_s_s.svg": "/static/media/icon_check_s_s.1aa205f14263037f7945d9da81958069.svg",
+    "static/media/icon_tab4_s.svg": "/static/media/icon_tab4_s.0f67ddc554b55cdcf7f678a0820bc9e4.svg",
+    "static/media/icon_tab4_u.svg": "/static/media/icon_tab4_u.43586d94d1ed2577d962f54171ad0160.svg",
+    "static/media/icon_bluetooth.svg": "/static/media/icon_bluetooth.a48021d03233ba0570bf3960cddf6a65.svg",
+    "static/media/icon_check_s_u.svg": "/static/media/icon_check_s_u.2c5e20bec088338dc1cb2161b5cba37d.svg",
+    "main.b5101f43.css.map": "/static/css/main.b5101f43.css.map",
+    "main.31b6ee2e.js.map": "/static/js/main.31b6ee2e.js.map",
+    "453.e7f11a48.chunk.js.map": "/static/js/453.e7f11a48.chunk.js.map"
   },
   "entrypoints": [
-    "static/css/main.4ee465da.css",
-    "static/js/main.ce23cd9f.js"
+    "static/css/main.b5101f43.css",
+    "static/js/main.31b6ee2e.js"
   ]
 }

app/src/main/assets/web/index.html

@@ -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.ce23cd9f.js"></script><link href="./static/css/main.4ee465da.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.31b6ee2e.js"></script><link href="/static/css/main.b5101f43.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>

app/src/main/assets/web/static/js/206.d71bd05f.chunk.js → app/src/main/assets/web/static/js/453.e7f11a48.chunk.js

@@ -1 +1,2 @@
-"use strict";(self.webpackChunkoutline_mobile=self.webpackChunkoutline_mobile||[]).push([[206],{206:(e,t,n)=>{n.r(t),n.d(t,{getCLS:()=>y,getFCP:()=>g,getFID:()=>C,getLCP:()=>P,getTTFB:()=>D});var i,r,a,o,u=function(e,t){return{name:e,value:void 0===t?-1:t,delta:0,entries:[],id:"v2-".concat(Date.now(),"-").concat(Math.floor(8999999999999*Math.random())+1e12)}},c=function(e,t){try{if(PerformanceObserver.supportedEntryTypes.includes(e)){if("first-input"===e&&!("PerformanceEventTiming"in self))return;var n=new PerformanceObserver((function(e){return e.getEntries().map(t)}));return n.observe({type:e,buffered:!0}),n}}catch(e){}},f=function(e,t){var n=function n(i){"pagehide"!==i.type&&"hidden"!==document.visibilityState||(e(i),t&&(removeEventListener("visibilitychange",n,!0),removeEventListener("pagehide",n,!0)))};addEventListener("visibilitychange",n,!0),addEventListener("pagehide",n,!0)},s=function(e){addEventListener("pageshow",(function(t){t.persisted&&e(t)}),!0)},m=function(e,t,n){var i;return function(r){t.value>=0&&(r||n)&&(t.delta=t.value-(i||0),(t.delta||void 0===i)&&(i=t.value,e(t)))}},v=-1,p=function(){return"hidden"===document.visibilityState?0:1/0},d=function(){f((function(e){var t=e.timeStamp;v=t}),!0)},l=function(){return v<0&&(v=p(),d(),s((function(){setTimeout((function(){v=p(),d()}),0)}))),{get firstHiddenTime(){return v}}},g=function(e,t){var n,i=l(),r=u("FCP"),a=function(e){"first-contentful-paint"===e.name&&(f&&f.disconnect(),e.startTime<i.firstHiddenTime&&(r.value=e.startTime,r.entries.push(e),n(!0)))},o=window.performance&&performance.getEntriesByName&&performance.getEntriesByName("first-contentful-paint")[0],f=o?null:c("paint",a);(o||f)&&(n=m(e,r,t),o&&a(o),s((function(i){r=u("FCP"),n=m(e,r,t),requestAnimationFrame((function(){requestAnimationFrame((function(){r.value=performance.now()-i.timeStamp,n(!0)}))}))})))},h=!1,T=-1,y=function(e,t){h||(g((function(e){T=e.value})),h=!0);var n,i=function(t){T>-1&&e(t)},r=u("CLS",0),a=0,o=[],v=function(e){if(!e.hadRecentInput){var t=o[0],i=o[o.length-1];a&&e.startTime-i.startTime<1e3&&e.startTime-t.startTime<5e3?(a+=e.value,o.push(e)):(a=e.value,o=[e]),a>r.value&&(r.value=a,r.entries=o,n())}},p=c("layout-shift",v);p&&(n=m(i,r,t),f((function(){p.takeRecords().map(v),n(!0)})),s((function(){a=0,T=-1,r=u("CLS",0),n=m(i,r,t)})))},E={passive:!0,capture:!0},w=new Date,L=function(e,t){i||(i=t,r=e,a=new Date,F(removeEventListener),S())},S=function(){if(r>=0&&r<a-w){var e={entryType:"first-input",name:i.type,target:i.target,cancelable:i.cancelable,startTime:i.timeStamp,processingStart:i.timeStamp+r};o.forEach((function(t){t(e)})),o=[]}},b=function(e){if(e.cancelable){var t=(e.timeStamp>1e12?new Date:performance.now())-e.timeStamp;"pointerdown"==e.type?function(e,t){var n=function(){L(e,t),r()},i=function(){r()},r=function(){removeEventListener("pointerup",n,E),removeEventListener("pointercancel",i,E)};addEventListener("pointerup",n,E),addEventListener("pointercancel",i,E)}(t,e):L(t,e)}},F=function(e){["mousedown","keydown","touchstart","pointerdown"].forEach((function(t){return e(t,b,E)}))},C=function(e,t){var n,a=l(),v=u("FID"),p=function(e){e.startTime<a.firstHiddenTime&&(v.value=e.processingStart-e.startTime,v.entries.push(e),n(!0))},d=c("first-input",p);n=m(e,v,t),d&&f((function(){d.takeRecords().map(p),d.disconnect()}),!0),d&&s((function(){var a;v=u("FID"),n=m(e,v,t),o=[],r=-1,i=null,F(addEventListener),a=p,o.push(a),S()}))},k={},P=function(e,t){var n,i=l(),r=u("LCP"),a=function(e){var t=e.startTime;t<i.firstHiddenTime&&(r.value=t,r.entries.push(e),n())},o=c("largest-contentful-paint",a);if(o){n=m(e,r,t);var v=function(){k[r.id]||(o.takeRecords().map(a),o.disconnect(),k[r.id]=!0,n(!0))};["keydown","click"].forEach((function(e){addEventListener(e,v,{once:!0,capture:!0})})),f(v,!0),s((function(i){r=u("LCP"),n=m(e,r,t),requestAnimationFrame((function(){requestAnimationFrame((function(){r.value=performance.now()-i.timeStamp,k[r.id]=!0,n(!0)}))}))}))}},D=function(e){var t,n=u("TTFB");t=function(){try{var t=performance.getEntriesByType("navigation")[0]||function(){var e=performance.timing,t={entryType:"navigation",startTime:0};for(var n in e)"navigationStart"!==n&&"toJSON"!==n&&(t[n]=Math.max(e[n]-e.navigationStart,0));return t}();if(n.value=n.delta=t.responseStart,n.value<0||n.value>performance.now())return;n.entries=[t],e(n)}catch(e){}},"complete"===document.readyState?setTimeout(t,0):addEventListener("load",(function(){return setTimeout(t,0)}))}}}]);
+"use strict";(self.webpackChunkoutline_mobile=self.webpackChunkoutline_mobile||[]).push([[453],{453:(e,t,n)=>{n.r(t),n.d(t,{getCLS:()=>y,getFCP:()=>g,getFID:()=>C,getLCP:()=>P,getTTFB:()=>D});var i,r,a,o,u=function(e,t){return{name:e,value:void 0===t?-1:t,delta:0,entries:[],id:"v2-".concat(Date.now(),"-").concat(Math.floor(8999999999999*Math.random())+1e12)}},c=function(e,t){try{if(PerformanceObserver.supportedEntryTypes.includes(e)){if("first-input"===e&&!("PerformanceEventTiming"in self))return;var n=new PerformanceObserver((function(e){return e.getEntries().map(t)}));return n.observe({type:e,buffered:!0}),n}}catch(e){}},f=function(e,t){var n=function n(i){"pagehide"!==i.type&&"hidden"!==document.visibilityState||(e(i),t&&(removeEventListener("visibilitychange",n,!0),removeEventListener("pagehide",n,!0)))};addEventListener("visibilitychange",n,!0),addEventListener("pagehide",n,!0)},s=function(e){addEventListener("pageshow",(function(t){t.persisted&&e(t)}),!0)},m=function(e,t,n){var i;return function(r){t.value>=0&&(r||n)&&(t.delta=t.value-(i||0),(t.delta||void 0===i)&&(i=t.value,e(t)))}},v=-1,p=function(){return"hidden"===document.visibilityState?0:1/0},d=function(){f((function(e){var t=e.timeStamp;v=t}),!0)},l=function(){return v<0&&(v=p(),d(),s((function(){setTimeout((function(){v=p(),d()}),0)}))),{get firstHiddenTime(){return v}}},g=function(e,t){var n,i=l(),r=u("FCP"),a=function(e){"first-contentful-paint"===e.name&&(f&&f.disconnect(),e.startTime<i.firstHiddenTime&&(r.value=e.startTime,r.entries.push(e),n(!0)))},o=window.performance&&performance.getEntriesByName&&performance.getEntriesByName("first-contentful-paint")[0],f=o?null:c("paint",a);(o||f)&&(n=m(e,r,t),o&&a(o),s((function(i){r=u("FCP"),n=m(e,r,t),requestAnimationFrame((function(){requestAnimationFrame((function(){r.value=performance.now()-i.timeStamp,n(!0)}))}))})))},h=!1,T=-1,y=function(e,t){h||(g((function(e){T=e.value})),h=!0);var n,i=function(t){T>-1&&e(t)},r=u("CLS",0),a=0,o=[],v=function(e){if(!e.hadRecentInput){var t=o[0],i=o[o.length-1];a&&e.startTime-i.startTime<1e3&&e.startTime-t.startTime<5e3?(a+=e.value,o.push(e)):(a=e.value,o=[e]),a>r.value&&(r.value=a,r.entries=o,n())}},p=c("layout-shift",v);p&&(n=m(i,r,t),f((function(){p.takeRecords().map(v),n(!0)})),s((function(){a=0,T=-1,r=u("CLS",0),n=m(i,r,t)})))},E={passive:!0,capture:!0},w=new Date,L=function(e,t){i||(i=t,r=e,a=new Date,F(removeEventListener),S())},S=function(){if(r>=0&&r<a-w){var e={entryType:"first-input",name:i.type,target:i.target,cancelable:i.cancelable,startTime:i.timeStamp,processingStart:i.timeStamp+r};o.forEach((function(t){t(e)})),o=[]}},b=function(e){if(e.cancelable){var t=(e.timeStamp>1e12?new Date:performance.now())-e.timeStamp;"pointerdown"==e.type?function(e,t){var n=function(){L(e,t),r()},i=function(){r()},r=function(){removeEventListener("pointerup",n,E),removeEventListener("pointercancel",i,E)};addEventListener("pointerup",n,E),addEventListener("pointercancel",i,E)}(t,e):L(t,e)}},F=function(e){["mousedown","keydown","touchstart","pointerdown"].forEach((function(t){return e(t,b,E)}))},C=function(e,t){var n,a=l(),v=u("FID"),p=function(e){e.startTime<a.firstHiddenTime&&(v.value=e.processingStart-e.startTime,v.entries.push(e),n(!0))},d=c("first-input",p);n=m(e,v,t),d&&f((function(){d.takeRecords().map(p),d.disconnect()}),!0),d&&s((function(){var a;v=u("FID"),n=m(e,v,t),o=[],r=-1,i=null,F(addEventListener),a=p,o.push(a),S()}))},k={},P=function(e,t){var n,i=l(),r=u("LCP"),a=function(e){var t=e.startTime;t<i.firstHiddenTime&&(r.value=t,r.entries.push(e),n())},o=c("largest-contentful-paint",a);if(o){n=m(e,r,t);var v=function(){k[r.id]||(o.takeRecords().map(a),o.disconnect(),k[r.id]=!0,n(!0))};["keydown","click"].forEach((function(e){addEventListener(e,v,{once:!0,capture:!0})})),f(v,!0),s((function(i){r=u("LCP"),n=m(e,r,t),requestAnimationFrame((function(){requestAnimationFrame((function(){r.value=performance.now()-i.timeStamp,k[r.id]=!0,n(!0)}))}))}))}},D=function(e){var t,n=u("TTFB");t=function(){try{var t=performance.getEntriesByType("navigation")[0]||function(){var e=performance.timing,t={entryType:"navigation",startTime:0};for(var n in e)"navigationStart"!==n&&"toJSON"!==n&&(t[n]=Math.max(e[n]-e.navigationStart,0));return t}();if(n.value=n.delta=t.responseStart,n.value<0||n.value>performance.now())return;n.entries=[t],e(n)}catch(e){}},"complete"===document.readyState?setTimeout(t,0):addEventListener("load",(function(){return setTimeout(t,0)}))}}}]);
+//# sourceMappingURL=453.e7f11a48.chunk.js.map

app/src/main/assets/web/static/js/main.ce23cd9f.js.LICENSE.txt

@@ -1,128 +0,0 @@
-/*!
-	Copyright (c) 2018 Jed Watson.
-	Licensed under the MIT License (MIT), see
-	http://jedwatson.github.io/classnames
-*/
-
-/**
- * @license React
- * react-dom.production.min.js
- *
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-/**
- * @license React
- * react-is.production.min.js
- *
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-/**
- * @license React
- * react-jsx-runtime.production.min.js
- *
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-/**
- * @license React
- * react-reconciler-constants.production.min.js
- *
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-/**
- * @license React
- * react-reconciler.production.min.js
- *
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-/**
- * @license React
- * react.production.min.js
- *
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-/**
- * @license React
- * scheduler.production.min.js
- *
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-/**
- * @license React
- * use-sync-external-store-shim.production.js
- *
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-/**
- * @license React
- * use-sync-external-store-with-selector.production.js
- *
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-/**
- * @remix-run/router v1.23.0
- *
- * Copyright (c) Remix Software Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE.md file in the root directory of this source tree.
- *
- * @license MIT
- */
-
-/**
- * React Router DOM v6.30.0
- *
- * Copyright (c) Remix Software Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE.md file in the root directory of this source tree.
- *
- * @license MIT
- */
-
-/**
- * React Router v6.30.0
- *
- * Copyright (c) Remix Software Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE.md file in the root directory of this source tree.
- *
- * @license MIT
- */

app/src/main/assets/web/static/media/icon_down.2b7e3bf8e9cb31de99dc0c5c36557ef9.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="50" height="50" viewBox="0 0 50 50"><defs><filter id="master_svg0_58_9800" filterUnits="objectBoundingBox" color-interpolation-filters="sRGB" x="-0.09090909090909091" y="-0.06818181818181818" width="1.1818181818181819" height="1.1818181818181819"><feFlood flood-opacity="0" result="BackgroundImageFix"/><feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/><feOffset dy="1" dx="0"/><feGaussianBlur stdDeviation="1"/><feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.15000000596046448 0"/><feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow"/><feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow" result="shape"/></filter><clipPath id="master_svg1_58_9798"><rect x="9" y="52" width="32" height="32" rx="0"/></clipPath></defs><g transform="matrix(1,0,0,-1,0,92)"><g transform="matrix(1,0,0,-1,0,180)" filter="url(#master_svg0_58_9800)"><ellipse cx="25" cy="112" rx="22" ry="22" fill="#FFFFFF" fill-opacity="1"/></g><g clip-path="url(#master_svg1_58_9798)"><g><path d="M21.7247371875,67.9623234375L21.7247371875,81.1185234375C21.7247371875,81.5717234375,22.0934871875,81.9404234375,22.5466171875,81.9404234375L27.3966171875,81.9404234375C27.8497371875,81.9404234375,28.218517187499998,81.5717234375,28.218517187499998,81.1185234375L28.218517187499998,67.9623234375L31.5341171875,67.9623234375C31.8528171875,67.9623234375,32.0497171875,67.6154234375,31.890317187500003,67.3435234375L25.3591171875,56.2029294375C25.1997371875,55.9310546375,24.8091171875,55.9310546375,24.6497371875,56.2029294375L18.1153630875,67.3404234375C17.9528631875,67.6154234375,18.1528634875,67.9592234375,18.4716131875,67.9592234375L21.7247371875,67.9592234375L21.7247371875,67.9623234375Z" fill="#5F5F5F" fill-opacity="1" style="mix-blend-mode:passthrough"/></g></g></g></svg>

app/src/main/assets/web/static/media/icon_left.d80a07713085d7d71fe4aa8442431b5f.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="50" height="50" viewBox="0 0 50 50"><defs><filter id="master_svg0_58_9802" filterUnits="objectBoundingBox" color-interpolation-filters="sRGB" x="-0.09090909090909091" y="-0.06818181818181818" width="1.1818181818181819" height="1.1818181818181819"><feFlood flood-opacity="0" result="BackgroundImageFix"/><feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/><feOffset dy="1" dx="0"/><feGaussianBlur stdDeviation="1"/><feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.15000000596046448 0"/><feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow"/><feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow" result="shape"/></filter><clipPath id="master_svg1_58_9803"><rect x="10" y="83" width="30" height="30" rx="0"/></clipPath></defs><g transform="matrix(1,0,0,-1,0,92)"><g transform="matrix(1,0,0,-1,0,180)" filter="url(#master_svg0_58_9802)"><ellipse cx="25" cy="112" rx="22" ry="22" fill="#FFFFFF" fill-opacity="1"/></g><g transform="matrix(1,0,0,-1,0,166)" clip-path="url(#master_svg1_58_9803)"><g transform="matrix(0,-1,1,0,-93,117)"><path d="M15.66712,116.9633L15.66712,130.1195C15.66712,130.5727,16.03587,130.9414,16.489,130.9414L21.339,130.9414C21.79212,130.9414,22.160899999999998,130.5727,22.160899999999998,130.1195L22.160899999999998,116.9633L25.4765,116.9633C25.7952,116.9633,25.9921,116.6164,25.832700000000003,116.3445L19.3015,105.203906C19.14212,104.9320312,18.7515,104.9320312,18.59212,105.203906L12.0577459,116.3414C11.895246,116.6164,12.0952463,116.9602,12.413996,116.9602L15.66712,116.9602L15.66712,116.9633Z" fill="#5F5F5F" fill-opacity="1" style="mix-blend-mode:passthrough"/></g></g></g></svg>

app/src/main/assets/web/static/media/icon_leftR.76cd3e03bb846b0bacb0a84808f24c36.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="50" height="50" viewBox="0 0 50 50"><defs><filter id="master_svg0_58_9791" filterUnits="objectBoundingBox" color-interpolation-filters="sRGB" x="-0.09090909090909091" y="-0.06818181818181818" width="1.1818181818181819" height="1.1818181818181819"><feFlood flood-opacity="0" result="BackgroundImageFix"/><feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/><feOffset dy="1" dx="0"/><feGaussianBlur stdDeviation="1"/><feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.15000000596046448 0"/><feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow"/><feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow" result="shape"/></filter><clipPath id="master_svg1_58_9789"><rect x="11" y="82.00011444091797" width="29" height="28" rx="0"/></clipPath><clipPath id="master_svg2_58_9685"><rect x="12" y="85.00011444091797" width="28" height="22" rx="0"/></clipPath></defs><g transform="matrix(1,0,0,-1,0,92)"><g transform="matrix(1,0,0,-1,0,180)" filter="url(#master_svg0_58_9791)"><ellipse cx="25" cy="112" rx="22" ry="22" fill="#FFFFFF" fill-opacity="1"/></g><g transform="matrix(1,0,0,-1,0,164.00022888183594)" clip-path="url(#master_svg1_58_9789)"><g clip-path="url(#master_svg2_58_9685)"><g><path d="M28.397199999999998,87.98627444091797L24.035980000000002,87.98627444091797L25.1113,86.91002444091797C25.5445,86.47652444091797,25.5445,85.75902544091797,25.1113,85.32553444091796C24.67265,84.89164144091797,23.96686,84.89164144091797,23.52817,85.32553444091796L21.03394,87.82184444091797C20.824849999999998,88.03112444091796,20.66056,88.41976444091797,20.66056,88.71872444091797C20.66056,89.01768444091798,20.824849999999998,89.40633444091797,21.03394,89.61560444091796L23.52817,92.11192444091797C23.752209999999998,92.33614444091796,24.035980000000002,92.44077444091796,24.319760000000002,92.44077444091796C24.60353,92.44077444091796,24.88731,92.33614444091796,25.1113,92.11192444091797C25.5445,91.67842444091796,25.5445,90.96092444091796,25.1113,90.52743444091797L24.81263,90.22847444091796L28.412100000000002,90.22847444091796C31.9144,90.23669444091797,34.7515,93.07617444091797,34.759699999999995,96.58141444091797C34.759699999999995,97.19421444091797,35.2675,97.70251444091797,35.8798,97.70251444091797C36.4922,97.70251444091797,37,97.19421444091797,37,96.58141444091797C36.9851,91.84285444091798,33.1466,87.98627444091797,28.397199999999998,87.98627444091797ZM31.2648,93.59177444091797L16.56823,93.59177444091797C15.701969,93.59177444091797,15,94.29432444091796,15,95.16131444091796L15,105.43061444091796C15,106.29751444091796,15.701969,107.00011444091797,16.56823,107.00011444091797L31.2648,107.00011444091797C32.131,107.00011444091797,32.833,106.29751444091796,32.833,105.43061444091796L32.833,95.16131444091796C32.847899999999996,94.29432444091796,32.131,93.59177444091797,31.2648,93.59177444091797ZM30.607599999999998,104.75791444091797L17.24033,104.75791444091797L17.24033,95.83401444091797L30.607599999999998,95.83401444091797L30.607599999999998,104.75791444091797Z" fill="#5F5F5F" fill-opacity="1" style="mix-blend-mode:passthrough"/></g></g></g></g></svg>

app/src/main/assets/web/static/media/icon_right.5e2aec5aa252c542beb49dced257b935.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="50" height="50" viewBox="0 0 50 50"><defs><filter id="master_svg0_58_9793" filterUnits="objectBoundingBox" color-interpolation-filters="sRGB" x="-0.09090909090909091" y="-0.06818181818181818" width="1.1818181818181819" height="1.1818181818181819"><feFlood flood-opacity="0" result="BackgroundImageFix"/><feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/><feOffset dy="1" dx="0"/><feGaussianBlur stdDeviation="1"/><feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.15000000596046448 0"/><feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow"/><feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow" result="shape"/></filter></defs><g transform="matrix(1,0,0,-1,0,92)"><g transform="matrix(1,0,0,-1,0,180)" filter="url(#master_svg0_58_9793)"><ellipse cx="25" cy="112" rx="22" ry="22" fill="#FFFFFF" fill-opacity="1"/></g><g transform="matrix(0,1,-1,0,99.05224609375,23.16943359375)"><path d="M41.60852625,73.07413984375L41.60852625,86.23033984375C41.60852625,86.68353984375,41.97727625,87.05223984375,42.43040625,87.05223984375L47.28040625,87.05223984375C47.73352625,87.05223984375,48.10230625,86.68353984375,48.10230625,86.23033984375L48.10230625,73.07413984375L51.41790625,73.07413984375C51.73660625,73.07413984375,51.93350625,72.72723984375,51.77410625,72.45533984375L45.24290625,61.31474584375C45.08352625,61.04287104375,44.69290625,61.04287104375,44.53352625,61.31474584375L37.99915215,72.45223984375C37.83665225,72.72723984375,38.03665255,73.07103984375,38.35540225,73.07103984375L41.60852625,73.07103984375L41.60852625,73.07413984375Z" fill="#5F5F5F" fill-opacity="1" style="mix-blend-mode:passthrough"/></g></g></svg>

app/src/main/assets/web/static/media/icon_rightR.c1fd246e41f0d82d1747361be8bdc7fe.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="50" height="50" viewBox="0 0 50 50"><defs><filter id="master_svg0_62_9683" filterUnits="objectBoundingBox" color-interpolation-filters="sRGB" x="-0.09090909090909091" y="-0.06818181818181818" width="1.1818181818181819" height="1.1818181818181819"><feFlood flood-opacity="0" result="BackgroundImageFix"/><feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/><feOffset dy="1" dx="0"/><feGaussianBlur stdDeviation="1"/><feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.15000000596046448 0"/><feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow"/><feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow" result="shape"/></filter></defs><g><g filter="url(#master_svg0_62_9683)"><ellipse cx="25" cy="24" rx="22" ry="22" fill="#FFFFFF" fill-opacity="1"/></g><g transform="matrix(-1,0,0,1,74,0)"><path d="M50.3972,15.98616L46.03598,15.98616L47.1113,14.90991C47.5445,14.47641,47.5445,13.758911,47.1113,13.32542C46.672650000000004,12.891527,45.96686,12.891527,45.52817,13.32542L43.03394,15.82173C42.82485,16.031010000000002,42.660560000000004,16.41965,42.660560000000004,16.718609999999998C42.660560000000004,17.01757,42.82485,17.40622,43.03394,17.61549L45.52817,20.11181C45.75221,20.33603,46.03598,20.44066,46.31976,20.44066C46.60353,20.44066,46.88731,20.33603,47.1113,20.11181C47.5445,19.67831,47.5445,18.960810000000002,47.1113,18.52732L46.81263,18.228360000000002L50.4121,18.228360000000002C53.9144,18.23658,56.7515,21.07606,56.759699999999995,24.5813C56.759699999999995,25.1941,57.2675,25.7024,57.8798,25.7024C58.4922,25.7024,59,25.1941,59,24.5813C58.9851,19.84274,55.1466,15.98616,50.3972,15.98616ZM53.2648,21.591659999999997L38.56823,21.591659999999997C37.701969,21.591659999999997,37,22.29421,37,23.1612L37,33.430499999999995C37,34.297399999999996,37.701969,35,38.56823,35L53.2648,35C54.131,35,54.833,34.297399999999996,54.833,33.430499999999995L54.833,23.1612C54.847899999999996,22.29421,54.131,21.591659999999997,53.2648,21.591659999999997ZM52.6076,32.7578L39.24033,32.7578L39.24033,23.8339L52.6076,23.8339L52.6076,32.7578Z" fill="#5F5F5F" fill-opacity="1" style="mix-blend-mode:passthrough"/></g></g></svg>

app/src/main/assets/web/static/media/icon_up.949fab143d0df7615a7bcb321a785702.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="50" height="50" viewBox="0 0 50 50"><defs><filter id="master_svg0_58_9785" filterUnits="objectBoundingBox" color-interpolation-filters="sRGB" x="-0.09090909090909091" y="-0.06818181818181818" width="1.1818181818181819" height="1.1818181818181819"><feFlood flood-opacity="0" result="BackgroundImageFix"/><feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/><feOffset dy="1" dx="0"/><feGaussianBlur stdDeviation="1"/><feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.15000000596046448 0"/><feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow"/><feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow" result="shape"/></filter><clipPath id="master_svg1_58_9786"><rect x="9" y="84" width="32" height="32" rx="0"/></clipPath></defs><g transform="matrix(1,0,0,-1,0,92)"><g transform="matrix(1,0,0,-1,0,180)" filter="url(#master_svg0_58_9785)"><ellipse cx="25" cy="112" rx="22" ry="22" fill="#FFFFFF" fill-opacity="1"/></g><g transform="matrix(1,0,0,-1,0,168)" clip-path="url(#master_svg1_58_9786)"><g><path d="M21.7247371875,99.9623234375L21.7247371875,113.1185234375C21.7247371875,113.5717234375,22.0934871875,113.9404234375,22.5466171875,113.9404234375L27.3966171875,113.9404234375C27.8497371875,113.9404234375,28.218517187499998,113.5717234375,28.218517187499998,113.1185234375L28.218517187499998,99.9623234375L31.5341171875,99.9623234375C31.8528171875,99.9623234375,32.0497171875,99.6154234375,31.890317187500003,99.3435234375L25.3591171875,88.2029294375C25.1997371875,87.9310546375,24.8091171875,87.9310546375,24.6497371875,88.2029294375L18.1153630875,99.3404234375C17.9528631875,99.6154234375,18.1528634875,99.9592234375,18.4716131875,99.9592234375L21.7247371875,99.9592234375L21.7247371875,99.9623234375Z" fill="#5F5F5F" fill-opacity="1" style="mix-blend-mode:passthrough"/></g></g></g></svg>

app/src/main/java/com/iflytop/profilometer/MainActivity.java

@@ -7,6 +7,7 @@ import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.WindowManager;
 import android.webkit.WebResourceRequest;
 import android.webkit.WebView;

app/src/main/java/com/iflytop/profilometer/ProfilometerApplication.java

@@ -4,6 +4,7 @@ import android.app.Activity;
 import android.app.Application;
 import android.content.Context;
 import android.os.Bundle;
+import android.util.Log;
 
 import androidx.annotation.NonNull;
 
@@ -34,6 +35,11 @@ public class ProfilometerApplication extends Application {
     public void onCreate() {
         super.onCreate();
 
+        Thread.setDefaultUncaughtExceptionHandler((thread, e) -> {
+            Log.e("UncaughtException", "Uncaught exception in thread " + thread.getName(), e);
+            // 可选择上报日志或预处理
+        });
+
         instance = this;
 
         DeviceStateWebsocketManager.getInstance().startWsPush();

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

@@ -119,8 +119,8 @@ public class MeasureApi {
                 Collections.reverse(leftPointsRevers);
                 alignPoints.addAll(leftPointsRevers);
                 alignPoints.addAll(rightPoint);
-                profileRecordPointSet.setAlignPoints(JSONUtil.toJsonStr(alignPoints));
             }
+            profileRecordPointSet.setAlignPoints(JSONUtil.toJsonStr(alignPoints));
         }
         profileRecordPointSetDao.insertProfileRecordPointSet(profileRecordPointSet);
         return Result.success();

app/src/main/java/com/iflytop/profilometer/core/migration/measure/drawer/type/XYPoint.java

@@ -44,12 +44,4 @@ public class XYPoint {
 		}
 		return false;
 	}
-
-	public void setX(double x) {
-		this.x = x;
-	}
-
-	public void setY(double y) {
-		this.y = y;
-	}
 }

app/src/main/java/com/iflytop/profilometer/core/sync/UploadManager.java

@@ -131,14 +131,6 @@ public class UploadManager {
         ProfileRecordPointSet profileRecordPointSet = profileRecordPointSetDao.getProfileRecordPointSetByUuid(profileRecordDescription.getUuid());
         String alignPointJsonStr = profileRecordPointSet.getAlignPoints();
         List<XYPoint> alignPointList = JSONUtil.toList(alignPointJsonStr, XYPoint.class);
-//        String leftPointJsonStr = profileRecordPointSet.getLeftPoints();
-//        String rightPointJsonStr = profileRecordPointSet.getLeftPoints();
-//        List<XYPoint> leftPointList = JSONUtil.toList(leftPointJsonStr, XYPoint.class);
-//        List<XYPoint> rightPointList = JSONUtil.toList(rightPointJsonStr, XYPoint.class);
-        // 合并左右点列表
-//        List<XYPoint> mergedPoints = new ArrayList<>();
-//        mergedPoints.addAll(leftPointList); // 添加左点
-//        mergedPoints.addAll(rightPointList); // 添加右点
         String fileName = "";
         String zipName = "";
         if (profileRecordDescription.getDataSource().equals("XLDC")) {

app/src/main/java/com/iflytop/profilometer/model/bo/RailProfileMeasureTaskState.java

@@ -71,10 +71,14 @@ public class RailProfileMeasureTaskState {
     }
 
     public void pushOutlinePoint(XYPoint point) {
-        if(isMeasuringLeftEnd){//左侧测量完毕
-            rightPointSetList.add(point);
-        }else{
+        if (isMeasuringLeftEnd) {
+            XYPoint firstXYPoint = leftPointSetList.get(0);
+            if (firstXYPoint != null && firstXYPoint.getX() < point.getX()) {
+                rightPointSetList.add(point);
+            }
+        } else {
             leftPointSetList.add(point);
+
         }
     }
 

app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>

app/src/main/res/values/ic_launcher_background.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#FFFFFF</color>
+</resources>