developOne / harmonyPool

Go to a project
Toggle navigation Toggle navigation pinning
zhenghy
72e5632b 2 parents 5f7d4ae0 d908c18b

Merge remote-tracking branch 'origin/main'

Inline Side-by-side
Showing 13 changed files with 103 additions and 53 deletions
... ... @@ -6,6 +6,7 @@ import { CardMediaInfo } from '../cardCommon/CardMediaInfo';
import { CardSourceInfo } from '../cardCommon/CardSourceInfo';
import { Notes } from './notes';
import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
// import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
const TAG: string = 'Card2Component';
... ... @@ -48,9 +49,9 @@ export struct Card2Component {
Stack() {
//新闻标题
if (this.contentDTO.newTags) {
Notes({ newTags: this.contentDTO.newTags })
Notes({ newTags: this.contentDTO.newTags })
} else if (this.contentDTO.objectType == '5') {
Notes({ objectType: this.contentDTO.objectType })
Notes({ objectType: this.contentDTO.objectType })
}
Text() {
... ... @@ -66,15 +67,16 @@ export struct Card2Component {
.fontSize($r('app.float.font_size_18'))
.fontColor(this.clicked ? 0x848484 : $r('app.color.color_222222'))
.maxLines(2)
.textOverflow({ overflow: TextOverflow.Ellipsis })// 超出的部分显示省略号。
.textOverflow({ overflow: TextOverflow.Ellipsis }) // 超出的部分显示省略号。
.align(Alignment.Start)
.textIndent(this.contentDTO.newTags?.length < 5 && this.contentDTO.newTags?.length > 2 ? 58 :
(this.contentDTO.newTags?.length != 0 && this.contentDTO.newTags?.length) ||
this.contentDTO.objectType == '5' ? 30 : 0)
}.alignContent(Alignment.TopStart)
//.textIndent(this.contentDTO.objectType == '5' ? 35 : 0)
// }
// .alignContent(Alignment.TopStart)
(this.contentDTO.newTags?.length != 0 && this.contentDTO.newTags?.length) ||
this.contentDTO.objectType == '5' ? 35 : 0)
}.alignContent(Alignment.TopStart)
//.textIndent(this.contentDTO.objectType == '5' ? 35 : 0)
// }
// .alignContent(Alignment.TopStart)
//大图
Stack() {
... ...
... ... @@ -5,6 +5,8 @@ import { MineAppointmentItem } from '../../../viewmodel/MineAppointmentItem';
import { LazyDataSource, StringUtils } from 'wdKit';
import MinePageDatasModel from '../../../model/MinePageDatasModel';
import { EmptyComponent } from '../../view/EmptyComponent';
import { Action } from 'wdBean/Index';
import { WDRouterPage, WDRouterRule } from 'wdRouter/Index';
const TAG = "AppointmentListUI"
... ... @@ -42,6 +44,17 @@ export struct AppointmentListUI {
}
.onClick(() => {
//TODO 跳转
let action = {
type:"2",
params:{
extra:{
relId:item.relId,
relType:item.relType.toString()
},
contentID:item.liveId.toString()
}
} as Action
WDRouterRule.jumpWithPage(WDRouterPage.detailPlayLiveCommon, action)
})
}, (item: MineAppointmentItem, index: number) => index.toString())
... ...
import { ContentDTO, LiveRoomDataBean } from 'wdBean';
import { ProcessUtils } from 'wdRouter';
import { CommonConstants } from 'wdConstant/Index';
import PageViewModel from '../../viewmodel/PageViewModel';
import { DateTimeUtils, LazyDataSource, Logger } from 'wdKit/Index';
import { router } from '@kit.ArkUI';
... ...
... ... @@ -115,6 +115,7 @@ export struct PeopleShipHomeAttentionComponent {
.onClick(() => {
ToastUtils.showToast('分享为公共方法，待开发', 1000);
})
.visibility(Visibility.Hidden)
}
... ...
... ... @@ -504,15 +504,12 @@ struct ReserveMorePage {
const eventMinutes = eventDateTime.getMinutes();
const eventTimeStr = `${eventHour}:${eventMinutes.toString().padStart(2, '0')}开始`; // 格式化时间，确保分钟是两位数
// 计算时间差
const timeDifference = eventDateTime.getTime() - currentDateTime.getTime();
// 如果事件在24小时内
if (type === 1) {
if (timeDifference > 0 && timeDifference <= 24 * 60 * 60 * 1000) {
// 如果是今天
if (eventDateTime.setHours(0,0,0,0) === currentDateTime.setHours(0,0,0,0)) {
return `今天`;
} else {
// 如果事件不在24小时内
// 如果事件不在今天
const month = eventDateTime.getMonth() + 1; // 月份从0开始
const date = eventDateTime.getDate();
return `${month}月${date}日`;
... ...
... ... @@ -39,6 +39,11 @@ export struct SearchComponent {
SearcherAboutDataModel.searchHistoryData = []
//获取搜索历史
this.getSearchHistoryData()
let intervalID = setInterval(() => {
sendEventByKey("searchId", 10, "")
clearInterval(intervalID);
}, 1000);
}
getRelatedSearchContent() {
... ... @@ -56,12 +61,18 @@ export struct SearchComponent {
while (tempValue.indexOf(this.searchText) != -1){
let index = tempValue.indexOf(this.searchText)
if(index === 0){
tempArr.push(this.searchText)
tempValue = tempValue.substring(this.searchText.length,tempValue.length)
try {
tempArr.push(this.searchText)
tempValue = tempValue.substring(this.searchText.length,tempValue.length)
} catch (e) {
}
}else {
tempArr.push(tempValue.substring(0,index))
tempArr.push(this.searchText)
tempValue = tempValue.substring(index+this.searchText.length,tempValue.length)
try {
tempArr.push(tempValue.substring(0,index))
tempArr.push(this.searchText)
tempValue = tempValue.substring(index+this.searchText.length,tempValue.length)
} catch (e) {
}
}
}
if(StringUtils.isNotEmpty(tempValue)){
... ... @@ -218,7 +229,7 @@ export struct SearchComponent {
.textAlign(TextAlign.Start)
.maxLines(1)
.textOverflow({ overflow: TextOverflow.Clip })
.margin({ left: '70lpx' })
.margin({ left: '40lpx' })
})
}
.loop(true)
... ... @@ -238,7 +249,15 @@ export struct SearchComponent {
.height('69lpx')
.backgroundColor($r('app.color.color_transparent'))
.textFont({ size: "27lpx", weight: "400lpx" })
.defaultFocus(true)
// .defaultFocus(true)
.id("searchId")
.focusable(true)
.searchIcon({
size:0
})
.cancelButton({
style:CancelButtonStyle.INVISIBLE
})
.caretStyle({color:Color.Pink})
.onSubmit((value: string) => {
if(StringUtils.isNotEmpty(this.searchText)){
... ... @@ -278,9 +297,20 @@ export struct SearchComponent {
}
}
})
}.padding({right:'30lpx'})
}.padding({right:'70lpx'})
.layoutWeight(1)
Image($r('app.media.search_input_del_icon'))
.width("31lpx")
.height("31lpx")
.objectFit(ImageFit.Auto)
.interpolation(ImageInterpolation.Medium)
.margin({left:"495lpx"})
.onClick(()=>{
this.searchText = ""
})
.visibility(StringUtils.isEmpty(this.searchText) ? Visibility.Hidden : Visibility.Visible)
}
.backgroundImage($r('app.media.search_page_input_bg'))
.backgroundImageSize(ImageSize.Cover)
... ...
... ... @@ -19,7 +19,7 @@ export struct channelSkeleton {
textArea('40%', 12)
}
.RightStyle()
Column() {
textArea('35%', 78)
}
... ... @@ -30,7 +30,6 @@ export struct channelSkeleton {
.SkeletonStyle()
})
textArea('40%', 12)
Column() {
textArea('100%', 204)
... ...
... ... @@ -131,8 +131,7 @@ export struct EmptyComponent {
// .height(this.EMPTY_IMAGE_HEIGHT)
Text(this.emptyType !== 8 ? this.buildNoDataTip() : `${this.buildNoDataTip()}(${this.timeNum}s)`)
.fontSize($r('app.float.font_size_14'))
.fontColor('#FF999999')
.fontSize($r('app.float.font_size_14'))// .fontColor('#FF999999')
.fontWeight(FontWeight.Normal)
.opacity(this.TEXT_OPACITY)
.margin({ top: this.EMPTY_TIP_TEXT_MARGIN_TOP })
... ... @@ -233,7 +232,7 @@ export struct EmptyComponent {
imageString = $r('app.media.icon_no_message')
} else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NoComment ||
this.emptyType === WDViewDefaultType.WDViewDefaultType_NoComment1) {
imageString = $r('app.media.icon_no_comment')
imageString = $r('app.media.icon_no_comment1')
} else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NoSearchResult) {
imageString = $r('app.media.icon_no_result1')
} else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NoNetwork) {
... ... @@ -251,7 +250,8 @@ export struct EmptyComponent {
} else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NoVideo) {
imageString = $r('app.media.icon_no_content')
} else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NoContent1 ||
this.emptyType === WDViewDefaultType.WDViewDefaultType_NoFollow || this.emptyType === WDViewDefaultType.WDViewDefaultType_NoContent2) {
this.emptyType === WDViewDefaultType.WDViewDefaultType_NoFollow ||
this.emptyType === WDViewDefaultType.WDViewDefaultType_NoContent2) {
imageString = $r('app.media.icon_no_appointmentMade1')
}
return imageString
... ...
... ... @@ -23,8 +23,8 @@ export struct LiveCountdownComponent {
aboutToAppear(): void {
//注册字体
font.registerFont({
familyName: 'BebasNeue_Regular',
familySrc: $rawfile('font/BebasNeue_Regular.otf')
familyName: 'BebasNeueBold',
familySrc: $rawfile('font/BebasNeueBold.otf')
})
setTimeout(() => {
this.textTimerController.start()
... ... @@ -69,13 +69,16 @@ export struct LiveCountdownComponent {
.showTimeStyleBold()
Text('月')
.showTimeStyleNormal()
.margin({ left: 3 })
.margin({ left: 1 })
.baselineOffset('-6vp')
Text(this.day)
.showTimeStyleBold()
.margin({ left: 3 })
Text('日')
.showTimeStyleNormal()
.margin({ left: 3 })
.margin({ left: 1 })
.baselineOffset('-6vp')
Text(this.hour)
.showTimeStyleBold()
.margin({ left: 10 })
... ... @@ -85,15 +88,15 @@ export struct LiveCountdownComponent {
.showTimeStyleBold()
}
.margin({ top: 10 })
.visibility(this.isCountDownStart ? Visibility.None : Visibility.Visible
)
.visibility(this.isCountDownStart ? Visibility.None : Visibility.Visible)
// 倒计时
TextTimer({ isCountDown: true, count: this.differenceTimeStamp, controller: this.textTimerController })
.format(this.format)
.fontSize('40fp')
.fontSize('40vp')
.fontWeight(FontWeight.Bold)
.fontColor('#222222')
.fontFamily('BebasNeue_Regular')
.fontFamily('BebasNeueBold')
.onTimer((utc: number, elapsedTime: number) => {
console.info('textTimer notCountDown utc is：' + utc + ', elapsedTime: ' + elapsedTime)
})
... ... @@ -139,7 +142,7 @@ export struct LiveCountdownComponent {
//2024-04-01 19:44:00-trim->2024-04-0119:44:00
if (StringUtils.isNotEmpty(this.liveDetailsBean.liveInfo?.planStartTime)) {
let playStartTimeTmp = this.liveDetailsBean.liveInfo?.planStartTime?.trim()
this.month = playStartTimeTmp.substring(5, 7)
this.month = Number(playStartTimeTmp.substring(5, 7)).toString()
this.day = playStartTimeTmp.substring(8, 10)
this.hour = playStartTimeTmp.substring(11, 13)
this.minute = playStartTimeTmp.substring(14, 16)
... ... @@ -182,7 +185,7 @@ export struct LiveCountdownComponent {
@Extend(Text)
function showTimeStyleNormal() {
.fontSize('16fp')
.fontSize('16vp')
.fontWeight(500)
.fontColor('#222222')
}
... ... @@ -190,7 +193,7 @@ function showTimeStyleNormal() {
@Extend(Text)
function showTimeStyleBold() {
.fontSize('40fp')
.fontFamily('BebasNeue_Regular')
.fontFamily('BebasNeueBold')
.fontWeight(FontWeight.Bold)
.fontColor('#222222')
}
\ No newline at end of file
... ...
... ... @@ -30,7 +30,8 @@ export struct TabInfoComponent {
Text(this.liveDetailsBean.newsTitle)
.maxLines(2)
.textOverflow({ overflow: TextOverflow.Ellipsis })
.fontSize('18fp')
.fontSize('18vp')
.lineHeight('26vp')
.fontWeight(500)
.fontColor('#222222')
}
... ... @@ -40,9 +41,10 @@ export struct TabInfoComponent {
Text(this.liveDetailsBean.newIntroduction)
.maxLines(5)
.textOverflow({ overflow: TextOverflow.Ellipsis })
.fontSize('14fp')
.fontSize('14vp')
.fontWeight(400)
.fontColor('#666666')
.lineHeight('22vp')
.margin({ top: 8 })
}
}
\ No newline at end of file
... ...
... ... @@ -25,13 +25,13 @@ export struct TabLiveItemComponent {
Text(this.item.senderUserName)
.maxLines(1)
.textOverflow({ overflow: TextOverflow.Ellipsis })
.fontSize('14fp')
.fontSize('14vp')
.fontWeight(400)
.fontColor('#222222')
Text(this.item.role === 'host' ? '主持人' : '嘉宾')
.maxLines(1)
.textOverflow({ overflow: TextOverflow.Ellipsis })
.fontSize('11fp')
.fontSize('11vp')
.fontWeight(400)
.fontColor('#968562')
.backgroundColor('#F1EFEB')
... ... @@ -44,17 +44,18 @@ export struct TabLiveItemComponent {
.borderRadius(2)
.margin({ left: 8 })
.visibility(StringUtils.isNotEmpty(this.item.role) ? Visibility.Visible : Visibility.None)
Text(DateTimeUtils.getCommentTime(new Date(this.item.time).getTime()))
.maxLines(1)
.textOverflow({ overflow: TextOverflow.Ellipsis })
.fontSize('12fp')
.fontSize('12vp')
.fontWeight(400)
.fontColor('#999999')
.margin({ left: 8 })
.visibility(StringUtils.isNotEmpty(this.item.time) ? Visibility.Visible : Visibility.None)
Text('置顶')
.fontSize('11fp')
.fontSize('11vp')
.fontWeight(400)
.fontColor('#ED2800')
.backgroundColor('#F1EFEB')
... ... @@ -71,9 +72,10 @@ export struct TabLiveItemComponent {
}
Text(this.item.text)
.fontSize('14fp')
.fontSize('14vp')
.fontWeight(400)
.fontColor('#222222')
.lineHeight('20vp')
.margin({
top: 6
})
... ...
... ... @@ -89,8 +89,8 @@ export struct PlayUIComponent {
Text(this.liveDetailsBean.newsTitle)
.maxLines(1)
.textOverflow({ overflow: TextOverflow.MARQUEE })
.fontSize('16fp')
.fontWeight(500)
.fontSize(this.displayDirection == DisplayDirection.VIDEO_HORIZONTAL ? '18vp' : '16vp')
.fontWeight(this.displayDirection == DisplayDirection.VIDEO_HORIZONTAL ? 600 : 500)
.fontColor(Color.White)
.textAlign(TextAlign.Start)
.layoutWeight(1)
... ... @@ -200,7 +200,7 @@ export struct PlayUIComponent {
else if (this.liveDetailsBean.liveInfo?.liveState == 'end') {
Row() {
Text('回看')
.fontSize('11fp')
.fontSize('11vp')
.fontWeight(400)
.fontColor(Color.White)
... ... @@ -209,7 +209,7 @@ export struct PlayUIComponent {
.width(12)
.height(12)
Text(`${NumberFormatterUtils.formatNumberWithWan(this.liveRoomDataBean.pv)}人参与`)
.fontSize('11fp')
.fontSize('11vp')
.fontWeight(400)
.fontColor(Color.White)
}
... ... @@ -221,6 +221,8 @@ export struct PlayUIComponent {
top: 1,
right: 4,
bottom: 1
}).margin({
left: this.displayDirection == DisplayDirection.VIDEO_HORIZONTAL ? '34vp' : 0
})
}
}
... ...