Skip to content

A
abook_check
Commit 8579b74d by Lee Munkyeong
Options

Merge branch 'features/abcomm_sp5' into 'features/abcomm_sp5_group_search_UI' 

# Conflicts:
#   ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/ShopMemberDao.java
#   ABVJE_BL/src/jp/agentec/adf/net/http/HttpParameterObject.java
parents 47e48b13 c10ae0b2
Showing with 5 additions and 5 deletions
ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/AcmsClient.java
...@@ -575,7 +575,7 @@ public class AcmsClient implements AcmsClientResponseListener { ...@@ -575,7 +575,7 @@ public class AcmsClient implements AcmsClientResponseListener {
* @throws NetworkDisconnectedException * @throws NetworkDisconnectedException
* @throws AcmsException * @throws AcmsException
*/ */
public MyInfoJSON getNameCard(String sid,String shopMemberId) throws NetworkDisconnectedException, AcmsException { public MyInfoJSON getNameCard(String sid, String shopMemberId) throws NetworkDisconnectedException, AcmsException {
HttpResponse response = send(AcmsApis.ApigetUser, new GetNameCardParameters(sid, AcmsApis.UserCmds.getNameCard, shopMemberId)); HttpResponse response = send(AcmsApis.ApigetUser, new GetNameCardParameters(sid, AcmsApis.UserCmds.getNameCard, shopMemberId));
MyInfoJSON json = new MyInfoJSON(response.httpResponseBody); MyInfoJSON json = new MyInfoJSON(response.httpResponseBody);
return json; return json;
...@@ -591,8 +591,8 @@ public class AcmsClient implements AcmsClientResponseListener { ...@@ -591,8 +591,8 @@ public class AcmsClient implements AcmsClientResponseListener {
* @throws NetworkDisconnectedException * @throws NetworkDisconnectedException
* @throws AcmsException * @throws AcmsException
*/ */
public GroupListJSON getGroupInfo(String sid,String groupId,String updatedDate) throws NetworkDisconnectedException, AcmsException { public GroupListJSON getGroupInfo(String sid, String groupId, String updatedDate) throws NetworkDisconnectedException, AcmsException {
HttpResponse response = send(AcmsApis.ApigetUser, new GetGroupInfoParameters(sid, AcmsApis.UserCmds.getGroupInfo,groupId, updatedDate)); HttpResponse response = send(AcmsApis.ApigetUser, new GetGroupInfoParameters(sid, AcmsApis.UserCmds.getGroupInfo, groupId, updatedDate));
GroupListJSON json = new GroupListJSON(response.httpResponseBody); GroupListJSON json = new GroupListJSON(response.httpResponseBody);
return json; return json;
} }
...@@ -624,7 +624,7 @@ public class AcmsClient implements AcmsClientResponseListener { ...@@ -624,7 +624,7 @@ public class AcmsClient implements AcmsClientResponseListener {
* @throws AcmsException * @throws AcmsException
*/ */
public MessageInfoListJSON getMessages(String sid, String roomId) throws NetworkDisconnectedException, AcmsException { public MessageInfoListJSON getMessages(String sid, String roomId) throws NetworkDisconnectedException, AcmsException {
HttpResponse response = send(AcmsApis.ApigetMessage, new GetMessagesParameters(sid, AcmsApis.MessageCmds.getMessages, roomId,"0")); HttpResponse response = send(AcmsApis.ApigetMessage, new GetMessagesParameters(sid, AcmsApis.MessageCmds.getMessages, roomId, "0"));
MessageInfoListJSON json = new MessageInfoListJSON(response.httpResponseBody); MessageInfoListJSON json = new MessageInfoListJSON(response.httpResponseBody);
return json; return json;
} }
......
chat @ 86aeab7c
Subproject commit e26e1370e79dff1eb5798ca86d41da8d768600d4 Subproject commit 86aeab7cc35f7886982389776a8450a4c5e82d2a
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment