Skip to content

Commit

Permalink
feat: suppose choose live role
Browse files Browse the repository at this point in the history
feat: suppose show media nickname
feat: install / usage doc
feat: update css
fix: media room stream play err
  • Loading branch information
iamtsm committed Aug 18, 2023
1 parent 0407e57 commit 52ad9eb
Show file tree
Hide file tree
Showing 26 changed files with 442 additions and 129 deletions.
25 changes: 25 additions & 0 deletions doc/FAQ.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# 常见问题

##

```
```

##

```
```

##

```
```

##

```
```
3 changes: 3 additions & 0 deletions doc/install/ENV_SETTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# 配置修改

无论是哪种模式安装,都需要先修改配置,再进行安装,启动。
Empty file.
Empty file.
Empty file.
Empty file.
Empty file added doc/install/INSTALL_BY_SHELL.md
Empty file.
Empty file.
2 changes: 1 addition & 1 deletion svr/conf/cfg.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "10.4.4",
"version": "10.4.5",
"socket": {
"port": "请到 tlrtcfile.env 中进行配置",
"host": "请到 tlrtcfile.env 中进行配置"
Expand Down
21 changes: 19 additions & 2 deletions svr/res/css/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -767,7 +767,7 @@ body {
}

.tl-rtc-file-mask-media-container {
/* display: flex; */
margin-bottom: 20px;
}

.tl-rtc-file-mask-media-video {
Expand Down Expand Up @@ -816,7 +816,6 @@ body {
width: 22px;
height: 22px;
position: absolute;
bottom: 25px;
left: 30px;
}

Expand Down Expand Up @@ -1163,6 +1162,24 @@ body {
-webkit-transform: scale(0.6) !important;
}

.tl-rtc-file-live-user-choose{
padding: 0px 20px 0px 20px;
margin: 10px 20px;
border-radius: 8px;
cursor: pointer;
transition: all 0.5s;
font-weight: bold;
color: #595252e3;
}

.tl-rtc-file-live-user-choose svg{
font-size: 3rem;
margin-bottom: 5px;
}

.tl-rtc-file-live-user-choose:hover{
color: black;
}

/* 500px以下 */
@media screen and (max-width: 500px) {
Expand Down
6 changes: 5 additions & 1 deletion svr/res/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
<use xlink:href="#icon-rtc-file-duoyuyan"></use>
</svg>
</a>
<a :title="lang.timer" style="position: relative;top: -5px;">
<a :title="lang.timer" style="position: relative;top: -3px;">
<b style="transition: color 0.8s;margin-right: 5px;" id="screenShareTimes" v-show="isScreenShare">
{{lang.sharing}}: {{screenShareTimes < 10 ? '0' + screenShareTimes :
screenShareTimes}}{{lang.second}} </b>
Expand Down Expand Up @@ -1024,6 +1024,7 @@
<div :style="{height: logsHeight + 80 +'px',overflowY: 'auto'}">
<div class="layui-card-body">
<div class="tl-rtc-file-mask-media-container" id="mediaVideoRoomList">
<div style="text-align: center;font-weight: bold;">{{nickName}}</div>
<div class="tl-rtc-file-mask-media-video">
<video v-show="isCameraEnabled" id="selfMediaShareVideo"
preload="auto" autoplay="autoplay" x-webkit-airplay="true"
Expand Down Expand Up @@ -1071,6 +1072,7 @@
<div :style="{height: logsHeight + 80 +'px',overflowY: 'auto'}">
<div class="layui-card-body">
<div class="tl-rtc-file-mask-media-container" id="mediaScreenRoomList">
<div style="text-align: center;font-weight: bold;">{{nickName}}</div>
<div class="tl-rtc-file-mask-media-video">
<video v-show="isCameraEnabled" id="selfMediaShareScreen"
preload="auto" autoplay="autoplay" x-webkit-airplay="true"
Expand Down Expand Up @@ -1112,6 +1114,7 @@
<div :style="{height: logsHeight + 80 +'px',overflowY: 'auto'}">
<div class="layui-card-body">
<div class="tl-rtc-file-mask-media-container" id="mediaLiveRoomList">
<div v-show="isLiveShare && owner" style="text-align: center;font-weight: bold;">{{nickName}}</div>
<div class="tl-rtc-file-mask-media-video" v-show="owner">
<video v-show="isCameraEnabled" id="selfMediaShareLive"
preload="auto" autoplay="autoplay" x-webkit-airplay="true"
Expand Down Expand Up @@ -1172,6 +1175,7 @@
<div :style="{height: logsHeight + 80 +'px',overflowY: 'auto'}">
<div class="layui-card-body">
<div class="tl-rtc-file-mask-media-container" id="mediaAudioRoomList">
<div style="text-align: center;font-weight: bold;">{{nickName}}</div>
<div class="tl-rtc-file-mask-media-video">
<video v-show="false" id="selfMediaShareAudio"
preload="auto" autoplay="autoplay" x-webkit-airplay="true"
Expand Down
Loading

0 comments on commit 52ad9eb

Please sign in to comment.