developOne / harmonyPool

Go to a project
Toggle navigation Toggle navigation pinning
yangchenggong1_wd
57382d16 1 parent 608530c9

desc：搜索结果展现

Inline Side-by-side
Showing 14 changed files with 307 additions and 15 deletions
@@ -235,6 +235,11 @@ export class HttpUrlUtils { @@ -235,6 +235,11 @@ export class HttpUrlUtils {
235 static readonly SEARCH_RESULT_LIST_DATA_PATH: string = "/api/rmrb-search-api/zh/c/search"; 235 static readonly SEARCH_RESULT_LIST_DATA_PATH: string = "/api/rmrb-search-api/zh/c/search";
236 236
237 /** 237 /**
  238 + * 创作者详情接口
  239 + */
  240 + static readonly CREATOR_DETAIL_LIST_DATA_PATH: string = "/api/rmrb-contact/contact/zh/c/master/detailList";
  241 +
  242 + /**
238 * 早晚报列表 243 * 早晚报列表
239 * 根据页面id获取页面楼层列表 244 * 根据页面id获取页面楼层列表
240 * https://pdapis.pdnews.cn/api/rmrb-bff-display-zh/display/zh/c/pageInfo?pageId=28927 245 * https://pdapis.pdnews.cn/api/rmrb-bff-display-zh/display/zh/c/pageInfo?pageId=28927
@@ -717,6 +722,11 @@ export class HttpUrlUtils { @@ -717,6 +722,11 @@ export class HttpUrlUtils {
717 return url 722 return url
718 } 723 }
719 724
  725 + static getCreatorDetailListDataUrl() {
  726 + let url = HttpUrlUtils._hostUrl + HttpUrlUtils.CREATOR_DETAIL_LIST_DATA_PATH
  727 + return url
  728 + }
  729 +
720 // static getYcgCommonHeaders(): HashMap<string, string> { 730 // static getYcgCommonHeaders(): HashMap<string, string> {
721 // let headers: HashMap<string, string> = new HashMap<string, string>() 731 // let headers: HashMap<string, string> = new HashMap<string, string>()
722 // 732 //
@@ -16,7 +16,7 @@ export default struct MinePageMoreFunctionUI { @@ -16,7 +16,7 @@ export default struct MinePageMoreFunctionUI {
16 .fontColor($r('app.color.color_666666')) 16 .fontColor($r('app.color.color_666666'))
17 .fontSize('29lpx') 17 .fontSize('29lpx')
18 .margin({ left: "31lpx" }) 18 .margin({ left: "31lpx" })
19 - .fontWeight(600) 19 + .fontWeight('600lpx')
20 }.height('92lpx') 20 }.height('92lpx')
21 .width('100%') 21 .width('100%')
22 .justifyContent(FlexAlign.Center) 22 .justifyContent(FlexAlign.Center)
@@ -10,6 +10,8 @@ export default struct MinePagePersonFunctionUI { @@ -10,6 +10,8 @@ export default struct MinePagePersonFunctionUI {
10 loginChange(){ 10 loginChange(){
11 if(this.loginState){ 11 if(this.loginState){
12 this.isLogin=true 12 this.isLogin=true
  13 + }else{
  14 + this.isLogin=false
13 } 15 }
14 } 16 }
15 17
@@ -18,6 +18,8 @@ export default struct MinePageUserSimpleInfoUI { @@ -18,6 +18,8 @@ export default struct MinePageUserSimpleInfoUI {
18 Logger.debug("isLogin",'MinePageUserSimpleInfoUI') 18 Logger.debug("isLogin",'MinePageUserSimpleInfoUI')
19 if(this.loginState){ 19 if(this.loginState){
20 this.isLogin=true 20 this.isLogin=true
  21 + }else {
  22 + this.isLogin=false
21 } 23 }
22 } 24 }
23 loginStateChange(){ 25 loginStateChange(){
  1 +/**
  2 + * 搜索活动 展示组件
  3 + */
  4 +import { ContentDTO } from 'wdBean/Index';
  5 +
  6 +@Component
  7 +export struct ActivityItemComponent {
  8 + @State contentDTO: ContentDTO = {} as ContentDTO;
  9 +
  10 + build() {
  11 + Row() {
  12 + Stack(){
  13 + Image(this.contentDTO.coverUrl)
  14 + .width('207lpx')
  15 + .height('276lpx')
  16 + .objectFit(ImageFit.Auto)
  17 + .borderRadius('7lpx')
  18 +
  19 + Row(){
  20 + Image(this.contentDTO.programType+"" === "1" ? $r('app.media.activity_is_start_icon') :$r('app.media.activity_not_begin_icon'))
  21 + .width('42lpx')
  22 + .height('35lpx')
  23 + .objectFit(ImageFit.Auto)
  24 + .interpolation(ImageInterpolation.Medium)
  25 +
  26 + Text(this.contentDTO.programType+"" === "1" ? "进行中" :"未开始")
  27 + .fontColor($r('app.color.white'))
  28 + .fontSize('21lpx')
  29 + .fontWeight('400lpx')
  30 + .lineHeight('31lpx')
  31 + .textAlign(TextAlign.Center)
  32 + }.margin({right:'19lpx',bottom:'13lpx'})
  33 + }.alignContent(Alignment.BottomEnd)
  34 +
  35 +
  36 + Column() {
  37 +
  38 + Row(){
  39 + // Text(){
  40 + // // backgroundColor 不生效
  41 + // Span(this.contentDTO.objectType == "new_collect" ? "征稿" : this.contentDTO.objectType == "vote" ? "投票":"")
  42 + // .fontColor($r('app.color.main_red'))
  43 + // .fontSize('23lpx')
  44 + // .fontWeight('400lpx')
  45 + // .lineHeight('31lpx')
  46 + // .padding({left:'10lpx',right:'10lpx',top:'6lpx',bottom:'6lpx'})
  47 + // .backgroundColor( "#FF0"/*$r('app.color.color_ED2800')*/)
  48 + // .borderRadius('10lpx')
  49 + // .margin({ right: '10lpx' })
  50 + //
  51 + // Span(this.contentDTO.newsTitle)
  52 + // .fontColor($r('app.color.color_222222'))
  53 + // .fontSize('33lpx')
  54 + // .fontWeight('400lpx')
  55 + // .lineHeight('48lpx')
  56 + // }.textAlign(TextAlign.Start)
  57 + // .maxLines(2)
  58 + // .textOverflow({ overflow: TextOverflow.Ellipsis })
  59 +
  60 + //TODO 这里的样式（objectType） 只写了两个，其他的需要扩展
  61 + Text(this.contentDTO.objectType == "new_collect" ? "征稿" : this.contentDTO.objectType == "vote" ? "投票":"")
  62 + .fontColor($r('app.color.white'))
  63 + .fontSize('23lpx')
  64 + .fontWeight('400lpx')
  65 + .lineHeight('31lpx')
  66 + .textAlign(TextAlign.Center)
  67 + .padding({left:'10lpx',right:'10lpx',top:'6lpx',bottom:'6lpx'})
  68 + .backgroundColor( $r('app.color.color_ED2800'))
  69 + .borderRadius('10lpx')
  70 + .margin({ right: '10lpx' })
  71 +
  72 +
  73 + Text(this.contentDTO.newsTitle)
  74 + .fontColor($r('app.color.color_222222'))
  75 + .fontSize('33lpx')
  76 + .fontWeight('400lpx')
  77 + .lineHeight('48lpx')
  78 + .textAlign(TextAlign.Start)
  79 + .maxLines(2)
  80 + .layoutWeight(1)
  81 + }
  82 + .margin({ bottom: '15lpx' })
  83 + .alignItems(VerticalAlign.Top)
  84 + .width('100%')
  85 +
  86 + Row() {
  87 + Image($r('app.media.time_icon'))
  88 + .width('27lpx')
  89 + .height('27lpx')
  90 + .objectFit(ImageFit.Auto)
  91 + .margin({ right: '4lpx' })
  92 + .interpolation(ImageInterpolation.Medium)
  93 +
  94 + Text("时间：" + this.contentDTO.startTime.split(" ")[0] + "～" + this.contentDTO.endTime.split(" ")[0])
  95 + .fontColor($r('app.color.color_999999'))
  96 + .fontSize('23lpx')
  97 + .fontWeight('400lpx')
  98 + .lineHeight('31lpx')
  99 + }
  100 +
  101 + Blank()
  102 +
  103 + Text(this.contentDTO.programType+"" === "1" ? "立即参与" : "立即查看")
  104 + .fontColor($r('app.color.white'))
  105 + .fontSize('23lpx')
  106 + .fontWeight('500lpx')
  107 + .lineHeight('38lpx')
  108 + .width('154lpx')
  109 + .height('54lpx')
  110 + .textAlign(TextAlign.Center)
  111 + .backgroundColor(this.contentDTO.programType+"" == "1" ? $r('app.color.color_ED2800') : $r('app.color.color_F07E47'))
  112 + .borderRadius('6lpx')
  113 +
  114 + }.alignItems(HorizontalAlign.Start)
  115 + .width('428lpx')
  116 + .height('276lpx')
  117 +
  118 + }.height('330lpx')
  119 + .justifyContent(FlexAlign.SpaceBetween)
  120 + .width('100%')
  121 + .padding({left:'31lpx',right:'31lpx'})
  122 + }
  123 +}
@@ -253,7 +253,8 @@ export struct SearchComponent { @@ -253,7 +253,8 @@ export struct SearchComponent {
253 if(StringUtils.isNotEmpty(this.searchText)){ 253 if(StringUtils.isNotEmpty(this.searchText)){
254 SearcherAboutDataModel.putSearchHistoryData(this.searchText) 254 SearcherAboutDataModel.putSearchHistoryData(this.searchText)
255 this.getSearchHistoryData() 255 this.getSearchHistoryData()
256 - ToastUtils.shortToast("插入一条搜索记录") 256 +
  257 + this.getSearchHotResData(this.searchText)
257 } 258 }
258 }else{ 259 }else{
259 router.back() 260 router.back()
@@ -3,12 +3,14 @@ import { ContentDTO, @@ -3,12 +3,14 @@ import { ContentDTO,
3 FullColumnImgUrlDTO, InteractDataDTO, RmhInfoDTO, VideoInfoDTO } from 'wdBean/Index' 3 FullColumnImgUrlDTO, InteractDataDTO, RmhInfoDTO, VideoInfoDTO } from 'wdBean/Index'
4 import { LiveInfoDTO } from 'wdBean/src/main/ets/bean/detail/LiveInfoDTO' 4 import { LiveInfoDTO } from 'wdBean/src/main/ets/bean/detail/LiveInfoDTO'
5 import { VoiceInfoDTO } from 'wdBean/src/main/ets/bean/detail/VoiceInfoDTO' 5 import { VoiceInfoDTO } from 'wdBean/src/main/ets/bean/detail/VoiceInfoDTO'
6 -import { LazyDataSource, StringUtils } from 'wdKit/Index' 6 +import { LazyDataSource, StringUtils, ToastUtils } from 'wdKit/Index'
7 import SearcherAboutDataModel from '../../model/SearcherAboutDataModel' 7 import SearcherAboutDataModel from '../../model/SearcherAboutDataModel'
  8 +import { CreatorDetailRequestItem } from '../../viewmodel/CreatorDetailRequestItem'
8 import { SearchResultContentData } from '../../viewmodel/SearchResultContentData' 9 import { SearchResultContentData } from '../../viewmodel/SearchResultContentData'
9 import { SearchRmhDescription } from '../../viewmodel/SearchResultContentItem' 10 import { SearchRmhDescription } from '../../viewmodel/SearchResultContentItem'
10 import { CardParser } from '../CardParser' 11 import { CardParser } from '../CardParser'
11 import { ListHasNoMoreDataUI } from '../reusable/ListHasNoMoreDataUI' 12 import { ListHasNoMoreDataUI } from '../reusable/ListHasNoMoreDataUI'
  13 +import { ActivityItemComponent } from './ActivityItemComponent'
12 14
13 const TAG = "SearchResultContentComponent" 15 const TAG = "SearchResultContentComponent"
14 16
@@ -20,6 +22,7 @@ export struct SearchResultContentComponent{ @@ -20,6 +22,7 @@ export struct SearchResultContentComponent{
20 @State data_rmh: SearchRmhDescription[] = [] 22 @State data_rmh: SearchRmhDescription[] = []
21 @State count:number = 0; 23 @State count:number = 0;
22 @State isLoading:boolean = false 24 @State isLoading:boolean = false
  25 + @State isLoading2:boolean = false
23 @State hasMore:boolean = true 26 @State hasMore:boolean = true
24 curPageNum:number = 1; 27 curPageNum:number = 1;
25 28
@@ -52,7 +55,25 @@ export struct SearchResultContentComponent{ @@ -52,7 +55,25 @@ export struct SearchResultContentComponent{
52 if(value.list[0].dataList!=null){ 55 if(value.list[0].dataList!=null){
53 this.data_rmh = value.list[0].dataList 56 this.data_rmh = value.list[0].dataList
54 //TODO 查询创作者详情接口 57 //TODO 查询创作者详情接口
  58 + let request = new CreatorDetailRequestItem()
55 59
  60 + this.data_rmh .forEach((data)=>{
  61 + request.creatorIdList.push(data.creatorId)
  62 + })
  63 +
  64 + SearcherAboutDataModel.getCreatorDetailListData(request).then((value)=>{
  65 + if(value!=null && value.length>0){
  66 + this.data_rmh.forEach((data)=>{
  67 + value.forEach((item)=>{
  68 + if(data.creatorId == item.creatorId){
  69 + data.headerPhotoUrl = item.headPhotoUrl
  70 + }
  71 + })
  72 + })
  73 + }
  74 + }).catch((err:Error)=>{
  75 + console.log(TAG,JSON.stringify(err))
  76 + })
56 } 77 }
57 this.getInteractData(value) 78 this.getInteractData(value)
58 } 79 }
@@ -105,7 +126,7 @@ export struct SearchResultContentComponent{ @@ -105,7 +126,7 @@ export struct SearchResultContentComponent{
105 cityCode: value.data.cityCode, 126 cityCode: value.data.cityCode,
106 coverSize: "", 127 coverSize: "",
107 coverType: -1, 128 coverType: -1,
108 - coverUrl: value.data.appStyleImages.split("&&")[0], 129 + coverUrl: this.searchType=="activity"?value.data.zhChannelPageImg:value.data.appStyleImages.split("&&")[0],
109 description: value.data.description, 130 description: value.data.description,
110 districtCode: value.data.districtCode, 131 districtCode: value.data.districtCode,
111 endTime: value.data.endTime, 132 endTime: value.data.endTime,
@@ -122,7 +143,7 @@ export struct SearchResultContentComponent{ @@ -122,7 +143,7 @@ export struct SearchResultContentComponent{
122 programId: "", 143 programId: "",
123 programName: "", 144 programName: "",
124 programSource: -1, 145 programSource: -1,
125 - programType: -1, 146 + programType: Number.parseInt(value.data.status),
126 provinceCode: value.data.provinceCode, 147 provinceCode: value.data.provinceCode,
127 showTitleEd: value.data.showTitleEd, 148 showTitleEd: value.data.showTitleEd,
128 showTitleIng: value.data.showTitleIng, 149 showTitleIng: value.data.showTitleIng,
@@ -186,42 +207,76 @@ export struct SearchResultContentComponent{ @@ -186,42 +207,76 @@ export struct SearchResultContentComponent{
186 Column(){ 207 Column(){
187 if (this.data_rmh!=null && this.data_rmh.length > 0) { 208 if (this.data_rmh!=null && this.data_rmh.length > 0) {
188 //List 209 //List
189 - List() { 210 + List({space:'8lpx'}) {
190 ForEach(this.data_rmh, (item: SearchRmhDescription, index: number) => { 211 ForEach(this.data_rmh, (item: SearchRmhDescription, index: number) => {
191 ListItem() { 212 ListItem() {
192 Column(){ 213 Column(){
193 - Image($r('app.media.default_head'))  
194 - .width('84lpx')  
195 - .height('84lpx') 214 + Image(item.headerPhotoUrl)
  215 + .width('92lpx')
  216 + .alt($r('app.media.default_head'))
  217 + .height('92lpx')
196 .margin({bottom:'15lpx'}) 218 .margin({bottom:'15lpx'})
  219 + .borderRadius(50)
197 Text(item.creatorName) 220 Text(item.creatorName)
198 - .fontSize('20lpx') 221 + .fontSize('25lpx')
  222 + .fontWeight('400lpx')
  223 + .lineHeight('35lpx')
  224 + .constraintSize({maxWidth:'150lpx'})
  225 + .maxLines(1)
  226 + .textOverflow({ overflow: TextOverflow.Ellipsis })
199 }.alignItems(HorizontalAlign.Center) 227 }.alignItems(HorizontalAlign.Center)
  228 + .justifyContent(FlexAlign.Center)
200 229
201 }.onClick(()=>{ 230 }.onClick(()=>{
202 //TODO 跳转 231 //TODO 跳转
203 }) 232 })
204 .width('150lpx') 233 .width('150lpx')
  234 + .height('100%')
205 }) 235 })
  236 +
  237 + ListItem(){
  238 + Text("查看更多")
  239 + .height('180lpx')
  240 + .textAlign(TextAlign.Center)
  241 + .width('77lpx')
  242 + .backgroundColor($r('app.color.color_EDEDED'))
  243 + .fontColor($r('app.color.color_9E9E9E'))
  244 + .borderRadius({topLeft:'4lpx',bottomLeft:'4lpx'})
  245 + }.height('100%')
  246 + .margin({left:'23lpx'})
  247 +
206 } 248 }
207 .cachedCount(6) 249 .cachedCount(6)
208 - .edgeEffect(EdgeEffect.None) 250 + .edgeEffect(EdgeEffect.Spring)
209 .scrollBar(BarState.Off) 251 .scrollBar(BarState.Off)
210 .listDirection(Axis.Horizontal) 252 .listDirection(Axis.Horizontal)
211 .width('100%') 253 .width('100%')
212 - .height('150lpx') 254 + .height('219lpx')
213 .onReachEnd(()=>{ 255 .onReachEnd(()=>{
214 - if(!this.isLoading){ 256 + if(!this.isLoading2){
  257 + this.isLoading2 = true
215 //进入更多关注页 258 //进入更多关注页
  259 + ToastUtils.shortToast("进入更多关注页")
  260 +
216 } 261 }
217 }) 262 })
  263 +
  264 + Divider()
  265 + .width('100%')
  266 + .height('12lpx')
  267 + .color($r('app.color.color_F5F5F5'))
  268 + .strokeWidth('12lpx')
218 } 269 }
219 //List 270 //List
220 List({ space: '6lpx' }) { 271 List({ space: '6lpx' }) {
221 LazyForEach(this.data, (item: ContentDTO, index: number) => { 272 LazyForEach(this.data, (item: ContentDTO, index: number) => {
222 ListItem() { 273 ListItem() {
223 Column(){ 274 Column(){
224 - CardParser({contentDTO:item}) 275 + if(this.searchType == "activity"){
  276 + ActivityItemComponent({contentDTO:item})
  277 + }else{
  278 + CardParser({contentDTO:item})
  279 + }
225 if(index != this.data.totalCount()-1 ){ 280 if(index != this.data.totalCount()-1 ){
226 Divider() 281 Divider()
227 .width('100%') 282 .width('100%')
@@ -245,7 +300,6 @@ export struct SearchResultContentComponent{ @@ -245,7 +300,6 @@ export struct SearchResultContentComponent{
245 }.cachedCount(6) 300 }.cachedCount(6)
246 .edgeEffect(EdgeEffect.None) 301 .edgeEffect(EdgeEffect.None)
247 .scrollBar(BarState.Off) 302 .scrollBar(BarState.Off)
248 - .margin({top:'23lpx',left:'23lpx',right:'23lpx'})  
249 .layoutWeight(1) 303 .layoutWeight(1)
250 .onReachEnd(()=>{ 304 .onReachEnd(()=>{
251 console.log(TAG,"触底了"); 305 console.log(TAG,"触底了");
@@ -7,6 +7,8 @@ import { SearchHotContentItem } from '../viewmodel/SearchHotContentItem'; @@ -7,6 +7,8 @@ import { SearchHotContentItem } from '../viewmodel/SearchHotContentItem';
7 import { SearchResultCountItem } from '../viewmodel/SearchResultCountItem'; 7 import { SearchResultCountItem } from '../viewmodel/SearchResultCountItem';
8 import { SearchResultContentData } from '../viewmodel/SearchResultContentData'; 8 import { SearchResultContentData } from '../viewmodel/SearchResultContentData';
9 import { contentListParams, InteractDataDTO } from 'wdBean/Index'; 9 import { contentListParams, InteractDataDTO } from 'wdBean/Index';
  10 +import { CreatorDetailRequestItem } from '../viewmodel/CreatorDetailRequestItem';
  11 +import { CreatorDetailResponseItem } from '../viewmodel/CreatorDetailResponseItem';
10 12
11 const TAG = "SearcherAboutDataModel" 13 const TAG = "SearcherAboutDataModel"
12 14
@@ -320,6 +322,37 @@ class SearcherAboutDataModel{ @@ -320,6 +322,37 @@ class SearcherAboutDataModel{
320 } 322 }
321 323
322 324
  325 + /**
  326 + * 获取关注详情 列表
  327 + */
  328 + getCreatorDetailListData(object:CreatorDetailRequestItem): Promise<CreatorDetailResponseItem[]> {
  329 + return new Promise<CreatorDetailResponseItem[]>((success, error) => {
  330 + Logger.info(TAG, `getCreatorDetailListData start`);
  331 + this.fetchCreatorDetailListData(object).then((navResDTO: ResponseDTO<CreatorDetailResponseItem[]>) => {
  332 + if (!navResDTO || navResDTO.code != 0) {
  333 + success([])
  334 + return
  335 + }
  336 + Logger.info(TAG, "getCreatorDetailListData then,SearchResultListResDTO.timeStamp:" + navResDTO.timestamp);
  337 + let navigationBean = navResDTO.data as CreatorDetailResponseItem[]
  338 + success(navigationBean);
  339 + }).catch((err: Error) => {
  340 + Logger.error(TAG, `getCreatorDetailListData catch, error.name : ${err.name}, error.message:${err.message}`);
  341 + success([])
  342 + })
  343 + })
  344 + }
  345 +
  346 + fetchCreatorDetailListData(object:CreatorDetailRequestItem) {
  347 + let url = HttpUrlUtils.getCreatorDetailListDataUrl()
  348 + let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
  349 + return WDHttp.post<ResponseDTO<CreatorDetailResponseItem[]>>(url,object, headers)
  350 + };
  351 +
  352 +
  353 +
  354 +
  355 +
323 } 356 }
324 357
325 const searcherAboutDataModel = SearcherAboutDataModel.getInstance() 358 const searcherAboutDataModel = SearcherAboutDataModel.getInstance()
  1 +export class CreatorDetailRequestItem{
  2 + creatorIdList:string[] = []
  3 +}
  1 +export class CreatorDetailResponseItem{
  2 + articleCreation: number = 0
  3 + attentionNum: number = 0
  4 + authIcon: string = ""
  5 + authId: number = 0
  6 + authPersonal: string = ""
  7 + authTitle: string = ""
  8 + banControl: number = 0
  9 + categoryAuth: string = ""
  10 + city: string = ""
  11 + cnContentPublish: number = 0
  12 + cnIsComment: number = 0
  13 + cnIsLike: number = 0
  14 + cnLiveCommentControl: number = 0
  15 + cnLiveGiftControl: number = 0
  16 + cnLiveLikeControl: number = 0
  17 + cnLivePublish: number = 0
  18 + cnLiveShareControl: number = 0
  19 + cnShareControl: number = 0
  20 + collectNum: number = 0
  21 + commentNum: number = 0
  22 + contentPublish: number = 0
  23 + creatorId: string = ""
  24 + district: string = ""
  25 + dynamicControl: number = 0
  26 + dynamicCreation: number = 0
  27 + fansNum: number = 0
  28 + headPhotoUrl: string = ""
  29 + honoraryIcon: string = ""
  30 + honoraryTitle: string = ""
  31 + introduction: string = ""
  32 + isAttention: number = 0
  33 + isComment: number = 0
  34 + isLike: number = 0
  35 + likeNum: number = 0
  36 + liveCommentControl: number = 0
  37 + liveGiftControl: number = 0
  38 + liveLikeControl: number = 0
  39 + livePublish: number = 0
  40 + liveShareControl: number = 0
  41 + liveSwitch: number = 0
  42 + mainControl: number = 0
  43 + pictureCollectionCreation: number = 0
  44 + posterShareControl: number = 0
  45 + province: string = ""
  46 + region: string = ""
  47 + registTime: number = 0
  48 + shareControl: number = 0
  49 + shareNum: number = 0
  50 + subjectType: number = 0
  51 + userId: string = ""
  52 + userName: string = ""
  53 + userType: string = ""
  54 + videoCollectionCreation: number = 0
  55 + videoCreation: number = 0
  56 +}
@@ -139,6 +139,14 @@ @@ -139,6 +139,14 @@
139 { 139 {
140 "name": "color_000000", 140 "name": "color_000000",
141 "value": "#000000" 141 "value": "#000000"
  142 + },
  143 + {
  144 + "name": "color_F07E47",
  145 + "value": "#F07E47"
  146 + },
  147 + {
  148 + "name": "color_9E9E9E",
  149 + "value": "#9E9E9E"
142 } 150 }
143 ] 151 ]
144 } 152 }