Browse Source

1、修改图标;
2、遥控截图;

scbc.sat2 5 years ago
parent
commit
f764c8fe62

+ 9 - 1
SATHelper/SATHelper/IRControlWnd.cpp

@@ -24,7 +24,7 @@ static char THIS_FILE[] = __FILE__;
 #define new DEBUG_NEW
 #endif
 
-
+extern CMainFrame* g_pMainFrame;
 /////////////////////////////////////////////////////////////////////////////
 // CResourceViewBar
 
@@ -550,6 +550,14 @@ void CIRControlWnd::OnSignalBtnClick(UINT uId) // 发送遥控信号;
 		if (g_sendSignal(text.GetString(), 1, 20))
 		{
 			TRACE("发送单信号成功\n");
+			if ( g_pMainFrame->m_bShotIR)
+			{
+				CUB530View *pView = (CUB530View*)g_pMainFrame->m_pUB530View->GetActiveView();
+				if ( pView )
+				{
+					pView->OnCutJpg();
+				}
+			}			
 		}
 		else
 		{

+ 1 - 0
SATHelper/SATHelper/MainFrm.cpp

@@ -106,6 +106,7 @@ CMainFrame::CMainFrame() noexcept :m_trayIcon(IDR_MAINFRAME)
 		m_pViewIDE[i] = NULL;
 	}
 
+	m_bShotIR = FALSE;
 	m_pUB530View = m_pDeviceView = NULL;
 
 	ReadBaiduCfg(m_bdcfg);

+ 2 - 0
SATHelper/SATHelper/MainFrm.h

@@ -172,6 +172,8 @@ public:
 	afx_msg LRESULT OnRibbonChanged(WPARAM wParam, LPARAM lParam);
 
 
+	// 是否遥控截图;
+	BOOL m_bShotIR;
 public:
 	//////////////////////////////////////////////////////////////////////////
 	// 读取baidu.cfg配置文件内容;

+ 2 - 2
SATHelper/SATHelper/Resource.h

@@ -159,17 +159,17 @@
 #define ID_BUTTON2                      32805
 #define ID_COMBO1_22293                 32806
 #define ID_CHECK1_22293                 32807
-#define ID_CHECK2                       32818
 #define ID_CHECK_SHOT_SPEC              32818
 #define ID_CHECK_SHOT_LOCAL             32819
 #define ID_CHECK_SHOT_SYSTEM            32820
+#define ID_CHECK_IR_SHOT                32823
 
 // Next default values for new objects
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        317
-#define _APS_NEXT_COMMAND_VALUE         32821
+#define _APS_NEXT_COMMAND_VALUE         32824
 #define _APS_NEXT_CONTROL_VALUE         1007
 #define _APS_NEXT_SYMED_VALUE           310
 #endif

+ 22 - 0
SATHelper/SATHelper/UB530View.cpp

@@ -274,6 +274,8 @@ BEGIN_MESSAGE_MAP(CUB530View, CFormView)
 	ON_COMMAND(ID_CHECK_SHOT_SPEC, &CUB530View::OnCheckShotSpec)
 	ON_UPDATE_COMMAND_UI(ID_CHECK_SHOT_SPEC, &CUB530View::OnUpdateCheckShotSpec)
 	ON_WM_CREATE()
+	ON_COMMAND(ID_CHECK_IR_SHOT, &CUB530View::OnCheckIrShot)
+	ON_UPDATE_COMMAND_UI(ID_CHECK_IR_SHOT, &CUB530View::OnUpdateCheckIrShot)
 END_MESSAGE_MAP()
 
 
@@ -1289,3 +1291,23 @@ int CUB530View::OnCreate(LPCREATESTRUCT lpCreateStruct)
 
 	return 0;
 }
+
+
+void CUB530View::OnCheckIrShot()
+{
+	// TODO: 在此添加命令处理程序代码
+	CMFCRibbonBar* pRibbon = g_pMainFrame->GetRibbonBar();
+	ASSERT_VALID(pRibbon);
+	CMFCRibbonButton* pCheck = DYNAMIC_DOWNCAST(CMFCRibbonButton, pRibbon->FindByID(ID_CHECK_SHOT_SPEC));
+	if ( pCheck )
+	{
+		g_pMainFrame->m_bShotIR = !pCheck->IsChecked();
+	}
+}
+
+
+void CUB530View::OnUpdateCheckIrShot(CCmdUI* pCmdUI)
+{
+	// TODO: 在此添加命令更新用户界面处理程序代码
+	pCmdUI->SetCheck(g_pMainFrame->m_bShotIR);
+}

+ 2 - 0
SATHelper/SATHelper/UB530View.h

@@ -171,6 +171,8 @@ public:
 	afx_msg void OnUpdateCheckShotSpec(CCmdUI* pCmdUI);
 	afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct);
 	
+	afx_msg void OnCheckIrShot();
+	afx_msg void OnUpdateCheckIrShot(CCmdUI* pCmdUI);
 };
 
 

BIN
SATHelper/SATHelper/res/buttons.bmp


File diff suppressed because it is too large
+ 0 - 0
SATHelper/SATHelper/res/ribbon.mfcribbon-ms


BIN
SATHelper/SATHelper/res/writelarge.bmp


Some files were not shown because too many files changed in this diff