Merge remote-tracking branch 'origin/main'

@@ -296,13 +296,13 @@ export struct ENewspaperPageComponent {
           Row() {
           Row() {
             Image($r('app.media.newspaper_shadow'))
             Image($r('app.media.newspaper_shadow'))
               .height($r('app.float.vp_12'))
               .height($r('app.float.vp_12'))
-              .width('100%')
+              .width(px2vp(this.picWidth))
               .objectFit(ImageFit.Contain)
               .objectFit(ImageFit.Contain)
 
 
-          }.margin({ top: -1,left: 10, right: 10 }).alignRules({
+          }.margin({ top: -1 }).alignRules({
             top: { anchor: "e_newspaper_content", align: VerticalAlign.Bottom },
             top: { anchor: "e_newspaper_content", align: VerticalAlign.Bottom },
-            // left: { anchor: 'e_newspaper_content', align: HorizontalAlign.Start },
-            // right: { anchor: 'e_newspaper_content', align: HorizontalAlign.End }
+            left: { anchor: 'e_newspaper_content', align: HorizontalAlign.Start },
+            right: { anchor: 'e_newspaper_content', align: HorizontalAlign.End }
           })
           })
           .id('e_newspaper_shadow')
           .id('e_newspaper_shadow')
 
 

@@ -383,10 +383,11 @@ export struct PlayUIComponent {
       step: 1,
       step: 1,
       style: SliderStyle.OutSet
       style: SliderStyle.OutSet
     })
     })
-      .blockSize({
-        width: 18,
-        height: 12
-      })// .blockStyle({
+      // .blockSize({
+      //   width: 18,
+      //   height: 12
+      // })
+        // .blockStyle({
         //   type: SliderBlockType.IMAGE,
         //   type: SliderBlockType.IMAGE,
         //   image: $r('app.media.ic_player_block')
         //   image: $r('app.media.ic_player_block')
         // })
         // })
@@ -394,8 +395,14 @@ export struct PlayUIComponent {
       .trackColor('#4DFFFFFF')
       .trackColor('#4DFFFFFF')
       .selectedColor('#FFED2800')
       .selectedColor('#FFED2800')
       .height(14)
       .height(14)
-      .trackThickness(1)
+      .trackThickness(2)
+      .blockStyle({
+        type: SliderBlockType.IMAGE,
+        image: $r('app.media.ic_player_block')
+      })
+      .blockSize({ width: 18, height: 12 })
       .layoutWeight(1)
       .layoutWeight(1)
+      .height(14)
       .margin({
       .margin({
         left: 8,
         left: 8,
         right: 8
         right: 8

@@ -123,10 +123,10 @@ export struct PlayerVideoControlComponent {
       step: 1,
       step: 1,
       style: SliderStyle.OutSet
       style: SliderStyle.OutSet
     })
     })
-      .blockSize({
-        width: 18,
-        height: 12
-      })
+      // .blockSize({
+      //   width: 18,
+      //   height: 12
+      // })
       .trackColor('#4DFFFFFF')
       .trackColor('#4DFFFFFF')
       .selectedColor('#FFED2800')
       .selectedColor('#FFED2800')
       .trackThickness(2)
       .trackThickness(2)