Commit f24b29364f20f3864dcc80d971466fb62dc95d68

Authored by liuye
1 parent c98319ae

bugfix<auto-updata>:修复自动升级时弹窗的问题

Signed-off-by: liuye <liuye@diligrp.com>
Showing 100 changed files with 9 additions and 16 deletions

Too many changes to show.

To preserve performance only 100 of 162 files are displayed.

client_auto_updata/AutoUpdate/AutoUpdate.cpp
@@ -115,7 +115,14 @@ BOOL CAUAutoUpdateApp::InitInstance() @@ -115,7 +115,14 @@ BOOL CAUAutoUpdateApp::InitInstance()
115 Log("已经是最新版本。"); 115 Log("已经是最新版本。");
116 break; 116 break;
117 } 117 }
  118 +
  119 + if (IDCANCEL == AfxMessageBox(("检查到有新版本,是否升级?"), MB_OKCANCEL))
  120 + {
  121 + Log("暂不升级。");
  122 + break;
  123 + }
118 124
  125 + Log("确认升级。");
119 m_pMainWnd = &dlgUpdate; 126 m_pMainWnd = &dlgUpdate;
120 INT_PTR nResponse = dlgUpdate.DoModal(); 127 INT_PTR nResponse = dlgUpdate.DoModal();
121 if (nResponse == IDOK) 128 if (nResponse == IDOK)
client_auto_updata/AutoUpdate/AutoUpdateDlg.cpp
@@ -61,20 +61,9 @@ BOOL CAUAutoUpdateDlg::OnInitDialog() @@ -61,20 +61,9 @@ BOOL CAUAutoUpdateDlg::OnInitDialog()
61 SetIcon(m_hIcon, TRUE); // 设置大图标 61 SetIcon(m_hIcon, TRUE); // 设置大图标
62 SetIcon(m_hIcon, FALSE); // 设置小图标 62 SetIcon(m_hIcon, FALSE); // 设置小图标
63 63
64 - ShowWindow(SW_HIDE); 64 + SetUpdateView();
  65 + AfxBeginThread(Updata, NULL, THREAD_PRIORITY_NORMAL, 0, 0, NULL);
