2월12일 업무

This commit is contained in:
Park Byung Eun 2020-02-12 18:10:29 +09:00
parent be1045cf09
commit 94dcc68fd0
4 changed files with 282 additions and 15 deletions

View File

@ -6,18 +6,22 @@
묶음 파일 삭제
썸네일 그리드 알고리즘
1 % 3 = 1
2 % 3 =
3 % 3 = 0
4 % 3 = 0
5 % 3 = 0
6 % 3 = 0
7 % 3 = 0
8 % 3 = 0
9 % 3 = 0
10 % 3 = 0
11 % 3 = 0
12 % 3 = 0
13 % 3 = 0
14 % 3 = 0
15 % 3 = 0
1 / 3 = 0 || 1 % 3 = 1 몫0 나머지 1 = 1개 출력
2 / 3 = 0 || 2 % 3 = 2 몫0 나머지 2 = 총1행 2개 출력
3 / 3 = 1 || 3 % 3 = 0 몫1 나머지 0 = 총1행 3개 출력
4 / 3 = 1 || 4 % 3 = 1 몫1 나머지 1 = 총2행 1행,2행 2개출력
5 / 3 = 1 || 5 % 3 = 2 몫1 나머지 2 = 총2행 1행 3개, 2행은 2개 출력
6 / 3 = 2 || 6 % 3 = 0 몫2 나머지 0 = 총2행 1행,2행 3개출력
7 / 3 = 2 || 7 % 3 = 1 몫2 나머지 1 = 총3행 1행 3, 2행 2, 3행 2개 출력
8 / 3 = 2 || 8 % 3 = 2 몫2 나머지 2 = 총3행 1행,2행 3개, 3행 2개 출력
9 / 3 = 3 || 9 % 3 = 0 몫3 나머지 0 = 총3행 1행,2행,3행 3개씩 출력
10 / 3 = 3 || 10 % 3 = 1 몫3 나머지 1 = 총4행 1행,2행 3개 3행,4행 2개 출력
11 / 3 = 3 || 11 % 3 = 2 몫3 나머지 2 = 총4행 1행,2행,3행 3개, 4행 2개 출력
12 / 3 = 4 || 12 % 3 = 0 몫4 나머지 0 = 총4행 1행,2행,3행,4행 3개 출력
13 / 3 = 4 || 13 % 3 = 1
14 / 3 = 4 || 14 % 3 = 2
15 / 3 = 5 || 15 % 3 = 0

View File

