Showing
6 changed files
with
28 additions
and
13 deletions
| @@ -57,7 +57,6 @@ export struct OtherHomePageBottomCommentComponent { | @@ -57,7 +57,6 @@ export struct OtherHomePageBottomCommentComponent { | ||
| 57 | this.curPageNum = 1; | 57 | this.curPageNum = 1; |
| 58 | this.hasMore = true | 58 | this.hasMore = true |
| 59 | this.isGetRequest = false | 59 | this.isGetRequest = false |
| 60 | - this.data_comment.clear() | ||
| 61 | 60 | ||
| 62 | if (!this.isLoading){ | 61 | if (!this.isLoading){ |
| 63 | this.getNewPageData() | 62 | this.getNewPageData() |
| @@ -134,6 +133,8 @@ export struct OtherHomePageBottomCommentComponent { | @@ -134,6 +133,8 @@ export struct OtherHomePageBottomCommentComponent { | ||
| 134 | let object = new OtherUserCommentListRequestItem("", 20, this.curPageNum, time, "1", this.curUserId) | 133 | let object = new OtherUserCommentListRequestItem("", 20, this.curPageNum, time, "1", this.curUserId) |
| 135 | 134 | ||
| 136 | MinePageDatasModel.getOtherCommentListData(object, getContext(this)).then((value) => { | 135 | MinePageDatasModel.getOtherCommentListData(object, getContext(this)).then((value) => { |
| 136 | + if (this.curPageNum === 1) this.data_comment.clear() | ||
| 137 | + | ||
| 137 | if (!this.data_comment || value.list.length == 0) { | 138 | if (!this.data_comment || value.list.length == 0) { |
| 138 | this.hasMore = false | 139 | this.hasMore = false |
| 139 | this.isLoading = false | 140 | this.isLoading = false |
| @@ -16,10 +16,10 @@ const TAG = "OtherNormalUserHomePage" | @@ -16,10 +16,10 @@ const TAG = "OtherNormalUserHomePage" | ||
| 16 | struct OtherNormalUserHomePage { | 16 | struct OtherNormalUserHomePage { |
| 17 | @State params:Record<string, string> = router.getParams() as Record<string, string>; | 17 | @State params:Record<string, string> = router.getParams() as Record<string, string>; |
| 18 | @Watch('change') @State curUserId: string = '-1'; | 18 | @Watch('change') @State curUserId: string = '-1'; |
| 19 | - @State topSafeHeight: number = AppStorage.get<number>('topSafeHeight') || 0 | ||
| 20 | pageShowTime:number = 0; | 19 | pageShowTime:number = 0; |
| 21 | pageHideTime:number = 0; | 20 | pageHideTime:number = 0; |
| 22 | - | 21 | + @State topSafeHeight: number = AppStorage.get<number>('topSafeHeight') || 0 |
| 22 | + @State bottomSafeHeight: number = AppStorage.get<number>('bottomSafeHeight') || 0 | ||
| 23 | 23 | ||
| 24 | onPageShow() { | 24 | onPageShow() { |
| 25 | this.curUserId = this.params?.['userId']; | 25 | this.curUserId = this.params?.['userId']; |
| @@ -68,7 +68,7 @@ struct OtherNormalUserHomePage { | @@ -68,7 +68,7 @@ struct OtherNormalUserHomePage { | ||
| 68 | Stack({ alignContent: Alignment.Top }){ | 68 | Stack({ alignContent: Alignment.Top }){ |
| 69 | Image($r('app.media.title_bg')) | 69 | Image($r('app.media.title_bg')) |
| 70 | .width('100%') | 70 | .width('100%') |
| 71 | - .height('355lpx') | 71 | + .height(`calc(${295 + this.topSafeHeight + 'lpx'})`) |
| 72 | .objectFit(ImageFit.Cover) | 72 | .objectFit(ImageFit.Cover) |
| 73 | 73 | ||
| 74 | Row() | 74 | Row() |
| @@ -83,7 +83,7 @@ struct OtherNormalUserHomePage { | @@ -83,7 +83,7 @@ struct OtherNormalUserHomePage { | ||
| 83 | Stack({ alignContent: Alignment.Top }){ | 83 | Stack({ alignContent: Alignment.Top }){ |
| 84 | this.MineHomeTitleTransparent() | 84 | this.MineHomeTitleTransparent() |
| 85 | this.MineHomeTitleWhite() | 85 | this.MineHomeTitleWhite() |
| 86 | - } | 86 | + }.margin({top:px2vp(this.topSafeHeight)}) |
| 87 | 87 | ||
| 88 | Scroll() { | 88 | Scroll() { |
| 89 | Column() { | 89 | Column() { |
| @@ -175,7 +175,7 @@ struct OtherNormalUserHomePage { | @@ -175,7 +175,7 @@ struct OtherNormalUserHomePage { | ||
| 175 | this.tileOpacity = persent | 175 | this.tileOpacity = persent |
| 176 | } | 176 | } |
| 177 | }) | 177 | }) |
| 178 | - .backgroundColor($r('app.color.color_transparent')) | 178 | + // .backgroundColor($r('app.color.color_transparent')) |
| 179 | .height('184lpx') | 179 | .height('184lpx') |
| 180 | .width('100%') | 180 | .width('100%') |
| 181 | .padding({ left: '6lpx' }) | 181 | .padding({ left: '6lpx' }) |
| @@ -184,7 +184,7 @@ struct OtherNormalUserHomePage { | @@ -184,7 +184,7 @@ struct OtherNormalUserHomePage { | ||
| 184 | if(StringUtils.isNotEmpty(this.desc)){ | 184 | if(StringUtils.isNotEmpty(this.desc)){ |
| 185 | Column() { | 185 | Column() { |
| 186 | Row() { | 186 | Row() { |
| 187 | - Text(this.desc) | 187 | + Text('简介:'+this.desc) |
| 188 | .fontSize('27lpx') | 188 | .fontSize('27lpx') |
| 189 | .maxLines(3) | 189 | .maxLines(3) |
| 190 | .textOverflow({ overflow: TextOverflow.Ellipsis }) | 190 | .textOverflow({ overflow: TextOverflow.Ellipsis }) |
| @@ -2,12 +2,12 @@ import { CommentListItem } from './CommentListItem' | @@ -2,12 +2,12 @@ import { CommentListItem } from './CommentListItem' | ||
| 2 | 2 | ||
| 3 | export class MineCommentListDetailItem{ | 3 | export class MineCommentListDetailItem{ |
| 4 | list:CommentListItem[] = [] | 4 | list:CommentListItem[] = [] |
| 5 | - | 5 | + hasNext: number = 1 |
| 6 | pageNum: number = 0 | 6 | pageNum: number = 0 |
| 7 | pageSize: number = 20 | 7 | pageSize: number = 20 |
| 8 | totalCount: number = 0 | 8 | totalCount: number = 0 |
| 9 | 9 | ||
| 10 | - constructor(list?:CommentListItem[],pageNum?: number,pageSize?: number,totalCount?: number) { | 10 | + constructor(list?:CommentListItem[],hasNext?: number,pageNum?: number,pageSize?: number,totalCount?: number) { |
| 11 | } | 11 | } |
| 12 | 12 | ||
| 13 | } | 13 | } |
| @@ -59,10 +59,13 @@ struct LoginProtocolWebview { | @@ -59,10 +59,13 @@ struct LoginProtocolWebview { | ||
| 59 | .width(24) | 59 | .width(24) |
| 60 | .aspectRatio(1) | 60 | .aspectRatio(1) |
| 61 | .onClick(() => { | 61 | .onClick(() => { |
| 62 | + if (this.isConnectNetwork){ | ||
| 63 | + ///无网络状态下 执行webviewController.accessBackward方法 会crash | ||
| 62 | if(this.webviewController.accessBackward()){ | 64 | if(this.webviewController.accessBackward()){ |
| 63 | this.webviewController.backward() | 65 | this.webviewController.backward() |
| 64 | return | 66 | return |
| 65 | } | 67 | } |
| 68 | + } | ||
| 66 | router.back(); | 69 | router.back(); |
| 67 | }).margin({ left: 16 }) | 70 | }).margin({ left: 16 }) |
| 68 | Text() | 71 | Text() |
| 1 | import {InterestsHobbiesModel, InterestsList} from '../viewModel/InterestsHobbiesModel' | 1 | import {InterestsHobbiesModel, InterestsList} from '../viewModel/InterestsHobbiesModel' |
| 2 | import { WDRouterRule } from 'wdRouter'; | 2 | import { WDRouterRule } from 'wdRouter'; |
| 3 | import { WDRouterPage } from 'wdRouter'; | 3 | import { WDRouterPage } from 'wdRouter'; |
| 4 | -import { SPHelper } from 'wdKit/Index'; | ||
| 5 | -import { SpConstants } from 'wdConstant/Index'; | 4 | +import { NetworkUtil, SPHelper } from 'wdKit/Index'; |
| 5 | +import { SpConstants, ViewType } from 'wdConstant/Index'; | ||
| 6 | import { CustomToast} from 'wdKit' | 6 | import { CustomToast} from 'wdKit' |
| 7 | import { ButtonOptions, promptAction, window } from '@kit.ArkUI'; | 7 | import { ButtonOptions, promptAction, window } from '@kit.ArkUI'; |
| 8 | import { ParamType, TrackConstants, TrackingContent } from 'wdTracking/Index'; | 8 | import { ParamType, TrackConstants, TrackingContent } from 'wdTracking/Index'; |
| 9 | import { ImageKnifeComponent,ScaleType } from '@ohos/imageknife'; | 9 | import { ImageKnifeComponent,ScaleType } from '@ohos/imageknife'; |
| 10 | +import { EmptyComponent, WDViewDefaultType } from 'wdComponent/Index'; | ||
| 10 | 11 | ||
| 11 | @Entry | 12 | @Entry |
| 12 | @Component | 13 | @Component |
| @@ -16,7 +17,7 @@ struct LaunchInterestsHobbiesPage { | @@ -16,7 +17,7 @@ struct LaunchInterestsHobbiesPage { | ||
| 16 | @State interestsArray: InterestsList[] = [] | 17 | @State interestsArray: InterestsList[] = [] |
| 17 | @State bottomSafeHeight: number = AppStorage.get<number>('bottomSafeHeight') || 0 | 18 | @State bottomSafeHeight: number = AppStorage.get<number>('bottomSafeHeight') || 0 |
| 18 | @State topSafeHeight: number = AppStorage.get<number>('topSafeHeight') || 0 | 19 | @State topSafeHeight: number = AppStorage.get<number>('topSafeHeight') || 0 |
| 19 | - | 20 | + @State isConnectNetwork : boolean = NetworkUtil.isNetConnected() |
| 20 | dialogToast: CustomDialogController = new CustomDialogController({ | 21 | dialogToast: CustomDialogController = new CustomDialogController({ |
| 21 | builder: CustomToast({ | 22 | builder: CustomToast({ |
| 22 | msg: '请先选择您感兴趣的内容哦', | 23 | msg: '请先选择您感兴趣的内容哦', |
| @@ -72,6 +73,13 @@ struct LaunchInterestsHobbiesPage { | @@ -72,6 +73,13 @@ struct LaunchInterestsHobbiesPage { | ||
| 72 | .height('35lpx') | 73 | .height('35lpx') |
| 73 | .margin({top:'12lpx'}) | 74 | .margin({top:'12lpx'}) |
| 74 | 75 | ||
| 76 | + if(!this.isConnectNetwork){ | ||
| 77 | + EmptyComponent({ emptyType: 1,emptyHeight:"60%" ,retry: () => { | ||
| 78 | + this.isConnectNetwork = NetworkUtil.isNetConnected() | ||
| 79 | + }}) | ||
| 80 | + .layoutWeight(1) | ||
| 81 | + .width('100%') | ||
| 82 | + }else{ | ||
| 75 | Grid( ){ | 83 | Grid( ){ |
| 76 | ForEach(this.interestsArray,(item:InterestsList,index:number)=>{ | 84 | ForEach(this.interestsArray,(item:InterestsList,index:number)=>{ |
| 77 | GridItem(){ | 85 | GridItem(){ |
| @@ -138,6 +146,9 @@ struct LaunchInterestsHobbiesPage { | @@ -138,6 +146,9 @@ struct LaunchInterestsHobbiesPage { | ||
| 138 | .rowsGap('23lpx') | 146 | .rowsGap('23lpx') |
| 139 | .scrollBar(BarState.Off) | 147 | .scrollBar(BarState.Off) |
| 140 | } | 148 | } |
| 149 | + | ||
| 150 | + | ||
| 151 | + } | ||
| 141 | .width('100%') | 152 | .width('100%') |
| 142 | .height('100%') | 153 | .height('100%') |
| 143 | } | 154 | } |
| @@ -110,7 +110,7 @@ export default struct CustomDialogComponent { | @@ -110,7 +110,7 @@ export default struct CustomDialogComponent { | ||
| 110 | .margin({top: 1}) | 110 | .margin({top: 1}) |
| 111 | } | 111 | } |
| 112 | .width('528lpx') | 112 | .width('528lpx') |
| 113 | - .borderRadius('15') | 113 | + .borderRadius('10') |
| 114 | .backgroundColor(Color.White) | 114 | .backgroundColor(Color.White) |
| 115 | .clip(true) | 115 | .clip(true) |
| 116 | 116 |
-
Please register or login to post a comment