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
f1076f09
Commit
f1076f09
authored
Jun 13, 2021
by
Lee Munkyeong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
性能改善
parent
4f1c0a9f
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
193 additions
and
28 deletions
+193
-28
ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/AcmsClient.java
+15
-4
ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/json/ArchiveListJSON.java
+14
-5
ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/json/GroupListJSON.java
+7
-3
ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/json/MessageInfoListJSON.java
+7
-3
ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/json/RoomJSON.java
+45
-0
ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/json/RoomListJSON.java
+6
-1
ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/json/UnreadCountJSON.java
+47
-0
ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/parameters/GetMessagesParameters.java
+12
-1
ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/type/AcmsApis.java
+2
-0
ABVJE_BL/src/jp/agentec/abook/abv/bl/common/constant/ABookCommConstants.java
+2
-0
ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/ArchiveDao.java
+1
-1
ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/ChatMessageDao.java
+8
-0
ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/CommunicationLogic.java
+4
-0
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/ChatWebViewActivity.java
+23
-10
No files found.
ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/AcmsClient.java
View file @
f1076f09
...
...
@@ -40,10 +40,12 @@ import jp.agentec.abook.abv.bl.acms.client.json.OperationListJSON;
import
jp.agentec.abook.abv.bl.acms.client.json.ProcessDataJSON
;
import
jp.agentec.abook.abv.bl.acms.client.json.RequirePasswordChangeJSON
;
import
jp.agentec.abook.abv.bl.acms.client.json.ResultJSON
;
import
jp.agentec.abook.abv.bl.acms.client.json.RoomJSON
;
import
jp.agentec.abook.abv.bl.acms.client.json.RoomListJSON
;
import
jp.agentec.abook.abv.bl.acms.client.json.SceneEntryJSON
;
import
jp.agentec.abook.abv.bl.acms.client.json.ServerTimeZoneJSON
;
import
jp.agentec.abook.abv.bl.acms.client.json.ServiceOptionsJSON
;
import
jp.agentec.abook.abv.bl.acms.client.json.UnreadCountJSON
;
import
jp.agentec.abook.abv.bl.acms.client.json.UserInviteResultJSON
;
import
jp.agentec.abook.abv.bl.acms.client.json.WorkerGroupJSON
;
import
jp.agentec.abook.abv.bl.acms.client.parameters.AbstractAcmsLoginParameters
;
...
...
@@ -564,6 +566,12 @@ public class AcmsClient implements AcmsClientResponseListener {
return
json
;
}
public
RoomJSON
getRoom
(
String
sid
,
String
roomId
)
throws
NetworkDisconnectedException
,
AcmsException
{
HttpResponse
response
=
send
(
AcmsApis
.
ApigetChatRooms
,
new
GetMessagesParameters
(
sid
,
AcmsApis
.
RoomCmds
.
getRoom
,
roomId
,
null
,
null
,
null
));
RoomJSON
json
=
new
RoomJSON
(
response
.
httpResponseBody
);
return
json
;
}
/**
* ログインしたユーザの情報を取得する。
*
...
...
@@ -650,12 +658,17 @@ public class AcmsClient implements AcmsClientResponseListener {
* @throws NetworkDisconnectedException
* @throws AcmsException
*/
public
MessageInfoListJSON
getMessages
(
String
sid
,
String
roomId
)
throws
NetworkDisconnectedException
,
AcmsException
{
HttpResponse
response
=
send
(
AcmsApis
.
ApigetMessage
,
new
GetMessagesParameters
(
sid
,
AcmsApis
.
MessageCmds
.
getMessages
,
roomId
,
"0"
));
public
MessageInfoListJSON
getMessages
(
String
sid
,
String
roomId
,
String
messageId
,
String
updateDate
)
throws
NetworkDisconnectedException
,
AcmsException
{
HttpResponse
response
=
send
(
AcmsApis
.
ApigetMessage
,
new
GetMessagesParameters
(
sid
,
AcmsApis
.
MessageCmds
.
getMessages
,
roomId
,
"0"
,
messageId
,
updateDate
));
MessageInfoListJSON
json
=
new
MessageInfoListJSON
(
response
.
httpResponseBody
);
return
json
;
}
public
UnreadCountJSON
getMessagesUnreadCount
(
String
sid
,
String
roomId
)
throws
NetworkDisconnectedException
,
AcmsException
{
HttpResponse
response
=
send
(
AcmsApis
.
ApigetMessage
,
new
GetMessagesParameters
(
sid
,
AcmsApis
.
MessageCmds
.
getUnreadCount
,
roomId
,
"0"
,
null
,
null
));
UnreadCountJSON
json
=
new
UnreadCountJSON
(
response
.
httpResponseBody
);
return
json
;
}
/**
* ユーザ招待。
*
...
...
@@ -1127,9 +1140,7 @@ public class AcmsClient implements AcmsClientResponseListener {
*/
private
HttpResponse
send
(
String
methodName
,
HttpParameterObject
param
)
throws
NetworkDisconnectedException
,
AcmsException
{
Logger
.
d
(
TAG
,
"call api : %s"
,
methodName
);
String
apiUrl
=
AcmsApis
.
getApiUrl
(
env
.
acmsAddress
,
urlPath
,
methodName
);
HttpResponse
response
=
send
(
apiUrl
,
methodName
,
param
);
// 最終アクセス時間更新
...
...
ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/json/ArchiveListJSON.java
View file @
f1076f09
...
...
@@ -8,9 +8,11 @@ import java.util.ArrayList;
import
jp.agentec.abook.abv.bl.common.constant.ABookCommConstants
;
import
jp.agentec.abook.abv.bl.common.exception.AcmsException
;
import
jp.agentec.abook.abv.bl.common.exception.JSONValidationException
;
import
jp.agentec.abook.abv.bl.common.util.JsonUtil
;
import
jp.agentec.abook.abv.bl.dto.ArchiveDto
;
import
jp.agentec.abook.abv.bl.dto.ChatGroupDto
;
import
jp.agentec.abook.abv.bl.dto.ShopMemberDto
;
import
jp.agentec.adf.util.DateTimeFormat
;
import
jp.agentec.adf.util.DateTimeUtil
;
public
class
ArchiveListJSON
extends
AcmsCommonJSON
{
...
...
@@ -41,18 +43,25 @@ public class ArchiveListJSON extends AcmsCommonJSON {
ArchiveDto
archiveDto
=
new
ArchiveDto
();
archiveDto
.
archiveId
=
archiveJSON
.
getInt
(
ABookCommConstants
.
KEY
.
ARCHIVE_ID
);
archiveDto
.
collaborationDetailId
=
archiveJSON
.
getInt
(
ABookCommConstants
.
KEY
.
COLLABORATION_DEATAIL_ID
);
archiveDto
.
archiveName
=
archiveJSON
.
getString
(
ABookCommConstants
.
KEY
.
ARCHIVE_NAME
);
archiveDto
.
archiveType
=
archiveJSON
.
getInt
(
ABookCommConstants
.
KEY
.
ARCHIVE_TYPE
);
archiveDto
.
archiveDate
=
DateTimeUtil
.
millToDateString
(
archiveJSON
.
getJSONObject
(
ABookCommConstants
.
KEY
.
ARCHIVE_DATE
)
.
getLong
(
ABookCommConstants
.
KEY
.
TIME
),
"yyyy/MM/dd HH:mm"
);
archiveDto
.
archiveType
=
archiveJSON
.
getInt
(
ABookCommConstants
.
KEY
.
ARCHIVE_TYPE
);
archiveDto
.
delFlg
=
archiveJSON
.
getInt
(
ABookCommConstants
.
KEY
.
DEL_FLG
);
archiveDto
.
collaborationDetailId
=
archiveJSON
.
getInt
(
ABookCommConstants
.
KEY
.
COLLABORATION_DEATAIL_ID
);
archiveDto
.
roomId
=
archiveJSON
.
getInt
(
ABookCommConstants
.
KEY
.
ROOM_ID
);
archiveDto
.
saveUserId
=
archiveJSON
.
getInt
(
ABookCommConstants
.
KEY
.
SAVE_USER_ID
);
archiveDto
.
filePath
=
archiveJSON
.
getString
(
ABookCommConstants
.
KEY
.
FILE_PATH
);
if
(
archiveJSON
.
has
(
ABookCommConstants
.
KEY
.
ATTEND_USER_IDS
))
{
archiveDto
.
attendUserIds
=
archiveJSON
.
getJSONArray
(
ABookCommConstants
.
KEY
.
ATTEND_USER_IDS
).
toString
();
}
archiveList
.
add
(
archiveDto
);
}
if
(
json
.
getJSONObject
(
ABookCommConstants
.
KEY
.
BODY
).
has
(
ABookCommConstants
.
KEY
.
ARCHIVE_INFO_LAST_UPDATE_DATE
))
{
archiveLastUpdateDate
=
json
.
getJSONObject
(
ABookCommConstants
.
KEY
.
BODY
).
getString
(
ABookCommConstants
.
KEY
.
ARCHIVE_INFO_LAST_UPDATE_DATE
);
}
String
time
=
JsonUtil
.
getString
(
json
,
PresentTime
);
presentTime
=
DateTimeUtil
.
toDate
(
time
,
DateTimeFormat
.
yyyyMMddHHmmss_hyphen
);
archiveLastUpdateDate
=
DateTimeUtil
.
toString
(
presentTime
,
DateTimeFormat
.
yyyyMMddHHmmss_none
);
}
}
ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/json/GroupListJSON.java
View file @
f1076f09
...
...
@@ -4,12 +4,16 @@ import org.json.adf.JSONArray;
import
org.json.adf.JSONObject
;
import
java.util.ArrayList
;
import
java.util.Date
;
import
jp.agentec.abook.abv.bl.common.constant.ABookCommConstants
;
import
jp.agentec.abook.abv.bl.common.exception.AcmsException
;
import
jp.agentec.abook.abv.bl.common.exception.JSONValidationException
;
import
jp.agentec.abook.abv.bl.common.util.JsonUtil
;
import
jp.agentec.abook.abv.bl.dto.ChatGroupDto
;
import
jp.agentec.abook.abv.bl.dto.ShopMemberDto
;
import
jp.agentec.adf.util.DateTimeFormat
;
import
jp.agentec.adf.util.DateTimeUtil
;
public
class
GroupListJSON
extends
AcmsCommonJSON
{
...
...
@@ -65,9 +69,9 @@ public class GroupListJSON extends AcmsCommonJSON {
}
groupList
.
add
(
groupDto
);
}
if
(
json
.
getJSONObject
(
ABookCommConstants
.
KEY
.
BODY
).
has
(
ABookCommConstants
.
KEY
.
LAST_REQUEST_DATE
))
{
lastRequestDate
=
json
.
getJSONObject
(
ABookCommConstants
.
KEY
.
BODY
).
getString
(
ABookCommConstants
.
KEY
.
LAST_REQUEST_DATE
);
}
String
time
=
JsonUtil
.
getString
(
json
,
PresentTime
);
presentTime
=
DateTimeUtil
.
toDate
(
time
,
DateTimeFormat
.
yyyyMMddHHmmss_hyphen
);
lastRequestDate
=
DateTimeUtil
.
toString
(
presentTime
,
DateTimeFormat
.
yyyyMMddHHmmss_none
);
}
}
...
...
ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/json/MessageInfoListJSON.java
View file @
f1076f09
...
...
@@ -9,8 +9,10 @@ import java.util.HashMap;
import
jp.agentec.abook.abv.bl.common.constant.ABookCommConstants
;
import
jp.agentec.abook.abv.bl.common.exception.AcmsException
;
import
jp.agentec.abook.abv.bl.common.exception.JSONValidationException
;
import
jp.agentec.abook.abv.bl.common.util.JsonUtil
;
import
jp.agentec.abook.abv.bl.dto.ChatMessageDto
;
import
jp.agentec.abook.abv.bl.dto.ShopMemberDto
;
import
jp.agentec.adf.util.DateTimeFormat
;
import
jp.agentec.adf.util.DateTimeUtil
;
public
class
MessageInfoListJSON
extends
AcmsCommonJSON
{
...
...
@@ -18,6 +20,7 @@ public class MessageInfoListJSON extends AcmsCommonJSON {
public
ArrayList
<
ChatMessageDto
>
chatMessageDtoArrayList
;
public
ArrayList
<
ShopMemberDto
>
shopMemberDtoArrayList
;
public
String
updateDate
;
public
MessageInfoListJSON
(
String
jsonString
)
throws
AcmsException
{
super
(
jsonString
);
...
...
@@ -54,14 +57,11 @@ public class MessageInfoListJSON extends AcmsCommonJSON {
}
else
{
chatMessageDto
.
message
=
messageInfoJSON
.
getString
(
ABookCommConstants
.
KEY
.
MESSAGE
);
}
chatMessageDto
.
unreadCount
=
messageInfoJSON
.
getInt
(
ABookCommConstants
.
KEY
.
UNREAD_COUNT
);
if
(
messageInfoJSON
.
has
(
ABookCommConstants
.
KEY
.
TIME
))
{
chatMessageDto
.
insertDate
=
DateTimeUtil
.
millToDateString
(
messageInfoJSON
.
getJSONObject
(
ABookCommConstants
.
KEY
.
TIME
).
getLong
(
ABookCommConstants
.
KEY
.
TIME
));
}
chatMessageDtoArrayList
.
add
(
chatMessageDto
);
if
(
existShopMmeberMap
.
get
(
chatMessageDto
.
shopMemberId
)
!=
null
)
{
continue
;
}
ShopMemberDto
shopMemberDto
=
new
ShopMemberDto
();
shopMemberDto
.
shopMemberId
=
messageInfoJSON
.
getInt
(
ABookCommConstants
.
KEY
.
SHOP_MEMBER_ID
);
...
...
@@ -74,6 +74,10 @@ public class MessageInfoListJSON extends AcmsCommonJSON {
shopMemberDtoArrayList
.
add
(
shopMemberDto
);
}
String
time
=
JsonUtil
.
getString
(
json
,
PresentTime
);
presentTime
=
DateTimeUtil
.
toDate
(
time
,
DateTimeFormat
.
yyyyMMddHHmmss_hyphen
);
updateDate
=
DateTimeUtil
.
toString
(
presentTime
,
DateTimeFormat
.
yyyyMMddHHmmss_none
);
}
}
ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/json/RoomJSON.java
0 → 100644
View file @
f1076f09
package
jp
.
agentec
.
abook
.
abv
.
bl
.
acms
.
client
.
json
;
import
org.json.adf.JSONArray
;
import
org.json.adf.JSONObject
;
import
java.util.ArrayList
;
import
jp.agentec.abook.abv.bl.common.constant.ABookCommConstants
;
import
jp.agentec.abook.abv.bl.common.exception.AcmsException
;
import
jp.agentec.abook.abv.bl.common.exception.JSONValidationException
;
import
jp.agentec.abook.abv.bl.dto.ChatMessageDto
;
import
jp.agentec.abook.abv.bl.dto.ChatRoomDto
;
import
jp.agentec.adf.util.DateTimeUtil
;
public
class
RoomJSON
extends
AcmsCommonJSON
{
public
ChatRoomDto
chatRoomDto
;
public
RoomJSON
(
String
jsonString
)
throws
AcmsException
{
super
(
jsonString
);
}
@Override
protected
void
parse
(
JSONObject
json
)
throws
JSONValidationException
{
// ルーム一覧情報を取得
if
(!
json
.
has
(
ABookCommConstants
.
KEY
.
BODY
))
{
return
;
}
JSONObject
roomInfo
=
json
.
getJSONObject
(
ABookCommConstants
.
KEY
.
BODY
);
chatRoomDto
=
new
ChatRoomDto
();
chatRoomDto
.
chatRoomId
=
roomInfo
.
getInt
(
ABookCommConstants
.
KEY
.
ROOM_ID
);
chatRoomDto
.
chatRoomName
=
roomInfo
.
getString
(
ABookCommConstants
.
KEY
.
ROOM_NAME
);
chatRoomDto
.
type
=
roomInfo
.
getInt
(
ABookCommConstants
.
KEY
.
ROOM_TYPE
);
chatRoomDto
.
userCount
=
roomInfo
.
getJSONArray
(
ABookCommConstants
.
KEY
.
ATTEND_USER_IDS
).
length
();
JSONArray
attendUsers
=
roomInfo
.
getJSONArray
(
ABookCommConstants
.
KEY
.
ATTEND_USER_IDS
);
ArrayList
<
Integer
>
attendUserList
=
new
ArrayList
<
Integer
>();
for
(
int
attendUserCount
=
0
;
attendUserCount
<
attendUsers
.
length
();
attendUserCount
++)
{
attendUserList
.
add
((
Integer
)
attendUsers
.
get
(
attendUserCount
));
}
chatRoomDto
.
attendUsers
=
attendUserList
;
}
}
ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/json/RoomListJSON.java
View file @
f1076f09
...
...
@@ -48,8 +48,13 @@ public class RoomListJSON extends AcmsCommonJSON {
JSONObject
lastMessageInfoJSON
=
roomListJsonArray
.
getJSONObject
(
listCount
).
has
(
ABookCommConstants
.
KEY
.
LAST_MESSAGE_INFO
)
?
roomListJsonArray
.
getJSONObject
(
listCount
).
getJSONObject
(
ABookCommConstants
.
KEY
.
LAST_MESSAGE_INFO
)
:
null
;
if
(
lastMessageInfoJSON
!=
null
&&
lastMessageInfoJSON
.
has
(
ABookCommConstants
.
KEY
.
MESSAGE_ID
))
{
chatMessageDto
.
chatRoomId
=
chatRoomDto
.
chatRoomId
;
chatMessageDto
.
message
=
lastMessageInfoJSON
.
getString
(
ABookCommConstants
.
KEY
.
MESSAGE
);
chatMessageDto
.
messageType
=
lastMessageInfoJSON
.
getInt
(
ABookCommConstants
.
KEY
.
MESSAGE_TYPE
);
if
(
ABookCommConstants
.
FLAG
.
MESSAGE_TYPE
.
COLLABORATION_START
.
equals
(
chatMessageDto
.
messageType
)
||
ABookCommConstants
.
FLAG
.
MESSAGE_TYPE
.
COLLABORATION_END
.
equals
(
chatMessageDto
.
messageType
))
{
chatMessageDto
.
message
=
lastMessageInfoJSON
.
getJSONObject
(
ABookCommConstants
.
KEY
.
MESSAGE
).
toString
();
}
else
{
chatMessageDto
.
message
=
lastMessageInfoJSON
.
getString
(
ABookCommConstants
.
KEY
.
MESSAGE
);
}
if
(
lastMessageInfoJSON
.
has
(
ABookCommConstants
.
KEY
.
INSERT_DATE
))
{
chatMessageDto
.
insertDate
=
DateTimeUtil
.
millToDateString
(
lastMessageInfoJSON
.
getJSONObject
(
ABookCommConstants
.
KEY
.
INSERT_DATE
).
getLong
(
ABookCommConstants
.
KEY
.
TIME
));
}
...
...
ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/json/UnreadCountJSON.java
0 → 100644
View file @
f1076f09
package
jp
.
agentec
.
abook
.
abv
.
bl
.
acms
.
client
.
json
;
import
org.json.adf.JSONArray
;
import
org.json.adf.JSONObject
;
import
java.util.ArrayList
;
import
java.util.HashMap
;
import
jp.agentec.abook.abv.bl.common.constant.ABookCommConstants
;
import
jp.agentec.abook.abv.bl.common.exception.AcmsException
;
import
jp.agentec.abook.abv.bl.common.exception.JSONValidationException
;
import
jp.agentec.abook.abv.bl.common.util.JsonUtil
;
import
jp.agentec.abook.abv.bl.dto.ChatMessageDto
;
import
jp.agentec.abook.abv.bl.dto.ShopMemberDto
;
import
jp.agentec.adf.util.DateTimeFormat
;
import
jp.agentec.adf.util.DateTimeUtil
;
public
class
UnreadCountJSON
extends
AcmsCommonJSON
{
public
ArrayList
<
ChatMessageDto
>
chatMessageDtoArrayList
;
public
UnreadCountJSON
(
String
jsonString
)
throws
AcmsException
{
super
(
jsonString
);
}
@Override
protected
void
parse
(
JSONObject
json
)
throws
JSONValidationException
{
// メッセージ情報を取得
if
(!
json
.
has
(
ABookCommConstants
.
KEY
.
BODY
))
{
return
;
}
HashMap
<
Integer
,
Integer
>
existShopMmeberMap
=
new
HashMap
<
Integer
,
Integer
>();
JSONArray
unreadCountList
=
json
.
getJSONArray
(
ABookCommConstants
.
KEY
.
BODY
);
if
(
unreadCountList
==
null
)
{
return
;
}
chatMessageDtoArrayList
=
new
ArrayList
<
ChatMessageDto
>();
for
(
int
listCount
=
0
;
listCount
<
unreadCountList
.
length
();
listCount
++)
{
ChatMessageDto
chatMessageDto
=
new
ChatMessageDto
();
JSONObject
messageInfoJSON
=
unreadCountList
.
getJSONObject
(
listCount
);
if
(
messageInfoJSON
==
null
)
{
continue
;
}
chatMessageDto
.
chatMessageId
=
messageInfoJSON
.
getInt
(
ABookCommConstants
.
KEY
.
MESSAGE_ID
);
chatMessageDto
.
unreadCount
=
messageInfoJSON
.
getInt
(
ABookCommConstants
.
KEY
.
UNREAD_COUNT
);
chatMessageDtoArrayList
.
add
(
chatMessageDto
);
}
}
}
ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/parameters/GetMessagesParameters.java
View file @
f1076f09
...
...
@@ -17,6 +17,8 @@ public class GetMessagesParameters extends HttpParameterObject {
private
String
cmd
;
private
String
roomId
;
private
String
lineNum
;
private
String
messageId
;
private
String
updateDate
;
/**
* {@link GetMessagesParameters} のインスタンスを初期化します。
...
...
@@ -33,11 +35,13 @@ public class GetMessagesParameters extends HttpParameterObject {
* @param cmd Apiリクエストに必要なコマンド(ABOOK COMM専用)。
* @since 1.0.0
*/
public
GetMessagesParameters
(
String
sid
,
String
cmd
,
String
roomId
,
String
lineNum
)
{
public
GetMessagesParameters
(
String
sid
,
String
cmd
,
String
roomId
,
String
lineNum
,
String
messageId
,
String
updateDate
)
{
this
.
sid
=
sid
;
this
.
cmd
=
cmd
;
this
.
roomId
=
roomId
;
this
.
lineNum
=
lineNum
;
this
.
messageId
=
messageId
;
this
.
updateDate
=
updateDate
;
}
/**
...
...
@@ -66,4 +70,11 @@ public class GetMessagesParameters extends HttpParameterObject {
return
lineNum
;
}
public
String
getMessageId
()
{
return
messageId
;
}
public
String
getUpdateDate
()
{
return
updateDate
;
}
}
ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/type/AcmsApis.java
View file @
f1076f09
...
...
@@ -188,10 +188,12 @@ public class AcmsApis {
public
static
final
String
getRoomList
=
"5"
;
public
static
final
String
createRoom
=
"2"
;
public
static
final
String
changeRoomName
=
"6"
;
public
static
final
String
getRoom
=
"7"
;
}
public
static
final
class
MessageCmds
{
public
static
final
String
getMessages
=
"2"
;
public
static
final
String
getUnreadCount
=
"4"
;
}
public
static
final
class
FavoriteCmds
{
...
...
ABVJE_BL/src/jp/agentec/abook/abv/bl/common/constant/ABookCommConstants.java
View file @
f1076f09
...
...
@@ -82,6 +82,8 @@ public interface ABookCommConstants {
String
ROOT_GROUP_ID
=
"rootGroupId"
;
String
GROUP_MEMBER_UPDATED_DATE
=
"groupMemberUpdatedDate"
;
String
MESSAGE_UPDATED_DATE
=
"MessageUpdatedDate"
;
String
ARCHIVE_UPDATED_DATE
=
"ArchiveUpdatedDate"
;
String
HTTP_STATUS
=
"httpStatus"
;
interface
API_KIND
{
String
USER
=
"user"
;
...
...
ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/ArchiveDao.java
View file @
f1076f09
...
...
@@ -161,7 +161,7 @@ public class ArchiveDao extends AbstractCommunicationDao {
}
public
boolean
updateArchiveDetailInfo
(
ArchiveDto
dto
)
{
long
count
=
update
(
"update t_archive set
archive_name=?, archive_type=?, archive_date=?, room_id=?, room_name=?, attend_user_ids=?, file_path=?, save_user_id=? where archive_id=?"
,
dto
.
getUpdateDetailValues
()
);
long
count
=
update
(
"update t_archive set
room_name=? where archive_id=?"
,
new
String
[]{
""
+
dto
.
roomName
,
""
+
dto
.
archiveId
}
);
return
count
>
0
;
}
...
...
ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/ChatMessageDao.java
View file @
f1076f09
...
...
@@ -177,6 +177,14 @@ public class ChatMessageDao extends AbstractCommunicationDao {
return
count
>
0
;
}
public
void
updatUnreadCount
(
List
<
ChatMessageDto
>
messageDtoList
)
{
beginTransaction
();
for
(
ChatMessageDto
messageDto
:
messageDtoList
)
{
update
(
"update t_chat_message set unread_count = ? where chat_message_id=?"
,
new
String
[]{
""
+
messageDto
.
unreadCount
,
""
+
messageDto
.
chatMessageId
});
}
commit
();
}
public
void
deleteChatMessage
()
{
try
{
beginTransaction
();
...
...
ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/CommunicationLogic.java
View file @
f1076f09
...
...
@@ -1089,4 +1089,8 @@ public class CommunicationLogic extends AbstractLogic {
}
return
map
;
}
public
void
updateUnreadCount
(
List
<
ChatMessageDto
>
messageList
)
{
chatMessageDao
.
updatUnreadCount
(
messageList
);
}
}
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/ChatWebViewActivity.java
View file @
f1076f09
...
...
@@ -76,7 +76,9 @@ import jp.agentec.abook.abv.bl.acms.client.json.GetFavoriteUserJSON;
import
jp.agentec.abook.abv.bl.acms.client.json.GroupListJSON
;
import
jp.agentec.abook.abv.bl.acms.client.json.MessageInfoListJSON
;
import
jp.agentec.abook.abv.bl.acms.client.json.MyInfoJSON
;
import
jp.agentec.abook.abv.bl.acms.client.json.RoomJSON
;
import
jp.agentec.abook.abv.bl.acms.client.json.RoomListJSON
;
import
jp.agentec.abook.abv.bl.acms.client.json.UnreadCountJSON
;
import
jp.agentec.abook.abv.bl.acms.client.json.UserInviteResultJSON
;
import
jp.agentec.abook.abv.bl.common.ABVEnvironment
;
import
jp.agentec.abook.abv.bl.common.CommonExecutor
;
...
...
@@ -1050,6 +1052,8 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity {
Map
<
String
,
Object
>
chatRoomList
;
RoomListJSON
resultJson
=
AcmsClient
.
getInstance
(
ABVEnvironment
.
getInstance
().
networkAdapter
).
getRoomList
(
sid
);
communicationLogic
.
insertChatRoomList
(
resultJson
.
roomList
);
}
@JavascriptInterface
...
...
@@ -1178,12 +1182,18 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity {
@JavascriptInterface
public
void
updateMessages
(
String
roomId
)
throws
NetworkDisconnectedException
,
AcmsException
{
MessageInfoListJSON
resultJson
=
AcmsClient
.
getInstance
(
ABVEnvironment
.
getInstance
().
networkAdapter
).
getMessages
(
sid
,
roomId
);
SharedPreferences
pref
=
getSharedPreferences
(
ABookCommConstants
.
TAG
,
MODE_PRIVATE
);
String
lastUpdatedDate
=
pref
.
getString
(
ABookCommConstants
.
KEY
.
MESSAGE_UPDATED_DATE
+
roomId
,
DEFAULT_CHECKSUM
);
MessageInfoListJSON
resultJson
=
AcmsClient
.
getInstance
(
ABVEnvironment
.
getInstance
().
networkAdapter
).
getMessages
(
sid
,
roomId
,
null
,
lastUpdatedDate
);
for
(
ChatMessageDto
chatMessageDto
:
resultJson
.
chatMessageDtoArrayList
)
{
chatMessageDto
.
chatRoomId
=
Integer
.
parseInt
(
roomId
);
}
communicationLogic
.
insertMessageList
(
resultJson
.
chatMessageDtoArrayList
);
communicationLogic
.
insertShopMember
(
resultJson
.
shopMemberDtoArrayList
);
updateUnreadCount
();
SharedPreferences
.
Editor
editor
=
pref
.
edit
();
editor
.
putString
(
ABookCommConstants
.
KEY
.
MESSAGE_UPDATED_DATE
+
roomId
,
resultJson
.
updateDate
);
editor
.
commit
();
}
@JavascriptInterface
...
...
@@ -1432,13 +1442,12 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity {
@JavascriptInterface
public
void
updateArchiveList
()
throws
NetworkDisconnectedException
,
AcmsException
{
SharedPreferences
pref
=
getSharedPreferences
(
ABookCommConstants
.
TAG
,
MODE_PRIVATE
);
String
updateDate
=
pref
.
getString
(
ABookCommConstants
.
KEY
.
ARCHIVE_
INFO_LAST_UPDATE
_DATE
,
DEFAULT_CHECKSUM
);
String
updateDate
=
pref
.
getString
(
ABookCommConstants
.
KEY
.
ARCHIVE_
UPDATED
_DATE
,
DEFAULT_CHECKSUM
);
ArchiveListJSON
resultJson
=
AcmsClient
.
getInstance
(
ABVEnvironment
.
getInstance
().
networkAdapter
).
getArchives
(
sid
,
updateDate
);
communicationLogic
.
updateArchives
(
resultJson
.
archiveList
);
if
(
StringUtil
.
isNullOrEmpty
(
resultJson
.
archiveLastUpdateDate
))
{
return
;
}
SharedPreferences
.
Editor
editor
=
pref
.
edit
();
editor
.
putString
(
ABookCommConstants
.
KEY
.
ARCHIVE_
INFO_LAST_UPDATE
_DATE
,
resultJson
.
archiveLastUpdateDate
);
editor
.
putString
(
ABookCommConstants
.
KEY
.
ARCHIVE_
UPDATED
_DATE
,
resultJson
.
archiveLastUpdateDate
);
editor
.
commit
();
}
...
...
@@ -1476,12 +1485,9 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity {
@JavascriptInterface
public
void
updateArchiveDetail
(
String
archiveId
)
throws
NetworkDisconnectedException
,
AcmsException
{
ArchiveDto
archiveDto
=
communicationLogic
.
getArchive
(
Integer
.
parseInt
(
archiveId
));
ArchiveDetailJSON
resultJson
=
AcmsClient
.
getInstance
(
ABVEnvironment
.
getInstance
().
networkAdapter
).
getArchiveDetail
(
sid
,
Integer
.
parseInt
(
archiveId
),
archiveDto
.
collaborationDetailId
);
if
(
resultJson
.
archiveDto
==
null
)
{
return
;
}
communicationLogic
.
updateArchiveDetial
(
resultJson
.
archiveDto
);
RoomJSON
resultJson
=
AcmsClient
.
getInstance
(
ABVEnvironment
.
getInstance
().
networkAdapter
).
getRoom
(
sid
,
archiveDto
.
roomId
.
toString
());
archiveDto
.
roomName
=
resultJson
.
chatRoomDto
.
chatRoomName
;
communicationLogic
.
updateArchiveDetial
(
archiveDto
);
}
@JavascriptInterface
...
...
@@ -1825,6 +1831,8 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity {
communicationLogic
.
updateFavoriteUser
(
resultJson
.
favoriteUserIds
);
}
private
void
updateFavoriteGroup
()
throws
NetworkDisconnectedException
,
AcmsException
{
GetFavoriteGroupJSON
resultJson
=
AcmsClient
.
getInstance
(
ABVEnvironment
.
getInstance
().
networkAdapter
).
getFavoriteGroup
(
sid
);
communicationLogic
.
updateFavoriteGroup
(
resultJson
.
favoriteGroupIds
);
...
...
@@ -1982,4 +1990,9 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity {
json
.
put
(
MeetingManager
.
LOGIN_ID
,
ABVDataCache
.
getInstance
().
getMemberInfo
().
loginId
);
meetingManager
.
sendWs
(
MeetingManager
.
CMD_PRESENTERREQUEST
,
contentViewActivity
!=
null
?
contentViewActivity
.
getContentId
()
:
0
,
null
,
null
,
json
);
}
public
void
updateUnreadCount
()
throws
NetworkDisconnectedException
,
AcmsException
{
UnreadCountJSON
resultJson
=
AcmsClient
.
getInstance
(
ABVEnvironment
.
getInstance
().
networkAdapter
).
getMessagesUnreadCount
(
sid
,
Integer
.
toString
(
roomId
.
intValue
()));
communicationLogic
.
updateUnreadCount
(
resultJson
.
chatMessageDtoArrayList
);
}
}
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