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

@@ -168,7 +168,7 @@ export struct ZhSingleRow06 {
             ? item.operDataList[0]?.commentInfo?.userHeaderUrl
               ? item.operDataList[0].commentInfo.userHeaderUrl
               : $r('app.media.default_head')
-            : '')
+            : $r('app.media.comment_rmh_tag'))
           .width(32)
           .height(32)
           .borderRadius(16)

@@ -132,54 +132,60 @@ export struct OperRowListView {
   build() {
     // 视频详情页
 
-    Flex({ justifyContent: FlexAlign.SpaceBetween, alignItems: ItemAlign.Center }) {
-      // AudioDialog()
-      Row() {
-        Column() {
-          Image(this.styleType == 1 ? $r('app.media.icon_arrow_left') :
-          $r('app.media.icon_arrow_left_white'))
-            .width(24)
-            .height(24)
-            .aspectRatio(1)
-            .interpolation(ImageInterpolation.High)
-        }
-        .hoverEffect(HoverEffect.Scale)
-        .onClick(() => {
-          if (this.onBack) {
-            this.onBack()
-          }
-          router.back();
-        })
-        .width(48)
+    Column() {
+      Image($r('app.media.ic_news_detail_division'))
+        .width('100%')
+        .height($r('app.float.margin_4'))
 
-        if (this.contentDetailData?.newsId) {
-          ForEach(this.operationButtonList, (item: string, index: number) => {
-            if (item == 'comment') {
-              this.builderComment()
-            } else if (item == 'like' && this.needLike) {
-              this.builderLike()
-            } else if (item == 'collect') {
-              this.builderCollect()
-            } else if (item == 'listen') {
-              this.builderListen()
-            } else if (item == 'share') {
-              this.builderShare()
-            } else {
+      Flex({ justifyContent: FlexAlign.SpaceBetween, alignItems: ItemAlign.Center }) {
+        // AudioDialog()
+        Row() {
+          Column() {
+            Image(this.styleType == 1 ? $r('app.media.icon_arrow_left') :
+            $r('app.media.icon_arrow_left_white'))
+              .width(24)
+              .height(24)
+              .aspectRatio(1)
+              .interpolation(ImageInterpolation.High)
+          }
+          .hoverEffect(HoverEffect.Scale)
+          .onClick(() => {
+            if (this.onBack) {
+              this.onBack()
             }
+            router.back();
           })
+          .width(48)
+
+          if (this.contentDetailData?.newsId) {
+            ForEach(this.operationButtonList, (item: string, index: number) => {
+              if (item == 'comment') {
+                this.builderComment()
+              } else if (item == 'like' && this.needLike) {
+                this.builderLike()
+              } else if (item == 'collect') {
+                this.builderCollect()
+              } else if (item == 'listen') {
+                this.builderListen()
+              } else if (item == 'share') {
+                this.builderShare()
+              } else {
+              }
+            })
+          }
         }
+        .width('100%')
+        .justifyContent(FlexAlign.Start)
       }
       .width('100%')
-      .justifyContent(FlexAlign.Start)
+      .backgroundColor(this.bgColor)
+      .padding({
+        top: 10,
+        // bottom: 10
+        bottom: `${this.bottomSafeHeight}px`
+        // bottom: 50
+      })
     }
-    .width('100%')
-    .backgroundColor(this.bgColor)
-    .padding({
-      top: 10,
-      // bottom: 10
-      bottom: `${this.bottomSafeHeight}px`
-      // bottom: 50
-    })
 
   }
 

@@ -65,10 +65,18 @@
       "value": "14vp"
     },
     {
+      "name": "margin_4",
+      "value": "4vp"
+    },
+    {
       "name": "margin_8",
       "value": "8vp"
     },
     {
+      "name": "margin_9",
+      "value": "9vp"
+    },
+    {
       "name": "label_margin_top",
       "value": "10vp"
     },

@@ -13,6 +13,10 @@
       "value": "12fp"
     },
     {
+      "name": "margin_4",
+      "value": "4vp"
+    },
+    {
       "name": "normal_text_size",
       "value": "16fp"
     },