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:
khk 2020-03-26 17:00:00 +09:00
commit 5203997fa4
10 changed files with 122 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
electron-projects/ucap-webmessenger-electron/src/app/AppWindow.ts
View File

@ -88,6 +88,10 @@ export class AppWindow {
// windows Focus or Blur state detacted.
this.window.on(ElectronBrowserWindowChannel.Focus, () => {
if (__WIN32__) {
this.window.flashFrame(false);
}
this.window.webContents.send(
WindowStateChannel.FocuseChanged,
ElectronBrowserWindowChannel.Focus
@ -122,9 +126,6 @@ export class AppWindow {
this.window.hide();
// }
});
this.window.on(ElectronBrowserWindowChannel.Focus, e => {
this.window.flashFrame(false);
});
}
if (__WIN32__) {

19
electron-projects/ucap-webmessenger-electron/src/index.ts
View File

@ -7,7 +7,8 @@ import {
shell,
dialog,
BrowserWindow,
clipboard
clipboard,
crashReporter
} from 'electron';
import path from 'path';
import fse from 'fs-extra';
@ -133,6 +134,12 @@ function getUptimeInSeconds() {
return (now() - launchTime) / 1000;
}
crashReporter.start({
productName: app.name,
companyName: app.getVersion(),
submitURL: 'https//localhost'
});
process.on('uncaughtException', (error: Error) => {
// error = withSourceMappedStack(error);
// reportError(error, getExtraErrorContext());
@ -212,6 +219,7 @@ function createWindow() {
}
window.onClose(() => {
process.crash();
appWindow = null;
if (!__DARWIN__ && !preventQuit) {
app.quit();
@ -671,9 +679,18 @@ ipcMain.on(
properties: ['openDirectory']
})
.then(value => {
if (!!value) {
event.returnValue = value.filePaths[0];
} else {
log.error(
'[IpcMain / SelectDirectory]',
'Value is null or undefined'
);
event.returnValue = undefined;
}
})
.catch(reason => {
log.error('[IpcMain / SelectDirectory]', reason);
event.returnValue = undefined;
});
}

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "ucap-webmessenger",
"version": "1.0.13",
"version": "1.0.14",
"author": {
"name": "LG CNS",
"email": "lgucap@lgcns.com"

30
projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.html
View File

@ -91,6 +91,36 @@
</ng-template>
<ng-template #roomNameNotExist>
{{ getRoomNameByRoomUser(_roomUserInfos) }}
<span
*ngIf="roomInfoSubject.value.roomType === RoomType.Single"
class="more-info"
>
<span>
{{ getSingleRoomUserInfosGrade(_roomUserInfos) }}
</span>
<span
*ngIf="
_roomUserInfos.length > 0 &&
!!_roomUserInfos[0].lineNumber &&
_roomUserInfos[0].lineNumber.trim().length > 0
"
(click)="onClickSendClickToCall('LINE')"
class="callable"
>
/ {{ getSingleRoomUserInfosLineNumber(_roomUserInfos) }}
</span>
<span
*ngIf="
_roomUserInfos.length > 0 &&
!!_roomUserInfos[0].hpNumber &&
_roomUserInfos[0].hpNumber.trim().length > 0
"
(click)="onClickSendClickToCall('MOBILE')"
class="callable"
>
/ {{ getSingleRoomUserInfosHpNumber(_roomUserInfos) }}
</span>
</span>
</ng-template>
</ng-container>
</ng-container>

8
projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.scss
View File

@ -77,6 +77,14 @@
font-size: 0.94rem;
line-height: normal;
@include ellipsis(1);
.more-info {
font-size: 0.9rem;
color: #656565;
.callable {
cursor: pointer;
}
}
}
.room-type {
font-size: 0.9rem;

46
projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.ts
View File

@ -27,7 +27,8 @@ import {
AlertSnackbarComponent,
AlertSnackbarData,
TranslateService as UiTranslateService,
TranslatePipe as UiTranslatePipe
TranslatePipe as UiTranslatePipe,
StringFormatterPhonePipe
} from '@ucap-webmessenger/ui';
import { Store, select } from '@ngrx/store';
import { NGXLogger } from 'ngx-logger';
@ -143,6 +144,7 @@ import {
EventDownloadRequest
} from '@ucap-webmessenger/api-message';
import moment from 'moment';
import { start } from 'repl';
@Component({
selector: 'app-layout-messenger-messages',
@ -158,6 +160,8 @@ export class MessagesComponent implements OnInit, OnDestroy, AfterViewInit {
}>();
@Output()
closeRightDrawer = new EventEmitter();
@Output()
sendCall = new EventEmitter<string>();
@ViewChild('chatSearch', { static: false })
private chatSearch: SearchComponent;
@ -534,6 +538,46 @@ export class MessagesComponent implements OnInit, OnDestroy, AfterViewInit {
return roomName;
}
getSingleRoomUserInfosGrade(roomUserInfos: any[]) {
if (roomUserInfos.length > 0) {
return new UiTranslatePipe(
this.uiTranslateService,
this.changeDetectorRef
).transform(roomUserInfos, 'grade', ',');
}
return '';
}
getSingleRoomUserInfosLineNumber(roomUserInfos: any[]) {
if (
roomUserInfos.length > 0 &&
!!roomUserInfos[0].lineNumber &&
roomUserInfos[0].lineNumber.trim().length > 0
) {
return `${new StringFormatterPhonePipe().transform(
roomUserInfos[0].lineNumber
)}`;
}
}
getSingleRoomUserInfosHpNumber(roomUserInfos: any[]) {
if (
roomUserInfos.length > 0 &&
!!roomUserInfos[0].hpNumber &&
roomUserInfos[0].hpNumber.trim().length > 0
) {
return `${new StringFormatterPhonePipe().transform(
roomUserInfos[0].hpNumber
)}`;
}
}
onClickSendClickToCall(type: string) {
if(type === 'LINE') {
this.sendCall.emit(this._roomUserInfos[0].lineNumber);
} else if(type === 'MOBILE') {
this.sendCall.emit(this._roomUserInfos[0].hpNumber);
}
}
/** 대화전송 가능한 방인지 판단 */
getEnableSend() {
if (!this.roomInfoSubject.value) {

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

@ -32,6 +32,7 @@
*ngIf="!!(this.selectedChat$ | async)"
(openProfile)="onClickOpenProfile($event)"
(closeRightDrawer)="onCloseRightDrawer()"
(sendCall)="sendClickToCall($event)"
></app-layout-messenger-messages>
<button
mat-icon-button

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

@ -286,16 +286,15 @@ export class AppNotificationService {
doNoti = false;
}
// // 포커스 아웃일때 무조건 노티.
// // Case 1 : 단순 포커스 아웃.
// // Case 2 : hidden 시 포커스 인 상태이지만 위에서 필터링 됨.
// console.log(windowState);
// if (
// windowState.windowFocusState !==
// ElectronBrowserWindowChannel.Focus
// ) {
// doNoti = true;
// }
// 포커스 아웃일때 무조건 노티.
// Case 1 : 단순 포커스 아웃.
// Case 2 : hidden 시 포커스 인 상태이지만 위에서 필터링 됨.
if (
windowState.windowFocusState !==
ElectronBrowserWindowChannel.Focus
) {
doNoti = true;
}
// 방별 알림이 꺼져 있으면 노티 안함. > 우선순위 최상위.
if (

3
projects/ucap-webmessenger-daesang/src/lib/services/daesang-cipher.service.ts
View File

@ -53,7 +53,8 @@ export class DaesangCipherService {
encryptForSapErp(pvUserKey: string, employeeNum: string): string {
// const txt = '20200221090321_asdfghjk'; // 1QgLAiLqJ6Uo6bE4Qk1o3Yd6mfqxXSnmqXX%2FXLL7DoA%3D
// const txt = '20200221101444_asdfghjk'; // Lz1TIdGTQQMui%2BBHMdj8fatYYhXbwJEL%2BJ91C7jUWEs%3D
const str = moment().format('YYYYMMDDHHmmss') + '_' + employeeNum;
const str =
moment().format('YYYYMMDDHHmmss') + '_' + employeeNum.toUpperCase();
const secretKeyToByteArray: Buffer = Buffer.from(pvUserKey, 'utf8').slice(
0,
16

4
projects/ucap-webmessenger-ui-settings/src/lib/components/chat.component.ts
View File

@ -62,7 +62,9 @@ export class ChatComponent implements OnInit {
this.emit({ ...this.setting, downloadPath: path });
}
})
.catch(reason => {});
.catch(reason => {
this.nativeService.appLogging(reason);
});
}
private emit(setting: ChatSetting) {