From 729a95e1eb84b19a15bf86cfdc26e14abc97a54f Mon Sep 17 00:00:00 2001 From: leejinho Date: Fri, 22 Nov 2019 09:17:47 +0900 Subject: [PATCH] =?UTF-8?q?[=EC=9D=B4=EC=8A=88=EC=B2=98=EB=A6=AC=205]=20My?= =?UTF-8?q?Talk=20=EC=97=90=EC=84=9C=20unread=20count=20=EB=B3=B4=EC=9D=B4?= =?UTF-8?q?=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=EC=88=98=EC=A0=95.=20#2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/messages.component.html | 6 +----- .../messenger/components/messages.component.ts | 17 +++++++++++++++-- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.html index 9630af37..1d64416a 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.html +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.html @@ -171,11 +171,7 @@ [userInfos]="userInfoList" [loginRes]="loginRes" [sessionVerInfo]="sessionVerInfo" - [isShowUnreadCount]=" - roomInfo.roomType !== RoomType.Mytalk && - roomInfo.roomType !== RoomType.Bot && - roomInfo.roomType !== RoomType.Allim - " + [isShowUnreadCount]="getShowUnreadCount()" (moreEvent)="onMoreEvent($event)" (massDetail)="onMassDetail($event)" (save)="onSave($event)" diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.ts index f2cea591..f28c7f5b 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.ts +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.ts @@ -151,8 +151,6 @@ export class MessagesComponent implements OnInit, OnDestroy, AfterViewInit { snackBarPreviewEvent: MatSnackBarRef; - RoomType = RoomType; - constructor( private store: Store, private sessionStorageService: SessionStorageService, @@ -355,6 +353,21 @@ export class MessagesComponent implements OnInit, OnDestroy, AfterViewInit { return true; } + getShowUnreadCount(): boolean { + if (!this.roomInfo || this.roomInfo === undefined) { + return true; + } + if ( + this.roomInfo.roomType === RoomType.Mytalk || + this.roomInfo.roomType === RoomType.Bot || + this.roomInfo.roomType === RoomType.Allim + ) { + return false; + } + + return true; + } + readyToReply(): void { setTimeout(() => { this.focusReplyInput();