@ -0,0 +1,131 @@
그리드 프로토타입 완료
실제 데이터로 출력
사진 묶어 보내기
묶음 파일 대화방 출력
묶음 파일 상세 이미지 출력
묶음 파일 슬라이드
묶음 파일 전달
묶음 파일 삭제
이미지 이벤트 파라미터
fileInfo 조회
decodeInfoData->
WARNING in Circular dependency detected:
projects\ucap-webmessenger-protocol-event\src\lib\protocols\event-json\codec.ts ->
projects\ucap-webmessenger-protocol-event\src\lib\protocols\event-json\bundle-image.event-json.ts ->
projects\ucap-webmessenger-protocol-file\src\public-api.ts ->
projects\ucap-webmessenger-protocol-file\src\lib\protocols\info.ts ->
projects\ucap-webmessenger-protocol-event\src\public-api.ts ->
projects\ucap-webmessenger-protocol-event\src\lib\protocols\info.ts ->
projects\ucap-webmessenger-protocol-event\src\lib\protocols\event-json\codec.ts
WARNING in Circular dependency detected:
projects\ucap-webmessenger-protocol-event\src\lib\protocols\info.ts ->
projects\ucap-webmessenger-protocol-event\src\lib\protocols\event-json\codec.ts ->
projects\ucap-webmessenger-protocol-event\src\lib\protocols\event-json\bundle-image.event-json.ts ->
projects\ucap-webmessenger-protocol-file\src\public-api.ts ->
projects\ucap-webmessenger-protocol-file\src\lib\protocols\info.ts ->
projects\ucap-webmessenger-protocol-event\src\public-api.ts ->
projects\ucap-webmessenger-protocol-event\src\lib\protocols\info.ts
WARNING in Circular dependency detected:
projects\ucap-webmessenger-protocol-event\src\lib\protocols\send.ts ->
projects\ucap-webmessenger-protocol-event\src\lib\protocols\event-json\codec.ts ->
projects\ucap-webmessenger-protocol-event\src\lib\protocols\event-json\bundle-image.event-json.ts ->
projects\ucap-webmessenger-protocol-file\src\public-api.ts ->
projects\ucap-webmessenger-protocol-file\src\lib\protocols\info.ts ->
projects\ucap-webmessenger-protocol-event\src\public-api.ts ->
projects\ucap-webmessenger-protocol-event\src\lib\protocols\send.ts
WARNING in Circular dependency detected:
projects\ucap-webmessenger-protocol-event\src\lib\services\event-protocol.service.ts -> projects\ucap-webmessenger-protocol-event\src\lib\protocols\info.ts -> projects\ucap-webmessenger-protocol-event\src\lib\protocols\event-json\codec.ts -> projects\ucap-webmessenger-protocol-event\src\lib\protocols\event-json\bundle-image.event-json.ts -> projects\ucap-webmessenger-protocol-file\src\public-api.ts -> projects\ucap-webmessenger-protocol-file\src\lib\protocols\info.ts -> projects\ucap-webmessenger-protocol-event\src\public-api.ts -> projects\ucap-webmessenger-protocol-event\src\lib\services\event-protocol.service.ts
WARNING in Circular dependency detected:
projects\ucap-webmessenger-protocol-event\src\lib\ucap-event-protocol.module.ts -> projects\ucap-webmessenger-protocol-event\src\lib\services\event-protocol.service.ts -> projects\ucap-webmessenger-protocol-event\src\lib\protocols\info.ts -> projects\ucap-webmessenger-protocol-event\src\lib\protocols\event-json\codec.ts -> projects\ucap-webmessenger-protocol-event\src\lib\protocols\event-json\bundle-image.event-json.ts -> projects\ucap-webmessenger-protocol-file\src\public-api.ts -> projects\ucap-webmessenger-protocol-file\src\lib\protocols\info.ts -> projects\ucap-webmessenger-protocol-event\src\public-api.ts -> projects\ucap-webmessenger-protocol-event\src\lib\ucap-event-protocol.module.ts
WARNING in Circular dependency detected:
projects\ucap-webmessenger-protocol-event\src\public-api.ts -> projects\ucap-webmessenger-protocol-event\src\lib\protocols\info.ts -> projects\ucap-webmessenger-protocol-event\src\lib\protocols\event-json\codec.ts -> projects\ucap-webmessenger-protocol-event\src\lib\protocols\event-json\bundle-image.event-json.ts -> projects\ucap-webmessenger-protocol-file\src\public-api.ts -> projects\ucap-webmessenger-protocol-file\src\lib\protocols\info.ts -> projects\ucap-webmessenger-protocol-event\src\public-api.ts
WARNING in Circular dependency detected:
projects\ucap-webmessenger-protocol-file\src\lib\protocols\info.ts -> projects\ucap-webmessenger-protocol-event\src\public-api.ts -> projects\ucap-webmessenger-protocol-event\src\lib\protocols\info.ts -> projects\ucap-webmessenger-protocol-event\src\lib\protocols\event-json\codec.ts -> projects\ucap-webmessenger-protocol-event\src\lib\protocols\event-json\bundle-image.event-json.ts -> projects\ucap-webmessenger-protocol-file\src\public-api.ts -> projects\ucap-webmessenger-protocol-file\src\lib\protocols\info.ts
WARNING in Circular dependency detected:
projects\ucap-webmessenger-protocol-file\src\lib\services\file-protocol.service.ts -> projects\ucap-webmessenger-protocol-file\src\lib\protocols\info.ts -> projects\ucap-webmessenger-protocol-event\src\public-api.ts -> projects\ucap-webmessenger-protocol-event\src\lib\protocols\info.ts -> projects\ucap-webmessenger-protocol-event\src\lib\protocols\event-json\codec.ts -> projects\ucap-webmessenger-protocol-event\src\lib\protocols\event-json\bundle-image.event-json.ts -> projects\ucap-webmessenger-protocol-file\src\public-api.ts -> projects\ucap-webmessenger-protocol-file\src\lib\services\file-protocol.service.ts
WARNING in Circular dependency detected:
projects\ucap-webmessenger-protocol-file\src\lib\ucap-file-protocol.module.ts -> projects\ucap-webmessenger-protocol-file\src\lib\services\file-protocol.service.ts -> projects\ucap-webmessenger-protocol-file\src\lib\protocols\info.ts -> projects\ucap-webmessenger-protocol-event\src\public-api.ts -> projects\ucap-webmessenger-protocol-event\src\lib\protocols\info.ts -> projects\ucap-webmessenger-protocol-event\src\lib\protocols\event-json\codec.ts -> projects\ucap-webmessenger-protocol-event\src\lib\protocols\event-json\bundle-image.event-json.ts -> projects\ucap-webmessenger-protocol-file\src\public-api.ts -> projects\ucap-webmessenger-protocol-file\src\lib\ucap-file-protocol.module.ts
WARNING in Circular dependency detected:
projects\ucap-webmessenger-protocol-file\src\public-api.ts -> projects\ucap-webmessenger-protocol-file\src\lib\protocols\info.ts -> projects\ucap-webmessenger-protocol-event\src\public-api.ts -> projects\ucap-webmessenger-protocol-event\src\lib\protocols\info.ts -> projects\ucap-webmessenger-protocol-event\src\lib\protocols\event-json\codec.ts -> projects\ucap-webmessenger-protocol-event\src\lib\protocols\event-json\bundle-image.event-json.ts -> projects\ucap-webmessenger-protocol-file\src\public-api.ts
1: "16F98292020-02-10 07:09:16{
↵"StatusCode":"200",
↵"ErrorMessage":"",
↵"RoomID":"76",
↵"FileName":"92164325ccca37df669d862498de47b8_t.jpeg",
↵"FileExt":"jpeg",
↵"FileType":"I",
↵"ThumbURL":"http://13.209.221.130/WebFile/LF/2020/02/10/MA_9829_160913829122_1.jpeg.thumb.jpg",
↵"AttSEQ":"430",
↵"AttSize":"15221",
↵"AttRegDate":"2020-02-10 16:09:13",
↵"ImageWidth":"320",
↵"ImageHeight":"240",
↵"CompanyCode":"LF",
↵"VoiceTime":"",
↵"SynappKey":""
↵}2"
2: "17F98292020-02-10 07:13:54{"StatusCode":"200","ErrorMessage":"","RoomID":"76","AttSEQ":"431","FileCount":"2","BaseURL":"http://13.209.221.130/WebFile/LF/2020/02/10/","ThumbURL":["MA_9829_16125729.jpeg.thumb.jpg","MA_9829_16125744.png.thumb.jpg"]}2"
3: "18F98292020-02-10 07:53:22{"StatusCode":"200","ErrorMessage":"","RoomID":"76","AttSEQ":"436","FileCount":"2","BaseURL":"http://13.209.221.130/WebFile/LF/2020/02/10/","ThumbURL":["MA_9829_165128591_0.jpeg.thumb.jpg","MA_9829_165128701_1.png.thumb.jpg"]}2"
4: "19F98292020-02-10 07:55:27{"StatusCode":"200","ErrorMessage":"","RoomID":"76","AttSEQ":"438","FileCount":"2","BaseURL":"http://13.209.221.130/WebFile/LF/2020/02/10/","ThumbURL":["MA_9829_165413230_0.jpeg.thumb.jpg","MA_9829_165413246_1.png.thumb.jpg"]}2"
5: "20F98292020-02-10 07:58:56{"StatusCode":"200","ErrorMessage":"","RoomID":"76","AttSEQ":"439","FileCount":"2","BaseURL":"http://13.209.221.130/WebFile/LF/2020/02/10/","ThumbURL":["MA_9829_165714649_0.jpeg.thumb.jpg","MA_9829_165714665_1.png.thumb.jpg"]}2"
6: "21B98292020-02-10 08:00:04{"StatusCode":"200","ErrorMessage":"","RoomID":"76","AttSEQ":"440","FileCount":"2","BaseURL":"http://13.209.221.130/WebFile/LF/2020/02/10/","ThumbURL":["MA_9829_165934679_0.jpeg.thumb.jpg","MA_9829_165934679_1.png.thumb.jpg"]}2"
7: "22b98292020-02-10 08:01:00{"StatusCode":"200","ErrorMessage":"","RoomID":"76","AttSEQ":"441","FileCount":"2","BaseURL":"http://13.209.221.130/WebFile/LF/2020/02/10/","ThumbURL":["MA_9829_17056365_0.jpeg.thumb.jpg","MA_9829_17056365_1.png.thumb.jpg"]}2"
8: "23b98292020-02-10 08:03:46{"StatusCode":"200","ErrorMessage":"","RoomID":"76","AttSEQ":"443","FileCount":"2","BaseURL":"http://13.209.221.130/WebFile/LF/2020/02/10/","ThumbURL":["MA_9829_1733766_0.jpeg.thumb.jpg","MA_9829_1733766_1.png.thumb.jpg"]}2"
9: "24F98292020-02-10 08:11:32{
↵"StatusCode":"200",
↵"ErrorMessage":"",
↵"RoomID":"76",
↵"FileName":"주석2020-02-06145415.png",
↵"FileExt":"png",
↵"FileType":"I",
↵"ThumbURL":"http://13.209.221.130/WebFile/LF/2020/02/10/MA_9829_171121060357_8.png.thumb.jpg",
↵"AttSEQ":"450",
↵"AttSize":"215994",
↵"AttRegDate":"2020-02-10 17:11:21",
↵"ImageWidth":"320",
↵"ImageHeight":"179",
↵"CompanyCode":"LF",
↵"VoiceTime":"",
↵"SynappKey":""
↵}2"
10: "25B98292020-02-10 08:49:35{
"StatusCode":"200","ErrorMessage":"","RoomID":"76","AttSEQ":"465","
FileCount":"2","BaseURL":"http://13.209.221.130/WebFile/LF/2020/02/10/",
"ThumbURL":["MA_9829_174913201_0.png.thumb.jpg","MA_9829_174913201_1.png.thumb.jpg"]}2"
11: "26B98292020-02-10 09:07:39{"StatusCode":"200","ErrorMessage":"","RoomID":"76","AttSEQ":"468","FileCount":"2","BaseURL":"http://13.209.221.130/WebFile/LF/2020/02/10/","ThumbURL":["MA_9829_18734780_0.png.thumb.jpg","MA_9829_18734796_1.png.thumb.jpg"]}2"
12: "27B98292020-02-11 01:12:45{"StatusCode":"200","ErrorMessage":"","RoomID":"76","AttSEQ":"474","FileCount":"3","BaseURL":"http://13.209.221.130/WebFile/LF/2020/02/11/","ThumbURL":["MA_9829_10123849_0.png.thumb.jpg","MA_9829_10123849_1.png.thumb.jpg","MA_9829_10123849_2.png.thumb.jpg"]}2"
13: "28B98292020-02-11 01:13:13{"StatusCode":"200","ErrorMessage":"","RoomID":"76","AttSEQ":"475","FileCount":"3","BaseURL":"http://13.209.221.130/WebFile/LF/2020/02/11/","ThumbURL":["MA_9829_10137971_0.png.thumb.jpg","MA_9829_10137971_1.png.thumb.jpg","MA_9829_10137971_2.png.thumb.jpg"]}2"
0, 1, 2, 3
0, 1, 2, 3, 4, 5, 6
0, 1, 2, 3, 4, 5, 6, 7, 8, 9
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12
1 1 2 1 3 1 4 1
4 7 10 13
0 1 2 0 1 2 0 1 2 0 1 2
3 3 4 5 3 4 5 3 4 5
6 6 7 8 6 7 8
9 9 10 11
12
2 3 3 3
2 2 3 3
2 2 3
2 2
2

