diff --git a/electron-projects/ucap-webmessenger-electron/src/index.ts b/electron-projects/ucap-webmessenger-electron/src/index.ts index a825c3e7..b5cb70ac 100644 --- a/electron-projects/ucap-webmessenger-electron/src/index.ts +++ b/electron-projects/ucap-webmessenger-electron/src/index.ts @@ -5,7 +5,8 @@ import { Tray, Menu, shell, - dialog + dialog, + webFrame } from 'electron'; import path from 'path'; import fse from 'fs-extra'; @@ -396,6 +397,13 @@ ipcMain.on( } ); +ipcMain.on( + MessengerChannel.GetVersionInfo, + (event: IpcMainEvent, ...args: any[]) => { + event.returnValue = app.getVersion(); + } +); + ipcMain.on( MessengerChannel.ChangeAutoLaunch, (event: IpcMainEvent, ...args: any[]) => { diff --git a/package.json b/package.json index c343c25c..83b6e8f6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ucap-webmessenger", - "version": "0.0.2", + "version": "0.0.3", "author": { "name": "LG CNS", "email": "lgucap@lgcns.com" diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.html index 3a39364d..2c8a44d4 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.html +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.html @@ -168,7 +168,7 @@ (click)="onClickProfileContextMenu('REGISTER_FAVORITE', userInfo)" > {{ - (userInfo.isFavorit ? 'group.unfavorite' : 'group.favorite') | translate + (userInfo.isFavorit ? 'group.unfavorite' : 'group.favorit') | translate }} 100%{{ zoom }}% + +
-
-
-
@@ -370,28 +412,17 @@
{{ 'presence.settingOfAwayTime' | translate }}
+ +
+ + {{ awayTime }}{{ 'common.units.minute' | translate }} +
+ + + +
- 10{{ 'common.units.minute' | translate }} -
-
- 20{{ 'common.units.minute' | translate }} -
-
- 30{{ 'common.units.minute' | translate }} + {{ 'information.version' | translate }}: {{ appVersion }}
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 15afa938..6c64bc3a 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 @@ -20,6 +20,7 @@ import * as ChatStore from '@app/store/messenger/chat'; import * as AuthenticationStore from '@app/store/account/authentication'; import * as SettingsStore from '@app/store/messenger/settings'; import * as UpdateStore from '@app/store/setting/update'; +import * as SettingNativeStore from '@app/store/setting/native'; import * as StatusStore from '@app/store/messenger/status'; import { LoginResponse } from '@ucap-webmessenger/protocol-authentication'; @@ -58,6 +59,9 @@ import { DOCUMENT } from '@angular/common'; import { MatMenu, MatRadioChange } from '@angular/material'; import { StatusCode, StatusType } from '@ucap-webmessenger/core'; import { StatusInfo } from '@ucap-webmessenger/protocol-status'; +import { UserInfoUpdateType } from '@ucap-webmessenger/protocol-info'; + +const zoomFactors = [60, 70, 85, 100, 120, 145, 170, 200]; @Component({ selector: 'app-layout-native-top-bar', @@ -80,14 +84,21 @@ export class TopBarComponent implements OnInit, OnDestroy { myIdleCheckTime: number; myIdleCheckTimeSubscription: Subscription; + zoom: number; + zoomSubscription: Subscription; + loginInfo: LoginInfo; weblink: WebLink[] = []; webLinkBadgeMail = 0; webLinkBadgePayment = 0; + appVersion: string; + WebLinkType = WebLinkType; StatusCode = StatusCode; + readonly awayTimeList = [10, 20, 30]; + @ViewChild('profileMenu', { static: true }) profileMenu: MatMenu; @@ -127,35 +138,50 @@ export class TopBarComponent implements OnInit, OnDestroy { .subscribe(); this.myStatusSubscription = this.store - .pipe(select(AppStore.MessengerSelector.StatusSelector.selectedMyStatus)) + .pipe(select(AppStore.MessengerSelector.StatusSelector.selectMyStatus)) .subscribe(myStatus => { this.myStatus = myStatus; }); this.myIdleCheckTimeSubscription = this.store .pipe( - select( - AppStore.MessengerSelector.StatusSelector.selectedMyIdleCheckTime - ) + select(AppStore.MessengerSelector.StatusSelector.selectMyIdleCheckTime) ) .subscribe(myIdleCheckTime => { this.myIdleCheckTime = myIdleCheckTime; }); + this.zoomSubscription = this.store + .pipe(select(AppStore.SettingSelector.NativeSelector.selectZoom)) + .subscribe(zoom => { + this.zoom = zoom; + }); + this.updateInfo$ = this.store.pipe( select(AppStore.SettingSelector.UpdateSelector.updateInfo) ); + + this.nativeService.getVersionInfo().then(ver => { + this.appVersion = ver; + }); } ngOnDestroy(): void { if (!!this.loginResSubscription) { this.loginResSubscription.unsubscribe(); + this.loginResSubscription = undefined; } if (!!this.myStatusSubscription) { this.myStatusSubscription.unsubscribe(); + this.myStatusSubscription = undefined; } if (!!this.myIdleCheckTimeSubscription) { this.myIdleCheckTimeSubscription.unsubscribe(); + this.myIdleCheckTimeSubscription = undefined; + } + if (!!this.zoomSubscription) { + this.zoomSubscription.unsubscribe(); + this.zoomSubscription = undefined; } } @@ -357,15 +383,27 @@ export class TopBarComponent implements OnInit, OnDestroy { } onClickZoomOut(event: Event) { - event.stopPropagation(); + const i = zoomFactors.indexOf(this.zoom); + if (-1 === i || 0 === i) { + return; + } - this.document.body.style.zoom = '80%'; + const zoom = zoomFactors[i - 1]; + this.store.dispatch(SettingNativeStore.changeZoom({ zoom })); + } + + onClickZoomLabel(event: Event) { + this.store.dispatch(SettingNativeStore.changeZoom({ zoom: 100 })); } onClickZoomIn(event: Event) { - event.stopPropagation(); + const i = zoomFactors.indexOf(this.zoom); + if (-1 === i || zoomFactors.length - 1 === i) { + return; + } - this.document.body.style.zoom = '120%'; + const zoom = zoomFactors[i + 1]; + this.store.dispatch(SettingNativeStore.changeZoom({ zoom })); } onClickRemoteSupport(event: Event) { @@ -419,6 +457,32 @@ export class TopBarComponent implements OnInit, OnDestroy { ); } + onApplyStatusMessage(index: number, statusMessage: string) { + this.logger.debug('StatusMessage', index, statusMessage); + + let updateType: UserInfoUpdateType; + switch (index) { + case 1: + updateType = UserInfoUpdateType.StatusMessage1; + break; + case 2: + updateType = UserInfoUpdateType.StatusMessage2; + break; + case 3: + updateType = UserInfoUpdateType.StatusMessage3; + break; + + default: + return; + } + + this.store.dispatch( + AuthenticationStore.infoUser({ + req: { type: updateType, info: statusMessage } + }) + ); + } + onClickChangeStatusBusy(event: Event, index: number) { event.stopPropagation(); } diff --git a/projects/ucap-webmessenger-app/src/app/pages/messenger/components/main.page.component.ts b/projects/ucap-webmessenger-app/src/app/pages/messenger/components/main.page.component.ts index 4d500e43..43f56a85 100644 --- a/projects/ucap-webmessenger-app/src/app/pages/messenger/components/main.page.component.ts +++ b/projects/ucap-webmessenger-app/src/app/pages/messenger/components/main.page.component.ts @@ -137,9 +137,7 @@ export class MainPageComponent implements OnInit, OnDestroy { this.myIdleCheckTimeSubscription = this.store .pipe( - select( - AppStore.MessengerSelector.StatusSelector.selectedMyIdleCheckTime - ) + select(AppStore.MessengerSelector.StatusSelector.selectMyIdleCheckTime) ) .subscribe(checkTime => { this.nativeService.changeLimitOfIdleState(checkTime); diff --git a/projects/ucap-webmessenger-app/src/app/resolvers/messenger.resolver.ts b/projects/ucap-webmessenger-app/src/app/resolvers/messenger.resolver.ts index d49e397d..81674ec1 100644 --- a/projects/ucap-webmessenger-app/src/app/resolvers/messenger.resolver.ts +++ b/projects/ucap-webmessenger-app/src/app/resolvers/messenger.resolver.ts @@ -58,6 +58,7 @@ import * as OptionStore from '@app/store/messenger/option'; import * as QueryStore from '@app/store/messenger/query'; import * as SyncStore from '@app/store/messenger/sync'; import * as StatusStore from '@app/store/messenger/status'; +import * as SettingInitStore from '@app/store/setting/init'; import { KEY_LOGIN_RES_INFO, KEY_VER_INFO } from '@app/types'; import { environment } from '../../environments/environment'; diff --git a/projects/ucap-webmessenger-app/src/app/services/authentication.service.ts b/projects/ucap-webmessenger-app/src/app/services/authentication.service.ts index 144603f4..5a042acf 100644 --- a/projects/ucap-webmessenger-app/src/app/services/authentication.service.ts +++ b/projects/ucap-webmessenger-app/src/app/services/authentication.service.ts @@ -66,6 +66,7 @@ export class AppAuthenticationService { if (!appUserInfo) { appUserInfo = { idleCheckTime: 10, + zoom: 100, settings: { ...environment.productConfig.defaultSettings, chat: { diff --git a/projects/ucap-webmessenger-app/src/app/store/account/authentication/actions.ts b/projects/ucap-webmessenger-app/src/app/store/account/authentication/actions.ts index c0e6456c..cd3a61d6 100644 --- a/projects/ucap-webmessenger-app/src/app/store/account/authentication/actions.ts +++ b/projects/ucap-webmessenger-app/src/app/store/account/authentication/actions.ts @@ -8,6 +8,7 @@ import { UserPasswordSetRequest, UserPasswordSetResponse } from '@ucap-webmessenger/protocol-service'; +import { UserRequest, UserResponse } from '@ucap-webmessenger/protocol-info'; export const webLogin = createAction( '[Account::Authentication] Web Login', @@ -122,3 +123,20 @@ export const updateLoginRes = createAction( loginRes: LoginResponse; }>() ); + +export const infoUser = createAction( + '[Account::Authentication] Info User', + props<{ req: UserRequest }>() +); + +export const infoUserSuccess = createAction( + '[Account::Authentication] Info User Success', + props<{ + res: UserResponse; + }>() +); + +export const infoUserFailure = createAction( + '[Account::Authentication] Info User Failure', + props<{ error: any }>() +); diff --git a/projects/ucap-webmessenger-app/src/app/store/account/authentication/effects.ts b/projects/ucap-webmessenger-app/src/app/store/account/authentication/effects.ts index 2f3d1186..3926db44 100644 --- a/projects/ucap-webmessenger-app/src/app/store/account/authentication/effects.ts +++ b/projects/ucap-webmessenger-app/src/app/store/account/authentication/effects.ts @@ -41,7 +41,10 @@ import { logoutInitialize, userPasswordSet, userPasswordSetSuccess, - userPasswordSetFailure + userPasswordSetFailure, + infoUser, + infoUserSuccess, + infoUserFailure } from './actions'; import { LoginInfo, @@ -77,6 +80,10 @@ import { DaesangUrlInfoResponse } from '@ucap-webmessenger/api-external'; import { AppUserInfo, KEY_APP_USER_INFO } from '@app/types/app-user-info.type'; import { DaesangCipherService, WebLinkType } from '@ucap-webmessenger/daesang'; import { TranslateService } from '@ngx-translate/core'; +import { + InfoProtocolService, + UserResponse +} from '@ucap-webmessenger/protocol-info'; @Injectable() export class Effects { @@ -482,6 +489,23 @@ export class Effects { { dispatch: false } ); + infoUser$ = createEffect(() => + this.actions$.pipe( + ofType(infoUser), + map(action => action.req), + exhaustMap(req => + this.infoProtocolService.user(req).pipe( + map((res: UserResponse) => { + return infoUserSuccess({ + res + }); + }), + catchError(error => of(infoUserFailure({ error }))) + ) + ) + ) + ); + constructor( private actions$: Actions, private ngZone: NgZone, @@ -493,6 +517,7 @@ export class Effects { private appAuthenticationService: AppAuthenticationService, private protocolService: ProtocolService, private authenticationProtocolService: AuthenticationProtocolService, + private infoProtocolService: InfoProtocolService, private serviceProtocolService: ServiceProtocolService, private translateService: TranslateService, private dialogService: DialogService, diff --git a/projects/ucap-webmessenger-app/src/app/store/account/authentication/reducers.ts b/projects/ucap-webmessenger-app/src/app/store/account/authentication/reducers.ts index 9b305d30..7429a773 100644 --- a/projects/ucap-webmessenger-app/src/app/store/account/authentication/reducers.ts +++ b/projects/ucap-webmessenger-app/src/app/store/account/authentication/reducers.ts @@ -6,8 +6,10 @@ import { initialLoginFailCount, logout, logoutInitialize, - updateLoginRes + updateLoginRes, + infoUserSuccess } from './actions'; +import { UserInfoUpdateType } from '@ucap-webmessenger/protocol-info'; export const reducer = createReducer( initialState, @@ -39,6 +41,57 @@ export const reducer = createReducer( }; }), + on(infoUserSuccess, (state, action) => { + let loginRes = { + ...state.loginRes + }; + + switch (action.res.type) { + case UserInfoUpdateType.Image: + loginRes = { + ...loginRes + }; + break; + case UserInfoUpdateType.Intro: + loginRes = { + ...loginRes + }; + break; + case UserInfoUpdateType.TelephoneVisible: + loginRes = { + ...loginRes + }; + break; + case UserInfoUpdateType.StatusMessage1: + loginRes = { + ...loginRes, + statusMessage1: action.res.info + }; + break; + case UserInfoUpdateType.StatusMessage2: + loginRes = { + ...loginRes, + statusMessage2: action.res.info + }; + break; + case UserInfoUpdateType.StatusMessage3: + loginRes = { + ...loginRes, + statusMessage3: action.res.info + }; + break; + default: + break; + } + + return { + ...state, + loginRes: { + ...loginRes + } + }; + }), + on(logoutInitialize, (state, action) => { return { ...initialState diff --git a/projects/ucap-webmessenger-app/src/app/store/messenger/status/state.ts b/projects/ucap-webmessenger-app/src/app/store/messenger/status/state.ts index 7e25c0ed..92b7d306 100644 --- a/projects/ucap-webmessenger-app/src/app/store/messenger/status/state.ts +++ b/projects/ucap-webmessenger-app/src/app/store/messenger/status/state.ts @@ -62,11 +62,8 @@ export function selectors(selector: Selector) { ngeSelectEntitiesStatusBulkInfo, (_, entities) => (!!entities ? entities[userSeq] : undefined) ), - selectedMyStatus: createSelector( - selector, - (state: State) => state.myStatus - ), - selectedMyIdleCheckTime: createSelector( + selectMyStatus: createSelector(selector, (state: State) => state.myStatus), + selectMyIdleCheckTime: createSelector( selector, (state: State) => state.myIdleCheckTime ) diff --git a/projects/ucap-webmessenger-app/src/app/store/setting/index.ts b/projects/ucap-webmessenger-app/src/app/store/setting/index.ts index 35df6196..3c8fc101 100644 --- a/projects/ucap-webmessenger-app/src/app/store/setting/index.ts +++ b/projects/ucap-webmessenger-app/src/app/store/setting/index.ts @@ -5,19 +5,22 @@ import * as CompanyStore from './company'; import * as InitStore from './init'; import * as VersionInfoStore from './version-info'; import * as UpdateStore from './update'; +import * as NativeStore from './native'; export interface State { company: CompanyStore.State; init: InitStore.State; versionInfo: VersionInfoStore.State; update: UpdateStore.State; + native: NativeStore.State; } export const effects: Type[] = [ CompanyStore.Effects, InitStore.Effects, VersionInfoStore.Effects, - UpdateStore.Effects + UpdateStore.Effects, + NativeStore.Effects ]; export function reducers(state: State | undefined, action: Action) { @@ -25,7 +28,8 @@ export function reducers(state: State | undefined, action: Action) { company: CompanyStore.reducer, init: InitStore.reducer, versionInfo: VersionInfoStore.reducer, - update: UpdateStore.reducer + update: UpdateStore.reducer, + native: NativeStore.reducer })(state, action); } @@ -42,6 +46,9 @@ export function selectors(selector: Selector) { ), UpdateSelector: UpdateStore.selectors( createSelector(selector, (state: State) => state.update) + ), + NativeSelector: NativeStore.selectors( + createSelector(selector, (state: State) => state.native) ) }; } diff --git a/projects/ucap-webmessenger-app/src/app/store/setting/init/effects.ts b/projects/ucap-webmessenger-app/src/app/store/setting/init/effects.ts index ec81eb8d..bbc822f0 100644 --- a/projects/ucap-webmessenger-app/src/app/store/setting/init/effects.ts +++ b/projects/ucap-webmessenger-app/src/app/store/setting/init/effects.ts @@ -36,6 +36,7 @@ export class Effects { ), { dispatch: false } ); + constructor( private actions$: Actions, private translateService: TranslateService, diff --git a/projects/ucap-webmessenger-app/src/app/store/setting/native/actions.ts b/projects/ucap-webmessenger-app/src/app/store/setting/native/actions.ts new file mode 100644 index 00000000..54659aad --- /dev/null +++ b/projects/ucap-webmessenger-app/src/app/store/setting/native/actions.ts @@ -0,0 +1,17 @@ +import { createAction, props } from '@ngrx/store'; + +export const changeZoom = createAction( + '[Setting::Native] Change Zoom', + props<{ zoom: number }>() +); + +export const changeZoomSuccess = createAction( + '[Setting::Native] changeZoom Success', + props<{ + zoom: number; + }>() +); +export const changeZoomFailure = createAction( + '[Setting::Native] changeZoom Failure', + props<{ error: any }>() +); diff --git a/projects/ucap-webmessenger-app/src/app/store/setting/native/effects.ts b/projects/ucap-webmessenger-app/src/app/store/setting/native/effects.ts new file mode 100644 index 00000000..cd60092c --- /dev/null +++ b/projects/ucap-webmessenger-app/src/app/store/setting/native/effects.ts @@ -0,0 +1,77 @@ +import { Injectable, Inject } from '@angular/core'; +import { Actions, createEffect, ofType } from '@ngrx/effects'; + +import { map, tap } from 'rxjs/operators'; +import { TranslateService } from '@ngx-translate/core'; + +import { TranslateService as UCapTranslateService } from '@ucap-webmessenger/ui'; +import { DateService as UCapDateService } from '@ucap-webmessenger/ui'; + +import * as AuthenticationStore from '@app/store/account/authentication'; +import { LocalStorageService } from '@ucap-webmessenger/web-storage'; +import { AppUserInfo, KEY_APP_USER_INFO } from '@app/types/app-user-info.type'; + +import { environment } from '../../../../environments/environment'; +import { changeZoom, changeZoomSuccess, changeZoomFailure } from './actions'; +import { UCAP_NATIVE_SERVICE, NativeService } from '@ucap-webmessenger/native'; +import { Store } from '@ngrx/store'; + +@Injectable() +export class Effects { + postLogin$ = createEffect( + () => + this.actions$.pipe( + ofType(AuthenticationStore.postLogin), + map(action => action.loginRes), + tap(async loginRes => { + const appUserInfo = this.localStorageService.encGet( + KEY_APP_USER_INFO, + environment.customConfig.appKey + ); + + this.store.dispatch(changeZoom({ zoom: appUserInfo.zoom })); + }) + ), + { dispatch: false } + ); + + changeZoom$ = createEffect( + () => + this.actions$.pipe( + ofType(changeZoom), + map(action => action.zoom), + tap(zoom => { + const appUserInfo = this.localStorageService.encGet( + KEY_APP_USER_INFO, + environment.customConfig.appKey + ); + + this.nativeService + .zoomTo(zoom) + .then(f => { + this.localStorageService.encSet( + KEY_APP_USER_INFO, + { + ...appUserInfo, + zoom + }, + environment.customConfig.appKey + ); + + this.store.dispatch(changeZoomSuccess({ zoom })); + }) + .catch(reason => { + this.store.dispatch(changeZoomFailure({ error: reason })); + }); + }) + ), + { dispatch: false } + ); + + constructor( + private actions$: Actions, + private store: Store, + @Inject(UCAP_NATIVE_SERVICE) private nativeService: NativeService, + private localStorageService: LocalStorageService + ) {} +} diff --git a/projects/ucap-webmessenger-app/src/app/store/setting/native/index.ts b/projects/ucap-webmessenger-app/src/app/store/setting/native/index.ts new file mode 100644 index 00000000..2663cade --- /dev/null +++ b/projects/ucap-webmessenger-app/src/app/store/setting/native/index.ts @@ -0,0 +1,4 @@ +export * from './actions'; +export * from './effects'; +export * from './reducers'; +export * from './state'; diff --git a/projects/ucap-webmessenger-app/src/app/store/setting/native/reducers.ts b/projects/ucap-webmessenger-app/src/app/store/setting/native/reducers.ts new file mode 100644 index 00000000..d280b418 --- /dev/null +++ b/projects/ucap-webmessenger-app/src/app/store/setting/native/reducers.ts @@ -0,0 +1,13 @@ +import { createReducer, on } from '@ngrx/store'; +import { State, initialState } from './state'; +import { changeZoomSuccess } from './actions'; + +export const reducer = createReducer( + initialState, + on(changeZoomSuccess, (state, action) => { + return { + ...state, + zoom: action.zoom + } as State; + }) +); diff --git a/projects/ucap-webmessenger-app/src/app/store/setting/native/state.ts b/projects/ucap-webmessenger-app/src/app/store/setting/native/state.ts new file mode 100644 index 00000000..b14f22fe --- /dev/null +++ b/projects/ucap-webmessenger-app/src/app/store/setting/native/state.ts @@ -0,0 +1,16 @@ +import { Selector, createSelector } from '@ngrx/store'; + +// tslint:disable-next-line: no-empty-interface +export interface State { + zoom: number; +} + +export const initialState: State = { + zoom: 100 +}; + +export function selectors(selector: Selector) { + return { + selectZoom: createSelector(selector, (state: State) => state.zoom) + }; +} diff --git a/projects/ucap-webmessenger-app/src/app/types/app-user-info.type.ts b/projects/ucap-webmessenger-app/src/app/types/app-user-info.type.ts index 2dde9efd..a509706f 100644 --- a/projects/ucap-webmessenger-app/src/app/types/app-user-info.type.ts +++ b/projects/ucap-webmessenger-app/src/app/types/app-user-info.type.ts @@ -11,6 +11,7 @@ export interface AppUserInfo { companyGroupType?: string; localeCode?: LocaleCode; idleCheckTime?: number; + zoom?: number; settings?: Settings; } diff --git a/projects/ucap-webmessenger-app/src/assets/i18n/en.json b/projects/ucap-webmessenger-app/src/assets/i18n/en.json index 79f1ef52..69a72fd4 100644 --- a/projects/ucap-webmessenger-app/src/assets/i18n/en.json +++ b/projects/ucap-webmessenger-app/src/assets/i18n/en.json @@ -67,6 +67,10 @@ "failToChangeProfileImage": "Failed to change profile image." } }, + "information": { + "label": "Information", + "version": "Version" + }, "settings": { "label": "Settings", "typeGenernal": "Genernal", diff --git a/projects/ucap-webmessenger-app/src/assets/i18n/ko.json b/projects/ucap-webmessenger-app/src/assets/i18n/ko.json index 6b437934..b79960fa 100644 --- a/projects/ucap-webmessenger-app/src/assets/i18n/ko.json +++ b/projects/ucap-webmessenger-app/src/assets/i18n/ko.json @@ -67,6 +67,10 @@ "failToChangeProfileImage": "프로필 이미지 변경에 실패 하였습니다." } }, + "information": { + "label": "정보", + "version": "버전" + }, "settings": { "label": "설정", "typeGenernal": "일반", 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 7929d7ec..dd3a7db5 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 @@ -78,6 +78,12 @@ export class BrowserNativeService extends NativeService { }); } + getVersionInfo(): Promise { + return new Promise((resolve, reject) => { + resolve(''); + }); + } + changeAutoLaunch(autoLaunch: boolean): Promise { return new Promise((resolve, reject) => { resolve(true); @@ -215,6 +221,12 @@ export class BrowserNativeService extends NativeService { windowMaximize(): void {} + zoomTo(factor: number): Promise { + return new Promise((resolve, reject) => { + resolve(-1); + }); + } + idleStateChanged(): Observable { return new Observable(subscriber => { try { 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 63726d4f..97fdfb19 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 @@ -1,4 +1,4 @@ -import { ipcRenderer, remote, shell } from 'electron'; +import { ipcRenderer, remote, shell, webFrame } from 'electron'; import { Observable, Subject } from 'rxjs'; @@ -34,6 +34,7 @@ import { StatusCode } from '@ucap-webmessenger/core'; }) export class ElectronNativeService implements NativeService { private ipcRenderer: typeof ipcRenderer; + private webFrame: typeof webFrame; private remote: typeof remote; private shell: typeof shell; @@ -89,6 +90,16 @@ export class ElectronNativeService implements NativeService { }); } + getVersionInfo(): Promise { + return new Promise((resolve, reject) => { + try { + resolve(this.ipcRenderer.sendSync(MessengerChannel.GetVersionInfo)); + } catch (error) { + reject(error); + } + }); + } + changeStatus(): Observable { if (!this.changeStatusSubject) { this.changeStatusSubject = new Subject(); @@ -377,6 +388,17 @@ export class ElectronNativeService implements NativeService { } } + zoomTo(factor: number): Promise { + return new Promise((resolve, reject) => { + try { + this.webFrame.setZoomFactor(factor / 100); + resolve(this.webFrame.getZoomFactor()); + } catch (error) { + reject(error); + } + }); + } + idleStateChanged(): Observable { if (!this.idleStateChangedSubject) { this.idleStateChangedSubject = new Subject(); @@ -448,6 +470,7 @@ export class ElectronNativeService implements NativeService { this.ipcRenderer = (window as any).require('electron').ipcRenderer; this.remote = (window as any).require('electron').remote; this.shell = (window as any).require('electron').shell; + this.webFrame = (window as any).require('electron').webFrame; } } } 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 f766d95a..611c8d76 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 @@ -5,7 +5,8 @@ export enum MessengerChannel { ChangeAutoLaunch = 'UCAP::messenger::changeAutoLaunch', ChangeStartupHideWindow = 'UCAP::messenger::changeStartupHideWindow', ChangeDownloadPath = 'UCAP::messenger::changeDownloadPath', - GetNetworkInfo = 'UCAP::messenger::getNetworkInfo' + GetNetworkInfo = 'UCAP::messenger::getNetworkInfo', + GetVersionInfo = 'UCAP::messenger::getVersionInfo' } export enum ChatChannel { 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 94158b7f..d4967761 100644 --- a/projects/ucap-webmessenger-native/src/lib/services/native.service.ts +++ b/projects/ucap-webmessenger-native/src/lib/services/native.service.ts @@ -25,6 +25,7 @@ export abstract class NativeService { abstract showSetting(): Observable; abstract getNetworkInfo(): Promise; + abstract getVersionInfo(): Promise; abstract changeAutoLaunch(autoLaunch: boolean): Promise; abstract changeStartupHideWindow( @@ -66,6 +67,7 @@ export abstract class NativeService { abstract windowClose(): void; abstract windowMinimize(): void; abstract windowMaximize(): void; + abstract zoomTo(factor: number): Promise; abstract idleStateChanged(): Observable; abstract changeLimitOfIdleState(limitTime: number): void; diff --git a/projects/ucap-webmessenger-protocol-info/src/lib/types/user-info-update.type.ts b/projects/ucap-webmessenger-protocol-info/src/lib/types/user-info-update.type.ts index a2496524..fb25bcf8 100644 --- a/projects/ucap-webmessenger-protocol-info/src/lib/types/user-info-update.type.ts +++ b/projects/ucap-webmessenger-protocol-info/src/lib/types/user-info-update.type.ts @@ -4,7 +4,13 @@ export enum UserInfoUpdateType { // R: 인트로소개 Intro = 'R', // T: 전화보이기여부 - TelephoneVisible = 'T' + TelephoneVisible = 'T', + /** StatusMessage1 */ + StatusMessage1 = 'S1', + /** StatusMessage2 */ + StatusMessage2 = 'S2', + /** StatusMessage3 */ + StatusMessage3 = 'S3' } export enum TelephoneVisibleType { diff --git a/projects/ucap-webmessenger-ui-message/src/lib/components/list-item.component.html b/projects/ucap-webmessenger-ui-message/src/lib/components/list-item.component.html index a2795aac..36daf520 100644 --- a/projects/ucap-webmessenger-ui-message/src/lib/components/list-item.component.html +++ b/projects/ucap-webmessenger-ui-message/src/lib/components/list-item.component.html @@ -1,5 +1,5 @@ -
+ + +
+
+
+ + {{ message.userName }} + + {{ + 'message.andOthers' | translate: { count: message.userCount - 1 } + }} + + +
+
+ image + attach_file + {{ message.title }} +
+
+
+ {{ message.regDate | ucapDate: 'MM:DD' }} + + N + +
diff --git a/projects/ucap-webmessenger-ui-message/src/lib/components/list-item.component.scss b/projects/ucap-webmessenger-ui-message/src/lib/components/list-item.component.scss index e69de29b..baeb82b3 100644 --- a/projects/ucap-webmessenger-ui-message/src/lib/components/list-item.component.scss +++ b/projects/ucap-webmessenger-ui-message/src/lib/components/list-item.component.scss @@ -0,0 +1,52 @@ +.message-list { + &.list-item { + dl { + display: flex; + flex-flow: column; + flex: 1 1 auto; + width: calc(100% - 80px); + dt { + .name { + font-size: 16px; + overflow: hidden; + text-overflow: ellipsis; + display: block; + white-space: nowrap; + word-wrap: normal; + font-weight: 600; + span { + font-size: 13px; + } + } + } + + dd { + color: #777777; + margin-top: 4px; + white-space: nowrap; + word-wrap: normal; + text-overflow: ellipsis; + display: block; + width: 100%; + position: relative; + overflow: hidden; + } + } + .date { + display: flex; + flex-flow: column; + align-self: flex-start; + .badge-new { + border-radius: 50%; + color: #ffffff; + padding: 0; + text-align: center; + align-self: flex-end; + width: 20px; + height: 20px; + font-size: 12px; + margin-top: 4px; + } + } + } +} diff --git a/projects/ucap-webmessenger-ui-profile/src/lib/components/user-list-item.component.html b/projects/ucap-webmessenger-ui-profile/src/lib/components/user-list-item.component.html index 34e02756..a4725c1f 100644 --- a/projects/ucap-webmessenger-ui-profile/src/lib/components/user-list-item.component.html +++ b/projects/ucap-webmessenger-ui-profile/src/lib/components/user-list-item.component.html @@ -1,5 +1,5 @@ -
+
diff --git a/projects/ucap-webmessenger-ui-settings/src/lib/components/chat.component.html b/projects/ucap-webmessenger-ui-settings/src/lib/components/chat.component.html index 84c760d5..f5a9742f 100644 --- a/projects/ucap-webmessenger-ui-settings/src/lib/components/chat.component.html +++ b/projects/ucap-webmessenger-ui-settings/src/lib/components/chat.component.html @@ -1,6 +1,6 @@
-

{{ 'settings.chat.label' | translate }}

+

{{ 'settings.chat.file' | translate }} diff --git a/projects/ucap-webmessenger-ui/src/lib/components/inline-edit-input.component.html b/projects/ucap-webmessenger-ui/src/lib/components/inline-edit-input.component.html new file mode 100644 index 00000000..213e2daa --- /dev/null +++ b/projects/ucap-webmessenger-ui/src/lib/components/inline-edit-input.component.html @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + diff --git a/projects/ucap-webmessenger-ui/src/lib/components/inline-edit-input.component.scss b/projects/ucap-webmessenger-ui/src/lib/components/inline-edit-input.component.scss new file mode 100644 index 00000000..130eb13d --- /dev/null +++ b/projects/ucap-webmessenger-ui/src/lib/components/inline-edit-input.component.scss @@ -0,0 +1,7 @@ +.view-actions { + margin-right: 0px; +} + +.edit-actions { + margin-right: 0px; +} diff --git a/projects/ucap-webmessenger-ui/src/lib/components/inline-edit-input.component.spec.ts b/projects/ucap-webmessenger-ui/src/lib/components/inline-edit-input.component.spec.ts new file mode 100644 index 00000000..747d03dc --- /dev/null +++ b/projects/ucap-webmessenger-ui/src/lib/components/inline-edit-input.component.spec.ts @@ -0,0 +1,25 @@ +/* tslint:disable:no-unused-variable */ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { InlineEditInputComponent } from './inline-edit-input.component'; + +describe('InlineEditInputComponent', () => { + let component: InlineEditInputComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [InlineEditInputComponent] + }).compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(InlineEditInputComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/projects/ucap-webmessenger-ui/src/lib/components/inline-edit-input.component.ts b/projects/ucap-webmessenger-ui/src/lib/components/inline-edit-input.component.ts new file mode 100644 index 00000000..633108a5 --- /dev/null +++ b/projects/ucap-webmessenger-ui/src/lib/components/inline-edit-input.component.ts @@ -0,0 +1,43 @@ +import { Component, OnInit, Output, EventEmitter } from '@angular/core'; + +@Component({ + selector: 'ucap-inline-edit-input', + templateUrl: './inline-edit-input.component.html', + styleUrls: ['./inline-edit-input.component.scss'] +}) +export class InlineEditInputComponent implements OnInit { + @Output() + edit = new EventEmitter(); + @Output() + cancel = new EventEmitter(); + @Output() + apply = new EventEmitter(); + + get editMode() { + return this._editMode; + } + set editMode(editMode: boolean) { + this._editMode = editMode; + } + // tslint:disable-next-line: variable-name + _editMode = false; + + constructor() {} + + ngOnInit() {} + + onClickEdit(event: Event) { + this.editMode = true; + this.edit.emit(event); + } + + onClickCancel(event: Event) { + this.editMode = false; + this.cancel.emit(event); + } + + onClickApply(event: Event) { + this.editMode = false; + this.apply.emit(event); + } +} diff --git a/projects/ucap-webmessenger-ui/src/lib/ucap-ui.module.ts b/projects/ucap-webmessenger-ui/src/lib/ucap-ui.module.ts index f5195542..1510db10 100644 --- a/projects/ucap-webmessenger-ui/src/lib/ucap-ui.module.ts +++ b/projects/ucap-webmessenger-ui/src/lib/ucap-ui.module.ts @@ -38,6 +38,7 @@ import { PickDateComponent } from './components/pick-date.component'; import { PickTimeComponent } from './components/pick-time.component'; import { StepInputComponent } from './components/step-input.component'; import { StickerSelectorComponent } from './components/sticker-selector.component'; +import { InlineEditInputComponent } from './components/inline-edit-input.component'; import { BinaryViewerComponent } from './components/file-viewer/binary-viewer.component'; import { DocumentViewerComponent } from './components/file-viewer/document-viewer.component'; @@ -88,6 +89,7 @@ const COMPONENTS = [ PickTimeComponent, StepInputComponent, TranslationSectionComponent, + InlineEditInputComponent, BinaryViewerComponent, DocumentViewerComponent, diff --git a/projects/ucap-webmessenger-ui/src/public-api.ts b/projects/ucap-webmessenger-ui/src/public-api.ts index 7a509dfa..4ad82c07 100644 --- a/projects/ucap-webmessenger-ui/src/public-api.ts +++ b/projects/ucap-webmessenger-ui/src/public-api.ts @@ -18,6 +18,7 @@ export * from './lib/components/pick-time.component'; export * from './lib/components/step-input.component'; export * from './lib/components/split-button.component'; export * from './lib/components/sticker-selector.component'; +export * from './lib/components/inline-edit-input.component'; export * from './lib/data-source/virtual-scroll-tree-flat.data-source';