-
Notifications
You must be signed in to change notification settings - Fork 234
Live UI optimization #495
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.
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
Merged
Merged
Live UI optimization #495
Changes from all commits
Commits
Show all changes
23 commits
Select commit
Hold shift + click to select a range
c8162b2
Add sidebar to the live streaming interface
4fuu 4395286
Add filter level settings for live danmaku
4fuu b98b9c0
Add introduction to the live
4fuu d225c53
Add emotion rendering
4fuu 8f49aaa
fix text color
4fuu 254ce8b
Add more information to the sidebar
4fuu 5e509ca
add sc fn
4fuu 731e479
update layout
4fuu 7500ae5
use mg_wakeup
4fuu 92d5845
fix sc bug
4fuu 7a1afb9
fix crash
4fuu b41f5ad
add zh-Hant support
4fuu 640113d
fix the issue of multiple pause buttons not sync
4fuu 9ede4f1
replace datach to brls:async
4fuu 45b1864
add resource clear & modify danmaku emoji position
4fuu 45582e6
replace brls:async
4fuu 7ba2372
add live_sidebar_count setting
4fuu 798a448
fix header import
4fuu bc40a18
danmaku rendering large emoticons
4fuu 5d428b7
disable bottom bar in live
4fuu 5ca6cef
reduce lock time
4fuu 91e78aa
dynamic loading of XML
4fuu 0e389b6
fix sidebar
4fuu File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,114 @@ | ||
| <brls:AppletFrame | ||
| id="video/detail/frame" | ||
| iconInterpolation="linear" | ||
| headerHidden="true" | ||
| footerHidden="false"> | ||
| <brls:Box | ||
| width="auto" | ||
| height="auto" | ||
| grow="1.0" | ||
| axis="row"> | ||
|
|
||
| <!--页面左侧--> | ||
| <brls:Box | ||
| id="live_detail_left_box" | ||
| margin="10" | ||
| width="@style/wiliwili/player/width" | ||
| height="auto" | ||
| wireframe="false" | ||
| axis="column"> | ||
|
|
||
| <VideoView | ||
| id="video" | ||
| focusable="true" | ||
| focusDown="live_title_box" | ||
| focusRight="live_danmaku_sidebar" | ||
| grow="1" | ||
| width="@style/wiliwili/player/width" | ||
| height="auto"/> | ||
|
|
||
| <!-- 直播标题 --> | ||
| <brls:Box | ||
| id="live_title_box" | ||
| wireframe="false" | ||
| marginTop="10" | ||
| alignItems="center" | ||
| focusable="true" | ||
| focusUp="video" | ||
| focusDown="live_author" | ||
| height="40" | ||
| width="100%"> | ||
| <brls:Label | ||
| id="live/title" | ||
| wireframe="false" | ||
| fontSize="24" | ||
| marginLeft="10" | ||
| singleLine="true"/> | ||
| </brls:Box> | ||
|
|
||
| <!--直播UP主相关信息--> | ||
| <brls:Box | ||
| id="live_detail_info_box" | ||
| wireframe="false" | ||
| width="100%" | ||
| height="auto"> | ||
| <brls:Box | ||
| wireframe="false" | ||
| width="100%" | ||
| height="100%" | ||
| maxHeight="100" | ||
| alignItems="flexStart" | ||
| axis="column" | ||
| justifyContent="center"> | ||
| <UserInfoView | ||
| focusable="true" | ||
| wireframe="false" | ||
| marginLeft="10" | ||
| id="live_author" | ||
| focusUp="live_title_box" | ||
| focusRight="live_danmaku_sidebar" | ||
| visibility="visible" | ||
| width="100%" | ||
| height="80%"/> | ||
| <!-- 主播称号标签 --> | ||
| <brls:Label | ||
| id="anchor/title" | ||
| fontSize="15" | ||
| marginLeft="10" | ||
| marginTop="5" | ||
| textColor="#FFB30F" | ||
| visibility="visible"/> | ||
| </brls:Box> | ||
| </brls:Box> | ||
| </brls:Box> | ||
|
|
||
| <!--右侧弹幕侧边栏--> | ||
| <brls:Box | ||
| id="live_danmaku_sidebar" | ||
| width="240" | ||
| height="auto" | ||
| axis="column" | ||
| marginRight="10" | ||
| grow="1"> | ||
|
|
||
| <brls:Header | ||
| title="实时互动" | ||
| paddingTop="15"/> | ||
|
|
||
| <brls:ScrollingFrame | ||
| id="live_danmaku_list" | ||
| width="100%" | ||
| height="auto" | ||
| grow="1"> | ||
| <brls:Box | ||
| id="live_danmaku_container" | ||
| width="100%" | ||
| height="auto" | ||
| paddingRight="5" | ||
| axis="column"> | ||
| <!-- 弹幕内容将动态添加到这里 --> | ||
| </brls:Box> | ||
| </brls:ScrollingFrame> | ||
| </brls:Box> | ||
| </brls:Box> | ||
| </brls:AppletFrame> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,147 @@ | ||
| <brls:Box | ||
| width="auto" | ||
| height="auto" | ||
| marginTop="5" | ||
| marginBottom="5" | ||
| marginLeft="5" | ||
| marginRight="5" | ||
| cornerRadius="8" | ||
| padding="8"> | ||
|
|
||
| <brls:Box | ||
| width="100%" | ||
| height="auto" | ||
| axis="column"> | ||
|
|
||
| <!-- 用户名和等级信息 --> | ||
| <brls:Box | ||
| width="100%" | ||
| height="auto" | ||
| alignItems="center"> | ||
|
|
||
| <!-- SC用户头像 --> | ||
| <brls:Image | ||
| id="danmaku_avatar" | ||
| width="24" | ||
| height="24" | ||
| scalingType="fit" | ||
| cornerRadius="100" | ||
| marginRight="4" | ||
| visibility="gone" | ||
| image="@res/pictures/default_avatar.png"/> | ||
|
|
||
| <brls:Box | ||
| id="danmaku_user_level" | ||
| width="auto" | ||
| height="18" | ||
| backgroundColor="#FF6699" | ||
| cornerRadius="4" | ||
| alignItems="center" | ||
| justifyContent="center" | ||
| paddingLeft="4" | ||
| paddingRight="4"> | ||
| <brls:Label | ||
| id="danmaku_level_text" | ||
| fontSize="10" | ||
| textColor="#FFFFFF" | ||
| text="UL1"/> | ||
| </brls:Box> | ||
|
|
||
| <!-- 粉丝牌子 --> | ||
| <brls:Box | ||
| id="danmaku_fan_medal" | ||
| width="auto" | ||
| height="18" | ||
| backgroundColor="#888888" | ||
| cornerRadius="4" | ||
| alignItems="center" | ||
| justifyContent="center" | ||
| paddingLeft="4" | ||
| paddingRight="4" | ||
| marginLeft="4" | ||
| visibility="gone"> | ||
| <brls:Label | ||
| id="danmaku_fan_medal_text" | ||
| fontSize="10" | ||
| textColor="#FFFFFF" | ||
| text="牌子1"/> | ||
| </brls:Box> | ||
|
|
||
| <!-- 房管标识 --> | ||
| <brls:Box | ||
| id="danmaku_admin" | ||
| width="auto" | ||
| height="18" | ||
| backgroundColor="#FF9900" | ||
| cornerRadius="4" | ||
| alignItems="center" | ||
| justifyContent="center" | ||
| paddingLeft="4" | ||
| paddingRight="4" | ||
| marginLeft="4" | ||
| visibility="gone"> | ||
| <brls:Label | ||
| id="danmaku_admin_text" | ||
| fontSize="10" | ||
| textColor="#FFFFFF" | ||
| text="房管"/> | ||
| </brls:Box> | ||
|
|
||
| <!-- VIP标识 --> | ||
| <brls:Box | ||
| id="danmaku_vip" | ||
| width="auto" | ||
| height="18" | ||
| backgroundColor="#E22882" | ||
| cornerRadius="4" | ||
| alignItems="center" | ||
| justifyContent="center" | ||
| paddingLeft="4" | ||
| paddingRight="4" | ||
| marginLeft="4" | ||
| visibility="gone"> | ||
| <brls:Label | ||
| id="danmaku_vip_text" | ||
| fontSize="10" | ||
| textColor="#FFFFFF" | ||
| text="舰长"/> | ||
| </brls:Box> | ||
|
|
||
| <!-- SC金额标签 --> | ||
| <brls:Box | ||
| id="danmaku_sc_price" | ||
| width="auto" | ||
| height="18" | ||
| backgroundColor="#FF9900" | ||
| cornerRadius="4" | ||
| alignItems="center" | ||
| justifyContent="center" | ||
| paddingLeft="6" | ||
| paddingRight="6" | ||
| marginLeft="4" | ||
| visibility="gone"> | ||
| <brls:Label | ||
| id="danmaku_sc_price_text" | ||
| fontSize="12" | ||
| textColor="#FFFFFF" | ||
| text="¥30"/> | ||
| </brls:Box> | ||
|
|
||
| <brls:Label | ||
| id="danmaku_username" | ||
| marginLeft="6" | ||
| fontSize="12" | ||
| text="用户名" | ||
| singleLine="true"/> | ||
| </brls:Box> | ||
|
|
||
| <!-- 弹幕内容单独放在一行 --> | ||
| <brls:Label | ||
| id="danmaku_content" | ||
| width="100%" | ||
| marginTop="4" | ||
| fontSize="14" | ||
| text="这是一条弹幕内容" | ||
| singleLine="false"/> | ||
| </brls:Box> | ||
| </brls:Box> |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.