Showing
4 changed files
with
28 additions
and
11 deletions
| 1 | import { ContentDTO, FrontLinkObject } from 'wdBean'; | 1 | import { ContentDTO, FrontLinkObject } from 'wdBean'; |
| 2 | +import { Logger } from 'wdKit/Index'; | ||
| 2 | import { ProcessUtils } from 'wdRouter/Index'; | 3 | import { ProcessUtils } from 'wdRouter/Index'; |
| 4 | +import { CommentText } from '../comment/view/CommentText'; | ||
| 3 | 5 | ||
| 4 | /** | 6 | /** |
| 5 | * 早晚报,topic | 7 | * 早晚报,topic |
| @@ -69,17 +71,25 @@ export struct topicInfoView { | @@ -69,17 +71,25 @@ export struct topicInfoView { | ||
| 69 | 71 | ||
| 70 | 72 | ||
| 71 | Row(){ | 73 | Row(){ |
| 72 | - Text(this.frontLinkObject?.summary ?? "") | ||
| 73 | - .fontSize(14) | ||
| 74 | - .fontColor('#CCFFFFFF') | ||
| 75 | - .maxLines(this.isExpansion?999:3) | ||
| 76 | - .textOverflow({ overflow: TextOverflow.Ellipsis }) | ||
| 77 | 74 | ||
| 78 | - Text(this.isExpansion?'收起':'展开').onClick(()=>{ | ||
| 79 | - this.isExpansion = !this.isExpansion | ||
| 80 | - }) | ||
| 81 | - .fontSize(14) | ||
| 82 | - .fontColor($r('app.color.white')) | 75 | + CommentText({longMessage:this.frontLinkObject?.summary ?? "",fontSize:14,fontColor:'#CCFFFFFF',isMorningEveningPaper:true}) |
| 76 | + // Text(this.frontLinkObject?.summary ?? "") | ||
| 77 | + // .fontSize(14) | ||
| 78 | + // .fontColor('#CCFFFFFF') | ||
| 79 | + // .maxLines(this.isExpansion?999:3) | ||
| 80 | + // .textOverflow({ overflow: TextOverflow.Ellipsis }) | ||
| 81 | + // .onVisibleAreaChange([0.0, 1.0], (isVisible: boolean, currentRatio: number) => { | ||
| 82 | + // Logger.debug('TAG', `当前屏幕可见区域大小: currentRatio:' +${currentRatio}`) | ||
| 83 | + // if (!isVisible && currentRatio <= 0.0) { | ||
| 84 | + // | ||
| 85 | + // } | ||
| 86 | + // }) | ||
| 87 | + // | ||
| 88 | + // Text(this.isExpansion?'收起':'展开').onClick(()=>{ | ||
| 89 | + // this.isExpansion = !this.isExpansion | ||
| 90 | + // }) | ||
| 91 | + // .fontSize(14) | ||
| 92 | + // .fontColor($r('app.color.white')) | ||
| 83 | }.alignItems(VerticalAlign.Bottom) | 93 | }.alignItems(VerticalAlign.Bottom) |
| 84 | .alignRules({ | 94 | .alignRules({ |
| 85 | left: { anchor: "__container__", align: HorizontalAlign.Start }, | 95 | left: { anchor: "__container__", align: HorizontalAlign.Start }, |
| @@ -32,6 +32,7 @@ export struct CommentText { | @@ -32,6 +32,7 @@ export struct CommentText { | ||
| 32 | fontColor: ResourceColor = $r('app.color.color_222222') | 32 | fontColor: ResourceColor = $r('app.color.color_222222') |
| 33 | // 测量文本宽度(单位px) | 33 | // 测量文本宽度(单位px) |
| 34 | @State textWidth: number = 0; | 34 | @State textWidth: number = 0; |
| 35 | + isMorningEveningPaper:boolean = false | ||
| 35 | // constructor(longMessage?:string,) { | 36 | // constructor(longMessage?:string,) { |
| 36 | // super(); | 37 | // super(); |
| 37 | // this.longMessage = longMessage; | 38 | // this.longMessage = longMessage; |
| @@ -108,6 +109,11 @@ export struct CommentText { | @@ -108,6 +109,11 @@ export struct CommentText { | ||
| 108 | // if (this.maxLineMesssage.endsWith('\n')) { | 109 | // if (this.maxLineMesssage.endsWith('\n')) { |
| 109 | // this.maxLineMesssage = this.maxLineMesssage.slice(0, this.maxLineMesssage.length - 1) | 110 | // this.maxLineMesssage = this.maxLineMesssage.slice(0, this.maxLineMesssage.length - 1) |
| 110 | // } | 111 | // } |
| 112 | + | ||
| 113 | + ///早晚报三行显示 展开功能显示末尾 | ||
| 114 | + if (this.isMorningEveningPaper) { | ||
| 115 | + this.maxLineMesssage = this.maxLineMesssage.substring(0,this.maxLineMesssage.length - 7) | ||
| 116 | + } | ||
| 111 | break | 117 | break |
| 112 | } | 118 | } |
| 113 | this.maxLineMesssage = element; | 119 | this.maxLineMesssage = element; |
| @@ -9,7 +9,7 @@ const TAG = 'AboutPageUI'; | @@ -9,7 +9,7 @@ const TAG = 'AboutPageUI'; | ||
| 9 | 9 | ||
| 10 | @Component | 10 | @Component |
| 11 | export struct AboutPageUI { | 11 | export struct AboutPageUI { |
| 12 | - @State listData: Array<string | Array<string>> = ['隐私授权协议', '软件许可及用户协议','收集个人信息明示清单','第三方信息共享清单']; | 12 | + @State listData: Array<string | Array<string>> = ['隐私授权协议', '软件许可及用户协议','APP个人信息收集清单','第三方信息共享清单']; |
| 13 | @State message: string = '京ICP备16066560号-6A Copyright © 人民日报客户端\nall rights reserved.' | 13 | @State message: string = '京ICP备16066560号-6A Copyright © 人民日报客户端\nall rights reserved.' |
| 14 | @State version: string = '版本号:v' | 14 | @State version: string = '版本号:v' |
| 15 | dialogController: CustomDialogController = new CustomDialogController({ | 15 | dialogController: CustomDialogController = new CustomDialogController({ |
| @@ -95,6 +95,7 @@ struct LoginProtocolWebview { | @@ -95,6 +95,7 @@ struct LoginProtocolWebview { | ||
| 95 | } | 95 | } |
| 96 | }.width("100%") | 96 | }.width("100%") |
| 97 | .height("100%") | 97 | .height("100%") |
| 98 | + .backgroundColor(Color.White) | ||
| 98 | .padding({top:px2vp(this.topSafeHeight),bottom:px2vp(this.bottomSafeHeight)}) | 99 | .padding({top:px2vp(this.topSafeHeight),bottom:px2vp(this.bottomSafeHeight)}) |
| 99 | 100 | ||
| 100 | } | 101 | } |
-
Please register or login to post a comment