Changeset 27 in chevmsgr

Timestamp:

11/29/15 21:05:47 (8 years ago)

Author:

cheese

Message:

UI
1:1 구현

Location:

trunk/msvc14/ChevMsgrClient_MFC

Files:

• AddFriendDlg.cpp (modified) (2 diffs)
• AddFriendDlg.h (modified) (2 diffs)
• AddGroupChat.cpp (modified) (2 diffs)
• AddGroupChat.h (modified) (2 diffs)
• ChevMsgrClient_MFCDlg.cpp (modified) (3 diffs)
• ChevMsgrClient_MFCDlg.h (modified) (3 diffs)
• Resource.h (modified) ( previous)

trunk/msvc14/ChevMsgrClient_MFC/AddFriendDlg.cpp

@@ -6 +6 @@
 #include "AddFriendDlg.h"
 #include "afxdialogex.h"
-#include "ChevMsgrClient_MFCDlg.h"
 
 
@@ -41 +40 @@
     // TODO: ¿©±â¿¡ ÄÁÆ®·Ñ ¾Ë¸² 󸮱â Äڵ带 Ãß°¡ÇÕ´Ï´Ù.
     CString friendId;
-    CChevMsgrClient_MFCDlg MsgrClntDlg;
-    
+        
     GetDlgItemText(IDC_EDIT_FRIEND_ID, friendId);
     chev->addFriend(cstr2str(friendId));
 
-    MsgrClntDlg.mFriendListBox.InsertString(MsgrClntDlg.mFriendListBox.GetCount(), friendId);
+    mMsgrClntDlg->mFriendListBox.InsertString(mMsgrClntDlg->mFriendListBox.GetCount(), friendId);
 
     CDialogEx::OnOK();

trunk/msvc14/ChevMsgrClient_MFC/AddFriendDlg.h

@@ -1 +1 @@
 #pragma once
 #include "msgclnt.h"
+#include "ChevMsgrClient_MFCDlg.h"
+
 
 // CAddFriendDlg ´ëÈ­ »óÀÚÀÔ´Ï´Ù.
@@ -12 +14 @@
     virtual ~CAddFriendDlg();
     chev *chev;
+    CChevMsgrClient_MFCDlg *mMsgrClntDlg;
 
 // ´ëÈ­ »óÀÚ µ¥ÀÌÅÍÀÔ´Ï´Ù.

trunk/msvc14/ChevMsgrClient_MFC/AddGroupChat.cpp

@@ -25 +25 @@
 {
     CDialogEx::DoDataExchange(pDX);
+    DDX_Control(pDX, IDC_LIST_FRIEND_TO_CHAT, mFriendListToChat);
+    DDX_Control(pDX, IDC_LIST_SELECTED_FRIEND, mListSelectFriend);
 }
 
 
 BEGIN_MESSAGE_MAP(CAddGroupChatDlg, CDialogEx)
-    ON_LBN_SELCHANGE(IDC_LIST_FRIEND_TO_CHAT, &CAddGroupChatDlg::OnLbnSelchangeListFriendToChat)
     ON_BN_CLICKED(IDC_ADD_LIST, &CAddGroupChatDlg::OnBnClickedAddList)
+    ON_BN_CLICKED(IDOK, &CAddGroupChatDlg::OnBnClickedOk)
+    ON_BN_CLICKED(IDC_REMOVE_LIST, &CAddGroupChatDlg::OnBnClickedRemoveList)
 END_MESSAGE_MAP()
 
 
 // CAddGroupChat ¸Þ½ÃÁö 󸮱âÀÔ´Ï´Ù.
-
-
-void CAddGroupChatDlg::OnLbnSelchangeListFriendToChat()
+void CAddGroupChatDlg::OnBnClickedAddList()
 {
     // TODO: ¿©±â¿¡ ÄÁÆ®·Ñ ¾Ë¸² 󸮱â Äڵ带 Ãß°¡ÇÕ´Ï´Ù.
@@ -44 +45 @@
 
 
-void CAddGroupChatDlg::OnBnClickedAddList()
+void CAddGroupChatDlg::OnBnClickedOk()
+{
+    // TODO: ¿©±â¿¡ ÄÁÆ®·Ñ ¾Ë¸² 󸮱â Äڵ带 Ãß°¡ÇÕ´Ï´Ù.
+
+    CDialogEx::OnOK();
+}
+
+
+void CAddGroupChatDlg::OnBnClickedRemoveList()
 {
     // TODO: ¿©±â¿¡ ÄÁÆ®·Ñ ¾Ë¸² 󸮱â Äڵ带 Ãß°¡ÇÕ´Ï´Ù.

trunk/msvc14/ChevMsgrClient_MFC/AddGroupChat.h

@@ -1 +1 @@
 #pragma once
 #include "msgclnt.h"
+#include "afxwin.h"
 
 // CAddGroupChat ´ëÈ­ »óÀÚÀÔ´Ï´Ù.
@@ -23 +24 @@
     DECLARE_MESSAGE_MAP()
 public:
-    afx_msg void OnLbnSelchangeListFriendToChat();
     afx_msg void OnBnClickedAddList();
+    afx_msg void OnBnClickedOk();
+    afx_msg void OnBnClickedRemoveList();
+    CListBox mFriendListToChat;
+    CListBox mListSelectFriend;
 };

trunk/msvc14/ChevMsgrClient_MFC/ChevMsgrClient_MFCDlg.cpp

@@ -222 +222 @@
 int cb_listen(SConversation & chat)
 {
-    //gDlg->mChatListBox.InsertString(gDlg->mListBox.GetCount(), );
-    //gDlg->mChatListBox.InsertString(gDlg->mListBox.GetCount(), );
+    gDlg->mChatListBox.InsertString(gDlg->mChatListBox.GetCount(), str2cstr(chat.from));
+    gDlg->mChatListBox.InsertString(gDlg->mChatListBox.GetCount(), str2cstr(chat.message));
+
+    gDlg->scl[gDlg->mFriendListBox.GetCurSel()].chatList.push_back(chat);
 
     return 0;
@@ -239 +241 @@
     CString receiver;
     SConversation conversation;
-
-    mFriendListBox.GetText(mFriendListBox.GetCurSel(), receiver);
+    int idx = mFriendListBox.GetCurSel();
+
+    if (idx < 0)
+        return;
+
+    mFriendListBox.GetText(idx, receiver);
+    GetDlgItemText(IDC_EDIT_INPUT, chat);
+    UpdateData(TRUE);
+
+    if(scl[idx].sessionId == "")
+    {
+        std::vector<std::string> idList;
+        idList.push_back(cstr2str(receiver));
+        scl[idx].sessionId = chev.getSessionID(idList);
+    }
+
+    conversation.sessid = scl[idx].sessionId;
     conversation.from = this->mId;
-
-    GetDlgItemText(IDC_EDIT_INPUT, chat);
     conversation.message = cstr2str(chat);
-
-    UpdateData(TRUE);
     conversation.sensitive = mCheckedSensitive ? true : false;
-
-    // Ä£±¸ ¼±ÅÃµÈ ¾Öµé ¸®½ºÆ®·Î ³Ñ°Ü¹ÞÀ» °Í.
-    //conversation.sessid = chev.getSessionID( ´ëÈ­¹æ ÃÊ´ëÇÑ ¾ÆÀ̵𸮽ºÆ® );
 
     if (chev.tell(conversation))
         mChatListBox.InsertString(mChatListBox.GetCount(), chat);
+    
+    SetDlgItemText(IDC_EDIT_INPUT, _T(""));
 }
 
@@ -263 +275 @@
 
     AFDlg.chev = &this->chev;
+    AFDlg.mMsgrClntDlg = this;
 
     AFDlg.DoModal();

trunk/msvc14/ChevMsgrClient_MFC/ChevMsgrClient_MFCDlg.h

@@ -8 +8 @@
 
 // CChevMsgrClient_MFCDlg ´ëÈ­ »óÀÚ
+typedef struct {
+    std::string sessionId;
+    std::list<SConversation> chatList;
+} Session;
+
 class CChevMsgrClient_MFCDlg : public CDialogEx
 {
@@ -14 +19 @@
     CChevMsgrClient_MFCDlg(CWnd* pParent = NULL);   // Ç¥ÁØ »ý¼ºÀÚÀÔ´Ï´Ù.
     chev chev;
-
+    std::vector<Session> scl;
+    
 // ´ëÈ­ »óÀÚ µ¥ÀÌÅÍÀÔ´Ï´Ù.
 #ifdef AFX_DESIGN_TIME
@@ -23 +29 @@
     virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV Áö¿øÀÔ´Ï´Ù.
     
-
 // ±¸ÇöÀÔ´Ï´Ù.
 protected: