1、优化问题；

VideoCapture/VideoCapture/DlgIRControl.cpp

@@ -59,7 +59,8 @@ void CDlgIRControl::AdjustLayout()
 	CRect rc;
 	CWnd* pWnd = GetDlgItem(IDC_BUTTON1);
 	pWnd->GetWindowRect(&rc);
-	pWnd->GetClientRect(&rc);
+	//pWnd->GetClientRect(&rc);
+
 	int start_id = IDC_BUTTON1;
 	const int c_interval = 4;	// 列间隔;
 	const int r_interval = 6;	// 行间隔;

VideoCapture/VideoCapture/Global.cpp

@@ -15,6 +15,7 @@ irc_IsAppRunning g_IsAppRunning = NULL;
 irc_StartIRApp g_StartIRApp = NULL;
 irc_CloseApp g_CloseApp = NULL;
 irc_Connect g_Connect = NULL;
+irc_DisConnect g_DisConnect = NULL;
 irc_loadSignalDataSet g_loadSignalDataSet = NULL;
 irc_getDeviceNames g_getDeviceNames = NULL;
 irc_getSignalsName g_getSignalsName = NULL;
@@ -102,6 +103,13 @@ BOOL LoadLogLibarary()
 		return FALSE;
 	}
 
+	g_DisConnect = (irc_DisConnect)GetProcAddress(g_hdll, "DisConnect");
+	if (!g_DisConnect)
+	{
+		FreeLogLibarary();
+		return FALSE;
+	}
+
 	// 导出全局变量;
 	g_nIRControl = *(int*)GetProcAddress(g_hdll, "nIRControl");
 	if (!g_CloseApp)
@@ -131,6 +139,7 @@ void FreeLogLibarary()
 			g_sendSignal = NULL;
 			g_sendSignals = NULL;
 			g_sendRepeatsSignal = NULL;
+			g_DisConnect = NULL;
 		}
 	}
 }
@@ -140,10 +149,10 @@ namespace Global
 {
 	//////////////////////////////////////////////////////////////////////////
 	// 全局变量;
-	TCHAR g_szCurModuleDir[MAX_PATH] = {0};
-	TCHAR g_szCurModulePath[MAX_PATH] = {0};
-	TCHAR g_szFna[MAX_PATH] = {0};
-	TCHAR g_szConfig[MAX_PATH] = {0};
+	TCHAR g_szCurModuleDir[MAX_PATH] = { 0 };
+	TCHAR g_szCurModulePath[MAX_PATH] = { 0 };
+	TCHAR g_szFna[MAX_PATH] = { 0 };
+	TCHAR g_szConfig[MAX_PATH] = { 0 };
 	STConfig g_Config;
 	//////////////////////////////////////////////////////////////////////////
 	// 全局函数;
@@ -160,13 +169,13 @@ namespace Global
 	/*  日期：;
 	/*  内容：;
 	/************************************************************************/
-	void WriteTextLog(const TCHAR *format, ...)
+	void WriteTextLog(const TCHAR* format, ...)
 	{
 		// 解析出日志路径;
 		TCHAR szlogpath[MAX_PATH] = { 0 };
 		_stprintf_s(szlogpath, _T("%s%s.txt"), g_szCurModuleDir, g_szFna);
 		// 打开或创建文件;
-		FILE *fp = NULL;
+		FILE* fp = NULL;
 		//if (_taccess(szlogpath, 0) != -1)
 #ifndef UNICODE
 		if (_access(szlogpath, 0) != -1)
@@ -174,7 +183,7 @@ namespace Global
 		if (_taccess(szlogpath, 0) != -1)
 #endif
 		{// 存在;
-			if ( 0 == _tfopen_s(&fp, szlogpath, _T("a+")))
+			if (0 == _tfopen_s(&fp, szlogpath, _T("a+")))
 				// 移动到末尾;
 				fseek(fp, 0, SEEK_END);
 		}
@@ -183,7 +192,7 @@ namespace Global
 			_tfopen_s(&fp, szlogpath, _T("w+"));
 		}
 
-		if ( fp == NULL )
+		if (fp == NULL)
 			return;
 
 		// 格式化前设置语言区域;
@@ -193,7 +202,7 @@ namespace Global
 		// 格式化日志内容;
 		va_list		args = NULL;
 		int			len = 0;
-		TCHAR		*buffer = NULL;
+		TCHAR* buffer = NULL;
 		va_start(args, format);
 		// _vscprintf doesn't count. terminating '\0'
 		len = _vsctprintf(format, args) + 1;
@@ -202,9 +211,9 @@ namespace Global
 		// 将日志内容输入到文件中;
 		// 获取今年年份;
 		__time64_t gmt = time(NULL);// 获取当前日历时间(1900-01-01开始的Unix时间戳);
-		struct tm gmtm = {0};
+		struct tm gmtm = { 0 };
 		localtime_s(&gmtm, &gmt); // 时间戳转成本地时间;
-		_ftprintf(fp, _T("%04d-%02d-%02d %02d:%02d:%02d %s\n"), gmtm.tm_year+1990, gmtm.tm_mon+1, gmtm.tm_mday, gmtm.tm_hour, gmtm.tm_min, gmtm.tm_sec, buffer);
+		_ftprintf(fp, _T("%04d-%02d-%02d %02d:%02d:%02d %s\n"), gmtm.tm_year + 1990, gmtm.tm_mon + 1, gmtm.tm_mday, gmtm.tm_hour, gmtm.tm_min, gmtm.tm_sec, buffer);
 
 		// 关闭文件，释放资源并设置回原语言区域;
 		free(buffer);
@@ -213,7 +222,7 @@ namespace Global
 		free(old_locale);//还原区域设定;
 	}
 
