Showing
3 changed files
with
27 additions
and
3 deletions
| @@ -36,6 +36,7 @@ struct MineHomePage { | @@ -36,6 +36,7 @@ struct MineHomePage { | ||
| 36 | @State params:Record<string, string> = router.getParams() as Record<string, string>; | 36 | @State params:Record<string, string> = router.getParams() as Record<string, string>; |
| 37 | @State isCommentEnter:string = ""; | 37 | @State isCommentEnter:string = ""; |
| 38 | @State isConnectNetwork : boolean = NetworkUtil.isNetConnected() | 38 | @State isConnectNetwork : boolean = NetworkUtil.isNetConnected() |
| 39 | + @State topSafeHeight: number = AppStorage.get<number>('topSafeHeight') || 0 | ||
| 39 | 40 | ||
| 40 | onPageShow(): void { | 41 | onPageShow(): void { |
| 41 | this.getUserInfo() | 42 | this.getUserInfo() |
| @@ -52,10 +53,21 @@ struct MineHomePage { | @@ -52,10 +53,21 @@ struct MineHomePage { | ||
| 52 | build() { | 53 | build() { |
| 53 | if(this.isConnectNetwork){ | 54 | if(this.isConnectNetwork){ |
| 54 | Stack({ alignContent: Alignment.Top }){ | 55 | Stack({ alignContent: Alignment.Top }){ |
| 56 | + Stack({ alignContent: Alignment.Top }){ | ||
| 55 | Image($r('app.media.title_bg')) | 57 | Image($r('app.media.title_bg')) |
| 56 | .width('100%') | 58 | .width('100%') |
| 57 | .height('355lpx') | 59 | .height('355lpx') |
| 58 | .objectFit(ImageFit.Cover) | 60 | .objectFit(ImageFit.Cover) |
| 61 | + .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.TOP]) | ||
| 62 | + | ||
| 63 | + Row() | ||
| 64 | + .height(px2vp(this.topSafeHeight)) | ||
| 65 | + .width("100%") | ||
| 66 | + .backgroundColor($r('app.color.white')) | ||
| 67 | + .visibility(this.tileOpacity > 0 ? 0 : 1) | ||
| 68 | + .opacity(this.tileOpacity ) | ||
| 69 | + .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.TOP]) | ||
| 70 | + } | ||
| 59 | 71 | ||
| 60 | Column(){ | 72 | Column(){ |
| 61 | Stack({ alignContent: Alignment.Top }){ | 73 | Stack({ alignContent: Alignment.Top }){ |
| @@ -262,7 +274,7 @@ struct MineHomePage { | @@ -262,7 +274,7 @@ struct MineHomePage { | ||
| 262 | .scrollBar(BarState.Off) | 274 | .scrollBar(BarState.Off) |
| 263 | .width('100%') | 275 | .width('100%') |
| 264 | .layoutWeight(1) | 276 | .layoutWeight(1) |
| 265 | - } | 277 | + }.expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.BOTTOM]) |
| 266 | }.width('100%') | 278 | }.width('100%') |
| 267 | .layoutWeight(1) | 279 | .layoutWeight(1) |
| 268 | }else{ | 280 | }else{ |
| @@ -385,10 +397,10 @@ struct MineHomePage { | @@ -385,10 +397,10 @@ struct MineHomePage { | ||
| 385 | this.editUserInfo() | 397 | this.editUserInfo() |
| 386 | }) | 398 | }) |
| 387 | } | 399 | } |
| 388 | - .visibility(this.tileOpacity > 0 ? 0 : 1) | ||
| 389 | .height('84lpx') | 400 | .height('84lpx') |
| 390 | .width('100%') | 401 | .width('100%') |
| 391 | .backgroundColor($r('app.color.white')) | 402 | .backgroundColor($r('app.color.white')) |
| 403 | + .visibility(this.tileOpacity > 0 ? 0 : 1) | ||
| 392 | .opacity(this.tileOpacity ) | 404 | .opacity(this.tileOpacity ) |
| 393 | 405 | ||
| 394 | } | 406 | } |
| @@ -15,6 +15,7 @@ const TAG = "OtherNormalUserHomePage" | @@ -15,6 +15,7 @@ const TAG = "OtherNormalUserHomePage" | ||
| 15 | struct OtherNormalUserHomePage { | 15 | struct OtherNormalUserHomePage { |
| 16 | @State params:Record<string, string> = router.getParams() as Record<string, string>; | 16 | @State params:Record<string, string> = router.getParams() as Record<string, string>; |
| 17 | @Watch('change') @State curUserId: string = '-1'; | 17 | @Watch('change') @State curUserId: string = '-1'; |
| 18 | + @State topSafeHeight: number = AppStorage.get<number>('topSafeHeight') || 0 | ||
| 18 | 19 | ||
| 19 | onPageShow() { | 20 | onPageShow() { |
| 20 | this.curUserId = this.params?.['userId']; | 21 | this.curUserId = this.params?.['userId']; |
| @@ -52,10 +53,21 @@ struct OtherNormalUserHomePage { | @@ -52,10 +53,21 @@ struct OtherNormalUserHomePage { | ||
| 52 | build() { | 53 | build() { |
| 53 | if(this.isConnectNetwork){ | 54 | if(this.isConnectNetwork){ |
| 54 | Stack({ alignContent: Alignment.Top }){ | 55 | Stack({ alignContent: Alignment.Top }){ |
| 56 | + Stack({ alignContent: Alignment.Top }){ | ||
| 55 | Image($r('app.media.title_bg')) | 57 | Image($r('app.media.title_bg')) |
| 56 | .width('100%') | 58 | .width('100%') |
| 57 | .height('355lpx') | 59 | .height('355lpx') |
| 58 | .objectFit(ImageFit.Cover) | 60 | .objectFit(ImageFit.Cover) |
| 61 | + .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.TOP]) | ||
| 62 | + | ||
| 63 | + Row() | ||
| 64 | + .height(px2vp(this.topSafeHeight)) | ||
| 65 | + .width("100%") | ||
| 66 | + .backgroundColor($r('app.color.white')) | ||
| 67 | + .visibility(this.tileOpacity > 0 ? 0 : 1) | ||
| 68 | + .opacity(this.tileOpacity ) | ||
| 69 | + .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.TOP]) | ||
| 70 | + } | ||
| 59 | 71 | ||
| 60 | Column(){ | 72 | Column(){ |
| 61 | Stack({ alignContent: Alignment.Top }){ | 73 | Stack({ alignContent: Alignment.Top }){ |
| @@ -229,7 +241,7 @@ struct OtherNormalUserHomePage { | @@ -229,7 +241,7 @@ struct OtherNormalUserHomePage { | ||
| 229 | .scrollBar(BarState.Off) | 241 | .scrollBar(BarState.Off) |
| 230 | .width('100%') | 242 | .width('100%') |
| 231 | .layoutWeight(1) | 243 | .layoutWeight(1) |
| 232 | - } | 244 | + }.expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.BOTTOM]) |
| 233 | }.width('100%') | 245 | }.width('100%') |
| 234 | .layoutWeight(1) | 246 | .layoutWeight(1) |
| 235 | }else{ | 247 | }else{ |
-
Please register or login to post a comment