Changeset 8 in chevmsgr

Timestamp:

08/30/15 00:01:12 (9 years ago)

Author:

cheese

Message:

클라 UI 쪼끔 수정
프로토콜 메시지 좀 수정
클라 메시지 핸들링 추가

Location:

trunk

Files:

• msg.cpp (modified) (6 diffs)
• msg.hpp (modified) (4 diffs)
• msgclnt.cpp (modified) (4 diffs)
• msgclnt.h (modified) (1 diff)
• msvc14/ChevMsgrClient_MFC/ChevMsgrClient_MFC.rc (modified) ( previous)
• msvc14/ChevMsgrClient_MFC/ChevMsgrClient_MFC.vcxproj (modified) (1 diff)
• msvc14/ChevMsgrClient_MFC/Resource.h (modified) ( previous)

trunk/msg.cpp

@@ -4 +4 @@
     json::Object _obj;                          \
     makeTemplate(_obj, _type);                  \
-
-#define DELIMITER   "$"
 
 namespace Protocol
@@ -18 +16 @@
     {
         return get<std::string>("type");
+    }
+
+    std::vector<SFriend> Message::getFriendList() const
+    {
+        json::Array ar = mObject[ProtocolType::FRIEND_LIST];
+
+        std::vector<SFriend> friendList;
+
+        std::vector<json::Value>::iterator iter;
+        for (iter = ar.begin(); iter != ar.end(); iter++)
+        {
+            SFriend fr;
+
+            fr.id   = (*iter)[ProtocolType::ID  ];
+            fr.name = (*iter)[ProtocolType::NAME];
+
+            friendList.push_back(fr);
+        }
+
+        return friendList;
     }
 
@@ -33 +51 @@
     void Request::makeTemplate(json::Object & obj, const std::string & type) const
     {
-        obj[ProtocolType::ID  ] = mID;
+        obj[ProtocolType::ID] = mID;
         obj[ProtocolType::TYPE] = type;
     }
@@ -50 +68 @@
         DECLARE_TEMPLATE_OBJECT(obj, ProtocolType::JOIN);
 
-        obj[ProtocolType::ID ] = id;
-        obj[ProtocolType::PW ] = pw;
+        obj[ProtocolType::ID] = id;
+        obj[ProtocolType::PW] = pw;
         obj[ProtocolType::SMS] = sms;
 
@@ -88 +106 @@
         DECLARE_TEMPLATE_OBJECT(obj, ProtocolType::CHAT);
 
-        obj[ProtocolType::FROM      ] = mID;
+        obj[ProtocolType::FROM] = mID;
         obj[ProtocolType::SESSION_ID] = sessid;
-        obj[ProtocolType::MESSAGE   ] = message;
-        obj[ProtocolType::SENSITIVE ] = sensitive;
+        obj[ProtocolType::MESSAGE] = message;
+        obj[ProtocolType::SENSITIVE] = sensitive;
 
         return json::Serialize(obj);
@@ -117 +135 @@
         return json::Serialize(obj);
     }
+
+    std::string Response::friendList(const std::vector<SFriend> & friendList) const
+    {
+        DECLARE_TEMPLATE_OBJECT(obj, ProtocolType::FRIEND_LIST);
+
+        json::Array ar;
+        std::vector<SFriend>::const_iterator iter;
+        for (iter = friendList.begin() ; iter != friendList.end() ; iter++)
+        {
+            json::Object fr;
+
+            fr[ProtocolType::ID  ] = iter->id;
+            fr[ProtocolType::NAME] = iter->name;
+
+            ar.push_back(fr);
+        }
+
+        obj[ProtocolType::FRIEND_LIST] = ar;
+
+        return json::Serialize(obj);
+    }
 };

trunk/msg.hpp

@@ -15 +15 @@
 } SFriend;
 
+#define DELIMITER   "$"
+
 // --------------------------------------------------------------
 
@@ -23 +25 @@
     DECLARE_KEY(ID);
     DECLARE_KEY(TYPE);
