Skip to content

A
abook_check
Commit 0f31ee16 by Kim Eunchul
Options

協業招待プッシュメッセージ方法変更

parent c1cbc3ca
Showing with 19 additions and 19 deletions
ABVJE_BL/src/jp/agentec/abook/abv/bl/common/constant/ABookCommConstants.java
...@@ -161,32 +161,32 @@ public interface ABookCommConstants { ...@@ -161,32 +161,32 @@ public interface ABookCommConstants {
interface COLLABORATION { interface COLLABORATION {
interface INVITE_COLLABORATION { interface INVITE_COLLABORATION {
String ENG = "inviteCollaboration"; String EN = "inviteCollaboration";
String JP = "\u5354\u696d"; String JP = "\u5354\u696d";
String KR = "\ud611\uc5c5"; String KR = "\ud611\uc5c5";
} }
interface COLLABORATION_AUDIO { interface COLLABORATION_AUDIO {
String ENG = "audio"; String EN = "audio";
String JP = "\u901a\u8a71"; String JP = "\u901a\u8a71";
String KR = "\ud1b5\ud654"; String KR = "\ud1b5\ud654";
} }
interface COLLABORATION_CAMERA { interface COLLABORATION_CAMERA {
String ENG = "image"; String EN = "image";
String JP = "\u5199\u771f"; String JP = "\u5199\u771f";
String KR = "\uc0ac\uc9c4"; String KR = "\uc0ac\uc9c4";
} }
interface COLLABORATION_VIDEO { interface COLLABORATION_VIDEO {
String ENG = "video"; String EN = "video";
String JP = "\u52d5\u753b"; String JP = "\u52d5\u753b";
String KR = "\uc601\uc0c1"; String KR = "\uc601\uc0c1";
} }
interface COLLABORATION_DOCUMENT { interface COLLABORATION_DOCUMENT {
String ENG = "document"; String EN = "document";
String JP = "\u6587\u66f8"; String JP = "\u6587\u66f8";
String KR = "\ubb38\uc11c"; String KR = "\ubb38\uc11c";
} }
interface COLLABORATION_BOARD { interface COLLABORATION_BOARD {
String ENG = "\ubcf4\ub4dc"; String EN = "board";
String JP = "\u30dc\u30fc\u30c9"; String JP = "\u30dc\u30fc\u30c9";
String KR = "\ubcf4\ub4dc"; String KR = "\ubcf4\ub4dc";
} }
......
ABVJE_UI_Android/src/jp/agentec/abook/abv/cl/push/ABVFcmListenerService.java
...@@ -234,7 +234,7 @@ public class ABVFcmListenerService extends FirebaseMessagingService { ...@@ -234,7 +234,7 @@ public class ABVFcmListenerService extends FirebaseMessagingService {
String textMessage = json.getString(AppDefType.PushMessageKey.message); String textMessage = json.getString(AppDefType.PushMessageKey.message);
String roomType = ""; String roomType = "";
String collaborationType = ""; String collaborationType = "";
if (textMessage.contains(ABookCommConstants.COLLABORATION.INVITE_COLLABORATION.ENG) || if (textMessage.contains(ABookCommConstants.COLLABORATION.INVITE_COLLABORATION.EN) ||
textMessage.contains(ABookCommConstants.COLLABORATION.INVITE_COLLABORATION.JP) || textMessage.contains(ABookCommConstants.COLLABORATION.INVITE_COLLABORATION.JP) ||
textMessage.contains(ABookCommConstants.COLLABORATION.INVITE_COLLABORATION.KR) textMessage.contains(ABookCommConstants.COLLABORATION.INVITE_COLLABORATION.KR)
) { ) {
...@@ -266,27 +266,27 @@ public class ABVFcmListenerService extends FirebaseMessagingService { ...@@ -266,27 +266,27 @@ public class ABVFcmListenerService extends FirebaseMessagingService {
} }
public String collaborationTypeToNum(String message) { public String collaborationTypeToNum(String message) {
if (message.contains(ABookCommConstants.COLLABORATION.COLLABORATION_AUDIO.ENG) || if (message.contains(ABookCommConstants.COLLABORATION.COLLABORATION_AUDIO.EN) ||
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)
) { ) {
return String.valueOf(ABookCommConstants.FLAG.COLLABORATION_TYPE.AUDIO); return String.valueOf(ABookCommConstants.FLAG.COLLABORATION_TYPE.AUDIO);
}else if (message.contains(ABookCommConstants.COLLABORATION.COLLABORATION_CAMERA.ENG) || }else if (message.contains(ABookCommConstants.COLLABORATION.COLLABORATION_CAMERA.EN) ||
message.contains(ABookCommConstants.COLLABORATION.COLLABORATION_CAMERA.JP) || message.contains(ABookCommConstants.COLLABORATION.COLLABORATION_CAMERA.JP) ||
message.contains(ABookCommConstants.COLLABORATION.COLLABORATION_CAMERA.KR) message.contains(ABookCommConstants.COLLABORATION.COLLABORATION_CAMERA.KR)
) { ) {
return String.valueOf(ABookCommConstants.FLAG.COLLABORATION_TYPE.CAMERA); return String.valueOf(ABookCommConstants.FLAG.COLLABORATION_TYPE.CAMERA);
}else if (message.contains(ABookCommConstants.COLLABORATION.COLLABORATION_VIDEO.ENG) || }else if (message.contains(ABookCommConstants.COLLABORATION.COLLABORATION_VIDEO.EN) ||
message.contains(ABookCommConstants.COLLABORATION.COLLABORATION_VIDEO.JP) || message.contains(ABookCommConstants.COLLABORATION.COLLABORATION_VIDEO.JP) ||
message.contains(ABookCommConstants.COLLABORATION.COLLABORATION_VIDEO.KR) message.contains(ABookCommConstants.COLLABORATION.COLLABORATION_VIDEO.KR)
) { ) {
return String.valueOf(ABookCommConstants.FLAG.COLLABORATION_TYPE.VIDEO); return String.valueOf(ABookCommConstants.FLAG.COLLABORATION_TYPE.VIDEO);
}else if (message.contains(ABookCommConstants.COLLABORATION.COLLABORATION_DOCUMENT.ENG) || }else if (message.contains(ABookCommConstants.COLLABORATION.COLLABORATION_DOCUMENT.EN) ||
message.contains(ABookCommConstants.COLLABORATION.COLLABORATION_DOCUMENT.JP) || message.contains(ABookCommConstants.COLLABORATION.COLLABORATION_DOCUMENT.JP) ||
message.contains(ABookCommConstants.COLLABORATION.COLLABORATION_DOCUMENT.KR) message.contains(ABookCommConstants.COLLABORATION.COLLABORATION_DOCUMENT.KR)
) { ) {
return String.valueOf(ABookCommConstants.FLAG.COLLABORATION_TYPE.DOCUMENT); return String.valueOf(ABookCommConstants.FLAG.COLLABORATION_TYPE.DOCUMENT);
}else if (message.contains(ABookCommConstants.COLLABORATION.COLLABORATION_BOARD.ENG) || }else if (message.contains(ABookCommConstants.COLLABORATION.COLLABORATION_BOARD.EN) ||
message.contains(ABookCommConstants.COLLABORATION.COLLABORATION_BOARD.JP) || message.contains(ABookCommConstants.COLLABORATION.COLLABORATION_BOARD.JP) ||
message.contains(ABookCommConstants.COLLABORATION.COLLABORATION_BOARD.KR) message.contains(ABookCommConstants.COLLABORATION.COLLABORATION_BOARD.KR)
) { ) {
......
ABVJE_UI_Android/src/jp/agentec/abook/abv/cl/push/PushMessageJSON.java
...@@ -87,7 +87,7 @@ public class PushMessageJSON { ...@@ -87,7 +87,7 @@ public class PushMessageJSON {
public boolean isCollaboration() { public boolean isCollaboration() {
String message = getMessage(); String message = getMessage();
if (message.contains(ABookCommConstants.COLLABORATION.INVITE_COLLABORATION.ENG) || if (message.contains(ABookCommConstants.COLLABORATION.INVITE_COLLABORATION.EN) ||
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)) {
...@@ -99,7 +99,7 @@ public class PushMessageJSON { ...@@ -99,7 +99,7 @@ public class PushMessageJSON {
public String getCollaborationType() { public String getCollaborationType() {
try { try {
String message = getMessage(); String message = getMessage();
if (message.contains(ABookCommConstants.COLLABORATION.INVITE_COLLABORATION.ENG) || if (message.contains(ABookCommConstants.COLLABORATION.INVITE_COLLABORATION.EN) ||
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)) {
...@@ -112,27 +112,27 @@ public class PushMessageJSON { ...@@ -112,27 +112,27 @@ public class PushMessageJSON {
} }
public String collaborationTypeToNum(String message) { public String collaborationTypeToNum(String message) {
if (message.contains(ABookCommConstants.COLLABORATION.COLLABORATION_AUDIO.ENG) || if (message.contains(ABookCommConstants.COLLABORATION.COLLABORATION_AUDIO.EN) ||
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)
) { ) {
return String.valueOf(ABookCommConstants.FLAG.COLLABORATION_TYPE.AUDIO); return String.valueOf(ABookCommConstants.FLAG.COLLABORATION_TYPE.AUDIO);
}else if (message.contains(ABookCommConstants.COLLABORATION.COLLABORATION_CAMERA.ENG) || }else if (message.contains(ABookCommConstants.COLLABORATION.COLLABORATION_CAMERA.EN) ||
message.contains(ABookCommConstants.COLLABORATION.COLLABORATION_CAMERA.JP) || message.contains(ABookCommConstants.COLLABORATION.COLLABORATION_CAMERA.JP) ||
message.contains(ABookCommConstants.COLLABORATION.COLLABORATION_CAMERA.KR) message.contains(ABookCommConstants.COLLABORATION.COLLABORATION_CAMERA.KR)
) { ) {
return String.valueOf(ABookCommConstants.FLAG.COLLABORATION_TYPE.CAMERA); return String.valueOf(ABookCommConstants.FLAG.COLLABORATION_TYPE.CAMERA);
}else if (message.contains(ABookCommConstants.COLLABORATION.COLLABORATION_VIDEO.ENG) || }else if (message.contains(ABookCommConstants.COLLABORATION.COLLABORATION_VIDEO.EN) ||
message.contains(ABookCommConstants.COLLABORATION.COLLABORATION_VIDEO.JP) || message.contains(ABookCommConstants.COLLABORATION.COLLABORATION_VIDEO.JP) ||
message.contains(ABookCommConstants.COLLABORATION.COLLABORATION_VIDEO.KR) message.contains(ABookCommConstants.COLLABORATION.COLLABORATION_VIDEO.KR)
) { ) {
return String.valueOf(ABookCommConstants.FLAG.COLLABORATION_TYPE.VIDEO); return String.valueOf(ABookCommConstants.FLAG.COLLABORATION_TYPE.VIDEO);
}else if (message.contains(ABookCommConstants.COLLABORATION.COLLABORATION_DOCUMENT.ENG) || }else if (message.contains(ABookCommConstants.COLLABORATION.COLLABORATION_DOCUMENT.EN) ||
message.contains(ABookCommConstants.COLLABORATION.COLLABORATION_DOCUMENT.JP) || message.contains(ABookCommConstants.COLLABORATION.COLLABORATION_DOCUMENT.JP) ||
message.contains(ABookCommConstants.COLLABORATION.COLLABORATION_DOCUMENT.KR) message.contains(ABookCommConstants.COLLABORATION.COLLABORATION_DOCUMENT.KR)
) { ) {
return String.valueOf(ABookCommConstants.FLAG.COLLABORATION_TYPE.DOCUMENT); return String.valueOf(ABookCommConstants.FLAG.COLLABORATION_TYPE.DOCUMENT);
}else if (message.contains(ABookCommConstants.COLLABORATION.COLLABORATION_BOARD.ENG) || }else if (message.contains(ABookCommConstants.COLLABORATION.COLLABORATION_BOARD.EN) ||
message.contains(ABookCommConstants.COLLABORATION.COLLABORATION_BOARD.JP) || message.contains(ABookCommConstants.COLLABORATION.COLLABORATION_BOARD.JP) ||
message.contains(ABookCommConstants.COLLABORATION.COLLABORATION_BOARD.KR) message.contains(ABookCommConstants.COLLABORATION.COLLABORATION_BOARD.KR)
) { ) {
......
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