王士厅

fix: 【华为验收】折叠屏,意见反馈,提交按钮与底部导航条重叠,解决方案增加提交按钮的底部边距

@@ -42,7 +42,7 @@ export struct FeedBackActivity { @@ -42,7 +42,7 @@ export struct FeedBackActivity {
42 42
43 @State toastText:ResourceStr = "" 43 @State toastText:ResourceStr = ""
44 44
45 - // @Provide bottomSafeHeight: number = AppStorage.get<number>('bottomSafeHeight') || 0 45 + @State bottomSafeHeight: number = AppStorage.get<number>('bottomSafeHeight') || 0
46 @Provide topSafeHeight: number = AppStorage.get<number>('topSafeHeight') || 0 46 @Provide topSafeHeight: number = AppStorage.get<number>('topSafeHeight') || 0
47 47
48 dialogToast: CustomDialogController = new CustomDialogController({ 48 dialogToast: CustomDialogController = new CustomDialogController({
@@ -291,7 +291,7 @@ export struct FeedBackActivity { @@ -291,7 +291,7 @@ export struct FeedBackActivity {
291 .height(CommonConstants.FULL_HEIGHT) 291 .height(CommonConstants.FULL_HEIGHT)
292 .scrollBar(BarState.Off) 292 .scrollBar(BarState.Off)
293 .alignSelf(ItemAlign.Start) 293 .alignSelf(ItemAlign.Start)
294 - .padding({ bottom: 64+64 }) 294 + .padding({ bottom: 64+64+15 })
295 Column(){ 295 Column(){
296 Text($r('app.string.submit')) 296 Text($r('app.string.submit'))
297 .textAlign(TextAlign.Center) 297 .textAlign(TextAlign.Center)
@@ -307,7 +307,7 @@ export struct FeedBackActivity { @@ -307,7 +307,7 @@ export struct FeedBackActivity {
307 } 307 }
308 this.reportCommit() 308 this.reportCommit()
309 }) 309 })
310 - .margin({bottom:64+64}) 310 + .margin({ bottom: 64+64+15 })
311 } 311 }
312 } 312 }
313 } 313 }
@@ -11,10 +11,8 @@ export struct CustomTitleUI { @@ -11,10 +11,8 @@ export struct CustomTitleUI {
11 //标题栏目 11 //标题栏目
12 if(this.imgBack){ 12 if(this.imgBack){
13 Image($r('app.media.back_icon')) 13 Image($r('app.media.back_icon'))
14 - // .width(`${this.calcHeight(46)}lpx`)  
15 - .width(24)  
16 - .height(24)  
17 - // .height(`${this.calcHeight(46)}lpx`) 14 + .width(`${this.calcHeight(46)}lpx`)
  15 + .height(`${this.calcHeight(46)}lpx`)
18 .objectFit(ImageFit.Auto) 16 .objectFit(ImageFit.Auto)
19 .interpolation(ImageInterpolation.High) 17 .interpolation(ImageInterpolation.High)
20 .id("back_icon") 18 .id("back_icon")
@@ -22,8 +20,7 @@ export struct CustomTitleUI { @@ -22,8 +20,7 @@ export struct CustomTitleUI {
22 center: {anchor: "__container__", align: VerticalAlign.Center}, 20 center: {anchor: "__container__", align: VerticalAlign.Center},
23 left: {anchor: "__container__", align: HorizontalAlign.Start} 21 left: {anchor: "__container__", align: HorizontalAlign.Start}
24 }) 22 })
25 - .margin({left:16})  
26 - // .margin({left:`${this.calcHeight(31)}lpx`}) 23 + .margin({left:`${this.calcHeight(31)}lpx`})
27 .onClick(()=>{ 24 .onClick(()=>{
28 router.back() 25 router.back()
29 }) 26 })
@@ -32,20 +29,17 @@ export struct CustomTitleUI { @@ -32,20 +29,17 @@ export struct CustomTitleUI {
32 Text(this.titleName) 29 Text(this.titleName)
33 .maxLines(1) 30 .maxLines(1)
34 .id("title") 31 .id("title")
35 - .fontSize(18)  
36 - // .fontSize(`${this.calcHeight(35)}lpx`) 32 + .fontSize(`${this.calcHeight(35)}lpx`)
37 .fontWeight(400) 33 .fontWeight(400)
38 .fontColor($r('app.color.color_222222')) 34 .fontColor($r('app.color.color_222222'))
39 - .lineHeight(26)  
40 - // .lineHeight(`${this.calcHeight(50)}lpx`) 35 + .lineHeight(`${this.calcHeight(50)}lpx`)
41 .alignRules({ 36 .alignRules({
42 center: {anchor: "__container__", align: VerticalAlign.Center}, 37 center: {anchor: "__container__", align: VerticalAlign.Center},
43 middle: {anchor: "__container__", align: HorizontalAlign.Center} 38 middle: {anchor: "__container__", align: HorizontalAlign.Center}
44 }) 39 })
45 40
46 } 41 }
47 - // .height(`${this.calcHeight(84)}lpx`)  
48 - .height(44) 42 + .height(`${this.calcHeight(84)}lpx`)
49 .width('100%') 43 .width('100%')
50 .backgroundColor($r('app.color.white')) 44 .backgroundColor($r('app.color.white'))
51 } 45 }