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
c1cbc3ca
Commit
c1cbc3ca
authored
Sep 06, 2021
by
Kim Eunchul
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
協業招待プッシュメッセージ方法変更
parent
ff749821
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
ABVJE_UI_Android/src/jp/agentec/abook/abv/cl/push/ABVFcmListenerService.java
+2
-2
ABVJE_UI_Android/src/jp/agentec/abook/abv/cl/push/PushMessageJSON.java
+2
-2
No files found.
ABVJE_UI_Android/src/jp/agentec/abook/abv/cl/push/ABVFcmListenerService.java
View file @
c1cbc3ca
...
@@ -239,7 +239,7 @@ public class ABVFcmListenerService extends FirebaseMessagingService {
...
@@ -239,7 +239,7 @@ public class ABVFcmListenerService extends FirebaseMessagingService {
textMessage
.
contains
(
ABookCommConstants
.
COLLABORATION
.
INVITE_COLLABORATION
.
KR
)
textMessage
.
contains
(
ABookCommConstants
.
COLLABORATION
.
INVITE_COLLABORATION
.
KR
)
)
{
)
{
roomType
=
Integer
.
toString
(
json
.
getInt
(
AppDefType
.
ChatPushMessageKey
.
roomType
));
roomType
=
Integer
.
toString
(
json
.
getInt
(
AppDefType
.
ChatPushMessageKey
.
roomType
));
collaborationType
=
C
ollaborationTypeToNum
(
textMessage
);
collaborationType
=
c
ollaborationTypeToNum
(
textMessage
);
}
}
String
roomName
=
json
.
getString
(
AppDefType
.
ChatPushMessageKey
.
roomName
);
String
roomName
=
json
.
getString
(
AppDefType
.
ChatPushMessageKey
.
roomName
);
String
pushMsg
=
json
.
getString
(
AppDefType
.
PushMessageKey
.
message
);
String
pushMsg
=
json
.
getString
(
AppDefType
.
PushMessageKey
.
message
);
...
@@ -265,7 +265,7 @@ public class ABVFcmListenerService extends FirebaseMessagingService {
...
@@ -265,7 +265,7 @@ public class ABVFcmListenerService extends FirebaseMessagingService {
return
intent
;
return
intent
;
}
}
public
String
C
ollaborationTypeToNum
(
String
message
)
{
public
String
c
ollaborationTypeToNum
(
String
message
)
{
if
(
message
.
contains
(
ABookCommConstants
.
COLLABORATION
.
COLLABORATION_AUDIO
.
ENG
)
||
if
(
message
.
contains
(
ABookCommConstants
.
COLLABORATION
.
COLLABORATION_AUDIO
.
ENG
)
||
message
.
contains
(
ABookCommConstants
.
COLLABORATION
.
COLLABORATION_AUDIO
.
JP
)
||
message
.
contains
(
ABookCommConstants
.
COLLABORATION
.
COLLABORATION_AUDIO
.
JP
)
||
message
.
contains
(
ABookCommConstants
.
COLLABORATION
.
COLLABORATION_AUDIO
.
KR
)
message
.
contains
(
ABookCommConstants
.
COLLABORATION
.
COLLABORATION_AUDIO
.
KR
)
...
...
ABVJE_UI_Android/src/jp/agentec/abook/abv/cl/push/PushMessageJSON.java
View file @
c1cbc3ca
...
@@ -103,7 +103,7 @@ public class PushMessageJSON {
...
@@ -103,7 +103,7 @@ public class PushMessageJSON {
message
.
contains
(
ABookCommConstants
.
COLLABORATION
.
INVITE_COLLABORATION
.
JP
)
||
message
.
contains
(
ABookCommConstants
.
COLLABORATION
.
INVITE_COLLABORATION
.
JP
)
||
message
.
contains
(
ABookCommConstants
.
COLLABORATION
.
INVITE_COLLABORATION
.
KR
))
{
message
.
contains
(
ABookCommConstants
.
COLLABORATION
.
INVITE_COLLABORATION
.
KR
))
{
return
C
ollaborationTypeToNum
(
message
);
return
c
ollaborationTypeToNum
(
message
);
}
}
return
jsonObject
.
getString
(
AppDefType
.
ChatPushMessageKey
.
collaborationType
);
return
jsonObject
.
getString
(
AppDefType
.
ChatPushMessageKey
.
collaborationType
);
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
...
@@ -111,7 +111,7 @@ public class PushMessageJSON {
...
@@ -111,7 +111,7 @@ public class PushMessageJSON {
}
}
}
}
public
String
C
ollaborationTypeToNum
(
String
message
)
{
public
String
c
ollaborationTypeToNum
(
String
message
)
{
if
(
message
.
contains
(
ABookCommConstants
.
COLLABORATION
.
COLLABORATION_AUDIO
.
ENG
)
||
if
(
message
.
contains
(
ABookCommConstants
.
COLLABORATION
.
COLLABORATION_AUDIO
.
ENG
)
||
message
.
contains
(
ABookCommConstants
.
COLLABORATION
.
COLLABORATION_AUDIO
.
JP
)
||
message
.
contains
(
ABookCommConstants
.
COLLABORATION
.
COLLABORATION_AUDIO
.
JP
)
||
message
.
contains
(
ABookCommConstants
.
COLLABORATION
.
COLLABORATION_AUDIO
.
KR
)
message
.
contains
(
ABookCommConstants
.
COLLABORATION
.
COLLABORATION_AUDIO
.
KR
)
...
...
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