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 |   73 +++++++++++++++++++++++++++++++++---
 1 files changed, 67 insertions(+), 6 deletions(-)

diff --git a/EdgeInspector_App/Recipe/HardwareSettings.cpp b/EdgeInspector_App/Recipe/HardwareSettings.cpp
index 46ce242..1d0d633 100644
--- a/EdgeInspector_App/Recipe/HardwareSettings.cpp
+++ b/EdgeInspector_App/Recipe/HardwareSettings.cpp
@@ -1,4 +1,4 @@
-#include "StdAfx.h"
+锘�#include "StdAfx.h"
 #include "HardwareSettings.h"
 
 //////////////////////////////////////////////////////////////////////////
@@ -1031,6 +1031,9 @@
 
 		m_bUse_SaveDebugImage = rhs.m_bUse_SaveDebugImage;
 
+		// ly,2025.07.10
+		m_bSaveResultByHour = rhs.m_bSaveResultByHour;
+
 		// ly,2025.07.07
 		m_bEnableAutoCopy = rhs.m_bEnableAutoCopy;
 		m_strCopyToolExePath = rhs.m_strCopyToolExePath;
@@ -1038,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;
 }
@@ -1262,6 +1269,10 @@
 	else if((void *)&m_nSaveImageQuality == pValue)
 		str = _T("SAVEIMAGE_QUALITY");
 
+	// ly,2025.07.10
+	else if ((void*)&m_bSaveResultByHour == pValue)
+		str = _T("SAVE_RESULT_BY_HOUR");
+
 	// ly,2025.07.07
 	else if ((void*)&m_bEnableAutoCopy == pValue)
 		str = _T("ENABLE_AUTOCOPY");
@@ -1275,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;
 }
 
@@ -1426,7 +1439,13 @@
 	BasicInfoFile.GetItemValue((TCHAR*)(LPCTSTR)str,nTemp);
 	m_bUse_SaveDebugImage = (BOOL) nTemp;
 
-	// ly.2025.07.07
+	// ly,2025.07.10
+	str = GetFileString((void*)&m_bSaveResultByHour);
+	if (str.IsEmpty() == TRUE)
+		return FALSE;
+	BasicInfoFile.GetItemValue((TCHAR*)(LPCTSTR)str, m_bSaveResultByHour, FALSE);
+
+	// ly,2025.07.07
 	str = GetFileString((void*)&m_bEnableAutoCopy);
 	if (str.IsEmpty() == TRUE)
 		return FALSE;
@@ -1452,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;
 }
 
@@ -1600,7 +1624,13 @@
 	Register.GetItemValue((TCHAR*)(LPCTSTR)str,nTemp);
 	m_bUse_SaveDebugImage = (BOOL) nTemp;
 
-	// ly.2025.07.07
+	// ly,2025.07.10
+	str = GetFileString((void*)&m_bSaveResultByHour);
+	if (str.IsEmpty() == TRUE)
+		return FALSE;
+	Register.GetItemValue((TCHAR*)(LPCTSTR)str, m_bSaveResultByHour, FALSE);
+
+	// ly,2025.07.07
 	str = GetFileString((void*)&m_bEnableAutoCopy);
 	if (str.IsEmpty() == TRUE)
 		return FALSE;
@@ -1625,6 +1655,12 @@
 	if (str.IsEmpty() == TRUE)
 		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;
 }
@@ -1757,7 +1793,13 @@
 		return FALSE;
 	Register.SetItemValue((TCHAR*)(LPCTSTR)str,(int) m_bUse_SaveDebugImage);
 
-	// ly.2025.07.07
+	// ly,2025.07.10
+	str = GetFileString((void*)&m_bSaveResultByHour);
+	if (str.IsEmpty() == TRUE)
+		return FALSE;
+	Register.SetItemValue((TCHAR*)(LPCTSTR)str, (int)m_bSaveResultByHour);
+
+	// ly,2025.07.07
 	str = GetFileString((void*)&m_bEnableAutoCopy);
 	if (str.IsEmpty() == TRUE)
 		return FALSE;
@@ -1782,6 +1824,12 @@
 	if (str.IsEmpty() == TRUE)
 		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;
 }
@@ -1923,7 +1971,13 @@
 		return FALSE;
 	BasicInfoFile.SetItemValue((TCHAR*)(LPCTSTR)str,m_bUse_SaveDebugImage);
 
-	// ly.2025.07.07
+	// ly,2025.07.10
+	str = GetFileString((void*)&m_bSaveResultByHour);
+	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)
 		return FALSE;
@@ -1949,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