Merge remote-tracking branch 'origin/main'

@@ -93,10 +93,8 @@ export class HttpBizUtil {
    */
    */
   static refreshToken(): Promise<string> {
   static refreshToken(): Promise<string> {
     let url = HttpUrlUtils.getRefreshTokenUrl();
     let url = HttpUrlUtils.getRefreshTokenUrl();
-    let params: HashMap<string, string> = new HashMap<string, string>()
-    params.set('refreshToken', HttpUtils.getRefreshToken())
-    params.set('deviceId', HttpUtils.getDeviceId())
-    // Logger.debug(TAG, 'refreshToken getRefreshToken: ' + HttpUrlUtils.getRefreshToken())
+    let params: RefreshTokenParam =
+      new RefreshTokenParam(HttpUtils.getRefreshToken(), HttpUtils.getDeviceId())
     // 请求刷新token接口
     // 请求刷新token接口
     return new Promise<string>((success, error) => {
     return new Promise<string>((success, error) => {
       WDHttp.post<ResponseDTO<RefreshTokenRes>>(url, params).then((resDTO: ResponseDTO<RefreshTokenRes>) => {
       WDHttp.post<ResponseDTO<RefreshTokenRes>>(url, params).then((resDTO: ResponseDTO<RefreshTokenRes>) => {
@@ -124,3 +122,13 @@ export class HttpBizUtil {
     })
     })
   }
   }
 }
 }
+
+export class RefreshTokenParam {
+  refreshToken: string = ''
+  deviceId: string = ''
+
+  constructor(refreshToken: string, deviceId: string) {
+    this.refreshToken = refreshToken
+    this.deviceId = deviceId
+  }
+}

@@ -9,6 +9,8 @@ import { ContentDetailDTO } from 'wdBean/Index'
 export struct CommentTabComponent {
 export struct CommentTabComponent {
   private onCommentFocus: () => void = () => {
   private onCommentFocus: () => void = () => {
   }
   }
+  private onLoad: (dialogController: CustomDialogController) => void = () => {
+  }
   @ObjectLink publishCommentModel: publishCommentModel
   @ObjectLink publishCommentModel: publishCommentModel
   @Prop contentDetail: ContentDetailDTO
   @Prop contentDetail: ContentDetailDTO
   @Prop pageComponentType: number = -1 //1:视频详情页 2:竖屏直播页
   @Prop pageComponentType: number = -1 //1:视频详情页 2:竖屏直播页
@@ -41,6 +43,8 @@ export struct CommentTabComponent {
       backgroundColor: "#50000000",
       backgroundColor: "#50000000",
     })
     })
 
 
+    this.onLoad(this.dialogController)
+
   }
   }
 
 
   getCommentInputBackImg() {
   getCommentInputBackImg() {
@@ -119,7 +123,6 @@ export struct CommentTabComponent {
       if (this.contentDetail.bestNoticer === 1) {
       if (this.contentDetail.bestNoticer === 1) {
         this.publishCommentModel.placeHolderText = "优质评论会获得最佳评论人的称号"
         this.publishCommentModel.placeHolderText = "优质评论会获得最佳评论人的称号"
       }
       }
-
       this.dialogController?.open();
       this.dialogController?.open();
     })
     })
   }
   }