+    DECLARE_KEY(NAME);
     DECLARE_KEY(SMS);
     DECLARE_KEY(PHONE);
@@ -37 +40 @@
     DECLARE_KEY(SENSITIVE);
     DECLARE_KEY(GET_FRIEND_LIST);
+    DECLARE_KEY(FRIEND_LIST);
     DECLARE_KEY(RESULT);
 }
@@ -55 +59 @@
             return (T)mObject[key];
         }
+
+        inline std::vector<SFriend> getFriendList() const;
 
         std::string type() const;

trunk/msgclnt.cpp

@@ -2 +2 @@
 #include "msgclnt.h"
 #include "msg.hpp"
+
+#include <algorithm>
 
 #include <stdlib.h>
@@ -182 +184 @@
 std::vector<SFriend> chev::getFriendList()
 {
+    std::vector<SFriend> friendList;
+
     try
     {
         socket.send(request.getFriendList());
-    }
-    catch (cf::exception & e)
-    {
-        LOG(e.what());
-    }
-    return std::vector<SFriend>();
-}
-
-std::string chev::getSessionID(const std::vector<std::string> & idList)
-{
-    try
-    {
+
+        friendList = messageQ.pop(ProtocolType::FRIEND_LIST).getFriendList();
+    }
+    catch (cf::exception & e)
+    {
+        LOG(e.what());
+    }
+
+    return friendList;
+}
+
+std::string chev::getSessionID(std::vector<std::string> & idList)
+{
+    try
+    {
+        if (idList.size() == 2)
+            std::sort(idList.begin(), idList.end());
+
         std::string concat = idList[0];
 
-        for (int iter = 1 ; iter < idList.size() ; iter++)
-            concat += "," + idList[iter];
+        for (int iter = 1; iter < idList.size(); iter++)
+            concat += DELIMITER + idList[iter];
 
         if (sessionMap.find(concat) == sessionMap.end())
@@ -206 +216 @@
             socket.send(request.openSession(concat));
 
-            std::string response = socket.receive().toString();
-            Protocol::Message parser;
-            parser.parse(response);
-
-            if (!parser.get<bool>("result"))
+            Protocol::Message message = messageQ.pop(ProtocolType::SESSION_ID);
+
+            if (!message.get<bool>(ProtocolType::RESULT))
                 THROW_EXCEPTION("failed to open session id");
 
-            sessionMap[concat] = parser.get<std::string>("sess-id");
+            sessionMap[concat] = message.get<std::string>(ProtocolType::SESSION_ID);
         }
 
@@ -247 +255 @@
 {
     SConversation c;
-    Protocol::Message parser = messageQ.pop(ProtocolType::CHAT);
-
-    c.sessid    = parser.get<std::string>(ProtocolType::SESSION_ID);
-    c.message   = parser.get<std::string>(ProtocolType::MESSAGE);
-    c.sensitive = parser.get<int>(ProtocolType::SENSITIVE);
-    c.isError   = parser.get<bool>(ProtocolType::RESULT);
-
-    c.from      = parser.get<std::string>(ProtocolType::FROM);
+    Protocol::Message message = messageQ.pop(ProtocolType::CHAT);
+
+    c.sessid    = message.get<std::string>(ProtocolType::SESSION_ID);
+    c.message   = message.get<std::string>(ProtocolType::MESSAGE);
+    c.sensitive = message.get<int>(ProtocolType::SENSITIVE);
+    c.isError   = message.get<bool>(ProtocolType::RESULT);
+
+    c.from      = message.get<std::string>(ProtocolType::FROM);
 
     return c;

trunk/msgclnt.h

@@ -64 +64 @@
     std::vector<SFriend> getFriendList();
 
-    std::string getSessionID(const std::vector<std::string> & idList);
+    std::string getSessionID(std::vector<std::string> & idList);
 
     bool tell(const SConversation & conversation);

trunk/msvc14/ChevMsgrClient_MFC/ChevMsgrClient_MFC.vcxproj

@@ -218 +218 @@
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties RESOURCE_FILE="ChevMsgrClient_MFC.rc" />
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>