瀏覽代碼

1、添加定时器,60秒检测一次更新;
2、修正UpdatedSVN

Jeff 5 年之前
父節點
當前提交
70aa74b9b1
共有 3 個文件被更改,包括 19 次插入4 次删除
  1. 17 0
      SATHelper/SATHelper/MainFrm.cpp
  2. 1 0
      SATHelper/SATHelper/MainFrm.h
  3. 1 4
      SATHelper/SATHelper/SVNProc.cpp

+ 17 - 0
SATHelper/SATHelper/MainFrm.cpp

@@ -18,6 +18,7 @@
 
 #include "MainFrm.h"
 #include "DlgLogin.h"
+#include "SVNProc.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW
@@ -100,6 +101,7 @@ BEGIN_MESSAGE_MAP(CMainFrame, CMDIFrameWndEx)
 	ON_UPDATE_COMMAND_UI(ID_CHECK_RCONTROL, &CMainFrame::OnUpdateCheckRcontrol)
 	ON_COMMAND(ID_CHECK_ACTUATOR, &CMainFrame::OnCheckActuator)
 	ON_UPDATE_COMMAND_UI(ID_CHECK_ACTUATOR, &CMainFrame::OnUpdateCheckActuator)
+	ON_WM_TIMER()
 END_MESSAGE_MAP()
 
 // CMainFrame 构造/析构
@@ -385,6 +387,8 @@ int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
 
 	SetWindowText(CString(_T("SATHelper 版本")) + CString(Global::g_szVersion));
 
+	SetTimer(0, 60000, NULL);
+
 	return 0;
 }
 
@@ -1786,3 +1790,16 @@ void CMainFrame::OnUpdateCheckActuator(CCmdUI* pCmdUI)
 	// TODO: 在此添加命令更新用户界面处理程序代码
 	pCmdUI->SetCheck(m_wndDevices.IsWindowVisible());
 }
+
+
+void CMainFrame::OnTimer(UINT_PTR nIDEvent)
+{
+	// TODO: 在此添加消息处理程序代码和/或调用默认值
+	if ( nIDEvent == 0 ) {
+		if (CSVNMgr::GetInstance()->CheckNewVersion(_T("http://192.168.1.103:8580/btc_execute_se/ajaxInteractiveManage!getSvnVersion.action"), _T("")))
+		{
+			m_trayIcon.SetInfo(_T("SVN资源有更新!"), _T("更新提醒!"));
+		}
+	}
+	CMDIFrameWndEx::OnTimer(nIDEvent);
+}

+ 1 - 0
SATHelper/SATHelper/MainFrm.h

@@ -302,6 +302,7 @@ public:
 	afx_msg void OnUpdateCheckRcontrol(CCmdUI* pCmdUI);
 	afx_msg void OnCheckActuator();
 	afx_msg void OnUpdateCheckActuator(CCmdUI* pCmdUI);
+	afx_msg void OnTimer(UINT_PTR nIDEvent);
 };
 
 

+ 1 - 4
SATHelper/SATHelper/SVNProc.cpp

@@ -151,6 +151,7 @@ BOOL CSVNMgr::ParseJson(std::string json)
 			if (code == "00") {
 				cJSON* pObj = cJSON_GetObjectItem(pMsg, "data");
 				if (pObj != NULL) {
+					pObj = cJSON_GetObjectItem(pObj, "svnVersionArray");
 					int nSise = cJSON_GetArraySize(pObj);
 					for (int i = 0; i < nSise; i++) {
 						cJSON* pInfo = cJSON_GetArrayItem(pObj, i);
@@ -327,10 +328,6 @@ void CSVNMgr::UpdatedSVN(CSVNProc* pSVN, DWORD dwVersion)
 		pSVN->m_bNeedUpdate = TRUE;
 		//pSVN->Rollback(pSVN->m_strSVNAddress.GetString(), pSVN->m_strSVNSavePath.GetString(), pSVN->m_dwSVNVersion);
 	}
-	else
-	{
-		pSVN->m_bNeedUpdate = FALSE;
-	}
 }
 
 BOOL CSVNMgr::HasNewVersion()