Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
galaxy-iOS
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
mobile-group
galaxy-iOS
Commits
5faf40f4
Commit
5faf40f4
authored
Dec 10, 2024
by
Alex朱枝文
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug修复
parent
f39d1b10
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
126 additions
and
10 deletions
+126
-10
project.pbxproj
galaxy/galaxy.xcodeproj/project.pbxproj
+4
-0
YHLivePlayerViewController.swift
.../LivestreamSales(直播销售)/C/YHLivePlayerViewController.swift
+23
-4
YHPlayerManager.swift
...ses/Modules/LivestreamSales(直播销售)/C/YHPlayerManager.swift
+4
-6
YHBlurredAvatarView.swift
...Modules/LivestreamSales(直播销售)/V/YHBlurredAvatarView.swift
+73
-0
Contents.json
....xcassets/YinHeLive/live_player_bg.imageset/Contents.json
+22
-0
live_player_bg@2x.png
...s/YinHeLive/live_player_bg.imageset/live_player_bg@2x.png
+0
-0
live_player_bg@3x.png
...s/YinHeLive/live_player_bg.imageset/live_player_bg@3x.png
+0
-0
No files found.
galaxy/galaxy.xcodeproj/project.pbxproj
View file @
5faf40f4
...
...
@@ -182,6 +182,7 @@
0431F8822C942D88003B84F4
/* YHResignMaterialNameCell.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
0431F8812C942D88003B84F4
/* YHResignMaterialNameCell.swift */
;
};
0431F8842C9579F7003B84F4
/* YHResignTemplateSheetView.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
0431F8832C9579F7003B84F4
/* YHResignTemplateSheetView.swift */
;
};
04336E252D0817ED0070A71B
/* YHLivePeopleModel.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
04336E242D0817ED0070A71B
/* YHLivePeopleModel.swift */
;
};
04336E272D0838100070A71B
/* YHBlurredAvatarView.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
04336E262D0838100070A71B
/* YHBlurredAvatarView.swift */
;
};
04358E042C77322700811928
/* YHHaveGrabbedNumberListCell.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
04358E032C77322700811928
/* YHHaveGrabbedNumberListCell.swift */
;
};
04358E062C77334B00811928
/* YHHaveGrabbedNumberInfoView.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
04358E052C77334B00811928
/* YHHaveGrabbedNumberInfoView.swift */
;
};
04358E082C77657000811928
/* YHReAppointViewController.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
04358E072C77657000811928
/* YHReAppointViewController.swift */
;
};
...
...
@@ -1297,6 +1298,7 @@
0431F8812C942D88003B84F4
/* YHResignMaterialNameCell.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
YHResignMaterialNameCell.swift
;
sourceTree
=
"<group>"
;
};
0431F8832C9579F7003B84F4
/* YHResignTemplateSheetView.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
YHResignTemplateSheetView.swift
;
sourceTree
=
"<group>"
;
};
04336E242D0817ED0070A71B
/* YHLivePeopleModel.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
YHLivePeopleModel.swift
;
sourceTree
=
"<group>"
;
};
04336E262D0838100070A71B
/* YHBlurredAvatarView.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
YHBlurredAvatarView.swift
;
sourceTree
=
"<group>"
;
};
04358E032C77322700811928
/* YHHaveGrabbedNumberListCell.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
YHHaveGrabbedNumberListCell.swift
;
sourceTree
=
"<group>"
;
};
04358E052C77334B00811928
/* YHHaveGrabbedNumberInfoView.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
YHHaveGrabbedNumberInfoView.swift
;
sourceTree
=
"<group>"
;
};
04358E072C77657000811928
/* YHReAppointViewController.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
YHReAppointViewController.swift
;
sourceTree
=
"<group>"
;
};
...
...
@@ -3081,6 +3083,7 @@
isa
=
PBXGroup
;
children
=
(
04564D462CF3851D004456E4
/* YHPlayerControlView.swift */
,
04336E262D0838100070A71B
/* YHBlurredAvatarView.swift */
,
04564D4C2CF38D16004456E4
/* YHLiveMessageCell.swift */
,
04564D4E2CF38E20004456E4
/* YHLiveMessageListView.swift */
,
04564D622CF60222004456E4
/* YHGradientView.swift */
,
...
...
@@ -6806,6 +6809,7 @@
044F39362CB6574D007CA277
/* YHVisaRenewalGuideHeaderCell.swift in Sources */
,
04C85DE92C36BF49008B20D6
/* YHMyFileListFooterView.swift in Sources */
,
045EEEA62B9F171A0022A143
/* YHCompanySelectViewController.swift in Sources */
,
04336E272D0838100070A71B
/* YHBlurredAvatarView.swift in Sources */
,
0425E6462BA9678E00A5E763
/* YHSchemeHeadTotalScoreView.swift in Sources */
,
044D0C0F2C2287C500C5CF5E
/* YHEditViewModel.swift in Sources */
,
045EEEA92B9F171A0022A143
/* YHWorkExperienceListViewController.swift in Sources */
,
...
...
galaxy/galaxy/Classes/Modules/LivestreamSales(直播销售)/C/YHLivePlayerViewController.swift
View file @
5faf40f4
...
...
@@ -80,6 +80,17 @@ class YHLivePlayerViewController: YHBasePlayerViewController {
label
.
alpha
=
0.7
return
label
}()
private
lazy
var
bottomImageView
:
UIImageView
=
{
let
imageView
=
UIImageView
(
image
:
UIImage
(
named
:
"live_player_bg"
))
return
imageView
}()
// private lazy var blurredView: YHBlurredAvatarView = {
// let view = YHBlurredAvatarView()
// view.isHidden = true
// return view
// }()
// MARK: - Initialization
...
...
@@ -147,9 +158,13 @@ class YHLivePlayerViewController: YHBasePlayerViewController {
// MARK: - Setup
private
func
setupLiveUI
()
{
playerView
.
addSubview
(
bottomImageView
)
//playerView.addSubview(blurredView)
containerView
.
addSubview
(
bottomInputBar
)
containerView
.
addSubview
(
messageListView
)
bottomImageView
.
snp
.
makeConstraints
{
make
in
make
.
edges
.
equalToSuperview
()
}
bottomInputBar
.
snp
.
makeConstraints
{
make
in
make
.
left
.
right
.
bottom
.
equalToSuperview
()
make
.
top
.
equalTo
(
view
.
safeAreaLayoutGuide
.
snp
.
bottom
)
...
...
@@ -234,16 +249,20 @@ class YHLivePlayerViewController: YHBasePlayerViewController {
nickname
:
liveDetail
.
account
,
count
:
liveDetail
.
access_num
)
// blurredView.setImageUrl(liveDetail.avatar) { [weak self] flag in
// self?.bottomImageView.isHidden = flag
// self?.blurredView.isHidden = !flag
// }
playbackInfo
?
.
channelId
=
liveDetail
.
rtmp_channel
playbackInfo
?
.
token
=
liveDetail
.
token
playbackInfo
?
.
title
=
liveDetail
.
live_title
playbackInfo
?
.
uid
=
UInt
(
liveDetail
.
user_id
)
messageListView
.
anchorName
=
liveDetail
.
hxNickname
if
needJoinLiveChannel
{
if
!
liveDetail
.
rtmp_channel
.
isEmpty
,
!
liveDetail
.
token
.
isEmpty
,
let
uid
=
playbackInfo
?
.
uid
,
let
player
=
player
{
if
!
liveDetail
.
rtmp_channel
.
isEmpty
,
!
liveDetail
.
token
.
isEmpty
,
let
uid
=
playbackInfo
?
.
uid
,
let
player
=
player
,
!
player
.
isJoined
{
YHPlayerManager
.
shared
.
joinChannel
(
for
:
player
,
token
:
liveDetail
.
token
,
channelId
:
liveDetail
.
rtmp_channel
,
uid
:
uid
,
view
:
playerView
,
defaultMuted
:
false
)
}
else
if
currentPlayingURL
==
nil
,
!
liveDetail
.
pullUrl
.
isEmpty
{
play
(
url
:
liveDetail
.
pullUrl
)
// 如果没有预设URL,使用接口返回的URL播放
}
}
// 如果没有预设roomId,使用接口返回的roomId
...
...
galaxy/galaxy/Classes/Modules/LivestreamSales(直播销售)/C/YHPlayerManager.swift
View file @
5faf40f4
...
...
@@ -348,12 +348,12 @@ class YHPlayerManager: NSObject {
if
let
url
=
playbackInfo
.
url
{
player
.
play
(
url
:
url
,
title
:
playbackInfo
.
title
,
view
:
playerVC
.
playerView
)
}
if
let
lastNav
=
lastNav
,
l
et
lastVodVC
=
lastVodVC
{
if
let
lastNav
=
lastNav
,
l
astVodVC
!=
nil
{
lastNav
.
viewControllers
.
removeAll
()
var
viewControllers
=
lastNav
.
viewControllers
viewControllers
.
append
(
playerVC
)
lastNav
.
setViewControllers
(
viewControllers
,
animated
:
true
)
}
else
if
let
lastNav
=
lastNav
,
l
et
lastLiveVC
=
lastLiveVC
{
}
else
if
let
lastNav
=
lastNav
,
l
astLiveVC
!=
nil
{
lastNav
.
pushViewController
(
playerVC
,
animated
:
true
)
}
else
{
present
(
navVC
,
from
:
sourceView
)
...
...
@@ -429,16 +429,14 @@ class YHPlayerManager: NSObject {
}
else
{
joinChannel
(
for
:
player
,
token
:
token
,
channelId
:
channelId
,
uid
:
uid
,
view
:
playerVC
.
playerView
)
}
}
else
if
let
url
=
playbackInfo
.
url
,
url
.
count
>
0
{
player
.
play
(
url
:
url
,
title
:
playbackInfo
.
title
,
view
:
playerVC
.
playerView
)
}
if
let
lastNav
=
lastNav
,
l
et
lastLiveVC
=
lastLiveVC
{
if
let
lastNav
=
lastNav
,
l
astLiveVC
!=
nil
{
lastNav
.
viewControllers
.
removeAll
()
var
viewControllers
=
lastNav
.
viewControllers
viewControllers
.
append
(
playerVC
)
lastNav
.
setViewControllers
(
viewControllers
,
animated
:
true
)
}
else
if
let
lastNav
=
lastNav
,
l
et
lastVodVC
=
lastVodVC
{
}
else
if
let
lastNav
=
lastNav
,
l
astVodVC
!=
nil
{
lastNav
.
pushViewController
(
playerVC
,
animated
:
true
)
}
else
{
present
(
navVC
,
from
:
sourceView
)
...
...
galaxy/galaxy/Classes/Modules/LivestreamSales(直播销售)/V/YHBlurredAvatarView.swift
0 → 100644
View file @
5faf40f4
//
// YHBlurredAvatarView.swift
// galaxy
//
// Created by alexzzw on 2024/12/10.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import
VisualEffectView
import
UIKit
class
YHBlurredAvatarView
:
UIView
{
private
let
imageView
:
UIImageView
=
{
let
iv
=
UIImageView
()
iv
.
contentMode
=
.
scaleAspectFill
iv
.
clipsToBounds
=
true
return
iv
}()
private
lazy
var
effectView
:
VisualEffectView
=
{
let
visualEffectView
=
VisualEffectView
()
visualEffectView
.
colorTint
=
UIColor
(
hex
:
0xAFAFAF
)
.
withAlphaComponent
(
0.15
)
visualEffectView
.
blurRadius
=
16
visualEffectView
.
scale
=
1
return
visualEffectView
}()
override
init
(
frame
:
CGRect
)
{
super
.
init
(
frame
:
frame
)
setupUI
()
}
required
init
?(
coder
:
NSCoder
)
{
super
.
init
(
coder
:
coder
)
setupUI
()
}
private
func
setupUI
()
{
// 添加图片视图
addSubview
(
imageView
)
imageView
.
frame
=
bounds
// 添加模糊视图
addSubview
(
effectView
)
effectView
.
frame
=
bounds
imageView
.
snp
.
makeConstraints
{
make
in
make
.
edges
.
equalToSuperview
()
}
effectView
.
snp
.
makeConstraints
{
make
in
make
.
edges
.
equalToSuperview
()
}
}
func
setImage
(
_
image
:
UIImage
?)
{
imageView
.
image
=
image
}
func
setImageUrl
(
_
url
:
String
,
completion
:
@escaping
(
Bool
)
->
Void
)
{
imageView
.
kf
.
setImage
(
with
:
URL
(
string
:
url
))
{
[
weak
self
]
result
in
guard
let
self
=
self
else
{
completion
(
false
)
return
}
switch
result
{
case
.
success
(
let
value
):
self
.
imageView
.
image
=
value
.
image
completion
(
true
)
case
.
failure
(
_
):
completion
(
false
)
}
}
}
}
galaxy/galaxy/Res/Assets.xcassets/YinHeLive/live_player_bg.imageset/Contents.json
0 → 100644
View file @
5faf40f4
{
"images"
:
[
{
"idiom"
:
"universal"
,
"scale"
:
"1x"
},
{
"filename"
:
"live_player_bg@2x.png"
,
"idiom"
:
"universal"
,
"scale"
:
"2x"
},
{
"filename"
:
"live_player_bg@3x.png"
,
"idiom"
:
"universal"
,
"scale"
:
"3x"
}
],
"info"
:
{
"author"
:
"xcode"
,
"version"
:
1
}
}
galaxy/galaxy/Res/Assets.xcassets/YinHeLive/live_player_bg.imageset/live_player_bg@2x.png
0 → 100644
View file @
5faf40f4
599 KB
galaxy/galaxy/Res/Assets.xcassets/YinHeLive/live_player_bg.imageset/live_player_bg@3x.png
0 → 100644
View file @
5faf40f4
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment