From 52221e72fc1f234a15c30bd5c9cc71305d6c1444 Mon Sep 17 00:00:00 2001 From: dongfuqiang Date: Fri, 16 Dec 2016 11:15:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=B1=9E=E6=80=A7=E5=91=BD?= =?UTF-8?q?=E5=90=8D=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../weixin/mp/bean/device/BaseResp.java | 13 ++- .../weixin/mp/bean/device/RespMsg.java | 4 + .../weixin/mp/bean/device/TransMsgResp.java | 12 ++- .../weixin/mp/bean/device/WxDevice.java | 101 ++++++++++-------- .../mp/bean/device/WxDeviceAuthorize.java | 39 ++++--- .../weixin/mp/bean/device/WxDeviceBind.java | 13 ++- .../mp/bean/device/WxDeviceBindResult.java | 12 ++- .../weixin/mp/bean/device/WxDeviceMsg.java | 4 + .../mp/bean/device/WxDeviceQrCodeResult.java | 45 ++++---- 9 files changed, 141 insertions(+), 102 deletions(-) diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/BaseResp.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/BaseResp.java index 5a3082f6..42c57f0b 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/BaseResp.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/BaseResp.java @@ -1,10 +1,13 @@ package me.chanjar.weixin.mp.bean.device; +import com.google.gson.annotations.SerializedName; + /** * Created by keungtung on 10/12/2016. */ public class BaseResp extends AbstractDeviceBean{ - private BaseInfo base_info; + @SerializedName("base_info") + private BaseInfo baseInfo; private Integer errcode; private String errmsg; @@ -16,12 +19,12 @@ public class BaseResp extends AbstractDeviceBean{ this.errcode = errcode; } - public BaseInfo getBase_info() { - return base_info; + public BaseInfo getBaseInfo() { + return baseInfo; } - public void setBase_info(BaseInfo base_info) { - this.base_info = base_info; + public void setBaseInfo(BaseInfo baseInfo) { + this.baseInfo = baseInfo; } public String getErrmsg() { diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/RespMsg.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/RespMsg.java index e0291fbb..f1fdedff 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/RespMsg.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/RespMsg.java @@ -1,11 +1,15 @@ package me.chanjar.weixin.mp.bean.device; +import com.google.gson.annotations.SerializedName; + /** * Created by keungtung on 10/12/2016. */ public class RespMsg extends AbstractDeviceBean{ + @SerializedName("ret_code") private Integer retCode; + @SerializedName("error_info") private String errorInfo; public Integer getRetCode() { diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/TransMsgResp.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/TransMsgResp.java index 6d5fbe06..d1f6484f 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/TransMsgResp.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/TransMsgResp.java @@ -1,5 +1,6 @@ package me.chanjar.weixin.mp.bean.device; +import com.google.gson.annotations.SerializedName; import me.chanjar.weixin.common.util.json.WxGsonBuilder; /** @@ -7,7 +8,8 @@ import me.chanjar.weixin.common.util.json.WxGsonBuilder; */ public class TransMsgResp extends AbstractDeviceBean{ private Integer ret; - private String ret_info; + @SerializedName("ret_info") + private String retInfo; private Integer errcode; private String errmsg; @@ -23,12 +25,12 @@ public class TransMsgResp extends AbstractDeviceBean{ this.ret = ret; } - public String getRet_info() { - return ret_info; + public String getRetInfo() { + return retInfo; } - public void setRet_info(String ret_info) { - this.ret_info = ret_info; + public void setRetInfo(String retInfo) { + this.retInfo = retInfo; } public Integer getErrcode() { diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDevice.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDevice.java index f36c4b10..c0f95dbf 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDevice.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDevice.java @@ -1,20 +1,31 @@ package me.chanjar.weixin.mp.bean.device; +import com.google.gson.annotations.SerializedName; + /** * Created by keungtung on 10/12/2016. */ public class WxDevice { private String id; private String mac; - private String connect_protocol; - private String auth_key; - private String close_strategy; - private String conn_strategy; - private String crypt_method; - private String auth_ver; - private String manu_mac_pos; - private String ser_mac_pos; - private String ble_simple_protocol; + @SerializedName("connect_protocol") + private String connectProtocol; + @SerializedName("auth_key") + private String authKey; + @SerializedName("close_strategy") + private String closeStrategy; + @SerializedName("conn_strategy") + private String connStrategy; + @SerializedName("crypt_method") + private String cryptMethod; + @SerializedName("auth_ver") + private String authVer; + @SerializedName("manu_mac_pos") + private String manuMacPos; + @SerializedName("ser_mac_pos") + private String serMacPos; + @SerializedName("ble_simple_protocol") + private String bleSimpleProtocol; public String getId() { return id; @@ -32,75 +43,75 @@ public class WxDevice { this.mac = mac; } - public String getConnect_protocol() { - return connect_protocol; + public String getConnectProtocol() { + return connectProtocol; } - public void setConnect_protocol(String connect_protocol) { - this.connect_protocol = connect_protocol; + public void setConnectProtocol(String connectProtocol) { + this.connectProtocol = connectProtocol; } - public String getAuth_key() { - return auth_key; + public String getAuthKey() { + return authKey; } - public void setAuth_key(String auth_key) { - this.auth_key = auth_key; + public void setAuthKey(String authKey) { + this.authKey = authKey; } - public String getClose_strategy() { - return close_strategy; + public String getCloseStrategy() { + return closeStrategy; } - public void setClose_strategy(String close_strategy) { - this.close_strategy = close_strategy; + public void setCloseStrategy(String closeStrategy) { + this.closeStrategy = closeStrategy; } - public String getConn_strategy() { - return conn_strategy; + public String getConnStrategy() { + return connStrategy; } - public void setConn_strategy(String conn_strategy) { - this.conn_strategy = conn_strategy; + public void setConnStrategy(String connStrategy) { + this.connStrategy = connStrategy; } - public String getCrypt_method() { - return crypt_method; + public String getCryptMethod() { + return cryptMethod; } - public void setCrypt_method(String crypt_method) { - this.crypt_method = crypt_method; + public void setCryptMethod(String cryptMethod) { + this.cryptMethod = cryptMethod; } - public String getAuth_ver() { - return auth_ver; + public String getAuthVer() { + return authVer; } - public void setAuth_ver(String auth_ver) { - this.auth_ver = auth_ver; + public void setAuthVer(String authVer) { + this.authVer = authVer; } - public String getManu_mac_pos() { - return manu_mac_pos; + public String getManuMacPos() { + return manuMacPos; } - public void setManu_mac_pos(String manu_mac_pos) { - this.manu_mac_pos = manu_mac_pos; + public void setManuMacPos(String manuMacPos) { + this.manuMacPos = manuMacPos; } - public String getSer_mac_pos() { - return ser_mac_pos; + public String getSerMacPos() { + return serMacPos; } - public void setSer_mac_pos(String ser_mac_pos) { - this.ser_mac_pos = ser_mac_pos; + public void setSerMacPos(String serMacPos) { + this.serMacPos = serMacPos; } - public String getBle_simple_protocol() { - return ble_simple_protocol; + public String getBleSimpleProtocol() { + return bleSimpleProtocol; } - public void setBle_simple_protocol(String ble_simple_protocol) { - this.ble_simple_protocol = ble_simple_protocol; + public void setBleSimpleProtocol(String bleSimpleProtocol) { + this.bleSimpleProtocol = bleSimpleProtocol; } } diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceAuthorize.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceAuthorize.java index e1dcd9be..a37a8a42 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceAuthorize.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceAuthorize.java @@ -1,5 +1,7 @@ package me.chanjar.weixin.mp.bean.device; +import com.google.gson.annotations.SerializedName; + import java.util.Arrays; import java.util.LinkedList; import java.util.List; @@ -8,35 +10,38 @@ import java.util.List; * Created by keungtung on 10/12/2016. */ public class WxDeviceAuthorize extends AbstractDeviceBean { - private String deivce_num; - private String op_type; - private List device_list = new LinkedList<>(); - - public String getDeivce_num() { - return deivce_num; + @SerializedName("device_num") + private String deviceNum; + @SerializedName("op_type") + private String opType; + @SerializedName("device_list") + private List deviceList = new LinkedList<>(); + + public String getDeviceNum() { + return deviceNum; } - public void setDeivce_num(String deivce_num) { - this.deivce_num = deivce_num; + public void setDeviceNum(String deviceNum) { + this.deviceNum = deviceNum; } - public String getOp_type() { - return op_type; + public String getOpType() { + return opType; } - public void setOp_type(String op_type) { - this.op_type = op_type; + public void setOpType(String opType) { + this.opType = opType; } - public List getDevice_list() { - return device_list; + public List getDeviceList() { + return deviceList; } - public void setDevice_list(List device_list) { - this.device_list = device_list; + public void setDeviceList(List deviceList) { + this.deviceList = deviceList; } public void addDevice(WxDevice... devices) { - this.device_list.addAll(Arrays.asList(devices)); + this.deviceList.addAll(Arrays.asList(devices)); } } diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceBind.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceBind.java index e4588478..1236048c 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceBind.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceBind.java @@ -1,11 +1,14 @@ package me.chanjar.weixin.mp.bean.device; +import com.google.gson.annotations.SerializedName; + /** * Created by keungtung on 10/12/2016. */ public class WxDeviceBind extends AbstractDeviceBean{ private String ticket; - private String device_id; + @SerializedName("device_id") + private String deviceId; private String openid; public String getTicket() { @@ -16,12 +19,12 @@ public class WxDeviceBind extends AbstractDeviceBean{ this.ticket = ticket; } - public String getDevice_id() { - return device_id; + public String getDeviceId() { + return deviceId; } - public void setDevice_id(String device_id) { - this.device_id = device_id; + public void setDeviceId(String deviceId) { + this.deviceId = deviceId; } public String getOpenid() { diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceBindResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceBindResult.java index 8f41a320..26bdb84c 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceBindResult.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceBindResult.java @@ -1,22 +1,24 @@ package me.chanjar.weixin.mp.bean.device; +import com.google.gson.annotations.SerializedName; import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder; /** * Created by keungtung on 10/12/2016. */ public class WxDeviceBindResult extends AbstractDeviceBean{ - private BaseResp base_resp; + @SerializedName("base_resp") + private BaseResp baseResp; public static WxDeviceBindResult fromJson(String json) { return WxMpGsonBuilder.create().fromJson(json, WxDeviceBindResult.class); } - public BaseResp getBase_resp() { - return base_resp; + public BaseResp getBaseResp() { + return baseResp; } - public void setBase_resp(BaseResp base_resp) { - this.base_resp = base_resp; + public void setBaseResp(BaseResp baseResp) { + this.baseResp = baseResp; } } diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceMsg.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceMsg.java index e01f09ab..bed1a8a2 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceMsg.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceMsg.java @@ -1,13 +1,17 @@ package me.chanjar.weixin.mp.bean.device; +import com.google.gson.annotations.SerializedName; import me.chanjar.weixin.common.util.ToStringUtils; /** * Created by keungtung on 10/12/2016. */ public class WxDeviceMsg extends AbstractDeviceBean{ + @SerializedName("device_type") private String deviceType; + @SerializedName("device_id") private String deviceId; + @SerializedName("open_id") private String openId; private String content; diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceQrCodeResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceQrCodeResult.java index c2f67c5f..9c89ff67 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceQrCodeResult.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceQrCodeResult.java @@ -1,49 +1,54 @@ package me.chanjar.weixin.mp.bean.device; +import com.google.gson.annotations.SerializedName; import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder; /** * Created by keungtung on 10/12/2016. */ public class WxDeviceQrCodeResult extends AbstractDeviceBean{ - private String deviceid; - private String qrticket; - private String devcielicence; - private RespMsg resp_msg; + @SerializedName("deviceid") + private String deviceId; + @SerializedName("qrticket") + private String qrTicket; + @SerializedName("devicelicence") + private String deviceLicence; + @SerializedName("resp_msg") + private RespMsg respMsg; public static WxDeviceQrCodeResult fromJson(String json) { return WxMpGsonBuilder.INSTANCE.create().fromJson(json, WxDeviceQrCodeResult.class); } - public String getDevcielicence() { - return devcielicence; + public String getDeviceLicence() { + return deviceLicence; } - public void setDevcielicence(String devcielicence) { - this.devcielicence = devcielicence; + public void setDeviceLicence(String deviceLicence) { + this.deviceLicence = deviceLicence; } - public RespMsg getResp_msg() { - return resp_msg; + public RespMsg getRespMsg() { + return respMsg; } - public void setResp_msg(RespMsg resp_msg) { - this.resp_msg = resp_msg; + public void setRespMsg(RespMsg respMsg) { + this.respMsg = respMsg; } - public String getDeviceid() { - return deviceid; + public String getDeviceId() { + return deviceId; } - public void setDeviceid(String deviceid) { - this.deviceid = deviceid; + public void setDeviceId(String deviceId) { + this.deviceId = deviceId; } - public String getQrticket() { - return qrticket; + public String getQrTicket() { + return qrTicket; } - public void setQrticket(String qrticket) { - this.qrticket = qrticket; + public void setQrTicket(String qrTicket) { + this.qrTicket = qrTicket; } }