diff --git a/central_clearing_system/ETradeClient.rc b/central_clearing_system/ETradeClient.rc index d625f05..de3dfbb 100644 --- a/central_clearing_system/ETradeClient.rc +++ b/central_clearing_system/ETradeClient.rc @@ -267,8 +267,8 @@ BEGIN LTEXT "",IDC_PAY_STATIC_MONEY,73,20,8,8 LTEXT "�� �룺",IDC_PAY_STATIC_PASSWORD,18,50,31,8 EDITTEXT IDC_PAY_EDIT_PASSWORD,56,46,40,14,ES_PASSWORD | ES_AUTOHSCROLL - PUSHBUTTON "��������(&X)",IDC_PAY_BUTTON_PASSWORD,151,51,71,18 - PUSHBUTTON "�ر�(&S)",IDC_PAY_BUTTON_CLOSE,155,94,67,17 + PUSHBUTTON "��������(&A)",IDC_PAY_BUTTON_PASSWORD,151,51,71,18 + PUSHBUTTON "�ر�(&X)",IDC_PAY_BUTTON_CLOSE,155,94,67,17 PUSHBUTTON "����(&F)",IDC_PAY_BUTTON_PAY,72,94,67,17 LTEXT "",IDC_PAY_STATIC_REAL_MONEY,65,20,57,8 LTEXT "",IDC_STATIC_ERROR_MSG,68,71,8,8 @@ -281,8 +281,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,0,0,6 - PRODUCTVERSION 2,0,0,6 + FILEVERSION 2,0,0,9 + PRODUCTVERSION 2,0,0,9 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -299,12 +299,12 @@ BEGIN BEGIN VALUE "CompanyName", "�������š�DILI GROUP��" VALUE "FileDescription", "���ӽ������ۺ�ҵ��ϵͳ" - VALUE "FileVersion", "2.0.0.6" - VALUE "InternalName", "Central-Clearing-System_2.0.6.181105_beta" + VALUE "FileVersion", "2.0.0.9" + VALUE "InternalName", "Central-Clearing-System_2.0.9.181109_beta" VALUE "LegalCopyright", "(C) �������š� ��������Ȩ����" - VALUE "OriginalFilename", "Central-Clearing-System_2.0.6.181105_beta" - VALUE "ProductName", "Central-Clearing-System_2.0.6.181105_beta" - VALUE "ProductVersion", "2.0.0.6" + VALUE "OriginalFilename", "Central-Clearing-System_2.0.9.181109_beta" + VALUE "ProductName", "Central-Clearing-System_2.0.9.181109_beta" + VALUE "ProductVersion", "2.0.0.9" END END BLOCK "VarFileInfo" diff --git a/central_clearing_system/ETradeClient/mfc_ui/MainFrm.cpp b/central_clearing_system/ETradeClient/mfc_ui/MainFrm.cpp index c4d68e7..9dff905 100644 --- a/central_clearing_system/ETradeClient/mfc_ui/MainFrm.cpp +++ b/central_clearing_system/ETradeClient/mfc_ui/MainFrm.cpp @@ -47,6 +47,7 @@ namespace enum ToolBarBtnID // Cannot use enum class due to TBBUTTON asks for integer. { + HOMEPAGE = 4003, RELOAD = 4000, USER_MESSAGE = 4001, USER_ACCOUNT = 4002, @@ -82,7 +83,7 @@ BEGIN_MESSAGE_MAP(CMainFrame, CFrameWnd) ON_UPDATE_COMMAND_UI(USER_MESSAGE, &CMainFrame::OnUpdateToolBarMsgCount) ON_COMMAND_RANGE(ID_ORDER, ID_LOG, OnMenuBtnClicked) - ON_COMMAND_RANGE(RELOAD, USER_ACCOUNT, OnToolBarBtnClicked) + ON_COMMAND_RANGE(RELOAD, HOMEPAGE, OnToolBarBtnClicked) ON_MESSAGE(WM_CEF_SESSION_EXPIRED, OnSessionExpired) ON_MESSAGE(WM_UPDATE_USER_MSG_COUNT,OnGotMsgCount) @@ -125,7 +126,7 @@ bool CMainFrame::Launch() void CMainFrame::UpdateStatus(LPCTSTR status) { - m_status_bar.SetPaneText(0, status); + //m_status_bar.SetPaneText(0, status); } BOOL CMainFrame::PreCreateWindow(CREATESTRUCT& cs) @@ -300,8 +301,15 @@ void CMainFrame::OnUpdateToolBarMsgCount(CCmdUI *pCmdUI) void CMainFrame::OnToolBarBtnClicked(UINT btn_id) { + CString sLog; + auto& url_cfg = URLConfig::Instance(); switch (btn_id) { + case HOMEPAGE: + sLog = _T("��ťid��HOME_PAGE"); + LOG_TRACE(sLog.GetBuffer()); + m_view.Browser().NavigateTo(url_cfg.FullHost() + url_cfg.MainPath()); + break; case RELOAD: m_view.Browser().Reload(); break; @@ -480,12 +488,12 @@ bool CMainFrame::CreateMainFrmUI() break; } - if (!m_status_bar.Create(this)) - { - LOG_ERROR(L"Failed to create status bar\n"); - break; // fail to create - } - m_status_bar.SetIndicators(indicators, sizeof(indicators) / sizeof(UINT)); + //if (!m_status_bar.Create(this)) + //{ + // LOG_ERROR(L"Failed to create status bar\n"); + // break; // fail to create + //} + //m_status_bar.SetIndicators(indicators, sizeof(indicators) / sizeof(UINT)); //@{ if (!CreateWebNaviToolBar()) @@ -507,7 +515,8 @@ bool CMainFrame::CreateMainFrmUI() } if (!m_re_bar.Create(this) || - !m_re_bar.AddBar(&m_web_navi_tlb, NULL, NULL, RBBS_NOGRIPPER) || + !m_re_bar.AddBar(&m_web_navi_tlb_home_page, NULL, NULL, RBBS_NOGRIPPER) || + !m_re_bar.AddBar(&m_web_navi_tlb_reload, NULL, NULL, RBBS_NOGRIPPER) || !m_re_bar.AddBar(&m_quick_access_tlb, NULL, NULL, RBBS_NOGRIPPER) || !m_re_bar.AddBar(&m_ex_func_tlb, NULL, NULL, RBBS_NOGRIPPER)) { @@ -516,7 +525,8 @@ bool CMainFrame::CreateMainFrmUI() } //@} - m_re_bar.GetReBarCtrl().MinimizeBand(0); + //m_re_bar.GetReBarCtrl().MinimizeBand(0); + m_re_bar.GetReBarCtrl().MaximizeBand(2); return true; } while (0); @@ -525,36 +535,72 @@ bool CMainFrame::CreateMainFrmUI() bool CMainFrame::CreateWebNaviToolBar() { - static const std::vector<std::wstring> kWebNaviIcon = { _T("reload.ico") }; - static std::vector<TBBUTTON> kWebNaviBtn = { { 0, RELOAD, TBSTATE_ENABLED, BTNS_BUTTON, 0, 0 } }; + {// HOME_PAGE BUTTON + const std::vector<std::wstring> kWebNaviIcon = { _T("home.ico") }; + std::vector<TBBUTTON> kWebNaviBtn = { + { 0, HOMEPAGE, TBSTATE_ENABLED, BTNS_BUTTON, 0, 0 } }; - if (!m_web_navi_tlb.CreateEx(this, TBSTYLE_TRANSPARENT)) - return false; // fail to create + if (!m_web_navi_tlb_home_page.CreateEx(this, TBSTYLE_TRANSPARENT)) + return false; // fail to create - if (!m_web_navi_tlb_imgs.Create(TOOLBAR_ICON_WIDTH, TOOLBAR_ICON_HEIGHT, ILC_COLOR32 | ILC_MASK, 0, 0)) - return false; + if (!m_web_navi_tlb_imgs_home_page.Create(TOOLBAR_ICON_WIDTH, TOOLBAR_ICON_HEIGHT, ILC_COLOR32 | ILC_MASK, 0, 0)) + return false; - for (const auto& icon_name : kWebNaviIcon) - { - std::wstring file_path = TOOLBAR_ICON_FOLDER + icon_name; - if (!fs::exists(file_path)) + for (const auto& icon_name : kWebNaviIcon) { - LOG_ERROR(L"ͼƬ�ļ���" + file_path + L"������, ���飡"); - return false; + std::wstring file_path = TOOLBAR_ICON_FOLDER + icon_name; + if (!fs::exists(file_path)) + { + LOG_ERROR(L"ͼƬ�ļ���" + file_path + L"������, ���飡"); + return false; + } + HICON icon = (HICON)LoadImage( + AfxGetResourceHandle(), file_path.c_str(), IMAGE_ICON, TOOLBAR_ICON_WIDTH, TOOLBAR_ICON_HEIGHT, LR_DEFAULTCOLOR | LR_LOADFROMFILE); + m_web_navi_tlb_imgs_home_page.Add(icon); } - HICON icon = (HICON)LoadImage( - AfxGetResourceHandle(), file_path.c_str(), IMAGE_ICON, TOOLBAR_ICON_WIDTH, TOOLBAR_ICON_HEIGHT, LR_DEFAULTCOLOR | LR_LOADFROMFILE); - m_web_navi_tlb_imgs.Add(icon); + + CToolBarCtrl& tbc = m_web_navi_tlb_home_page.GetToolBarCtrl(); + for (auto& btn : kWebNaviBtn) + tbc.AddButtons(1, &btn); + + tbc.SetImageList(&m_web_navi_tlb_imgs_home_page); + + const uint32_t kPaddingWidth = 10; + UpdateToolbarBtnSize(m_web_navi_tlb_home_page, kPaddingWidth); // Make sure to set toolbar button size after the button text has been set. } + {// RELOAD BUTTON + const std::vector<std::wstring> kWebNaviIcon = { _T("reload.ico") }; + std::vector<TBBUTTON> kWebNaviBtn = { + { 0, RELOAD, TBSTATE_ENABLED, BTNS_BUTTON, 0, 0 } }; - CToolBarCtrl& tbc = m_web_navi_tlb.GetToolBarCtrl(); - for (auto& btn : kWebNaviBtn) - tbc.AddButtons(1, &btn); + if (!m_web_navi_tlb_reload.CreateEx(this, TBSTYLE_TRANSPARENT)) + return false; // fail to create - tbc.SetImageList(&m_web_navi_tlb_imgs); + if (!m_web_navi_tlb_imgs_reload.Create(TOOLBAR_ICON_WIDTH, TOOLBAR_ICON_HEIGHT, ILC_COLOR32 | ILC_MASK, 0, 0)) + return false; - const uint32_t kPaddingWidth = 45; - UpdateToolbarBtnSize(m_web_navi_tlb, kPaddingWidth); // Make sure to set toolbar button size after the button text has been set. + for (const auto& icon_name : kWebNaviIcon) + { + std::wstring file_path = TOOLBAR_ICON_FOLDER + icon_name; + if (!fs::exists(file_path)) + { + LOG_ERROR(L"ͼƬ�ļ���" + file_path + L"������, ���飡"); + return false; + } + HICON icon = (HICON)LoadImage( + AfxGetResourceHandle(), file_path.c_str(), IMAGE_ICON, TOOLBAR_ICON_WIDTH, TOOLBAR_ICON_HEIGHT, LR_DEFAULTCOLOR | LR_LOADFROMFILE); + m_web_navi_tlb_imgs_reload.Add(icon); + } + + CToolBarCtrl& tbc = m_web_navi_tlb_reload.GetToolBarCtrl(); + for (auto& btn : kWebNaviBtn) + tbc.AddButtons(1, &btn); + + tbc.SetImageList(&m_web_navi_tlb_imgs_reload); + + const uint32_t kPaddingWidth = 10; + UpdateToolbarBtnSize(m_web_navi_tlb_reload, kPaddingWidth); // Make sure to set toolbar button size after the button text has been set. + } return true; } diff --git a/central_clearing_system/ETradeClient/mfc_ui/MainFrm.h b/central_clearing_system/ETradeClient/mfc_ui/MainFrm.h index 6804e64..3c87c20 100644 --- a/central_clearing_system/ETradeClient/mfc_ui/MainFrm.h +++ b/central_clearing_system/ETradeClient/mfc_ui/MainFrm.h @@ -74,11 +74,14 @@ private: std::string WinHttpGet(const std::string& url_path) const; private: - CStatusBar m_status_bar; + //CStatusBar m_status_bar; CETradeClientView m_view; - CToolBar m_web_navi_tlb; - CImageList m_web_navi_tlb_imgs; + CToolBar m_web_navi_tlb_home_page; + CImageList m_web_navi_tlb_imgs_home_page; + + CToolBar m_web_navi_tlb_reload; + CImageList m_web_navi_tlb_imgs_reload; CToolBar m_quick_access_tlb; CImageList m_quick_access_tlb_imgs; diff --git a/central_clearing_system/Resource/Toolbar/home.ico b/central_clearing_system/Resource/Toolbar/home.ico new file mode 100644 index 0000000..e479b96 Binary files /dev/null and b/central_clearing_system/Resource/Toolbar/home.ico differ diff --git a/central_clearing_system/res/ETradeClient.ico b/central_clearing_system/res/ETradeClient.ico index e8570c2..fb91230 100644 Binary files a/central_clearing_system/res/ETradeClient.ico and b/central_clearing_system/res/ETradeClient.ico differ diff --git a/doc/各市场版本/卡务客户端正式版-20171031.zip b/doc/各市场版本/卡务客户端正式版-20171031.zip new file mode 100644 index 0000000..117bb21 Binary files /dev/null and b/doc/各市场版本/卡务客户端正式版-20171031.zip differ diff --git a/doc/各市场版本/卡务客户端正式版-非沈阳市场-20170927.zip b/doc/各市场版本/卡务客户端正式版-非沈阳市场-20170927.zip new file mode 100644 index 0000000..2a93d55 Binary files /dev/null and b/doc/各市场版本/卡务客户端正式版-非沈阳市场-20170927.zip differ diff --git a/doc/各市场版本/各市场版本.txt b/doc/各市场版本/各市场版本.txt new file mode 100644 index 0000000..7772ec5 --- /dev/null +++ b/doc/各市场版本/各市场版本.txt @@ -0,0 +1,7 @@ +�����г�-����20170927 +�����г�-����20170927 +�����г�-����20170927 +ĵ�����г�-����20170927 +��������г�-����20170927 +�����г�-����20171031 +�����г�-�̻���20171120 \ No newline at end of file diff --git a/doc/各市场版本/商户客户端正式版-20171120.zip b/doc/各市场版本/商户客户端正式版-20171120.zip new file mode 100644 index 0000000..60b8ff2 Binary files /dev/null and b/doc/各市场版本/商户客户端正式版-20171120.zip differ diff --git a/etrade_card_client/ETradeClient.rc b/etrade_card_client/ETradeClient.rc index a98607a..c24f3f0 100644 --- a/etrade_card_client/ETradeClient.rc +++ b/etrade_card_client/ETradeClient.rc @@ -245,8 +245,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,0,0,4 - PRODUCTVERSION 1,0,0,4 + FILEVERSION 1,0,0,5 + PRODUCTVERSION 1,0,0,5 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -263,12 +263,12 @@ BEGIN BEGIN VALUE "CompanyName", "�������š�DILI GROUP��" VALUE "FileDescription", "���ӽ������Աϵͳ��ETradeClient��" - VALUE "FileVersion", "1.0.0.4" - VALUE "InternalName", "ETradeClient.exe" + VALUE "FileVersion", "1.0.0.5" + VALUE "InternalName", "1.0.5.181108_���ӽ������Աϵͳ_beta" VALUE "LegalCopyright", "(C) �������š� ��������Ȩ����" - VALUE "OriginalFilename", "ETradeClient.exe" + VALUE "OriginalFilename", "1.0.5.181108_���ӽ������Աϵͳ_beta" VALUE "ProductName", "���ӽ������Աϵͳ" - VALUE "ProductVersion", "1.0.4.181030_Release" + VALUE "ProductVersion", "1.0.5.181108_���ӽ������Աϵͳ_beta" END END BLOCK "VarFileInfo" diff --git a/etrade_card_client/ETradeClient.vcxproj b/etrade_card_client/ETradeClient.vcxproj index 31f2d4e..21cf3da 100644 --- a/etrade_card_client/ETradeClient.vcxproj +++ b/etrade_card_client/ETradeClient.vcxproj @@ -47,6 +47,7 @@ <LinkIncremental>true</LinkIncremental> <LibraryPath>$(ProjectDir)\ExLib\hardware\id_card_reader;$(ProjectDir)\ExLib\hardware\dili_card_device;D:\GitProject\etradeclient\etrade_card_client;$(LibraryPath)</LibraryPath> <LibraryWPath>$(LibraryWPath)</LibraryWPath> + <TargetName>电子交易结算柜员系统_beta</TargetName> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <LinkIncremental>false</LinkIncremental> diff --git a/etrade_card_client/res/ETradeClient.ico b/etrade_card_client/res/ETradeClient.ico index 65f51e7..fb91230 100644 Binary files a/etrade_card_client/res/ETradeClient.ico and b/etrade_card_client/res/ETradeClient.ico differ diff --git a/etrade_card_client/res/ETradeClient.ico-- b/etrade_card_client/res/ETradeClient.ico-- deleted file mode 100644 index ef8c1ad..0000000 Binary files a/etrade_card_client/res/ETradeClient.ico-- and /dev/null differ