From 6641feb60c7332bb758f838c79d04f2530008632 Mon Sep 17 00:00:00 2001 From: jangdongsin Date: Tue, 10 Dec 2024 23:20:18 +0900 Subject: [PATCH] =?UTF-8?q?MMS,=20=EC=B9=B4=EC=B9=B4=EC=98=A4=20=EC=95=8C?= =?UTF-8?q?=EB=A6=BC=ED=86=A1,=20=EC=B9=9C=EA=B5=AC=ED=86=A1=20=ED=8C=8C?= =?UTF-8?q?=EC=9D=BC=EC=B2=98=EB=A6=AC=20=EB=A1=9C=EC=A7=81=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/packet/common/KakaoMessage.java | 3 +++ .../server/packet/common/MmsMessage.java | 3 +++ .../server/server/task/CollectServerTask.java | 24 +++++++++---------- 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/munjaon/server/server/packet/common/KakaoMessage.java b/src/main/java/com/munjaon/server/server/packet/common/KakaoMessage.java index 7dec1ef..ed5e8bb 100644 --- a/src/main/java/com/munjaon/server/server/packet/common/KakaoMessage.java +++ b/src/main/java/com/munjaon/server/server/packet/common/KakaoMessage.java @@ -6,6 +6,9 @@ import java.io.UnsupportedEncodingException; import java.nio.ByteBuffer; public final class KakaoMessage { + /* 카카오 파일 수신 분배 바이트 수 */ + public static final int KAKAO_FILE_UNIT_BYTES = 1024; + public static final int LIMIT_FILE_CAPACITY = 1024 * 50; public static final int DELIVER_JSON_FILENAME_LENGTH = 40; diff --git a/src/main/java/com/munjaon/server/server/packet/common/MmsMessage.java b/src/main/java/com/munjaon/server/server/packet/common/MmsMessage.java index 868ab19..d27f774 100644 --- a/src/main/java/com/munjaon/server/server/packet/common/MmsMessage.java +++ b/src/main/java/com/munjaon/server/server/packet/common/MmsMessage.java @@ -6,6 +6,9 @@ import java.io.UnsupportedEncodingException; import java.nio.ByteBuffer; public final class MmsMessage { + /* MMS 파일 수신 분배 바이트 수 */ + public static final int MMS_IMAGE_UNIT_BYTES = 1024; + public static final int DELIVER_MMS_BODY_LENGTH = 2130; public static final int DELIVER_MMS_ACK_BODY_LENGTH = 21; diff --git a/src/main/java/com/munjaon/server/server/task/CollectServerTask.java b/src/main/java/com/munjaon/server/server/task/CollectServerTask.java index 30b5def..c6218e3 100644 --- a/src/main/java/com/munjaon/server/server/task/CollectServerTask.java +++ b/src/main/java/com/munjaon/server/server/task/CollectServerTask.java @@ -371,8 +371,8 @@ public class CollectServerTask extends Thread { ByteBuffer fileBuffer = ByteBuffer.allocate(fileSize); long IMAGE_RECV_TIME = System.currentTimeMillis(); // 이미지 패킷 처리 시작시간 while (true) { - int bufferSize = 1024; - if ((fileSize - recvFileSize) < 1024) { + int bufferSize = MmsMessage.MMS_IMAGE_UNIT_BYTES; + if ((fileSize - recvFileSize) < MmsMessage.MMS_IMAGE_UNIT_BYTES) { bufferSize = fileSize - recvFileSize; } @@ -381,8 +381,8 @@ public class CollectServerTask extends Thread { if (unitRecvCnt > 0) { Packet.mergeBuffers(fileBuffer, buffer, recvFileSize); recvFileSize += unitRecvCnt; - saveLog("unitRecvCnt : " + unitRecvCnt); - saveLog("recvFileSize : " + recvFileSize); +// saveLog("unitRecvCnt : " + unitRecvCnt); +// saveLog("recvFileSize : " + recvFileSize); } if (recvFileSize == fileSize) { @@ -472,8 +472,8 @@ public class CollectServerTask extends Thread { int recvFileSize = 0; long IMAGE_RECV_TIME = System.currentTimeMillis(); // 파일 패킷 처리 시작시간 while (true) { - int bufferSize = 1024; - if ((fileSize - recvFileSize) < 1024) { + int bufferSize = KakaoMessage.KAKAO_FILE_UNIT_BYTES; + if ((fileSize - recvFileSize) < KakaoMessage.KAKAO_FILE_UNIT_BYTES) { bufferSize = fileSize - recvFileSize; } @@ -482,8 +482,8 @@ public class CollectServerTask extends Thread { if (unitRecvCnt > 0) { Packet.mergeBuffers(fileBuffer, buffer, recvFileSize); recvFileSize += unitRecvCnt; - saveLog("unitRecvCnt : " + unitRecvCnt); - saveLog("recvFileSize : " + recvFileSize); +// saveLog("unitRecvCnt : " + unitRecvCnt); +// saveLog("recvFileSize : " + recvFileSize); } if (recvFileSize == fileSize) { @@ -609,8 +609,8 @@ public class CollectServerTask extends Thread { int recvFileSize = 0; long IMAGE_RECV_TIME = System.currentTimeMillis(); // 파일 패킷 처리 시작시간 while (true) { - int bufferSize = 1024; - if ((fileSize - recvFileSize) < 1024) { + int bufferSize = KakaoMessage.KAKAO_FILE_UNIT_BYTES; + if ((fileSize - recvFileSize) < KakaoMessage.KAKAO_FILE_UNIT_BYTES) { bufferSize = fileSize - recvFileSize; } @@ -619,8 +619,8 @@ public class CollectServerTask extends Thread { if (unitRecvCnt > 0) { Packet.mergeBuffers(fileBuffer, buffer, recvFileSize); recvFileSize += unitRecvCnt; - saveLog("unitRecvCnt : " + unitRecvCnt); - saveLog("recvFileSize : " + recvFileSize); +// saveLog("unitRecvCnt : " + unitRecvCnt); +// saveLog("recvFileSize : " + recvFileSize); } if (recvFileSize == fileSize) {