Showing
1 changed file
with
19 additions
and
7 deletions
| @@ -214,20 +214,23 @@ struct ChannelDialog { | @@ -214,20 +214,23 @@ struct ChannelDialog { | ||
| 214 | Flex({ justifyContent: FlexAlign.SpaceBetween }) { | 214 | Flex({ justifyContent: FlexAlign.SpaceBetween }) { |
| 215 | ForEach(this.homeChannelList, (item: TopNavDTO, index: number) => { | 215 | ForEach(this.homeChannelList, (item: TopNavDTO, index: number) => { |
| 216 | Stack() { | 216 | Stack() { |
| 217 | - Image(item.channelId === this.indexSettingChannelId ? $r('app.media.index_setting_button_active') : $r('app.media.index_setting_button')) | 217 | + Image(item.channelId === this.indexSettingChannelId ? $r('app.media.index_setting_button_active') : |
| 218 | + $r('app.media.index_setting_button')) | ||
| 218 | .objectFit(ImageFit.Auto) | 219 | .objectFit(ImageFit.Auto) |
| 219 | .rotate({ | 220 | .rotate({ |
| 220 | angle: index === 1 ? 180 : 0 | 221 | angle: index === 1 ? 180 : 0 |
| 221 | }) | 222 | }) |
| 222 | Row() { | 223 | Row() { |
| 223 | if (index === 0) { | 224 | if (index === 0) { |
| 224 | - Image(item.channelId === this.indexSettingChannelId ? $r('app.media.recommend_icon') : $r('app.media.recommend_icon_active')) | 225 | + Image(item.channelId === this.indexSettingChannelId ? $r('app.media.recommend_icon') : |
| 226 | + $r('app.media.recommend_icon_active')) | ||
| 225 | .width(20) | 227 | .width(20) |
| 226 | } | 228 | } |
| 227 | Text(item.name) | 229 | Text(item.name) |
| 228 | .textAlign(TextAlign.Center) | 230 | .textAlign(TextAlign.Center) |
| 229 | .fontSize(16) | 231 | .fontSize(16) |
| 230 | .fontColor(item.channelId === this.indexSettingChannelId ? '#ffffff' : '#ED2800') | 232 | .fontColor(item.channelId === this.indexSettingChannelId ? '#ffffff' : '#ED2800') |
| 233 | + | ||
| 231 | } | 234 | } |
| 232 | .width('100%') | 235 | .width('100%') |
| 233 | .justifyContent(FlexAlign.Center) | 236 | .justifyContent(FlexAlign.Center) |
| @@ -275,8 +278,8 @@ struct ChannelDialog { | @@ -275,8 +278,8 @@ struct ChannelDialog { | ||
| 275 | GridItem() { | 278 | GridItem() { |
| 276 | Row() { | 279 | Row() { |
| 277 | Text(item.name) | 280 | Text(item.name) |
| 278 | - .fontSize(14) | ||
| 279 | - .fontColor(this.currentTopNavSelectedItem.channelId === item.channelId ? '#ED2800' : (item.headlinesOn === 1 || item.movePermitted === 0 ? '#999999' : '#222222')) | 281 | + .fontSize(14)// .fontColor(this.currentTopNavSelectedItem.channelId === item.channelId ? '#ED2800' : (item.headlinesOn === 1 || item.movePermitted === 0 ? '#999999' : '#222222')) |
| 282 | + .fontColor(item.headlinesOn === 1 || item.movePermitted === 0 ? '#999999' : '#222222') | ||
| 280 | 283 | ||
| 281 | if (this.isEditIng && item.delPermitted === 1 && item.movePermitted === 1) { | 284 | if (this.isEditIng && item.delPermitted === 1 && item.movePermitted === 1) { |
| 282 | Image($r('app.media.icon_audio_close')) | 285 | Image($r('app.media.icon_audio_close')) |
| @@ -292,7 +295,7 @@ struct ChannelDialog { | @@ -292,7 +295,7 @@ struct ChannelDialog { | ||
| 292 | .width('23%') | 295 | .width('23%') |
| 293 | .height(40) | 296 | .height(40) |
| 294 | .border({ | 297 | .border({ |
| 295 | - width: item.headlinesOn === 1 || item.movePermitted === 0 ? 0 : 1, | 298 | + width: item.headlinesOn === 1 || item.movePermitted === 0 ? 0 : 1, |
| 296 | color: '#EDEDED', | 299 | color: '#EDEDED', |
| 297 | radius: 3 | 300 | radius: 3 |
| 298 | }) | 301 | }) |
| @@ -319,7 +322,11 @@ struct ChannelDialog { | @@ -319,7 +322,11 @@ struct ChannelDialog { | ||
| 319 | } | 322 | } |
| 320 | } | 323 | } |
| 321 | }), | 324 | }), |
| 322 | - PanGesture({ fingers: 1, direction: this.isEditIng ? PanDirection.All:PanDirection.None, distance: 0 }) | 325 | + PanGesture({ |
| 326 | + fingers: 1, | ||
| 327 | + direction: this.isEditIng ? PanDirection.All : PanDirection.None, | ||
| 328 | + distance: 0 | ||
| 329 | + }) | ||
| 323 | .onActionStart((event: GestureEvent) => { | 330 | .onActionStart((event: GestureEvent) => { |
| 324 | this.dragItem = item.num | 331 | this.dragItem = item.num |
| 325 | this.dragRefOffsetX = 0 | 332 | this.dragRefOffsetX = 0 |
| @@ -449,7 +456,12 @@ struct ChannelDialog { | @@ -449,7 +456,12 @@ struct ChannelDialog { | ||
| 449 | }.width('100%').height('100%') | 456 | }.width('100%').height('100%') |
| 450 | .scrollBar(BarState.Off) | 457 | .scrollBar(BarState.Off) |
| 451 | } | 458 | } |
| 452 | - .padding({ top: 40, right: 15, bottom: 40, left: 15 }) | 459 | + .padding({ |
| 460 | + top: 40, | ||
| 461 | + right: 15, | ||
| 462 | + bottom: 40, | ||
| 463 | + left: 15 | ||
| 464 | + }) | ||
| 453 | .backgroundColor('#ffffff') | 465 | .backgroundColor('#ffffff') |
| 454 | } | 466 | } |
| 455 | } | 467 | } |
-
Please register or login to post a comment