|
@@ -58,6 +58,7 @@ COLORREF HexColor2RGB(std::string strHexColor)
|
|
|
CIRControlWnd::CIRControlWnd() noexcept
|
|
|
{
|
|
|
m_nComboHeight = 0;
|
|
|
+ m_bSendKey = FALSE;
|
|
|
}
|
|
|
|
|
|
CIRControlWnd::~CIRControlWnd()
|
|
@@ -95,6 +96,7 @@ BEGIN_MESSAGE_MAP(CIRControlWnd, CDockablePane)
|
|
|
ON_WM_SETFOCUS()
|
|
|
ON_WM_SETTINGCHANGE()
|
|
|
ON_WM_PAINT()
|
|
|
+ ON_MESSAGE(WM_IR_SHOT_IMG, OnIRShotImg)
|
|
|
// 信号按钮;
|
|
|
ON_COMMAND_RANGE(BTNID, BTNID + 100, OnSignalBtnClick)
|
|
|
ON_UPDATE_COMMAND_UI_RANGE(BTNID, BTNID + 100, OnUpdateSignalBtn)
|
|
@@ -197,6 +199,24 @@ int CIRControlWnd::OnCreate(LPCREATESTRUCT lpCreateStruct)
|
|
|
|
|
|
StartIRDevice(FALSE);
|
|
|
|
|
|
+ std::thread t([](CIRControlWnd *pWnd) {
|
|
|
+ while (true)
|
|
|
+ {
|
|
|
+ if (g_pMainFrame->m_bShotIR && pWnd->m_bSendKey)
|
|
|
+ {
|
|
|
+ pWnd->m_bSendKey = FALSE;
|
|
|
+ Sleep(200);
|
|
|
+ CUB530View* pView = (CUB530View*)g_pMainFrame->m_pUB530View->GetActiveView();
|
|
|
+ if (pView)
|
|
|
+ {
|
|
|
+ pView->OnCutJpg();
|
|
|
+ }
|
|
|
+ }
|
|
|
+ Sleep(20);
|
|
|
+ }
|
|
|
+ },this);
|
|
|
+ t.detach();
|
|
|
+
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
@@ -549,15 +569,8 @@ void CIRControlWnd::OnSignalBtnClick(UINT uId) // 发送遥控信号;
|
|
|
// 发送单信号;
|
|
|
if (g_sendSignal(text.GetString(), 1, 20))
|
|
|
{
|
|
|
+ m_bSendKey = TRUE;
|
|
|
TRACE("发送单信号成功\n");
|
|
|
- if ( g_pMainFrame->m_bShotIR)
|
|
|
- {
|
|
|
- CUB530View *pView = (CUB530View*)g_pMainFrame->m_pUB530View->GetActiveView();
|
|
|
- if ( pView )
|
|
|
- {
|
|
|
- pView->OnCutJpg();
|
|
|
- }
|
|
|
- }
|
|
|
}
|
|
|
else
|
|
|
{
|
|
@@ -704,3 +717,9 @@ void CIRControlWnd::AddHScroll()
|
|
|
// be scrolled to.
|
|
|
m_wndSignalCombo.SetHorizontalExtent(dx);
|
|
|
}
|
|
|
+
|
|
|
+LRESULT CIRControlWnd::OnIRShotImg(WPARAM wparam, LPARAM lparam)
|
|
|
+{
|
|
|
+
|
|
|
+ return LRESULT();
|
|
|
+}
|