65 66
66 - if (IDOK == MessageBox(_T("检查到有新版本,是否升级?"), _T("版本升级"), MB_OKCANCEL))  
67 - {  
68 - Log("确认升级。");  
69 - SetUpdateView();  
70 - AfxBeginThread(Updata, NULL, THREAD_PRIORITY_NORMAL, 0, 0, NULL);  
71 - }  
72 - else  
73 - {  
74 - Log("暂不升级。");  
75 - SendMessage(WM_CLOSE);  
76 - }  
77 -  
78 return TRUE; // 除非将焦点设置到控件,否则返回 TRUE 67 return TRUE; // 除非将焦点设置到控件,否则返回 TRUE
79 } 68 }
80 69
doc/各市场版本/20181116/综合业务系统/Config/application_config deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Config/menu_res_auth_cfg deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Config/url_cfg deleted 100644 → 0
1 -`®˜ÍDÌgýiŶ"X ©—ß3ŒHç[i*­°Í·dx–X Ž²*7/B¤ÁžUø´>C“ž…èd F9WîˆF³'ƒå  
2 -t)MpEOÄwOï+ Gâïvž¢+oãLYGyìÔYC¹ $‰Íì/_Jh‘íÒüM•,ߊB÷@@„;q¼;u0o„Ÿƒ5Z5u ˜kŠŠì¶î4ô*Û¤´O/óÚ¾A”˜ô1ÕˆÎåaœAêÜæcAª% ›š\æ±'7çÕG©Áo Ô…ÍÄø¶ªVqö¾’ kÞöÛýqsµ3¾¿e¿&òMcc;vÚÂ-!T³¦&¯=WryªŠÊ:çüÍ;Q4,åq^K“ÆAÑ :s“èñF!m(7wfEEò+²TžR¸uác°PÅߤî>ÔN}èY–Í4΃*kÒÏrM^nGÙ²¾œ}2™& Q~÷æÌâû«98Æ ²@WU´Ãñ!]ÉÇù>(× Œ„•ô?®Ìë>¬ç:kR=jªvÞ,¾\né+þ8£²è(+Ü\^ºÖX”½Ô¸«# ¨Ë]ˆãè®û~RWb è%Ã;Dû…ãÞË,㪵 TŽ Šø5ªøfÙ«´¥tscÿök®úÊÑࢯË}  
3 -é”t'®KHhbÇi3 ÌåÊý,tΪº96_–wû…AˆÏÝb­FìÀwN”{8)†Òp60Z(YÄIQ¢ÍqºRV=[gËŒø׉O“q#:#‚à"Ù1wT؆íìRò}ß(½SSÂ’ßp›{óõ –%ÚÐ6lßQ[ëâиóD„ÿ¶³¤˜‰1öDÃÍ䞢zۜƲÿ0_=ícbø–£$£Ë ãÊv¼IŠB:ù«DB~Y*'»=Å>3“Ë°qÊ®]oiï㸂Ջ  
4 \ No newline at end of file 0 \ No newline at end of file
doc/各市场版本/20181116/综合业务系统/Resource/APP.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/INSTALL.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Login/batton.png deleted 100644 → 0

2.26 KB

doc/各市场版本/20181116/综合业务系统/Resource/Login/error.bmp deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Login/error.png deleted 100644 → 0

1.06 KB

doc/各市场版本/20181116/综合业务系统/Resource/Login/hover.png deleted 100644 → 0

2.26 KB

doc/各市场版本/20181116/综合业务系统/Resource/Login/login-bg.png deleted 100644 → 0

86.8 KB

doc/各市场版本/20181116/综合业务系统/Resource/Menu/about.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Menu/agreement.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Menu/buckle-list.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Menu/cash_recharge.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Menu/cash_withdraw.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Menu/cate_manage.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Menu/change_card.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Menu/comm_distrib.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Menu/comm_regist.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Menu/consign_manage.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Menu/copy.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Menu/credit_sale_white_list.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Menu/credt.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Menu/customer_query.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Menu/cut.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Menu/exit.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Menu/fee_payment.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Menu/issue_anonymous_card.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Menu/issue_master_card.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Menu/issue_slave_card.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Menu/log.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Menu/manage_bank_card.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Menu/modify_account_pwd.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Menu/modify_card_pwd.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Menu/modify_cfg.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Menu/oper_log_query.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Menu/order.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Menu/order_manage.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Menu/para.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Menu/paste.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Menu/pay-black-list.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Menu/pay-mode.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Menu/pay-white-list.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Menu/place_an_order.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Menu/point_rule.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Menu/query_manage.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Menu/report_card_loss.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Menu/reset_card_pwd.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Menu/reset_pwd.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Menu/restore_card_loss.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Menu/return_card.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Menu/role.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Menu/role_manage.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Menu/set_card_auth.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Menu/settle_accounts_apply.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Menu/settle_manage.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Menu/special_handle.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Menu/statement_manage.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Menu/trade.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Menu/unlock_card.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Menu/user.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Menu/user_manage.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Toolbar/agreement.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Toolbar/cash_recharge.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Toolbar/cash_withdraw.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Toolbar/cate_manage.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Toolbar/comm_distrib.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Toolbar/comm_regist.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Toolbar/consign_manage.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Toolbar/credt.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Toolbar/exit.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Toolbar/home.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Toolbar/issue_anonymous_card.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Toolbar/issue_master_card.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Toolbar/issue_slave_card.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Toolbar/log.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Toolbar/message.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Toolbar/message_d.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Toolbar/modify_account_pwd.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Toolbar/modify_pwd.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Toolbar/order.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Toolbar/order_manage.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Toolbar/para.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Toolbar/place_an_order.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Toolbar/point_rule.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Toolbar/query_manage.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Toolbar/reload.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Toolbar/role.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Toolbar/role_manage.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Toolbar/settle_accounts_apply.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Toolbar/settle_manage.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Toolbar/special_handle.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Toolbar/statement_manage.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Toolbar/trade.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Toolbar/user.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Toolbar/user_d.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/Resource/Toolbar/user_manage.ico deleted 100644 → 0
No preview for this file type
doc/各市场版本/20181116/综合业务系统/cef/Resources/cef.pak deleted 100644 → 0
No preview for this file type