developOne / harmonyPool

Go to a project
Toggle navigation Toggle navigation pinning
yumaochao
aca2c445 2 parents 5b2b73ea 1dd38fda

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

Inline Side-by-side
Showing 9 changed files with 219 additions and 225 deletions
@@ -108,7 +108,7 @@ export struct ZhSingleRow02 { @@ -108,7 +108,7 @@ export struct ZhSingleRow02 {
108 Column() { 108 Column() {
109 if (this.moreWidth > this.initMoreWidth + 2) { 109 if (this.moreWidth > this.initMoreWidth + 2) {
110 Text(this.moreTips) 110 Text(this.moreTips)
111 - .fontSize(8) 111 + .fontSize(9)
112 .fontColor(0x858585) 112 .fontColor(0x858585)
113 .width(8) 113 .width(8)
114 } 114 }
@@ -179,7 +179,7 @@ export struct ZhSingleRow03 { @@ -179,7 +179,7 @@ export struct ZhSingleRow03 {
179 Column() { 179 Column() {
180 if (this.moreWidth > this.initMoreWidth + 2) { 180 if (this.moreWidth > this.initMoreWidth + 2) {
181 Text(this.moreTips) 181 Text(this.moreTips)
182 - .fontSize(8) 182 + .fontSize(9)
183 .fontColor(0x858585) 183 .fontColor(0x858585)
184 .width(8) 184 .width(8)
185 } 185 }
@@ -70,7 +70,6 @@ struct PeopleShipHomePage { @@ -70,7 +70,6 @@ struct PeopleShipHomePage {
70 .objectRepeat(ImageRepeat.NoRepeat) 70 .objectRepeat(ImageRepeat.NoRepeat)
71 .backgroundColor(Color.White) 71 .backgroundColor(Color.White)
72 .visibility(this.isLoading ? Visibility.None : Visibility.Visible) 72 .visibility(this.isLoading ? Visibility.None : Visibility.Visible)
73 - .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.TOP])  
74 73
75 Row() 74 Row()
76 .height(px2vp(this.topSafeHeight)) 75 .height(px2vp(this.topSafeHeight))
@@ -78,7 +77,6 @@ struct PeopleShipHomePage { @@ -78,7 +77,6 @@ struct PeopleShipHomePage {
78 .backgroundColor($r('app.color.white')) 77 .backgroundColor($r('app.color.white'))
79 .visibility(this.topOpacity > 0 ? Visibility.Visible : Visibility.None) 78 .visibility(this.topOpacity > 0 ? Visibility.Visible : Visibility.None)
80 .opacity(this.topOpacity ) 79 .opacity(this.topOpacity )
81 - .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.TOP])  
82 } 80 }
83 81
84 Column(){ 82 Column(){
@@ -141,10 +139,10 @@ struct PeopleShipHomePage { @@ -141,10 +139,10 @@ struct PeopleShipHomePage {
141 }) 139 })
142 } 140 }
143 } 141 }
144 - .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.BOTTOM])  
145 .alignItems(HorizontalAlign.Start) 142 .alignItems(HorizontalAlign.Start)
146 .justifyContent(FlexAlign.Start) 143 .justifyContent(FlexAlign.Start)
147 .width('100%') 144 .width('100%')
  145 + .margin({top:px2vp(this.topSafeHeight)})
