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

* 'main' of http://192.168.1.42/developOne/harmonyPool:
  fix |> 20568 我的评论列表中，上方展示的昵称，换行比安卓早，并且等级的位置展示不正确
  fix |> 修复竖屏直播结束页面直播时长显示问题

@@ -28,7 +28,7 @@ export class GradeSpan extends CustomSpan {
     canvas.attachBrush(brush);
     canvas.attachBrush(brush);
     let options2 = new drawing.SamplingOptions(drawing.FilterMode.FILTER_MODE_NEAREST);
     let options2 = new drawing.SamplingOptions(drawing.FilterMode.FILTER_MODE_NEAREST);
     if (this.imagePixelMap) {
     if (this.imagePixelMap) {
-      canvas.drawImage(this.imagePixelMap, options.x , options.lineBottom - vp2px(this.height) - 10, options2);
+      canvas.drawImage(this.imagePixelMap, options.x + vp2px(6) , options.lineBottom - vp2px(this.height) - 10, options2);
     }
     }
 
 
     brush.setColor({ alpha: 255, red: 237, green: 40, blue: 0 });
     brush.setColor({ alpha: 255, red: 237, green: 40, blue: 0 });
@@ -38,7 +38,7 @@ export class GradeSpan extends CustomSpan {
     font.setSize(vp2px(12));
     font.setSize(vp2px(12));
     const textBlob = drawing.TextBlob.makeFromString(this.word, font, drawing.TextEncoding.TEXT_ENCODING_UTF8);
     const textBlob = drawing.TextBlob.makeFromString(this.word, font, drawing.TextEncoding.TEXT_ENCODING_UTF8);
     // canvas.drawTextBlob(textBlob, options.x + 20, options.lineBottom - 15);
     // canvas.drawTextBlob(textBlob, options.x + 20, options.lineBottom - 15);
-    canvas.drawTextBlob(textBlob, options.x + vp2px(9), options.lineBottom - vp2px(7.5));
+    canvas.drawTextBlob(textBlob, options.x + vp2px(9)  + vp2px(6) , options.lineBottom - vp2px(7.5));
 
 
     canvas.detachBrush();
     canvas.detachBrush();
   }
   }

@@ -123,9 +123,9 @@ struct MineHomePage {
                   Column() {
                   Column() {
                     Row() {
                     Row() {
 
 
-                      UserGradeTextSpan({nameContent:`${this.userName}`,gradeContent:`等级${this.levelId}`,gradeWidth:this.levelId >9 ? 50 : 45})
+                      UserGradeTextSpan({nameContent:`${this.userName}`,gradeContent:`等级${this.levelId}`,gradeWidth:this.levelId > 9 ? (this.levelId > 10 ? 55 : 50 ): 45})
 
 
-                    }.constraintSize({maxWidth:`calc(100% - 16vp - 90vp)`})
+                    }.constraintSize({maxWidth:`calc(100% - 16vp - 80vp)`})
                     .padding({top:8})
                     .padding({top:8})
                     .onClick(()=>{
                     .onClick(()=>{
                       let params: editModelParams = {
                       let params: editModelParams = {
@@ -187,7 +187,7 @@ struct MineHomePage {
                   }
                   }
                 })
                 })
                 .backgroundColor($r('app.color.color_transparent'))
                 .backgroundColor($r('app.color.color_transparent'))
-                .height(100)
+                .height(120)
                 .width('100%')
                 .width('100%')
                 .padding({ left: 10 })
                 .padding({ left: 10 })
 
 

@@ -111,9 +111,9 @@ struct OtherNormalUserHomePage {
 
 
                   Column() {
                   Column() {
                     Row() {
                     Row() {
-                      UserGradeTextSpan({nameContent:`${this.userName}`,gradeContent:`等级${this.levelId}`,gradeWidth:this.levelId >9 ? 50 : 45})
+                      UserGradeTextSpan({nameContent:`${this.userName}`,gradeContent:`等级${this.levelId}`,gradeWidth:this.levelId > 9 ? (this.levelId > 10 ? 55 : 50 ): 45})
 
 
-                    }.constraintSize({maxWidth:`calc(100% - 16vp - 90vp)`})
+                    }.constraintSize({maxWidth:`calc(100% - 16vp - 80vp)`})
                     .padding({top:8})
                     .padding({top:8})
 
 
                     /*Row() {
                     /*Row() {
@@ -189,7 +189,7 @@ struct OtherNormalUserHomePage {
                   }
                   }
                 })
                 })
                 // .backgroundColor($r('app.color.color_transparent'))
                 // .backgroundColor($r('app.color.color_transparent'))
-                .height('184lpx')
+                .height('220lpx')
                 .width('100%')
                 .width('100%')
                 .padding({ left: '6lpx' })
                 .padding({ left: '6lpx' })
 
 

@@ -77,7 +77,7 @@ export class LiveDetailPageLogic {
    * @param index
    * @param index
    */
    */
   resolvingRoomVliveData(index:number){
   resolvingRoomVliveData(index:number){
-
+    
     // 只有直播中的才会有垫片
     // 只有直播中的才会有垫片
     if(this.liveState === 'running'){
     if(this.liveState === 'running'){
       if (this.contentDetailData.liveInfo.vlive && this.contentDetailData.liveInfo.vlive.length > 0) {
       if (this.contentDetailData.liveInfo.vlive && this.contentDetailData.liveInfo.vlive.length > 0) {

@@ -28,8 +28,10 @@ export struct PlayerEndView {
   calculateLiveDuration() {
   calculateLiveDuration() {
     const sn =
     const sn =
       DateTimeUtils.parseDate(this.contentDetailData.liveInfo.startTime, DateTimeUtils.PATTERN_DATE_TIME_HYPHEN)
       DateTimeUtils.parseDate(this.contentDetailData.liveInfo.startTime, DateTimeUtils.PATTERN_DATE_TIME_HYPHEN)
-    let en = DateTimeUtils.parseDate(this.contentDetailData.liveInfo.endTime, DateTimeUtils.PATTERN_DATE_TIME_HYPHEN)
-    if (this.contentDetailData.liveInfo?.endTime == null) {
+    let en = 0
+    if (this.contentDetailData.liveInfo?.endTime.length > 0) {
+      en = DateTimeUtils.parseDate(this.contentDetailData.liveInfo.endTime, DateTimeUtils.PATTERN_DATE_TIME_HYPHEN)
+    }else {
       en = DateTimeUtils.parseDate(DateTimeUtils.getCurTime(DateTimeUtils.PATTERN_DATE_TIME_HYPHEN),DateTimeUtils.PATTERN_DATE_TIME_HYPHEN)
       en = DateTimeUtils.parseDate(DateTimeUtils.getCurTime(DateTimeUtils.PATTERN_DATE_TIME_HYPHEN),DateTimeUtils.PATTERN_DATE_TIME_HYPHEN)
     }
     }
     const sd = DateTimeUtils.getDuration(sn, en)
     const sd = DateTimeUtils.getDuration(sn, en)