增加微信推送用户领取卡券事件中所需两个属性 binarywang#210 并重构提取出部分内部类，避免WxMpXmlMessage类过于庞大

binarywang · binarywang · commit ce77578ff67b · 2017-05-04T23:00:35.000+08:00
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/HardWare.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/HardWare.java
@@ -0,0 +1,50 @@
+package me.chanjar.weixin.mp.bean.message;
+
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+import com.thoughtworks.xstream.annotations.XStreamConverter;
+import me.chanjar.weixin.common.util.ToStringUtils;
+import me.chanjar.weixin.common.util.xml.XStreamCDataConverter;
+
+/**
+ * <pre>
+ *  Created by BinaryWang on 2017/5/4.
+ * </pre>
+ *
+ * @author Binary Wang
+ */
+@XStreamAlias("HardWare")
+public class HardWare {
+  /**
+   * 消息展示，目前支持myrank(排行榜)
+   */
+  @XStreamAlias("MessageView")
+  @XStreamConverter(value = XStreamCDataConverter.class)
+  private String messageView;
+  /**
+   * 消息点击动作，目前支持ranklist(点击跳转排行榜)
+   */
+  @XStreamAlias("MessageAction")
+  @XStreamConverter(value = XStreamCDataConverter.class)
+  private String messageAction;
+
+  @Override
+  public String toString() {
+    return ToStringUtils.toSimpleString(this);
+  }
+
+  public String getMessageView() {
+    return messageView;
+  }
+
+  public void setMessageView(String messageView) {
+    this.messageView = messageView;
+  }
+
+  public String getMessageAction() {
+    return messageAction;
+  }
+
+  public void setMessageAction(String messageAction) {
+    this.messageAction = messageAction;
+  }
+}
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/ScanCodeInfo.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/ScanCodeInfo.java
@@ -0,0 +1,52 @@
+package me.chanjar.weixin.mp.bean.message;
+
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+import com.thoughtworks.xstream.annotations.XStreamConverter;
+import me.chanjar.weixin.common.util.ToStringUtils;
+import me.chanjar.weixin.common.util.xml.XStreamCDataConverter;
+
+/**
+ * <pre>
+ *  Created by BinaryWang on 2017/5/4.
+ * </pre>
+ *
+ * @author Binary Wang
+ */
+@XStreamAlias("ScanCodeInfo")
+public class ScanCodeInfo {
+  @XStreamAlias("ScanType")
+  @XStreamConverter(value = XStreamCDataConverter.class)
+  private String scanType;
+  @XStreamAlias("ScanResult")
+  @XStreamConverter(value = XStreamCDataConverter.class)
+  private String scanResult;
+
+  @Override
+  public String toString() {
+    return ToStringUtils.toSimpleString(this);
+  }
+
+  /**
+   * 扫描类型，一般是qrcode
+   */
+  public String getScanType() {
+
+    return this.scanType;
+  }
+
+  public void setScanType(String scanType) {
+    this.scanType = scanType;
+  }
+
+  /**
+   * 扫描结果，即二维码对应的字符串信息
+   */
+  public String getScanResult() {
+    return this.scanResult;
+  }
+
+  public void setScanResult(String scanResult) {
+    this.scanResult = scanResult;
+  }
+
+}
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/SendLocationInfo.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/SendLocationInfo.java
@@ -0,0 +1,82 @@
+package me.chanjar.weixin.mp.bean.message;
+
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+import com.thoughtworks.xstream.annotations.XStreamConverter;
+import me.chanjar.weixin.common.util.ToStringUtils;
+import me.chanjar.weixin.common.util.xml.XStreamCDataConverter;
+
+/**
+ * <pre>
+ *  Created by BinaryWang on 2017/5/4.
+ * </pre>
+ *
+ * @author Binary Wang
+ */
+@XStreamAlias("SendLocationInfo")
+public class SendLocationInfo {
+
+  @XStreamAlias("Location_X")
+  @XStreamConverter(value = XStreamCDataConverter.class)
+  private String locationX;
+
+  @XStreamAlias("Location_Y")
+  @XStreamConverter(value = XStreamCDataConverter.class)
+  private String locationY;
+
+  @XStreamAlias("Scale")
+  @XStreamConverter(value = XStreamCDataConverter.class)
+  private String scale;
+
+  @XStreamAlias("Label")
+  @XStreamConverter(value = XStreamCDataConverter.class)
+  private String label;
+
+  @XStreamAlias("Poiname")
+  @XStreamConverter(value = XStreamCDataConverter.class)
+  private String poiname;
+
+  @Override
+  public String toString() {
+    return ToStringUtils.toSimpleString(this);
+  }
+
+  public String getLocationX() {
+    return this.locationX;
+  }
+
+  public void setLocationX(String locationX) {
+    this.locationX = locationX;
+  }
+
+  public String getLocationY() {
+    return this.locationY;
+  }
+
+  public void setLocationY(String locationY) {
+    this.locationY = locationY;
+  }
+
+  public String getScale() {
+    return this.scale;
+  }
+
+  public void setScale(String scale) {
+    this.scale = scale;
+  }
+
+  public String getLabel() {
+    return this.label;
+  }
+
+  public void setLabel(String label) {
+    this.label = label;
+  }
+
+  public String getPoiname() {
+    return this.poiname;
+  }
+
+  public void setPoiname(String poiname) {
+    this.poiname = poiname;
+  }
+}
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/SendPicsInfo.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/SendPicsInfo.java
@@ -0,0 +1,61 @@
+package me.chanjar.weixin.mp.bean.message;
+
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+import com.thoughtworks.xstream.annotations.XStreamConverter;
+import me.chanjar.weixin.common.util.ToStringUtils;
+import me.chanjar.weixin.common.util.xml.XStreamCDataConverter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <pre>
+ *  Created by BinaryWang on 2017/5/4.
+ * </pre>
+ *
+ * @author Binary Wang
+ */
+@XStreamAlias("SendPicsInfo")
+public class SendPicsInfo {
+  @XStreamAlias("PicList")
+  protected final List<Item> picList = new ArrayList<>();
+  @XStreamAlias("Count")
+  private Long count;
+
+  @Override
+  public String toString() {
+    return ToStringUtils.toSimpleString(this);
+  }
+
+  public Long getCount() {
+    return this.count;
+  }
+
+  public void setCount(Long count) {
+    this.count = count;
+  }
+
+  public List<Item> getPicList() {
+    return this.picList;
+  }
+
+  @XStreamAlias("item")
+  public static class Item {
+    @XStreamAlias("PicMd5Sum")
+    @XStreamConverter(value = XStreamCDataConverter.class)
+    private String picMd5Sum;
+
+    @Override
+    public String toString() {
+      return ToStringUtils.toSimpleString(this);
+    }
+
+    public String getPicMd5Sum() {
+      return this.picMd5Sum;
+    }
+
+    public void setPicMd5Sum(String picMd5Sum) {
+      this.picMd5Sum = picMd5Sum;
+    }
+  }
+}
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlMessage.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlMessage.java
