developOne / harmonyPool

Go to a project
Toggle navigation Toggle navigation pinning
王士厅
2edd3083 2 parents 6ef9422a 51be8c92

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

Inline Side-by-side
Showing 3 changed files with 79 additions and 27 deletions
... ... @@ -139,29 +139,7 @@ export struct DynamicDetailComponent {
build() {
Column() {
//logo、日期
Row() {
Image($r('app.media.ic_article_rmh'))
.width($r('app.float.margin_80'))
.height($r('app.float.margin_28'))
.margin({ left: $r('app.float.margin_16') })
Blank()
Text(this.publishTime)
.fontColor($r('app.color.color_B0B0B0'))
.fontSize($r('app.float.font_size_12'))
.lineHeight($r('app.float.margin_28'))
.margin({ right: $r('app.float.margin_16') })
}
.height($r('app.float.margin_48'))
.width('100%')
.alignItems(VerticalAlign.Bottom)
.padding({ bottom: 5 })
.margin({top: `${this.topSafeHeight}px`})
//分割线
Image($r('app.media.ic_news_detail_division'))
.width('100%')
.height($r('app.float.margin_6'))
.padding({ left: $r('app.float.margin_16'), right: $r('app.float.margin_16') })
this.topNav()
Stack({ alignContent: Alignment.Bottom }) {
if (!this.isNetConnected) {
EmptyComponent({
... ... @@ -704,6 +682,72 @@ export struct DynamicDetailComponent {
.height('100%')
}
@Builder topNav() {
//logo、日期
Row() {
Image($r('app.media.ic_article_rmh'))
.width($r('app.float.margin_80'))
.height($r('app.float.margin_28'))
.margin({ left: $r('app.float.margin_16') })
Blank()
Text(this.publishTime)
.fontColor($r('app.color.color_B0B0B0'))
.fontSize($r('app.float.font_size_12'))
.lineHeight($r('app.float.margin_28'))
.margin({ right: $r('app.float.margin_16') })
}
.height($r('app.float.margin_48'))
.width('100%')
.alignItems(VerticalAlign.Bottom)
.padding({ bottom: 5 })
.margin({top: `${this.topSafeHeight}px`})
//分割线
Image($r('app.media.ic_news_detail_division'))
.width('100%')
.height($r('app.float.margin_6'))
.padding({ left: $r('app.float.margin_16'), right: $r('app.float.margin_16') })
// 发布时间 ，TODO：需要参考文章详情
// Column() {
// Row() {
// if (this.isNetConnected && this.contentDetailData) {
// if (this.contentDetailData.rmhPlatform == 1) { // 人民号
// if (this.contentDetailData?.rmhInfo?.userType == "5") { // 内容源账号
// Blank().height(1)
// } else {
// Image($r('app.media.logo_rmh')).width(80) .height(28)
// }
// } else if (this.contentDetailData.rmhPlatform == 2) { // 普通用户
// Blank().height(1)
// } else {
// Image($r('app.media.logo_rmrb')).width(80) .height(28)
// }
// Text(this.publishTime)
// .fontColor($r('app.color.color_B0B0B0'))
// .fontSize(13)
// .height(20)
// }
// }
// .width(CommonConstants.FULL_WIDTH)
// .height($r('app.float.margin_48'))
// .padding({ left: 15, right: 15, })
// .justifyContent(FlexAlign.SpaceBetween)
// .alignItems(VerticalAlign.Bottom)
//
// // if (this.isNetConnected && !this.detailContentEmpty) {
// Row() {
// Image($r('app.media.ic_news_detail_division'))
// .width('100%')
// .height(6)
// .margin({ top: 10 })
// .objectFit(ImageFit.Fill)
// }
// .padding({ left: 15, right: 15 })
// .backgroundColor(Color.White)
// // }
// }.backgroundColor(Color.White)
}
private titleText() {
if(!StringUtils.isEmpty(this.contentDetailData.newsContent)){
return this.contentDetailData.newsContent
... ...
... ... @@ -264,9 +264,17 @@ export struct ImageAndTextPageComponent {
Column() {
Row() {
if (this.isNetConnected && !this.detailContentEmpty) {
Image(this.contentDetailData?.rmhInfo ? $r('app.media.logo_rmh') : $r('app.media.logo_rmrb'))
.width(80)
.height(28)
if (this.contentDetailData.rmhPlatform == 1) { // 人民号
if (this.contentDetailData?.rmhInfo?.userType == "5") { // 内容源账号
Blank().height(1)
} else {
Image($r('app.media.logo_rmh')).width(80) .height(28)
}
} else if (this.contentDetailData.rmhPlatform == 2) { // 普通用户
Blank().height(1)
} else {
Image($r('app.media.logo_rmrb')).width(80) .height(28)
}
Text(this.publishTime)
.fontColor($r('app.color.color_B0B0B0'))
.fontSize(13)
... ...
... ... @@ -382,7 +382,7 @@ export struct LiveOperRowListView {
this.publishCommentModel.rootCommentId = '-1';
this.publishCommentModel.parentId = '-1';
this.publishCommentModel.placeHolderText = "说两句..."
this.publishCommentModel.commentContent = ""
// this.publishCommentModel.commentContent = ""
this.commentInputDialogController?.open();
}
... ...