developOne / harmonyPool

Go to a project
Toggle navigation Toggle navigation pinning
张善主
fa4df16c 2 parents c18fda82 a4ea1a27

Merge remote-tracking branch 'origin/main'

Inline Side-by-side
Showing 6 changed files with 44 additions and 26 deletions
1 import { ContentDTO, slideShows } from 'wdBean'; 1 import { ContentDTO, slideShows } from 'wdBean';
2 -import { CommonConstants } from 'wdConstant' 2 +import { CommonConstants } from 'wdConstant';
3 import { DateTimeUtils } from 'wdKit'; 3 import { DateTimeUtils } from 'wdKit';
4 import { ProcessUtils } from 'wdRouter'; 4 import { ProcessUtils } from 'wdRouter';
5 5
@@ -104,10 +104,12 @@ export struct Card9Component { @@ -104,10 +104,12 @@ export struct Card9Component {
104 Column() { 104 Column() {
105 Row() { 105 Row() {
106 // 标题 106 // 标题
107 - Image($r("app.media.timeline_rect")) 107 + Image($r("app.media.timeAxis"))
108 .width(9) 108 .width(9)
109 .height(9) 109 .height(9)
110 .margin({ right: 5 }) 110 .margin({ right: 5 })
  111 + .fillColor(item.newsTitleColor)
  112 +
111 Text(DateTimeUtils.formatDate(item.publishTime, "MM月dd日 HH:mm")) 113 Text(DateTimeUtils.formatDate(item.publishTime, "MM月dd日 HH:mm"))
112 .fontSize($r('app.float.font_size_12')) 114 .fontSize($r('app.float.font_size_12'))
113 .fontColor($r('app.color.color_222222')) 115 .fontColor($r('app.color.color_222222'))
@@ -5,12 +5,14 @@ import { RefreshConstants } from '../../utils/RefreshConstants' @@ -5,12 +5,14 @@ import { RefreshConstants } from '../../utils/RefreshConstants'
5 */ 5 */
6 @Component 6 @Component
7 export default struct NoMoreLayout { 7 export default struct NoMoreLayout {
  8 +
  9 +
8 build() { 10 build() {
9 - Row() { 11 + Column() {
10 Text($r('app.string.footer_text')) 12 Text($r('app.string.footer_text'))
11 - .margin({ left: RefreshConstants.NoMoreLayoutConstant_NORMAL_PADDING })  
12 .fontSize(RefreshConstants.NoMoreLayoutConstant_TITLE_FONT) 13 .fontSize(RefreshConstants.NoMoreLayoutConstant_TITLE_FONT)
13 .textAlign(TextAlign.Center) 14 .textAlign(TextAlign.Center)
  15 + .margin({bottom:40})
14 } 16 }
15 .width(RefreshConstants.FULL_WIDTH) 17 .width(RefreshConstants.FULL_WIDTH)
16 .justifyContent(FlexAlign.Center) 18 .justifyContent(FlexAlign.Center)
1 import { Params } from 'wdBean'; 1 import { Params } from 'wdBean';
2 import { AppUtils, StringUtils } from 'wdKit/Index'; 2 import { AppUtils, StringUtils } from 'wdKit/Index';
3 import { WDRouterPage, WDRouterRule } from 'wdRouter'; 3 import { WDRouterPage, WDRouterRule } from 'wdRouter';
  4 +import { CustomTitleUI } from '../reusable/CustomTitleUI';
4 import { EnvironmentCustomDialog } from './EnvironmentCustomDialog'; 5 import { EnvironmentCustomDialog } from './EnvironmentCustomDialog';
5 6
6 const TAG = 'AboutPageUI'; 7 const TAG = 'AboutPageUI';
@@ -23,11 +24,11 @@ export struct AboutPageUI { @@ -23,11 +24,11 @@ export struct AboutPageUI {
23 }) 24 })
24 25
25 build() { 26 build() {
26 - Navigation() { 27 + // Navigation() {
27 //滑动区域 28 //滑动区域
28 this.aboutUi() 29 this.aboutUi()
29 - }.titleMode(NavigationTitleMode.Mini)  
30 - .title('关于') 30 + // }.titleMode(NavigationTitleMode.Mini)
  31 + // .title('关于')
31 } 32 }
32 33
33 aboutToAppear() { 34 aboutToAppear() {
@@ -42,6 +43,8 @@ export struct AboutPageUI { @@ -42,6 +43,8 @@ export struct AboutPageUI {
42 @Builder 43 @Builder
43 aboutUi() { 44 aboutUi() {
44 Column() { 45 Column() {
  46 + CustomTitleUI({titleName:'关于'})
  47 +
45 Image($r('app.media.setting_about_logo')) 48 Image($r('app.media.setting_about_logo'))
46 .width('278lpx') 49 .width('278lpx')
47 .height('154lpx') 50 .height('154lpx')
@@ -34,7 +34,7 @@ export class RefreshConstants { @@ -34,7 +34,7 @@ export class RefreshConstants {
34 /** 34 /**
35 * The refresh and load height. 35 * The refresh and load height.
36 */ 36 */
37 - static readonly CUSTOM_LAYOUT_HEIGHT: number = 90; 37 + static readonly CUSTOM_LAYOUT_HEIGHT: number = 80;
38 /** 38 /**
39 * Full the width. 39 * Full the width.
40 */ 40 */
  1 +<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="9" height="6" viewBox="0 0 9 6"><g><g><path d="M2.63066,0.5L7.79156,0.5C8.13703,0.5,8.3784,0.8420000000000001,8.26266,1.167505L6.84044,5.1675C6.76957,5.36684,6.5809,5.5,6.36934,5.5L1.208442,5.5C0.862974,5.5,0.6216,5.158,0.737335,4.8325L2.15956,0.832495C2.23043,0.633155,2.4191000000000003,0.5,2.63066,0.5" fill-rule="evenodd" fill="#ED2800" fill-opacity="1"/></g></g></svg>
@@ -58,10 +58,10 @@ export struct TabLiveComponent { @@ -58,10 +58,10 @@ export struct TabLiveComponent {
58 // 加载更多 58 // 加载更多
59 ListItem() { 59 ListItem() {
60 if (this.pageModel.hasMore) { 60 if (this.pageModel.hasMore) {
61 - LoadMoreLayout({  
62 - refreshBean: new RefreshLayoutBean(this.pageModel.isVisiblePullUpLoad, this.pageModel.pullUpLoadImage,  
63 - this.pageModel.pullUpLoadText, this.pageModel.pullUpLoadHeight)  
64 - }) 61 + // LoadMoreLayout({
  62 + // refreshBean: new RefreshLayoutBean(this.pageModel.isVisiblePullUpLoad, this.pageModel.pullUpLoadImage,
  63 + // this.pageModel.pullUpLoadText, this.pageModel.pullUpLoadHeight)
  64 + // })
65 } else { 65 } else {
66 ListHasNoMoreDataUI() 66 ListHasNoMoreDataUI()
67 } 67 }
@@ -89,7 +89,7 @@ export struct TabLiveComponent { @@ -89,7 +89,7 @@ export struct TabLiveComponent {
89 if (data.barrageResponses && data.barrageResponses.length > 0) { 89 if (data.barrageResponses && data.barrageResponses.length > 0) {
90 /** 90 /**
91 * 在直播聊天添加一条新内容逻辑： 91 * 在直播聊天添加一条新内容逻辑：
92 - 判断 oldNewsId：迁移id非空 且 直播状态不是预约："wait" 92 + 判断 oldNewsId：迁移id为空 且 直播状态不是预约："wait"
93 消息内容： 93 消息内容：
94 1.头像固定：APP默认头像 94 1.头像固定：APP默认头像
95 2.名称固定：人民日报主持人 95 2.名称固定：人民日报主持人
@@ -105,22 +105,17 @@ export struct TabLiveComponent { @@ -105,22 +105,17 @@ export struct TabLiveComponent {
105 if (StringUtils.isEmpty(this.liveDetailsBean.oldNewsId) 105 if (StringUtils.isEmpty(this.liveDetailsBean.oldNewsId)
106 && this.liveDetailsBean 106 && this.liveDetailsBean
107 && this.liveDetailsBean.liveInfo.liveState != 'wait') { 107 && this.liveDetailsBean.liveInfo.liveState != 'wait') {
108 - let liveRoomItemBeanTemp: LiveRoomItemBean = {} as LiveRoomItemBean  
109 - liveRoomItemBeanTemp.text = this.liveDetailsBean.newIntroduction  
110 - liveRoomItemBeanTemp.senderUserName = '人民日报主持人'  
111 - liveRoomItemBeanTemp.pictureUrls = []  
112 - liveRoomItemBeanTemp.pictureUrls.push(this.liveDetailsBean?.fullColumnImgUrls[0]?.url)  
113 - liveRoomItemBeanTemp.dataType = 'ZH_TEXT_AND_IMAGE_MSG'  
114 - let temp = this.liveDetailsBean?.fullColumnImgUrls[0]  
115 - if (temp) {  
116 - liveRoomItemBeanTemp.pictureResolutions = []  
117 - liveRoomItemBeanTemp.pictureResolutions.push(`${temp.height}*${temp.weight}`)  
118 - }  
119 - this.liveList.push(liveRoomItemBeanTemp) 108 + this.updateLiveListData()
120 } 109 }
121 } 110 }
122 } else { 111 } else {
123 - this.pageModel.viewType = ViewType.EMPTY; 112 + if (StringUtils.isEmpty(this.liveDetailsBean.oldNewsId)
  113 + && this.liveDetailsBean
  114 + && this.liveDetailsBean.liveInfo.liveState != 'wait') {
  115 + this.updateLiveListData()
  116 + } else {
  117 + this.pageModel.viewType = ViewType.EMPTY;
  118 + }
124 } 119 }
125 }, 120 },
126 () => { 121 () => {
@@ -128,6 +123,21 @@ export struct TabLiveComponent { @@ -128,6 +123,21 @@ export struct TabLiveComponent {
128 }) 123 })
129 } 124 }
130 125
  126 + updateLiveListData() {
  127 + let liveRoomItemBeanTemp: LiveRoomItemBean = {} as LiveRoomItemBean
  128 + liveRoomItemBeanTemp.text = this.liveDetailsBean.newIntroduction
  129 + liveRoomItemBeanTemp.senderUserName = '人民日报主持人'
  130 + liveRoomItemBeanTemp.pictureUrls = []
  131 + liveRoomItemBeanTemp.pictureUrls.push(this.liveDetailsBean?.fullColumnImgUrls[0]?.url)
  132 + liveRoomItemBeanTemp.dataType = 'ZH_TEXT_AND_IMAGE_MSG'
  133 + let temp = this.liveDetailsBean?.fullColumnImgUrls[0]
  134 + if (temp) {
  135 + liveRoomItemBeanTemp.pictureResolutions = []
  136 + liveRoomItemBeanTemp.pictureResolutions.push(`${temp.height}*${temp.weight}`)
  137 + }
  138 + this.liveList.push(liveRoomItemBeanTemp)
  139 + }
  140 +
131 aboutToDisappear(): void { 141 aboutToDisappear(): void {
132 } 142 }
133 } 143 }