-	
+
 	// 读取配置文件-预留;
 	void GetConfig()
 	{
@@ -238,7 +247,7 @@ namespace Global
 		memset(szValue, 0, MAX_PATH);
 
 	}
-	
+
 	BOOL GetOrientation(IN Image* pImg)
 	{
 		if (pImg == NULL) return FALSE;
@@ -256,7 +265,7 @@ namespace Global
 			if (PropertyTagOrientation == pAllItems[j].id)
 			{
 				short* ptrLong = (short*)(pAllItems[j].value);
-				int ret = (int)* ptrLong;
+				int ret = (int)*ptrLong;
 				free(pAllItems);
 				return ret;
 			}
@@ -455,7 +464,7 @@ namespace Global
 
 	BOOL SaveImgByRotate(LPCTSTR lpszFileName, BYTE* pBuffer, const INT& nBufLen, BOOL bHoriontal, BOOL bVertically)
 	{
-		Image *pImg = NULL;
+		Image* pImg = NULL;
 		HGLOBAL hMemery = GlobalAlloc(GMEM_MOVEABLE, nBufLen);
 		if (hMemery == NULL)
 			return FALSE;
@@ -467,7 +476,7 @@ namespace Global
 		memcpy(pMem, pBuffer, nBufLen);
 
 		IStream* pstream = NULL;
-	    HRESULT hr = CreateStreamOnHGlobal(hMemery, TRUE, &pstream);
+		HRESULT hr = CreateStreamOnHGlobal(hMemery, TRUE, &pstream);
 		if (pstream == NULL)
 			return FALSE;
 		pImg = Image::FromStream(pstream);
@@ -476,7 +485,7 @@ namespace Global
 
 		if (bHoriontal && !bVertically)
 			pImg->RotateFlip(RotateNoneFlipX);// 水平翻转;
-		else if ( bHoriontal && bVertically)
+		else if (bHoriontal && bVertically)
 			pImg->RotateFlip(Rotate180FlipNone);// 270度;
 		else if (!bHoriontal && bVertically)
 			pImg->RotateFlip(Rotate180FlipX);// 垂直翻转;
@@ -535,7 +544,7 @@ namespace Global
 
 		return stat == Ok ? TRUE : FALSE;
 	}
-	
+
 
 	void MKDIR(LPCTSTR dir)
 	{
@@ -589,7 +598,7 @@ namespace Global
 
 			if (GetFileVersionInfo(szFilePath, dwHandle, size, buffer))
 			{
-				if (VerQueryValue(buffer, _T("\\"), (LPVOID*)& pVi, (PUINT)& size))
+				if (VerQueryValue(buffer, _T("\\"), (LPVOID*)&pVi, (PUINT)&size))
 				{
 					pdwFileVersion[0] = HIWORD(pVi->dwFileVersionMS);
 					pdwFileVersion[1] = LOWORD(pVi->dwFileVersionMS);

VideoCapture/VideoCapture/Global.h

@@ -31,6 +31,7 @@ typedef DWORD(*irc_IsAppRunning)(LPCTSTR lpszAppDir);
 typedef bool (*irc_StartIRApp)(LPCTSTR lpszAppDir, LPCTSTR lpSignalXml, DWORD dwPort);
 typedef bool (*irc_CloseApp)();
 typedef bool (*irc_Connect)(LPCTSTR lpServer, int port);
+typedef void (*irc_DisConnect)();
 typedef bool (*irc_loadSignalDataSet)(LPCTSTR lpDatasetXml);
 typedef LPCTSTR(*irc_getDeviceNames)();
 typedef LPCTSTR(*irc_getSignalsName)();
@@ -43,6 +44,7 @@ extern irc_IsAppRunning g_IsAppRunning;
 extern irc_StartIRApp g_StartIRApp;
 extern irc_CloseApp g_CloseApp;
 extern irc_Connect g_Connect;
+extern irc_DisConnect g_DisConnect;
 extern irc_getDeviceNames g_getDeviceNames;
 extern irc_getSignalsName g_getSignalsName;
 extern irc_loadSignalDataSet g_loadSignalDataSet;

VideoCapture/VideoCapture/IRControlWnd.cpp

@@ -195,6 +195,9 @@ int CIRControlWnd::OnCreate(LPCREATESTRUCT lpCreateStruct)
 		AfxMessageBox("加载遥控dll失败，请检测dll是否正常！");
 	}
 
+#if 1
+	ReStartIRDevice();
+#else
 	// 启动服务;
 	if (g_IsAppRunning(Global::g_Config.redratpath.c_str()))
 	{
@@ -203,7 +206,7 @@ int CIRControlWnd::OnCreate(LPCREATESTRUCT lpCreateStruct)
 	else
 	{
 		TRACE("启动红老鼠进程未运行\r");
-		if (g_StartIRApp(Global::g_Config.redratpath.c_str(), (Global::g_Config.signaldir + "\\defualt.xml").c_str(), 40000))
+		if (g_StartIRApp(Global::g_Config.redratpath.c_str(), ".\\default.xml", 40000))
 		{
 			TRACE("启动红老鼠进程启动成功\r");
 		}
@@ -239,7 +242,7 @@ int CIRControlWnd::OnCreate(LPCREATESTRUCT lpCreateStruct)
 	{
 		TRACE("加载信号集文件成功\r");
 	}
-
+#endif
 	return 0;
 }
 
@@ -310,34 +313,14 @@ void CIRControlWnd::OnCbnSelchangeSignal()
 	{
 		std::string signalpath;
 		m_wndSignalCombo.GetLBText(nCurSel, strSignal);
-		if ( Global::g_Config.bGenerics )
-		{
-			signalpath = Global::g_Config.signaldir + "\\general\\";
-		}
-		else
-		{
-			signalpath = Global::g_Config.signaldir + "\\product\\";
-		}
-
-		signalpath.append(strSignal.GetString());
-		signalpath.append(".xml");
-
-		// 切换信号集文件;
-		// 加载指定目录的xml信号集文件;
-		if (!g_loadSignalDataSet(signalpath.c_str()))
-		{
-			TRACE("加载信号集文件失败\r");
-		}
-		else
-		{
-			TRACE("加载信号集文件成功\r");
-			UpdateSignalBtnStatus();
-		}
 
 		// 保存到配置文件中;
+		Global::g_Config.use_signal = strSignal.GetString();
 		WritePrivateProfileString("ir-device", "use-signal", strSignal.GetString(), Global::g_szConfig);
-
 	}
+
+	DisableSignalBtn();
+	ReLoadSignalXml();
 }
 
 void CIRControlWnd::SetPropListFont()
@@ -361,59 +344,130 @@ void CIRControlWnd::SetPropListFont()
 	//m_wndObjectCombo.SetFont(&m_fntPropList);
 }
 
-void CIRControlWnd::LoadSignals()
+void CIRControlWnd::ReStartIRDevice(std::string signalName)
 {
-	filehelper fh;
-	fh.getfolderfiles((Global::g_Config.signaldir + "\\general\\").c_str(), NULL, &m_vtsignal_gen);
-	fh.getfolderfiles((Global::g_Config.signaldir + "\\product\\").c_str(), NULL, &m_vtsignal_pro);
+	std::thread t([&](std::string signal_name) {
+		// 结束进程;
+		if (g_CloseApp)
+			g_CloseApp();
+
+		// 默认加载配置的信号集文件;
+		std::string signale = Global::g_Config.bGenerics ? Global::g_Config.signaldir + "\\general\\" : Global::g_Config.signaldir + "\\product\\";
+		signale.append(Global::g_Config.use_signal + ".xml");
+		if ( !PathFileExists(signale.c_str()) )
+		{
+			m_wndSignalCombo.SetCurSel(-1);
+			signale = ".\\default.xml";
+		}
+		else
+		{
+			m_wndSignalCombo.SelectString(0, Global::g_Config.use_signal.c_str());
+		}
 
-	// 添加到combobox中;
-	std::string signalpath;
-	if (Global::g_Config.bGenerics )
-	{
-		signalpath = Global::g_Config.signaldir + "\\general\\";
+		if (g_StartIRApp(Global::g_Config.redratpath.c_str(), signale.c_str(), 40000))
+		{
+			TRACE("启动红老鼠进程启动成功\r");
+		}
+		else
+		{
+			TRACE("启动红老鼠进程启动失败\r");
+			AfxMessageBox("启动红老鼠进程启动失败！");
+		}
 
-		m_wndSignalCombo.ResetContent();
-		for ( auto it : m_vtsignal_gen)
+		BOOL bRet = FALSE;
+		// 连接服务器;
+		for (int i = 0; i < 5; i++)
 		{
-			m_wndSignalCombo.AddString(fh.getfilename(it).c_str());
+			if ((bRet = g_Connect(_T("127.0.0.1"), 40000)))
+				break;
+			Sleep(1000);
+		}
+
+		if (!bRet)
+			AfxMessageBox("连接红老鼠服务端失败，请重启设备！");
+
+		// 更新按钮状态;
+		UpdateSignalBtnStatus();
+		// 获取设备列表,以逗号分隔;
+		std::string devices = g_getDeviceNames();
+		if (devices.size() == 0)
+		{
+			AfxMessageBox("当前无红老鼠设备连接！");
 		}
+	}, signalName);
+	t.detach();
+}
+
+void CIRControlWnd::ReLoadSignalXml()
+{
+	std::string signaldir,signalpath;
+	if (Global::g_Config.bGenerics)
+	{
+		signaldir = Global::g_Config.signaldir + "\\general\\";
 	}
 	else
 	{
-		signalpath = Global::g_Config.signaldir + "\\product\\";
-		m_wndSignalCombo.ResetContent();
-		for (auto it : m_vtsignal_pro)
-		{
-			m_wndSignalCombo.AddString(fh.getfilename(it).c_str());
-		}
-	}	
+		signaldir = Global::g_Config.signaldir + "\\product\\";
+	}
 
+	signalpath = signaldir;
 	signalpath.append(Global::g_Config.use_signal + ".xml");
 	if (!PathFileExists(signalpath.c_str()))
 	{
+		AfxMessageBox(_T("该信号文件不存在！"));
+		// 设置默认的;
 		CString strSignal;
 		m_wndSignalCombo.SetCurSel(0);
 		m_wndSignalCombo.GetLBText(0, strSignal);
 
-		// 加载指定目录的xml信号集文件;
-		if (!g_loadSignalDataSet(signalpath.c_str()))
-		{
-			TRACE("加载信号集文件失败\r");
-		}
-		else
-		{
-			TRACE("加载信号集文件成功\r");
-			UpdateSignalBtnStatus();
-		}
+		signalpath = signaldir;
+		signalpath.append(strSignal.GetString());
+		signalpath.append(".xml");
 
 		// 保存到配置文件中;
+		Global::g_Config.use_signal = strSignal.GetString();
 		WritePrivateProfileString("ir-device", "use-signal", strSignal.GetString(), Global::g_szConfig);
 	}
-	else
+	else // 切换通用类型时用到;
 	{
 		m_wndSignalCombo.SelectString(0, Global::g_Config.use_signal.c_str());
 	}
+
+	// 加载指定目录的xml信号集文件;
+	if (!g_loadSignalDataSet(signalpath.c_str()))
+	{
+		TRACE("加载信号集文件失败\r");
+	}
+	else
+	{
+		TRACE("加载信号集文件成功\r");
+		UpdateSignalBtnStatus();
+	}
+}
+
+void CIRControlWnd::LoadSignals()
+{
+	filehelper fh;
+	fh.getfolderfiles((Global::g_Config.signaldir + "\\general\\").c_str(), NULL, &m_vtsignal_gen);
+	fh.getfolderfiles((Global::g_Config.signaldir + "\\product\\").c_str(), NULL, &m_vtsignal_pro);
+
+	// 添加到combobox中;
+	if (Global::g_Config.bGenerics )
+	{
+		m_wndSignalCombo.ResetContent();
+		for ( auto it : m_vtsignal_gen)
+		{
+			m_wndSignalCombo.AddString(fh.getfilename(it).c_str());
+		}
+	}
+	else
+	{
+		m_wndSignalCombo.ResetContent();
+		for (auto it : m_vtsignal_pro)
+		{
+			m_wndSignalCombo.AddString(fh.getfilename(it).c_str());
+		}
+	}	
 }
 
 void CIRControlWnd::Loadlayout(std::vector<BtnInfo>& vt)
@@ -524,7 +578,7 @@ void CIRControlWnd::OnPaint()
 #endif
 }
 
-void CIRControlWnd::OnSignalBtnClick(UINT uId)
+void CIRControlWnd::OnSignalBtnClick(UINT uId) // 发送遥控信号;
 {
 	CWnd* pWnd = GetFocus();
 	int id = pWnd->GetDlgCtrlID();
@@ -557,12 +611,12 @@ void CIRControlWnd::OnUpdateCheckBox(CCmdUI* pCmdUI)
 void CIRControlWnd::OnCheckBoxClicked()
 {
 	Global::g_Config.bGenerics = m_wndSignalCheck.IsChecked();
+	// 保存到配置文件中;
+	WritePrivateProfileString("ir-device", "generics", Global::g_Config.bGenerics ? "1" : "0", Global::g_szConfig);
+
 	// 添加到combobox中;
-	std::string signalpath;
 	if (Global::g_Config.bGenerics)
 	{
-		signalpath = Global::g_Config.signaldir + "\\general\\";
-
 		m_wndSignalCombo.ResetContent();
 		for (auto it : m_vtsignal_gen)
 		{
@@ -571,41 +625,15 @@ void CIRControlWnd::OnCheckBoxClicked()
 	}
 	else
 	{
-		signalpath = Global::g_Config.signaldir + "\\product\\";
 		m_wndSignalCombo.ResetContent();
 		for (auto it : m_vtsignal_pro)
 		{
 			m_wndSignalCombo.AddString(filehelper::getfilename(it).c_str());
 		}
 	}
-
-	signalpath.append(Global::g_Config.use_signal + ".xml");
-	if (!PathFileExists(signalpath.c_str()))
-	{
-		CString strSignal;
-		m_wndSignalCombo.SetCurSel(0);
-		m_wndSignalCombo.GetLBText(0, strSignal);
-
-		// 加载指定目录的xml信号集文件;
-		if (!g_loadSignalDataSet(signalpath.c_str()))
-		{
-			TRACE("加载信号集文件失败\r");
-		}
-		else
-		{
-			TRACE("加载信号集文件成功\r");
-			UpdateSignalBtnStatus();
-		}
-
-		// 保存到配置文件中;
-		WritePrivateProfileString("ir-device", "use-signal", strSignal.GetString(), Global::g_szConfig);
-	}
-	else
-	{
-		m_wndSignalCombo.SelectString(0, Global::g_Config.use_signal.c_str());
-	}
-
-	WritePrivateProfileString("ir-device", "generics", Global::g_Config.bGenerics ? "1" : "0", Global::g_szConfig);
+	
+	DisableSignalBtn();
+	ReLoadSignalXml();	
 }
 
 void CIRControlWnd::OnUpdateBtnRestartProc(CCmdUI* pCmdUI)
@@ -613,8 +641,12 @@ void CIRControlWnd::OnUpdateBtnRestartProc(CCmdUI* pCmdUI)
 	pCmdUI->Enable(TRUE);
 }
 
-void CIRControlWnd::OnBtnRestartProcClicked()
+void CIRControlWnd::OnBtnRestartProcClicked() // 重启红老鼠;
 {
+#if 1
+	DisableSignalBtn();
+	ReStartIRDevice();
+#else
 	// 关闭旧类型进程;
 	if (g_CloseApp)
 		g_CloseApp();
@@ -622,7 +654,7 @@ void CIRControlWnd::OnBtnRestartProcClicked()
 	// 新启动类型进程;
 	if (g_StartIRApp)
 	{
-		if (g_StartIRApp(Global::g_Config.redratpath.c_str(), (Global::g_Config.signaldir + "\\defualt.xml").c_str(), 40000))
+		if (g_StartIRApp(Global::g_Config.redratpath.c_str(), ".\\default.xml", 40000))
 		{
 			TRACE("启动红老鼠进程启动成功\r");
 		}
@@ -658,6 +690,7 @@ void CIRControlWnd::OnBtnRestartProcClicked()
 		TRACE("加载信号集文件成功\r");
 		UpdateSignalBtnStatus();
 	}
+#endif
 }
 
 void CIRControlWnd::UpdateSignalBtnStatus()

VideoCapture/VideoCapture/IRControlWnd.h

@@ -93,6 +93,18 @@ protected:
 	void SetPropListFont();
 
 	int m_nComboHeight;
+
+	// 重启红老鼠;
+	void ReStartIRDevice(std::string signalName = "");
+	// 重载信号文件;
+	void ReLoadSignalXml();
+	// 禁用信号按钮;
+	void DisableSignalBtn() {
+		for (std::vector<BtnInfo>::iterator it = m_vtBtnInfo.begin(); it != m_vtBtnInfo.end(); it++)
+		{
+			it->bEnable = false;
+		}
+	}
 public:
 	std::map<UINT, BtnInfo&> m_map_btn;
 	std::vector<std::string> m_vtsignal_gen;

VideoCapture/VideoCapture/VideoCapture.rc

@@ -53,11 +53,11 @@ BEGIN
     "\r\n"
     "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_CHS)\r\n"
     "LANGUAGE 4, 2\r\n"
-    "#include ""res\\VideoCapture.rc2""  // 闈?Microsoft Visual C++ 缂栬緫鐨勮祫婧?\n"
-    "#include ""l.CHS\\afxres.rc""      // 鏍囧噯缁勪欢\r\n"
-    "#include ""l.CHS\\afxprint.rc""    // 鎵撳嵃/鎵撳嵃棰勮璧勬簮\r\n"
+    "#include ""res\\VideoCapture.rc2""  // 非 Microsoft Visual C++ 编辑的资源\r\n"
+    "#include ""l.CHS\\afxres.rc""      // 标准组件\r\n"
+    "#include ""l.CHS\\afxprint.rc""    // 打印/打印预览资源\r\n"
     "#if !defined(_AFXDLL)\r\n"
-    "#include ""l.CHS\\afxribbon.rc""        // MFC 鍔熻兘鍖哄拰鎺у埗鏉¤祫婧?\n"
+    "#include ""l.CHS\\afxribbon.rc""        // MFC 功能区和控制条资源\r\n"
     "#endif\r\n"
     "#endif\r\n"
     "\0"
@@ -755,11 +755,11 @@ END
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_CHS)
 LANGUAGE 4, 2
-#include "res\VideoCapture.rc2"  // 闈?Microsoft Visual C++ 缂栬緫鐨勮祫婧?
-#include "l.CHS\afxres.rc"      // 鏍囧噯缁勪欢
-#include "l.CHS\afxprint.rc"    // 鎵撳嵃/鎵撳嵃棰勮璧勬簮
+#include "res\VideoCapture.rc2"  // 非 Microsoft Visual C++ 编辑的资源
+#include "l.CHS\afxres.rc"      // 标准组件
+#include "l.CHS\afxprint.rc"    // 打印/打印预览资源
 #if !defined(_AFXDLL)
-#include "l.CHS\afxribbon.rc"        // MFC 鍔熻兘鍖哄拰鎺у埗鏉¤祫婧?
+#include "l.CHS\afxribbon.rc"        // MFC 功能区和控制条资源
 #endif
 #endif
 

VideoCapture/VideoCapture/VideoCapture.vcxproj

@@ -219,7 +219,6 @@ copy "$(SolutionDir)AMESDK.DLL" "$(TargetDir)AMESDK.dll" /y/a</Command>
   <ItemGroup>
     <Image Include="res\buttons.bmp" />
     <Image Include="res\checked.bmp" />
-    <Image Include="res\checked.png" />
     <Image Include="res\classview.bmp" />
     <Image Include="res\classview_hc.bmp" />
     <Image Include="res\class_view.ico" />

VideoCapture/VideoCapture/VideoCapture.vcxproj.filters

@@ -339,9 +339,6 @@
     <Image Include="res\checked.bmp">
       <Filter>资源文件</Filter>
     </Image>
-    <Image Include="res\checked.png">
-      <Filter>资源文件</Filter>
-    </Image>
     <Image Include="res\unchecked.bmp">
       <Filter>资源文件</Filter>
     </Image>

VideoCapture/VideoCapture/config.ini

@@ -9,4 +9,4 @@ generics=0
 signal=D:\SAT\resource\RCU
 
 ;ʹÓõÄÐźż¯;
-use-signal=6586_waixie_all
+use-signal=ARTEL_WZ_RC311_2841