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
1c36fc61
Commit
1c36fc61
authored
Sep 13, 2021
by
Kim Jinsung
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ソースコード指摘事項反映
parent
46342f26
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
4 deletions
+3
-4
ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/OperationLogic.java
+2
-2
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVAuthenticatedActivity.java
+1
-2
No files found.
ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/OperationLogic.java
View file @
1c36fc61
...
@@ -133,7 +133,7 @@ public class OperationLogic extends AbstractLogic {
...
@@ -133,7 +133,7 @@ public class OperationLogic extends AbstractLogic {
//サーバーからチャットプシュデータを取得
//サーバーからチャットプシュデータを取得
if
(
ABVDataCache
.
getInstance
().
serviceOption
.
isChat
())
{
if
(
ABVDataCache
.
getInstance
().
serviceOption
.
isChat
())
{
ChatPushDataJSON
chatPushJson
=
AcmsClient
.
getInstance
(
cache
.
getUrlPath
(),
networkAdapter
).
getChatPushList
(
param
);
ChatPushDataJSON
chatPushJson
=
AcmsClient
.
getInstance
(
cache
.
getUrlPath
(),
networkAdapter
).
getChatPushList
(
param
);
for
(
PushMessageDto
dto
:
chatPushJson
.
pushMessageList
)
{
for
(
PushMessageDto
dto
:
chatPushJson
.
pushMessageList
)
{
PushMessageDto
dtoTemp
=
mPushMessageDao
.
selectChat
(
dto
.
pushMessageId
,
dto
.
operationId
,
dto
.
pushSendDate
);
PushMessageDto
dtoTemp
=
mPushMessageDao
.
selectChat
(
dto
.
pushMessageId
,
dto
.
operationId
,
dto
.
pushSendDate
);
if
(
dtoTemp
==
null
)
{
if
(
dtoTemp
==
null
)
{
mPushMessageDao
.
insert
(
dto
);
mPushMessageDao
.
insert
(
dto
);
...
@@ -295,7 +295,7 @@ public class OperationLogic extends AbstractLogic {
...
@@ -295,7 +295,7 @@ public class OperationLogic extends AbstractLogic {
//サーバーからチャットプシュデータを取得
//サーバーからチャットプシュデータを取得
if
(
ABVDataCache
.
getInstance
().
serviceOption
.
isChat
())
{
if
(
ABVDataCache
.
getInstance
().
serviceOption
.
isChat
())
{
ChatPushDataJSON
chatPushJson
=
AcmsClient
.
getInstance
(
cache
.
getUrlPath
(),
networkAdapter
).
getChatPushList
(
param
);
ChatPushDataJSON
chatPushJson
=
AcmsClient
.
getInstance
(
cache
.
getUrlPath
(),
networkAdapter
).
getChatPushList
(
param
);
for
(
PushMessageDto
dto
:
chatPushJson
.
pushMessageList
)
{
for
(
PushMessageDto
dto
:
chatPushJson
.
pushMessageList
)
{
PushMessageDto
dtoTemp
=
mPushMessageDao
.
selectChat
(
dto
.
pushMessageId
,
dto
.
operationId
,
dto
.
pushSendDate
);
PushMessageDto
dtoTemp
=
mPushMessageDao
.
selectChat
(
dto
.
pushMessageId
,
dto
.
operationId
,
dto
.
pushSendDate
);
if
(
dtoTemp
==
null
)
{
if
(
dtoTemp
==
null
)
{
mPushMessageDao
.
insert
(
dto
);
mPushMessageDao
.
insert
(
dto
);
...
...
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVAuthenticatedActivity.java
View file @
1c36fc61
...
@@ -970,8 +970,7 @@ public abstract class ABVAuthenticatedActivity extends ABVActivity implements Co
...
@@ -970,8 +970,7 @@ public abstract class ABVAuthenticatedActivity extends ABVActivity implements Co
@Override
@Override
public
void
onDetailView
(
final
PushMessageDto
dto
)
{
public
void
onDetailView
(
final
PushMessageDto
dto
)
{
if
(
dto
.
roomName
!=
null
&&
dto
.
roomId
!=
0
)
if
(
dto
.
roomName
!=
null
&&
dto
.
roomId
!=
0
)
{
{
pushMessageLogic
.
updateReadingFlg
(
dto
.
pushMessageId
);
pushMessageLogic
.
updateReadingFlg
(
dto
.
pushMessageId
);
String
collaborationType
=
communicationLogic
.
getCollaborationType
(
dto
.
pushMessage
);
String
collaborationType
=
communicationLogic
.
getCollaborationType
(
dto
.
pushMessage
);
ActivityHandlingHelper
.
getInstance
().
startChatWebViewActivityWithPushMessage
(
dto
,
collaborationType
);
ActivityHandlingHelper
.
getInstance
().
startChatWebViewActivityWithPushMessage
(
dto
,
collaborationType
);
...
...
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