diff --git a/app/src/main/assets/web/asset-manifest.json b/app/src/main/assets/web/asset-manifest.json
index 957ace2..3857d5b 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.7779cd83.css",
- "main.js": "/static/js/main.4e78fc5b.js",
+ "main.js": "/static/js/main.e7d7db22.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.7779cd83.css.map": "/static/css/main.7779cd83.css.map",
- "main.4e78fc5b.js.map": "/static/js/main.4e78fc5b.js.map",
+ "main.e7d7db22.js.map": "/static/js/main.e7d7db22.js.map",
"453.e7f11a48.chunk.js.map": "/static/js/453.e7f11a48.chunk.js.map"
},
"entrypoints": [
"static/css/main.7779cd83.css",
- "static/js/main.4e78fc5b.js"
+ "static/js/main.e7d7db22.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 6e9c5db..802dbf4 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/core/migration/algo/type/ProfilometerAlgoConfig.java b/app/src/main/java/com/iflytop/profilometer/core/migration/algo/type/ProfilometerAlgoConfig.java
index cd0e53f..12b8bd4 100644
--- a/app/src/main/java/com/iflytop/profilometer/core/migration/algo/type/ProfilometerAlgoConfig.java
+++ b/app/src/main/java/com/iflytop/profilometer/core/migration/algo/type/ProfilometerAlgoConfig.java
@@ -1,14 +1,14 @@
package com.iflytop.profilometer.core.migration.algo.type;
public class ProfilometerAlgoConfig {
- public int outlineStartRecordSigJudgeTimeThresholdMS = 400; // 开始采样静止时间判定阈值，单位MS
+ public int outlineStartRecordSigJudgeTimeThresholdMS = 800; // 开始采样静止时间判定阈值，单位MS
public int startOutlineRecordingTimingJudgmentAreaHight = 30; // 开始采样静止时间判定区域高度，单位mm
public int startOutlineRecordingTimingJudgmentAreaWeight = 90; // 开始采样静止时间判定区域权重，单位mm
public double precision = 0.10; // 采样精度(mm) 当其等于0.12mm,满足测量长度13cm的情况下，1500个点.
public double overSamplePrecision = 0.03; // 过采样精度(mm) 0.03mm
public double displayPrecision = 1.5; // 显示精度(影响，采样时候的回调的次数)
- public double stillJudgeThreshold = 0.5; // 静止判断阈值(mm),当前点与上一个点的距离小于该值，认为静止
- public double outlineComputeRefPointDistance = 0.2; // (mm) 计算轮廓线时，两个参考点距离
+ public double stillJudgeThreshold = 0.3; // 静止判断阈值(mm),当前点与上一个点的距离小于该值，认为静止
+ public double outlineComputeRefPointDistance = 0.4; // (mm) 计算轮廓线时，两个参考点距离
public double directionJudgePointDistance = 1;// (mm) 方向判断点距离,该值越大方向判定越准确，结束条件判定也就更准确，但是错误的采样点数也会增加
}
diff --git a/app/src/main/java/com/iflytop/profilometer/service/RailProfileDrawerService.java b/app/src/main/java/com/iflytop/profilometer/service/RailProfileDrawerService.java
index b39bc08..527d30e 100644
--- a/app/src/main/java/com/iflytop/profilometer/service/RailProfileDrawerService.java
+++ b/app/src/main/java/com/iflytop/profilometer/service/RailProfileDrawerService.java
@@ -214,10 +214,9 @@ public class RailProfileDrawerService implements ProfilometerDrawerListener {
allList.addAll(outline1List);
allList.addAll(outline2List);
} else {
- allList.addAll(report.outline2);
Collections.reverse(outline2List);
- allList.addAll(outline1List);
allList.addAll(outline2List);
+ allList.addAll(outline1List);
}
Log.i(LogTag.PROFILOMENTER, "本次测量一共" + allList.size() + "个点");
Map finishMap = new HashMap<>();