Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

为视频添加发布时间显示 #39

Merged
merged 5 commits into from
Dec 18, 2023
Merged

为视频添加发布时间显示 #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0887c5c
Update VideoDetailView.swift
WindowsMEMZ Dec 18, 2023
ba01c02
Update VideoDetailView.swift
WindowsMEMZ Dec 18, 2023
dac912f
Update DarockBili_Watch_App_UI_Tests.swift
WindowsMEMZ Dec 18, 2023
821bf3c
Update VideoDetailView.swift
WindowsMEMZ Dec 18, 2023
e0dbdaa
Update VideoDetailView.swift
WindowsMEMZ Dec 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions DarockBili Watch App UI Tests/DarockBili_Watch_App_UI_Tests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@ final class DarockBili_Watch_App_UI_Tests: XCTestCase {
app.swipeUp()
sleep(1)
takeScreenshot(of: app, named: "RMVideoP2")
app.swipeUp()
sleep(1)
takeScreenshot(of: app, named: "RMVideoP2-Down")
app.swipeLeft()
sleep(5)
takeScreenshot(of: app, named: "RMVideoComments")
Expand Down
26 changes: 23 additions & 3 deletions DarockBili Watch App/Video/VideoDetailView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ struct VideoDetailView: View {
@State var subTitles = [[String: String]]()
@State var ownerFansCount = 0
@State var nowPlayingCount = "0"
@State var publishTime = ""
@State var videoDesc = ""
@State var isVideoPlayerPresented = false
@State var isMoreMenuPresented = false
Expand Down Expand Up @@ -187,7 +188,7 @@ struct VideoDetailView: View {
}
.tag(1)
}
DetailViewSecondPageBase(videoDetails: $videoDetails, owner: $owner, stat: $stat, honors: $honors, tags: $tags, videoDesc: $videoDesc, isLiked: $isLiked, isCoined: $isCoined, isFavoured: $isFavoured, isCoinViewPresented: $isCoinViewPresented, ownerFansCount: $ownerFansCount, nowPlayingCount: $nowPlayingCount)
DetailViewSecondPageBase(videoDetails: $videoDetails, owner: $owner, stat: $stat, honors: $honors, tags: $tags, videoDesc: $videoDesc, isLiked: $isLiked, isCoined: $isCoined, isFavoured: $isFavoured, isCoinViewPresented: $isCoinViewPresented, ownerFansCount: $ownerFansCount, nowPlayingCount: $nowPlayingCount, publishTime: $publishTime)
.tag(2)
if videoPages.count != 1 {
DetailViewVideoPartPageBase(videoDetails: $videoDetails, videoPages: $videoPages, isLoading: $isLoading)
Expand Down Expand Up @@ -236,7 +237,7 @@ struct VideoDetailView: View {
Group {
ScrollView {
DetailViewFirstPageBase(videoDetails: $videoDetails, videoPages: $videoPages, honors: $honors, subTitles: $subTitles, isLoading: $isLoading)
DetailViewSecondPageBase(videoDetails: $videoDetails, owner: $owner, stat: $stat, honors: $honors, tags: $tags, videoDesc: $videoDesc, isLiked: $isLiked, isCoined: $isCoined, isFavoured: $isFavoured, isCoinViewPresented: $isCoinViewPresented, ownerFansCount: $ownerFansCount, nowPlayingCount: $nowPlayingCount)
DetailViewSecondPageBase(videoDetails: $videoDetails, owner: $owner, stat: $stat, honors: $honors, tags: $tags, videoDesc: $videoDesc, isLiked: $isLiked, isCoined: $isCoined, isFavoured: $isFavoured, isCoinViewPresented: $isCoinViewPresented, ownerFansCount: $ownerFansCount, nowPlayingCount: $nowPlayingCount, publishTime: $publishTime)
}
}
.blur(radius: isLoading ? 14 : 0)
Expand Down Expand Up @@ -316,6 +317,13 @@ struct VideoDetailView: View {
owner = ["Name": respJson["data"]["owner"]["name"].string ?? "[加载失败]", "Face": respJson["data"]["owner"]["face"].string ?? "E", "ID": String(respJson["data"]["owner"]["mid"].int64 ?? -1)]
stat = ["Like": String(respJson["data"]["stat"]["like"].int ?? -1), "Coin": String(respJson["data"]["stat"]["coin"].int ?? -1), "Favorite": String(respJson["data"]["stat"]["favorite"].int ?? -1)]
videoDesc = respJson["data"]["desc"].string ?? "[加载失败]".replacingOccurrences(of: "\\n", with: "\n")

// Publish time calculation
let df = DateFormatter()
df.dateFormat = "yyyy-MM-dd HH:mm:ss"
let pubTimestamp = respJson["data"]["pubdate"].int ?? 1
publishTime = df.string(from: Date(timeIntervalSince1970: Double(pubTimestamp))) ?? "[转换失败]"

for _ in 1...4 {
honors.append("")
}
Expand Down Expand Up @@ -594,6 +602,7 @@ struct VideoDetailView: View {
@Binding var isCoinViewPresented: Bool
@Binding var ownerFansCount: Int
@Binding var nowPlayingCount: String
@Binding var publishTime: String
@AppStorage("DedeUserID") var dedeUserID = ""
@AppStorage("DedeUserID__ckMd5") var dedeUserID__ckMd5 = ""
@AppStorage("SESSDATA") var sessdata = ""
Expand All @@ -604,6 +613,7 @@ struct VideoDetailView: View {
@State var danmakuCountOffset: CGFloat = 20
@State var nowWatchingCountOffset: CGFloat = 20
@State var totalPlayedCountOffset: CGFloat = 20
@State var publishTimeTextOffset: CGFloat = 20
@State var bvidTextOffset: CGFloat = 20
@State var descOffset: CGFloat = 20
@State var tagOffset: CGFloat = 20
Expand Down Expand Up @@ -751,13 +761,23 @@ struct VideoDetailView: View {
.onAppear {
totalPlayedCountOffset = 0
}
HStack {
Image(systemName: "clock")
Text(publishTime)
Spacer()
}
.offset(x: -1, y: publishTimeTextOffset)
.animation(.easeOut(duration: 0.85), value: publishTimeTextOffset)
.onAppear {
publishTimeTextOffset = 0
}
HStack {
Image(systemName: "movieclapper")
Text(videoDetails["BV"]!)
Spacer()
}
.offset(x: -1, y: bvidTextOffset)
.animation(.easeOut(duration: 0.85), value: bvidTextOffset)
.animation(.easeOut(duration: 0.95), value: bvidTextOffset)
.onAppear {
bvidTextOffset = 0
}
Expand Down