zhenghy

Merge remote-tracking branch 'origin/main'

... ... @@ -5,6 +5,7 @@ import { BaseDTO } from './BaseDTO';
@Observed
export class CompDTO implements BaseDTO {
contentText?: string = '';
backgroundColor: string = '';
backgroundImgUrl: string = '';
cityCode: string = '';
... ...
... ... @@ -64,7 +64,7 @@ export struct SearchResultContentComponent {
if (this.hasMore) {
SearcherAboutDataModel.getSearchResultListData("15", `${this.curPageNum}`, this.searchType, this.keywords,
getContext(this)).then((value) => {
console.log('SearcherAboutDataModel', JSON.stringify(value))
if (!this.data || value.list.length == 0) {
this.hasMore = false
this.isLoading = false
... ... @@ -474,6 +474,7 @@ export struct SearchResultContentComponent {
contentDTO.titleShow = value.data.type == "5" ? 1 : 0;
contentDTO.rmhInfo = rmhInfo
contentDTO.shareFlag = value.data.shareFlag
contentDTO.contentText = value.data.contentText
return contentDTO;
... ...
... ... @@ -290,7 +290,7 @@ export struct OperRowListView {
@Builder
builderListen() {
Column() {
Image(this.currentStatus === PlayerConstants.STATUS_START ? $r("app.media.icon_listen") : $r("app.media.icon_listen"))
Image(this.currentStatus === PlayerConstants.STATUS_START ? $r("app.media.icon_voice_playing") : $r("app.media.icon_listen"))
.width(24)
.height(24)
.aspectRatio(1)
... ...