Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

额 消息和UT都在我的master分支上 #52

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Client/Client/FrameWork/FrameWork.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "stdafx.h"
#include "FrameWork.h"
#include "Factory.h"

//
CFrameWork::CFrameWork()
{

Expand Down Expand Up @@ -222,7 +222,7 @@ VOID CFrameWork::_GetModulesListenList(FrameModule module)
VOID CFrameWork::_InitUILib()
{
BkFontPool::SetDefaultFont(_T("Courier New"), -12);
BkSkin::LoadSkins(IDR_XML_SKIN_DEF);
BkSkin::LoadSkins(IDR_BK_SKIN_DEF);
BkStyle::LoadStyles(IDR_BK_STYLE_DEF);
CString strPath;
GetModuleFileName(nullptr,strPath.GetBuffer(MAX_PATH),MAX_PATH);
Expand Down
81 changes: 28 additions & 53 deletions Client/Client/GUI/BKWin/bkres/bkwinres.rc2
Original file line number Diff line number Diff line change
@@ -1,68 +1,43 @@
#pragma once

DEFINE_XML(IDR_XML_SKIN_DEF, 100, "../res/def_skin.xml")
DEFINE_XML(IDR_BK_STYLE_DEF, 101, "../res\\def_style.xml")
DEFINE_XML(IDR_BK_STRING_DEF, 102, "../res\\def_string.xml")
DEFINE_XML(IDR_BK_MAIN_DIALOG, 103, "../res\\dlg_main.xml")
DEFINE_XML(IDR_BK_MESSAGEBOX, 105, "../res\\dlg_msgbox.xml")
DEFINE_XML(IDR_BK_RUNOPT_LIST, 128, "../res\\dlg_runopt_list.xml")
DEFINE_XML(IDR_BK_RUNOPT_IGNORE_DLG, 134, "../res\\dlg_runopt_ignore.xml")
DEFINE_XML(IDR_BK_MESSAGEBOX2, 150, "../res\\dlg_msgbox2.xml")
DEFINE_XML(IDR_BK_SYSOPT_SETTING_DLG, 152, "../res\\dlg_sysopt_setting.xml")

// dlgfile ��ǩ������ļ�
DEFINE_XML(IDR_BK_DLGFILE_OPT, 504, "../res\\dlgfile_opt.xml")
DEFINE_XML(IDR_BK_DLGFILE_FOOT, 508, "../res\\dlgfile_foot.xml")
DEFINE_XML(IDR_BK_DLGFILE_HEADER, 509, "../res\\dlgfile_header.xml")

DEFINE_XML(IDR_BK_MORE_BKWIN, 600, "../res\\dlg_more_bkwin.xml")
/////////////////////////////////////////////////////////////////////////
// XML

DEFINE_XML(IDR_BK_SKIN_DEF, 100, "../res\\def_skin.xml")
DEFINE_XML(IDR_BK_STYLE_DEF, 101, "../res\\def_style.xml")
DEFINE_XML(IDR_BK_STRING_DEF, 102, "../res\\def_string.xml")
DEFINE_XML(IDR_BK_MAIN_DIALOG, 103, "../res\\dlg_main.xml")

//////////////////////////////////////////////////////////////////////////
// ICON
// BITMAP

DEFINE_ICO(IDI_BEIKESAFE, 100, "../res\\beikesafe.ico")
DEFINE_ICO(IDI_SMALL, 101, "../res\\small.ico")

//////////////////////////////////////////////////////////////////////////
// PNG
DEFINE_PNG(IDP_PNG_STATUS15, 40, "../res\\status_icon.png")
DEFINE_PNG(IDP_PNG_EXAM_STATUS15, 41, "../res\\exam_status_icon.png")
DEFINE_PNG(IDB_BTN_SYS_CLOSE_PNG, 44, "../res\\btn_sys_close.png")
DEFINE_PNG(IDB_BTN_SYS_MAXIMIZE_PNG, 46, "../res\\btn_sys_maximize.png")
DEFINE_PNG(IDB_BTN_SYS_MINIMIZE_PNG, 47, "../res\\btn_sys_minimize.png")
DEFINE_PNG(IDB_BTN_SYS_RESTORE_PNG, 48, "../res\\btn_sys_restore.png")
DEFINE_BMP(IDB_MSGBOX_BG, 4, "../res\\msgbox_bg.bmp")
DEFINE_BMP(IDB_TAB_NORMAL, 6, "../res\\tab_normal.bmp")
DEFINE_BMP(IDB_STATUS_40, 15, "../res\\status_40.bmp")
DEFINE_BMP(IDB_TAB_LEFT, 16, "../res\\tab_left.bmp")
DEFINE_BMP(IDB_TAB_LEFT_SPLITTER, 17, "../res\\tab_left_splitter.bmp")
DEFINE_BMP(IDB_BTN_VIRSCAN_BG, 27, "../res\\btn_virscan_bg.bmp")
DEFINE_BMP(IDP_BG_MSGBOX_BODY, 29, "../res\\msgbox_body_bg.bmp")
DEFINE_BMP(IDB_BTN_SYS_CLOSE, 101, "../res\\btn_sys_close.bmp")
DEFINE_BMP(IDB_BTN_SYS_MAXIMIZE, 103, "../res\\btn_sys_maximize.bmp")
DEFINE_BMP(IDB_BTN_SYS_MINIMIZE, 104, "../res\\btn_sys_minimize.bmp")
DEFINE_BMP(IDB_BTN_SYS_RESTORE, 105, "../res\\btn_sys_restore.bmp")
DEFINE_BMP(IDB_MSGBOX_BG, 70, "../res\\msgbox_bg.bmp")
DEFINE_BMP(IDB_MSG_BODY, 71, "../res\\msgbox_body_bg.bmp")
DEFINE_BMP(IDB_FRAME_PANEL_GRAY, 106, "../res\\frame_panel_gray.bmp")
DEFINE_BMP(IDB_FRAME_PANEL, 107, "../res\\frame_panel.bmp")
DEFINE_BMP(IDB_STATUS_ICON, 111, "../res\\status_icon.bmp")
DEFINE_BMP(IDB_SCAN_RESULT_LIST_BAR, 122, "../res\\scan_result_list_bar.bmp")
DEFINE_PNG(IDP_LITTLE_LOGO, 201, "../res\\little_logo.png")
DEFINE_BMP(IDB_BITMAP_LISTCTRL_HEADER, 210, "../res\\listctrl_header.bmp")
DEFINE_BMP(IDB_BITMAP_MINUS_PLUS, 212, "../res\\minus_plus.bmp")
DEFINE_BMP(IDB_BITMAP_LISTCTRL_CHECK, 211, "../res\\listctrl_check.bmp")
DEFINE_BMP(IDB_BITMAP_MINUS_PLUS, 212, "../res\\minus_plus.bmp")
DEFINE_BMP(IDB_BITMAP_LISTCTRL_RADIO, 213, "../res\\listctrl_radio.bmp")
DEFINE_PNG(IDP_ROOMLIST_PANE, 214, "../res\\frame_roomlistpane.png")
DEFINE_PNG(IDP_LOADINFO_TIP, 8020, "../res\\loadinfo_tip_softmgr.png")
DEFINE_BMP(IDB_SOFTMGR_CLEAR_BK, 8034, "../res\\clear_bk.bmp")
DEFINE_BMP(IDB_SYSOPT_LIST_HEADERBK, 8035, "../res\\sysopt_listbk.bmp")
DEFINE_BMP(IDB_LOADINFO_DLGBK, 8036, "../res\\loadinfo_dlgbk.bmp")

//////////////////////////////////////////////////////////////////////////
// ����
DEFINE_BMP(IDB_RUNOPT_STATUS, 20007, "../res\\stat_runopt.bmp")
DEFINE_PNG(IDP_RUNOPT_LOADING_TIP, 20008, "../res\\loading_runopt.png")
DEFINE_BMP(IDB_RUNOPT_LIST_HEADER, 20010, "../res\\runopt_listheader.bmp")
DEFINE_BMP(IDB_RUNOPT_PANEL_DELAY, 20011, "../res\\loaddlg_panel.bmp")
DEFINE_PNG(IDP_RUNOPT_STARTUPTIME_SETTING, 20012, "../res\\startuptime_setting.png")
DEFINE_PNG(IDP_RUNOPT_IGNORE_TIP, 20013, "../res\\ignore_tip.png")
// ICON

DEFINE_ICO(IDI_BEIKESAFE, 100, "..\\res\\beikesafe.ico")
DEFINE_ICO(IDI_SMALL, 101, "..\\res\\beikesafe.ico")

//////////////////////////////////////////////////////////////////////////
// PNG

DEFINE_PNG(IDP_LOGO_MODULE, 3, "..\\res\\logo_module.png")
DEFINE_PNG(IDB_BTN_SYS_CLOSE, 101, "..\\res\\btn_sys_close.png")
DEFINE_PNG(IDB_BTN_SYS_CLOSE_PNG, 102, "..\\res\\btn_sys_close.png")
DEFINE_PNG(IDB_TAB_MAIN, 103, "..\\res\\tab_main.png")
DEFINE_PNG(IDB_LITTLE_LOOGO, 108, "..\\res\\little_logo.png")
DEFINE_PNG(TAB_MAIN_SPLITTER, 200, "..\\res\\tab_main_splitter.png")
DEFINE_PNG(SEARCH, 201, "..\\res\\search.png")

//////////////////////////////////////////////////////////////////////////
// BMP
2 changes: 1 addition & 1 deletion Client/Client/GUI/RoomListWin/BKWinRoomList.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ void CRoomListWnd::OnBkBtnClose()

void CRoomListWnd::OnShowWnd( XMessage* pmsg )
{
DoModal();
DoModal();
}


Expand Down
87 changes: 31 additions & 56 deletions Client/Client/GUI/bkwinres.rc2
Original file line number Diff line number Diff line change
@@ -1,68 +1,43 @@
#pragma once

DEFINE_XML(IDR_XML_SKIN_DEF, 100, "res/def_skin.xml")
DEFINE_XML(IDR_BK_STYLE_DEF, 101, "res\\def_style.xml")
DEFINE_XML(IDR_BK_STRING_DEF, 102, "res\\def_string.xml")
DEFINE_XML(IDR_BK_MAIN_DIALOG, 103, "res\\dlg_main.xml")
DEFINE_XML(IDR_BK_MESSAGEBOX, 105, "res\\dlg_msgbox.xml")
DEFINE_XML(IDR_BK_RUNOPT_LIST, 128, "res\\dlg_runopt_list.xml")
DEFINE_XML(IDR_BK_RUNOPT_IGNORE_DLG, 134, "res\\dlg_runopt_ignore.xml")
DEFINE_XML(IDR_BK_MESSAGEBOX2, 150, "res\\dlg_msgbox2.xml")
DEFINE_XML(IDR_BK_SYSOPT_SETTING_DLG, 152, "res\\dlg_sysopt_setting.xml")

// dlgfile ��ǩ������ļ�
DEFINE_XML(IDR_BK_DLGFILE_OPT, 504, "res\\dlgfile_opt.xml")
DEFINE_XML(IDR_BK_DLGFILE_FOOT, 508, "res\\dlgfile_foot.xml")
DEFINE_XML(IDR_BK_DLGFILE_HEADER, 509, "res\\dlgfile_header.xml")
/////////////////////////////////////////////////////////////////////////
// XML

DEFINE_XML(IDR_BK_MORE_BKWIN, 600, "res\\dlg_more_bkwin.xml")
DEFINE_XML(IDR_BK_SKIN_DEF, 100, "res\\def_skin.xml")
DEFINE_XML(IDR_BK_STYLE_DEF, 101, "res\\def_style.xml")
DEFINE_XML(IDR_BK_STRING_DEF, 102, "res\\def_string.xml")
DEFINE_XML(IDR_BK_MAIN_DIALOG, 103, "res\\dlg_main.xml")

//////////////////////////////////////////////////////////////////////////
// BITMAP


DEFINE_BMP(IDB_TAB_NORMAL, 6, "res\\tab_normal.bmp")
DEFINE_BMP(IDB_MSGBOX_BG, 70, "res\\msgbox_bg.bmp")
DEFINE_BMP(IDB_MSG_BODY, 71, "res\\msgbox_body_bg.bmp")
DEFINE_BMP(IDB_FRAME_PANEL_GRAY, 106, "res\\frame_panel_gray.bmp")
DEFINE_BMP(IDB_FRAME_PANEL, 107, "res\\frame_panel.bmp")
DEFINE_BMP(IDB_BITMAP_LISTCTRL_HEADER, 210, "res\\listctrl_header.bmp")
DEFINE_BMP(IDB_BITMAP_LISTCTRL_CHECK, 211, "res\\listctrl_check.bmp")
DEFINE_BMP(IDB_BITMAP_MINUS_PLUS, 212, "res\\minus_plus.bmp")
DEFINE_BMP(IDB_BITMAP_LISTCTRL_RADIO, 213, "res\\listctrl_radio.bmp")

//////////////////////////////////////////////////////////////////////////
// ICON

DEFINE_ICO(IDI_BEIKESAFE, 100, "res\\beikesafe.ico")
DEFINE_ICO(IDI_SMALL, 101, "res\\small.ico")
DEFINE_ICO(IDI_BEIKESAFE, 100, "res\\beikesafe.ico")
DEFINE_ICO(IDI_SMALL, 101, "res\\beikesafe.ico")

//////////////////////////////////////////////////////////////////////////
// PNG
DEFINE_PNG(IDP_PNG_STATUS15, 40, "res\\status_icon.png")
DEFINE_PNG(IDP_PNG_EXAM_STATUS15, 41, "res\\exam_status_icon.png")
DEFINE_PNG(IDB_BTN_SYS_CLOSE_PNG, 44, "res\\btn_sys_close.png")
DEFINE_PNG(IDB_BTN_SYS_MAXIMIZE_PNG, 46, "res\\btn_sys_maximize.png")
DEFINE_PNG(IDB_BTN_SYS_MINIMIZE_PNG, 47, "res\\btn_sys_minimize.png")
DEFINE_PNG(IDB_BTN_SYS_RESTORE_PNG, 48, "res\\btn_sys_restore.png")
DEFINE_BMP(IDB_MSGBOX_BG, 4, "res\\msgbox_bg.bmp")
DEFINE_BMP(IDB_TAB_NORMAL, 6, "res\\tab_normal.bmp")
DEFINE_BMP(IDB_STATUS_40, 15, "res\\status_40.bmp")
DEFINE_BMP(IDB_TAB_LEFT, 16, "res\\tab_left.bmp")
DEFINE_BMP(IDB_TAB_LEFT_SPLITTER, 17, "res\\tab_left_splitter.bmp")
DEFINE_BMP(IDB_BTN_VIRSCAN_BG, 27, "res\\btn_virscan_bg.bmp")
DEFINE_BMP(IDP_BG_MSGBOX_BODY, 29, "res\\msgbox_body_bg.bmp")
DEFINE_BMP(IDB_BTN_SYS_CLOSE, 101, "res\\btn_sys_close.bmp")
DEFINE_BMP(IDB_BTN_SYS_MAXIMIZE, 103, "res\\btn_sys_maximize.bmp")
DEFINE_BMP(IDB_BTN_SYS_MINIMIZE, 104, "res\\btn_sys_minimize.bmp")
DEFINE_BMP(IDB_BTN_SYS_RESTORE, 105, "res\\btn_sys_restore.bmp")
DEFINE_BMP(IDB_FRAME_PANEL_GRAY, 106, "res\\frame_panel_gray.bmp")
DEFINE_BMP(IDB_FRAME_PANEL, 107, "res\\frame_panel.bmp")
DEFINE_BMP(IDB_STATUS_ICON, 111, "res\\status_icon.bmp")
DEFINE_BMP(IDB_SCAN_RESULT_LIST_BAR, 122, "res\\scan_result_list_bar.bmp")
DEFINE_PNG(IDP_LITTLE_LOGO, 201, "res\\little_logo.png")
DEFINE_BMP(IDB_BITMAP_LISTCTRL_HEADER, 210, "res\\listctrl_header.bmp")
DEFINE_BMP(IDB_BITMAP_MINUS_PLUS, 212, "res\\minus_plus.bmp")
DEFINE_BMP(IDB_BITMAP_LISTCTRL_CHECK, 211, "res\\listctrl_check.bmp")
DEFINE_BMP(IDB_BITMAP_LISTCTRL_RADIO, 213, "res\\listctrl_radio.bmp")
DEFINE_PNG(IDP_ROOMLIST_PANE, 214, "res\\frame_roomlistpane.png")
DEFINE_PNG(IDP_LOADINFO_TIP, 8020, "res\\loadinfo_tip_softmgr.png")
DEFINE_BMP(IDB_SOFTMGR_CLEAR_BK, 8034, "res\\clear_bk.bmp")
DEFINE_BMP(IDB_SYSOPT_LIST_HEADERBK, 8035, "res\\sysopt_listbk.bmp")
DEFINE_BMP(IDB_LOADINFO_DLGBK, 8036, "res\\loadinfo_dlgbk.bmp")
// PNG

DEFINE_PNG(IDP_LOGO_MODULE, 3, "res\\logo_module.png")
DEFINE_PNG(IDB_BTN_SYS_CLOSE, 101, "res\\btn_sys_close.png")
DEFINE_PNG(IDB_BTN_SYS_CLOSE_PNG, 102, "res\\btn_sys_close.png")
DEFINE_PNG(IDB_TAB_MAIN, 103, "res\\tab_main.png")
DEFINE_PNG(IDB_LITTLE_LOOGO, 108, "res\\little_logo.png")
DEFINE_PNG(TAB_MAIN_SPLITTER, 200, "res\\tab_main_splitter.png")
DEFINE_PNG(SEARCH, 201, "res\\search.png")

//////////////////////////////////////////////////////////////////////////
// ����
DEFINE_BMP(IDB_RUNOPT_STATUS, 20007, "res\\stat_runopt.bmp")
DEFINE_PNG(IDP_RUNOPT_LOADING_TIP, 20008, "res\\loading_runopt.png")
DEFINE_BMP(IDB_RUNOPT_LIST_HEADER, 20010, "res\\runopt_listheader.bmp")
DEFINE_BMP(IDB_RUNOPT_PANEL_DELAY, 20011, "res\\loaddlg_panel.bmp")
DEFINE_PNG(IDP_RUNOPT_STARTUPTIME_SETTING, 20012, "res\\startuptime_setting.png")
DEFINE_PNG(IDP_RUNOPT_IGNORE_TIP, 20013, "res\\ignore_tip.png")
// BMP
30 changes: 28 additions & 2 deletions Client/Client/Resource/NewMsgdef.xml
Original file line number Diff line number Diff line change
@@ -1,22 +1,28 @@
<vnoc>
<msg name="MSG_RequestQueryServer" id="1100">
</msg>

<msg name="MSG_AnswerQueryServer" id="1101">
</msg>


<msg name="MSG_RequestRegister" id="2100">
<item mtype="data" name="Rank" type="uint8" />
<item mtype="data" name="Nickname" type="string" />
<item mtype="data" name="Autograph" type="string" />
<item mtype="data" name="HeadForm" type="uint8" />
<item mtype="data" name="HeadPortrait" type="string" />
<item mtype="data" name="EmailAddress" type="string" />
<item mtype="data" name="Age" type="uint8" />
<item mtype="data" name="Birthday" type="string" />
<item mtype="data" name="PersonalExplanation" type="string" />
</msg>

<msg name="MSG_AnswerRegister" id="2101">
<item mtype="data" name="RetTag" type="uint32" />
</msg>


<msg name="MSG_RequestVerificationCode" id="3101">
<item mtype="data" name="MachineAddress" type="string" />
</msg>
Expand All @@ -27,6 +33,7 @@
<item mtype="data" name="Captcha" type="string" />
</msg>


<msg name="MSG_RequestLogin" id="4101">
<item mtype="data" name="VerificationCode" type="string" />
<item mtype="data" name="AccountNumber" type="string" />
Expand All @@ -39,6 +46,7 @@
<item mtype="data" name="ATLGUID" type="string" />
</msg>


<msg name="MSG_RequestProfileSync" id="5101">
<item mtype="data" name="Rank" type="uint8" />
<item mtype="data" name="Nickname" type="string" />
Expand All @@ -51,17 +59,21 @@
<item mtype="data" name="MessageSynchro" type="string" />
</msg>


<msg name="MSG_RequestClassSync" id="6101">
</msg>

<msg name="MSG_AnswerClassSync" id="6102">
</msg>


<msg name="MSG_RequestClassSyncResult" id="6103">
</msg>

<msg name="MSG_AnswerClassSyncResult" id="6104">
</msg>


<msg name="MSG_RequestClassList" id="6105">
<item mtype="data" name="UserType" type="uint32" />
</msg>
Expand All @@ -72,18 +84,32 @@
<item mtype="list" name="RoomStateList" type="uint32" />
</msg>


<msg name="MSG_RequestClassInfo" id="6107">
<item mtype="data" name="RoomID" type="uint32" />
</msg>

<msg name="MSG_AnswerClassInfo" id="6108">
<item mtype="data" name="RoomID" type="uint32" />
<item mtype="data" name="RoomType" type="uint32" />
<item mtype="data" name="RoomName" type="string" />
<item mtype="data" name="RoomRank" type="uint32" />
<item mtype="data" name="RoomState" type="uint32" />
<item mtype="data" name="RoomPassword" type="string" />
<item mtype="data" name="RoomPeopleNumMax" type="uint32" />
<item mtype="data" name="RoomPeopleCurNum" type="uint32" />
<item mtype="list" name="RoomPeopleListId" type="uint32" />
<item mtype="data" name="RoomManageId" type="uint32" />
<item mtype="data" name="RoomMasterId" type="uint32" />
</msg>


<msg name="MSG_RequestEnterClassroom" id="6109">
<item mtype="data" name="VerificationCode" type="string" />
<item mtype="data" name="RoomID" type="uint32" />
<item mtype="data" name="RoomPassword" type="string" />
</msg>

<msg name="MSG_AnswerEnterClassroom" id="6110">
<item mtype="data" name="RetTag" type="uint32" />
</msg>

</vnoc>
2 changes: 1 addition & 1 deletion Client/res/LoginWin.xml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<layer title="VNOC LoginWin" width="250" height="800" appwin="1" resize="0"> <header class="msgboxhead" width="full" height="26"> <icon src="101" pos="5,6"/> <text class="dlgtitle" pos="25,8">VNOC</text> <imgbtn id="10001" class="linkimage" skin="closebtn" pos="-43,0"/> </header> <!-- <footer class="mainfoot" width="full" height="23"> <dlgfile pos="0,0,-0,-0" src="508" /> </footer> --> <body class="dlgfoot" width="full" height="full"> <dlgfile pos="5,0,-5,-5" src="LoginWin_Body.xml" /> </body></layer>
<?xml version="1.0" encoding="utf-8"?><layer title="VNOC LoginWin" width="250" height="800" appwin="1" resize="0"> <header class="msgboxhead" width="full" height="26"> <icon src="101" pos="5,6"/> <text class="dlgtitle" pos="25,8">VNOC</text> <imgbtn id="10001" class="linkimage" skin="closebtn" pos="-43,0"/> </header> <footer class="msgboxfoot" width="full" height="24"> </footer> <body class="msgboxbody" width="full" height="full"> <dlg pos="5,0,-5,-5"> <text pos="10,203">帐号:</text> <edit id="10100" pos="10,220,235,250" show="1"/> <text pos="10,263">密码:</text> <edit id="10101" pos="10,280,235,310" show="1" password="1"/> <check id ="10111" pos="15,355">记住密码</check> <check id ="11000" pos="15,375">自动登录</check> <richtext pos="11,327,43,347" class="richtext">状态:</richtext> <button id="10110" class="normalbtn" pos="55,410,125,448">登录</button> </dlg> </body></layer>
Expand Down
Loading