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

Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger

Browse Source
This commit is contained in:
병준 박 2019-12-04 17:59:10 +09:00
commit aac8802822
19 changed files with 255 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
electron-projects/ucap-webmessenger-electron-core/src/lib/types/channel.type.ts
View File

@ -26,7 +26,8 @@ export enum ElectronBrowserWindowChannel {
Show = 'show',
Close = 'close',
Closed = 'closed',
ReadyToShow = 'ready-to-show'
ReadyToShow = 'ready-to-show',
Focus = 'focus'
}
export enum ElectronWebContentsChannel {

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

@ -65,7 +65,7 @@ export class AppWindow {
this.window = new BrowserWindow(windowOptions);
savedWindowState.manage(this.window);
let quitting = false;
let quitting = true;
app.on(ElectronAppChannel.BeforeQuit, () => {
quitting = true;
});
@ -92,10 +92,13 @@ export class AppWindow {
}
});
this.window.on(ElectronBrowserWindowChannel.Close, e => {
if (!quitting) {
e.preventDefault();
this.window.hide();
}
// if (!quitting) {
e.preventDefault();
this.window.hide();
// }
});
this.window.on(ElectronBrowserWindowChannel.Focus, e => {
this.window.flashFrame(false);
});
}

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

@ -5,7 +5,8 @@ import {
remote,
Tray,
Menu,
dialog
dialog,
shell
} from 'electron';
import * as path from 'path';
import * as url from 'url';
@ -319,6 +320,38 @@ ipcMain.on(
}
);
ipcMain.on(
FileChannel.OpenFolderItem,
async (event: IpcMainEvent, ...args: any[]) => {
try {
let folderItem: string = args[0];
const make: boolean = args[1];
if (!folderItem) {
folderItem = DefaultFolder.downloads();
}
let isSuccess = true;
if (make) {
fse.ensureDirSync(folderItem);
}
if (isSuccess && fse.existsSync(folderItem)) {
shell.openItem(folderItem);
} else {
isSuccess = false;
}
if (isSuccess) {
event.returnValue = true;
} else {
event.returnValue = false;
}
} catch (error) {
event.returnValue = false;
}
}
);
ipcMain.on(
IdleStateChannel.StartCheck,
(event: IpcMainEvent, ...args: any[]) => {
@ -350,6 +383,7 @@ ipcMain.on(
)
: '',
onClick: e => {
appWindow.browserWindow.flashFrame(false);
appWindow.browserWindow.webContents.send(
ChatChannel.OpenRoom,
noti.roomSeq
@ -358,12 +392,15 @@ ipcMain.on(
e.close();
}
});
appWindow.browserWindow.flashFrame(true);
}
);
ipcMain.on(
NotificationChannel.CloseAllNotify,
(event: IpcMainEvent, ...args: any[]) => {
appWindow.browserWindow.flashFrame(false);
console.log('Channel.closeAllNotify', args);
}
);

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

@ -172,7 +172,7 @@
>
<ucap-chat-messages
[messages]="eventList"
[eventInfoStatus]="eventInfoStatus$ | async"
[eventInfoStatus]="eventInfoStatus"
[eventRemain]="eventRemain$ | async"
[userInfos]="userInfoList"
[loginRes]="loginRes"
@ -248,12 +248,14 @@
</button>
<button
mat-menu-item
*ngIf="isForwardableMessage(message, eventInfoStatus.validFileBaseSeq)"
(click)="onClickMessageContextMenu('REPLAY', message)"
>
대화 전달
</button>
<button
mat-menu-item
*ngIf="isForwardableMessage(message, eventInfoStatus.validFileBaseSeq)"
(click)="onClickMessageContextMenu('REPLAY_TO_ME', message)"
>
대화 나에게 전달

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

