receive alarm is implemented
This commit is contained in:
parent
37691a565f
commit
9b0106a4be
|
@ -5,14 +5,37 @@
|
|||
<div fxFlex fxLayout="row" fxLayoutAlign="space-between center">
|
||||
<div fxLayout="row" fxLayoutAlign="start center">
|
||||
<!-- RESPONSIVE CHATS BUTTON-->
|
||||
<button mat-icon-button aria-label="chats button" fxHide.gt-md class="responsive-chats-button">
|
||||
<button
|
||||
mat-icon-button
|
||||
aria-label="chats button"
|
||||
fxHide.gt-md
|
||||
class="responsive-chats-button"
|
||||
>
|
||||
<mat-icon>chat</mat-icon>
|
||||
</button>
|
||||
<!-- / RESPONSIVE CHATS BUTTON-->
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<button mat-icon-button [matMenuTriggerFor]="contactMenu" aria-label="more">
|
||||
<button
|
||||
*ngIf="!!roomInfo"
|
||||
mat-icon-button
|
||||
(click)="onClickReceiveAlarm($event)"
|
||||
aria-label="Toggle Receive Alarm"
|
||||
>
|
||||
<mat-icon class="amber-fg" *ngIf="roomInfo.receiveAlarm"
|
||||
>notifications_active</mat-icon
|
||||
>
|
||||
<mat-icon class="secondary-text" *ngIf="!roomInfo.receiveAlarm"
|
||||
>notifications_off</mat-icon
|
||||
>
|
||||
</button>
|
||||
|
||||
<button
|
||||
mat-icon-button
|
||||
[matMenuTriggerFor]="contactMenu"
|
||||
aria-label="more"
|
||||
>
|
||||
<mat-icon>more_vert</mat-icon>
|
||||
</button>
|
||||
|
||||
|
@ -25,11 +48,18 @@
|
|||
</div>
|
||||
</mat-toolbar>
|
||||
<!-- / CHAT TOOLBAR -->
|
||||
<mat-progress-bar *ngIf="eventListProcessing$ | async" mode="indeterminate"></mat-progress-bar>
|
||||
<mat-progress-bar
|
||||
*ngIf="eventListProcessing$ | async"
|
||||
mode="indeterminate"
|
||||
></mat-progress-bar>
|
||||
<!-- CHAT CONTENT -->
|
||||
<div fxFlex="1 1 auto" class="chat-content" #messageBoxContainer>
|
||||
<!-- CHAT MESSAGES -->
|
||||
<ucap-chat-messages [messages]="eventList$ | async" [userInfos]="userInfoList$ | async" [loginRes]="loginRes">
|
||||
<ucap-chat-messages
|
||||
[messages]="eventList$ | async"
|
||||
[userInfos]="userInfoList$ | async"
|
||||
[loginRes]="loginRes"
|
||||
>
|
||||
</ucap-chat-messages>
|
||||
<!-- CHAT MESSAGES -->
|
||||
</div>
|
||||
|
|
|
@ -14,6 +14,7 @@ import { Info, EventType } from '@ucap-webmessenger/protocol-event';
|
|||
|
||||
import * as AppStore from '@app/store';
|
||||
import * as EventStore from '@app/store/messenger/event';
|
||||
import * as RoomStore from '@app/store/messenger/room';
|
||||
import { LoginResponse } from '@ucap-webmessenger/protocol-authentication';
|
||||
import { SessionStorageService } from '@ucap-webmessenger/web-storage';
|
||||
import { LoginInfo, KEY_LOGIN_INFO } from '@app/types';
|
||||
|
@ -108,6 +109,10 @@ export class MessagesComponent implements OnInit, OnDestroy, AfterViewChecked {
|
|||
);
|
||||
}
|
||||
|
||||
onClickReceiveAlarm() {
|
||||
this.store.dispatch(RoomStore.updateOnlyAlarm({ roomInfo: this.roomInfo }));
|
||||
}
|
||||
|
||||
private scrollToBottomForMessageBoxContainer(): void {
|
||||
try {
|
||||
this.messageBoxContainer.nativeElement.scrollTop = this.messageBoxContainer.nativeElement.scrollHeight;
|
||||
|
|
|
@ -106,7 +106,7 @@ const roomInfo: RoomInfo = {
|
|||
finalEventDate: '2019-09-30 13:57:06',
|
||||
joinUserCount: 2,
|
||||
noReadCnt: 0,
|
||||
isAlarm: true,
|
||||
receiveAlarm: true,
|
||||
isJoinRoom: true,
|
||||
expiredFileStdSeq: 0,
|
||||
isTimeRoom: true,
|
||||
|
|
|
@ -7,7 +7,9 @@ import {
|
|||
InviteNotification,
|
||||
ExitNotification,
|
||||
ExitForcingNotification,
|
||||
UpdateFontNotification
|
||||
UpdateFontNotification,
|
||||
UpdateResponse,
|
||||
UpdateRequest
|
||||
} from '@ucap-webmessenger/protocol-room';
|
||||
|
||||
export const info = createAction(
|
||||
|
@ -48,3 +50,25 @@ export const updateFontNotification = createAction(
|
|||
'[Messenger::Room] Update Font Notification',
|
||||
props<{ noti: UpdateFontNotification }>()
|
||||
);
|
||||
|
||||
export const updateOnlyAlarm = createAction(
|
||||
'[Messenger::Room] Update Only Alarm',
|
||||
props<{ roomInfo: RoomInfo }>()
|
||||
);
|
||||
|
||||
export const update = createAction(
|
||||
'[Messenger::Room] Update',
|
||||
props<{ req: UpdateRequest }>()
|
||||
);
|
||||
|
||||
export const updateSuccess = createAction(
|
||||
'[Messenger::Room] Update Success',
|
||||
props<{
|
||||
res: UpdateResponse;
|
||||
}>()
|
||||
);
|
||||
|
||||
export const updateFailure = createAction(
|
||||
'[Messenger::Room] Update Failure',
|
||||
props<{ error: any }>()
|
||||
);
|
||||
|
|
|
@ -2,12 +2,19 @@ import { Injectable } from '@angular/core';
|
|||
|
||||
import { Actions, createEffect, ofType } from '@ngrx/effects';
|
||||
|
||||
import { Store } from '@ngrx/store';
|
||||
import { Store, select } from '@ngrx/store';
|
||||
|
||||
import { NGXLogger } from 'ngx-logger';
|
||||
|
||||
import { of } from 'rxjs';
|
||||
import { tap, switchMap, map, catchError } from 'rxjs/operators';
|
||||
import {
|
||||
tap,
|
||||
switchMap,
|
||||
map,
|
||||
catchError,
|
||||
exhaustMap,
|
||||
withLatestFrom
|
||||
} from 'rxjs/operators';
|
||||
import {
|
||||
RoomInfo,
|
||||
UserInfoShort,
|
||||
|
@ -19,7 +26,8 @@ import {
|
|||
SSVC_TYPE_ROOM_INFO_USER2,
|
||||
SSVC_TYPE_ROOM_INFO_RES,
|
||||
UserShortData,
|
||||
UserData
|
||||
UserData,
|
||||
UpdateResponse
|
||||
} from '@ucap-webmessenger/protocol-room';
|
||||
|
||||
import * as ChatStore from '@app/store/messenger/chat';
|
||||
|
@ -31,7 +39,11 @@ import {
|
|||
inviteNotification,
|
||||
exitNotification,
|
||||
exitForcingNotification,
|
||||
updateFontNotification
|
||||
updateFontNotification,
|
||||
updateOnlyAlarm,
|
||||
update,
|
||||
updateSuccess,
|
||||
updateFailure
|
||||
} from './actions';
|
||||
import { SessionStorageService } from '@ucap-webmessenger/web-storage';
|
||||
import { LoginInfo, KEY_LOGIN_INFO } from '@app/types';
|
||||
|
@ -99,6 +111,38 @@ export class Effects {
|
|||
{ dispatch: false }
|
||||
);
|
||||
|
||||
update$ = createEffect(() =>
|
||||
this.actions$.pipe(
|
||||
ofType(update),
|
||||
map(action => action.req),
|
||||
exhaustMap(req => {
|
||||
return this.roomProtocolService.update(req).pipe(
|
||||
map((res: UpdateResponse) => {
|
||||
return updateSuccess({ res });
|
||||
}),
|
||||
catchError(error => of(updateFailure({ error })))
|
||||
);
|
||||
})
|
||||
)
|
||||
);
|
||||
|
||||
updateOnlyAlarm$ = createEffect(() =>
|
||||
this.actions$.pipe(
|
||||
ofType(updateOnlyAlarm),
|
||||
map(action => action.roomInfo),
|
||||
map(roomInfo =>
|
||||
update({
|
||||
req: {
|
||||
roomSeq: roomInfo.roomSeq,
|
||||
roomName: roomInfo.roomName,
|
||||
receiveAlarm: !roomInfo.receiveAlarm,
|
||||
syncAll: false
|
||||
}
|
||||
})
|
||||
)
|
||||
)
|
||||
);
|
||||
|
||||
inviteNotification$ = createEffect(
|
||||
() => {
|
||||
return this.actions$.pipe(
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
import { createReducer, on } from '@ngrx/store';
|
||||
import { initialState } from './state';
|
||||
import { infoSuccess } from './actions';
|
||||
import { infoSuccess, updateSuccess } from './actions';
|
||||
|
||||
import * as AuthenticationStore from '@app/store/account/authentication';
|
||||
|
||||
|
@ -15,6 +15,17 @@ export const reducer = createReducer(
|
|||
};
|
||||
}),
|
||||
|
||||
on(updateSuccess, (state, action) => {
|
||||
return {
|
||||
...state,
|
||||
roomInfo: {
|
||||
...state.roomInfo,
|
||||
roomName: action.res.roomName,
|
||||
receiveAlarm: action.res.receiveAlarm
|
||||
}
|
||||
};
|
||||
}),
|
||||
|
||||
on(AuthenticationStore.logout, (state, action) => {
|
||||
return {
|
||||
...initialState
|
||||
|
|
|
@ -19,6 +19,8 @@ import {
|
|||
} from '@ucap-webmessenger/protocol-sync';
|
||||
|
||||
import * as AuthenticationStore from '@app/store/account/authentication';
|
||||
import * as RoomStore from '@app/store/messenger/room';
|
||||
import { RoomInfo } from '@ucap-webmessenger/protocol-room';
|
||||
|
||||
export const reducer = createReducer(
|
||||
initialState,
|
||||
|
@ -95,6 +97,22 @@ export const reducer = createReducer(
|
|||
};
|
||||
}),
|
||||
|
||||
on(RoomStore.updateSuccess, (state, action) => {
|
||||
const roomInfo: RoomInfo = {
|
||||
...state.room.entities[action.res.roomSeq],
|
||||
roomName: action.res.roomName,
|
||||
receiveAlarm: action.res.receiveAlarm
|
||||
};
|
||||
|
||||
return {
|
||||
...state,
|
||||
room: adapterRoom.updateOne(
|
||||
{ id: action.res.roomSeq, changes: roomInfo },
|
||||
{ ...state.room }
|
||||
)
|
||||
};
|
||||
}),
|
||||
|
||||
on(AuthenticationStore.logout, (state, action) => {
|
||||
return {
|
||||
...initialState
|
||||
|
|
|
@ -2,30 +2,30 @@ import { RoomType } from '../types/room.type';
|
|||
import { EventType } from '@ucap-webmessenger/protocol-event';
|
||||
|
||||
export interface RoomInfo {
|
||||
// 0. 대화방SEQ
|
||||
/** 0. 대화방SEQ */
|
||||
roomSeq: string;
|
||||
// 1. 대화방종류
|
||||
/** 1. 대화방종류 */
|
||||
roomType: RoomType;
|
||||
// 2. 대화방명
|
||||
/** 2. 대화방명 */
|
||||
roomName: string;
|
||||
// 3. 최종타입
|
||||
/** 3. 최종타입 */
|
||||
finalEventType: EventType;
|
||||
// 4. 최종대화
|
||||
/** 4. 최종대화 */
|
||||
finalEventMessage: string;
|
||||
// 5. 최종시간
|
||||
/** 5. 최종시간 */
|
||||
finalEventDate: string;
|
||||
// 6. 참여인원수
|
||||
/** 6. 참여인원수 */
|
||||
joinUserCount: number;
|
||||
// 7. 안읽은수
|
||||
/** 7. 안읽은수 */
|
||||
noReadCnt: number;
|
||||
// 8. 알람여부
|
||||
isAlarm: boolean;
|
||||
// 9. 참여여부
|
||||
/** 8. 알람여부 */
|
||||
receiveAlarm: boolean;
|
||||
/** 9. 참여여부 */
|
||||
isJoinRoom: boolean;
|
||||
// 10. 유효한파일 이벤트 기준 SEQ
|
||||
/** 10. 유효한파일 이벤트 기준 SEQ */
|
||||
expiredFileStdSeq: number;
|
||||
// 11. 타이머대화방여부YN
|
||||
/** 11. 타이머대화방여부YN */
|
||||
isTimeRoom: boolean;
|
||||
// 12. 타이머시간(n)
|
||||
/** 12. 타이머시간(n) */
|
||||
timeRoomInterval: number;
|
||||
}
|
||||
|
|
|
@ -90,7 +90,7 @@ export const decodeInfoData: ProtocolDecoder<InfoData> = (
|
|||
finalEventDate: info[5],
|
||||
joinUserCount: Number(info[6]),
|
||||
noReadCnt: Number(info[7]),
|
||||
isAlarm: info[8] !== 'N' ? true : false,
|
||||
receiveAlarm: info[8] !== 'N' ? true : false,
|
||||
isJoinRoom: info[9] === 'Y' ? true : false,
|
||||
expiredFileStdSeq: Number(info[10]),
|
||||
isTimeRoom: info[11] === 'Y' ? true : false,
|
||||
|
|
|
@ -11,25 +11,25 @@ import {
|
|||
} from '@ucap-webmessenger/protocol';
|
||||
|
||||
export interface UpdateRequest extends ProtocolRequest {
|
||||
// 대화방SEQ(s)
|
||||
/** 대화방SEQ(s) */
|
||||
roomSeq: string;
|
||||
// 대화방제목(s)
|
||||
/** 대화방제목(s) */
|
||||
roomName: string;
|
||||
// 알람여부(y)
|
||||
isAlarm: boolean;
|
||||
// 동기화여부(s)
|
||||
isSyncAll: boolean;
|
||||
/** 알람여부(y) */
|
||||
receiveAlarm: boolean;
|
||||
/** 동기화여부(s) */
|
||||
syncAll: boolean;
|
||||
}
|
||||
|
||||
export interface UpdateResponse extends ProtocolResponse {
|
||||
// 대화방SEQ(s)
|
||||
/** 대화방SEQ(s) */
|
||||
roomSeq: string;
|
||||
// 대화방제목(s)
|
||||
/** 대화방제목(s) */
|
||||
roomName: string;
|
||||
// 알람여부(y)
|
||||
isAlarm: boolean;
|
||||
// 동기화여부(s)
|
||||
isSyncAll: boolean;
|
||||
/** 알람여부(y) */
|
||||
receiveAlarm: boolean;
|
||||
/** 동기화여부(s) */
|
||||
syncAll: boolean;
|
||||
}
|
||||
|
||||
export const encodeUpdate: ProtocolEncoder<UpdateRequest> = (
|
||||
|
@ -41,11 +41,11 @@ export const encodeUpdate: ProtocolEncoder<UpdateRequest> = (
|
|||
bodyList.push({ type: PacketBodyValue.String, value: req.roomName });
|
||||
bodyList.push({
|
||||
type: PacketBodyValue.String,
|
||||
value: req.isAlarm ? 'Y' : 'N'
|
||||
value: req.receiveAlarm ? 'Y' : 'N'
|
||||
});
|
||||
bodyList.push({
|
||||
type: PacketBodyValue.String,
|
||||
value: req.isSyncAll ? 'Y' : 'N'
|
||||
value: req.syncAll ? 'Y' : 'N'
|
||||
});
|
||||
return bodyList;
|
||||
};
|
||||
|
@ -56,8 +56,8 @@ export const decodeUpdate: ProtocolDecoder<UpdateResponse> = (
|
|||
return decodeProtocolMessage(message, {
|
||||
roomSeq: message.bodyList[0],
|
||||
roomName: message.bodyList[1],
|
||||
isAlarm: message.bodyList[2] === 'Y' ? true : false,
|
||||
isSyncAll: message.bodyList[3] === 'Y' ? true : false
|
||||
receiveAlarm: message.bodyList[2] === 'Y' ? true : false,
|
||||
syncAll: message.bodyList[3] === 'Y' ? true : false
|
||||
} as UpdateResponse);
|
||||
};
|
||||
|
||||
|
|
|
@ -84,7 +84,7 @@ export const decodeRoomData: ProtocolDecoder<RoomData> = (
|
|||
finalEventDate: info[5],
|
||||
joinUserCount: Number(info[6]),
|
||||
noReadCnt: Number(info[7]),
|
||||
isAlarm: info[8] !== 'N' ? true : false,
|
||||
receiveAlarm: info[8] !== 'N' ? true : false,
|
||||
isJoinRoom: info[9] === 'Y' ? true : false,
|
||||
expiredFileStdSeq: Number(info[10]),
|
||||
isTimeRoom: info[11] === 'Y' ? true : false,
|
||||
|
|
|
@ -36,6 +36,10 @@ export class MessagesComponent implements OnInit {
|
|||
}
|
||||
|
||||
getUserName(seq: number): string {
|
||||
if (!this.userInfos) {
|
||||
return '';
|
||||
}
|
||||
|
||||
const userInfo: UserInfo[] = this.userInfos.filter(
|
||||
user => user.seq === seq
|
||||
);
|
||||
|
@ -45,6 +49,10 @@ export class MessagesComponent implements OnInit {
|
|||
return '(알수없는 사용자)';
|
||||
}
|
||||
getUserProfile(seq: number): string {
|
||||
if (!this.userInfos) {
|
||||
return '';
|
||||
}
|
||||
|
||||
const userInfo: UserInfo[] = this.userInfos.filter(
|
||||
user => user.seq === seq
|
||||
);
|
||||
|
|
Loading…
Reference in New Issue
Block a user