polish code

This commit is contained in:
Daniel Qian
2014-10-22 13:38:16 +08:00
parent f76f0e6773
commit 2c96d542d6
31 changed files with 145 additions and 220 deletions

View File

@@ -9,7 +9,7 @@
package me.chanjar.weixin.mp.util.json;
import com.google.gson.*;
import me.chanjar.weixin.mp.api.WxMpConsts;
import me.chanjar.weixin.common.api.WxConsts;
import me.chanjar.weixin.mp.bean.WxMpCustomMessage;
import java.lang.reflect.Type;
@@ -26,25 +26,25 @@ public class WxMpCustomMessageGsonAdapter implements JsonSerializer<WxMpCustomMe
messageJson.addProperty("touser", message.getToUser());
messageJson.addProperty("msgtype", message.getMsgType());
if (WxMpConsts.CUSTOM_MSG_TEXT.equals(message.getMsgType())) {
if (WxConsts.CUSTOM_MSG_TEXT.equals(message.getMsgType())) {
JsonObject text = new JsonObject();
text.addProperty("content", message.getContent());
messageJson.add("text", text);
}
if (WxMpConsts.CUSTOM_MSG_IMAGE.equals(message.getMsgType())) {
if (WxConsts.CUSTOM_MSG_IMAGE.equals(message.getMsgType())) {
JsonObject image = new JsonObject();
image.addProperty("media_id", message.getMediaId());
messageJson.add("image", image);
}
if (WxMpConsts.CUSTOM_MSG_VOICE.equals(message.getMsgType())) {
if (WxConsts.CUSTOM_MSG_VOICE.equals(message.getMsgType())) {
JsonObject voice = new JsonObject();
voice.addProperty("media_id", message.getMediaId());
messageJson.add("voice", voice);
}
if (WxMpConsts.CUSTOM_MSG_VIDEO.equals(message.getMsgType())) {
if (WxConsts.CUSTOM_MSG_VIDEO.equals(message.getMsgType())) {
JsonObject video = new JsonObject();
video.addProperty("media_id", message.getMediaId());
video.addProperty("thumb_media_id", message.getThumbMediaId());
@@ -53,7 +53,7 @@ public class WxMpCustomMessageGsonAdapter implements JsonSerializer<WxMpCustomMe
messageJson.add("video", video);
}
if (WxMpConsts.CUSTOM_MSG_MUSIC.equals(message.getMsgType())) {
if (WxConsts.CUSTOM_MSG_MUSIC.equals(message.getMsgType())) {
JsonObject music = new JsonObject();
music.addProperty("title", message.getTitle());
music.addProperty("description", message.getDescription());
@@ -63,7 +63,7 @@ public class WxMpCustomMessageGsonAdapter implements JsonSerializer<WxMpCustomMe
messageJson.add("music", music);
}
if (WxMpConsts.CUSTOM_MSG_NEWS.equals(message.getMsgType())) {
if (WxConsts.CUSTOM_MSG_NEWS.equals(message.getMsgType())) {
JsonArray articleJsonArray = new JsonArray();
for (WxMpCustomMessage.WxArticle article : message.getArticles()) {
JsonObject articleJson = new JsonObject();

View File

@@ -12,7 +12,7 @@ import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonSerializationContext;
import com.google.gson.JsonSerializer;
import me.chanjar.weixin.mp.api.WxMpConsts;
import me.chanjar.weixin.common.api.WxConsts;
import me.chanjar.weixin.mp.bean.WxMpMassGroupMessage;
import java.lang.reflect.Type;
@@ -31,30 +31,30 @@ public class WxMpMassMessageGsonAdapter implements JsonSerializer<WxMpMassGroupM
filter.addProperty("group_id", message.getGroupId());
messageJson.add("filter", filter);
if (WxMpConsts.MASS_MSG_NEWS.equals(message.getMsgtype())) {
if (WxConsts.MASS_MSG_NEWS.equals(message.getMsgtype())) {
JsonObject sub = new JsonObject();
sub.addProperty("media_id", message.getMediaId());
messageJson.add(WxMpConsts.MASS_MSG_NEWS, sub);
messageJson.add(WxConsts.MASS_MSG_NEWS, sub);
}
if (WxMpConsts.MASS_MSG_TEXT.equals(message.getMsgtype())) {
if (WxConsts.MASS_MSG_TEXT.equals(message.getMsgtype())) {
JsonObject sub = new JsonObject();
sub.addProperty("content", message.getContent());
messageJson.add(WxMpConsts.MASS_MSG_TEXT, sub);
messageJson.add(WxConsts.MASS_MSG_TEXT, sub);
}
if (WxMpConsts.MASS_MSG_VOICE.equals(message.getMsgtype())) {
if (WxConsts.MASS_MSG_VOICE.equals(message.getMsgtype())) {
JsonObject sub = new JsonObject();
sub.addProperty("media_id", message.getMediaId());
messageJson.add(WxMpConsts.MASS_MSG_VOICE, sub);
messageJson.add(WxConsts.MASS_MSG_VOICE, sub);
}
if (WxMpConsts.MASS_MSG_IMAGE.equals(message.getMsgtype())) {
if (WxConsts.MASS_MSG_IMAGE.equals(message.getMsgtype())) {
JsonObject sub = new JsonObject();
sub.addProperty("media_id", message.getMediaId());
messageJson.add(WxMpConsts.MASS_MSG_IMAGE, sub);
messageJson.add(WxConsts.MASS_MSG_IMAGE, sub);
}
if (WxMpConsts.MASS_MSG_VIDEO.equals(message.getMsgtype())) {
if (WxConsts.MASS_MSG_VIDEO.equals(message.getMsgtype())) {
JsonObject sub = new JsonObject();
sub.addProperty("media_id", message.getMediaId());
messageJson.add(WxMpConsts.MASS_MSG_VIDEO, sub);
messageJson.add(WxConsts.MASS_MSG_VIDEO, sub);
}
messageJson.addProperty("msgtype", message.getMsgtype());
return messageJson;

View File

@@ -24,7 +24,7 @@ public class WxMpMassNewsGsonAdapter implements JsonSerializer<WxMpMassNews> {
JsonObject newsJson = new JsonObject();
JsonArray articleJsonArray = new JsonArray();
for (WxMpMassNews.WxMassNewsArticle article : message.getArticles()) {
for (WxMpMassNews.WxMpMassNewsArticle article : message.getArticles()) {
JsonObject articleJson = new JsonObject();
articleJson.addProperty("thumb_media_id", article.getThumbMediaId());
articleJson.addProperty("title", article.getTitle());

View File

@@ -9,7 +9,7 @@
package me.chanjar.weixin.mp.util.json;
import com.google.gson.*;
import me.chanjar.weixin.mp.api.WxMpConsts;
import me.chanjar.weixin.common.api.WxConsts;
import me.chanjar.weixin.mp.bean.WxMpMassOpenIdsMessage;
import java.lang.reflect.Type;
@@ -30,30 +30,30 @@ public class WxMpMassOpenIdsMessageGsonAdapter implements JsonSerializer<WxMpMas
}
messageJson.add("touser", toUsers);
if (WxMpConsts.MASS_MSG_NEWS.equals(message.getMsgType())) {
if (WxConsts.MASS_MSG_NEWS.equals(message.getMsgType())) {
JsonObject sub = new JsonObject();
sub.addProperty("media_id", message.getMediaId());
messageJson.add(WxMpConsts.MASS_MSG_NEWS, sub);
messageJson.add(WxConsts.MASS_MSG_NEWS, sub);
}
if (WxMpConsts.MASS_MSG_TEXT.equals(message.getMsgType())) {
if (WxConsts.MASS_MSG_TEXT.equals(message.getMsgType())) {
JsonObject sub = new JsonObject();
sub.addProperty("content", message.getContent());
messageJson.add(WxMpConsts.MASS_MSG_TEXT, sub);
messageJson.add(WxConsts.MASS_MSG_TEXT, sub);
}
if (WxMpConsts.MASS_MSG_VOICE.equals(message.getMsgType())) {
if (WxConsts.MASS_MSG_VOICE.equals(message.getMsgType())) {
JsonObject sub = new JsonObject();
sub.addProperty("media_id", message.getMediaId());
messageJson.add(WxMpConsts.MASS_MSG_VOICE, sub);
messageJson.add(WxConsts.MASS_MSG_VOICE, sub);
}
if (WxMpConsts.MASS_MSG_IMAGE.equals(message.getMsgType())) {
if (WxConsts.MASS_MSG_IMAGE.equals(message.getMsgType())) {
JsonObject sub = new JsonObject();
sub.addProperty("media_id", message.getMediaId());
messageJson.add(WxMpConsts.MASS_MSG_IMAGE, sub);
messageJson.add(WxConsts.MASS_MSG_IMAGE, sub);
}
if (WxMpConsts.MASS_MSG_VIDEO.equals(message.getMsgType())) {
if (WxConsts.MASS_MSG_VIDEO.equals(message.getMsgType())) {
JsonObject sub = new JsonObject();
sub.addProperty("media_id", message.getMediaId());
messageJson.add(WxMpConsts.MASS_MSG_VIDEO, sub);
messageJson.add(WxConsts.MASS_MSG_VIDEO, sub);
}
messageJson.addProperty("msgtype", message.getMsgType());
return messageJson;