From 7171f8b0e0a69b201d8bc0b5cfebfd2f82e295f8 Mon Sep 17 00:00:00 2001 From: leejinho Date: Tue, 7 Jan 2020 17:45:43 +0900 Subject: [PATCH] =?UTF-8?q?#=20=EC=9D=B4=EC=8A=88=EC=B2=98=EB=A6=AC=20124?= =?UTF-8?q?=206=EA=B0=9C=20=EB=A9=94=EC=8B=9C=EC=A7=80=20=EB=B0=9C?= =?UTF-8?q?=EC=8B=A0=20=EC=8B=9C=20'=EC=97=AC=EA=B8=B0=EA=B9=8C=EC=A7=80?= =?UTF-8?q?=20=EC=9D=BD=EC=97=88=EC=8A=B5=EB=8B=88=EB=8B=A4.'=20=EB=B3=B4?= =?UTF-8?q?=EC=97=AC=EC=A7=90=20::=20=EB=B2=84=EA=B7=B8=20=EC=88=98?= =?UTF-8?q?=EC=A0=95.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../messenger/components/messages.component.html | 1 + .../messenger/components/messages.component.ts | 12 +++++++++++- .../src/lib/components/messages.component.ts | 7 ++++--- 3 files changed, 16 insertions(+), 4 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 e067daba..92487036 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 @@ -239,6 +239,7 @@ [minShowReadHere]=" environment.productConfig.CommonSetting.readHereShowMinimumEventCount " + [initRoomLastEventSeq]="initRoomLastEventSeq" [translationSimpleview]="translationSimpleview" (moreEvent)="onMoreEvent($event)" (massDetail)="onMassDetail($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 95d61e71..739e1079 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 @@ -192,6 +192,7 @@ export class MessagesComponent implements OnInit, OnDestroy, AfterViewInit { /** About ReadHere */ firstcheckReadHere = true; clearReadHere = false; + initRoomLastEventSeq: number; snackBarPreviewEvent: MatSnackBarRef; @@ -358,7 +359,16 @@ export class MessagesComponent implements OnInit, OnDestroy, AfterViewInit { this.eventInfoStatusSubscription = this.store .pipe( select(AppStore.MessengerSelector.EventSelector.infoStatus), - tap(res => (this.eventInfoStatus = res)) + tap(res => { + this.eventInfoStatus = res; + + if (!!res) { + const elist = this.eventList; + if (res.baseSeq === 0 && elist.length > 0) { + this.initRoomLastEventSeq = elist[elist.length - 1].seq; + } + } + }) ) .subscribe(); diff --git a/projects/ucap-webmessenger-ui-chat/src/lib/components/messages.component.ts b/projects/ucap-webmessenger-ui-chat/src/lib/components/messages.component.ts index fac5f2d6..403564f4 100644 --- a/projects/ucap-webmessenger-ui-chat/src/lib/components/messages.component.ts +++ b/projects/ucap-webmessenger-ui-chat/src/lib/components/messages.component.ts @@ -30,7 +30,6 @@ export class MessagesComponent implements OnInit { set eventList(elist: Info[]) { if (!!elist && elist.length > 0) { this.firstEventSeq = elist[0].seq; - this.lastEventSeq = elist[elist.length - 1].seq; } this.messages = elist; @@ -52,6 +51,8 @@ export class MessagesComponent implements OnInit { @Input() minShowReadHere = 10; @Input() + initRoomLastEventSeq: number; + @Input() translationSimpleview = false; @Output() @@ -86,7 +87,6 @@ export class MessagesComponent implements OnInit { moment = moment; firstEventSeq = 0; - lastEventSeq = 0; existReadHere = false; constructor(private logger: NGXLogger, private datePipe: DatePipe) {} @@ -186,7 +186,8 @@ export class MessagesComponent implements OnInit { if ( !!this.roomInfo && !!this.roomInfo.lastReadEventSeq && - this.lastEventSeq - this.roomInfo.lastReadEventSeq > 5 + this.initRoomLastEventSeq - this.roomInfo.lastReadEventSeq > + this.minShowReadHere ) { if ( this.roomInfo.roomType === RoomType.Single ||