@@ -156,7 +159,7 @@ export struct CommentIconComponent {
         // Stack({alignContent:Alignment.Start}) {
         // Stack({alignContent:Alignment.Start}) {
         if (Number.parseInt(this.publishCommentModel.totalCommentNumer) != 0) {
         if (Number.parseInt(this.publishCommentModel.totalCommentNumer) != 0) {
           RelativeContainer() {
           RelativeContainer() {
-            Image(this.styleType == 1 ? $r('app.media.comment_icon_number_bg'):$r('app.media.ic_like_back_Select'))
+            Image(this.styleType == 1 ? $r('app.media.comment_icon_number_bg') : $r('app.media.ic_like_back_Select'))
               .objectFit(ImageFit.Fill)
               .objectFit(ImageFit.Fill)
               .resizable({
               .resizable({
                 slice: {
                 slice: {

@@ -78,9 +78,12 @@ export struct PeopleShipHomeArticleListComponent {
 
 
     List({scroller: this.scroller}) {
     List({scroller: this.scroller}) {
       // 下拉刷新
       // 下拉刷新
-        ForEach(this.arr, (item: ContentDTO) => {
+        ForEach(this.arr, (item: ContentDTO, index: number) => {
           ListItem() {
           ListItem() {
+            Column() {
               CardParser({compDTO:new CompDTO, contentDTO: item })
               CardParser({compDTO:new CompDTO, contentDTO: item })
+              Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
+            }
           }.width("100%")
           }.width("100%")
           .backgroundColor(Color.Transparent)
           .backgroundColor(Color.Transparent)
         }, (item: ContentDTO, index: number) =>  item.objectId + index.toString())
         }, (item: ContentDTO, index: number) =>  item.objectId + index.toString())

@@ -83,6 +83,7 @@ export struct OperRowListView {
   private AudioSuspension = new AudioSuspensionModel()
   private AudioSuspension = new AudioSuspensionModel()
   @State currentStatus: number | string | undefined = 0;
   @State currentStatus: number | string | undefined = 0;
   @State name: string = 'audio_recommend_status_wait'
   @State name: string = 'audio_recommend_status_wait'
+  @State dialogController: CustomDialogController | null = null;
 
 
   async aboutToAppear() {
   async aboutToAppear() {
     console.info(TAG, '22222----', this.styleType)
     console.info(TAG, '22222----', this.styleType)
@@ -207,6 +208,9 @@ export struct OperRowListView {
           contentDetail: this.contentDetailData,
           contentDetail: this.contentDetailData,
           onCommentFocus: this.onCommentFocus,
           onCommentFocus: this.onCommentFocus,
           pageComponentType: this.pageComponentType,
           pageComponentType: this.pageComponentType,
+          onLoad: (dialogController: CustomDialogController) => {
+            this.dialogController = dialogController
+          }
         })
         })
       }
       }
     }
     }
@@ -222,6 +226,11 @@ export struct OperRowListView {
           CommentIconComponent({ publishCommentModel: this.publishCommentModel, styleType: this.styleType })
           CommentIconComponent({ publishCommentModel: this.publishCommentModel, styleType: this.styleType })
             .onClick(() => {
             .onClick(() => {
               this.onCommentIconClick()
               this.onCommentIconClick()
+
+              console.log(JSON.stringify(this.dialogController?.open))
+
+              // 评论弹框内部嵌入
+              !this.showBackIcon && this.dialogController?.open()
             })
             })
         }
         }
       }
       }
@@ -290,7 +299,8 @@ export struct OperRowListView {
   @Builder
   @Builder
   builderListen() {
   builderListen() {
     Column() {
     Column() {
-      Image(this.currentStatus === PlayerConstants.STATUS_START ? $r("app.media.icon_voice_playing") : $r("app.media.icon_listen"))
+      Image(this.currentStatus === PlayerConstants.STATUS_START ? $r("app.media.icon_voice_playing") :
+      $r("app.media.icon_listen"))
         .width(24)
         .width(24)
         .height(24)
         .height(24)
         .aspectRatio(1)
         .aspectRatio(1)

@@ -44,7 +44,7 @@ export default struct CustomDialogComponent {
           .fontSize(14)
           .fontSize(14)
           .fontColor($r('app.color.dialog_private_text_color'))
           .fontColor($r('app.color.dialog_private_text_color'))
       }
       }
-        .width('90%')
+        .width('90%').lineHeight(22)
       Row(){
       Row(){
 
 
         // Button(){
         // Button(){
@@ -135,6 +135,12 @@ export default struct CustomDialogComponent {
         .width('90%')
         .width('90%')
         .fontColor($r('app.color.dialog_text_color'))
         .fontColor($r('app.color.dialog_text_color'))
         .fontSize(14).margin({top:20})
         .fontSize(14).margin({top:20})
+
+      Divider()
+        .color('#f5f5f5')
+        .width('100%')
+        .strokeWidth(1)
+        .padding({left:16,right:16,top:22})
       Row() {
       Row() {
         Text($r('app.string.dialog_button_disagree'))
         Text($r('app.string.dialog_button_disagree'))
           .fancy()
           .fancy()
@@ -154,7 +160,7 @@ export default struct CustomDialogComponent {
           })
           })
 
 
       }
       }
-      .margin({ bottom: '21lpx',top:'42lpx' })
+      .margin({ bottom: '21lpx',top:'22lpx' })
 
 
     }
     }
     .width('528lpx')
     .width('528lpx')