Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger

projects/ucap-webmessenger-app/src/app/layouts/messenger/components/intro.component.html

@@ -1,10 +1,5 @@
 <div fxFlex fxLayout="column" fxLayoutAlign="center center">
-  <div
+  <div class="empty-logo" fxLayoutAlign="center center" fxLayout="column">
-    class="empty-logo"
-    fxLayoutAlign="center center"
-    fxLayout="column"
-    (click)="onClickStatusBar()"
-  >
     <div
       class="big-circle app-logo border-accent-color"
       fxLayoutAlign="center center"

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) {

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>
           </td>
         </ng-container>
         <tr

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;
-      }
+      font-size: 0.8em;
+      padding-right: 17px;
     }
   }
 }

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">

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>
             )
-          )
           ),
-        tap(([notiOrRes, curRoomInfo, roomList]) => {
+          this.nativeService.windowStateChanged()
+        ),
+        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;
                   }