diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/.vs/ZTTMS_Manage_yibayiyi_20230320/FileContentIndex/15e7920f-8a4f-41d8-981a-9025b1df4868.vsidx b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/.vs/ZTTMS_Manage_yibayiyi_20230320/FileContentIndex/5ab432cd-207f-4a01-a145-8651acca0d3a.vsidx similarity index 50% rename from ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/.vs/ZTTMS_Manage_yibayiyi_20230320/FileContentIndex/15e7920f-8a4f-41d8-981a-9025b1df4868.vsidx rename to ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/.vs/ZTTMS_Manage_yibayiyi_20230320/FileContentIndex/5ab432cd-207f-4a01-a145-8651acca0d3a.vsidx index 36eb817..ae7a24c 100644 Binary files a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/.vs/ZTTMS_Manage_yibayiyi_20230320/FileContentIndex/15e7920f-8a4f-41d8-981a-9025b1df4868.vsidx and b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/.vs/ZTTMS_Manage_yibayiyi_20230320/FileContentIndex/5ab432cd-207f-4a01-a145-8651acca0d3a.vsidx differ diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/.vs/ZTTMS_Manage_yibayiyi_20230320/v17/.suo b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/.vs/ZTTMS_Manage_yibayiyi_20230320/v17/.suo index 1a5535f..265eb4c 100644 Binary files a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/.vs/ZTTMS_Manage_yibayiyi_20230320/v17/.suo and b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/.vs/ZTTMS_Manage_yibayiyi_20230320/v17/.suo differ diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/MainForm.cs b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/MainForm.cs index 17b8a5e..904b0a4 100644 --- a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/MainForm.cs +++ b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/MainForm.cs @@ -667,12 +667,6 @@ namespace ZTTMS_Manage_yibayiyi_20230320 Console.WriteLine("上位机软件开始加载状态！"); EveryDayLog.WriteDZ("上位机软件开始加载状态！"); - - //判断数据库最新字段是否有设置 - - - //若未有设置，则读取默认设置 - try { string sql = $"select * from tb_originalstate order by record_time desc limit 1;"; @@ -687,101 +681,109 @@ namespace ZTTMS_Manage_yibayiyi_20230320 while (dataReader.Read()) { - pictureTakeForm.txtCycle.Text = dataReader[3].ToString(); - - if (Others.g_yxReceive == true) + if (dataReader[3].ToString() == "" && dataReader[2].ToString() == "Unchecked" && + dataReader[9].ToString() == "" && dataReader[8].ToString() == "Unchecked" && + dataReader[12].ToString() == "" && dataReader[13].ToString() == "" && dataReader[10].ToString() == "Unchecked" && dataReader[15].ToString() == "" && + dataReader[16].ToString() == "" && dataReader[18].ToString() == "" && dataReader[17].ToString() == "Unchecked" && dataReader[20].ToString() == "" && + dataReader[19].ToString() == "Unchecked" && dataReader[22].ToString() == "" && dataReader[21].ToString() == "Unchecked" && dataReader[24].ToString() == "" && + dataReader[23].ToString() == "Unchecked" && dataReader[26].ToString() == "" && dataReader[25].ToString() == "Unchecked" && dataReader[28].ToString() == "" && + dataReader[27].ToString() == "Unchecked" && dataReader[30].ToString() == "" && dataReader[29].ToString() == "Unchecked" && dataReader[32].ToString() == "" && + dataReader[31].ToString() == "Unchecked" && dataReader[34].ToString() == "" && dataReader[33].ToString() == "Unchecked") { + pictureTakeForm.txtCycle.Text = "300"; + pictureTakeForm.chkCycleGet.Checked = true; + + if (dataReader[4].ToString() == "" || dataReader[5].ToString() == "" || dataReader[6].ToString() == "" || dataReader[7].ToString() == "") + { + pictureTakeForm.txtExposure.Text = "70000"; + pictureTakeForm.txtGain.Text = "8"; + pictureTakeForm.txtFrameRate.Text = "5"; + pictureTakeForm.cmbSaveFormat.SelectedItem = "jpg"; + } + else + { + pictureTakeForm.txtExposure.Text = dataReader[4].ToString(); + pictureTakeForm.txtGain.Text = dataReader[5].ToString(); + pictureTakeForm.txtFrameRate.Text = dataReader[6].ToString(); + pictureTakeForm.cmbSaveFormat.SelectedItem = dataReader[7].ToString(); + } + + pictureTakeForm.txtInterval.Text = "60"; + pictureTakeForm.chkAutoClear.Checked = true; + + videoRecordForm.txtOpenTime.Text = "240"; + videoRecordForm.txtCloseTime.Text = "120"; + videoRecordForm.chkCycleWork.Checked = true; + videoRecordForm.txtIntervalTimeUVC.Text = "30"; + videoRecordForm.txtWorkTimeUVC.Text = "5"; + + mulitiDataForm.txtCycle.Text = "60"; + mulitiDataForm.chkCycleGet.Checked = true; + + cTDDataForm.txtCycle.Text = "60"; + cTDDataForm.chkCycleGet.Checked = true; + + cavityEnvironDataForm.txtCycleEnviron.Text = "60"; + cavityEnvironDataForm.chkCycleGetEnviron.Checked = true; + camAndVidCurrentDataForm.txtCycle.Text = "60"; + camAndVidCurrentDataForm.chkCycleGet.Checked = true; + camAndVidCurrentDataForm.txtCycleVid.Text = "60"; + camAndVidCurrentDataForm.chkCycleGetVid.Checked = true; + + photoelectricSeparationDataForm.txtCycle.Text = "60"; + photoelectricSeparationDataForm.chkCycleGet.Checked = true; + + gDFLPortStateForm.txtCycle.Text = "60"; + gDFLPortStateForm.chkCycleGet.Checked = true; + + workStatusInfoDataForm.txtCycle.Text = "60"; + workStatusInfoDataForm.chkCycleGet.Checked = true; + + outputStatusInfoDataForm.txtCycle.Text = "60"; + outputStatusInfoDataForm.chkCycleGet.Checked = true; + } + else + { + pictureTakeForm.txtCycle.Text = dataReader[3].ToString(); pictureTakeForm.chkCycleGet.Checked = dataReader[2].ToString() != "Unchecked"; - } - - pictureTakeForm.txtExposure.Text = dataReader[4].ToString(); - pictureTakeForm.txtGain.Text = dataReader[5].ToString(); - pictureTakeForm.txtFrameRate.Text = dataReader[6].ToString(); - pictureTakeForm.cmbSaveFormat.SelectedItem = dataReader[7].ToString(); - pictureTakeForm.txtInterval.Text = dataReader[9].ToString(); - - if (Others.g_yxReceive == true) - { + pictureTakeForm.txtExposure.Text = dataReader[4].ToString(); + pictureTakeForm.txtGain.Text = dataReader[5].ToString(); + pictureTakeForm.txtFrameRate.Text = dataReader[6].ToString(); + pictureTakeForm.cmbSaveFormat.SelectedItem = dataReader[7].ToString(); + pictureTakeForm.txtInterval.Text = dataReader[9].ToString(); pictureTakeForm.chkAutoClear.Checked = dataReader[8].ToString() != "Unchecked"; - } - videoRecordForm.txtOpenTime.Text = dataReader[12].ToString(); - //videoRecordForm.txtStartTimeM.Text = dataReader[35].ToString(); - videoRecordForm.txtCloseTime.Text = dataReader[13].ToString(); - //videoRecordForm.txtStopTimeM.Text = dataReader[36].ToString(); - - if (Others.g_yxReceive == true) - { + videoRecordForm.txtOpenTime.Text = dataReader[12].ToString(); + videoRecordForm.txtCloseTime.Text = dataReader[13].ToString(); videoRecordForm.chkCycleWork.Checked = dataReader[10].ToString() != "Unchecked"; - } + videoRecordForm.txtIntervalTimeUVC.Text = dataReader[15].ToString(); + videoRecordForm.txtWorkTimeUVC.Text = dataReader[16].ToString(); - //videoRecordForm.chkControlLight.Checked = dataReader[11].ToString() != "Unchecked"; - videoRecordForm.txtIntervalTimeUVC.Text = dataReader[15].ToString(); - videoRecordForm.txtWorkTimeUVC.Text = dataReader[16].ToString(); - //videoRecordForm.chkCycleWorkUVC.Checked = dataReader[14].ToString() != "Unchecked"; - mulitiDataForm.txtCycle.Text = dataReader[18].ToString(); - - if (Others.g_multiReceive == true) - { + mulitiDataForm.txtCycle.Text = dataReader[18].ToString(); mulitiDataForm.chkCycleGet.Checked = dataReader[17].ToString() != "Unchecked"; - } - cTDDataForm.txtCycle.Text = dataReader[20].ToString(); - - if (Others.g_ctdReceive == true) - { + cTDDataForm.txtCycle.Text = dataReader[20].ToString(); cTDDataForm.chkCycleGet.Checked = dataReader[19].ToString() != "Unchecked"; - } - cavityEnvironDataForm.txtCycleEnviron.Text = dataReader[22].ToString(); - - if (Others.g_yxReceive == true) - { + cavityEnvironDataForm.txtCycleEnviron.Text = dataReader[22].ToString(); cavityEnvironDataForm.chkCycleGetEnviron.Checked = dataReader[21].ToString() != "Unchecked"; - } - - camAndVidCurrentDataForm.txtCycle.Text = dataReader[24].ToString(); - - if (Others.g_yxReceive == true) - { + camAndVidCurrentDataForm.txtCycle.Text = dataReader[24].ToString(); camAndVidCurrentDataForm.chkCycleGet.Checked = dataReader[23].ToString() != "Unchecked"; - } - - camAndVidCurrentDataForm.txtCycleVid.Text = dataReader[26].ToString(); - - if (Others.g_yxReceive == true) - { + camAndVidCurrentDataForm.txtCycleVid.Text = dataReader[26].ToString(); camAndVidCurrentDataForm.chkCycleGetVid.Checked = dataReader[25].ToString() != "Unchecked"; - } - photoelectricSeparationDataForm.txtCycle.Text = dataReader[28].ToString(); - - if (Others.g_gdflReceive) - { + photoelectricSeparationDataForm.txtCycle.Text = dataReader[28].ToString(); photoelectricSeparationDataForm.chkCycleGet.Checked = dataReader[27].ToString() != "Unchecked"; - } - gDFLPortStateForm.txtCycle.Text = dataReader[30].ToString(); - - if (Others.g_gdflReceive) - { + gDFLPortStateForm.txtCycle.Text = dataReader[30].ToString(); gDFLPortStateForm.chkCycleGet.Checked = dataReader[29].ToString() != "Unchecked"; - } - workStatusInfoDataForm.txtCycle.Text = dataReader[32].ToString(); - - if (Others.g_flagReceive) - { + workStatusInfoDataForm.txtCycle.Text = dataReader[32].ToString(); workStatusInfoDataForm.chkCycleGet.Checked = dataReader[31].ToString() != "Unchecked"; - } - outputStatusInfoDataForm.txtCycle.Text = dataReader[34].ToString(); - - if (Others.g_flagReceive) - { + outputStatusInfoDataForm.txtCycle.Text = dataReader[34].ToString(); outputStatusInfoDataForm.chkCycleGet.Checked = dataReader[33].ToString() != "Unchecked"; } - } dataReader.Close(); @@ -4121,7 +4123,7 @@ namespace ZTTMS_Manage_yibayiyi_20230320 timerRecordHXDataSS.Enabled = false; timerRecordHXDataSS.Stop(); } - catch(Exception ex) + catch (Exception ex) { Console.WriteLine("CloseTimerError:" + ex.ToString()); EveryDayLog.WriteErrorOther("CloseTimerError:" + ex.ToString()); @@ -4201,7 +4203,7 @@ namespace ZTTMS_Manage_yibayiyi_20230320 cTDDataForm.CTDDataForm_FormClosing(null, null); mulitiDataForm.MulitiDataForm_FormClosing(null, null); } - catch(Exception ex) + catch (Exception ex) { Console.WriteLine("CloseOtherFormError:" + ex.ToString()); EveryDayLog.WriteErrorOther("CloseOtherFormError:" + ex.ToString()); @@ -5606,6 +5608,5 @@ namespace ZTTMS_Manage_yibayiyi_20230320 } #endregion - } }