fix<card_client>:修复时间控件占用cpu的问题

之前时间控件更新时间逻辑错误，导致cpu占有率过高，现使用定时器每秒钟更新一次时间。

fix<card_client>:修复时间控件占用cpu的问题
之前时间控件更新时间逻辑错误，导致cpu占有率过高，现使用定时器每秒钟更新一次时间。
liuye
1 parent 8ca804f7
Showing 12 changed files with 22 additions and 35 deletions
doc/北京意诚信通智能卡股份有限公司/00-个人化.txt
doc/北京意诚信通智能卡股份有限公司/02-权限测试.txt
doc/北京意诚信通智能卡股份有限公司/Card_Spec_v2.1.1v0303.pdf
doc/北京意诚信通智能卡股份有限公司/交通部一卡通个人化指南.pdf
doc/北京意诚信通智能卡股份有限公司/微信图片_20180807153406.jpg
doc/卡片情况.xlsx
doc/智信融创/智信融创替换秘钥方法.txt
doc/硬件卡片总体需求/卡片基本信息字段和初始秘钥说明.docx
etrade_card_client/Config/application_config.json
etrade_card_client/Config/menu_res_auth_cfg.json
etrade_card_client/ETradeClient.rc
etrade_card_client/ETradeClient/mfc_ui/MainFrm.cpp
 Binary files /dev/null and b/doc/北京意诚信通智能卡股份有限公司/00-个人化.txt differ
 Binary files /dev/null and b/doc/北京意诚信通智能卡股份有限公司/02-权限测试.txt differ
@@ -5,9 +5,9 @@
 3.84D4010124 + 密文 + mac
 DCMK id:01
-主控秘钥：84D4010124
+主控秘钥：	84D4010124
 非主控秘钥：84D4000124
-K_DCCK_CMD_HEAD = 18000000003300FF10
+K_DCCK_CMD_HEAD = 		18000000003300FF10
 K_F0015_DACK_CMD_HEAD = 18000000006600FF10
 K_F0015_DEAK_CMD_HEAD = 180D01000066002210
 K_F0015_DAMK1_CMD_HEAD = 184801000066002210
 \ No newline at end of file
@@ -9,7 +9,7 @@
 	"client_cert_subject": "*.diligrp.com",
 	"client_cert_filename": "",
 	"client_cert_password": "",
-	"security_level": 0,
-	"encrypt_type": 1,
+	"security_level": 1,
+	"encrypt_type": 0,
 	"id_reader": 1
 }
 \ No newline at end of file
@@ -27,9 +27,9 @@
     {"res_id":50180, 	"auth_id":6004, "icon":"customer_query.ico", 			"index":[4, 0]},
     {"res_id":50190, 	"auth_id":6008, "icon":"oper_log_query.ico", 			"index":[4, 1]},
 	{"res_id":50181, 	"auth_id":6009, "icon":"about.ico", 					"index":[4, 2]},
-	{"res_id":5, 		"auth_id":65, 	"icon":"about.ico", 					"index":[5]},
-	{"res_id":50182, 	"auth_id":6502, "icon":"about.ico", 					"index":[5, 0]},
-	{"res_id":50183, 	"auth_id":6504, "icon":"about.ico", 					"index":[5, 1]},
+	{"res_id":5, 		"auth_id":70, 	"icon":"", 								"index":[5]},
+	{"res_id":50182, 	"auth_id":7002, "icon":"about.ico", 					"index":[5, 0]},
+	{"res_id":50183, 	"auth_id":7004, "icon":"about.ico", 					"index":[5, 1]},
     {"res_id":6,        "auth_id":0,    "icon":"",                              "index":[6]},
     {"res_id":32807,    "auth_id":0,    "icon":"modify_cfg.ico",                "index":[6, 0]},
     {"res_id":32782,    "auth_id":0,    "icon":"exit.ico",                      "index":[]},
