From 27b9bb599ac6dbc26062fec769dc865fa2719ede Mon Sep 17 00:00:00 2001 From: leejh Date: Mon, 21 Oct 2019 15:03:27 +0900 Subject: [PATCH] =?UTF-8?q?=EC=88=98=EC=A0=95=20::=20=EB=8C=80=ED=99=94=20?= =?UTF-8?q?>=20=EB=8C=80=ED=99=94=EB=A6=AC=EC=8A=A4=ED=8A=B8=EC=97=90=20?= =?UTF-8?q?=ED=94=84=EB=A1=9C=ED=95=84=20=EC=82=AC=EC=A7=84=20=EC=A0=81?= =?UTF-8?q?=EC=9A=A9.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/right-side.component.html | 8 ++--- .../src/assets/images/img_groupphoto_36.png | Bin 0 -> 1791 bytes .../src/assets/images/img_groupphoto_80.png | Bin 0 -> 5259 bytes .../components/expansion-panel.component.html | 1 + .../lib/components/list-item.component.html | 24 +++++++++++--- .../lib/components/list-item.component.scss | 9 +++++- .../src/lib/components/list-item.component.ts | 30 ++++++++++++++++-- .../src/lib/ucap-ui-room.module.ts | 8 ++++- 8 files changed, 67 insertions(+), 13 deletions(-) create mode 100644 projects/ucap-webmessenger-app/src/assets/images/img_groupphoto_36.png create mode 100644 projects/ucap-webmessenger-app/src/assets/images/img_groupphoto_80.png diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-side.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-side.component.html index 7a015a6d..68114870 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-side.component.html +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-side.component.html @@ -1,7 +1,5 @@ -
-
-
-
+
+
slide dashboard
-
\ No newline at end of file +
diff --git a/projects/ucap-webmessenger-app/src/assets/images/img_groupphoto_36.png b/projects/ucap-webmessenger-app/src/assets/images/img_groupphoto_36.png new file mode 100644 index 0000000000000000000000000000000000000000..1b98d1e1b35eaf2ecd4412f706abbfbc065cf323 GIT binary patch literal 1791 zcmVcfNDJ z?@D@mdpW#;ki9NS95)r8L?U@*e=kMMn1n6kwh*?7m^DITpBF<=D%Rnvk}~&a4OWT0 zPC~Z$6`V>jq_kQss;a8c-rmms(=^SVJsTk*AqWZz5=G9^)J|J2#3XoGSs5Nae2A#1 zD9oQfA8u}LY>Y_Wym=G%@83sKQWAW9eFc4qCMJf|>C>kX78ZsL8#YX9*Wcfdg9i^{ z*REag_V%`koT%hC$E8b`5FQ>bNQ$6PC~)Y|A>`-hTlHx!29KCEwVpnG3YAKQ_3PJ* z3c|y~0|5a6XlZG&iJVP}snu$nKYt#3_Uy4Ze(l;d)YjJW?ng#O;`Z&^w!F%en2=iO z>FG#KO~uZgJ27k4EZ+F&=qM^GDi9bL$QzqCZys7(TWumHSS~2~d-v|4udk2gOJ`>% zjvP6HGiT1g#l^*7N7H-qJn_yW; zNlAg7ogE?~BG|&A+gRVhqH1$=}`G&1APkia^mFJ$e*z zadB9_e7Pu61X`J^R;@yFb2D#@)M{vGV4Va1i^L;FQ$uo32fbd8k&zKmWXwT9ySlns z9NV;M6Dlh!4c9zkN~IEu7A>0A`IaqPuz&x4R99DvCRA5fhpenDHieXpao?AWn`Q>)ch?UIv|x$5d_#>GUj z!oot8 zmsVkNaLPkaoDO-e|u#=*gX6+}zu=;&ar$a-QW@TFqL{I2?(Xg^VJUx% zLCL;#>sIvi^<#7TVO+jmiJ-thl$KrQ=|I){ZvDTATDKP4GrmLql|Qj@<3_ggHAZf3 zuA$8tbC`B_L50wK8}zKV4|{&fhthj7v@u^J^6v{c`h7a`i;9tyk~ZN`Cd26H2psM0 z@%bn52nt+)pC4Q<-)mh=U7t>4Gl$Oa|^!7 z{S|i|eW45g2#`)R;WdBd;qsAmlV=A82H@o6WVo)Ytwr3mhv*7kGogsKA6}Ig@o}Ih zzD@cR8jXg{4DDj*3^56wViW=OEIQpRT(}VXf6T+hei_v3z62zug;zJG=f!GFilBVj zj$T)R<1zz^XG!Z zUW`t41N2vtSZ_U7VZzwXXWfWe?2nla hGi>tzW_}z7@E@U!CSoDGk{18~002ovPDHLkV1mJUW%vL9 literal 0 HcmV?d00001 diff --git a/projects/ucap-webmessenger-app/src/assets/images/img_groupphoto_80.png b/projects/ucap-webmessenger-app/src/assets/images/img_groupphoto_80.png new file mode 100644 index 0000000000000000000000000000000000000000..2f6e938f4b97e5b6539c2ea3273ee5487115a288 GIT binary patch literal 5259 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 RV^aVC002ovPDHLkV1nifE 즐겨찾기 diff --git a/projects/ucap-webmessenger-ui-room/src/lib/components/list-item.component.html b/projects/ucap-webmessenger-ui-room/src/lib/components/list-item.component.html index 35138e62..0d24b2e3 100644 --- a/projects/ucap-webmessenger-ui-room/src/lib/components/list-item.component.html +++ b/projects/ucap-webmessenger-ui-room/src/lib/components/list-item.component.html @@ -1,14 +1,20 @@
- + +
{{ getRoomName(roomInfo) }}
-
- noReadCnt : {{ roomInfo.noReadCnt }} +
+ {{ roomInfo.joinUserCount }}명
{{ finalEventMessage }}
@@ -17,5 +23,15 @@
{{ roomInfo.finalEventDate }}
- 1 + + +
diff --git a/projects/ucap-webmessenger-ui-room/src/lib/components/list-item.component.scss b/projects/ucap-webmessenger-ui-room/src/lib/components/list-item.component.scss index b81e9f22..599f2ff9 100644 --- a/projects/ucap-webmessenger-ui-room/src/lib/components/list-item.component.scss +++ b/projects/ucap-webmessenger-ui-room/src/lib/components/list-item.component.scss @@ -18,7 +18,7 @@ .profile-name { font-size: 16px; - @include ellipsis(1) + @include ellipsis(1); } .profile-last-message { @@ -93,6 +93,7 @@ font-size: 12px; color: $font-mid; margin-top: 4px; + @include ellipsis(1); } } .date { @@ -126,3 +127,9 @@ @include ellipsis(1); @include border-radius(100px); } + +.notiBadge { + position: absolute !important; + right: 22px; + bottom: 22px; +} diff --git a/projects/ucap-webmessenger-ui-room/src/lib/components/list-item.component.ts b/projects/ucap-webmessenger-ui-room/src/lib/components/list-item.component.ts index 409e037a..95e54747 100644 --- a/projects/ucap-webmessenger-ui-room/src/lib/components/list-item.component.ts +++ b/projects/ucap-webmessenger-ui-room/src/lib/components/list-item.component.ts @@ -23,15 +23,17 @@ import { export class ListItemComponent implements OnInit { @Input() loginRes: LoginResponse; - @Input() roomInfo: RoomInfo; @Input() - roomUserInfo: RoomUserInfo[] | UserInfoShort[]; + roomUserInfo: (RoomUserInfo | UserInfoShort)[]; @Input() sessionVerinfo: VersionInfo2Response; + imagePath: string; + defaultPath = 'assets/images/img_nophoto_50.png'; finalEventMessage: string; + RoomType = RoomType; constructor(private logger: NGXLogger) {} @@ -41,6 +43,30 @@ export class ListItemComponent implements OnInit { } else { this.finalEventMessage = this.roomInfo.finalEventMessage; } + + switch (this.roomInfo.roomType) { + case RoomType.Multi: + this.defaultPath = 'assets/images/img_groupphoto_80.png'; + break; + case RoomType.Mytalk: + const me = this.roomUserInfo.filter( + v => v.seq === this.loginRes.userSeq + ); + if (!!me && me.length > 0) { + this.imagePath = me[0].profileImageFile; + } + break; + case RoomType.Single: + case RoomType.Bot: + case RoomType.Allim: + const others = this.roomUserInfo.filter( + v => v.seq !== this.loginRes.userSeq + ); + if (!!others && others.length > 0) { + this.imagePath = others[0].profileImageFile; + } + break; + } } getRoomName(roomInfo: RoomInfo): string { diff --git a/projects/ucap-webmessenger-ui-room/src/lib/ucap-ui-room.module.ts b/projects/ucap-webmessenger-ui-room/src/lib/ucap-ui-room.module.ts index 1a56969f..33a792d5 100644 --- a/projects/ucap-webmessenger-ui-room/src/lib/ucap-ui-room.module.ts +++ b/projects/ucap-webmessenger-ui-room/src/lib/ucap-ui-room.module.ts @@ -8,6 +8,9 @@ import { MatFormFieldModule } from '@angular/material/form-field'; import { MatIconModule } from '@angular/material/icon'; import { MatInputModule } from '@angular/material/input'; import { ListItemComponent } from './components/list-item.component'; +import { MatBadgeModule } from '@angular/material'; + +import { UCapUiModule } from '@ucap-webmessenger/ui'; const COMPONENTS = [ListItemComponent]; const DIRECTIVES = []; @@ -21,7 +24,10 @@ const SERVICES = []; FlexLayoutModule, MatFormFieldModule, MatIconModule, - MatInputModule + MatInputModule, + MatBadgeModule, + + UCapUiModule ], exports: [...COMPONENTS, ...DIRECTIVES], declarations: [...COMPONENTS, ...DIRECTIVES]