Toggle navigation
Toggle navigation
This project
Loading...
Sign in
developOne
/
harmonyPool
Go to a project
Toggle navigation
Projects
Groups
Snippets
Help
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
王士厅
2024-05-16 18:08:09 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
f82d2360b1b46d641bac8fd6319e328e848f9ccc
f82d2360
1 parent
b710d9df
稿件 缺省图-内容找不到了,对应缺省页缺失。
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
27 additions
and
23 deletions
sight_harmony/features/wdComponent/src/main/ets/components/ImageAndTextPageComponent.ets
sight_harmony/features/wdComponent/src/main/ets/components/cardview/Card4Component.ets
sight_harmony/features/wdComponent/src/main/ets/components/cardview/Card9Component.ets
sight_harmony/features/wdComponent/src/main/ets/viewmodel/DetailViewModel.ets
sight_harmony/features/wdComponent/src/main/ets/components/ImageAndTextPageComponent.ets
View file @
f82d236
...
...
@@ -50,6 +50,8 @@ export struct ImageAndTextPageComponent {
// @State operationButtonList: string[] = ['comment', 'collect', 'share']
@State operationButtonList: string[] = []
@State isNetConnected: boolean = true
@State emptyType: number = 1 // 缺省图类型
@State detailContentEmpty: boolean = false
@State info: Area | null = null
@State likeNum: number = 0
@State reachEndIncreament: number = 0
...
...
@@ -141,10 +143,10 @@ export struct ImageAndTextPageComponent {
this.reachEndIncreament += 1
})
if (!this.isNetConnected) {
if (!this.isNetConnected
|| this.detailContentEmpty
) {
EmptyComponent({
emptyType: 1,
emptyButton: true,
emptyType: this.emptyType,
emptyButton: this.emptyType === 1 ? true : false,
retry: () => {
this.getDetail()
}
...
...
@@ -171,12 +173,14 @@ export struct ImageAndTextPageComponent {
// 发布时间
Column() {
Row() {
Image(this.contentDetailData?.rmhInfo ? $r('app.media.logo_rmh') : $r('app.media.logo_rmrb'))
.width(80)
.height(28)
Text(this.publishTime)
.fontColor($r('app.color.color_B0B0B0'))
.fontSize(13)
if(this.isNetConnected && !this.detailContentEmpty) {
Image(this.contentDetailData?.rmhInfo ? $r('app.media.logo_rmh') : $r('app.media.logo_rmrb'))
.width(80)
.height(28)
Text(this.publishTime)
.fontColor($r('app.color.color_B0B0B0'))
.fontSize(13)
}
}
.width(CommonConstants.FULL_WIDTH)
.height(32)
...
...
@@ -202,6 +206,9 @@ export struct ImageAndTextPageComponent {
private async getDetail() {
this.isNetConnected = NetworkUtil.isNetConnected()
if(!this.isNetConnected) {
this.emptyType = 1
}
let contentId: string = ''
let relId: string = ''
let relType: string = ''
...
...
@@ -219,6 +226,12 @@ export struct ImageAndTextPageComponent {
}
let detailBeans = await DetailViewModel.getDetailPageData(relId, contentId, relType)
// 判断内容是否已下线,空数组表示下线
this.detailContentEmpty = detailBeans.length === 0 ? true : false
if(this.detailContentEmpty) {
this.emptyType = 18
}
console.log(TAG, JSON.stringify(detailBeans))
if (detailBeans && detailBeans.length > 0) {
this.contentDetailData = detailBeans[0];
let dateTime =
...
...
sight_harmony/features/wdComponent/src/main/ets/components/cardview/Card4Component.ets
View file @
f82d236
...
...
@@ -66,7 +66,6 @@ export struct Card4Component {
.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)// 超出的部分显示省略号。
//三图
Stack(){
Row() {
...
...
sight_harmony/features/wdComponent/src/main/ets/components/cardview/Card9Component.ets
View file @
f82d236
...
...
@@ -63,7 +63,6 @@ export struct Card9Component {
.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)
}
// 大图
...
...
sight_harmony/features/wdComponent/src/main/ets/viewmodel/DetailViewModel.ets
View file @
f82d236
...
...
@@ -23,18 +23,11 @@ export class DetailViewModel extends BaseViewModel {
Logger.debug(TAG, 'getDetailPageData contentId: ' + contentId);
return new Promise<ContentDetailDTO[]>((success, error) => {
PageRepository.fetchDetailData(relId, contentId, relType).then((resDTO: ResponseDTO<ContentDetailDTO[]>) => {
if (!resDTO || !resDTO.data) {
Logger.error(TAG, 'getDetailPageData then resDTO is empty');
error('resDTO is empty');
return
}
if (resDTO.code != 0) {
Logger.error(TAG, `getDetailPageData then code:${resDTO.code}, message:${resDTO.message}`);
error('resDTO Response Code is failure');
return
}
Logger.info(TAG, "getDetailPageData then,resDTO.timeStamp:" + resDTO.timestamp);
success(resDTO.data);
if(resDTO.data) {
success(resDTO.data)
} else {
success([] as ContentDetailDTO[])
};
}).catch((err: Error) => {
Logger.error(TAG, `getDetailPageData catch, error.name : ${err.name}, error.message:${err.message}`);
error(err);
...
...
Please
register
or
login
to post a comment