View File

@ -0,0 +1,131 @@
c:\projects\work\next-ucap-messenger\projects\ucap-webmessenger-protocol-file\src\lib\protocols\info.ts
import {
ProtocolRequest,
ProtocolResponse,
ProtocolEncoder,
PacketBody,
PacketBodyValue,
ProtocolDecoder,
ProtocolMessage,
BodyStringDivider,
ProtocolStream,
decodeProtocolMessage
} from '@ucap-webmessenger/protocol';
import { FileType } from '../types/file.type';
import { FileInfo } from '../models/file-info';
import { FileDownloadInfo } from '../models/file-download-info';
import {
decodeEventJson,
EventType,
FileEventJson,
BundleImageEventJson
} from '@ucap-webmessenger/protocol-event';
export interface InfoRequest extends ProtocolRequest {
// 대화방SEQ(s)
roomSeq: string;
// { 파일타입 } cf) I : 이미지 V: 동영상 F: 파일 "" 빈값이면 모든 타입을 내려줌
type: FileType;
}
export interface InfoData extends ProtocolStream {
// { 대화방파일정보 }...
fileInfos: FileInfo[];
}
export interface InfoCheckData extends ProtocolStream {
// { 파일다운로드정보 }...
fileDownloadInfos: FileDownloadInfo[];
}
export interface InfoResponse extends ProtocolResponse {
// 대화방SEQ(s)
roomSeq: string;
// { 파일타입 } cf) I : 이미지 V: 동영상 F: 파일 "" 빈값이면 모든 타입을 내려줌
type: FileType;
}
export const encodeInfo: ProtocolEncoder<InfoRequest> = (req: InfoRequest) => {
const bodyList: PacketBody[] = [];
bodyList.push(
{ type: PacketBodyValue.String, value: req.roomSeq },
{ type: PacketBodyValue.String, value: req.type }
);
return bodyList;
};
export const decodeInfoData: ProtocolDecoder<InfoData> = (
message: ProtocolMessage
) => {
const fileInfos: FileInfo[] = [];
message.bodyList.forEach(fileInfo => {
const info = fileInfo.split(BodyStringDivider);
const fileType = info[4] as FileType;
let sentMessageTemp = {};
if (fileType === FileType.BundleImage) {
sentMessageTemp = decodeEventJson(
EventType.MultiFile,
info[11]
) as BundleImageEventJson;
} else {
sentMessageTemp = decodeEventJson(
EventType.File,
info[11]
) as FileEventJson;
}
fileInfos.push({
roomSeq: info[0],
eventSeq: Number(info[1]),
seq: Number(info[2]),
senderSeq: Number(info[3]),
type: fileType,
name: info[5],
url: info[6],
size: info[7],
sendDate: info[8],
receivedUserCount: Number(info[9]),
receiverCount: Number(info[10]),
sentMessage: info[11],
sentMessageJson: sentMessageTemp
});
});
return decodeProtocolMessage(message, {
fileInfos
} as InfoData);
};
export const decodeInfoCheckData: ProtocolDecoder<InfoCheckData> = (
message: ProtocolMessage
) => {
const fileDownloadInfos: FileDownloadInfo[] = [];
message.bodyList.forEach(fileInfo => {
const info = fileInfo.split(BodyStringDivider);
fileDownloadInfos.push({
roomSeq: info[0],
seq: Number(info[1]),
userSeq: Number(info[2]),
userName: info[3],
downloadDate: info[4],
isDownload: info[5] === 'Y' ? true : false
});
});
return decodeProtocolMessage(message, {
fileDownloadInfos
} as InfoCheckData);
};
export const decodeInfo: ProtocolDecoder<InfoResponse> = (
message: ProtocolMessage
) => {
return decodeProtocolMessage(message, {
roomSeq: message.bodyList[0],
type: message.bodyList[1] as FileType
} as InfoResponse);
};

View File

@ -0,0 +1 @@
git config --global http.sslVerify false