developOne / harmonyPool

Go to a project
Toggle navigation Toggle navigation pinning
王士厅
c6a9e007 2 parents 5e23e50b da1ba84c

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

Inline Side-by-side
Showing 37 changed files with 173 additions and 112 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() {
@@ -14,15 +14,16 @@ export struct LottieView { @@ -14,15 +14,16 @@ export struct LottieView {
14 private politeChickyController: CanvasRenderingContext2D = 14 private politeChickyController: CanvasRenderingContext2D =
15 new CanvasRenderingContext2D(); // CanvasRenderingContext2D对象 15 new CanvasRenderingContext2D(); // CanvasRenderingContext2D对象
16 private animateItem: AnimationItem | null = null; // 初始化loadAnimation接口的返回对象 16 private animateItem: AnimationItem | null = null; // 初始化loadAnimation接口的返回对象
  17 + @Prop title: string
17 18
18 // 页面隐藏销毁动画 19 // 页面隐藏销毁动画
19 - onPageHide(): void {  
20 - this.animateItem?.destroy()  
21 -  
22 - if (this.onComplete) {  
23 - this.animateItem?.removeEventListener('complete', this.onComplete)  
24 - }  
25 - } 20 + // onPageHide(): void {
  21 + // this.animateItem?.destroy()
  22 + //
  23 + // if (this.onComplete) {
  24 + // this.animateItem?.removeEventListener('complete', this.onComplete)
  25 + // }
  26 + // }
26 27
27 /** 28 /**
28 * 加载动画 29 * 加载动画
@@ -31,7 +32,7 @@ export struct LottieView { @@ -31,7 +32,7 @@ export struct LottieView {
31 loadAnimation() { 32 loadAnimation() {
32 // 销毁动画，减少缓存 33 // 销毁动画，减少缓存
33 if (this.animateItem !== null) { 34 if (this.animateItem !== null) {
34 - this.animateItem.destroy(); 35 + this.animateItem.destroy(this.name);
35 this.animateItem = null; 36 this.animateItem = null;
36 } 37 }
37 38
@@ -54,6 +55,32 @@ export struct LottieView { @@ -54,6 +55,32 @@ export struct LottieView {
54 55
55 } 56 }
56 57
  58 + aboutToAppear(): void {
  59 + // console.error('XXXXZZZZ', '-------aboutToAppear-------' + this.title)
  60 + //lottie?.play()
  61 +
  62 + // if(this.init){
  63 + // if(this.animateItem = null){
  64 + // this.loadAnimation();
  65 + // }
  66 + // }
  67 +
  68 +
  69 + }
  70 +
  71 + aboutToDisappear(): void {
  72 + // console.error('XXXXZZZZ', '-------aboutToDisappear-------' + this.title)
  73 + // if(this.init){
  74 + // lottie?.destroy(this.name)
  75 + //
  76 + // if (this.onComplete) {
  77 + // this.animateItem?.removeEventListener('complete', this.onComplete)
  78 + // }
  79 + // this.animateItem = null;
  80 + // // }
  81 +
  82 + }
  83 +
57 build() { 84 build() {
58 Stack({ alignContent: Alignment.TopStart }) { 85 Stack({ alignContent: Alignment.TopStart }) {
59 Canvas(this.politeChickyController) 86 Canvas(this.politeChickyController)
@@ -65,9 +92,13 @@ export struct LottieView { @@ -65,9 +92,13 @@ export struct LottieView {
65 this.onReady(this.animateItem) 92 this.onReady(this.animateItem)
66 } 93 }
67 }) 94 })
68 - .onClick(() => {  
69 - this.animateItem?.play() 95 + .onDisAppear(() => {
  96 + lottie.destroy(this.name)
  97 + this.animateItem = null;
  98 + }).onAppear(()=>{
  99 + this.loadAnimation();
70 }) 100 })
  101 +
71 } 102 }
72 } 103 }
73 } 104 }
@@ -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
@@ -31,7 +31,7 @@ let preferenceTheme: dataPreferences.Preferences | null = null @@ -31,7 +31,7 @@ let preferenceTheme: dataPreferences.Preferences | null = null
31 @Component 31 @Component
32 struct LiveMorePage { 32 struct LiveMorePage {
33 @State data: LazyDataSource<ContentDTO> = new LazyDataSource(); 33 @State data: LazyDataSource<ContentDTO> = new LazyDataSource();
34 - topSafeHeight: number = AppStorage.get<number>('topSafeHeight') as number; 34 + @State topSafeHeight: number = AppStorage.get<number>('topSafeHeight') as number;
35 @State bottomSafeHeight: number = AppStorage.get<number>('bottomSafeHeight') || 0 35 @State bottomSafeHeight: number = AppStorage.get<number>('bottomSafeHeight') || 0
36 type: number = 1; 36 type: number = 1;
37 pageSize: number = 20; 37 pageSize: number = 20;
@@ -46,11 +46,9 @@ struct LiveMorePage { @@ -46,11 +46,9 @@ struct LiveMorePage {
46 @State liveRoomList: LiveRoomDataBean[] = [] 46 @State liveRoomList: LiveRoomDataBean[] = []
47 // 点击过的数据 47 // 点击过的数据
48 @State clickDatas: Array<string> = [] 48 @State clickDatas: Array<string> = []
49 -  
50 @State loadImg: boolean = false; 49 @State loadImg: boolean = false;
51 50
52 -  
53 - async aboutToAppear() : Promise<void>{ 51 + async aboutToAppear(): Promise<void> {
54 await this.getPreferencesFromStorage() 52 await this.getPreferencesFromStorage()
55 this.loadImg = await onlyWifiLoadImg(); 53 this.loadImg = await onlyWifiLoadImg();
56 this.getLivMoreClickPreference() 54 this.getLivMoreClickPreference()
@@ -60,16 +58,9 @@ struct LiveMorePage { @@ -60,16 +58,9 @@ struct LiveMorePage {
60 } 58 }
61 59
62 build() { 60 build() {
63 - // Navigation() {  
64 - // //滑动区域  
65 - // this.ListLayout()  
66 - // }  
67 - // .titleMode(NavigationTitleMode.Mini)  
68 - // .title('直播列表')  
69 61
70 Column() { 62 Column() {
71 this.TabbarNormal() 63 this.TabbarNormal()
72 -  
73 if (this.viewType == ViewType.LOADING) { 64 if (this.viewType == ViewType.LOADING) {
74 this.LoadingLayout() 65 this.LoadingLayout()
75 } else if (this.viewType == ViewType.ERROR) { 66 } else if (this.viewType == ViewType.ERROR) {
@@ -96,15 +87,13 @@ struct LiveMorePage { @@ -96,15 +87,13 @@ struct LiveMorePage {
96 }) 87 })
97 } 88 }
98 } 89 }
  90 + .height('100%')
99 .padding({ 91 .padding({
100 left: $r('app.float.card_comp_pagePadding_lf'), 92 left: $r('app.float.card_comp_pagePadding_lf'),
101 right: $r('app.float.card_comp_pagePadding_lf'), 93 right: $r('app.float.card_comp_pagePadding_lf'),
102 - bottom: $r('app.float.card_comp_pagePadding_tb')  
103 - })  
104 - .margin({bottom:px2vp(this.bottomSafeHeight)})  
105 - .onClick(() => {  
106 - ProcessUtils.processPage(this.contentDTO) 94 + top:px2vp(this.topSafeHeight),bottom:px2vp(this.bottomSafeHeight)
107 }) 95 })
  96 +
108 } 97 }
109 98
110 @Builder 99 @Builder
@@ -133,7 +122,7 @@ struct LiveMorePage { @@ -133,7 +122,7 @@ struct LiveMorePage {
133 } 122 }
134 .scrollBar(BarState.Off) 123 .scrollBar(BarState.Off)
135 .edgeEffect(EdgeEffect.None) 124 .edgeEffect(EdgeEffect.None)
136 - .cachedCount(8) 125 + .cachedCount(3)
137 .height('calc(100% - 44vp)') 126 .height('calc(100% - 44vp)')
138 .onReachEnd(() => { 127 .onReachEnd(() => {
139 Logger.debug(TAG, "触底了"); 128 Logger.debug(TAG, "触底了");
@@ -160,9 +149,10 @@ struct LiveMorePage { @@ -160,9 +149,10 @@ struct LiveMorePage {
160 .margin({ top: 16, bottom: 8 }) 149 .margin({ top: 16, bottom: 8 })
161 .alignSelf(ItemAlign.Start) 150 .alignSelf(ItemAlign.Start)
162 .fontColor(this.isClicked(item.objectId) ? $r('app.color.color_848484') : $r('app.color.color_222222')) 151 .fontColor(this.isClicked(item.objectId) ? $r('app.color.color_848484') : $r('app.color.color_222222'))
  152 +
163 Stack() { 153 Stack() {
164 if (item.fullColumnImgUrls && item.fullColumnImgUrls.length > 0) { 154 if (item.fullColumnImgUrls && item.fullColumnImgUrls.length > 0) {
165 - Image(this.loadImg?item.fullColumnImgUrls[0].url:'') 155 + Image(this.loadImg ? item.fullColumnImgUrls[0].url : '')
166 .backgroundColor(this.loadImg ? $r('app.color.color_B0B0B0') : 0xf5f5f5) 156 .backgroundColor(this.loadImg ? $r('app.color.color_B0B0B0') : 0xf5f5f5)
167 .width('100%') 157 .width('100%')
168 .aspectRatio(16 / 9) 158 .aspectRatio(16 / 9)
@@ -246,7 +236,6 @@ struct LiveMorePage { @@ -246,7 +236,6 @@ struct LiveMorePage {
246 }) 236 })
247 } 237 }
248 .height(44) 238 .height(44)
249 - .margin({top:this.topSafeHeight+'px'})  
250 .width('100%') 239 .width('100%')
251 } 240 }
252 241
@@ -260,24 +249,25 @@ struct LiveMorePage { @@ -260,24 +249,25 @@ struct LiveMorePage {
260 lottieHeight: 14, 249 lottieHeight: 14,
261 autoplay: true, 250 autoplay: true,
262 loop: true, 251 loop: true,
  252 + title: item.newsTitle
263 }) 253 })
264 .margin({ 254 .margin({
265 right: '2vp' 255 right: '2vp'
266 }) 256 })
  257 +
267 Text('直播中') 258 Text('直播中')
268 .fontSize('12vp') 259 .fontSize('12vp')
269 .fontWeight(400) 260 .fontWeight(400)
270 .fontColor(Color.White) 261 .fontColor(Color.White)
271 - .textShadow({ radius: 2, color: 'rgba(0,0,0,0.3)', offsetX: 0, offsetY: 2 }) 262 + .textShadow({
  263 + radius: 2,
  264 + color: 'rgba(0,0,0,0.3)',
  265 + offsetX: 0,
  266 + offsetY: 2
  267 + })
272 .margin({ 268 .margin({
273 right: '5vp' 269 right: '5vp'
274 }) 270 })
275 - // Divider()  
276 - // .vertical(true)  
277 - // .strokeWidth(1)  
278 - // .height('12vp')  
279 - // .margin({ top: 2, bottom: 2 })  
280 - // .color(Color.White)  
281 271
282 Image($r('app.media.icon_comp_line_live')).height('11vp').width('1.5vp') 272 Image($r('app.media.icon_comp_line_live')).height('11vp').width('1.5vp')
283 273
@@ -285,7 +275,12 @@ struct LiveMorePage { @@ -285,7 +275,12 @@ struct LiveMorePage {
285 Text(this.getLiveRoomNumber(item)) 275 Text(this.getLiveRoomNumber(item))
286 .fontSize('12vp') 276 .fontSize('12vp')
287 .fontWeight(400) 277 .fontWeight(400)
288 - .textShadow({ radius: 2, color: 'rgba(0,0,0,0.3)', offsetX: 0, offsetY: 2 }) 278 + .textShadow({
  279 + radius: 2,
  280 + color: 'rgba(0,0,0,0.3)',
  281 + offsetX: 0,
  282 + offsetY: 2
  283 + })
289 .fontColor(Color.White) 284 .fontColor(Color.White)
290 .margin({ 285 .margin({
291 left: '5vp' 286 left: '5vp'
@@ -422,7 +417,7 @@ struct LiveMorePage { @@ -422,7 +417,7 @@ struct LiveMorePage {
422 const arr: Array<string> = [] 417 const arr: Array<string> = []
423 arr.push(...this.clickDatas) 418 arr.push(...this.clickDatas)
424 preferenceTheme.put('liveMorePage', arr).then(() => { 419 preferenceTheme.put('liveMorePage', arr).then(() => {
425 - Logger.debug(TAG,"Succeeded in putting value of 'startup'."); 420 + Logger.debug(TAG, "Succeeded in putting value of 'startup'.");
426 }).catch((err: BusinessError) => { 421 }).catch((err: BusinessError) => {
427 Logger.debug(TAG, "Failed to put value of 'startup'. code =" + err.code + ", message =" + err.message); 422 Logger.debug(TAG, "Failed to put value of 'startup'. code =" + err.code + ", message =" + err.message);
428 }) 423 })
@@ -31,7 +31,8 @@ const TAG: string = 'ReserveMorePage'; @@ -31,7 +31,8 @@ const TAG: string = 'ReserveMorePage';
31 struct ReserveMorePage { 31 struct ReserveMorePage {
32 @State data: LazyDataSource<ContentDTO> = new LazyDataSource(); 32 @State data: LazyDataSource<ContentDTO> = new LazyDataSource();
33 private reserveList: ReserveItemBean[] = [] 33 private reserveList: ReserveItemBean[] = []
34 - topSafeHeight: number = AppStorage.get<number>('topSafeHeight') as number; 34 + @State topSafeHeight: number = AppStorage.get<number>('topSafeHeight') as number;
  35 + @State bottomSafeHeight: number = AppStorage.get<number>('bottomSafeHeight') || 0
35 type: number = 2; 36 type: number = 2;
36 pageSize: number = 20; 37 pageSize: number = 20;
37 title: string = '直播预告' 38 title: string = '直播预告'
@@ -78,10 +79,13 @@ struct ReserveMorePage { @@ -78,10 +79,13 @@ struct ReserveMorePage {
78 this.currentPage = 1 79 this.currentPage = 1
79 this.getData(resolve) 80 this.getData(resolve)
80 }, 81 },
81 - }) 82 + }).backgroundColor($r('app.color.color_F5F5F5'))
82 } 83 }
83 84
84 - }.backgroundColor($r('app.color.color_F5F5F5')) 85 + }.height('100%').backgroundColor('#FFFFFF').padding({
  86 + top: px2vp(this.topSafeHeight),
  87 + bottom: px2vp(this.bottomSafeHeight)
  88 + })
85 89
86 } 90 }
87 91
@@ -306,8 +310,7 @@ struct ReserveMorePage { @@ -306,8 +310,7 @@ struct ReserveMorePage {
306 middle: { anchor: "__container__", align: HorizontalAlign.Center } 310 middle: { anchor: "__container__", align: HorizontalAlign.Center }
307 }) 311 })
308 } 312 }
309 - .height(vp2px(44) + this.topSafeHeight + 'px')  
310 - .padding({ top: this.topSafeHeight + 'px' }) 313 + .height(44)
311 .width('100%').backgroundColor('#FFFFFF') 314 .width('100%').backgroundColor('#FFFFFF')
312 315
313 } 316 }
@@ -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,6 +156,7 @@ struct SearchCreatorPage { @@ -154,6 +156,7 @@ struct SearchCreatorPage {
154 } 156 }
155 157
156 build() { 158 build() {
  159 + Column(){
157 Column() { 160 Column() {
158 CustomTitleUI({ titleName: "全部结果" }) 161 CustomTitleUI({ titleName: "全部结果" })
159 Divider() 162 Divider()
@@ -200,5 +203,10 @@ struct SearchCreatorPage { @@ -200,5 +203,10 @@ struct SearchCreatorPage {
200 } 203 }
201 .width('100%') 204 .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,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()
@@ -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,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
@@ -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,