From 30debd93b79c21e54c7b207099e3fe3908bbc284 Mon Sep 17 00:00:00 2001
From: leejinho <lilis7575@gmail.com>
Date: Fri, 14 Feb 2020 13:27:15 +0900
Subject: [PATCH 1/3] =?UTF-8?q?bugfix=20=EC=97=BD=EB=8D=B0=EC=9D=B4?=
 =?UTF-8?q?=ED=8A=B8=EA=B0=80=20=EC=9E=88=EC=8A=B5=EB=8B=88=EB=8B=A4.=20?=
 =?UTF-8?q?=ED=91=9C=EC=8B=9C=20=EB=B6=80=EB=B6=84=20=EC=A0=9C=EA=B1=B0.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/layouts/messenger/components/intro.component.html  | 7 +------
 .../pages/messenger/components/main.page.component.html    | 1 -
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/intro.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/intro.component.html
index 4dba153b..b6dd54fb 100644
--- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/intro.component.html
+++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/intro.component.html
@@ -1,10 +1,5 @@
 <div fxFlex fxLayout="column" fxLayoutAlign="center center">
-  <div
-    class="empty-logo"
-    fxLayoutAlign="center center"
-    fxLayout="column"
-    (click)="onClickStatusBar()"
-  >
+  <div class="empty-logo" fxLayoutAlign="center center" fxLayout="column">
     <div
       class="big-circle app-logo border-accent-color"
       fxLayoutAlign="center center"
diff --git a/projects/ucap-webmessenger-app/src/app/pages/messenger/components/main.page.component.html b/projects/ucap-webmessenger-app/src/app/pages/messenger/components/main.page.component.html
index ccdb8c00..420235ae 100644
--- a/projects/ucap-webmessenger-app/src/app/pages/messenger/components/main.page.component.html
+++ b/projects/ucap-webmessenger-app/src/app/pages/messenger/components/main.page.component.html
@@ -17,7 +17,6 @@
     <div class="chat-messages bg-accent-brightest">
       <div
         #statusbarContainer
-        *ngIf="false"
         class="messenger-statusbar-container bg-accent-darkest"
       >
         <div class="messenger-statusbar-message">

From c07d13eae89394dd685dcde6a3242696c12a118c Mon Sep 17 00:00:00 2001
From: leejinho <lilis7575@gmail.com>
Date: Fri, 14 Feb 2020 13:27:28 +0900
Subject: [PATCH 2/3] =?UTF-8?q?#=20=EC=9D=B4=EC=8A=88=EC=B2=98=EB=A6=AC=20?=
 =?UTF-8?q?247,=20253?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../left-sidenav/organization.component.ts           |  3 ++-
 .../components/right-drawer/notice.component.html    |  6 ++----
 .../components/right-drawer/notice.component.scss    | 12 ++++++++----
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.ts
index 24d0e074..298c8aca 100644
--- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.ts
+++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.ts
@@ -573,7 +573,8 @@ export class OrganizationComponent
       data: {
         title: this.translateService.instant('organization.selectedUser'),
         selectedUserList: this.selectedUserList
-      }
+      },
+      restoreFocus: false
     });
 
     if (!!result && !!result.choice && result.choice) {
diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/notice.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/notice.component.html
index b6c1ddf5..cb042300 100644
--- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/notice.component.html
+++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/notice.component.html
@@ -22,13 +22,11 @@
           </td>
         </ng-container>
         <ng-container matColumnDef="regDate">
-          <th mat-header-cell *matHeaderCellDef>
+          <th mat-header-cell *matHeaderCellDef class="regDate">
             {{ 'notice.fieldPostDate' | translate }}
           </th>
           <td mat-cell *matCellDef="let element" class="date">
-            <div class="date">
-              {{ element.regDate }}
-            </div>
+            {{ element.regDate }}
           </td>
         </ng-container>
         <tr
diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/notice.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/notice.component.scss
index 16179aa1..d8a170b0 100644
--- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/notice.component.scss
+++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/notice.component.scss
@@ -38,6 +38,11 @@ $tablet-s-width: 768px;
   th.infos {
     padding: 10px;
     text-align: center;
+    width: 80%;
+  }
+  th.regDate {
+    padding: 10px;
+    text-align: center;
   }
   tr.mat-row {
     height: 70px;
@@ -59,10 +64,9 @@ $tablet-s-width: 768px;
       }
     }
     .date {
-      .date {
-        font-size: 0.8em;
-        text-align: right;
-      }
+      text-align: right;
+      font-size: 0.8em;
+      padding-right: 17px;
     }
   }
 }

From 0686c1d5127717960f19902b63bc9c7170837a62 Mon Sep 17 00:00:00 2001
From: leejinho <lilis7575@gmail.com>
Date: Fri, 14 Feb 2020 14:59:40 +0900
Subject: [PATCH 3/3] =?UTF-8?q?bugfix=20::=20=20=ED=98=84=EC=9E=AC=20?=
 =?UTF-8?q?=EC=97=B4=EB=A0=A4=20=EC=9E=88=EB=8A=94=20=EB=8C=80=ED=99=94?=
 =?UTF-8?q?=EB=B0=A9=EC=9D=B4=EC=96=B4=EB=8F=84,=20windowState=20=EA=B0=80?=
 =?UTF-8?q?=20minimal,=20hidden=20=EC=9D=BC=20=EA=B2=BD=EC=9A=B0=EC=97=90?=
 =?UTF-8?q?=EB=8A=94=20noti=20=ED=8C=9D=EC=97=85=EC=9D=84=20=EB=B3=B4?=
 =?UTF-8?q?=EC=97=AC=EC=A3=BC=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/app/services/notification.service.ts        | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/projects/ucap-webmessenger-app/src/app/services/notification.service.ts b/projects/ucap-webmessenger-app/src/app/services/notification.service.ts
index 2cc63bad..7f9eff2c 100644
--- a/projects/ucap-webmessenger-app/src/app/services/notification.service.ts
+++ b/projects/ucap-webmessenger-app/src/app/services/notification.service.ts
@@ -92,7 +92,8 @@ import {
   NotificationRequest,
   NativeService,
   UCAP_NATIVE_SERVICE,
-  NotificationType
+  NotificationType,
+  WindowState
 } from '@ucap-webmessenger/native';
 import { StringUtil, DialogService } from '@ucap-webmessenger/ui';
 import {
@@ -208,9 +209,10 @@ export class AppNotificationService {
               (state: any) =>
                 state.messenger.sync.room.entities as Dictionary<RoomInfo>
             )
-          )
+          ),
+          this.nativeService.windowStateChanged()
         ),
-        tap(([notiOrRes, curRoomInfo, roomList]) => {
+        tap(([notiOrRes, curRoomInfo, roomList, windowStateChanged]) => {
           switch (notiOrRes.SSVC_TYPE) {
             case SSVC_TYPE_EVENT_SEND_RES:
             case SSVC_TYPE_EVENT_SEND_NOTI:
@@ -243,7 +245,10 @@ export class AppNotificationService {
                   if (
                     !!curRoomInfo &&
                     !!curRoomInfo.roomSeq &&
-                    curRoomInfo.roomSeq === noti.roomSeq
+                    curRoomInfo.roomSeq === noti.roomSeq &&
+                    !!windowStateChanged &&
+                    windowStateChanged !== WindowState.Minimized &&
+                    windowStateChanged !== WindowState.Hidden
                   ) {
                     doNoti = false;
                   }