ucap/next-ucap-messenger
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
richard-loafle 2020-02-14 15:30:53 +09:00
commit 64ea49ae09
6 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

3
projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.ts
View File

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

4
projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/notice.component.html
View File

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

10
projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/notice.component.scss
View File

@ -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;
}
}
}

1
projects/ucap-webmessenger-app/src/app/pages/messenger/components/main.page.component.html
View File

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

13
projects/ucap-webmessenger-app/src/app/services/notification.service.ts
View File

@ -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;
}