change ReceivedMsg to ReceivedTextMsg ,QRCodeMessage to ReceivedEventMsg

B3WeChat.Web/Pages/WeChatReceive.cs

@@ -47,9 +47,9 @@ namespace BWP.Web.Pages
       
       object result = InOutMessageUtil.GetMessage(context.Request);
 
-      if (result is ReceivedMsg)
+      if (result is ReceivedTextMsg)
       {
-        ReceivedMsg msg = result as ReceivedMsg;
+        ReceivedTextMsg msg = result as ReceivedTextMsg;
         string str = string.Empty;
         if (msg != null)
         {
@@ -70,9 +70,9 @@ namespace BWP.Web.Pages
 
         }
       }
-      else if (result is QRCodeMessage)
+      else if (result is ReceivedEventMsg)
       {        
-        QRCodeMessage msg = result as QRCodeMessage;
+        ReceivedEventMsg msg = result as ReceivedEventMsg;
         if (msg.IsUnsubscribeEvent())
         {
           Unsubscribe(msg.FromUserName);

B3WeChat/B3WeChat.csproj

@@ -121,9 +121,9 @@
     <Compile Include="Entities\MessageType.cs" />
     <Compile Include="Entities\OpenIDObject.cs" />
     <Compile Include="Entities\QRCodeArgs.cs" />
-    <Compile Include="Entities\QRCodeMessage.cs" />
+    <Compile Include="Entities\ReceivedEventMsg.cs" />
     <Compile Include="Entities\QRCodeResult.cs" />
-    <Compile Include="Entities\ReceivedMsg.cs" />
+    <Compile Include="Entities\ReceivedTextMsg.cs" />
     <Compile Include="Entities\ReplyMsg.cs" />
     <Compile Include="Entities\SendTemplateMessageResult.cs" />
     <Compile Include="Entities\TokenObject.cs" />

B3WeChat/Entities/QRCodeMessage.cs → B3WeChat/Entities/ReceivedEventMsg.cs

@@ -11,7 +11,7 @@ namespace BWP.B3WeChat.Entities
   /// </summary>
   [XmlRoot("xml")]
   [Serializable]
-  public class QRCodeMessage
+  public class ReceivedEventMsg
   {
     /// <summary>
     /// 开发者微信号

B3WeChat/Entities/ReceivedMsg.cs → B3WeChat/Entities/ReceivedTextMsg.cs

@@ -11,7 +11,7 @@ namespace BWP.B3WeChat.Entities
   /// </summary>
   [XmlRoot("xml")]
   [Serializable]
-  public class ReceivedMsg
+  public class ReceivedTextMsg
   {
     /// <summary>
     /// 开发者微信号

B3WeChat/Utils/InOutMessageUtil.cs

@@ -212,11 +212,11 @@ namespace BWP.B3WeChat.Utils
       MessageType type = XmlUtil.Deserialize<MessageType>(xmlData);
       if (type.MsgType == MsgType.文本)
       {
-        obj = XmlUtil.Deserialize<ReceivedMsg>(xmlData);
+        obj = XmlUtil.Deserialize<ReceivedTextMsg>(xmlData);
       }
       else if (type.MsgType == MsgType.事件)
       {
-        obj = XmlUtil.Deserialize<QRCodeMessage>(xmlData);
+        obj = XmlUtil.Deserialize<ReceivedEventMsg>(xmlData);
       }
       return obj;
     }

Test/UnitTest1.cs

@@ -21,7 +21,7 @@ namespace Test
  <MsgId>1234567890123456</MsgId>
  </xml>";
 
-      var message = InOutMessageUtil.ParseWeChatMessage(xml) as ReceivedMsg;
+      var message = InOutMessageUtil.ParseWeChatMessage(xml) as ReceivedTextMsg;
 
       Assert.IsNotNull(message);
       Assert.AreEqual("toUser", message.ToUserName);
@@ -43,7 +43,7 @@ namespace Test
 <Event><![CDATA[subscribe]]></Event>
 </xml>";
 
-      var message = InOutMessageUtil.ParseWeChatMessage(xml) as QRCodeMessage;
+      var message = InOutMessageUtil.ParseWeChatMessage(xml) as ReceivedEventMsg;
 
       Assert.IsNotNull(message);
       Assert.AreEqual("toUser", message.ToUserName);
@@ -68,7 +68,7 @@ namespace Test
 <Ticket><![CDATA[TICKET]]></Ticket>
 </xml>";
 
-      var message = InOutMessageUtil.ParseWeChatMessage(xml) as QRCodeMessage;
+      var message = InOutMessageUtil.ParseWeChatMessage(xml) as ReceivedEventMsg;
 
       Assert.IsNotNull(message);
       Assert.AreEqual("toUser", message.ToUserName);
@@ -95,7 +95,7 @@ namespace Test
 <EventKey><![CDATA[123123]]></EventKey>
 <Ticket><![CDATA[TICKET]]></Ticket>
 </xml>";
-      var message = InOutMessageUtil.ParseWeChatMessage(xml) as QRCodeMessage;
+      var message = InOutMessageUtil.ParseWeChatMessage(xml) as ReceivedEventMsg;
       Assert.IsNotNull(message);
       Assert.AreEqual("toUser", message.ToUserName);
       Assert.AreEqual("fromUser", message.FromUserName);