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-09-09 11:05:16 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
2258fac775983e095e25593bd35c69dbea2bfbf4
2258fac7
1 parent
e88e1fc6
fix: 19533 【UI走查-卡片】折叠屏展开-所有带图片的卡片,图片都要增加一个描边
Show whitespace changes
Inline
Side-by-side
Showing
27 changed files
with
114 additions
and
15 deletions
sight_harmony/features/wdComponent/src/main/ets/components/cardViewAdv/CardAdvBigImageComponent.ets
sight_harmony/features/wdComponent/src/main/ets/components/cardViewAdv/CardAdvGanMiComponent.ets
sight_harmony/features/wdComponent/src/main/ets/components/cardViewAdv/CardAdvLongImageComponent.ets
sight_harmony/features/wdComponent/src/main/ets/components/cardViewAdv/CardAdvSmallImageComponent.ets
sight_harmony/features/wdComponent/src/main/ets/components/cardViewAdv/CardAdvThreeImageComponent.ets
sight_harmony/features/wdComponent/src/main/ets/components/cardViewAdv/CardAdvVideoComponent.ets
sight_harmony/features/wdComponent/src/main/ets/components/cardViewAdv/CardAdvVideoExComponent.ets
sight_harmony/features/wdComponent/src/main/ets/components/cardview/Card10Component.ets
sight_harmony/features/wdComponent/src/main/ets/components/cardview/Card14Component.ets
sight_harmony/features/wdComponent/src/main/ets/components/cardview/Card15Component.ets
sight_harmony/features/wdComponent/src/main/ets/components/cardview/Card16Component.ets
sight_harmony/features/wdComponent/src/main/ets/components/cardview/Card17Component.ets
sight_harmony/features/wdComponent/src/main/ets/components/cardview/Card19Component.ets
sight_harmony/features/wdComponent/src/main/ets/components/cardview/Card21Component.ets
sight_harmony/features/wdComponent/src/main/ets/components/cardview/Card2Component.ets
sight_harmony/features/wdComponent/src/main/ets/components/cardview/Card4Component.ets
sight_harmony/features/wdComponent/src/main/ets/components/cardview/Card5Component.ets
sight_harmony/features/wdComponent/src/main/ets/components/cardview/Card6Component.ets
sight_harmony/features/wdComponent/src/main/ets/components/cardview/LiveBigImage01Component.ets
sight_harmony/features/wdComponent/src/main/ets/components/compview/ZhCarouselLayout01.ets
sight_harmony/features/wdComponent/src/main/ets/components/compview/ZhGridLayout02NewsContent.ets
sight_harmony/features/wdComponent/src/main/ets/components/compview/ZhGridLayout03.ets
sight_harmony/features/wdComponent/src/main/ets/components/compview/ZhSingleColumn09.ets
sight_harmony/features/wdComponent/src/main/ets/components/compview/ZhSingleRow02.ets
sight_harmony/features/wdComponent/src/main/ets/components/compview/ZhSingleRow03.ets
sight_harmony/features/wdComponent/src/main/ets/components/mine/appointment/AppointmentListChildComponent.ets
sight_harmony/features/wdComponent/src/main/ets/components/view/LiveHorizontalCardComponent.ets
sight_harmony/features/wdComponent/src/main/ets/components/cardViewAdv/CardAdvBigImageComponent.ets
View file @
2258fac
...
...
@@ -41,9 +41,12 @@ export struct CardAdvBigImageComponent {
.backgroundColor(this.loadImg ? $r('app.color.color_B0B0B0') : 0xf5f5f5)
.width(CommonConstants.FULL_WIDTH)
.aspectRatio(16 / 9)
.borderRadius(4)
.borderWidth(0.5)
.borderColor($r('app.color.color_0D000000'))
.border({
width: 0.5,
color: '#0D000000', // 5% 透明度的黑色
style: BorderStyle.Solid,
radius: 4
})
.width(CommonConstants.FULL_WIDTH)
CardAdvBottom({pageModel:this.pageModel,compDTO:this.compDTO}).margin({
...
...
sight_harmony/features/wdComponent/src/main/ets/components/cardViewAdv/CardAdvGanMiComponent.ets
View file @
2258fac
...
...
@@ -51,9 +51,12 @@ export struct CardAdvGanMiComponent {
.width(CommonConstants.FULL_WIDTH)
.backgroundColor(this.loadImg ? $r('app.color.color_B0B0B0') : 0xf5f5f5)
.aspectRatio(343 / 40)
.borderRadius(4)
.borderWidth(0.5)
.borderColor($r('app.color.color_0D000000'))
.border({
width: 0.5,
color: '#0D000000', // 5% 透明度的黑色
style: BorderStyle.Solid,
radius: 4
})
// 广告标签和删除功能
CardAdvTop({ pageModel: this.pageModel, compDTO: this.compDTO })
...
...
@@ -79,9 +82,12 @@ export struct CardAdvGanMiComponent {
.width('100%')
.backgroundColor(this.loadImg ? $r('app.color.color_B0B0B0') : 0xf5f5f5)
.aspectRatio(150 / 84)
.borderWidth(0.5)
.borderColor($r('app.color.color_0D000000'))
.borderRadius(4)
.border({
width: 0.5,
color: '#0D000000', // 5% 透明度的黑色
style: BorderStyle.Solid,
radius: 4
})
Text(content.title)
.fontSize('16fp')
...
...
sight_harmony/features/wdComponent/src/main/ets/components/cardViewAdv/CardAdvLongImageComponent.ets
View file @
2258fac
...
...
@@ -44,9 +44,12 @@ export struct CardAdvLongImageComponent {
.backgroundColor(this.loadImg ? $r('app.color.color_B0B0B0') : 0xf5f5f5)
.width(CommonConstants.FULL_WIDTH)
.aspectRatio(343 / 96)
.borderRadius(4)
.borderWidth(0.5)
.borderColor($r('app.color.color_0D000000'))
.border({
width: 0.5,
color: '#0D000000', // 5% 透明度的黑色
style: BorderStyle.Solid,
radius: 4
})
CardAdvBottom({ pageModel: this.pageModel, compDTO:this.compDTO }).margin({
top: 8,
...
...
sight_harmony/features/wdComponent/src/main/ets/components/cardViewAdv/CardAdvSmallImageComponent.ets
View file @
2258fac
...
...
@@ -66,6 +66,7 @@ export struct CardAdvSmallImageComponent {
.borderWidth(0.5)
.borderColor($r('app.color.color_0D000000'))
.borderRadius(4)//.alt('wwww.baidu.com')
.borderStyle(BorderStyle.Solid)
.alignRules({
top: { anchor: 'title_name', align: VerticalAlign.Top },
left: { anchor: 'title_name', align: HorizontalAlign.End },
...
...
sight_harmony/features/wdComponent/src/main/ets/components/cardViewAdv/CardAdvThreeImageComponent.ets
View file @
2258fac
...
...
@@ -57,6 +57,8 @@ export struct CardAdvThreeImageComponent {
bottomRight: index === 2 ? $r('app.float.image_border_radius') : 0,
})
.borderColor($r('app.color.color_0D000000'))
.borderStyle(BorderStyle.Solid)
.borderWidth(0.5)
}
}
})
...
...
sight_harmony/features/wdComponent/src/main/ets/components/cardViewAdv/CardAdvVideoComponent.ets
View file @
2258fac
...
...
@@ -47,6 +47,7 @@ export struct CardAdvVideoComponent {
.borderRadius(4)
.borderWidth(0.5)
.borderColor($r('app.color.color_0D000000'))
.borderStyle(BorderStyle.Solid)
//播放状态+时长
CardMediaInfo({
contentDTO: this.contentDTO, livePeopleNum:false,
...
...
sight_harmony/features/wdComponent/src/main/ets/components/cardViewAdv/CardAdvVideoExComponent.ets
View file @
2258fac
...
...
@@ -49,6 +49,7 @@ export struct CardAdvVideoExComponent {
.borderRadius(4)
.borderWidth(0.5)
.borderColor($r('app.color.color_0D000000'))
.borderStyle(BorderStyle.Solid)
.onClick(() => {
ProcessUtils.openAdvDetail(this.compDTO.matInfo)
...
...
sight_harmony/features/wdComponent/src/main/ets/components/cardview/Card10Component.ets
View file @
2258fac
...
...
@@ -122,6 +122,9 @@ export struct Card10Component {
topLeft: $r('app.float.image_border_radius'),
topRight: $r('app.float.image_border_radius')
})
.borderStyle(BorderStyle.Solid)
.borderWidth(0.5)
.borderColor($r('app.color.color_0D000000'))
.onClick((event: ClickEvent) => {
InfomationCardClick.track(this.compDTO, this.contentDTO, this.pageId, this.pageName)
ProcessUtils.processPage(this.contentDTO)
...
...
@@ -248,6 +251,9 @@ export struct Card10ComponentTimelineItem {
.height(78)
.objectFit(ImageFit.Cover)
.borderRadius($r('app.float.image_border_radius'))
.borderStyle(BorderStyle.Solid)
.borderWidth(0.5)
.borderColor($r('app.color.color_0D000000'))
.margin({ left: 12 })
CardMediaInfo({
contentDTO: this.createMediaInfoContent(this.slideItem)
...
...
sight_harmony/features/wdComponent/src/main/ets/components/cardview/Card14Component.ets
View file @
2258fac
...
...
@@ -89,6 +89,7 @@ export struct Card14Component {
width: 1,
color: '#0D000000'
})
.borderStyle(BorderStyle.Solid)
.backgroundImageSize(ImageSize.Auto)
}
...
...
sight_harmony/features/wdComponent/src/main/ets/components/cardview/Card15Component.ets
View file @
2258fac
...
...
@@ -83,6 +83,9 @@ export struct Card15Component {
Image(this.loadImg ? this.contentDTO.fullColumnImgUrls?.[0]?.url || this.contentDTO.fullColumnImgUrls?.[0]?.fullUrl : '')
.backgroundColor(0xf5f5f5)
.borderRadius($r('app.float.image_border_radius'))
.borderStyle(BorderStyle.Solid)
.borderWidth(0.5)
.borderColor($r('app.color.color_0D000000'))
//播放状态+时长
CardMediaInfo({
contentDTO: this.contentDTO
...
...
sight_harmony/features/wdComponent/src/main/ets/components/cardview/Card16Component.ets
View file @
2258fac
...
...
@@ -101,6 +101,10 @@ export struct Card16Component {
bottomLeft: index === 0 ? $r('app.float.image_border_radius') : 0,
bottomRight: index === 2 ? $r('app.float.image_border_radius') : 0,
})
.border({
width: 1,
color: '#0D000000'
})
}
}
})
...
...
@@ -174,6 +178,10 @@ struct createImg {
.width(CommonConstants.FULL_WIDTH)
.aspectRatio(16 / 9)
.borderRadius($r('app.float.image_border_radius'))
.border({
width: 1,
color: '#0D000000'
})
CardMediaInfo({ contentDTO: this.contentDTO })
}
.align(Alignment.BottomEnd)
...
...
@@ -188,6 +196,10 @@ struct createImg {
.backgroundColor(0xf5f5f5)
.width(CommonConstants.FULL_WIDTH)
.borderRadius($r('app.float.image_border_radius'))
.border({
width: 1,
color: '#0D000000'
})
CardMediaInfo({ contentDTO: this.contentDTO })
}
.align(Alignment.BottomEnd)
...
...
sight_harmony/features/wdComponent/src/main/ets/components/cardview/Card17Component.ets
View file @
2258fac
...
...
@@ -77,6 +77,9 @@ export struct Card17Component {
topLeft: $r('app.float.image_border_radius'),
bottomLeft: $r('app.float.image_border_radius'),
})
.borderStyle(BorderStyle.Solid)
.borderWidth(0.5)
.borderColor($r('app.color.color_0D000000'))
}
GridCol({ span: { xs: 4 } }) {
...
...
@@ -89,6 +92,9 @@ export struct Card17Component {
.borderRadius({
topRight: $r('app.float.image_border_radius'),
})
.borderStyle(BorderStyle.Solid)
.borderWidth(0.5)
.borderColor($r('app.color.color_0D000000'))
}
}
...
...
@@ -106,6 +112,9 @@ export struct Card17Component {
.borderRadius({
bottomRight: $r('app.float.image_border_radius'),
})
.borderStyle(BorderStyle.Solid)
.borderWidth(0.5)
.borderColor($r('app.color.color_0D000000'))
}
}
...
...
sight_harmony/features/wdComponent/src/main/ets/components/cardview/Card19Component.ets
View file @
2258fac
...
...
@@ -233,12 +233,18 @@ struct createImg {
.height(198)
.autoResize(true)
.borderRadius(this.caclImageRadius(index))
.borderStyle(BorderStyle.Solid)
.borderWidth(0.5)
.borderColor($r('app.color.color_0D000000'))
} else if (this.getPicType(item.weight, item.height) === 2) {
Image(this.loadImg ? item.url || item.fullUrl : '')
.width('100%')
.height(305)
.autoResize(true)
.borderRadius(this.caclImageRadius(index))
.borderStyle(BorderStyle.Solid)
.borderWidth(0.5)
.borderColor($r('app.color.color_0D000000'))
}
this.longPicTip(item.weight, item.height)
...
...
@@ -257,6 +263,9 @@ struct createImg {
.autoResize(true)
.aspectRatio(3/4)
.borderRadius(this.caclImageRadius(index))
.borderStyle(BorderStyle.Solid)
.borderWidth(0.5)
.borderColor($r('app.color.color_0D000000'))
.opacity(!item.weight && !item.height ? 0 : 1)
.onComplete((event?) => {
this.onePicW = event?.width || 0;
...
...
@@ -277,6 +286,9 @@ struct createImg {
})
.autoResize(true)
.borderRadius(this.caclImageRadius(index))
.borderStyle(BorderStyle.Solid)
.borderWidth(0.5)
.borderColor($r('app.color.color_0D000000'))
.opacity(!item.weight && !item.height ? 0 : 1)
.onComplete((event?) => {
this.onePicW = event?.width || 0;
...
...
@@ -300,6 +312,9 @@ struct createImg {
.width('226lvp')
.height('226lvp')
.borderRadius(this.caclImageRadius(index))
.borderStyle(BorderStyle.Solid)
.borderWidth(0.5)
.borderColor($r('app.color.color_0D000000'))
if(this.getPicType(item.weight, item.height) !== 3){
this.longPicTip(item.weight, item.height)
}
...
...
@@ -314,6 +329,9 @@ struct createImg {
.backgroundColor(0xf5f5f5)
.aspectRatio(1)
.borderRadius(this.caclImageRadius(index))
.borderStyle(BorderStyle.Solid)
.borderWidth(0.5)
.borderColor($r('app.color.color_0D000000'))
.width('100%')
.autoResize(true)
if (this.getPicType(item.weight, item.height) !== 3) {
...
...
sight_harmony/features/wdComponent/src/main/ets/components/cardview/Card21Component.ets
View file @
2258fac
...
...
@@ -83,6 +83,9 @@ export struct Card21Component {
.backgroundColor(0xf5f5f5)
.width(CommonConstants.FULL_WIDTH)
.borderRadius($r('app.float.image_border_radius'))
.borderStyle(BorderStyle.Solid)
.borderWidth(0.5)
.borderColor($r('app.color.color_0D000000'))
CardMediaInfo({ contentDTO: this.contentDTO })
}
.alignContent(Alignment.BottomEnd)
...
...
sight_harmony/features/wdComponent/src/main/ets/components/cardview/Card2Component.ets
View file @
2258fac
...
...
@@ -107,6 +107,9 @@ export struct Card2Component {
.width(CommonConstants.FULL_WIDTH)
.aspectRatio(16 / 9)
.borderRadius($r('app.float.image_border_radius'))
.borderStyle(BorderStyle.Solid)
.borderWidth(0.5)
.borderColor($r('app.color.color_0D000000'))
.backgroundColor(0xf5f5f5)
//播放状态+时长
CardMediaInfo({
...
...
sight_harmony/features/wdComponent/src/main/ets/components/cardview/Card4Component.ets
View file @
2258fac
...
...
@@ -110,6 +110,9 @@ export struct Card4Component {
bottomLeft: index === 0 ? $r('app.float.image_border_radius') : 0,
bottomRight: index === 2 ? $r('app.float.image_border_radius') : 0,
})
.borderStyle(BorderStyle.Solid)
.borderWidth(0.5)
.borderColor($r('app.color.color_0D000000'))
}
}
})
...
...
sight_harmony/features/wdComponent/src/main/ets/components/cardview/Card5Component.ets
View file @
2258fac
...
...
@@ -63,6 +63,9 @@ export struct Card5Component {
bottomRight: $r('app.float.image_border_radius')
}
)
.borderStyle(BorderStyle.Solid)
.borderWidth(0.5)
.borderColor($r('app.color.color_0D000000'))
.height(this.loadImg ? '' : 114)
.autoResize(true)
if (this.titleShowPolicy == 1) {
...
...
sight_harmony/features/wdComponent/src/main/ets/components/cardview/Card6Component.ets
View file @
2258fac
...
...
@@ -125,6 +125,7 @@ export struct Card6Component {
.aspectRatio(this.contentDTO.appStyle === CompStyle.Card_13 ? 3 / 2 : 3 / 4)
.height(this.contentDTO.appStyle === CompStyle.Card_13 ? 78 : 156)
.border({width: 1, color: 0xf5f5f5})
.borderStyle(BorderStyle.Solid)
CardMediaInfo({ contentDTO: this.contentDTO })
}
...
...
sight_harmony/features/wdComponent/src/main/ets/components/cardview/LiveBigImage01Component.ets
View file @
2258fac
...
...
@@ -44,6 +44,7 @@ export struct LiveBigImage01Component {
topLeft: '4vp',
topRight: '4vp'
})
.borderStyle(BorderStyle.Solid)
this.LiveImage()
...
...
sight_harmony/features/wdComponent/src/main/ets/components/compview/ZhCarouselLayout01.ets
View file @
2258fac
...
...
@@ -225,6 +225,9 @@ struct CarouselLayout01CardView {
.objectFit(ImageFit.Cover)
.backgroundColor(0xf5f5f5)
.borderRadius(this.showPicBorderRadius ? $r('app.float.image_border_radius') : 0)
.borderStyle(BorderStyle.Solid)
.borderWidth(0.5)
.borderColor($r('app.color.color_0D000000'))
Stack() {
Row()
...
...
sight_harmony/features/wdComponent/src/main/ets/components/compview/ZhGridLayout02NewsContent.ets
View file @
2258fac
...
...
@@ -61,6 +61,7 @@ export struct ZhGridLayout02NewsContent {
.borderWidth(0.5)
.borderColor($r('app.color.color_0D000000'))
.borderRadius(4)
.borderStyle(BorderStyle.Solid)
if (this.compDTO.operDataList[index].liveRoomDataBean != undefined
&& this.compDTO.operDataList[index].liveRoomDataBean?.pv != undefined) {
Text(this.computeShowNum(this.compDTO.operDataList[index].liveRoomDataBean))
...
...
sight_harmony/features/wdComponent/src/main/ets/components/compview/ZhGridLayout03.ets
View file @
2258fac
...
...
@@ -61,9 +61,10 @@ export struct ZhGridLayout03 {
.backgroundColor(0xf5f5f5)
.width(44)
.aspectRatio(1 / 1)
// .margin({
// bottom: 16
// })
.borderStyle(BorderStyle.Solid)
.borderWidth(0.5)
.borderColor($r('app.color.color_0D000000'))
Text(item.newsTitle)
.fontSize(13)
.maxLines(1)
...
...
sight_harmony/features/wdComponent/src/main/ets/components/compview/ZhSingleColumn09.ets
View file @
2258fac
...
...
@@ -186,6 +186,9 @@ export struct ZhSingleColumn09 {
.width('100%')
.height('100%')
.borderRadius(3)
.borderStyle(BorderStyle.Solid)
.borderWidth(0.5)
.borderColor($r('app.color.color_0D000000'))
Row() {
}
.width('100%')
...
...
sight_harmony/features/wdComponent/src/main/ets/components/compview/ZhSingleRow02.ets
View file @
2258fac
...
...
@@ -241,6 +241,9 @@ struct CreatorItem {
.height(208)
.backgroundColor(0xf5f5f5)
.borderRadius(4)
.borderStyle(BorderStyle.Solid)
.borderWidth(0.5)
.borderColor($r('app.color.color_0D000000'))
Row()
.width(156)
...
...
sight_harmony/features/wdComponent/src/main/ets/components/compview/ZhSingleRow03.ets
View file @
2258fac
...
...
@@ -271,6 +271,7 @@ export struct ZhSingleRow03 {
.border({
width: 0.7,
color: '#EDEDED',
style: BorderStyle.Solid
})
.flexShrink(0)
...
...
@@ -379,6 +380,7 @@ export struct ZhSingleRow03 {
.border({
width: 0.7,
color: '#EDEDED',
style: BorderStyle.Solid
})
Text(item.newsTitle)
...
...
sight_harmony/features/wdComponent/src/main/ets/components/mine/appointment/AppointmentListChildComponent.ets
View file @
2258fac
...
...
@@ -44,6 +44,9 @@ export struct AppointmentListChildComponent {
.objectFit(ImageFit.Auto)
.interpolation(ImageInterpolation.High)
.borderRadius(4)
.borderStyle(BorderStyle.Solid)
.borderWidth(0.5)
.borderColor($r('app.color.color_0D000000'))
if (this.item.status == "wait") {
...
...
sight_harmony/features/wdComponent/src/main/ets/components/view/LiveHorizontalCardComponent.ets
View file @
2258fac
...
...
@@ -159,6 +159,9 @@ export struct LiveHorizontalCardComponent {
.width(this.compDTO.operDataList.length == 2 ? 210 : 150)
// .borderRadius(4)
.objectFit(ImageFit.Contain)
.borderStyle(BorderStyle.Solid)
.borderWidth(0.5)
.borderColor($r('app.color.color_0D000000'))
CardMediaInfo({
livePeopleNum:false,
contentDTO: item
...
...
Please
register
or
login
to post a comment