Changeset 8 in chevmsgr for trunk/msg.cpp

Timestamp:

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

Author:

cheese

Message:

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

File:

• trunk/msg.cpp (modified) (6 diffs)

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);
+    }
 };