developOne / harmonyPool

Go to a project
Toggle navigation Toggle navigation pinning
zhenghy
82128e67 2 parents 852aad26 b6a49286

Merge remote-tracking branch 'origin/main'

Inline Side-by-side
Showing 8 changed files with 70 additions and 50 deletions
@@ -211,12 +211,13 @@ export struct MorningEveningPaperComponent { @@ -211,12 +211,13 @@ export struct MorningEveningPaperComponent {
211 } 211 }
212 .height('100%') 212 .height('100%')
213 213
214 - PaperTitleComponent().margin({  
215 - top: this.topSafeHeight  
216 - }) 214 + PaperTitleComponent()
217 } 215 }
218 .width('100%') 216 .width('100%')
219 .height('100%') 217 .height('100%')
  218 + .padding({
  219 + top: this.topSafeHeight
  220 + })
220 // .backgroundColor(Color.Black) 221 // .backgroundColor(Color.Black)
221 // .backgroundColor(this.pageInfoBean?.backgroundColor ?? Color.Black) 222 // .backgroundColor(this.pageInfoBean?.backgroundColor ?? Color.Black)
222 .backgroundColor(this.mixedBgColor ?? Color.Black) 223 .backgroundColor(this.mixedBgColor ?? Color.Black)
@@ -16,6 +16,7 @@ const TAG = 'Zh_Single_Row-03' @@ -16,6 +16,7 @@ const TAG = 'Zh_Single_Row-03'
16 @Component 16 @Component
17 export struct ZhSingleRow03 { 17 export struct ZhSingleRow03 {
18 @State compDTO: CompDTO = {} as CompDTO 18 @State compDTO: CompDTO = {} as CompDTO
  19 + @State isEndEdge: boolean = false;
19 scroller: Scroller = new Scroller() 20 scroller: Scroller = new Scroller()
20 21
21 format(timeNum: number) { 22 format(timeNum: number) {
@@ -106,6 +107,19 @@ export struct ZhSingleRow03 { @@ -106,6 +107,19 @@ export struct ZhSingleRow03 {
106 } 107 }
107 .scrollable(ScrollDirection.Horizontal) 108 .scrollable(ScrollDirection.Horizontal)
108 .scrollBar(BarState.Off) 109 .scrollBar(BarState.Off)
  110 + .onScrollEdge((side: Edge) => {
  111 + if (side === Edge.End) {
  112 + this.isEndEdge = true;
  113 + }
  114 + })
  115 + .onScrollStop(() => {
  116 + if (this.isEndEdge) {
  117 + this.jumpToMore();
  118 + }
  119 + })
  120 + .onScroll((xOffset: number, yOffset: number) => {
  121 + this.isEndEdge = false;
  122 + })
109 } 123 }
110 .padding({ 124 .padding({
111 left: $r('app.float.card_comp_pagePadding_lf'), 125 left: $r('app.float.card_comp_pagePadding_lf'),
@@ -143,17 +157,7 @@ export struct ZhSingleRow03 { @@ -143,17 +157,7 @@ export struct ZhSingleRow03 {
143 right: $r('app.float.card_comp_pagePadding_lf'), 157 right: $r('app.float.card_comp_pagePadding_lf'),
144 }) 158 })
145 .onClick(() => { 159 .onClick(() => {
146 - if (this.compDTO.linkUrl) {  
147 - let taskAction: Action = {  
148 - type: 'JUMP_H5_BY_WEB_VIEW',  
149 - params: {  
150 - url: this.compDTO.linkUrl  
151 - } as Params,  
152 - };  
153 - WDRouterRule.jumpWithAction(taskAction)  
154 - } else {  
155 - this.jumpToLiveMorePage()  
156 - } 160 + this.jumpToMore();
157 }) 161 })
158 } 162 }
159 .justifyContent(FlexAlign.SpaceBetween) 163 .justifyContent(FlexAlign.SpaceBetween)
@@ -162,15 +166,23 @@ export struct ZhSingleRow03 { @@ -162,15 +166,23 @@ export struct ZhSingleRow03 {
162 } 166 }
163 167
164 private jumpToLiveMorePage() { 168 private jumpToLiveMorePage() {
165 - // let taskAction: Action = {  
166 - // type: 'JUMP_INNER_NEW_PAGE',  
167 - // params: {  
168 - // pageID: 'LIVE_MORE_PAGE'  
169 - // } as Params,  
170 - // };  
171 - // WDRouterRule.jumpWithAction(taskAction)  
172 WDRouterRule.jumpWithPage(WDRouterPage.reserveMorePage) 169 WDRouterRule.jumpWithPage(WDRouterPage.reserveMorePage)
173 } 170 }
  171 +
  172 + private jumpToMore() {
  173 + if (this.compDTO.linkUrl) {
  174 + let taskAction: Action = {
  175 + type: 'JUMP_H5_BY_WEB_VIEW',
  176 + params: {
  177 + url: this.compDTO.linkUrl
  178 + } as Params,
  179 + };
  180 + WDRouterRule.jumpWithAction(taskAction)
  181 + } else {
  182 + this.jumpToLiveMorePage()
  183 + }
  184 + }
  185 +
174 } 186 }
175 187
176 @Extend(Text) 188 @Extend(Text)
@@ -199,7 +199,9 @@ struct EditUserInfoPage { @@ -199,7 +199,9 @@ struct EditUserInfoPage {
199 getAccountOwnerInfo(){ 199 getAccountOwnerInfo(){
200 EditInfoViewModel.queryAccountOwnerInfo(1,getContext(this)).then((editModel) => { 200 EditInfoViewModel.queryAccountOwnerInfo(1,getContext(this)).then((editModel) => {
201 this.listData = [] 201 this.listData = []
202 - this.headerImg = editModel.userExtend.headPhotoUrl 202 + if (editModel.userExtend.headPhotoUrl) {
  203 + this.headerImg = editModel.userExtend.headPhotoUrl
  204 + }
203 this.currentUserInfo = editModel as editModel; 205 this.currentUserInfo = editModel as editModel;
204 this.listData.push(...EditInfoViewModel.getEditListInfo(editModel)) 206 this.listData.push(...EditInfoViewModel.getEditListInfo(editModel))
205 }); 207 });
@@ -4,9 +4,11 @@ import { WDRouterPage } from 'wdRouter'; @@ -4,9 +4,11 @@ import { WDRouterPage } from 'wdRouter';
4 @Entry 4 @Entry
5 @Component 5 @Component
6 struct GuidePages { 6 struct GuidePages {
7 - guideImage = [$r('app.media.guide_static1'), $r('app.media.guide_static2'), $r('app.media.guide_static3'), $r('app.media.guide_static4'),$r('app.media.guide_static5')]  
8 - guideTitle = [$r('app.media.guide_title1'), $r('app.media.guide_title2'), $r('app.media.guide_title3'), $r('app.media.guide_title4'),$r('app.media.guide_title5')]  
9 - guideIndex = [$r('app.media.guide_index1'), $r('app.media.guide_index2'), $r('app.media.guide_index3'),$r('app.media.guide_index4'), $r('app.media.guide_button')] 7 + // guideImage = [$r('app.media.guide_static1'), $r('app.media.guide_static2'), $r('app.media.guide_static3'), $r('app.media.guide_static4'),$r('app.media.guide_static5')]
  8 + // guideTitle = [$r('app.media.guide_title1'), $r('app.media.guide_title2'), $r('app.media.guide_title3'), $r('app.media.guide_title4'),$r('app.media.guide_title5')]
  9 + // guideIndex = [$r('app.media.guide_index1'), $r('app.media.guide_index2'), $r('app.media.guide_index3'),$r('app.media.guide_index4'), $r('app.media.guide_button')]
  10 + guideImage = [$r('app.media.guide_Static')]
  11 + guideIndex = [$r('app.media.guide_button')]
10 12
11 build() { 13 build() {
12 Column() { 14 Column() {
@@ -32,32 +34,34 @@ struct GuidePages { @@ -32,32 +34,34 @@ struct GuidePages {
32 top: { anchor: "__container__", align: VerticalAlign.Top }, 34 top: { anchor: "__container__", align: VerticalAlign.Top },
33 bottom: { anchor: "__container__", align: VerticalAlign.Bottom } 35 bottom: { anchor: "__container__", align: VerticalAlign.Bottom }
34 }) 36 })
  37 + .margin({bottom:150})
35 .width('100%') 38 .width('100%')
36 - .height('100%') 39 + .height('60%')
37 .id('image') 40 .id('image')
38 - Image(this.guideTitle[index])  
39 - .objectFit(ImageFit.ScaleDown)  
40 - .alignRules({  
41 - bottom: { anchor: "__container__", align: VerticalAlign.Bottom },  
42 - left: { anchor: "__container__", align: HorizontalAlign.Start },  
43 - right: { anchor: "__container__", align: HorizontalAlign.End },  
44 - })  
45 - .margin({ left: 60, bottom: 150, right: 60 })  
46 - .alignSelf(ItemAlign.Center)  
47 - .id('title') 41 + // Image('')
  42 + // .objectFit(imagefit.scaledown)
  43 + // .alignRules({
  44 + // bottom: { anchor: "__container__", align: VerticalAlign.Bottom },
  45 + // left: { anchor: "__container__", align: HorizontalAlign.Start },
  46 + // right: { anchor: "__container__", align: HorizontalAlign.End },
  47 + // })
  48 + // .margin({ left: 60, bottom: 150, right: 60 })
  49 + // .alignSelf(ItemAlign.Center)
  50 + // .id('title')
48 51
49 Image(this.guideIndex[index]) 52 Image(this.guideIndex[index])
50 - .objectFit(ImageFit.ScaleDown) 53 + .objectFit(ImageFit.Fill)
51 .alignRules({ 54 .alignRules({
52 bottom: { anchor: "__container__", align: VerticalAlign.Bottom }, 55 bottom: { anchor: "__container__", align: VerticalAlign.Bottom },
53 left: { anchor: "__container__", align: HorizontalAlign.Start }, 56 left: { anchor: "__container__", align: HorizontalAlign.Start },
54 right: { anchor: "__container__", align: HorizontalAlign.End }, 57 right: { anchor: "__container__", align: HorizontalAlign.End },
55 58
56 }) 59 })
57 - .margin({ bottom: 85 })  
58 - .height(40) 60 + .margin({ bottom: 85})
  61 + .width(191)
  62 + .height(44)
59 .onClick(() => { 63 .onClick(() => {
60 - if (index == 4) { 64 + if (index == 0) {
61 // 跳转到首页 65 // 跳转到首页
62 //WDRouterRule.jumpWithReplacePage(WDRouterPage.mainPage) 66 //WDRouterRule.jumpWithReplacePage(WDRouterPage.mainPage)
63 //跳转到兴趣偏好选择页 67 //跳转到兴趣偏好选择页
@@ -17,7 +17,7 @@ struct MorningEveningPaperPage { @@ -17,7 +17,7 @@ struct MorningEveningPaperPage {
17 17
18 pageTransition() { 18 pageTransition() {
19 // 定义页面进入时的效果，从底侧滑入 19 // 定义页面进入时的效果，从底侧滑入
20 - PageTransitionEnter({ type: RouteType.None, duration: 300 }) 20 + PageTransitionEnter({ type: RouteType.Push, duration: 300 })
21 .slide(SlideEffect.Bottom).onEnter((type: RouteType, progress: number) => { 21 .slide(SlideEffect.Bottom).onEnter((type: RouteType, progress: number) => {
22 if (progress >= 0.99) { 22 if (progress >= 0.99) {
23 WindowModel.shared.setWindowLayoutFullScreen(true) 23 WindowModel.shared.setWindowLayoutFullScreen(true)
@@ -25,7 +25,7 @@ struct MorningEveningPaperPage { @@ -25,7 +25,7 @@ struct MorningEveningPaperPage {
25 } 25 }
26 }) 26 })
27 // 定义页面退出时的效果，向底侧滑出 27 // 定义页面退出时的效果，向底侧滑出
28 - PageTransitionExit({ type: RouteType.None, duration: 300 }) 28 + PageTransitionExit({ type: RouteType.Pop, duration: 300 })
29 .slide(SlideEffect.Bottom) 29 .slide(SlideEffect.Bottom)
30 } 30 }
31 31
@@ -66,6 +66,15 @@ struct LaunchInterestsHobbiesPage { @@ -66,6 +66,15 @@ struct LaunchInterestsHobbiesPage {
66 .backgroundColor(Color.White) 66 .backgroundColor(Color.White)
67 .borderRadius(5) 67 .borderRadius(5)
68 Stack(){ 68 Stack(){
  69 + Image('')
  70 + .width('100%')
  71 + .height('100%')
  72 + .backgroundColor(Color.Gray)
  73 + .opacity(item.choose?0.7:0)
  74 + .borderRadius(5)
  75 + }
  76 +
  77 + Stack(){
69 Column({}){ 78 Column({}){
70 Text(item.name) 79 Text(item.name)
71 .fontSize(18) 80 .fontSize(18)
@@ -88,14 +97,6 @@ struct LaunchInterestsHobbiesPage { @@ -88,14 +97,6 @@ struct LaunchInterestsHobbiesPage {
88 }.justifyContent(FlexAlign.Start) 97 }.justifyContent(FlexAlign.Start)
89 } 98 }
90 99
91 - Stack(){  
92 - Image('')  
93 - .width('100%')  
94 - .height('100%')  
95 - .backgroundColor(Color.White)  
96 - .opacity(item.choose?0:0.6)  
97 - .borderRadius(5)  
98 - }  
99 } 100 }
100 } 101 }
101 .width('192lpx') 102 .width('192lpx')