developOne / harmonyPool

Go to a project
Toggle navigation Toggle navigation pinning
wangliang_wd
1c1a141a 2 parents f048fafa 47e52ff1

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

* 'main' of http://192.168.1.42/developOne/harmonyPool:
  fix: 动态视频>进入视频播放详情页-引导功能未实现
  ref |> 去掉一键登录按钮上的图标
  fix: UI还原问题-【uat】进入视频详情页，点击评论，默哀图标未显示
Inline Side-by-side
Showing 4 changed files with 48 additions and 27 deletions
... ... @@ -124,8 +124,8 @@ export struct LikeComponent {
}
} else if (this.likesStyle === 3 || this.likesStyle === 'mourning') {
return {
url: this.likeStatus ? $r(`app.media.ic_candle_check`) :
$r(`app.media.ic_candle_uncheck`),
url: this.likeStatus ? $r(`app.media.icon_candle_active`) :
$r(`app.media.icon_candle_unactive`),
name: '默哀'
}
}
... ...
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="24" height="24" viewBox="0 0 24 24"><defs><clipPath id="master_svg0_13722_099281/13416_090981"><rect x="4.5" y="0.75" width="15" height="22.5" rx="0"/></clipPath></defs><g><g clip-path="url(#master_svg0_13722_099281/13416_090981)"><g><rect x="4.5" y="20.75" width="15" height="2" rx="0.5" fill="#222222" fill-opacity="1"/></g><g><path d="M11,9.5L11,12L13,12L13,9.5C13,9.223858,12.77614,9,12.5,9L11.5,9C11.223858,9,11,9.223858,11,9.5Z" fill="#222222" fill-opacity="1"/></g><g><path d="M6,11.25L6,22.75L18,22.75L18,11.25C18,10.973858,17.7761,10.75,17.5,10.75L6.5,10.75C6.223858,10.75,6,10.973858,6,11.25ZM16,20.75L8,20.75L8,12.75L16,12.75L16,20.75Z" fill-rule="evenodd" fill="#222222" fill-opacity="1"/></g></g><g><path d="M15.75,6.31146C15.75,8.34859,14.071069999999999,10,12,10C9.92893,10,8.25,8.34859,8.25,6.31146C8.25,4.51906,10.02101,2.02987,11.84184,1.0786622C11.94119,1.0267585,12.05881,1.0267585,12.15816,1.0786622C13.97899,2.02987,15.75,4.51906,15.75,6.31146ZM13.75,6.31146Q13.75,5.60876,12.99419,4.52046Q12.519169999999999,3.83648,12,3.38317Q11.480830000000001,3.83648,11.00581,4.52046Q10.25,5.60876,10.25,6.31146Q10.25,7.00118,10.75083,7.4938Q11.265460000000001,8,12,8Q12.734539999999999,8,13.24917,7.4938Q13.75,7.00118,13.75,6.31146Z" fill-rule="evenodd" fill="#222222" fill-opacity="1"/></g></g></svg>
\ No newline at end of file
... ...
... ... @@ -7,7 +7,7 @@ import router from '@ohos.router';
import { contentListParams } from 'wdDetailPlayApi/src/main/ets/request/ContentDetailRequest';
import { DisplayDirection } from 'wdConstant/Index';
import { window } from '@kit.ArkUI';
import { EmptyComponent } from 'wdComponent/Index';
import { EmptyComponent, LottieView } from 'wdComponent/Index';
import { DateTimeUtils } from 'wdKit/Index';
import { TrackConstants, TrackingPageBrowse } from 'wdTracking/Index';
import { AudioSuspensionModel } from 'wdComponent'
... ... @@ -15,6 +15,7 @@ import { BusinessError } from '@kit.BasicServicesKit';
const storage = LocalStorage.getShared();
const TAG = 'DetailVideoListPage'
PersistentStorage.persistProp('DetailVideoListGestureLoadStrategy', 0); // 点播视频手势动画0为用户首次进入视频点播，1为用户已进入视频点播
@Entry(storage)
@Component
... ... @@ -46,6 +47,7 @@ export struct DetailVideoListPage {
@Provide toastTextVisible: boolean = false
private AudioSuspension = new AudioSuspensionModel()
@State isShowAudioCom: boolean = false
@StorageLink('DetailVideoListGestureLoadStrategy') DetailVideoListGestureLoadStrategy: number = 0
async aboutToAppear(): Promise<void> {
// 注册监听网络连接
... ... @@ -228,20 +230,20 @@ export struct DetailVideoListPage {
}
build() {
if (this.netStatus !== undefined || this.isOffLine) {
EmptyComponent({
emptyType: 15, emptyButton: true, retry: () => {
this.getContentDetail(this.contentId, this.relId, this.relType)
}
})
.id('e_empty_content')
.alignRules({
center: { anchor: "__container__", align: VerticalAlign.Center },
middle: { anchor: "__container__", align: HorizontalAlign.Center }
Stack({ alignContent: Alignment.Center }) {
if (this.netStatus !== undefined || this.isOffLine) {
EmptyComponent({
emptyType: 15, emptyButton: true, retry: () => {
this.getContentDetail(this.contentId, this.relId, this.relType)
}
})
.backgroundColor(Color.Black)
} else {
Column() {
.id('e_empty_content')
.alignRules({
center: { anchor: "__container__", align: VerticalAlign.Center },
middle: { anchor: "__container__", align: HorizontalAlign.Center }
})
.backgroundColor(Color.Black)
} else {
Swiper(this.swiperController) {
ForEach(this.data, (item: ContentDetailDTO, index: number) => {
DetailPlayShortVideoPage({
... ... @@ -267,16 +269,34 @@ export struct DetailVideoListPage {
this.queryVideoList()
}
})
// 作为手势动画的背景
Row() {}
.justifyContent(FlexAlign.Center)
.width('100%')
.height('100%')
.visibility(this.DetailVideoListGestureLoadStrategy == 0 ? Visibility.Visible : Visibility.Hidden)
.backgroundColor('rgba(0, 0, 0, 0.50)')
.onTouch(() => {
this.DetailVideoListGestureLoadStrategy = 1
})
// 手势动画 初次进入显示
LottieView({
name: 'slider_up_view_more',
path: "lottie/slider_up_view_more.json",
lottieWidth: 167,
lottieHeight: 167,
autoplay: true,
loop: true
})
.visibility(this.DetailVideoListGestureLoadStrategy == 0 ? Visibility.Visible : Visibility.Hidden)
.onTouch(() => {
this.DetailVideoListGestureLoadStrategy = 1
})
}
.width('100%')
.height('100%')
.backgroundColor(Color.Black)
.expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.TOP, SafeAreaEdge.BOTTOM])
// .padding({
// bottom: this.bottomSafeHeight + 'px'
// })
}
.width('100%')
.height('100%')
.backgroundColor(Color.Black)
}
}
\ No newline at end of file
... ...
... ... @@ -158,11 +158,11 @@ struct OneKeyLoginPage {
Stack(){
Button() {
Row() {
Image($r("app.media.huawei_one_key_login_icon"))
.width(24).height(24)
// Image($r("app.media.huawei_one_key_login_icon"))
// .width(24).height(24)
Text("华为账号一键登录")
.fontColor(Color.White)
.margin({left:5})
// .margin({left:5})
}
}
.width('100%')
... ...