@@ -243,8 +243,8 @@ END
 //
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,1
- PRODUCTVERSION 1,0,0,1
+ FILEVERSION 1,0,0,2
+ PRODUCTVERSION 1,0,0,2
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -261,12 +261,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "地利集团【DILI GROUP】"
             VALUE "FileDescription", "电子交易结算柜员系统【ETradeClient】"
-            VALUE "FileVersion", "1.0.0.1"
+            VALUE "FileVersion", "1.0.0.2"
             VALUE "InternalName", "ETradeClient.exe"
             VALUE "LegalCopyright", "(C) 地利集团。  保留所有权利。"
             VALUE "OriginalFilename", "ETradeClient.exe"
             VALUE "ProductName", "电子交易结算柜员系统"
-            VALUE "ProductVersion", "1.0.0.1"
+            VALUE "ProductVersion", "1.0.1.180808_Beta"
         END
     END
     BLOCK "VarFileInfo"
@@ -97,7 +97,7 @@ BEGIN_MESSAGE_MAP(CMainFrame, CFrameWnd)
 	ON_WM_TIMER()
-	ON_MESSAGE(WM_TIME_TICK, UpdateTime)
+	//ON_MESSAGE(WM_TIME_TICK, UpdateTime)
 END_MESSAGE_MAP()
 static UINT indicators[] =
@@ -180,24 +180,6 @@ void CMainFrame::Dump(CDumpContext&amp; dc) const
 // CMainFrame message handlers
-UINT TimeTick(LPVOID lParam)
-{
-	CMainFrame* pDlg = (CMainFrame*)lParam;
-	DWORD dwStart, dwStop;
-	dwStop = timeGetTime();// 起始值和终止值
-	while (TRUE)
-	{
-		dwStart = dwStop;// 上一次的终止值变成新的起始值
-		::SendMessage(pDlg->m_hWnd, WM_TIME_TICK, 0, 0);//发送消息通知对话框该更新时间了
-		do
-		{
-			dwStop = timeGetTime();
-		} while (dwStop - 1000 < dwStart);
-	}
-	return 0;
-}
-
-
 int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
 {
 	do
@@ -213,11 +195,12 @@ int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
 		if (!CreateMainFrmUI())
 			break;
-		AfxBeginThread(TimeTick, this);//这个级别高一点，用来更新时间
 		SetTimer(1, 60000, NULL);//这个级别低一点，用来从服务器获取时间
+		SetTimer(2, 1000, NULL);//每分钟更新一次时间
-		UINT nIndex = m_status_bar.CommandToIndex(ID_INDICATOR_TIME);//获取时间指示器索引  
-		m_status_bar.SetPaneText(nIndex, m_cTimeManager.GetServerTime());
+		UINT nIndex = m_status_bar.CommandToIndex(ID_INDICATOR_TIME);//获取时间指示器索引 
+		CString sTime = m_cTimeManager.GetServerTime();
+		m_status_bar.SetPaneText(nIndex, sTime);
 		return 0; // Return 0 if all succeed.
@@ -821,12 +804,16 @@ LRESULT CMainFrame::OnCrashClose(WPARAM wParam, LPARAM lParam)
 void CMainFrame::OnTimer(UINT_PTR nIDEvent)
 {
 	CString sTime;
+	UINT nIndex = m_status_bar.CommandToIndex(ID_INDICATOR_TIME);//获取时间指示器索引 
 	if (nIDEvent == 1)
 	{
 		sTime = m_cTimeManager.GetServerTime();
-		UINT nIndex = m_status_bar.CommandToIndex(ID_INDICATOR_TIME);//获取时间指示器索引  
-		m_status_bar.SetPaneText(nIndex, sTime);
 	}
+	else if (nIDEvent == 2)
+	{
+		sTime = m_cTimeManager.UpdateTime();
+	}
+	m_status_bar.SetPaneText(nIndex, sTime);
 	CFrameWnd::OnTimer(nIDEvent);
 }