developOne / harmonyPool

Go to a project
Toggle navigation Toggle navigation pinning
王士厅
662c5290 2 parents 9dac9e28 c41fedff

Merge branch 'main' of http://192.168.1.42/developOne/harmonyPool

Inline Side-by-side
Showing 14 changed files with 116 additions and 51 deletions
@@ -352,7 +352,6 @@ export struct DynamicDetailComponent { @@ -352,7 +352,6 @@ export struct DynamicDetailComponent {
352 } 352 }
353 .width(48) 353 .width(48)
354 .padding({ bottom: 9 }) 354 .padding({ bottom: 9 })
355 -  
356 } 355 }
357 356
358 } 357 }
@@ -380,6 +379,7 @@ export struct DynamicDetailComponent { @@ -380,6 +379,7 @@ export struct DynamicDetailComponent {
380 GridCol({ 379 GridCol({
381 span: this.onePicW > this.onePicH ? 12 : 8 380 span: this.onePicW > this.onePicH ? 12 : 8
382 }) { 381 }) {
  382 + Stack({alignContent: Alignment.BottomEnd}) {
383 Image(item.picPath) 383 Image(item.picPath)
384 .backgroundColor(0xf5f5f5) 384 .backgroundColor(0xf5f5f5)
385 .width('100%') 385 .width('100%')
@@ -396,23 +396,6 @@ export struct DynamicDetailComponent { @@ -396,23 +396,6 @@ export struct DynamicDetailComponent {
396 this.onePicW = event?.width || 0; 396 this.onePicW = event?.width || 0;
397 this.onePicH = event?.height || 0; 397 this.onePicH = event?.height || 0;
398 }) 398 })
399 - }  
400 - .onClick(async (event: ClickEvent) => {  
401 - let retvalue = await FastClickUtil.isMinDelayTime()  
402 - if(retvalue){  
403 - return  
404 - }  
405 - ProcessUtils.gotoMultiPictureListPage(this.contentDetailData.photoList, index)  
406 - })  
407 - }  
408 - } else if (this.contentDetailData.photoList.length === 4) {  
409 - GridCol({  
410 - span: { xs: 4 }  
411 - }) {  
412 - Stack({alignContent: Alignment.BottomEnd}) {  
413 - Image(item.picPath)  
414 - .aspectRatio(1)  
415 - .borderRadius(this.caclImageRadius(index))  
416 if(this.getPicType(item) !== 3){ 399 if(this.getPicType(item) !== 3){
417 Flex({ direction: FlexDirection.Row }) { 400 Flex({ direction: FlexDirection.Row }) {
418 Image($r('app.media.icon_long_pic')) 401 Image($r('app.media.icon_long_pic'))
@@ -444,7 +427,49 @@ export struct DynamicDetailComponent { @@ -444,7 +427,49 @@ export struct DynamicDetailComponent {
444 } 427 }
445 ProcessUtils.gotoMultiPictureListPage(this.contentDetailData.photoList, index) 428 ProcessUtils.gotoMultiPictureListPage(this.contentDetailData.photoList, index)
446 }) 429 })
447 - } else { 430 + }
  431 + }
  432 + // else if (this.contentDetailData.photoList.length === 4) {
  433 + // GridCol({
  434 + // span: { xs: 4 }
  435 + // }) {
  436 + // Stack({alignContent: Alignment.BottomEnd}) {
  437 + // Image(item.picPath)
  438 + // .aspectRatio(1)
  439 + // .borderRadius(this.caclImageRadius(index))
  440 + // if(this.getPicType(item) !== 3){
  441 + // Flex({ direction: FlexDirection.Row }) {
  442 + // Image($r('app.media.icon_long_pic'))
  443 + // .width(12)
  444 + // .height(12)
  445 + // .margin({ right: 4 })
  446 + // Text('长图')
  447 + // .fontSize(10)
  448 + // .fontWeight(400)
  449 + // .textShadow({
  450 + // radius: 1,
  451 + // color: `rgba(0,0,0,0.5)`,
  452 + // offsetY:1,
  453 + // offsetX:1
  454 + // })
  455 + // .fontColor(0xffffff)
  456 + // .fontFamily('PingFang SC')
  457 + // }
  458 + // .width(48)
  459 + // .align(Alignment.BottomEnd)
  460 + // .padding({ bottom: 3 })
  461 + // }
  462 + // }
  463 + // }
  464 + // .onClick(async (event: ClickEvent) => {
  465 + // let retvalue = await FastClickUtil.isMinDelayTime()
  466 + // if(retvalue){
  467 + // return
  468 + // }
  469 + // ProcessUtils.gotoMultiPictureListPage(this.contentDetailData.photoList, index)
  470 + // })
  471 + // }
  472 + else {
448 GridCol({ 473 GridCol({
449 span: { sm: 4, lg: 3 } 474 span: { sm: 4, lg: 3 }
450 }) { 475 }) {
@@ -284,7 +284,7 @@ export struct ImageAndTextPageComponent { @@ -284,7 +284,7 @@ export struct ImageAndTextPageComponent {
284 .justifyContent(FlexAlign.SpaceBetween) 284 .justifyContent(FlexAlign.SpaceBetween)
285 .alignItems(VerticalAlign.Bottom) 285 .alignItems(VerticalAlign.Bottom)
286 286
287 - if (this.isNetConnected && !this.detailContentEmpty) { 287 + // if (this.isNetConnected && !this.detailContentEmpty) {
288 Row() { 288 Row() {
289 Image($r('app.media.ic_news_detail_division')) 289 Image($r('app.media.ic_news_detail_division'))
290 .width('100%') 290 .width('100%')
@@ -294,7 +294,7 @@ export struct ImageAndTextPageComponent { @@ -294,7 +294,7 @@ export struct ImageAndTextPageComponent {
294 } 294 }
295 .padding({ left: 15, right: 15 }) 295 .padding({ left: 15, right: 15 })
296 .backgroundColor(Color.White) 296 .backgroundColor(Color.White)
297 - } 297 + // }
298 }.backgroundColor(Color.White) 298 }.backgroundColor(Color.White)
299 } 299 }
300 .margin({top: `${this.topSafeHeight}px`, bottom: `${this.bottomSafeHeight}px`}) 300 .margin({top: `${this.topSafeHeight}px`, bottom: `${this.bottomSafeHeight}px`})
@@ -147,7 +147,7 @@ export struct AppointmentListChildComponent { @@ -147,7 +147,7 @@ export struct AppointmentListChildComponent {
147 } 147 }
148 } 148 }
149 .height(24) 149 .height(24)
150 - .width(82) 150 + .width(this.item.status == "wait"?150:82)
151 .padding({ left: 10, right: 10}) 151 .padding({ left: 10, right: 10})
152 .alignItems(VerticalAlign.Center) 152 .alignItems(VerticalAlign.Center)
153 .backgroundColor($r('app.color.color_F5F5F5')) 153 .backgroundColor($r('app.color.color_F5F5F5'))
@@ -50,7 +50,7 @@ export struct FollowThirdTabsComponent{ @@ -50,7 +50,7 @@ export struct FollowThirdTabsComponent{
50 .fontColor(this.currentIndex === index ? this.selectedFontColor : this.fontColor) 50 .fontColor(this.currentIndex === index ? this.selectedFontColor : this.fontColor)
51 .lineHeight(18) 51 .lineHeight(18)
52 .backgroundImage($r('app.media.ic_collect_mid')) 52 .backgroundImage($r('app.media.ic_collect_mid'))
53 - .backgroundImageSize(ImageSize.Cover) 53 + .backgroundImageSize(ImageSize.FILL)
54 .padding({top:7,bottom:7}) 54 .padding({top:7,bottom:7})
55 55
56 Image(index === 0?$r("app.media.ic_collect_left_right"):(index === this.data[this.firstIndex].children[this.secondIndex].children.length-1?$r('app.media.ic_collect_right_right'):$r('app.media.ic_collect_mid_right'))) 56 Image(index === 0?$r("app.media.ic_collect_left_right"):(index === this.data[this.firstIndex].children[this.secondIndex].children.length-1?$r('app.media.ic_collect_right_right'):$r('app.media.ic_collect_mid_right')))
1 -import { LazyDataSource, NetworkUtil, StringUtils, ToastUtils } from 'wdKit/Index'; 1 +import { DateTimeUtils, LazyDataSource, NetworkUtil, StringUtils, ToastUtils } from 'wdKit/Index';
2 import { Remark, SubscribeMessageModel, 2 import { Remark, SubscribeMessageModel,
3 WDMessageCenterMessageType } from '../../../../model/InteractMessageModel'; 3 WDMessageCenterMessageType } from '../../../../model/InteractMessageModel';
4 import MinePageDatasModel from '../../../../model/MinePageDatasModel'; 4 import MinePageDatasModel from '../../../../model/MinePageDatasModel';
@@ -150,10 +150,11 @@ export struct SubscribeMessageComponent{ @@ -150,10 +150,11 @@ export struct SubscribeMessageComponent{
150 this.hasMore = false 150 this.hasMore = false
151 } else { 151 } else {
152 value.list.forEach((value) => { 152 value.list.forEach((value) => {
153 - let dealTime = this.DealStartTime(value.time,1)  
154 - let dealTime2 = this.DealStartTime(value.time,2)  
155 -  
156 let remark = JSON.parse(value.remark) as Remark 153 let remark = JSON.parse(value.remark) as Remark
  154 + let liveTime = DateTimeUtils.formatDate(Number(remark.planStartTimeLong),'yyyy-MM-dd HH:mm:ss')
  155 +
  156 + let dealTime = this.DealStartTime(liveTime,1)
  157 + let dealTime2 = this.DealStartTime(liveTime,2)
157 158
158 let bean = new SubscribeMessageModel(dealTime,value.message,remark.coverImageUrl,value.title,dealTime2,value.contentId) 159 let bean = new SubscribeMessageModel(dealTime,value.message,remark.coverImageUrl,value.title,dealTime2,value.contentId)
159 bean.relId = remark.relationId 160 bean.relId = remark.relationId
@@ -16,7 +16,7 @@ struct EditUserIntroductionPage { @@ -16,7 +16,7 @@ struct EditUserIntroductionPage {
16 CustomTitleUI({titleName:'修改简介'}) 16 CustomTitleUI({titleName:'修改简介'})
17 17
18 Row(){ 18 Row(){
19 - TextInput({placeholder:'请输入简介',text:this.params.editContent}) 19 + TextArea({placeholder:'请输入简介',text:this.params.editContent})
20 .maxLength(60) 20 .maxLength(60)
21 .width('100%') 21 .width('100%')
22 .height(80) 22 .height(80)
@@ -318,13 +318,13 @@ export struct PeopleShipHomePageTopComponent { @@ -318,13 +318,13 @@ export struct PeopleShipHomePageTopComponent {
318 this.content = this.subTxt 318 this.content = this.subTxt
319 } 319 }
320 } 320 }
321 - // if (this.detailModel) { 321 + if (this.detailModel) {
322 // this.topFixedHeight = 160 322 // this.topFixedHeight = 160
323 - // if (this.detailModel.region && this.detailModel.region.length > 0) {  
324 - // this.provinceName = this.detailModel.region  
325 - // } else {  
326 - // this.provinceName = await this.computeIPRegion(this.detailModel.province)  
327 - // } 323 + if (this.detailModel.region && this.detailModel.region.length > 0) {
  324 + this.provinceName = this.detailModel.region
  325 + } else {
  326 + this.provinceName = await this.computeIPRegion(this.detailModel.province)
  327 + }
328 // if (this.detailModel.authId == 1 && this.detailModel.categoryAuth.length > 0) { 328 // if (this.detailModel.authId == 1 && this.detailModel.categoryAuth.length > 0) {
329 // this.topFixedHeight += this.getTextLineNum(this.detailModel.categoryAuth, DisplayUtils.getDeviceWidth() - 90, 22, $r('app.float.vp_12')) * 18 329 // this.topFixedHeight += this.getTextLineNum(this.detailModel.categoryAuth, DisplayUtils.getDeviceWidth() - 90, 22, $r('app.float.vp_12')) * 18
330 // this.topFixedHeight += 12 330 // this.topFixedHeight += 12
@@ -362,7 +362,7 @@ export struct PeopleShipHomePageTopComponent { @@ -362,7 +362,7 @@ export struct PeopleShipHomePageTopComponent {
362 // } 362 // }
363 // 363 //
364 // this.topHeight = this.topFixedHeight 364 // this.topHeight = this.topFixedHeight
365 - // } 365 + }
366 } 366 }
367 367
368 private computeShowNum(count: number) { 368 private computeShowNum(count: number) {
@@ -107,6 +107,7 @@ export class SubscribeMessageModel{ @@ -107,6 +107,7 @@ export class SubscribeMessageModel{
107 export class Remark{ 107 export class Remark{
108 relationType:string = "" 108 relationType:string = ""
109 coverImageUrl:string = "" 109 coverImageUrl:string = ""
  110 + planStartTimeLong:string = ""
110 relationId:string = "" 111 relationId:string = ""
111 status:string = "" 112 status:string = ""
112 userName:string = "" 113 userName:string = ""
@@ -154,7 +154,7 @@ struct MineHomePage { @@ -154,7 +154,7 @@ struct MineHomePage {
154 154
155 Row() { 155 Row() {
156 Row() { 156 Row() {
157 - Text(`${this.browseNum}`) 157 + Text(this.handlerNum(this.browseNum.toString()))
158 .textStyle() 158 .textStyle()
159 Text("阅读") 159 Text("阅读")
160 .textStyle2() 160 .textStyle2()
@@ -168,7 +168,7 @@ struct MineHomePage { @@ -168,7 +168,7 @@ struct MineHomePage {
168 .vertical(true) 168 .vertical(true)
169 .opacity(0.4) 169 .opacity(0.4)
170 Row() { 170 Row() {
171 - Text(`${this.commentNum}`) 171 + Text(this.handlerNum(this.commentNum.toString()))
172 .textStyle() 172 .textStyle()
173 Text("评论") 173 Text("评论")
174 .textStyle2() 174 .textStyle2()
@@ -182,7 +182,7 @@ struct MineHomePage { @@ -182,7 +182,7 @@ struct MineHomePage {
182 .vertical(true) 182 .vertical(true)
183 .opacity(0.4) 183 .opacity(0.4)
184 Row() { 184 Row() {
185 - Text(`${this.attentionNum}`) 185 + Text(this.handlerNum(this.attentionNum.toString()))
186 .textStyle() 186 .textStyle()
187 Text("关注") 187 Text("关注")
188 .textStyle2() 188 .textStyle2()
@@ -401,7 +401,8 @@ struct MineHomePage { @@ -401,7 +401,8 @@ struct MineHomePage {
401 }) 401 })
402 .margin({ left: 10 }) 402 .margin({ left: 10 })
403 .onClick(() => { 403 .onClick(() => {
404 - router.back() 404 + let params = {'headPhotoUrl': this.headPhotoUrl} as Record<string, string>;
  405 + WDRouterRule.jumpWithPage(WDRouterPage.showUserHeaderPage,params)
405 }) 406 })
406 407
407 Text(`${this.userName}`) 408 Text(`${this.userName}`)
@@ -518,6 +519,24 @@ struct MineHomePage { @@ -518,6 +519,24 @@ struct MineHomePage {
518 console.log(TAG,JSON.stringify(err)) 519 console.log(TAG,JSON.stringify(err))
519 }) 520 })
520 } 521 }
  522 +
  523 + handlerNum(number: string) {
  524 + const num = number??'0';
  525 + if (Number.parseInt(num) <= 9999) {
  526 + return Number.parseInt(num).toString()
  527 + } else if (Number.parseInt(num) > 9999 && Number.parseInt(num) <= 99999999) {
  528 + const num1: string = num.slice(0, -4); // 万
  529 + const num2: string = num.slice(-4, -3); // 千
  530 + return num2 === '0' ? num1 +'万' : num1 + '.' + num2 + '万'
  531 + } else if (Number.parseInt(num) > 99999999) {
  532 + const num1: string = num.slice(0, -8); // 亿
  533 + const num2: string = num.slice(-8, -7);
  534 + return num2 === '0' ? num1 +'亿' : num1 + '.' + num2 + '亿'
  535 + }
  536 + return num
  537 + }
  538 +
  539 +
521 getUserLevel(){ 540 getUserLevel(){
522 MinePageDatasModel.getUserLevelData(getContext(this)).then((value)=>{ 541 MinePageDatasModel.getUserLevelData(getContext(this)).then((value)=>{
523 if(value!=null){ 542 if(value!=null){
@@ -258,7 +258,7 @@ export struct PlayUIComponent { @@ -258,7 +258,7 @@ export struct PlayUIComponent {
258 .fontWeight(400) 258 .fontWeight(400)
259 .fontColor(Color.White) 259 .fontColor(Color.White)
260 260
261 - if (this.liveRoomDataBean.pv > 0) { 261 + if (this.liveRoomDataBean.pv > 0 && !StringUtils.isEmpty(this.liveUrl)) {
262 Image($r('app.media.icon_live_player_status_end')) 262 Image($r('app.media.icon_live_player_status_end'))
263 .width(12) 263 .width(12)
264 .height(12) 264 .height(12)
@@ -91,6 +91,19 @@ export struct PlayerEndView { @@ -91,6 +91,19 @@ export struct PlayerEndView {
91 .padding({ bottom: 40, top: 120 }) 91 .padding({ bottom: 40, top: 120 })
92 92
93 Stack() { 93 Stack() {
  94 + if (this.contentDetailData.rmhInfo != null) {
  95 + Row() {
  96 + Image($r("app.media.live_end_BG_l"))
  97 + .width(307/2.0)
  98 + .height(254)
  99 + Image($r("app.media.live_end_BG_r"))
  100 + .width(307/2.0)
  101 + .height(254)
  102 + }
  103 + // .width(307)
  104 + // .height(254)
  105 + // .backgroundColor(Color.Red)
  106 + }
94 Column() { 107 Column() {
95 if (this.contentDetailData.rmhInfo != null) { 108 if (this.contentDetailData.rmhInfo != null) {
96 Text(this.contentDetailData?.rmhInfo?.rmhName) 109 Text(this.contentDetailData?.rmhInfo?.rmhName)
@@ -104,22 +117,26 @@ export struct PlayerEndView { @@ -104,22 +117,26 @@ export struct PlayerEndView {
104 .fontColor('#B2FFFFFF') 117 .fontColor('#B2FFFFFF')
105 .padding({ top: 8 }) 118 .padding({ top: 8 })
106 } 119 }
  120 +
  121 + Stack() {
107 Row() { 122 Row() {
108 Column() { 123 Column() {
109 - Text(this.duration).fontWeight(600).fontSize(24).fontColor(Color.White)  
110 - Text('直播时长').fontWeight(400).fontSize(13).fontColor(Color.White) 124 + Text(this.duration).fontWeight(600).fontSize(20).fontColor(Color.White)
  125 + Text('直播时长').fontWeight(400).fontSize(12).fontColor(Color.White)
111 } 126 }
112 127
113 - Text('').width(1).height(32).margin({ left: 36, right: 36 }).backgroundColor('#33FFFFFF') 128 + Blank().width(1).height(32).margin({ left: 36, right: 36 })
114 Column() { 129 Column() {
115 Text(NumberFormatterUtils.formatNumberWithWan(this.liveRoomDataBean?.pv || '')) 130 Text(NumberFormatterUtils.formatNumberWithWan(this.liveRoomDataBean?.pv || ''))
116 .fontWeight(600) 131 .fontWeight(600)
117 - .fontSize(24) 132 + .fontSize(20)
118 .fontColor(Color.White) 133 .fontColor(Color.White)
119 - Text('观看人数').fontWeight(400).fontSize(13).fontColor(Color.White) 134 + Text('观看人数').fontWeight(400).fontSize(12).fontColor(Color.White)
120 } 135 }
121 } 136 }
122 .padding({ top: this.contentDetailData.rmhInfo == null ? 26 : 16 }) 137 .padding({ top: this.contentDetailData.rmhInfo == null ? 26 : 16 })
  138 + Text('').width(1).height(32).margin({ left: 36, right: 36,top:this.contentDetailData.rmhInfo == null ? 26 : 16 }).backgroundColor('#33FFFFFF')
  139 + }
123 if (this.contentDetailData.rmhInfo != null) { 140 if (this.contentDetailData.rmhInfo != null) {
124 Row() { 141 Row() {
125 Text(this.followStatus == '0' ? '关注' : '已关注') 142 Text(this.followStatus == '0' ? '关注' : '已关注')
@@ -132,7 +149,7 @@ export struct PlayerEndView { @@ -132,7 +149,7 @@ export struct PlayerEndView {
132 left: 122, 149 left: 122,
133 right: 122 150 right: 122
134 }) 151 })
135 - .backgroundColor(this.followStatus == '0' ? '#FFED2800' : Color.Grey) 152 + .backgroundColor(this.followStatus == '0' ? '#FFED2800' : '#CCCCCC')
136 .borderRadius(4) 153 .borderRadius(4)
137 .onClick(() => { 154 .onClick(() => {
138 this.handleAccention() 155 this.handleAccention()
@@ -143,16 +160,16 @@ export struct PlayerEndView { @@ -143,16 +160,16 @@ export struct PlayerEndView {
143 } 160 }
144 .width(307) 161 .width(307)
145 .height(this.contentDetailData.rmhInfo == null ? 100 : 254) 162 .height(this.contentDetailData.rmhInfo == null ? 100 : 254)
146 - .backgroundColor('#999999') 163 + .backgroundColor(this.contentDetailData.rmhInfo == null ? '#12ffffff' : '')
147 .borderRadius(4) 164 .borderRadius(4)
148 if (this.contentDetailData.rmhInfo != null) { 165 if (this.contentDetailData.rmhInfo != null) {
149 Image(this.contentDetailData.rmhInfo?.rmhHeadUrl) 166 Image(this.contentDetailData.rmhInfo?.rmhHeadUrl)
150 .width(80) 167 .width(80)
151 .height(80) 168 .height(80)
152 .borderRadius(40) 169 .borderRadius(40)
153 - .borderWidth(1)  
154 - .borderColor(Color.White)  
155 - .borderStyle(BorderStyle.Solid) 170 + // .borderWidth(1)
  171 + // .borderColor(Color.White)
  172 + // .borderStyle(BorderStyle.Solid)
156 .position({ x: '50%', y: 0 }) 173 .position({ x: '50%', y: 0 })
157 .markAnchor({ x: '50%', y: '50%' }) 174 .markAnchor({ x: '50%', y: '50%' })
158 } 175 }
@@ -183,6 +200,8 @@ export struct PlayerEndView { @@ -183,6 +200,8 @@ export struct PlayerEndView {
183 } 200 }
184 .height('100%') 201 .height('100%')
185 .width('100%') 202 .width('100%')
  203 + // .align(Alignment.Center)
  204 + .justifyContent(FlexAlign.Center)
186 } 205 }
187 .height('100%') 206 .height('100%')
188 .width('100%') 207 .width('100%')
@@ -126,7 +126,7 @@ struct LaunchAdvertisingPage { @@ -126,7 +126,7 @@ struct LaunchAdvertisingPage {
126 .fontColor(Color.White) 126 .fontColor(Color.White)
127 .margin({left:14,right:14}) 127 .margin({left:14,right:14})
128 } 128 }
129 - .width(74) 129 + .width(84)
130 .height(28) 130 .height(28)
131 .margin({top:5,right:10}) 131 .margin({top:5,right:10})
132 .backgroundColor('#80000000') 132 .backgroundColor('#80000000')