From f8ad0695ff2431cb90640be52b523d6434bdbf83 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期五, 22 八月 2025 15:48:03 +0800
Subject: [PATCH] Merge branch 'LWQ' into liuyang
---
EdgeInspector_App/Recipe/HardwareSettings.cpp | 34 ++++++++++++++++++++++++++++++++--
1 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/EdgeInspector_App/Recipe/HardwareSettings.cpp b/EdgeInspector_App/Recipe/HardwareSettings.cpp
index e7f9f00..1d0d633 100644
--- a/EdgeInspector_App/Recipe/HardwareSettings.cpp
+++ b/EdgeInspector_App/Recipe/HardwareSettings.cpp
@@ -1041,6 +1041,10 @@
m_bEnableAutoDelete = rhs.m_bEnableAutoDelete;
m_strDeleteToolExePath = rhs.m_strDeleteToolExePath;
m_strDeleteToolConfigPath = rhs.m_strDeleteToolConfigPath;
+
+ // lwq,2025.08.04
+ m_bUse_SaveDLDefectImage = rhs.m_bUse_SaveDLDefectImage;
+
}
return *this;
}
@@ -1282,7 +1286,9 @@
str = _T("DELETETOOL_EXE_PATH");
else if ((void*)&m_strDeleteToolConfigPath == pValue)
str = _T("DELETETOOL_CONFIG_PATH");
-
+ // lwq,2025.08.04
+ else if ((void*)&m_bUse_SaveDLDefectImage == pValue)
+ str = _T("SAVE_DLDEFECT_IMAGE");
return str;
}
@@ -1465,6 +1471,11 @@
return FALSE;
BasicInfoFile.GetItemValue((TCHAR*)(LPCTSTR)str, m_strDeleteToolConfigPath, _T(""));
+ // ly,2025.08.04
+ str = GetFileString((void*)&m_bUse_SaveDLDefectImage);
+ if (str.IsEmpty() == TRUE)
+ return FALSE;
+ BasicInfoFile.GetItemValue((TCHAR*)(LPCTSTR)str, m_bUse_SaveDLDefectImage, FALSE);
return TRUE;
}
@@ -1645,6 +1656,12 @@
return FALSE;
Register.GetItemValue((TCHAR*)(LPCTSTR)str, m_strDeleteToolConfigPath, _T(""));
+ // lwq,2025.08.04
+ str = GetFileString((void*)&m_bUse_SaveDLDefectImage);
+ if (str.IsEmpty() == TRUE)
+ return FALSE;
+ Register.GetItemValue((TCHAR*)(LPCTSTR)str, m_bUse_SaveDLDefectImage, FALSE);
+
return TRUE;
}
@@ -1808,6 +1825,12 @@
return FALSE;
Register.SetItemValue((TCHAR*)(LPCTSTR)str, m_strDeleteToolConfigPath);
+ //lwq2025.08.04
+ str = GetFileString((void*)&m_bUse_SaveDLDefectImage);
+ if (str.IsEmpty() == TRUE)
+ return FALSE;
+ Register.SetItemValue((TCHAR*)(LPCTSTR)str, (int)m_bUse_SaveDLDefectImage);
+
return TRUE;
}
@@ -1953,7 +1976,7 @@
if (str.IsEmpty() == TRUE)
return FALSE;
BasicInfoFile.SetItemValue((TCHAR*)(LPCTSTR)str, (int)m_bSaveResultByHour);
-
+
// ly,2025.07.07
str = GetFileString((void*)&m_bEnableAutoCopy);
if (str.IsEmpty() == TRUE)
@@ -1980,6 +2003,13 @@
return FALSE;
BasicInfoFile.SetItemValue((TCHAR*)(LPCTSTR)str, m_strDeleteToolConfigPath);
+
+ //lwq,2025.08.04
+ str = GetFileString((void*)&m_bUse_SaveDLDefectImage);
+ if (str.IsEmpty() == TRUE)
+ return FALSE;
+ BasicInfoFile.SetItemValue((TCHAR*)(LPCTSTR)str, m_bUse_SaveDLDefectImage);
+
BasicInfoFile.WriteToFile();
return TRUE;
--
Gitblit v1.9.3