@ -31,6 +31,7 @@ import {
isRecalled,
isCopyable,
isRecallable,
isForwardable,
InfoResponse,
EventJson,
FileEventJson,
@ -144,7 +145,8 @@ export class MessagesComponent implements OnInit, OnDestroy, AfterViewInit {
userInfoList: UserInfo[];
userInfoListSubscription: Subscription;
eventListProcessing$: Observable<boolean>;
eventInfoStatus$: Observable<InfoResponse>;
eventInfoStatus: InfoResponse;
eventInfoStatusSubscription: Subscription;
sessionVerInfo: VersionInfo2Response;
eventRemain$: Observable<boolean>;
@ -155,6 +157,7 @@ export class MessagesComponent implements OnInit, OnDestroy, AfterViewInit {
isRecalledMessage = isRecalled;
isCopyableMessage = isCopyable;
isRecallableMessage = isRecallable;
isForwardableMessage = isForwardable;
/** Timer 대화방의 대화 삭제를 위한 interval */
interval: any;
@ -253,9 +256,12 @@ export class MessagesComponent implements OnInit, OnDestroy, AfterViewInit {
)
.subscribe();
this.eventInfoStatus$ = this.store.pipe(
select(AppStore.MessengerSelector.EventSelector.infoStatus)
);
this.eventInfoStatusSubscription = this.store
.pipe(
select(AppStore.MessengerSelector.EventSelector.infoStatus),
tap(res => (this.eventInfoStatus = res))
)
.subscribe();
this.interval = setInterval(() => {
if (!!this.roomInfo && !!this.roomInfo.isTimeRoom) {
@ -277,6 +283,9 @@ export class MessagesComponent implements OnInit, OnDestroy, AfterViewInit {
if (!!this.eventListSubscription) {
this.eventListSubscription.unsubscribe();
}
if (!!this.eventInfoStatusSubscription) {
this.eventInfoStatusSubscription.unsubscribe();
}
clearInterval(this.interval);
}

6
projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/album-box.component.html
View File

@ -149,7 +149,11 @@
>
Download All
</button>
<button mat-flat-button class="mat-primary">
<button
mat-flat-button
class="mat-primary"
(click)="onClickOpenDownloadFolder()"
>
Open Folder
</button>
</div>

34
projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/album-box.component.ts
View File

@ -1,9 +1,9 @@
import { Component, OnInit, ViewChild, OnDestroy } from '@angular/core';
import { Component, OnInit, ViewChild, OnDestroy, Inject } from '@angular/core';
import { MatPaginator, MatTableDataSource } from '@angular/material';
import {
FileInfo,
FileDownloadInfo,
FileType,
FileType
} from '@ucap-webmessenger/protocol-file';
import { Subscription, combineLatest } from 'rxjs';
import { Store, select } from '@ngrx/store';
@ -14,7 +14,7 @@ import { tap, map } from 'rxjs/operators';
import {
Info,
EventJson,
FileEventJson,
FileEventJson
} from '@ucap-webmessenger/protocol-event';
import { FileUtil } from '@ucap-webmessenger/core';
import { CommonApiService } from '@ucap-webmessenger/api-common';
@ -24,6 +24,8 @@ import { KEY_LOGIN_RES_INFO } from '@app/types/login-res-info.type';
import { EnvironmentsInfo, KEY_ENVIRONMENTS_INFO } from '@app/types';
import { VersionInfo2Response } from '@ucap-webmessenger/api-public';
import { KEY_VER_INFO } from '@app/types/ver-info.type';
import { UCAP_NATIVE_SERVICE, NativeService } from '@ucap-webmessenger/native';
import { NGXLogger } from 'ngx-logger';
export interface FileInfoTotal {
info: FileInfo;
@ -34,7 +36,7 @@ export interface FileInfoTotal {
@Component({
selector: 'app-layout-chat-right-drawer-album-box',
templateUrl: './album-box.component.html',
styleUrls: ['./album-box.component.scss'],
styleUrls: ['./album-box.component.scss']
})
export class AlbumBoxComponent implements OnInit, OnDestroy {
filteredList: FileInfoTotal[] = [];
@ -55,7 +57,9 @@ export class AlbumBoxComponent implements OnInit, OnDestroy {
constructor(
private store: Store<any>,
private sessionStorageService: SessionStorageService,
private commonApiService: CommonApiService
private commonApiService: CommonApiService,
@Inject(UCAP_NATIVE_SERVICE) private nativeService: NativeService,
private loggger: NGXLogger
) {
this.loginRes = this.sessionStorageService.get<LoginResponse>(
KEY_LOGIN_RES_INFO
@ -81,7 +85,7 @@ export class AlbumBoxComponent implements OnInit, OnDestroy {
),
this.store.pipe(
select(AppStore.MessengerSelector.EventSelector.selectAllInfoList)
),
)
])
.pipe(
tap(() => (this.fileInfoTotal = [])),
@ -109,7 +113,7 @@ export class AlbumBoxComponent implements OnInit, OnDestroy {
checkInfo => checkInfo.seq === fileInfo.seq
),
eventInfo:
events.length > 0 ? (events[0] as Info<FileEventJson>) : null,
events.length > 0 ? (events[0] as Info<FileEventJson>) : null
});
});
@ -135,7 +139,7 @@ export class AlbumBoxComponent implements OnInit, OnDestroy {
userSeq: this.loginRes.userSeq,
deviceType: this.environmentsInfo.deviceType,
token: this.loginRes.tokenString,
attachmentsSeq: fileInfo.info.seq,
attachmentsSeq: fileInfo.info.seq
},
this.sessionVerinfo.downloadUrl
);
@ -195,4 +199,18 @@ export class AlbumBoxComponent implements OnInit, OnDestroy {
onClickDownload(fileInfo: FileInfoTotal) {
console.log(fileInfo);
}
onClickOpenDownloadFolder(): void {
this.nativeService
.openDefaultDownloadFolder()
.then(result => {
if (!!result) {
} else {
throw new Error('response Error');
}
})
.catch(reason => {
this.loggger.error(reason);
});
}
}

6
projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/file-box.component.html
View File

@ -202,7 +202,11 @@
>
Download All
</button>
<button mat-flat-button class="mat-primary">
<button
mat-flat-button
class="mat-primary"
(click)="onClickOpenDownloadFolder()"
>
Open Folder
</button>
</div>

22
projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/file-box.component.ts
View File

@ -1,4 +1,4 @@
import { Component, OnInit, ViewChild, OnDestroy } from '@angular/core';
import { Component, OnInit, ViewChild, OnDestroy, Inject } from '@angular/core';
import { MatPaginator, MatTableDataSource, MatSort } from '@angular/material';
import {
FileInfo,
@ -15,6 +15,8 @@ import { FileUtil } from '@ucap-webmessenger/core';
import { LoginResponse } from '@ucap-webmessenger/protocol-authentication';
import { SessionStorageService } from '@ucap-webmessenger/web-storage';
import { KEY_LOGIN_RES_INFO } from '@app/types/login-res-info.type';
import { NativeService, UCAP_NATIVE_SERVICE } from '@ucap-webmessenger/native';
import { NGXLogger } from 'ngx-logger';
export interface FileInfoTotal {
info: FileInfo;
@ -46,7 +48,9 @@ export class FileBoxComponent implements OnInit, OnDestroy {
constructor(
private store: Store<any>,
private sessionStorageService: SessionStorageService
private sessionStorageService: SessionStorageService,
@Inject(UCAP_NATIVE_SERVICE) private nativeService: NativeService,
private loggger: NGXLogger
) {
this.loginRes = this.sessionStorageService.get<LoginResponse>(
KEY_LOGIN_RES_INFO
@ -212,4 +216,18 @@ export class FileBoxComponent implements OnInit, OnDestroy {
onClickRow(row: FileInfoTotal) {
this.selectedFile = row;
}
onClickOpenDownloadFolder(): void {
this.nativeService
.openDefaultDownloadFolder()
.then(result => {
if (!!result) {
} else {
throw new Error('response Error');
}
})
.catch(reason => {
this.loggger.error(reason);
});
}
}

16
projects/ucap-webmessenger-native-browser/src/lib/services/browser-native.service.ts
View File

@ -99,6 +99,22 @@ export class BrowserNativeService extends NativeService {
});
}
openDefaultDownloadFolder(): Promise<boolean> {
return new Promise<boolean>((resolve, reject) => {
resolve(true);
});
}
openTargetFolder(folderPath?: string, make?: boolean): Promise<boolean> {
return new Promise<boolean>((resolve, reject) => {
resolve(true);
});
}
openTargetItem(filePath?: string): Promise<boolean> {
return new Promise<boolean>((resolve, reject) => {
resolve(true);
});
}
windowStateChanged(): Observable<WindowState> {
return new Observable<WindowState>(subscriber => {
try {

38
projects/ucap-webmessenger-native-electron/src/lib/services/electron-native.service.ts
View File

@ -147,6 +147,44 @@ export class ElectronNativeService implements NativeService {
});
}
openDefaultDownloadFolder(): Promise<boolean> {
return new Promise<boolean>((resolve, reject) => {
try {
resolve(
this.ipcRenderer.sendSync(FileChannel.OpenFolderItem, undefined, true)
);
} catch (error) {
reject(error);
}
});
}
openTargetFolder(folderPath?: string, make?: boolean): Promise<boolean> {
return new Promise<boolean>((resolve, reject) => {
try {
resolve(
this.ipcRenderer.sendSync(
FileChannel.OpenFolderItem,
folderPath,
!make ? false : make
)
);
} catch (error) {
reject(error);
}
});
}
openTargetItem(filePath?: string): Promise<boolean> {
return new Promise<boolean>((resolve, reject) => {
try {
resolve(
this.ipcRenderer.sendSync(FileChannel.OpenFolderItem, filePath, false)
);
} catch (error) {
reject(error);
}
});
}
windowStateChanged(): Observable<WindowState> {
if (!this.windowStateChangedSubject) {
this.windowStateChangedSubject = new Subject<WindowState>();

1
projects/ucap-webmessenger-native-electron/src/lib/types/channel.type.ts
View File

@ -18,6 +18,7 @@ export enum UpdaterChannel {
}
export enum FileChannel {
OpenFolderItem = 'UCAP::file::openFolderItem',
ShowImageViewer = 'UCAP::file::showImageViewer',
SaveFile = 'UCAP::file::saveFile',
ReadFile = 'UCAP::file::readFile'

6
projects/ucap-webmessenger-native/src/lib/services/native.service.ts
View File

@ -27,6 +27,12 @@ export abstract class NativeService {
path?: string
): Promise<string>;
abstract readFile(path: string): Promise<Buffer>;
abstract openDefaultDownloadFolder(): Promise<boolean>;
abstract openTargetFolder(
folderPath?: string,
make?: boolean
): Promise<boolean>;
abstract openTargetItem(filePath?: string): Promise<boolean>;
abstract windowStateChanged(): Observable<WindowState>;
abstract windowClose(): void;

13
projects/ucap-webmessenger-protocol-event/src/lib/models/info.ts
View File

@ -32,3 +32,16 @@ export function isRecallable(event: Info<any>, userSeq: number): boolean {
event.senderSeq === userSeq && event.type !== EventType.RecalledMessage
);
}
export function isForwardable(event: Info, expiredFileStdSeq: number): boolean {
if (event.type === EventType.File) {
if (!!expiredFileStdSeq && expiredFileStdSeq <= event.seq) {
// valid..
return true;
} else {
// expired..
return false;
}
}
return true;
}

11
projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/attach-file.component.scss
View File

@ -2,6 +2,7 @@
display: flex;
flex-direction: row;
padding: 14px;
min-width: 200px;
.file-img {
display: inline-flex;
width: 50px;
@ -102,13 +103,13 @@
height: 100%;
}
}
&.expired{
li{
width:100%;
&.expired {
li {
width: 100%;
white-space: nowrap;
color:#999999;
color: #999999;
align-items: center;
line-height:40px;
line-height: 40px;
}
}
}

8
projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/file.component.ts
View File

@ -51,10 +51,14 @@ export class FileComponent implements OnInit {
}
onClickFileViewer(fileInfo: FileEventJson) {
this.fileViewer.emit(fileInfo);
if (!this.getExpiredFile()) {
this.fileViewer.emit(fileInfo);
}
}
onSave(value: string) {
this.save.emit({ fileInfo: this.fileInfo, type: value });
if (!this.getExpiredFile()) {
this.save.emit({ fileInfo: this.fileInfo, type: value });
}
}
}

9
projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/image.component.html
View File

@ -1,3 +1,10 @@
<div class="bubble-main">
<div
class="bubble-main"
(mouseenter)="mouseEnter($event)"
(mouseleave)="mouseLeave($event)"
>
<div *ngIf="showExpired" class="expired-text">
<span>기간이 만료된 파일입니다</span>
</div>
<img [src]="fileInfo.thumbUrl" />
</div>

29
projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/image.component.scss
View File

@ -1,7 +1,24 @@
.bubble-main{
padding:10px;
img{
height:140px;
width:auto;
.bubble-main {
padding: 10px;
position: relative;
img {
height: 140px;
width: auto;
}
}
.expired-text {
position: absolute;
background-color: rgb(255, 255, 255, 0.6);
width: calc(100% - 20px);
height: calc(100% - 20px);
text-align: center;
display: table;
span {
color: #666666;
display: table-cell;
vertical-align: middle;
}
}
}

19
projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/image.component.ts
View File

@ -1,4 +1,4 @@
import { Component, OnInit, Input } from '@angular/core';
import { Component, OnInit, Input, ViewChild, ElementRef } from '@angular/core';
import { NGXLogger } from 'ngx-logger';
import { FileEventJson } from '@ucap-webmessenger/protocol-event';
@ -13,7 +13,24 @@ export class ImageComponent implements OnInit {
@Input()
expired = false;
showExpired = false;
constructor(private logger: NGXLogger) {}
ngOnInit() {}
mouseEnter(event: MouseEvent): void {
if (this.expired) {
this.showExpired = true;
}
event.stopPropagation();
event.preventDefault();
}
mouseLeave(event: MouseEvent): void {
if (this.expired) {
this.showExpired = false;
}
event.stopPropagation();
event.preventDefault();
}
}