diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.csproj b/RbFreqStandMeasure/RbFreqStandMeasure.csproj
index f3ca62b..ca7e5c4 100644
--- a/RbFreqStandMeasure/RbFreqStandMeasure.csproj
+++ b/RbFreqStandMeasure/RbFreqStandMeasure.csproj
@@ -627,15 +627,6 @@
False
True
-
- {DB8CBF00-D6D3-11D4-AA51-00A024EE30BD}
- 7
- 1
- 0
- primary
- False
- True
-
\ No newline at end of file
diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.csproj b/RbFreqStandMeasure/RbFreqStandMeasure.csproj
index f3ca62b..ca7e5c4 100644
--- a/RbFreqStandMeasure/RbFreqStandMeasure.csproj
+++ b/RbFreqStandMeasure/RbFreqStandMeasure.csproj
@@ -627,15 +627,6 @@
False
True
-
- {DB8CBF00-D6D3-11D4-AA51-00A024EE30BD}
- 7
- 1
- 0
- primary
- False
- True
-
\ No newline at end of file
diff --git a/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe
index 555286d..5937943 100644
--- a/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe
+++ b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe
Binary files differ
diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.csproj b/RbFreqStandMeasure/RbFreqStandMeasure.csproj
index f3ca62b..ca7e5c4 100644
--- a/RbFreqStandMeasure/RbFreqStandMeasure.csproj
+++ b/RbFreqStandMeasure/RbFreqStandMeasure.csproj
@@ -627,15 +627,6 @@
False
True
-
- {DB8CBF00-D6D3-11D4-AA51-00A024EE30BD}
- 7
- 1
- 0
- primary
- False
- True
-
\ No newline at end of file
diff --git a/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe
index 555286d..5937943 100644
--- a/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe
+++ b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe
Binary files differ
diff --git a/RbFreqStandMeasure/info/DetailDlg.cs b/RbFreqStandMeasure/info/DetailDlg.cs
index cc05eac..4035fe6 100644
--- a/RbFreqStandMeasure/info/DetailDlg.cs
+++ b/RbFreqStandMeasure/info/DetailDlg.cs
@@ -85,19 +85,72 @@
resultStaStr1 = dataGridView_times.Rows[0].Cells[8].Value.ToString();
resultBootStr = dataGridView_times.Rows[0].Cells[5].Value.ToString();
resultAgeStr = dataGridView_times.Rows[0].Cells[6].Value.ToString();
-
- if (!resultAccStr.Equals("-1") && !resultAccStr.Equals("-2") && !resultAccStr.Equals("-3") && !resultAccStr.Equals("0")) tabPageEvent("tab_accuracy");
- if ((!resultStaStr1.Equals("-1")&& !resultStaStr1.Equals("-2") && !resultStaStr1.Equals("-3") && !resultStaStr1.Equals("0")) || (!resultStaStr10.Equals("-1")&& !resultStaStr10.Equals("-2") && !resultStaStr10.Equals("-3") && !resultStaStr10.Equals("0")) ||( !resultStaStr100.Equals("-1") && !resultStaStr100.Equals("-2") && !resultStaStr100.Equals("-3") && !resultStaStr100.Equals("0")))
+
+ List queryList = detectionService.search(deviceId, "2", startTime, endTime, detectionItemId);
+ if (null != queryList && queryList.Count > 0) tabPageEvent("tab_accuracy");
+ else
{
- tabPageEvent("tab_stability");
- if (!resultStaStr1.Equals("-1") && !resultStaStr1.Equals("-2") && !resultStaStr1.Equals("-3") && !resultStaStr1.Equals("0")) loadStability1();
- else if (!resultStaStr10.Equals("-1") && !resultStaStr10.Equals("-2") && !resultStaStr10.Equals("-3") && !resultStaStr10.Equals("0")) loadStability10();
- else if(!resultStaStr20.Equals("-1") && !resultStaStr20.Equals("-2") && !resultStaStr20.Equals("-3") && !resultStaStr20.Equals("0")) loadStability20();
- else if (!resultStaStr100.Equals("-1") && !resultStaStr100.Equals("-2") && !resultStaStr100.Equals("-3") && !resultStaStr100.Equals("0")) loadStability100();
+ queryList = detectionService.search(deviceId, "1-1", startTime, endTime, detectionItemId);
+ if (null != queryList && queryList.Count > 0)
+ {
+ tabPageEvent("tab_stability");
+ loadStability1();
+ }
+ else
+ {
+ queryList = detectionService.search(deviceId, "1-10", startTime, endTime, detectionItemId);
+ if (null != queryList && queryList.Count > 0)
+ {
+ tabPageEvent("tab_stability");
+ loadStability10();
+ }
+ else
+ {
+ queryList = detectionService.search(deviceId, "1-20", startTime, endTime, detectionItemId);
+ if (null != queryList && queryList.Count > 0)
+ {
+ tabPageEvent("tab_stability");
+ loadStability20();
+ }
+ else
+ {
+ queryList = detectionService.search(deviceId, "1-100", startTime, endTime, detectionItemId);
+ if (null != queryList && queryList.Count > 0)
+ {
+ tabPageEvent("tab_stability");
+ loadStability100();
+ }
+ else
+ {
+ queryList = detectionService.search(deviceId, "3", startTime, endTime, detectionItemId);
+ if (null != queryList && queryList.Count > 0)
+ {
+ tabPageEvent("tab_bootFeature");
+ }
+ else
+ {
+ queryList = detectionService.search(deviceId, "4", startTime, endTime, detectionItemId);
+ if (null != queryList && queryList.Count > 0)
+ {
+ tabPageEvent("tab_ageRate");
+ }
+ else
+ {
+ tableOriginData.Rows.Clear();
+ tabControl1.SelectedIndex = -1;
+ btn_reDetec.Visible = false;
+ dataGridView_times.Visible = true;
+ panel_radios.Visible = false;
+ }
+ }
+ }
+ }
+ }
+ }
+
+
}
- if (!resultBootStr.Equals("-1")&& !resultBootStr.Equals("-2")&& !resultBootStr.Equals("-3") && !resultBootStr.Equals("0")) tabPageEvent("tab_bootFeature");
- if (!resultAgeStr.Equals("-1")&&!resultAgeStr.Equals("-2")&& !resultAgeStr.Equals("-3") && !resultAgeStr.Equals("0")) tabPageEvent("tab_ageRate");
-
+
}
if (dataGridView_Data.Rows.Count == 0) btn_reDetec.Enabled = false;
}
@@ -278,8 +331,7 @@
{
dataGridView_times.DataSource = null;
label_noTimes.Visible = true;
- }
-
+ }
}
@@ -305,17 +357,85 @@
resultBootStr = dataGridView_times.Rows[rowIndex].Cells[5].Value.ToString();
resultAgeStr = dataGridView_times.Rows[rowIndex].Cells[6].Value.ToString();
- if (!resultAccStr.Equals("-1") && !resultAccStr.Equals("-2") && !resultAccStr.Equals("-3") && !resultAccStr.Equals("0")) tabPageEvent("tab_accuracy");
- else if ((!resultStaStr1.Equals("-1") && !resultStaStr1.Equals("-2") && !resultStaStr1.Equals("-3") && !resultStaStr1.Equals("0")) || (!resultStaStr10.Equals("-1") && !resultStaStr10.Equals("-2") && !resultStaStr10.Equals("-3") && !resultStaStr10.Equals("0")) || (!resultStaStr100.Equals("-1") && !resultStaStr100.Equals("-2") && !resultStaStr100.Equals("-3") && !resultStaStr100.Equals("0")))
+ List queryList = detectionService.search(deviceId, "2", startTime, endTime, detectionItemId);
+ if (null != queryList && queryList.Count > 0) tabPageEvent("tab_accuracy");
+ else
{
- tabPageEvent("tab_stability");
- if (!resultStaStr1.Equals("-1") && !resultStaStr1.Equals("-2") && !resultStaStr1.Equals("-3") && !resultStaStr1.Equals("0")) loadStability1();
- else if (!resultStaStr10.Equals("-1") && !resultStaStr10.Equals("-2") && !resultStaStr10.Equals("-3") && !resultStaStr10.Equals("0")) loadStability10();
- else if (!resultStaStr20.Equals("-1") && !resultStaStr20.Equals("-2") && !resultStaStr20.Equals("-3") && !resultStaStr20.Equals("0")) loadStability20();
- else if (!resultStaStr100.Equals("-1") && !resultStaStr100.Equals("-2") && !resultStaStr100.Equals("-3") && !resultStaStr100.Equals("0")) loadStability100();
+ queryList = detectionService.search(deviceId, "1-1", startTime, endTime, detectionItemId);
+ if (null != queryList && queryList.Count > 0)
+ {
+ tabPageEvent("tab_stability");
+ loadStability1();
+ }
+ else
+ {
+ queryList = detectionService.search(deviceId, "1-10", startTime, endTime, detectionItemId);
+ if (null != queryList && queryList.Count > 0)
+ {
+ tabPageEvent("tab_stability");
+ loadStability10();
+ }
+ else
+ {
+ queryList = detectionService.search(deviceId, "1-20", startTime, endTime, detectionItemId);
+ if (null != queryList && queryList.Count > 0)
+ {
+ tabPageEvent("tab_stability");
+ loadStability20();
+ }
+ else
+ {
+ queryList = detectionService.search(deviceId, "1-100", startTime, endTime, detectionItemId);
+ if (null != queryList && queryList.Count > 0)
+ {
+ tabPageEvent("tab_stability");
+ loadStability100();
+ }
+ else
+ {
+ queryList = detectionService.search(deviceId, "3", startTime, endTime, detectionItemId);
+ if (null != queryList && queryList.Count > 0)
+ {
+ tabPageEvent("tab_bootFeature");
+ }
+ else
+ {
+ queryList = detectionService.search(deviceId, "4", startTime, endTime, detectionItemId);
+ if (null != queryList && queryList.Count > 0)
+ {
+ tabPageEvent("tab_ageRate");
+ }
+ else
+ {
+ tableOriginData.Rows.Clear();
+ panel_result.Controls.Clear();
+ tabControl1.SelectedIndex = -1;
+ btn_reDetec.Visible = false;
+ dataGridView_times.Visible = true;
+ panel_radios.Visible = false;
+ }
+ }
+ }
+ }
+ }
+ }
+
+
}
- else if (!resultBootStr.Equals("-1") && !resultBootStr.Equals("-2") && !resultBootStr.Equals("-3") && !resultBootStr.Equals("0")) tabPageEvent("tab_bootFeature");
- else if (!resultAgeStr.Equals("-1") && !resultAgeStr.Equals("-2") && !resultAgeStr.Equals("-3") && !resultAgeStr.Equals("0")) tabPageEvent("tab_ageRate");
+
+
+
+ //if (!resultAccStr.Equals("-1") && !resultAccStr.Equals("-2") && !resultAccStr.Equals("-3") && !resultAccStr.Equals("0")) tabPageEvent("tab_accuracy");
+ //else if ((!resultStaStr1.Equals("-1") && !resultStaStr1.Equals("-2") && !resultStaStr1.Equals("-3") && !resultStaStr1.Equals("0")) || (!resultStaStr10.Equals("-1") && !resultStaStr10.Equals("-2") && !resultStaStr10.Equals("-3") && !resultStaStr10.Equals("0")) || (!resultStaStr100.Equals("-1") && !resultStaStr100.Equals("-2") && !resultStaStr100.Equals("-3") && !resultStaStr100.Equals("0")))
+ //{
+ // tabPageEvent("tab_stability");
+ // if (!resultStaStr1.Equals("-1") && !resultStaStr1.Equals("-2") && !resultStaStr1.Equals("-3") && !resultStaStr1.Equals("0")) loadStability1();
+ // else if (!resultStaStr10.Equals("-1") && !resultStaStr10.Equals("-2") && !resultStaStr10.Equals("-3") && !resultStaStr10.Equals("0")) loadStability10();
+ // else if (!resultStaStr20.Equals("-1") && !resultStaStr20.Equals("-2") && !resultStaStr20.Equals("-3") && !resultStaStr20.Equals("0")) loadStability20();
+ // else if (!resultStaStr100.Equals("-1") && !resultStaStr100.Equals("-2") && !resultStaStr100.Equals("-3") && !resultStaStr100.Equals("0")) loadStability100();
+ //}
+ //else if (!resultBootStr.Equals("-1") && !resultBootStr.Equals("-2") && !resultBootStr.Equals("-3") && !resultBootStr.Equals("0")) tabPageEvent("tab_bootFeature");
+ //else if (!resultAgeStr.Equals("-1") && !resultAgeStr.Equals("-2") && !resultAgeStr.Equals("-3") && !resultAgeStr.Equals("0")) tabPageEvent("tab_ageRate");
}
}
diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.csproj b/RbFreqStandMeasure/RbFreqStandMeasure.csproj
index f3ca62b..ca7e5c4 100644
--- a/RbFreqStandMeasure/RbFreqStandMeasure.csproj
+++ b/RbFreqStandMeasure/RbFreqStandMeasure.csproj
@@ -627,15 +627,6 @@
False
True
-
- {DB8CBF00-D6D3-11D4-AA51-00A024EE30BD}
- 7
- 1
- 0
- primary
- False
- True
-
\ No newline at end of file
diff --git a/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe
index 555286d..5937943 100644
--- a/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe
+++ b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe
Binary files differ
diff --git a/RbFreqStandMeasure/info/DetailDlg.cs b/RbFreqStandMeasure/info/DetailDlg.cs
index cc05eac..4035fe6 100644
--- a/RbFreqStandMeasure/info/DetailDlg.cs
+++ b/RbFreqStandMeasure/info/DetailDlg.cs
@@ -85,19 +85,72 @@
resultStaStr1 = dataGridView_times.Rows[0].Cells[8].Value.ToString();
resultBootStr = dataGridView_times.Rows[0].Cells[5].Value.ToString();
resultAgeStr = dataGridView_times.Rows[0].Cells[6].Value.ToString();
-
- if (!resultAccStr.Equals("-1") && !resultAccStr.Equals("-2") && !resultAccStr.Equals("-3") && !resultAccStr.Equals("0")) tabPageEvent("tab_accuracy");
- if ((!resultStaStr1.Equals("-1")&& !resultStaStr1.Equals("-2") && !resultStaStr1.Equals("-3") && !resultStaStr1.Equals("0")) || (!resultStaStr10.Equals("-1")&& !resultStaStr10.Equals("-2") && !resultStaStr10.Equals("-3") && !resultStaStr10.Equals("0")) ||( !resultStaStr100.Equals("-1") && !resultStaStr100.Equals("-2") && !resultStaStr100.Equals("-3") && !resultStaStr100.Equals("0")))
+
+ List queryList = detectionService.search(deviceId, "2", startTime, endTime, detectionItemId);
+ if (null != queryList && queryList.Count > 0) tabPageEvent("tab_accuracy");
+ else
{
- tabPageEvent("tab_stability");
- if (!resultStaStr1.Equals("-1") && !resultStaStr1.Equals("-2") && !resultStaStr1.Equals("-3") && !resultStaStr1.Equals("0")) loadStability1();
- else if (!resultStaStr10.Equals("-1") && !resultStaStr10.Equals("-2") && !resultStaStr10.Equals("-3") && !resultStaStr10.Equals("0")) loadStability10();
- else if(!resultStaStr20.Equals("-1") && !resultStaStr20.Equals("-2") && !resultStaStr20.Equals("-3") && !resultStaStr20.Equals("0")) loadStability20();
- else if (!resultStaStr100.Equals("-1") && !resultStaStr100.Equals("-2") && !resultStaStr100.Equals("-3") && !resultStaStr100.Equals("0")) loadStability100();
+ queryList = detectionService.search(deviceId, "1-1", startTime, endTime, detectionItemId);
+ if (null != queryList && queryList.Count > 0)
+ {
+ tabPageEvent("tab_stability");
+ loadStability1();
+ }
+ else
+ {
+ queryList = detectionService.search(deviceId, "1-10", startTime, endTime, detectionItemId);
+ if (null != queryList && queryList.Count > 0)
+ {
+ tabPageEvent("tab_stability");
+ loadStability10();
+ }
+ else
+ {
+ queryList = detectionService.search(deviceId, "1-20", startTime, endTime, detectionItemId);
+ if (null != queryList && queryList.Count > 0)
+ {
+ tabPageEvent("tab_stability");
+ loadStability20();
+ }
+ else
+ {
+ queryList = detectionService.search(deviceId, "1-100", startTime, endTime, detectionItemId);
+ if (null != queryList && queryList.Count > 0)
+ {
+ tabPageEvent("tab_stability");
+ loadStability100();
+ }
+ else
+ {
+ queryList = detectionService.search(deviceId, "3", startTime, endTime, detectionItemId);
+ if (null != queryList && queryList.Count > 0)
+ {
+ tabPageEvent("tab_bootFeature");
+ }
+ else
+ {
+ queryList = detectionService.search(deviceId, "4", startTime, endTime, detectionItemId);
+ if (null != queryList && queryList.Count > 0)
+ {
+ tabPageEvent("tab_ageRate");
+ }
+ else
+ {
+ tableOriginData.Rows.Clear();
+ tabControl1.SelectedIndex = -1;
+ btn_reDetec.Visible = false;
+ dataGridView_times.Visible = true;
+ panel_radios.Visible = false;
+ }
+ }
+ }
+ }
+ }
+ }
+
+
}
- if (!resultBootStr.Equals("-1")&& !resultBootStr.Equals("-2")&& !resultBootStr.Equals("-3") && !resultBootStr.Equals("0")) tabPageEvent("tab_bootFeature");
- if (!resultAgeStr.Equals("-1")&&!resultAgeStr.Equals("-2")&& !resultAgeStr.Equals("-3") && !resultAgeStr.Equals("0")) tabPageEvent("tab_ageRate");
-
+
}
if (dataGridView_Data.Rows.Count == 0) btn_reDetec.Enabled = false;
}
@@ -278,8 +331,7 @@
{
dataGridView_times.DataSource = null;
label_noTimes.Visible = true;
- }
-
+ }
}
@@ -305,17 +357,85 @@
resultBootStr = dataGridView_times.Rows[rowIndex].Cells[5].Value.ToString();
resultAgeStr = dataGridView_times.Rows[rowIndex].Cells[6].Value.ToString();
- if (!resultAccStr.Equals("-1") && !resultAccStr.Equals("-2") && !resultAccStr.Equals("-3") && !resultAccStr.Equals("0")) tabPageEvent("tab_accuracy");
- else if ((!resultStaStr1.Equals("-1") && !resultStaStr1.Equals("-2") && !resultStaStr1.Equals("-3") && !resultStaStr1.Equals("0")) || (!resultStaStr10.Equals("-1") && !resultStaStr10.Equals("-2") && !resultStaStr10.Equals("-3") && !resultStaStr10.Equals("0")) || (!resultStaStr100.Equals("-1") && !resultStaStr100.Equals("-2") && !resultStaStr100.Equals("-3") && !resultStaStr100.Equals("0")))
+ List queryList = detectionService.search(deviceId, "2", startTime, endTime, detectionItemId);
+ if (null != queryList && queryList.Count > 0) tabPageEvent("tab_accuracy");
+ else
{
- tabPageEvent("tab_stability");
- if (!resultStaStr1.Equals("-1") && !resultStaStr1.Equals("-2") && !resultStaStr1.Equals("-3") && !resultStaStr1.Equals("0")) loadStability1();
- else if (!resultStaStr10.Equals("-1") && !resultStaStr10.Equals("-2") && !resultStaStr10.Equals("-3") && !resultStaStr10.Equals("0")) loadStability10();
- else if (!resultStaStr20.Equals("-1") && !resultStaStr20.Equals("-2") && !resultStaStr20.Equals("-3") && !resultStaStr20.Equals("0")) loadStability20();
- else if (!resultStaStr100.Equals("-1") && !resultStaStr100.Equals("-2") && !resultStaStr100.Equals("-3") && !resultStaStr100.Equals("0")) loadStability100();
+ queryList = detectionService.search(deviceId, "1-1", startTime, endTime, detectionItemId);
+ if (null != queryList && queryList.Count > 0)
+ {
+ tabPageEvent("tab_stability");
+ loadStability1();
+ }
+ else
+ {
+ queryList = detectionService.search(deviceId, "1-10", startTime, endTime, detectionItemId);
+ if (null != queryList && queryList.Count > 0)
+ {
+ tabPageEvent("tab_stability");
+ loadStability10();
+ }
+ else
+ {
+ queryList = detectionService.search(deviceId, "1-20", startTime, endTime, detectionItemId);
+ if (null != queryList && queryList.Count > 0)
+ {
+ tabPageEvent("tab_stability");
+ loadStability20();
+ }
+ else
+ {
+ queryList = detectionService.search(deviceId, "1-100", startTime, endTime, detectionItemId);
+ if (null != queryList && queryList.Count > 0)
+ {
+ tabPageEvent("tab_stability");
+ loadStability100();
+ }
+ else
+ {
+ queryList = detectionService.search(deviceId, "3", startTime, endTime, detectionItemId);
+ if (null != queryList && queryList.Count > 0)
+ {
+ tabPageEvent("tab_bootFeature");
+ }
+ else
+ {
+ queryList = detectionService.search(deviceId, "4", startTime, endTime, detectionItemId);
+ if (null != queryList && queryList.Count > 0)
+ {
+ tabPageEvent("tab_ageRate");
+ }
+ else
+ {
+ tableOriginData.Rows.Clear();
+ panel_result.Controls.Clear();
+ tabControl1.SelectedIndex = -1;
+ btn_reDetec.Visible = false;
+ dataGridView_times.Visible = true;
+ panel_radios.Visible = false;
+ }
+ }
+ }
+ }
+ }
+ }
+
+
}
- else if (!resultBootStr.Equals("-1") && !resultBootStr.Equals("-2") && !resultBootStr.Equals("-3") && !resultBootStr.Equals("0")) tabPageEvent("tab_bootFeature");
- else if (!resultAgeStr.Equals("-1") && !resultAgeStr.Equals("-2") && !resultAgeStr.Equals("-3") && !resultAgeStr.Equals("0")) tabPageEvent("tab_ageRate");
+
+
+
+ //if (!resultAccStr.Equals("-1") && !resultAccStr.Equals("-2") && !resultAccStr.Equals("-3") && !resultAccStr.Equals("0")) tabPageEvent("tab_accuracy");
+ //else if ((!resultStaStr1.Equals("-1") && !resultStaStr1.Equals("-2") && !resultStaStr1.Equals("-3") && !resultStaStr1.Equals("0")) || (!resultStaStr10.Equals("-1") && !resultStaStr10.Equals("-2") && !resultStaStr10.Equals("-3") && !resultStaStr10.Equals("0")) || (!resultStaStr100.Equals("-1") && !resultStaStr100.Equals("-2") && !resultStaStr100.Equals("-3") && !resultStaStr100.Equals("0")))
+ //{
+ // tabPageEvent("tab_stability");
+ // if (!resultStaStr1.Equals("-1") && !resultStaStr1.Equals("-2") && !resultStaStr1.Equals("-3") && !resultStaStr1.Equals("0")) loadStability1();
+ // else if (!resultStaStr10.Equals("-1") && !resultStaStr10.Equals("-2") && !resultStaStr10.Equals("-3") && !resultStaStr10.Equals("0")) loadStability10();
+ // else if (!resultStaStr20.Equals("-1") && !resultStaStr20.Equals("-2") && !resultStaStr20.Equals("-3") && !resultStaStr20.Equals("0")) loadStability20();
+ // else if (!resultStaStr100.Equals("-1") && !resultStaStr100.Equals("-2") && !resultStaStr100.Equals("-3") && !resultStaStr100.Equals("0")) loadStability100();
+ //}
+ //else if (!resultBootStr.Equals("-1") && !resultBootStr.Equals("-2") && !resultBootStr.Equals("-3") && !resultBootStr.Equals("0")) tabPageEvent("tab_bootFeature");
+ //else if (!resultAgeStr.Equals("-1") && !resultAgeStr.Equals("-2") && !resultAgeStr.Equals("-3") && !resultAgeStr.Equals("0")) tabPageEvent("tab_ageRate");
}
}
diff --git a/RbFreqStandMeasure/tools/DetectionHelper.cs b/RbFreqStandMeasure/tools/DetectionHelper.cs
index bdece1a..bbffca6 100644
--- a/RbFreqStandMeasure/tools/DetectionHelper.cs
+++ b/RbFreqStandMeasure/tools/DetectionHelper.cs
@@ -1136,7 +1136,7 @@
if (ConfigHelper.GetAppConfig("deviceType").ToString().Equals("1"))
{
int count = 0;
- while (count < 500)
+ while (count < 1000)
{
int readLen = port.BytesToRead;
@@ -1166,14 +1166,14 @@
}
}
count++;
- Thread.Sleep(20);
+ Thread.Sleep(10);
}
}
else
{
int count = 0;
- while (count < 500)
+ while (count < 1000)
{
int readLen = port.BytesToRead;
@@ -1202,7 +1202,7 @@
}
count++;
- Thread.Sleep(20);
+ Thread.Sleep(10);
}
}