developOne / harmonyPool

Go to a project
Toggle navigation Toggle navigation pinning
liyubing
da1ba84c 2 parents b1228d0c 354138e2

Merge remote-tracking branch 'origin/main'

Inline Side-by-side
Showing 35 changed files with 205 additions and 173 deletions
@@ -5,8 +5,8 @@ @@ -5,8 +5,8 @@
5 "description": "$string:shared_desc", 5 "description": "$string:shared_desc",
6 "deviceTypes": [ 6 "deviceTypes": [
7 "phone", 7 "phone",
8 - "tablet",  
9 - "2in1" 8 +// "tablet",
  9 +// "2in1"
10 ], 10 ],
11 "compressNativeLibs": true, 11 "compressNativeLibs": true,
12 "deliveryWithInstall": true 12 "deliveryWithInstall": true
@@ -5,8 +5,8 @@ @@ -5,8 +5,8 @@
5 "description": "$string:shared_desc", 5 "description": "$string:shared_desc",
6 "deviceTypes": [ 6 "deviceTypes": [
7 "phone", 7 "phone",
8 - "tablet",  
9 - "2in1" 8 +// "tablet",
  9 +// "2in1"
10 ] 10 ]
11 } 11 }
12 } 12 }
@@ -5,8 +5,8 @@ @@ -5,8 +5,8 @@
5 "description": "$string:shared_desc", 5 "description": "$string:shared_desc",
6 "deviceTypes": [ 6 "deviceTypes": [
7 "phone", 7 "phone",
8 - "tablet",  
9 - "2in1" 8 +// "tablet",
  9 +// "2in1"
10 ], 10 ],
11 "compressNativeLibs": true, 11 "compressNativeLibs": true,
12 "deliveryWithInstall": true, 12 "deliveryWithInstall": true,
@@ -5,8 +5,8 @@ @@ -5,8 +5,8 @@
5 "description": "$string:shared_desc", 5 "description": "$string:shared_desc",
6 "deviceTypes": [ 6 "deviceTypes": [
7 "phone", 7 "phone",
8 - "tablet",  
9 - "2in1" 8 +// "tablet",
  9 +// "2in1"
10 ], 10 ],
11 "compressNativeLibs": true, 11 "compressNativeLibs": true,
12 "deliveryWithInstall": true, 12 "deliveryWithInstall": true,
@@ -5,8 +5,8 @@ @@ -5,8 +5,8 @@
5 "description": "$string:shared_desc", 5 "description": "$string:shared_desc",
6 "deviceTypes": [ 6 "deviceTypes": [
7 "phone", 7 "phone",
8 - "tablet",  
9 - "2in1" 8 +// "tablet",
  9 +// "2in1"
10 ], 10 ],
11 "compressNativeLibs": true, 11 "compressNativeLibs": true,
12 "deliveryWithInstall": true 12 "deliveryWithInstall": true
@@ -5,8 +5,8 @@ @@ -5,8 +5,8 @@
5 "description": "$string:shared_desc", 5 "description": "$string:shared_desc",
6 "deviceTypes": [ 6 "deviceTypes": [
7 "phone", 7 "phone",
8 - "tablet",  
9 - "2in1" 8 +// "tablet",
  9 +// "2in1"
10 ], 10 ],
11 "compressNativeLibs": true, 11 "compressNativeLibs": true,
12 "deliveryWithInstall": true, 12 "deliveryWithInstall": true,
@@ -5,8 +5,8 @@ @@ -5,8 +5,8 @@
5 "description": "$string:shared_desc", 5 "description": "$string:shared_desc",
6 "deviceTypes": [ 6 "deviceTypes": [
7 "phone", 7 "phone",
8 - "tablet",  
9 - "2in1" 8 +// "tablet",
  9 +// "2in1"
10 ], 10 ],
11 "compressNativeLibs": true, 11 "compressNativeLibs": true,
12 "deliveryWithInstall": true 12 "deliveryWithInstall": true
@@ -5,8 +5,8 @@ @@ -5,8 +5,8 @@
5 "description": "$string:shared_desc", 5 "description": "$string:shared_desc",
6 "deviceTypes": [ 6 "deviceTypes": [
7 "phone", 7 "phone",
8 - "tablet",  
9 - "2in1" 8 +// "tablet",
  9 +// "2in1"
10 ], 10 ],
11 "compressNativeLibs": true, 11 "compressNativeLibs": true,
12 "deliveryWithInstall": true 12 "deliveryWithInstall": true
@@ -233,7 +233,8 @@ struct createImg { @@ -233,7 +233,8 @@ struct createImg {
233 }) 233 })
234 } 234 }
235 } 235 }
236 - } else if (this.fullColumnImgUrls.length === 4) { 236 + } else if (this.fullColumnImgUrls.length === 5) {
  237 + // 四图卡里面塞了一张补位卡
237 GridCol({ 238 GridCol({
238 span: { xs: 4 } 239 span: { xs: 4 }
239 }) { 240 }) {
@@ -53,7 +53,7 @@ export struct Card5Component { @@ -53,7 +53,7 @@ export struct Card5Component {
53 } 53 }
54 ) 54 )
55 .aspectRatio(343 / 225) 55 .aspectRatio(343 / 225)
56 - if (!!this.titleShowPolicy) { 56 + if (!!this.titleShowPolicy || this.titleShowPolicy === null ) {
57 Row() 57 Row()
58 .borderRadius( 58 .borderRadius(
59 { 59 {
@@ -273,14 +273,14 @@ struct indicatorAnimations { @@ -273,14 +273,14 @@ struct indicatorAnimations {
273 if (this.isAutoPlay) { 273 if (this.isAutoPlay) {
274 setTimeout(() => { 274 setTimeout(() => {
275 this.leftW = '100%' 275 this.leftW = '100%'
276 - this.centerFontSize = 11 276 + this.centerFontSize = 10
277 }, 0) 277 }, 0)
278 setTimeout(() => { 278 setTimeout(() => {
279 this.rightW = '100%' 279 this.rightW = '100%'
280 }, 1500) 280 }, 1500)
281 } else { 281 } else {
282 this.leftW = '100%' 282 this.leftW = '100%'
283 - this.centerFontSize = 11 283 + this.centerFontSize = 10
284 this.rightW = '100%' 284 this.rightW = '100%'
285 } 285 }
286 286
@@ -307,7 +307,7 @@ struct indicatorAnimations { @@ -307,7 +307,7 @@ struct indicatorAnimations {
307 Text(this.index + 1 < 10 ? `0${this.index + 1}` : `${this.index + 1}`) 307 Text(this.index + 1 < 10 ? `0${this.index + 1}` : `${this.index + 1}`)
308 .fontSize(this.centerFontSize) 308 .fontSize(this.centerFontSize)
309 .fontColor($r('app.color.white')) 309 .fontColor($r('app.color.white'))
310 - .width(16) 310 + .width(11)
311 .textAlign(TextAlign.Center) 311 .textAlign(TextAlign.Center)
312 .margin({ 312 .margin({
313 bottom: -2 313 bottom: -2
@@ -153,8 +153,8 @@ export struct ZhSingleRow02 { @@ -153,8 +153,8 @@ export struct ZhSingleRow02 {
153 .padding({ 153 .padding({
154 left: $r('app.float.card_comp_pagePadding_lf'), 154 left: $r('app.float.card_comp_pagePadding_lf'),
155 // right: $r('app.float.card_comp_pagePadding_lf'), 155 // right: $r('app.float.card_comp_pagePadding_lf'),
156 - top: $r('app.float.card_comp_pagePadding_tb'),  
157 - bottom: $r('app.float.card_comp_pagePadding_tb') 156 + top: 8,
  157 + bottom: 8
158 }) 158 })
159 .backgroundColor($r('app.color.white')) 159 .backgroundColor($r('app.color.white'))
160 .margin({ bottom: 8 }) 160 .margin({ bottom: 8 })
@@ -244,6 +244,7 @@ export struct ZhSingleRow03 { @@ -244,6 +244,7 @@ export struct ZhSingleRow03 {
244 .width(154) 244 .width(154)
245 .height(60) 245 .height(60)
246 .maxLines(3) 246 .maxLines(3)
  247 + .fontSize(15)
247 .textOverflow({overflow: TextOverflow.Ellipsis}) 248 .textOverflow({overflow: TextOverflow.Ellipsis})
248 } 249 }
249 .margin({bottom: 16}) 250 .margin({bottom: 16})
@@ -254,8 +255,10 @@ export struct ZhSingleRow03 { @@ -254,8 +255,10 @@ export struct ZhSingleRow03 {
254 Text(this.format(new Date(item.liveInfo.liveStartTime).getTime())) 255 Text(this.format(new Date(item.liveInfo.liveStartTime).getTime()))
255 .margin({right: 6}) 256 .margin({right: 6})
256 .fontColor(0x000000) 257 .fontColor(0x000000)
257 - .fontSize(13) 258 + .fontSize(12)
258 .textAlign(TextAlign.Start) 259 .textAlign(TextAlign.Start)
  260 + .fontFamily('PingFang SC-Semibold')
  261 + .fontWeight(600)
259 Image($r('app.media.timeline_rect')) 262 Image($r('app.media.timeline_rect'))
260 .width(4) 263 .width(4)
261 .height(3) 264 .height(3)
@@ -263,10 +266,13 @@ export struct ZhSingleRow03 { @@ -263,10 +266,13 @@ export struct ZhSingleRow03 {
263 Text(item.liveInfo.liveStartTime.split(' ')[1].slice(0, 5)) 266 Text(item.liveInfo.liveStartTime.split(' ')[1].slice(0, 5))
264 .margin({right: 6}) 267 .margin({right: 6})
265 .fontColor(0x000000) 268 .fontColor(0x000000)
266 - .fontSize(13) 269 + .fontSize(12)
  270 + .fontFamily('PingFang SC-Semibold')
  271 + .fontWeight(600)
267 Text('开始直播') 272 Text('开始直播')
268 .fontColor(0xC8C8C8) 273 .fontColor(0xC8C8C8)
269 - .fontSize(13) 274 + .fontSize(12)
  275 + .fontFamily('PingFang SC-Semibold')
270 } 276 }
271 277
272 Row() { 278 Row() {
@@ -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
@@ -142,11 +142,11 @@ export struct HorizontalStrokeCardThreeTwoRadioForMoreComponent { @@ -142,11 +142,11 @@ export struct HorizontalStrokeCardThreeTwoRadioForMoreComponent {
142 .textOverflow({ overflow: TextOverflow.Ellipsis })// 超出的部分显示省略号。 142 .textOverflow({ overflow: TextOverflow.Ellipsis })// 超出的部分显示省略号。
143 .textAlign(TextAlign.Start) 143 .textAlign(TextAlign.Start)
144 .margin({ top: 8 }) 144 .margin({ top: 8 })
145 - .width(150) 145 + .width(this.compDTO.operDataList.length == 2 ? 210 : 150)
146 .lineHeight(19) 146 .lineHeight(19)
147 - .height(42)  
148 .lineHeight(21) 147 .lineHeight(21)
149 } 148 }
  149 + .height(134)
150 .padding({ right: 16 }) 150 .padding({ right: 16 })
151 // .offset({x:16}) 151 // .offset({x:16})
152 .onClick(() => { 152 .onClick(() => {
@@ -146,16 +146,18 @@ export struct LiveHorizontalCardComponent { @@ -146,16 +146,18 @@ export struct LiveHorizontalCardComponent {
146 Column() { 146 Column() {
147 Stack({ alignContent: Alignment.BottomEnd }) { 147 Stack({ alignContent: Alignment.BottomEnd }) {
148 Image(this.loadImg ? item.coverUrl : '') 148 Image(this.loadImg ? item.coverUrl : '')
149 - .backgroundColor(0xf5f5f5) 149 + .backgroundColor(this.loadImg ? 0xffffff : 0xf5f5f5)
150 .aspectRatio(16 / 9) 150 .aspectRatio(16 / 9)
151 .width(this.compDTO.operDataList.length == 2 ? 210 : 150) 151 .width(this.compDTO.operDataList.length == 2 ? 210 : 150)
152 - .borderRadius(4)  
153 - .objectFit(ImageFit.Cover) 152 + // .borderRadius(4)
  153 + .objectFit(ImageFit.Contain)
154 CardMediaInfo({ 154 CardMediaInfo({
155 livePeopleNum:false, 155 livePeopleNum:false,
156 contentDTO: item 156 contentDTO: item
157 }) 157 })
158 } 158 }
  159 + .borderRadius(4)
  160 + .border({width: 1, color: 0xf5f5f5})
159 161
160 Text(item.newsTitle) 162 Text(item.newsTitle)
161 .fontSize($r("app.float.font_size_14")) 163 .fontSize($r("app.float.font_size_14"))
@@ -166,9 +168,9 @@ export struct LiveHorizontalCardComponent { @@ -166,9 +168,9 @@ export struct LiveHorizontalCardComponent {
166 .textAlign(TextAlign.Start) 168 .textAlign(TextAlign.Start)
167 .margin({ top: 8 }) 169 .margin({ top: 8 })
168 .width(this.compDTO.operDataList.length == 2 ? 210 : 150) 170 .width(this.compDTO.operDataList.length == 2 ? 210 : 150)
169 - .height(42)  
170 .lineHeight(21) 171 .lineHeight(21)
171 } 172 }
  173 + .height(134)
172 .padding({ right: 16 }) 174 .padding({ right: 16 })
173 .onClick(() => { 175 .onClick(() => {
174 InfomationCardClick.track(this.compDTO, item, this.pageId, this.pageName) 176 InfomationCardClick.track(this.compDTO, item, this.pageId, this.pageName)
@@ -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 })
@@ -26,6 +26,8 @@ struct SearchCreatorPage { @@ -26,6 +26,8 @@ struct SearchCreatorPage {
26 @State isLoading: boolean = false 26 @State isLoading: boolean = false
27 @State hasMore: boolean = true 27 @State hasMore: boolean = true
28 curPageNum: number = 1; 28 curPageNum: number = 1;
  29 + @State topSafeHeight: number = AppStorage.get<number>('topSafeHeight') || 0
  30 + @State bottomSafeHeight: number = AppStorage.get<number>('bottomSafeHeight') || 0
29 31
30 onPageShow() { 32 onPageShow() {
31 this.keyword = this.params?.pageID; 33 this.keyword = this.params?.pageID;
@@ -154,51 +156,57 @@ struct SearchCreatorPage { @@ -154,51 +156,57 @@ struct SearchCreatorPage {
154 } 156 }
155 157
156 build() { 158 build() {
157 - Column() {  
158 - CustomTitleUI({ titleName: "全部结果" })  
159 - Divider()  
160 - .width('100%')  
161 - .height('1lpx')  
162 - .color($r('app.color.color_F5F5F5'))  
163 - .strokeWidth('1lpx')  
164 -  
165 - Column(){  
166 - if(this.count === 0){  
167 - ListHasNoMoreDataUI({style:2})  
168 - .height('100%')  
169 - }else{  
170 - List({ space: 3 }) {  
171 - LazyForEach(this.data, (item: FollowListDetailItem, index: number = 0) => {  
172 - ListItem() {  
173 - FollowChildComponent({data: item,type:1})  
174 - }  
175 - .onClick(() => {  
176 - })  
177 - }, (item: FollowListDetailItem, index: number) => index.toString()) 159 + Column(){
  160 + Column() {
  161 + CustomTitleUI({ titleName: "全部结果" })
  162 + Divider()
  163 + .width('100%')
  164 + .height('1lpx')
  165 + .color($r('app.color.color_F5F5F5'))
  166 + .strokeWidth('1lpx')
  167 +
  168 + Column(){
  169 + if(this.count === 0){
  170 + ListHasNoMoreDataUI({style:2})
  171 + .height('100%')
  172 + }else{
  173 + List({ space: 3 }) {
  174 + LazyForEach(this.data, (item: FollowListDetailItem, index: number = 0) => {
  175 + ListItem() {
  176 + FollowChildComponent({data: item,type:1})
  177 + }
  178 + .onClick(() => {
  179 + })
  180 + }, (item: FollowListDetailItem, index: number) => index.toString())
178 181
179 - //没有更多数据 显示提示  
180 - if(!this.hasMore){  
181 - ListItem(){  
182 - ListHasNoMoreDataUI() 182 + //没有更多数据 显示提示
  183 + if(!this.hasMore){
  184 + ListItem(){
  185 + ListHasNoMoreDataUI()
  186 + }
183 } 187 }
184 - }  
185 - }.cachedCount(5)  
186 - .padding({left:'31lpx',right:'31lpx'})  
187 - .layoutWeight(1)  
188 - .scrollBar(BarState.Off)  
189 - .onReachEnd(()=>{  
190 - console.log(TAG,"触底了");  
191 - if(!this.isLoading){  
192 - this.isLoading = true  
193 - //加载分页数据  
194 - this.getNewPageData()  
195 - }  
196 - })  
197 - }  
198 - }.layoutWeight(1) 188 + }.cachedCount(5)
  189 + .padding({left:'31lpx',right:'31lpx'})
  190 + .layoutWeight(1)
  191 + .scrollBar(BarState.Off)
  192 + .onReachEnd(()=>{
  193 + console.log(TAG,"触底了");
  194 + if(!this.isLoading){
  195 + this.isLoading = true
  196 + //加载分页数据
  197 + this.getNewPageData()
  198 + }
  199 + })
  200 + }
  201 + }.layoutWeight(1)
  202 + .width('100%')
  203 + }
199 .width('100%') 204 .width('100%')
200 - }  
201 - .width('100%')  
202 - .height('100%') 205 + .height('100%')
  206 + }.width("100%")
  207 + .height("100%")
  208 + .backgroundColor($r('app.color.color_transparent'))
  209 + .padding({top:px2vp(this.topSafeHeight)})
  210 +
203 } 211 }
204 } 212 }
@@ -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 }
@@ -5,8 +5,8 @@ @@ -5,8 +5,8 @@
5 "description": "$string:shared_desc", 5 "description": "$string:shared_desc",
6 "deviceTypes": [ 6 "deviceTypes": [
7 "phone", 7 "phone",
8 - "tablet",  
9 - "2in1" 8 +// "tablet",
  9 +// "2in1"
10 ], 10 ],
11 "compressNativeLibs": true, 11 "compressNativeLibs": true,
12 "deliveryWithInstall": true, 12 "deliveryWithInstall": true,
@@ -5,8 +5,8 @@ @@ -5,8 +5,8 @@
5 "description": "$string:shared_desc", 5 "description": "$string:shared_desc",
6 "deviceTypes": [ 6 "deviceTypes": [
7 "phone", 7 "phone",
8 - "tablet",  
9 - "2in1" 8 +// "tablet",
  9 +// "2in1"
10 ], 10 ],
11 "compressNativeLibs": true, 11 "compressNativeLibs": true,
12 "deliveryWithInstall": true, 12 "deliveryWithInstall": true,
@@ -5,8 +5,8 @@ @@ -5,8 +5,8 @@
5 "description": "$string:shared_desc", 5 "description": "$string:shared_desc",
6 "deviceTypes": [ 6 "deviceTypes": [
7 "phone", 7 "phone",
8 - "tablet",  
9 - "2in1" 8 +// "tablet",
  9 +// "2in1"
10 ], 10 ],
11 "compressNativeLibs": true, 11 "compressNativeLibs": true,
12 "deliveryWithInstall": true, 12 "deliveryWithInstall": true,
@@ -5,8 +5,8 @@ @@ -5,8 +5,8 @@
5 "description": "$string:shared_desc", 5 "description": "$string:shared_desc",
6 "deviceTypes": [ 6 "deviceTypes": [
7 "phone", 7 "phone",
8 - "tablet",  
9 - "2in1" 8 +// "tablet",
  9 +// "2in1"
10 ], 10 ],
11 "compressNativeLibs": true, 11 "compressNativeLibs": true,
12 "deliveryWithInstall": true, 12 "deliveryWithInstall": true,
@@ -5,8 +5,8 @@ @@ -5,8 +5,8 @@
5 "description": "$string:shared_desc", 5 "description": "$string:shared_desc",
6 "deviceTypes": [ 6 "deviceTypes": [
7 "phone", 7 "phone",
8 - "tablet",  
9 - "2in1" 8 +// "tablet",
  9 +// "2in1"
10 ], 10 ],
11 "compressNativeLibs": true, 11 "compressNativeLibs": true,
12 "deliveryWithInstall": true, 12 "deliveryWithInstall": true,
@@ -5,8 +5,8 @@ @@ -5,8 +5,8 @@
5 "description": "$string:shared_desc", 5 "description": "$string:shared_desc",
6 "deviceTypes": [ 6 "deviceTypes": [
7 "phone", 7 "phone",
8 - "tablet",  
9 - "2in1" 8 +// "tablet",
  9 +// "2in1"
10 ], 10 ],
11 "compressNativeLibs": true, 11 "compressNativeLibs": true,
12 "deliveryWithInstall": true, 12 "deliveryWithInstall": true,
@@ -5,8 +5,8 @@ @@ -5,8 +5,8 @@
5 "description": "$string:shared_desc", 5 "description": "$string:shared_desc",
6 "deviceTypes": [ 6 "deviceTypes": [
7 "phone", 7 "phone",
8 - "tablet",  
9 - "2in1" 8 +// "tablet",
  9 +// "2in1"
10 ], 10 ],
11 "compressNativeLibs": true, 11 "compressNativeLibs": true,
12 "deliveryWithInstall": true 12 "deliveryWithInstall": true
@@ -59,9 +59,12 @@ struct LoginProtocolWebview { @@ -59,9 +59,12 @@ struct LoginProtocolWebview {
59 .width(24) 59 .width(24)
60 .aspectRatio(1) 60 .aspectRatio(1)
61 .onClick(() => { 61 .onClick(() => {
62 - if(this.webviewController.accessBackward()){  
63 - this.webviewController.backward()  
64 - return 62 + if (this.isConnectNetwork){
  63 + ///无网络状态下 执行webviewController.accessBackward方法 会crash
  64 + if(this.webviewController.accessBackward()){
  65 + this.webviewController.backward()
  66 + return
  67 + }
65 } 68 }
66 router.back(); 69 router.back();
67 }).margin({ left: 16 }) 70 }).margin({ left: 16 })
@@ -5,8 +5,8 @@ @@ -5,8 +5,8 @@
5 "description": "$string:shared_desc", 5 "description": "$string:shared_desc",
6 "deviceTypes": [ 6 "deviceTypes": [
7 "phone", 7 "phone",
8 - "tablet",  
9 - "2in1" 8 +// "tablet",
  9 +// "2in1"
10 ], 10 ],
11 "compressNativeLibs": true, 11 "compressNativeLibs": true,
12 "deliveryWithInstall": true, 12 "deliveryWithInstall": true,
@@ -5,8 +5,8 @@ @@ -5,8 +5,8 @@
5 "description": "$string:shared_desc", 5 "description": "$string:shared_desc",
6 "deviceTypes": [ 6 "deviceTypes": [
7 "phone", 7 "phone",
8 - "tablet",  
9 - "2in1" 8 +// "tablet",
  9 +// "2in1"
10 ], 10 ],
11 "compressNativeLibs": true, 11 "compressNativeLibs": true,
12 "deliveryWithInstall": true, 12 "deliveryWithInstall": true,
@@ -5,8 +5,8 @@ @@ -5,8 +5,8 @@
5 "description": "$string:shared_desc", 5 "description": "$string:shared_desc",
6 "deviceTypes": [ 6 "deviceTypes": [
7 "phone", 7 "phone",
8 - "tablet",  
9 - "2in1" 8 +// "tablet",
  9 +// "2in1"
10 ], 10 ],
11 "compressNativeLibs": true, 11 "compressNativeLibs": true,
12 "deliveryWithInstall": true, 12 "deliveryWithInstall": true,
@@ -5,8 +5,8 @@ @@ -5,8 +5,8 @@
5 "description": "$string:shared_desc", 5 "description": "$string:shared_desc",
6 "deviceTypes": [ 6 "deviceTypes": [
7 "phone", 7 "phone",
8 - "tablet",  
9 - "2in1" 8 +// "tablet",
  9 +// "2in1"
10 ], 10 ],
11 "compressNativeLibs": true, 11 "compressNativeLibs": true,
12 "deliveryWithInstall": true, 12 "deliveryWithInstall": true,
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,71 +73,81 @@ struct LaunchInterestsHobbiesPage { @@ -72,71 +73,81 @@ struct LaunchInterestsHobbiesPage {
72 .height('35lpx') 73 .height('35lpx')
73 .margin({top:'12lpx'}) 74 .margin({top:'12lpx'})
74 75
75 - Grid( ){  
76 - ForEach(this.interestsArray,(item:InterestsList,index:number)=>{  
77 - GridItem(){  
78 - Stack({alignContent:Alignment.TopStart}){  
79 - ImageKnifeComponent({imageKnifeOption:{loadSrc:item.pic?item.pic:'',mainScaleType:ScaleType.FIT_XY}})  
80 - .width('100%')  
81 - .height('100%')  
82 - .backgroundColor(Color.White)  
83 - .borderRadius(5)  
84 - // Image(item.pic)  
85 - // .width('100%')  
86 - // .height('100%')  
87 - // .backgroundColor(Color.White)  
88 - // .borderRadius(5)  
89 - Stack(){  
90 - Image('') 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{
  83 + Grid( ){
  84 + ForEach(this.interestsArray,(item:InterestsList,index:number)=>{
  85 + GridItem(){
  86 + Stack({alignContent:Alignment.TopStart}){
  87 + ImageKnifeComponent({imageKnifeOption:{loadSrc:item.pic?item.pic:'',mainScaleType:ScaleType.FIT_XY}})
91 .width('100%') 88 .width('100%')
92 .height('100%') 89 .height('100%')
93 - .backgroundColor(Color.Black)  
94 - .opacity(item.choose?0.5:0) 90 + .backgroundColor(Color.White)
95 .borderRadius(5) 91 .borderRadius(5)
96 - }  
97 - Stack(){  
98 - Column({}){  
99 - Text(item.name)  
100 - .fontSize(18)  
101 - .fontColor('#FFFFFF')  
102 - .margin({top:'21lpx',left:'19lpx'})  
103 - .width('100%')  
104 - .height('46lpx')  
105 - .fontWeight(FontWeight.Bold)  
106 - Text(item.title)  
107 - .fontSize('23lpx')  
108 - .fontColor('#FFFFFF')  
109 - .margin({top:'2lpx',left:'19lpx'}) 92 + // Image(item.pic)
  93 + // .width('100%')
  94 + // .height('100%')
  95 + // .backgroundColor(Color.White)
  96 + // .borderRadius(5)
  97 + Stack(){
  98 + Image('')
110 .width('100%') 99 .width('100%')
111 - .height('31lpx')  
112 - Image(item.choose ? $r('app.media.interestsSelected') : $r('app.media.interestsSelectNot'))  
113 - .height('32lpx')  
114 - .width('32lpx')  
115 - .margin({top:'80lpx',left:'120lpx'}) 100 + .height('100%')
  101 + .backgroundColor(Color.Black)
  102 + .opacity(item.choose?0.5:0)
  103 + .borderRadius(5)
  104 + }
  105 + Stack(){
  106 + Column({}){
  107 + Text(item.name)
  108 + .fontSize(18)
  109 + .fontColor('#FFFFFF')
  110 + .margin({top:'21lpx',left:'19lpx'})
  111 + .width('100%')
  112 + .height('46lpx')
  113 + .fontWeight(FontWeight.Bold)
  114 + Text(item.title)
  115 + .fontSize('23lpx')
  116 + .fontColor('#FFFFFF')
  117 + .margin({top:'2lpx',left:'19lpx'})
  118 + .width('100%')
  119 + .height('31lpx')
  120 + Image(item.choose ? $r('app.media.interestsSelected') : $r('app.media.interestsSelectNot'))
  121 + .height('32lpx')
  122 + .width('32lpx')
  123 + .margin({top:'80lpx',left:'120lpx'})
  124 +
  125 + }.justifyContent(FlexAlign.Start)
  126 + }
116 127
117 - }.justifyContent(FlexAlign.Start)  
118 } 128 }
119 -  
120 } 129 }
121 - }  
122 - .width('192lpx')  
123 - .height('230lpx')  
124 - .borderRadius('8lpx')  
125 - .onClick(()=>{  
126 - //选择后改变已选择属性  
127 - item.choose = !item.choose  
128 - this.interestsArray.splice(index,1,item)  
129 - this.selectCount = this.interestsArray.filter(item => item.choose).length  
130 - }) 130 + .width('192lpx')
  131 + .height('230lpx')
  132 + .borderRadius('8lpx')
  133 + .onClick(()=>{
  134 + //选择后改变已选择属性
  135 + item.choose = !item.choose
  136 + this.interestsArray.splice(index,1,item)
  137 + this.selectCount = this.interestsArray.filter(item => item.choose).length
  138 + })
131 139
132 - }) 140 + })
  141 + }
  142 + .width('90%')
  143 + .margin({top:'61lpx',bottom:'300lpx'})
  144 + .columnsTemplate('1fr 1fr 1fr')
  145 + .columnsGap('23lpx')
  146 + .rowsGap('23lpx')
  147 + .scrollBar(BarState.Off)
133 } 148 }
134 - .width('90%')  
135 - .margin({top:'61lpx',bottom:'300lpx'})  
136 - .columnsTemplate('1fr 1fr 1fr')  
137 - .columnsGap('23lpx')  
138 - .rowsGap('23lpx')  
139 - .scrollBar(BarState.Off) 149 +
  150 +
140 } 151 }
141 .width('100%') 152 .width('100%')
142 .height('100%') 153 .height('100%')
@@ -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
@@ -321,8 +321,8 @@ export struct MultiPictureDetailPageComponent { @@ -321,8 +321,8 @@ export struct MultiPictureDetailPageComponent {
321 middle: { anchor: "__container__", align: HorizontalAlign.Center } 321 middle: { anchor: "__container__", align: HorizontalAlign.Center }
322 }) 322 })
323 .zIndex(1) 323 .zIndex(1)
324 - .onChange((index: number) => {  
325 - this.swiperIndex = index 324 + .onAnimationStart((index: number, targetIndex: number, extraInfo: SwiperAnimationEvent) => {
  325 + this.swiperIndex = targetIndex
326 }) 326 })
327 .onClick(() => { 327 .onClick(() => {
328 this.showDownload = !this.showDownload 328 this.showDownload = !this.showDownload
@@ -6,8 +6,8 @@ @@ -6,8 +6,8 @@
6 "mainElement": "EntryAbility", 6 "mainElement": "EntryAbility",
7 "deviceTypes": [ 7 "deviceTypes": [
8 "phone", 8 "phone",
9 - "tablet",  
10 - "2in1" 9 +// "tablet",
  10 +// "2in1"
11 ], 11 ],
12 "compressNativeLibs": true, 12 "compressNativeLibs": true,
13 "deliveryWithInstall": true, 13 "deliveryWithInstall": true,