tolag3/client_agent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MMS, 알림톡, 친구톡 파일전송 로직 수정

Browse Source
This commit is contained in:
jangdongsin 2024-12-10 23:19:40 +09:00
parent 6d2985df6f
commit b3c21f0345
1 changed files with 46 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
src/main/java/com/munjaon/client/server/service/CollectClientService.java
View File

@ -416,35 +416,42 @@ public class CollectClientService extends Service {
saveLog("[MESSAGE SEND] [... ...]"); saveLog("[MESSAGE SEND] [... ...]");
saveLog("[MESSAGE DATA : " + data.toString() + "]"); saveLog("[MESSAGE DATA : " + data.toString() + "]");
while (sendBuffer.hasRemaining()) {
socketChannel.write(sendBuffer); socketChannel.write(sendBuffer);
}
if (file01HeadBuffer != null) { if (file01HeadBuffer != null) {
socketChannel.write(file01HeadBuffer); socketChannel.write(file01HeadBuffer);
uploadFileSend(path + data.getFilename01());
ByteBuffer fileBodyBuffer = MmsMessage.makeImageBodyForDeliver(path, data.getFilename01()); //
fileBodyBuffer.flip(); // ByteBuffer fileBodyBuffer = MmsMessage.makeImageBodyForDeliver(path, data.getFilename01());
while(fileBodyBuffer.hasRemaining()){ // fileBodyBuffer.flip();
int bytesWritten = socketChannel.write(fileBodyBuffer); // while(fileBodyBuffer.hasRemaining()){
saveLog("bytesWritten : " + bytesWritten); // int bytesWritten = socketChannel.write(fileBodyBuffer);
} // saveLog("bytesWritten : " + bytesWritten);
// }
} }
if (file02HeadBuffer != null) { if (file02HeadBuffer != null) {
socketChannel.write(file02HeadBuffer); socketChannel.write(file02HeadBuffer);
ByteBuffer fileBodyBuffer = MmsMessage.makeImageBodyForDeliver(path, data.getFilename02()); uploadFileSend(path + data.getFilename02());
fileBodyBuffer.flip();
while(fileBodyBuffer.hasRemaining()){ // ByteBuffer fileBodyBuffer = MmsMessage.makeImageBodyForDeliver(path, data.getFilename02());
int bytesWritten = socketChannel.write(fileBodyBuffer); // fileBodyBuffer.flip();
saveLog("bytesWritten : " + bytesWritten); // while(fileBodyBuffer.hasRemaining()){
} // int bytesWritten = socketChannel.write(fileBodyBuffer);
// saveLog("bytesWritten : " + bytesWritten);
// }
} }
if (file03HeadBuffer != null) { if (file03HeadBuffer != null) {
socketChannel.write(file03HeadBuffer); socketChannel.write(file03HeadBuffer);
ByteBuffer fileBodyBuffer = MmsMessage.makeImageBodyForDeliver(path, data.getFilename03()); uploadFileSend(path + data.getFilename03());
fileBodyBuffer.flip();
while(fileBodyBuffer.hasRemaining()){ // ByteBuffer fileBodyBuffer = MmsMessage.makeImageBodyForDeliver(path, data.getFilename03());
int bytesWritten = socketChannel.write(fileBodyBuffer); // fileBodyBuffer.flip();
saveLog("bytesWritten : " + bytesWritten); // while(fileBodyBuffer.hasRemaining()){
} // int bytesWritten = socketChannel.write(fileBodyBuffer);
// saveLog("bytesWritten : " + bytesWritten);
// }
} }
long MSG_SEND_TIME = System.currentTimeMillis(); long MSG_SEND_TIME = System.currentTimeMillis();
@ -487,7 +494,9 @@ public class CollectClientService extends Service {
} }
buff.flip(); buff.flip();
while (buff.hasRemaining()) {
socketChannel.write(buff); socketChannel.write(buff);
}
buff.clear(); buff.clear();
} }
@ -671,12 +680,14 @@ public class CollectClientService extends Service {
/* 파일 전송 */ /* 파일 전송 */
ByteBuffer fileHeadBuffer = KakaoMessage.makeJsonHeaderForDeliver(path, data.getKakaoJsonFile()); ByteBuffer fileHeadBuffer = KakaoMessage.makeJsonHeaderForDeliver(path, data.getKakaoJsonFile());
socketChannel.write(fileHeadBuffer); socketChannel.write(fileHeadBuffer);
ByteBuffer fileBodyBuffer = KakaoMessage.makeJsonBodyForDeliver(path, data.getKakaoJsonFile()); uploadFileSend(path + data.getKakaoJsonFile());
fileBodyBuffer.flip();
while(fileBodyBuffer.hasRemaining()){ // ByteBuffer fileBodyBuffer = KakaoMessage.makeJsonBodyForDeliver(path, data.getKakaoJsonFile());
int bytesWritten = socketChannel.write(fileBodyBuffer); // fileBodyBuffer.flip();
saveLog("bytesWritten : " + bytesWritten); // while(fileBodyBuffer.hasRemaining()){
} // int bytesWritten = socketChannel.write(fileBodyBuffer);
// saveLog("bytesWritten : " + bytesWritten);
// }
long MSG_SEND_TIME = System.currentTimeMillis(); long MSG_SEND_TIME = System.currentTimeMillis();
while (true) { while (true) {
@ -829,12 +840,14 @@ public class CollectClientService extends Service {
/* 파일 전송 */ /* 파일 전송 */
ByteBuffer fileHeadBuffer = KakaoMessage.makeJsonHeaderForDeliver(path, data.getKakaoJsonFile()); ByteBuffer fileHeadBuffer = KakaoMessage.makeJsonHeaderForDeliver(path, data.getKakaoJsonFile());
socketChannel.write(fileHeadBuffer); socketChannel.write(fileHeadBuffer);
ByteBuffer fileBodyBuffer = KakaoMessage.makeJsonBodyForDeliver(path, data.getKakaoJsonFile()); uploadFileSend(path + data.getKakaoJsonFile());
fileBodyBuffer.flip();
while(fileBodyBuffer.hasRemaining()){ // ByteBuffer fileBodyBuffer = KakaoMessage.makeJsonBodyForDeliver(path, data.getKakaoJsonFile());
int bytesWritten = socketChannel.write(fileBodyBuffer); // fileBodyBuffer.flip();
saveLog("bytesWritten : " + bytesWritten); // while(fileBodyBuffer.hasRemaining()){
} // int bytesWritten = socketChannel.write(fileBodyBuffer);
// saveLog("bytesWritten : " + bytesWritten);
// }
long MSG_SEND_TIME = System.currentTimeMillis(); long MSG_SEND_TIME = System.currentTimeMillis();
while (true) { while (true) {