From c49c557d9596dd60d44f9c3275f8c95fe92f8bdf Mon Sep 17 00:00:00 2001 From: leejinho Date: Mon, 30 Dec 2019 09:47:58 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=EC=95=88=EC=9D=BD=EC=9D=80=20=EB=A9=94?= =?UTF-8?q?=EC=8B=9C=EC=A7=80=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95=20?= =?UTF-8?q?:=20=EB=8B=A4=EB=A5=B8=EB=B0=A9=EC=9D=B4=20=ED=98=84=EC=9E=AC?= =?UTF-8?q?=20=EB=A1=9C=EB=94=A9=EB=90=98=EC=96=B4=20=EC=9E=88=EB=8A=94=20?= =?UTF-8?q?=EC=83=81=ED=83=9C=EC=97=90=EC=84=9C=20=EB=8C=80=EC=83=81=20?= =?UTF-8?q?=EB=B0=A9=EC=9C=BC=EB=A1=9C=20=EC=9D=B4=EB=8F=99=EC=8B=9C=20?= =?UTF-8?q?=EC=95=88=EB=82=98=EC=98=A4=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=20>=20selectedRoom=20=EB=B0=9C=EC=83=9D?= =?UTF-8?q?=EC=8B=9C=20event=20state=20=EC=B4=88=EA=B8=B0=ED=99=94.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/app/store/messenger/event/reducers.ts | 5 ++++ .../src/environments/environment.type.ts | 2 +- .../lib/components/messages.component.html | 29 +++++++++++-------- 3 files changed, 23 insertions(+), 13 deletions(-) diff --git a/projects/ucap-webmessenger-app/src/app/store/messenger/event/reducers.ts b/projects/ucap-webmessenger-app/src/app/store/messenger/event/reducers.ts index 28416d36..03de3a0f 100644 --- a/projects/ucap-webmessenger-app/src/app/store/messenger/event/reducers.ts +++ b/projects/ucap-webmessenger-app/src/app/store/messenger/event/reducers.ts @@ -136,6 +136,11 @@ export const reducer = createReducer( }; }), + on(ChatStore.selectedRoom, (state, action) => { + return { + ...initialState + }; + }), on(ChatStore.clearSelectedRoom, (state, action) => { return { ...initialState diff --git a/projects/ucap-webmessenger-app/src/environments/environment.type.ts b/projects/ucap-webmessenger-app/src/environments/environment.type.ts index fb97ced7..4e97d513 100644 --- a/projects/ucap-webmessenger-app/src/environments/environment.type.ts +++ b/projects/ucap-webmessenger-app/src/environments/environment.type.ts @@ -89,7 +89,7 @@ export interface Environment { readHereShowMinimumEventCount: number; /** 여기까지 읽음을 보여줄 최대 이벤트 개수 (show: under) */ readHereShowMaximumEventCount: number; - /** 여기까지 읽음이 보려질때 대화방 이벤트 조회 개수. */ + /** 여기까지 읽음이 보여질때 대화방 이벤트 조회 개수. */ readHereEventRequestCount: number; }; }; diff --git a/projects/ucap-webmessenger-ui-chat/src/lib/components/messages.component.html b/projects/ucap-webmessenger-ui-chat/src/lib/components/messages.component.html index 35b65b89..a586c4cf 100644 --- a/projects/ucap-webmessenger-ui-chat/src/lib/components/messages.component.html +++ b/projects/ucap-webmessenger-ui-chat/src/lib/components/messages.component.html @@ -16,18 +16,6 @@ -->
-
- - - 안읽은 메시지가 ({{ firstEventSeq - (roomInfo.lastReadEventSeq + 1) }})개 - 더 있습니다. - - -
이전 대화 보기 +
+ + + 안읽은 메시지가 + ({{ firstEventSeq - (roomInfo.lastReadEventSeq + 1) }})개 더 있습니다. + + +
From 422223eadc5353b8dec9809fd36e9139cd6355ed Mon Sep 17 00:00:00 2001 From: leejinho Date: Mon, 30 Dec 2019 15:25:08 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=EC=9B=B9=EB=A7=81=ED=81=AC=20=ED=91=9C?= =?UTF-8?q?=ED=98=84=EB=B0=A9=EC=8B=9D=20=EB=B3=80=EA=B2=BD.=20=ED=8C=9D?= =?UTF-8?q?=EC=97=85=20>=20=EB=82=98=EC=97=B4=EC=8B=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../left-sidenav/group.component.ts | 1 - .../native/components/top-bar.component.html | 54 +++++++++--------- .../native/components/top-bar.component.scss | 55 ------------------- .../native/components/top-bar.component.ts | 20 ++++--- 4 files changed, 41 insertions(+), 89 deletions(-) diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.ts index 3e972fa7..0650f8c1 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.ts +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.ts @@ -232,7 +232,6 @@ export class GroupComponent implements OnInit, OnDestroy { } onSelectBuddy(buddy: UserInfo) { - this.logger.debug('onSelectBuddy', buddy); if (buddy.seq === this.loginRes.userSeq) { this.store.dispatch( ChatStore.openRoom({ userSeqList: [this.loginRes.talkWithMeBotSeq] }) 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 f890a17a..c93be4d8 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 @@ -7,10 +7,35 @@
+ +
- -
-
-
-
    -
  • -
    - -
    -
    {{ link.title }}
    -
    • -
-
-
-
diff --git a/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.scss index 64f50889..d7a6f564 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.scss +++ b/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.scss @@ -132,58 +132,3 @@ } } } - -.weblink { - position: absolute; - width: 350px; - height: 40%; - top: 60px; - right: 15px; - background: #fff; - border-radius: 5px; - border: 1px solid #666; - z-index: 2; - padding: 10px; - display: none; - - .container { - display: flex; - padding: 0 10px; - height: 100%; - overflow-y: auto; - flex-wrap: wrap; - - .img-item { - cursor: pointer; - margin-bottom: 10px; - margin-right: 9px; - position: relative; - height: 150px; - - ul { - li { - list-style: none; - float: left; - margin: 0 10px 20px 10px; - - .icon { - height: 50px; - width: 50px; - line-height: 50px; - } - .description { - width: 50px; - text-align: center; - } - .ellipsis { - display: block; - text-overflow: ellipsis; - white-space: nowrap; - word-wrap: normal; - overflow: hidden; - } - } - } - } - } -} 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 3e89267e..d2717d49 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 @@ -50,9 +50,9 @@ export class TopBarComponent implements OnInit, OnDestroy { updateInfo$: Observable; - showWeblink = false; loginInfo: LoginInfo; weblink: WebLink[] = []; + weblinkBadgeTypes: WebLink[] = []; webLinkBadgeMail = 0; webLinkBadgePayment = 0; @@ -78,8 +78,6 @@ export class TopBarComponent implements OnInit, OnDestroy { KEY_LOGIN_INFO ); - this.showWeblink = false; - // WebLink init.. this.initWebLink(); }) @@ -114,10 +112,20 @@ export class TopBarComponent implements OnInit, OnDestroy { weblink => urlInfo.webLinkAllowedList .filter( - type => type !== 'WebLinkMailCnt' && type !== 'WebLinkPaymentCnt' + type => + type !== 'WebLinkMailCnt' && + type !== 'WebLinkPaymentCnt' && + type !== 'WebLinkMail' && + type !== 'WebLinkPayment' ) .filter(type => type === weblink.key).length > 0 ); + this.weblinkBadgeTypes = urlInfo.webLink.filter( + weblink => + urlInfo.webLinkAllowedList + .filter(type => type === 'WebLinkMail' || type === 'WebLinkPayment') + .filter(type => type === weblink.key).length > 0 + ); if (urlInfo.webLinkAllowedList.indexOf('WebLinkMail') > -1) { // 메일 카운트 체크. @@ -223,9 +231,7 @@ export class TopBarComponent implements OnInit, OnDestroy { ); } - onToggleWebLinkSelector(): void { - this.showWeblink = !this.showWeblink; - } + /** About WebLink */ onClickWebLink(link: WebLink): void { const appUserInfo = this.localStorageService.encGet( KEY_APP_USER_INFO, From 84a30fc416cddcd7997cefe1a93331b66b5640aa Mon Sep 17 00:00:00 2001 From: leejinho Date: Mon, 30 Dec 2019 15:55:48 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=EB=AA=A8=EB=B0=94=EC=9D=BC=20status=20?= =?UTF-8?q?=ED=91=9C=EC=8B=9C=20=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/user-list-item.component.html | 6 ++++++ .../components/user-list-item.component.scss | 17 +++++++++++++++++ .../lib/components/user-list-item.component.ts | 7 +++++-- 3 files changed, 28 insertions(+), 2 deletions(-) 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 9f4cd16f..69d175de 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 @@ -14,6 +14,12 @@ (click)="onClickOpenProfile($event, userInfo)" />
+ + phone_android +
diff --git a/projects/ucap-webmessenger-ui-profile/src/lib/components/user-list-item.component.scss b/projects/ucap-webmessenger-ui-profile/src/lib/components/user-list-item.component.scss index 3a888f93..fcf879f9 100644 --- a/projects/ucap-webmessenger-ui-profile/src/lib/components/user-list-item.component.scss +++ b/projects/ucap-webmessenger-ui-profile/src/lib/components/user-list-item.component.scss @@ -26,6 +26,23 @@ $thumbnail-msize: 40px; } } +.badge-mobile-state { + position: absolute; + background-color: #ffffff; + width: 18px; + height: 18px; + border-radius: 50%; + bottom: 14px; + left: 60px; + text-align: center; + .mat-icon { + font-size: 14px; + width: 18px; + height: 18px; + line-height: 18px; + } +} + %list-item { position: relative; display: flex; diff --git a/projects/ucap-webmessenger-ui-profile/src/lib/components/user-list-item.component.ts b/projects/ucap-webmessenger-ui-profile/src/lib/components/user-list-item.component.ts index 28d5212d..d230a758 100644 --- a/projects/ucap-webmessenger-ui-profile/src/lib/components/user-list-item.component.ts +++ b/projects/ucap-webmessenger-ui-profile/src/lib/components/user-list-item.component.ts @@ -65,13 +65,16 @@ export class UserListItemComponent implements OnInit { this.profileImageRoot || this.sessionVerinfo.profileRoot; } - getPresence(type: string): string { + getPresence(type: PresenceType): string { let status: string; let rtnClass = ''; switch (type) { - case 'pc': + case PresenceType.PC: status = !!this.presence ? this.presence.pcStatus : undefined; break; + case PresenceType.MOBILE: + status = !!this.presence ? this.presence.mobileStatus : undefined; + break; } if (!!status) {