diff --git a/angular.json b/angular.json
index 2ca10f49..2210dd0b 100644
--- a/angular.json
+++ b/angular.json
@@ -1445,6 +1445,76 @@
}
}
}
+ },
+ "ucap-webmessenger-electron-notification": {
+ "projectType": "library",
+ "root": "projects/ucap-webmessenger-electron-notification",
+ "sourceRoot": "projects/ucap-webmessenger-electron-notification/src",
+ "prefix": "ucap-electron-notification",
+ "architect": {
+ "build": {
+ "builder": "@angular-devkit/build-ng-packagr:build",
+ "options": {
+ "tsConfig": "projects/ucap-webmessenger-electron-notification/tsconfig.lib.json",
+ "project": "projects/ucap-webmessenger-electron-notification/ng-package.json"
+ }
+ },
+ "test": {
+ "builder": "@angular-devkit/build-angular:karma",
+ "options": {
+ "main": "projects/ucap-webmessenger-electron-notification/src/test.ts",
+ "tsConfig": "projects/ucap-webmessenger-electron-notification/tsconfig.spec.json",
+ "karmaConfig": "projects/ucap-webmessenger-electron-notification/karma.conf.js"
+ }
+ },
+ "lint": {
+ "builder": "@angular-devkit/build-angular:tslint",
+ "options": {
+ "tsConfig": [
+ "projects/ucap-webmessenger-electron-notification/tsconfig.lib.json",
+ "projects/ucap-webmessenger-electron-notification/tsconfig.spec.json"
+ ],
+ "exclude": [
+ "**/node_modules/**"
+ ]
+ }
+ }
+ }
+ },
+ "ucap-webmessenger-electron-core": {
+ "projectType": "library",
+ "root": "projects/ucap-webmessenger-electron-core",
+ "sourceRoot": "projects/ucap-webmessenger-electron-core/src",
+ "prefix": "ucap-electron-core",
+ "architect": {
+ "build": {
+ "builder": "@angular-devkit/build-ng-packagr:build",
+ "options": {
+ "tsConfig": "projects/ucap-webmessenger-electron-core/tsconfig.lib.json",
+ "project": "projects/ucap-webmessenger-electron-core/ng-package.json"
+ }
+ },
+ "test": {
+ "builder": "@angular-devkit/build-angular:karma",
+ "options": {
+ "main": "projects/ucap-webmessenger-electron-core/src/test.ts",
+ "tsConfig": "projects/ucap-webmessenger-electron-core/tsconfig.spec.json",
+ "karmaConfig": "projects/ucap-webmessenger-electron-core/karma.conf.js"
+ }
+ },
+ "lint": {
+ "builder": "@angular-devkit/build-angular:tslint",
+ "options": {
+ "tsConfig": [
+ "projects/ucap-webmessenger-electron-core/tsconfig.lib.json",
+ "projects/ucap-webmessenger-electron-core/tsconfig.spec.json"
+ ],
+ "exclude": [
+ "**/node_modules/**"
+ ]
+ }
+ }
+ }
}
},
"defaultProject": "ucap-webmessenger-app"
diff --git a/config/main.webpack.config.ts b/config/main.webpack.config.ts
index 523d6814..d42998ac 100644
--- a/config/main.webpack.config.ts
+++ b/config/main.webpack.config.ts
@@ -79,6 +79,16 @@ const mainConfig: webpack.Configuration = {
resolve: {
extensions: ['.js', '.ts'],
alias: {
+ '@ucap-webmessenger/electron-core': path.resolve(
+ __dirname,
+ '..',
+ 'projects/ucap-webmessenger-electron-core/src/public-api'
+ ),
+ '@ucap-webmessenger/electron-notification': path.resolve(
+ __dirname,
+ '..',
+ 'projects/ucap-webmessenger-electron-notification/src/public-api'
+ ),
'@ucap-webmessenger/native': path.resolve(
__dirname,
'..',
diff --git a/main/resources/notification/image/btn_call_message.png b/main/resources/notification/image/btn_call_message.png
new file mode 100644
index 00000000..0e2c7949
Binary files /dev/null and b/main/resources/notification/image/btn_call_message.png differ
diff --git a/main/resources/notification/image/btn_call_receive.png b/main/resources/notification/image/btn_call_receive.png
new file mode 100644
index 00000000..7f60010e
Binary files /dev/null and b/main/resources/notification/image/btn_call_receive.png differ
diff --git a/main/resources/notification/image/btn_call_refuse.png b/main/resources/notification/image/btn_call_refuse.png
new file mode 100644
index 00000000..674a5843
Binary files /dev/null and b/main/resources/notification/image/btn_call_refuse.png differ
diff --git a/main/resources/notification/image/btn_call_transfer.png b/main/resources/notification/image/btn_call_transfer.png
new file mode 100644
index 00000000..fdd11523
Binary files /dev/null and b/main/resources/notification/image/btn_call_transfer.png differ
diff --git a/main/resources/notification/image/btn_close.png b/main/resources/notification/image/btn_close.png
new file mode 100644
index 00000000..2cdaee37
Binary files /dev/null and b/main/resources/notification/image/btn_close.png differ
diff --git a/main/resources/notification/image/btn_close_gray.png b/main/resources/notification/image/btn_close_gray.png
new file mode 100644
index 00000000..0ce0aba0
Binary files /dev/null and b/main/resources/notification/image/btn_close_gray.png differ
diff --git a/main/resources/notification/image/btn_noti_call.png b/main/resources/notification/image/btn_noti_call.png
new file mode 100644
index 00000000..9e695905
Binary files /dev/null and b/main/resources/notification/image/btn_noti_call.png differ
diff --git a/main/resources/notification/image/img_nophoto_50.png b/main/resources/notification/image/img_nophoto_50.png
new file mode 100644
index 00000000..029f81bd
Binary files /dev/null and b/main/resources/notification/image/img_nophoto_50.png differ
diff --git a/main/resources/notification/preload.js b/main/resources/notification/preload.js
new file mode 100644
index 00000000..86975a25
--- /dev/null
+++ b/main/resources/notification/preload.js
@@ -0,0 +1,143 @@
+'use strict';
+
+const electron = require('electron');
+const ipc = electron.ipcRenderer;
+const winId = electron.remote.getCurrentWindow().id;
+
+function setStyle(config) {
+ // Style it
+ let notiDoc = global.window.document;
+ let container = notiDoc.getElementById('container');
+ let appIcon = notiDoc.getElementById('appIcon');
+ let image = notiDoc.getElementById('image');
+ let close = notiDoc.getElementById('close');
+ let message = notiDoc.getElementById('message');
+ // Default style
+ setStyleOnDomElement(config.defaultStyleContainer, container);
+ // Size and radius
+ let style = {
+ height:
+ config.height -
+ 2 * config.borderRadius -
+ 2 * config.defaultStyleContainer.padding,
+ width:
+ config.width -
+ 2 * config.borderRadius -
+ 2 * config.defaultStyleContainer.padding,
+ borderRadius: config.borderRadius + 'px'
+ };
+ setStyleOnDomElement(style, container);
+ // Style appIcon or hide
+ if (config.appIcon) {
+ setStyleOnDomElement(config.defaultStyleAppIcon, appIcon);
+ appIcon.src = config.appIcon;
+ } else {
+ setStyleOnDomElement(
+ {
+ display: 'none'
+ },
+ appIcon
+ );
+ }
+ // Style image
+ setStyleOnDomElement(config.defaultStyleImage, image);
+ // Style close button
+ setStyleOnDomElement(config.defaultStyleClose, close);
+ // Remove margin from text p
+ setStyleOnDomElement(config.defaultStyleText, message);
+}
+
+function setContents(event, notificationObj) {
+ // sound
+ if (notificationObj.sound) {
+ // Check if file is accessible
+ try {
+ // If it's a local file, check it's existence
+ // Won't check remote files e.g. http://
+ if (
+ notificationObj.sound.match(/^file\:/) !== null ||
+ notificationObj.sound.match(/^\//) !== null
+ ) {
+ let audio = new global.window.Audio(notificationObj.sound);
+ audio.play();
+ }
+ } catch (e) {
+ log(
+ 'electron-notify: ERROR could not find sound file: ' +
+ notificationObj.sound.replace('file://', ''),
+ e,
+ e.stack
+ );
+ }
+ }
+
+ let notiDoc = global.window.document;
+ // Title
+ let titleDoc = notiDoc.getElementById('title');
+ titleDoc.innerHTML = notificationObj.title || '';
+ // message
+ let messageDoc = notiDoc.getElementById('message');
+ messageDoc.innerHTML = notificationObj.text || '';
+ // Image
+ let imageDoc = notiDoc.getElementById('image');
+ if (notificationObj.image) {
+ imageDoc.src = notificationObj.image;
+ } else {
+ setStyleOnDomElement({ display: 'none' }, imageDoc);
+ }
+
+ // Close button
+ let closeButton = notiDoc.getElementById('close');
+ closeButton.addEventListener('click', function(event) {
+ event.stopPropagation();
+ ipc.send('UCAP::ElectronNotification::close', winId, notificationObj);
+ });
+
+ // URL
+ let container = notiDoc.getElementById('container');
+ container.addEventListener('click', function() {
+ ipc.send('UCAP::ElectronNotification::click', winId, notificationObj);
+ });
+}
+
+function setStyleOnDomElement(styleObj, domElement) {
+ try {
+ for (let styleAttr in styleObj) {
+ domElement.style[styleAttr] = styleObj[styleAttr];
+ }
+ } catch (e) {
+ throw new Error(
+ 'electron-notify: Could not set style on domElement',
+ styleObj,
+ domElement
+ );
+ }
+}
+
+function loadConfig(event, conf) {
+ setStyle(conf || {});
+}
+
+function reset() {
+ let notiDoc = global.window.document;
+ let container = notiDoc.getElementById('container');
+ let closeButton = notiDoc.getElementById('close');
+
+ // Remove event listener
+ let newContainer = container.cloneNode(true);
+ container.parentNode.replaceChild(newContainer, container);
+ let newCloseButton = closeButton.cloneNode(true);
+ closeButton.parentNode.replaceChild(newCloseButton, closeButton);
+}
+
+ipc.on('UCAP::ElectronNotification::BrowserWindowSetContents', setContents);
+ipc.on('UCAP::ElectronNotification::loadConfig', loadConfig);
+ipc.on('UCAP::ElectronNotification::reset', reset);
+
+function log() {
+ console.log.apply(console, arguments);
+}
+
+delete global.require;
+delete global.exports;
+delete global.module;
diff --git a/main/resources/notification/sound/messageAlarm.mp3 b/main/resources/notification/sound/messageAlarm.mp3
new file mode 100644
index 00000000..abaa3831
Binary files /dev/null and b/main/resources/notification/sound/messageAlarm.mp3 differ
diff --git a/main/resources/notification/styles/noti_messege.css b/main/resources/notification/styles/noti_messege.css
new file mode 100644
index 00000000..02cbf609
--- /dev/null
+++ b/main/resources/notification/styles/noti_messege.css
@@ -0,0 +1,130 @@
+html {
+ height: 100%;
+ overflow-y: scroll;
+}
+body {
+ position: relative;
+ width: 100%;
+ height: 100%;
+ padding: 0;
+ margin: 0;
+ color: #333;
+ font-family: '나눔고딕', Malgun Gothic, '맑은고딕', Arial, Dotum, '돋움',
+ Gulim, '굴림';
+ font-size: 12px;
+ line-height: 18px !important;
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ box-sizing: border-box;
+}
+body * {
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ box-sizing: border-box;
+}
+ul,
+ol {
+ list-style: none;
+ margin: 0;
+ padding: 0;
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ box-sizing: border-box;
+}
+img {
+ border: none;
+}
+a:link,
+a:visited,
+a:hover,
+a:active {
+ text-decoration: none;
+}
+
+.noti_messege {
+ width: 340px;
+ height: 100px;
+ border: 1px solid #666;
+ background-color: #fff;
+ box-shadow: 0px 0px 3px 0px #e7e7e7;
+}
+.info {
+ position: relative;
+ width: 100%;
+ height: 100%;
+ box-sizing: border-box;
+ padding: 16px 14px;
+ color: #fff;
+}
+.btn_close {
+ position: absolute;
+ z-index: 1;
+ right: 6px;
+ top: 6px;
+ width: 20px;
+ height: 20px;
+ background: url(../image/btn_close_gray.png) no-repeat 50% 50%;
+}
+.btn_close:hover {
+ opacity: 0.7;
+}
+.photo {
+ position: relative;
+ top: 0px;
+ right: 0;
+ bottom: 0;
+ left: 0;
+ margin: 4px 0;
+ width: 54px;
+ height: 54px;
+ border-radius: 50%;
+ background: #5bc1ff url(../image/img_nophoto_50.png) no-repeat 50% 50%;
+ border: 2px solid #ddd;
+}
+.info .profile {
+ position: absolute;
+ width: 60px;
+ text-align: center;
+}
+.photo img {
+ overflow: hidden;
+ width: 50px;
+ height: 50px;
+ border-radius: 50px;
+}
+.noti_messege .info .profile + div {
+ padding-left: 70px;
+ position: relative;
+ line-height: 180%;
+ height: 100%;
+}
+.sender {
+ font-size: 14px;
+ font-weight: bold;
+ margin-bottom: 4px;
+ color: #333;
+ width: 94%;
+}
+.sender .name {
+ color: #2e7fb5;
+}
+.message {
+ color: #666;
+}
+.ellipsis {
+ display: block;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ word-wrap: normal;
+ overflow: hidden;
+}
+.ellipsis_row2 {
+ overflow: hidden;
+ text-overflow: ellipsis;
+ display: -webkit-box;
+ -webkit-line-clamp: 2;
+ -webkit-box-orient: vertical;
+ word-wrap: break-word;
+ line-height: 1.6em;
+ height: 3.2em;
+}
diff --git a/main/resources/notification/template.html b/main/resources/notification/template.html
new file mode 100644
index 00000000..5bec4a80
--- /dev/null
+++ b/main/resources/notification/template.html
@@ -0,0 +1,50 @@
+
+
+
+ [개발]M Messenger - 메시지 알림
+
+
+
+
+
+
+
+
+
+
+
+
+
![]()
+
![]()
+
+
+
+
+ -
+ 김 수안무 거북이와 두루미님이 메시지를
+ 보냈습니다.
+
+ -
+ 홍길동 대리(솔루션사업팀)홍길동 대리(솔루션사업팀)홍길동
+ 대리(솔루션사업팀)홍길동 대리(솔루션사업팀)
+
+
+
+
+
\n' +
+ '
![]()
\n' +
+ '
![]()
\n' +
+ '
\n' +
+ '
\n' +
+ '
\n' +
+ '
\n' +
+ '
X
\n' +
+ '