148 } 146 }
149 .width('100%') 147 .width('100%')
150 }else{ 148 }else{
@@ -165,7 +163,6 @@ struct PeopleShipHomePage { @@ -165,7 +163,6 @@ struct PeopleShipHomePage {
165 } 163 }
166 164
167 aboutToAppear() { 165 aboutToAppear() {
168 - WindowModel.shared.setWindowLayoutFullScreen(false)  
169 this.getData() 166 this.getData()
170 } 167 }
171 168
@@ -167,7 +167,7 @@ export struct HorizontalStrokeCardThreeTwoRadioForMoreComponent { @@ -167,7 +167,7 @@ export struct HorizontalStrokeCardThreeTwoRadioForMoreComponent {
167 Column() { 167 Column() {
168 if (this.moreWidth > this.initMoreWidth + 2) { 168 if (this.moreWidth > this.initMoreWidth + 2) {
169 Text(this.moreTips) 169 Text(this.moreTips)
170 - .fontSize(8) 170 + .fontSize(9)
171 .fontColor(0x858585) 171 .fontColor(0x858585)
172 .width(8) 172 .width(8)
173 } 173 }
@@ -190,7 +190,7 @@ export struct LiveHorizontalCardComponent { @@ -190,7 +190,7 @@ export struct LiveHorizontalCardComponent {
190 Column() { 190 Column() {
191 if (this.moreWidth > this.initMoreWidth + 2) { 191 if (this.moreWidth > this.initMoreWidth + 2) {
192 Text(this.moreTips) 192 Text(this.moreTips)
193 - .fontSize(8) 193 + .fontSize(9)
194 .fontColor(0x858585) 194 .fontColor(0x858585)
195 .width(8) 195 .width(8)
196 } 196 }
@@ -38,6 +38,7 @@ struct MineHomePage { @@ -38,6 +38,7 @@ struct MineHomePage {
38 @State isCommentEnter:string = ""; 38 @State isCommentEnter:string = "";
39 @State isConnectNetwork : boolean = NetworkUtil.isNetConnected() 39 @State isConnectNetwork : boolean = NetworkUtil.isNetConnected()
40 @State topSafeHeight: number = AppStorage.get<number>('topSafeHeight') || 0 40 @State topSafeHeight: number = AppStorage.get<number>('topSafeHeight') || 0
  41 + @State bottomSafeHeight: number = AppStorage.get<number>('bottomSafeHeight') || 0
41 pageShowTime:number = 0; 42 pageShowTime:number = 0;
42 pageHideTime:number = 0; 43 pageHideTime:number = 0;
43 44
@@ -62,248 +63,248 @@ struct MineHomePage { @@ -62,248 +63,248 @@ struct MineHomePage {
62 } 63 }
63 64
64 build() { 65 build() {
65 - if(this.isConnectNetwork){  
66 - Stack({ alignContent: Alignment.Top }){ 66 + if(this.isConnectNetwork){
67 Stack({ alignContent: Alignment.Top }){ 67 Stack({ alignContent: Alignment.Top }){
68 - Image($r('app.media.title_bg'))  
69 - .width('100%')  
70 - .height('355lpx')  
71 - .objectFit(ImageFit.Cover)  
72 - .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.TOP])  
73 -  
74 - Row()  
75 - .height(px2vp(this.topSafeHeight))  
76 - .width("100%")  
77 - .backgroundColor($r('app.color.white'))  
78 - .visibility(this.tileOpacity > 0 ? 0 : 1)  
79 - .opacity(this.tileOpacity )  
80 - .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.TOP])  
81 - }  
82 -  
83 - Column(){  
84 Stack({ alignContent: Alignment.Top }){ 68 Stack({ alignContent: Alignment.Top }){
85 - this.MineHomeTitleTransparent()  
86 - this.MineHomeTitleWhite() 69 + Image($r('app.media.title_bg'))
  70 + .width('100%')
  71 + .height('355lpx')
  72 + .objectFit(ImageFit.Cover)
  73 +
  74 + Row()
  75 + .height(px2vp(this.topSafeHeight))
  76 + .width("100%")
  77 + .backgroundColor($r('app.color.white'))
  78 + .visibility(this.tileOpacity > 0 ? 0 : 1)
  79 + .opacity(this.tileOpacity )
87 } 80 }
88 81
89 - Scroll(this.scroller) {  
90 - Column() {  
91 - //用户信息区域  
92 - Row() {  
93 - Stack(){  
94 - Image(this.headPhotoUrl)  
95 - .alt($r('app.media.default_head'))  
96 - .width('115lpx')  
97 - .height('115lpx')  
98 - .objectFit(ImageFit.Auto)  
99 - .clip(new Circle({ width: '115lpx', height: '115lpx' }))  
100 - Image(this.levelHead)  
101 - .width('165lpx')  
102 - .height('165lpx')  
103 - .objectFit(ImageFit.Auto)  
104 - }.onClick(()=>{  
105 - let params = {'headPhotoUrl': this.headPhotoUrl} as Record<string, string>;  
106 - WDRouterRule.jumpWithPage(WDRouterPage.showUserHeaderPage,params)  
107 - }).width('165lpx')  
108 - .height('165lpx') 82 + Column(){
  83 + Stack({ alignContent: Alignment.Top }){
  84 + this.MineHomeTitleTransparent()
  85 + this.MineHomeTitleWhite()
  86 + }
  87 +
  88 + Scroll(this.scroller) {
  89 + Column() {
  90 + //用户信息区域
  91 + Row() {
  92 + Stack(){
  93 + Image(this.headPhotoUrl)
  94 + .alt($r('app.media.default_head'))
  95 + .width('115lpx')
  96 + .height('115lpx')
  97 + .objectFit(ImageFit.Auto)
  98 + .clip(new Circle({ width: '115lpx', height: '115lpx' }))
  99 + Image(this.levelHead)
  100 + .width('165lpx')
  101 + .height('165lpx')
  102 + .objectFit(ImageFit.Auto)
  103 + }.onClick(()=>{
  104 + let params = {'headPhotoUrl': this.headPhotoUrl} as Record<string, string>;
  105 + WDRouterRule.jumpWithPage(WDRouterPage.showUserHeaderPage,params)
  106 + }).width('165lpx')
  107 + .height('165lpx')
  108 +
  109 + Column() {
  110 + Row() {
  111 + Text(`${this.userName}`)
  112 + .fontColor($r('app.color.white'))
  113 + .maxLines(1)
  114 + .textOverflow({ overflow: TextOverflow.Ellipsis })
  115 + .fontSize('38lpx')
  116 + .lineHeight('50lpx')
  117 + .fontWeight('500lpx')
  118 + .onClick(()=>{
  119 + let params: editModelParams = {
  120 + editContent: this.userName
  121 + }
  122 + WDRouterRule.jumpWithPage(WDRouterPage.editUserNikeNamePage,params)
  123 + })
  124 +
  125 + if(this.levelId>0){
  126 + Text(`等级${this.levelId}`)
  127 + .fontColor($r('app.color.color_ED2800'))
  128 + .fontSize('23lpx')
  129 + .fontWeight(500)
  130 + .margin({ left: '10lpx' })
  131 + .backgroundImage($r("app.media.my_grade_bg"))
  132 + .backgroundImageSize(ImageSize.Cover)
  133 + .padding({left:"17lpx",right:"8lpx"})
  134 + .height('35lpx')
  135 + .borderRadius({topRight:2,bottomRight:2})
  136 + }
  137 +
  138 + Blank()
  139 + }.width('507lpx')
109 140
  141 + Row() {
  142 + Row() {
  143 + Text(`${this.browseNum}`)
  144 + .textStyle()
  145 + Text("阅读")
  146 + .textStyle2()
  147 + }
  148 + .margin({ right: '15lpx' })
  149 +
  150 + Divider()
  151 + .height('19lpx')
  152 + .width('2lpx')
  153 + .color($r('app.color.white'))
  154 + .vertical(true)
  155 + .opacity(0.4)
  156 + Row() {
  157 + Text(`${this.commentNum}`)
  158 + .textStyle()
  159 + Text("评论")
  160 + .textStyle2()
  161 + }.margin({ right: '15lpx', left: '15lpx' })
  162 +
  163 + Divider()
  164 + .height('19lpx')
  165 + .width('2lpx')
  166 + .color($r('app.color.white'))
  167 + .vertical(true)
  168 + .opacity(0.4)
  169 + Row() {
  170 + Text(`${this.attentionNum}`)
  171 + .textStyle()
  172 + Text("关注")
  173 + .textStyle2()
  174 + }.margin({ left: '15lpx' })
  175 + }.margin({ top: '23lpx' })
  176 + }.alignItems(HorizontalAlign.Start)
  177 + .margin({ left: StringUtils.isEmpty(this.levelHead)?'32lpx':"3lpx" })
  178 + }
  179 + .onAreaChange((oldValue: Area, newValue: Area) => {
  180 + if (this.firstPositionY === 0) {
  181 + this.firstPositionY = newValue.globalPosition.y as number
  182 + }else{
  183 + let persent = (this.firstPositionY - Number(newValue.globalPosition.y)) / (this.firstPositionY * 0.3)
  184 + if(persent > 1){
  185 + persent = 1
  186 + }
  187 + this.tileOpacity = persent
  188 + }
  189 + })
  190 + .backgroundColor($r('app.color.color_transparent'))
  191 + .height('184lpx')
  192 + .width('100%')
  193 + .padding({ left: '6lpx' })
  194 +
  195 +
  196 + //用户简介区域
110 Column() { 197 Column() {
111 Row() { 198 Row() {
112 - Text(`${this.userName}`)  
113 - .fontColor($r('app.color.white'))  
114 - .maxLines(1) 199 + Text(this.isHasIntroduction?"简介："+this.desc:this.desc)
  200 + .fontSize('27lpx')
  201 + .maxLines(3)
115 .textOverflow({ overflow: TextOverflow.Ellipsis }) 202 .textOverflow({ overflow: TextOverflow.Ellipsis })
116 - .fontSize('38lpx')  
117 - .lineHeight('50lpx')  
118 - .fontWeight('500lpx') 203 + .lineHeight('40lpx')
  204 + .fontWeight('400lpx')
  205 + .fontColor(this.isHasIntroduction?$r('app.color.color_222222'):$r('app.color.color_999999'))
  206 + .textAlign(TextAlign.Start)
119 .onClick(()=>{ 207 .onClick(()=>{
120 let params: editModelParams = { 208 let params: editModelParams = {
121 - editContent: this.userName 209 + editContent: this.isHasIntroduction?this.desc:''
122 } 210 }
123 - WDRouterRule.jumpWithPage(WDRouterPage.editUserNikeNamePage,params) 211 + WDRouterRule.jumpWithPage(WDRouterPage.editUserIntroductionPage,params)
124 }) 212 })
125 -  
126 - if(this.levelId>0){  
127 - Text(`等级${this.levelId}`)  
128 - .fontColor($r('app.color.color_ED2800'))  
129 - .fontSize('23lpx')  
130 - .fontWeight(500)  
131 - .margin({ left: '10lpx' })  
132 - .backgroundImage($r("app.media.my_grade_bg"))  
133 - .backgroundImageSize(ImageSize.Cover)  
134 - .padding({left:"17lpx",right:"8lpx"})  
135 - .height('35lpx')  
136 - .borderRadius({topRight:2,bottomRight:2})  
137 - }  
138 -  
139 - Blank()  
140 - }.width('507lpx')  
141 -  
142 - Row() {  
143 - Row() {  
144 - Text(`${this.browseNum}`)  
145 - .textStyle()  
146 - Text("阅读")  
147 - .textStyle2() 213 + if(!this.isHasIntroduction){
  214 + Image($r('app.media.user_info_edit_icon'))
  215 + .width('27lpx')
  216 + .height('27lpx')
  217 + .interpolation(ImageInterpolation.High)
  218 + .objectFit(ImageFit.Auto)
148 } 219 }
149 - .margin({ right: '15lpx' })  
150 -  
151 - Divider()  
152 - .height('19lpx')  
153 - .width('2lpx')  
154 - .color($r('app.color.white'))  
155 - .vertical(true)  
156 - .opacity(0.4)  
157 - Row() {  
158 - Text(`${this.commentNum}`)  
159 - .textStyle()  
160 - Text("评论")  
161 - .textStyle2()  
162 - }.margin({ right: '15lpx', left: '15lpx' })  
163 -  
164 - Divider()  
165 - .height('19lpx')  
166 - .width('2lpx')  
167 - .color($r('app.color.white'))  
168 - .vertical(true)  
169 - .opacity(0.4)  
170 - Row() {  
171 - Text(`${this.attentionNum}`)  
172 - .textStyle()  
173 - Text("关注")  
174 - .textStyle2()  
175 - }.margin({ left: '15lpx' })  
176 - }.margin({ top: '23lpx' })  
177 - }.alignItems(HorizontalAlign.Start)  
178 - .margin({ left: StringUtils.isEmpty(this.levelHead)?'32lpx':"3lpx" })  
179 - }  
180 - .onAreaChange((oldValue: Area, newValue: Area) => {  
181 - if (this.firstPositionY === 0) {  
182 - this.firstPositionY = newValue.globalPosition.y as number  
183 - }else{  
184 - let persent = (this.firstPositionY - Number(newValue.globalPosition.y)) / (this.firstPositionY * 0.3)  
185 - if(persent > 1){  
186 - persent = 1  
187 } 220 }
188 - this.tileOpacity = persent  
189 - }  
190 - })  
191 - .backgroundColor($r('app.color.color_transparent'))  
192 - .height('184lpx')  
193 - .width('100%')  
194 - .padding({ left: '6lpx' })  
195 221
196 222
197 - //用户简介区域  
198 - Column() {  
199 - Row() {  
200 - Text(this.isHasIntroduction?"简介："+this.desc:this.desc)  
201 - .fontSize('27lpx')  
202 - .maxLines(3)  
203 - .textOverflow({ overflow: TextOverflow.Ellipsis })  
204 - .lineHeight('40lpx') 223 + Text(`来到人民日报${this.registerTimeForDay}天`)
  224 + .fontSize('23lpx')
  225 + .lineHeight('25lpx')
205 .fontWeight('400lpx') 226 .fontWeight('400lpx')
206 - .fontColor(this.isHasIntroduction?$r('app.color.color_222222'):$r('app.color.color_999999')) 227 + .fontColor($r('app.color.color_999999'))
207 .textAlign(TextAlign.Start) 228 .textAlign(TextAlign.Start)
208 - .onClick(()=>{  
209 - let params: editModelParams = {  
210 - editContent: this.isHasIntroduction?this.desc:''  
211 - }  
212 - WDRouterRule.jumpWithPage(WDRouterPage.editUserIntroductionPage,params)  
213 - })  
214 - if(!this.isHasIntroduction){  
215 - Image($r('app.media.user_info_edit_icon'))  
216 - .width('27lpx')  
217 - .height('27lpx')  
218 - .interpolation(ImageInterpolation.High)  
219 - .objectFit(ImageFit.Auto)  
220 - }  
221 - } 229 + .margin({ top: '15lpx' })
222 230
  231 + }.padding({ left: '31lpx',right:'31lpx',top:'19lpx',bottom:'31lpx'})
  232 + .alignItems(HorizontalAlign.Start)
  233 + .justifyContent(FlexAlign.Center)
  234 + .width('100%')
  235 + .backgroundColor($r('app.color.white'))
  236 + //间隔符
223 237
224 - Text(`来到人民日报${this.registerTimeForDay}天`)  
225 - .fontSize('23lpx')  
226 - .lineHeight('25lpx')  
227 - .fontWeight('400lpx')  
228 - .fontColor($r('app.color.color_999999'))  
229 - .textAlign(TextAlign.Start)  
230 - .margin({ top: '15lpx' })  
231 -  
232 - }.padding({ left: '31lpx',right:'31lpx',top:'19lpx',bottom:'31lpx'})  
233 - .alignItems(HorizontalAlign.Start)  
234 - .justifyContent(FlexAlign.Center)  
235 - .width('100%')  
236 - .backgroundColor($r('app.color.white'))  
237 - //间隔符  
238 -  
239 - Divider().width('100%').height('12lpx').color($r('app.color.color_F5F5F5')).strokeWidth('12lpx') 238 + Divider().width('100%').height('12lpx').color($r('app.color.color_F5F5F5')).strokeWidth('12lpx')
240 239
241 - //tab 页面  
242 - Stack({ alignContent: Alignment.Top }){  
243 - Tabs({controller: this.controller}) {  
244 - TabContent() {  
245 - HomePageBottomCommentComponent({commentNum:$commentNum})  
246 - }  
247 - TabContent() {  
248 - HomePageBottomFollowComponent() 240 + //tab 页面
  241 + Stack({ alignContent: Alignment.Top }){
  242 + Tabs({controller: this.controller}) {
  243 + TabContent() {
  244 + HomePageBottomCommentComponent({commentNum:$commentNum})
  245 + }
  246 + TabContent() {
  247 + HomePageBottomFollowComponent()
  248 + }
249 } 249 }
250 - }  
251 - .backgroundColor($r('app.color.white'))  
252 - .animationDuration(0)  
253 - .onChange((index: number) => {  
254 - this.currentIndex = index  
255 - trackTabFirstClick(index === 0 ? "评论":"关注")  
256 - })  
257 - .vertical(false)  
258 - .barHeight("77lpx")  
259 -  
260 - Column() {  
261 - // 页签  
262 - Row({ space: 7 }) {  
263 - Scroll() {  
264 - Row() {  
265 - this.TabBuilder(0,"评论")  
266 - this.TabBuilder(1,"关注") 250 + .backgroundColor($r('app.color.white'))
  251 + .animationDuration(0)
  252 + .onChange((index: number) => {
  253 + this.currentIndex = index
  254 + trackTabFirstClick(index === 0 ? "评论":"关注")
  255 + })
  256 + .vertical(false)
  257 + .barHeight("77lpx")
  258 +
  259 + Column() {
  260 + // 页签
  261 + Row({ space: 7 }) {
  262 + Scroll() {
  263 + Row() {
  264 + this.TabBuilder(0,"评论")
  265 + this.TabBuilder(1,"关注")
  266 + }
  267 + .justifyContent(FlexAlign.Start)
267 } 268 }
268 - .justifyContent(FlexAlign.Start) 269 + .align(Alignment.Start)
  270 + .scrollable(ScrollDirection.Horizontal)
  271 + .scrollBar(BarState.Off)
  272 + .width('100%')
  273 + .padding({left:'31lpx'})
269 } 274 }
270 - .align(Alignment.Start)  
271 - .scrollable(ScrollDirection.Horizontal)  
272 - .scrollBar(BarState.Off) 275 + .alignItems(VerticalAlign.Bottom)
273 .width('100%') 276 .width('100%')
274 - .padding({left:'31lpx'})  
275 } 277 }
276 - .alignItems(VerticalAlign.Bottom) 278 + .backgroundColor($r('app.color.white'))
  279 + .alignItems(HorizontalAlign.Start)
277 .width('100%') 280 .width('100%')
  281 + .height('77lpx')
278 } 282 }
279 - .backgroundColor($r('app.color.white'))  
280 - .alignItems(HorizontalAlign.Start)  
281 - .width('100%')  
282 - .height('77lpx')  
283 - }  
284 - }.width("100%")  
285 - }  
286 - .edgeEffect(EdgeEffect.None)  
287 - .scrollBar(BarState.Off)  
288 - .width('100%')  
289 - .layoutWeight(1)  
290 - }.expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.BOTTOM])  
291 - }.width('100%')  
292 - .layoutWeight(1)  
293 - }else{  
294 - Column(){  
295 - CustomTitleUI({ titleName: "" })  
296 -  
297 - EmptyComponent({ emptyType: 1,emptyHeight:"100%" ,retry: () => {  
298 - this.isConnectNetwork = NetworkUtil.isNetConnected()  
299 - if(this.isConnectNetwork){  
300 - this.getUserInfo() 283 + }.width("100%")
  284 + }
  285 + .edgeEffect(EdgeEffect.None)
  286 + .scrollBar(BarState.Off)
  287 + .width('100%')
  288 + .layoutWeight(1)
301 } 289 }
302 - },})  
303 - .layoutWeight(1)  
304 - .width('100%') 290 + .margin({top:px2vp(this.topSafeHeight)})
  291 + }.width('100%')
  292 + .padding({bottom:px2vp(this.bottomSafeHeight)})
  293 + .layoutWeight(1)
  294 + }else{
  295 + Column(){
  296 + CustomTitleUI({ titleName: "" })
  297 +
  298 + EmptyComponent({ emptyType: 1,emptyHeight:"100%" ,retry: () => {
  299 + this.isConnectNetwork = NetworkUtil.isNetConnected()
  300 + if(this.isConnectNetwork){
  301 + this.getUserInfo()
  302 + }
  303 + },})
  304 + .layoutWeight(1)
  305 + .width('100%')
  306 + }
305 } 307 }
306 - }  
307 308
308 } 309 }
309 @Builder MineHomeTitleTransparent() { 310 @Builder MineHomeTitleTransparent() {
@@ -140,7 +140,6 @@ export struct MultiPictureListPage { @@ -140,7 +140,6 @@ export struct MultiPictureListPage {
140 .id('e_picture_container') 140 .id('e_picture_container')
141 // 设置顶部绘制延伸到状态栏 141 // 设置顶部绘制延伸到状态栏
142 // 设置底部绘制延伸到导航条 142 // 设置底部绘制延伸到导航条
143 - .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.TOP, SafeAreaEdge.BOTTOM])  
144 } 143 }
145 144
146 /** 145 /**
@@ -70,7 +70,6 @@ struct OtherNormalUserHomePage { @@ -70,7 +70,6 @@ struct OtherNormalUserHomePage {
70 .width('100%') 70 .width('100%')
71 .height('355lpx') 71 .height('355lpx')
72 .objectFit(ImageFit.Cover) 72 .objectFit(ImageFit.Cover)
73 - .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.TOP])  
74 73
75 Row() 74 Row()
76 .height(px2vp(this.topSafeHeight)) 75 .height(px2vp(this.topSafeHeight))
@@ -78,7 +77,6 @@ struct OtherNormalUserHomePage { @@ -78,7 +77,6 @@ struct OtherNormalUserHomePage {
78 .backgroundColor($r('app.color.white')) 77 .backgroundColor($r('app.color.white'))
79 .visibility(this.tileOpacity > 0 ? 0 : 1) 78 .visibility(this.tileOpacity > 0 ? 0 : 1)
80 .opacity(this.tileOpacity ) 79 .opacity(this.tileOpacity )
81 - .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.TOP])  
82 } 80 }
83 81
84 Column(){ 82 Column(){
@@ -254,7 +252,7 @@ struct OtherNormalUserHomePage { @@ -254,7 +252,7 @@ struct OtherNormalUserHomePage {
254 .scrollBar(BarState.Off) 252 .scrollBar(BarState.Off)
255 .width('100%') 253 .width('100%')
256 .layoutWeight(1) 254 .layoutWeight(1)
257 - }.expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.BOTTOM]) 255 + }
258 }.width('100%') 256 }.width('100%')
259 .layoutWeight(1) 257 .layoutWeight(1)
260 }else{ 258 }else{
@@ -68,7 +68,6 @@ struct VisitorCommentPage { @@ -68,7 +68,6 @@ struct VisitorCommentPage {
68 .width("100%") 68 .width("100%")
69 .height("100%") 69 .height("100%")
70 .backgroundColor($r('app.color.white')) 70 .backgroundColor($r('app.color.white'))
71 - .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.BOTTOM])  
72 CustomPullToRefresh({ 71 CustomPullToRefresh({
73 alldata:this.data, 72 alldata:this.data,
74 scroller:this.scroller, 73 scroller:this.scroller,