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

devicetype 저장된 값을 쓰도록 수정.

Browse Source
This commit is contained in:
leejinho 2020-01-03 17:35:34 +09:00
parent 3a58a47e1f
commit 69bb77e92c
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -211,7 +211,7 @@ export class AlbumBoxComponent implements OnInit, OnDestroy {
this.commonApiService this.commonApiService
.fileTalkDownload({ .fileTalkDownload({
userSeq: this.loginRes.userSeq, userSeq: this.loginRes.userSeq,
deviceType: DeviceType.PC, deviceType: this.environmentsInfo.deviceType,
token: this.loginRes.tokenString, token: this.loginRes.tokenString,
attachmentsSeq: fileInfo.info.seq, attachmentsSeq: fileInfo.info.seq,
fileDownloadItem: fileInfo.fileDownloadItem fileDownloadItem: fileInfo.fileDownloadItem

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

@ -33,7 +33,11 @@ import {
CreateChatDialogResult, CreateChatDialogResult,
CreateChatDialogData CreateChatDialogData
} from '../../dialogs/chat/create-chat.dialog.component'; } from '../../dialogs/chat/create-chat.dialog.component';
import { UserSelectDialogType } from '@app/types'; import {
UserSelectDialogType,
EnvironmentsInfo,
KEY_ENVIRONMENTS_INFO
} from '@app/types';
import { RoomInfo } from '@ucap-webmessenger/protocol-room'; import { RoomInfo } from '@ucap-webmessenger/protocol-room';
export interface FileInfoTotal { export interface FileInfoTotal {
@ -60,6 +64,7 @@ export class FileBoxComponent implements OnInit, OnDestroy {
selectedFileList: FileInfoTotal[] = []; selectedFileList: FileInfoTotal[] = [];
loginRes: LoginResponse; loginRes: LoginResponse;
environmentsInfo: EnvironmentsInfo;
currentTabIndex = 0; currentTabIndex = 0;
@ -78,6 +83,9 @@ export class FileBoxComponent implements OnInit, OnDestroy {
this.loginRes = this.sessionStorageService.get<LoginResponse>( this.loginRes = this.sessionStorageService.get<LoginResponse>(
KEY_LOGIN_RES_INFO KEY_LOGIN_RES_INFO
); );
this.environmentsInfo = this.sessionStorageService.get<EnvironmentsInfo>(
KEY_ENVIRONMENTS_INFO
);
} }
ngOnInit() { ngOnInit() {
@ -247,7 +255,7 @@ export class FileBoxComponent implements OnInit, OnDestroy {
this.commonApiService this.commonApiService
.fileTalkDownload({ .fileTalkDownload({
userSeq: this.loginRes.userSeq, userSeq: this.loginRes.userSeq,
deviceType: DeviceType.PC, deviceType: this.environmentsInfo.deviceType,
token: this.loginRes.tokenString, token: this.loginRes.tokenString,
attachmentsSeq: fileInfo.info.seq, attachmentsSeq: fileInfo.info.seq,
fileDownloadItem: fileInfo.fileDownloadItem fileDownloadItem: fileInfo.fileDownloadItem

10
projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/message/message-detail.dialog.component.ts
View File

@ -161,7 +161,7 @@ export class MessageDetailDialogComponent implements OnInit {
this.messageApiService this.messageApiService
.retrieveResourceFile({ .retrieveResourceFile({
userSeq: this.data.loginRes.userSeq, userSeq: this.data.loginRes.userSeq,
deviceType: DeviceType.PC, deviceType: this.data.environmentsInfo.deviceType,
tokenKey: this.data.loginRes.tokenString, tokenKey: this.data.loginRes.tokenString,
type: this.messageInfo.type, type: this.messageInfo.type,
msgId: this.messageInfo.msgId, msgId: this.messageInfo.msgId,
@ -187,7 +187,7 @@ export class MessageDetailDialogComponent implements OnInit {
this.messageApiService this.messageApiService
.retrieveResourceFile({ .retrieveResourceFile({
userSeq: this.data.loginRes.userSeq, userSeq: this.data.loginRes.userSeq,
deviceType: DeviceType.PC, deviceType: this.data.environmentsInfo.deviceType,
tokenKey: this.data.loginRes.tokenString, tokenKey: this.data.loginRes.tokenString,
type: this.messageInfo.type, type: this.messageInfo.type,
msgId: this.messageInfo.msgId, msgId: this.messageInfo.msgId,
@ -215,7 +215,7 @@ export class MessageDetailDialogComponent implements OnInit {
// this.messageApiService // this.messageApiService
// .retrieveResourceFile({ // .retrieveResourceFile({
// userSeq: this.data.loginRes.userSeq, // userSeq: this.data.loginRes.userSeq,
// deviceType: DeviceType.PC, // deviceType: this.data.environmentsInfo.deviceType,
// tokenKey: this.data.loginRes.tokenString, // tokenKey: this.data.loginRes.tokenString,
// type: this.messageInfo.type, // type: this.messageInfo.type,
// msgId: this.messageInfo.msgId, // msgId: this.messageInfo.msgId,
@ -310,7 +310,7 @@ export class MessageDetailDialogComponent implements OnInit {
this.messageApiService this.messageApiService
.retrieveResourceFile({ .retrieveResourceFile({
userSeq: this.data.loginRes.userSeq, userSeq: this.data.loginRes.userSeq,
deviceType: DeviceType.PC, deviceType: this.data.environmentsInfo.deviceType,
tokenKey: this.data.loginRes.tokenString, tokenKey: this.data.loginRes.tokenString,
type: this.messageInfo.type, type: this.messageInfo.type,
msgId: this.messageInfo.msgId, msgId: this.messageInfo.msgId,
@ -541,7 +541,7 @@ export class MessageDetailDialogComponent implements OnInit {
this.messageApiService this.messageApiService
.cancelMessage({ .cancelMessage({
userSeq: this.data.loginRes.userSeq, userSeq: this.data.loginRes.userSeq,
deviceType: DeviceType.PC, deviceType: this.data.environmentsInfo.deviceType,
tokenKey: this.data.loginRes.tokenString, tokenKey: this.data.loginRes.tokenString,
type: this.messageInfo.type, type: this.messageInfo.type,
msgId: this.messageInfo.msgId, msgId: this.messageInfo.msgId,