Changeset 6 in chevmsgr for trunk/msg.hpp

Timestamp:

08/29/15 02:20:50 (9 years ago)

Author:

cheese

Message:

modify client interface and message protocol

File:

• trunk/msg.hpp (modified) (2 diffs)

trunk/msg.hpp

@@ -8 +8 @@
 #include <string>
 #include <vector>
+
+typedef struct SFriend
+{
+    std::string id;
+    std::string name;
+} SFriend;
+
+// --------------------------------------------------------------
+
+namespace ProtocolType
+{
+#define DECLARE_KEY(_t) static const std::string _t = #_t
+
+    DECLARE_KEY(ID);
+    DECLARE_KEY(TYPE);
+    DECLARE_KEY(SMS);
+    DECLARE_KEY(PHONE);
+    DECLARE_KEY(JOIN);
+    DECLARE_KEY(PW);
+    DECLARE_KEY(LOGIN);
+    DECLARE_KEY(ADD_FRIEND);
+    DECLARE_KEY(OPEN_SESSION);
+    DECLARE_KEY(TO);
+    DECLARE_KEY(CHAT);
+    DECLARE_KEY(FROM);
+    DECLARE_KEY(SESSION_ID);
+    DECLARE_KEY(MESSAGE);
+    DECLARE_KEY(SENSITIVE);
+    DECLARE_KEY(GET_FRIEND_LIST);
+    DECLARE_KEY(RESULT);
+}
+
+namespace Protocol
+{
+    class Message
+    {
+    private:
+        json::Object mObject;
+
+    public:
+        void parse(const std::string & message);
+
+        template<typename T>
+        inline T get(const std::string & key) const
+        {
+            return (T)mObject[key];
+        }
+
+        std::string type() const;
+    };
+
+    class IProtocol
+    {
+    public:
+        virtual void makeTemplate(json::Object & obj, const std::string & type) const = 0;
+    };
+
+    class Request : public IProtocol
+    {
+    private:
+        std::string mID;
+
+    public:
+        void setUserID(const std::string & id);
+
+        const std::string & getUserID();
+
+        void makeTemplate(json::Object & obj, const std::string & type) const;
+
+        std::string sms(const std::string & phone) const;
+
+        std::string join(const std::string & id, const std::string & pw, const std::string & sms);
+
+        std::string login(const std::string & pw) const;
+
+        std::string addFriend(const std::string & id) const;
+
+        std::string openSession(const std::string & to) const;
+
+        std::string chat(const std::string & sessid, const std::string & message, const int sensitive) const;
+
+        std::string getFriendList() const;
+    };
+
+    class Response : public IProtocol
+    {
+    public:
+        void makeTemplate(json::Object & obj, const std::string & type) const;
+
+        std::string result(const std::string & requestType, const bool status) const;
+
+        std::string friendList(const std::vector<SFriend> & friendList) const;
+
+        std::string openSession(const std::vector<std::string> & idList) const;
+    };
+};
+
+// --------------------------------------------------------------
 
 #define LOG(message)    log(__FILE__,__func__,__LINE__,message)
@@ -30 +128 @@
               << message << std::endl;
 }
-
-// --------------------------------------------------------------
-namespace Message
-{
-    class Parser
-    {
-    private:
-        json::Object mObject;
-
-    public:
-        void parse(const std::string & message);
-
-        template<typename T>
-        inline T get(const std::string & key) const
-        {
-            return (T)mObject[key];
-        }
-
-        std::string type() const;
-    };
-
-    class IMessage
-    {
-    public:
-        virtual void makeTemplate(json::Object & obj, const std::string & type) const = 0;
-    };
-
-    class Request : public IMessage
-    {
-    private:
-        std::string mID;
-
-    public:
-        void setUserID(const std::string & id);
-
-        const std::string & getUserID();
-
-        void makeTemplate(json::Object & obj, const std::string & type) const;
-
-        std::string command(const std::string & cmd) const;
-
-        std::string sms(const std::string & phone) const;
-
-        std::string Request::join(const std::string & id, const std::string & pw, const std::string & sms);
-
-        std::string login(const std::string & pw) const;
-
-        std::string Request::chat(const std::string & to, const std::string & sessid, const std::string & message) const;
-
-        std::string friendList() const;
-    };
-
-    class Response : public IMessage
-    {
-    public:
-        typedef struct friendInfo
-        {
-            std::string id;
-            std::string name;
-        } friendInfo;
-
-    public:
-        void makeTemplate(json::Object & obj, const std::string & type) const;
-
-        std::string result(const bool status) const;
-    };
-};