Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
abook_check
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abook_android
abook_check
Commits
9daff9e1
Commit
9daff9e1
authored
Mar 09, 2021
by
Lee Munkyeong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ルーム開設API修正。
parent
99e916bc
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
21 additions
and
6 deletions
+21
-6
ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/AcmsClient.java
+2
-2
ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/parameters/CreateRoomParameters.java
+8
-1
ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/CommunicationLogic.java
+5
-0
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/ChatWebviewActivity.java
+6
-3
No files found.
ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/AcmsClient.java
View file @
9daff9e1
...
...
@@ -603,8 +603,8 @@ public class AcmsClient implements AcmsClientResponseListener {
* @throws NetworkDisconnectedException
* @throws AcmsException
*/
public
CreatedRoomJSON
createRoom
(
String
sid
,
String
roomType
,
String
inviteMemberIds
,
String
newRoomName
)
throws
NetworkDisconnectedException
,
AcmsException
{
HttpResponse
response
=
send
(
AcmsApis
.
ApigetChatRooms
,
new
CreateRoomParameters
(
sid
,
AcmsApis
.
RoomCmds
.
createRoom
,
roomType
,
inviteMemberIds
,
newRoomName
));
public
CreatedRoomJSON
createRoom
(
String
sid
,
String
roomType
,
String
inviteMemberIds
,
String
newRoomName
,
String
memberName
)
throws
NetworkDisconnectedException
,
AcmsException
{
HttpResponse
response
=
send
(
AcmsApis
.
ApigetChatRooms
,
new
CreateRoomParameters
(
sid
,
AcmsApis
.
RoomCmds
.
createRoom
,
roomType
,
inviteMemberIds
,
newRoomName
,
memberName
));
CreatedRoomJSON
json
=
new
CreatedRoomJSON
(
response
.
httpResponseBody
);
return
json
;
}
...
...
ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/parameters/CreateRoomParameters.java
View file @
9daff9e1
...
...
@@ -19,6 +19,8 @@ public class CreateRoomParameters extends HttpParameterObject {
private
String
roomType
;
private
String
inviteMemberIds
;
private
String
newRoomName
;
private
String
memberName
;
/**
* {@link CreateRoomParameters} のインスタンスを初期化します。
* @param sid ログインした時のセッションIDです。
...
...
@@ -34,12 +36,13 @@ public class CreateRoomParameters extends HttpParameterObject {
* @param cmd Apiリクエストに必要なコマンド(ABOOK COMM専用)。
* @since 1.0.0
*/
public
CreateRoomParameters
(
String
sid
,
String
cmd
,
String
roomType
,
String
inviteMemberIds
,
String
newRoomName
)
{
public
CreateRoomParameters
(
String
sid
,
String
cmd
,
String
roomType
,
String
inviteMemberIds
,
String
newRoomName
,
String
memberName
)
{
this
.
sid
=
sid
;
this
.
cmd
=
cmd
;
this
.
roomType
=
roomType
;
this
.
inviteMemberIds
=
inviteMemberIds
;
this
.
newRoomName
=
newRoomName
;
this
.
memberName
=
memberName
;
}
/**
...
...
@@ -71,4 +74,8 @@ public class CreateRoomParameters extends HttpParameterObject {
public
String
getNewRoomName
()
{
return
newRoomName
;
}
public
String
getMemberName
()
{
return
memberName
;
}
}
ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/CommunicationLogic.java
View file @
9daff9e1
...
...
@@ -299,6 +299,11 @@ public class CommunicationLogic extends AbstractLogic {
groupDao
.
deleteGroupList
(
deleteGroupList
);
}
public
ShopMemberDto
getMyShopMemberDto
()
{
ShopMemberDto
myInfo
=
shopMemberDao
.
getMyInfo
();
return
myInfo
;
}
public
void
deleteChatRoomList
()
{
chatRoomDao
.
deleteChatRoom
();
}
...
...
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/ChatWebviewActivity.java
View file @
9daff9e1
...
...
@@ -92,6 +92,7 @@ public class ChatWebviewActivity extends ParentWebViewActivity {
private
String
shopName
;
private
boolean
isOnline
;
private
Long
roomId
;
private
Integer
shopMemberId
;
public
AlertDialog
myAlertDialog
;
...
...
@@ -135,6 +136,9 @@ public class ChatWebviewActivity extends ParentWebViewActivity {
Logger
.
d
(
"DEVICE_NOT_CONNECTED_NETWORK:"
);
}
shopMemberId
=
communicationLogic
.
getMyShopMemberDto
().
shopMemberId
;
mChatWebView
=
findViewById
(
R
.
id
.
chatWebview2
);
mChatWebView
.
setOverScrollMode
(
View
.
OVER_SCROLL_NEVER
);
//オーバースクロールしない。
mChatWebView
.
setVerticalScrollBarEnabled
(
false
);
//スクロールバーを消す。
...
...
@@ -720,7 +724,7 @@ public class ChatWebviewActivity extends ParentWebViewActivity {
@JavascriptInterface
public
void
createChatRoom
(
String
roomType
,
String
userIdList
,
String
encodedRoomName
)
throws
NetworkDisconnectedException
,
AcmsException
{
CreatedRoomJSON
resultJson
=
AcmsClient
.
getInstance
(
ABVEnvironment
.
getInstance
().
networkAdapter
).
createRoom
(
sid
,
roomType
,
userIdList
,
encodedRoomName
);
CreatedRoomJSON
resultJson
=
AcmsClient
.
getInstance
(
ABVEnvironment
.
getInstance
().
networkAdapter
).
createRoom
(
sid
,
roomType
,
userIdList
,
encodedRoomName
,
loginId
);
communicationLogic
.
insertChatRoom
(
resultJson
.
chatRoomDto
);
final
Integer
chatRoomId
=
resultJson
.
chatRoomDto
.
chatRoomId
;
final
String
chatRoomName
=
resultJson
.
chatRoomDto
.
chatRoomName
;
...
...
@@ -779,11 +783,10 @@ public class ChatWebviewActivity extends ParentWebViewActivity {
}
@JavascriptInterface
public
String
getGroupInfo
(
String
groupId
)
throws
NetworkDisconnectedException
,
AcmsException
{
public
String
getGroupInfo
(
String
groupId
)
{
String
groupInfoStr
=
communicationLogic
.
getGroupSearchData
(
Integer
.
parseInt
(
groupId
));
return
groupInfoStr
;
}
}
/**
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment