Changeset 30 in chevmsgr

Timestamp:

11/30/15 20:51:27 (8 years ago)

Author:

cheese

Message:

그룹챗 완성

Location:

trunk

Files:

• msgsrv.cpp (modified) (1 diff)
• msvc14/ChevMsgrClient_MFC/AddGroupChat.cpp (modified) (1 diff)
• msvc14/ChevMsgrClient_MFC/ChevMsgrClient_MFCDlg.cpp (modified) (6 diffs)

trunk/msgsrv.cpp

@@ -115 +115 @@
             "("
             "   id      TEXT NOT NULL,"
-            "   friend  TEXT NOT NULL"
+            "   friend  TEXT NOT NULL,"
+            "   unique  (friend)"
             ")";
 

trunk/msvc14/ChevMsgrClient_MFC/AddGroupChat.cpp

@@ -41 +41 @@
 
     for (size_t iter = 0; iter < mMsgrClntDlg->idList.size(); iter++)
-    {
         mFriendListToChat.InsertString(iter, str2cstr(mMsgrClntDlg->idList[iter].id));
-    }
 
     return TRUE;

trunk/msvc14/ChevMsgrClient_MFC/ChevMsgrClient_MFCDlg.cpp

@@ -8 +8 @@
 #include "afxdialogex.h"
 #include <fstream>
+#include <algorithm>
 
 #include "LoginDlg.h"
@@ -214 +215 @@
 int cb_listen(SConversation & chat)
 {
-    CString cstr;
-
-    if (gDlg->mFriendListBox.GetCurSel() >= 0)
-    {
-        gDlg->mFriendListBox.GetText(gDlg->mFriendListBox.GetCurSel(), cstr);
-
-        if (cstr2str(cstr) == chat.from)
+    int idx = -1;
+
+    for (idx = 0; idx < gDlg->mFriendListBox.GetCount(); idx++)
+    {
+        if (chat.sessid == gDlg->scl[idx].sessionId)
         {
-            gDlg->mChatListBox.InsertString(gDlg->mChatListBox.GetCount(), str2cstr("<" + chat.from + ">"));
-            gDlg->mChatListBox.InsertString(gDlg->mChatListBox.GetCount(), str2cstr(chat.message));
-            gDlg->mChatListBox.InsertString(gDlg->mChatListBox.GetCount(), _T(""));
-        }
-    }
-
-    for (int iter = 0; iter < gDlg->mFriendListBox.GetCount(); iter++)
-    {
-        gDlg->mFriendListBox.GetText(iter, cstr);
-
-        if (cstr2str(cstr) == chat.from)
-        {
-            gDlg->scl[iter].chatList.push_back(chat);
+            gDlg->scl[idx].chatList.push_back(chat);
             break;
         }
     }
 
+    if (gDlg->mFriendListBox.GetCurSel() == idx)
+    {
+        gDlg->mChatListBox.InsertString(gDlg->mChatListBox.GetCount(), str2cstr("<" + chat.from + ">"));
+        gDlg->mChatListBox.InsertString(gDlg->mChatListBox.GetCount(), str2cstr(chat.message));
+        gDlg->mChatListBox.InsertString(gDlg->mChatListBox.GetCount(), _T(""));
+    }
+
     return 0;
 }
@@ -244 +238 @@
 int cb_opensession(SOpenSession & opensession)
 {
+    if (opensession.idList.size() == 2)
+        return 0;
+
+    CString cstrIdList = _T("");
+
+    for (size_t iter = 0; iter < opensession.idList.size(); iter++)
+    {
+        if (opensession.idList[iter] != gDlg->mId)
+        {
+            if (cstrIdList == "")
+                cstrIdList = str2cstr(opensession.idList[iter]);
+            else
+                cstrIdList = cstrIdList + "," + str2cstr(opensession.idList[iter]);
+        }
+    }
+
+    gDlg->mFriendListBox.InsertString(gDlg->mFriendListBox.GetCount(), cstrIdList);
+
+    Session s;
+    s.sessionId = opensession.sessid;
+
+    gDlg->scl.push_back(s);
+
     return 0;
 }
@@ -265 +282 @@
     {
         std::vector<std::string> idList;
-        //FIXME : ,·Î ÆĽÌÇϱâ! testÄÚµå Âü°íÇÒ°Í
-        idList.push_back(cstr2str(receiver));
+        std::string comma;
+        mFriendListBox.GetText(idx, receiver);
+        std::istringstream is(cstr2str(receiver));
+        while (std::getline(is, comma, ','))
+            idList.push_back(comma);
+        std::sort(idList.begin(), idList.end());
         scl[idx].sessionId = chev.getSessionID(idList);
     }
@@ -309 +330 @@
     AGCDlg.DoModal();
 
+    CString cmpCstr;
+    for (int iter = 0; iter < this->mFriendListBox.GetCount(); iter++)
+    {
+        this->mFriendListBox.GetText(iter, cmpCstr);
+        if (AGCDlg.groupChat == cmpCstr)
+            return;
+    }
+
     mFriendListBox.InsertString(mFriendListBox.GetCount(), AGCDlg.groupChat);
-
-    //FIXME : Á¤»óÀûÀ¸·Î push_back µ¿ÀÛÇÏ´ÂÁö Å×½ºÆ®
-    // ÀÌ°Å¿¡ ÀÇÇØ OnLbnSelchangeListFriends¿¡¼­ ¾ÈÁ×´ÂÁö È®ÀÎÇϱâ
-    Session s;
-    scl.push_back(s);
+    gDlg->scl.resize(gDlg->scl.size() + 1);
 }
 
@@ -344 +369 @@
         return;
     
+    // vector out of range error
     if (scl[idx].sessionId == "")
         return;