From 97499b041549897c072309cad511bac86540814e Mon Sep 17 00:00:00 2001 From: richard-loafle <44828666+richard-loafle@users.noreply.github.com> Date: Thu, 23 Jan 2020 11:23:31 +0900 Subject: [PATCH] app exit is added --- .../ucap-webmessenger-electron/src/index.ts | 15 +- .../native/components/top-bar.component.html | 387 +++++++++--------- .../native/components/top-bar.component.ts | 4 + .../src/assets/i18n/en.json | 1 + .../src/assets/i18n/ko.json | 1 + .../lib/services/browser-native.service.ts | 2 + .../lib/services/electron-native.service.ts | 7 +- .../src/lib/types/channel.type.ts | 4 + .../src/lib/services/native.service.ts | 1 + 9 files changed, 233 insertions(+), 189 deletions(-) diff --git a/electron-projects/ucap-webmessenger-electron/src/index.ts b/electron-projects/ucap-webmessenger-electron/src/index.ts index 98110195..bec8dde9 100644 --- a/electron-projects/ucap-webmessenger-electron/src/index.ts +++ b/electron-projects/ucap-webmessenger-electron/src/index.ts @@ -28,7 +28,8 @@ import { NotificationChannel, ChatChannel, MessengerChannel, - MessageChannel + MessageChannel, + AppChannel } from '@ucap-webmessenger/native-electron'; import { ElectronNotificationService } from '@ucap-webmessenger/electron-notification'; import { ElectronUpdateWindowService } from '@ucap-webmessenger/electron-update-window'; @@ -231,8 +232,7 @@ function createTray() { // selector: 'terminate:', click: () => { // 메신저에 로그아웃 후 종료 - appWindow = null; - app.exit(); + appExit(); } } ]); @@ -715,6 +715,10 @@ ipcMain.on( } ); +ipcMain.on(AppChannel.Exit, (event: IpcMainEvent, ...args: any[]) => { + appExit(); +}); + autoUpdater.on('checking-for-update', () => { log.info('Checking for update...'); }); @@ -748,3 +752,8 @@ autoUpdater.on('update-downloaded', info => { updateWindowService.setDownloadComplete(); autoUpdater.quitAndInstall(true, true); }); + +function appExit() { + appWindow = null; + app.exit(); +} diff --git a/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.html b/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.html index 346c6658..8b323ad3 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.html +++ b/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.html @@ -257,27 +257,28 @@ yPosition="below" (closed)="onClosedProfileMenu($event)" > -
- -
-
- -
- -
- -
-
- -
-
- -
- -
- -
- -
- -
+
+ +
+
+ +
+
+ +
+ +
+ +
+ +
+ +
+
+ +
+ -
- -
-
- - -
-
- -
-
- -
-
- -
+ +
+ +
+
+ + +
+
+ +
+
+ +
+
+ +
+ -
- {{ 'presence.settingOfAwayTime' | translate }} -
- -
- - {{ awayTime }}{{ 'common.units.minute' | translate }} + +
+ {{ 'presence.settingOfAwayTime' | translate }}
- + +
+ + {{ awayTime + }}{{ 'common.units.minute' | translate }} +
+ + -
-
- - {{ 'information.installedVersion' | translate }}:{{ appVersion }} - -
-
-
- - {{ 'information.checkForUpdatesInProgress' | translate }} + +
+
+ + {{ 'information.installedVersion' | translate }}:{{ appVersion }} +
+
+
+ + {{ 'information.checkForUpdatesInProgress' | translate }} +
-
- - {{ 'information.latestVersion' | translate }}:{{ - checkingUpdateAppVersion - }} - - - - +
+ + {{ 'information.latestVersion' | translate }}:{{ + checkingUpdateAppVersion + }} + + + + +
-
+ diff --git a/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.ts index 8d657c49..021a4412 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.ts +++ b/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.ts @@ -309,6 +309,10 @@ export class TopBarComponent implements OnInit, OnDestroy { this.store.dispatch(AuthenticationStore.logoutConfirmation()); } + onClickQuit(): void { + this.nativeService.appExit(); + } + getMyProfileImageWidget(): string { if (!!this.loginRes) { return this.loginRes.userInfo.profileImageFile; diff --git a/projects/ucap-webmessenger-app/src/assets/i18n/en.json b/projects/ucap-webmessenger-app/src/assets/i18n/en.json index d7f892f4..40e42f6d 100644 --- a/projects/ucap-webmessenger-app/src/assets/i18n/en.json +++ b/projects/ucap-webmessenger-app/src/assets/i18n/en.json @@ -406,6 +406,7 @@ } }, "messages": { + "quit": "Quit", "yes": "Yes", "no": "No", "confirm": "Confirm", diff --git a/projects/ucap-webmessenger-app/src/assets/i18n/ko.json b/projects/ucap-webmessenger-app/src/assets/i18n/ko.json index 75795d8e..a5de9e29 100644 --- a/projects/ucap-webmessenger-app/src/assets/i18n/ko.json +++ b/projects/ucap-webmessenger-app/src/assets/i18n/ko.json @@ -406,6 +406,7 @@ } }, "messages": { + "quit": "종료", "yes": "예", "no": "아니오", "confirm": "확인", diff --git a/projects/ucap-webmessenger-native-browser/src/lib/services/browser-native.service.ts b/projects/ucap-webmessenger-native-browser/src/lib/services/browser-native.service.ts index dd3a7db5..5acb611f 100644 --- a/projects/ucap-webmessenger-native-browser/src/lib/services/browser-native.service.ts +++ b/projects/ucap-webmessenger-native-browser/src/lib/services/browser-native.service.ts @@ -221,6 +221,8 @@ export class BrowserNativeService extends NativeService { windowMaximize(): void {} + appExit(): void {} + zoomTo(factor: number): Promise { return new Promise((resolve, reject) => { resolve(-1); diff --git a/projects/ucap-webmessenger-native-electron/src/lib/services/electron-native.service.ts b/projects/ucap-webmessenger-native-electron/src/lib/services/electron-native.service.ts index 97fdfb19..4ef37352 100644 --- a/projects/ucap-webmessenger-native-electron/src/lib/services/electron-native.service.ts +++ b/projects/ucap-webmessenger-native-electron/src/lib/services/electron-native.service.ts @@ -22,7 +22,8 @@ import { ChatChannel, MessengerChannel, MessageChannel, - ProcessChannel + ProcessChannel, + AppChannel } from '../types/channel.type'; import { Injectable } from '@angular/core'; import { TranslateLoaderService } from '../translate/electron-loader'; @@ -388,6 +389,10 @@ export class ElectronNativeService implements NativeService { } } + appExit(): void { + this.ipcRenderer.send(AppChannel.Exit); + } + zoomTo(factor: number): Promise { return new Promise((resolve, reject) => { try { diff --git a/projects/ucap-webmessenger-native-electron/src/lib/types/channel.type.ts b/projects/ucap-webmessenger-native-electron/src/lib/types/channel.type.ts index 611c8d76..f9f210de 100644 --- a/projects/ucap-webmessenger-native-electron/src/lib/types/channel.type.ts +++ b/projects/ucap-webmessenger-native-electron/src/lib/types/channel.type.ts @@ -53,3 +53,7 @@ export enum IdleStateChannel { StartCheck = 'UCAP::idleState::startCheck', ChangeLimitTime = 'UCAP::idleState::changeLimitTime' } + +export enum AppChannel { + Exit = 'UCAP::app::exit' +} diff --git a/projects/ucap-webmessenger-native/src/lib/services/native.service.ts b/projects/ucap-webmessenger-native/src/lib/services/native.service.ts index d4967761..55334b9c 100644 --- a/projects/ucap-webmessenger-native/src/lib/services/native.service.ts +++ b/projects/ucap-webmessenger-native/src/lib/services/native.service.ts @@ -68,6 +68,7 @@ export abstract class NativeService { abstract windowMinimize(): void; abstract windowMaximize(): void; abstract zoomTo(factor: number): Promise; + abstract appExit(): void; abstract idleStateChanged(): Observable; abstract changeLimitOfIdleState(limitTime: number): void;