Merge remote-tracking branch 'origin/main'

@@ -210,7 +210,7 @@ export struct LiveHorizontalCardComponent {
           this.edgeAnimation()
           this.edgeAnimation()
         })
         })
         .onScrollStop(() => {
         .onScrollStop(() => {
-          this.resetEdgeAnimation();
+          // this.resetEdgeAnimation();
         })
         })
         .onScroll((xOffset: number, yOffset: number) => {
         .onScroll((xOffset: number, yOffset: number) => {
           if (xOffset < 0) {
           if (xOffset < 0) {

@@ -138,10 +138,12 @@ struct LaunchAdvertisingPage {
                 })
                 })
               }
               }
               if(this.defaultModel.screenType === '1') {
               if(this.defaultModel.screenType === '1') {
+                Column(){
                   Image($r('app.media.LaunchPage_logo'))
                   Image($r('app.media.LaunchPage_logo'))
                     .width('278lpx')
                     .width('278lpx')
                     .height('154lpx')
                     .height('154lpx')
-                  .margin({top: '28lpx',bottom:'28lpx'})
+                    .margin({top:20})
+                }.width('100%').height('16%').backgroundColor(Color.White).expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.TOP, SafeAreaEdge.BOTTOM])
               }
               }
             }
             }
             .width('100%')
             .width('100%')