ucap/next-ucap-messenger
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger

Browse Source
This commit is contained in:
병준 박 2019-10-15 18:20:58 +09:00
commit ac8acc2b5c
5 changed files with 126 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/chat.component.html
View File

@ -1,7 +1,3 @@
<ucap-room-list-item
*ngFor="let room of roomList"
[roomInfo]="room"
[roomUserInfo]="getRoomUserList(room)"
(click)="onSelectedRoom(room)"
>
<ucap-room-list-item *ngFor="let room of roomList" [roomInfo]="room" [roomUserInfo]="getRoomUserList(room)"
[sessionVerinfo]="sessionVerinfo" (click)="onSelectedRoom(room)">
</ucap-room-list-item>

14
projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/chat.component.ts
View File

@ -15,6 +15,9 @@ import {
RoomUserDetailData,
RoomUserData
} from '@ucap-webmessenger/protocol-sync';
import { VersionInfo2Response } from '@ucap-webmessenger/api-public';
import { SessionStorageService } from '@ucap-webmessenger/web-storage';
import { KEY_VER_INFO } from '@app/types/ver-info.type';
@Component({
selector: 'app-layout-chat-left-sidenav-chat',
@ -26,10 +29,15 @@ export class ChatComponent implements OnInit, OnDestroy {
roomList: RoomInfo[];
roomUserList: RoomUserDetailData[];
roomUserShortList: RoomUserData[];
sessionVerinfo: VersionInfo2Response;
roomSubscription: Subscription;
constructor(private store: Store<any>, private logger: NGXLogger) {}
constructor(
private store: Store<any>,
private logger: NGXLogger,
private sessionStorageService: SessionStorageService
) {}
ngOnInit() {
this.roomSubscription = combineLatest([
@ -51,6 +59,10 @@ export class ChatComponent implements OnInit, OnDestroy {
})
)
.subscribe();
this.sessionVerinfo = this.sessionStorageService.get<VersionInfo2Response>(
KEY_VER_INFO
);
}
ngOnDestroy(): void {

14
projects/ucap-webmessenger-app/src/app/pages/template/components/template.page.component.html
View File

@ -5,11 +5,13 @@
<h3>User-list-item</h3>
<div>
<ucap-profile-user-list-item [userInfo]="userInfo" [profileImageRoot]="profileImageRoot" [presence]="presence">
<ucap-profile-user-list-item [userInfo]="userInfo" [profileImageRoot]="profileImageRoot" [presence]="presence"
[sessionVerinfo]="sessionVerinfo">
</ucap-profile-user-list-item>
<ucap-profile-user-list-item [userInfo]="userInfo">
<ucap-profile-user-list-item [userInfo]="userInfo" [sessionVerinfo]="sessionVerinfo">
</ucap-profile-user-list-item>
<ucap-profile-user-list-item [userInfo]="userInfo" [profileImageRoot]="profileImageRoot" [checkable]="true">
<ucap-profile-user-list-item [userInfo]="userInfo" [profileImageRoot]="profileImageRoot" [checkable]="true"
[sessionVerinfo]="sessionVerinfo">
</ucap-profile-user-list-item>
</div>
<h3>Organization</h3>
@ -26,10 +28,10 @@
</div>
<h3>Chat</h3>
<div>
<ucap-room-list-item [roomInfo]="roomInfo">
<ucap-room-list-item [roomInfo]="roomInfo" [sessionVerinfo]="sessionVerinfo">
</ucap-room-list-item>
</div>
<h3>Chat::MessageBox</h3>
<!-- <h3>Chat::MessageBox</h3>
<div>
<div>
<div>
@ -141,5 +143,5 @@
<ucap-chat-message-box-video-conference></ucap-chat-message-box-video-conference>
</div>
</div>
</div>
</div> -->
</div>

103
projects/ucap-webmessenger-app/src/app/pages/template/components/template.page.component.ts
View File

@ -11,10 +11,12 @@ import {
TerminalStatusInfo,
TerminalStatusNumber
} from '@ucap-webmessenger/protocol-status';
import { StatusCode } from '@ucap-webmessenger/core';
import { Router } from '@angular/router';
import { Company } from '@ucap-webmessenger/api-external';
import { EventType } from '@ucap-webmessenger/protocol-event';
import { EventType, Info } from '@ucap-webmessenger/protocol-event';
import { VersionInfo2Response } from '@ucap-webmessenger/api-public';
import { StatusCode as ApiStatusCode } from '@ucap-webmessenger/api';
import { StatusCode } from '@ucap-webmessenger/core';
@Component({
selector: 'app-template.page',
@ -34,9 +36,17 @@ export class TemplatePageComponent implements OnInit {
roomInfo: RoomInfo = roomInfo;
sessionVerinfo: VersionInfo2Response;
constructor(private router: Router) {}
ngOnInit() {}
ngOnInit() {
this.sessionVerinfo = {
statusCode: ApiStatusCode.Success,
errorMessage: '',
profileRoot: this.profileImageRoot
};
}
onClickLogin() {
this.router.navigate(['/account/login']);
@ -291,3 +301,90 @@ const companyList: Company[] = [
companyTimerChatAuthYn: 'Y'
}
];
const eventInfo: Info[] = [
{
seq: 6,
type: EventType.Character,
senderSeq: 504688,
sendDate: '2019-10-08 14:28:43',
sentMessage: '테스트1111',
receiverCount: 2
},
{
seq: 20,
type: EventType.File,
senderSeq: 509747,
sendDate: '2019-10-15 17:18:49',
sentMessage:
'{\r\n"StatusCode":"200",\r\n"ErrorMessage":"",\r\n"RoomID":"0",\r\n"FileName":"1.jpg",\r\n"FileExt":"jpg",\r\n"FileType":"I",\r\n"ThumbURL":"http://27.122.224.170:8011/WebFile/GUC006/2019/10/15/MA_509747_17184948.jpg.thumb.jpg",\r\n"AttSEQ":"2964",\r\n"AttSize":"879394",\r\n"AttRegDate":"2019-10-15 17:18:49",\r\n"ImageWidth":"320",\r\n"ImageHeight":"240",\r\n"CompanyCode":"GUC006",\r\n"VoiceTime":"",\r\n"SynappKey":""\r\n}',
receiverCount: 2
},
{
seq: 21,
type: EventType.File,
senderSeq: 509747,
sendDate: '2019-10-15 17:20:24',
sentMessage:
'{\r\n"StatusCode":"200",\r\n"ErrorMessage":"",\r\n"RoomID":"0",\r\n"FileName":"dummy_더미.txt",\r\n"FileExt":"txt",\r\n"FileType":"F",\r\n"ThumbURL":"",\r\n"AttSEQ":"2965",\r\n"AttSize":"1736",\r\n"AttRegDate":"2019-10-15 17:20:23",\r\n"ImageWidth":"320",\r\n"ImageHeight":"320",\r\n"CompanyCode":"GUC006",\r\n"VoiceTime":"",\r\n"SynappKey":""\r\n}',
receiverCount: 2
},
{
seq: 22,
type: EventType.File,
senderSeq: 509747,
sendDate: '2019-10-15 17:21:10',
sentMessage:
'{\r\n"StatusCode":"200",\r\n"ErrorMessage":"",\r\n"RoomID":"0",\r\n"FileName":"The_Power_of_Teamwork_-_Funny_Animation.mp4",\r\n"FileExt":"mp4",\r\n"FileType":"V",\r\n"ThumbURL":"",\r\n"AttSEQ":"2966",\r\n"AttSize":"4476141",\r\n"AttRegDate":"2019-10-15 17:21:10",\r\n"ImageWidth":"320",\r\n"ImageHeight":"320",\r\n"CompanyCode":"GUC006",\r\n"VoiceTime":"",\r\n"SynappKey":""\r\n}',
receiverCount: 2
},
{
seq: 3,
type: EventType.MassText,
senderSeq: 10642,
sendDate: '2019-09-19 09:46:24',
sentMessage:
'{"StatusCode":"200","ErrorMessage":"","EventMassSeq":"1011","RoomID":"2479","RegDate":"","Content":"RequestMassEventSendRequestMassEventSendRequestMassEventSendRequestMassEventSendRequestMassEventSendRequestMassEventSendRequestMassEventSendRequestMassEventSendRequestMassEventSendRequestMassEventSendRequestMassEventSendRequestMassEventSendRequestMassEventSendRequestMassEventSendRequestMassEventSend"}',
receiverCount: 2
},
{
seq: 1,
type: EventType.Join,
senderSeq: 509747,
sendDate: '2019-10-15 17:23:26',
sentMessage: '이진호2,T10112,T10222,이진호',
receiverCount: 4
},
{
seq: 4,
type: EventType.Exit,
senderSeq: 509747,
sendDate: '2019-10-15 17:24:15',
sentMessage: '이진호2',
receiverCount: 3
},
{
seq: 19,
type: EventType.RecalledMessage,
senderSeq: 509747,
sendDate: '2019-10-15 16:36:47',
sentMessage: 'aaaaaa',
receiverCount: 2
},
{
seq: 25,
type: EventType.RenameRoom,
senderSeq: 509747,
sendDate: '2019-10-15 17:25:55',
sentMessage: '이진호2,이진호,이진호2 바꿔',
receiverCount: 2
},
{
receiverCount: 2,
sendDate: '2019-10-15 17:28:13',
senderSeq: 509747,
sentMessage: '509747,43200',
seq: 5,
type: EventType.GuideForRoomTimerChanged
}
];

4
projects/ucap-webmessenger-ui-room/src/lib/components/list-item.component.ts
View File

@ -5,6 +5,7 @@ import {
UserInfo as RoomUserInfo
} from '@ucap-webmessenger/protocol-room';
import { NGXLogger } from 'ngx-logger';
import { VersionInfo2Response } from '@ucap-webmessenger/api-public';
@Component({
selector: 'ucap-room-list-item',
@ -14,9 +15,10 @@ import { NGXLogger } from 'ngx-logger';
export class ListItemComponent implements OnInit {
@Input()
roomInfo: RoomInfo;
@Input()
roomUserInfo: RoomUserInfo[] | UserInfoShort[];
@Input()
sessionVerinfo: VersionInfo2Response;
constructor(private logger: NGXLogger) {}