Skip to content

Commit 1e637f3

Browse files
committed
fix: 视频无法播放的问题(#118
1 parent 98cbf72 commit 1e637f3

File tree

9 files changed

+43
-11
lines changed

9 files changed

+43
-11
lines changed

.github/workflows/release.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -82,14 +82,14 @@ jobs:
8282
ls -l
8383
8484
- name: Upload artifact
85-
uses: actions/upload-artifact@v2.3.1
85+
uses: actions/upload-artifact@v3
8686
with:
8787
# Artifact name
8888
name: wechat-devtools-${{ matrix.ARCH }}.src
8989
path: tmp/src
9090

9191
- name: Upload artifact
92-
uses: actions/upload-artifact@v2.3.1
92+
uses: actions/upload-artifact@v3
9393
with:
9494
# Artifact name
9595
name: wechat-devtools-${{ matrix.ARCH }}.build
@@ -110,7 +110,7 @@ jobs:
110110
steps:
111111
- uses: actions/checkout@v2
112112
- name: Download artifacts
113-
uses: actions/download-artifact@v2
113+
uses: actions/download-artifact@v3
114114

115115
- name: Prepare
116116
run: |
@@ -145,7 +145,7 @@ jobs:
145145
ls -l
146146
147147
- name: Upload artifact
148-
uses: actions/upload-artifact@v2.3.1
148+
uses: actions/upload-artifact@v3
149149
with:
150150
# Artifact name
151151
name: wechat-devtools-${{ matrix.ARCH }}.build
@@ -165,7 +165,7 @@ jobs:
165165
steps:
166166
- uses: actions/checkout@v2
167167
- name: Download artifacts
168-
uses: actions/download-artifact@v2
168+
uses: actions/download-artifact@v3
169169

170170
- name: Generate TAG
171171
id: Tag
@@ -203,7 +203,7 @@ jobs:
203203
env WINE=false tools/build-deepin.sh ${{ steps.tag.outputs.tag }}
204204
205205
- name: Upload artifact
206-
uses: actions/upload-artifact@v2.3.1
206+
uses: actions/upload-artifact@v3
207207
with:
208208
# Artifact name
209209
name: wechat-devtools-${{ matrix.ARCH }}.build
@@ -219,7 +219,7 @@ jobs:
219219
runs-on: ubuntu-latest
220220
steps:
221221
- name: Download artifacts
222-
uses: actions/download-artifact@v2
222+
uses: actions/download-artifact@v3
223223
- name: Inspect directory after downloading artifacts
224224
run: ls -alFR
225225

changelog.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# 1.06.2405020-4 / 2024-09-28
2+
3+
- fix: 视频无法播放的问题(#118
4+
15
# 1.06.2405020-3 / 2024-08-10
26

37
- update: compiler(Linux) v0.1.1

docker/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ WORKDIR /workspace
44

55
RUN sed -i 's/deb.debian.org/mirrors.ustc.edu.cn/g' /etc/apt/sources.list && \
66
sed -i 's/security.debian.org/mirrors.ustc.edu.cn/g' /etc/apt/sources.list && \
7+
sed -i 's/security.ubuntu.com/mirrors.ustc.edu.cn/g' /etc/apt/sources.list && \
78
sed -i 's/archive.ubuntu.com/mirrors.ustc.edu.cn/g' /etc/apt/sources.list && \
89
mkdir -p /build_temp/python36 /build_temp/nodejs && \
910
apt update && \
@@ -27,7 +28,7 @@ RUN sed -i 's/deb.debian.org/mirrors.ustc.edu.cn/g' /etc/apt/sources.list && \
2728
./setup_16.x &&\
2829
apt-get install -y nodejs &&\
2930
rm -rf /build_temp && \
30-
apt install -y gosu && \
31+
apt install -y gosu unzip python && \
3132
gosu nobody true && \
3233
useradd -s /bin/bash -m user
3334

readme.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,8 @@
163163
164164
| 赞赏人 | 赞赏 | 时间 |
165165
|-------|---------|-----|
166+
| [shao4598](https://github.com/shao4598) | 50.00¥ | 2024-09-24 |
167+
| [OWALabuy](https://github.com/OWALabuy) | 16.66¥ | 2024-08-28 |
166168
| [wangvation](https://github.com/wangvation) | 50.00¥ | 2024-07-16 |
167169
| 孤泉冷月 | 100.00¥ | 2024-07-12 |
168170
| [liushuai05](https://github.com/liushuai05) | 88.00¥ | 2023-12-26 |

test/nw-simple/index.html

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<!-- <video src="https://vjs.zencdn.net/v/oceans.mp4"></video> -->
2+
<hr />
3+
<video autoplay width="320" height="240" controls>
4+
<source src="https://media.w3.org/2010/05/sintel/trailer.mp4" type="video/mp4">
5+
您的浏览器不支持 HTML5 video 标签。
6+
</video>
7+
<script>
8+
// window.open('chrome://media-internals/')
9+
</script>

test/nw-simple/package.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"name": "test",
3+
"main": "index.html"
4+
}

tools/build-with-docker.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22

33
root_dir=$(cd `dirname $0`/.. && pwd -P)
44
echo "$(id -u):$(id -g)"
5-
docker run -u "$(id -u):$(id -g)" --rm -i -e "ACTION_MODE=${ACTION_MODE:-false}" -w /workspace -v "$root_dir:/workspace" jiyecafe/wechat-devtools-build:v3 \
5+
docker run -u "$(id -u):$(id -g)" --rm -i -e "ACTION_MODE=${ACTION_MODE:-false}" -w /workspace -v "$root_dir:/workspace" jiyecafe/wechat-devtools-build:v1.0.4 \
66
bash ./docker/entrypoint

tools/fix-other.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ set -ex
33
root_dir=$(cd `dirname $0`/.. && pwd -P)
44
srcdir=$root_dir
55
tmp_dir="$root_dir/tmp"
6+
nwjs_dir="$root_dir/nwjs"
67
package_dir="$root_dir/package.nw"
78

89
# 修复: webview manager
@@ -55,6 +56,14 @@ cd "${package_dir}/node_modules/wcc/build/Release" && rm -rf wcsc.node && mv wcs
5556
# 修复mock按钮无反应
5657
sed -i '1s/^/window.prompt = parent.prompt;\n/' "${package_dir}/js/ideplugin/devtools/index.js"
5758

59+
# 修复视频无法播放
60+
if [ ! -f "${srcdir}/cache/libffmpeg-0.55.00-linux-x64.zip" ];then
61+
wget -c https://github.com/nwjs-ffmpeg-prebuilt/nwjs-ffmpeg-prebuilt/releases/download/0.55.0/0.55.0-linux-x64.zip -O "${srcdir}/cache/libffmpeg-0.55.00-linux-x64.zip.tmp"
62+
mv "${srcdir}/cache/libffmpeg-0.55.00-linux-x64.zip.tmp" "${srcdir}/cache/libffmpeg-0.55.00-linux-x64.zip"
63+
fi
64+
rm -rf "${nwjs_dir}/lib/libffmpeg.so"
65+
unzip "${srcdir}/cache/libffmpeg-0.55.00-linux-x64.zip" -d "${nwjs_dir}/lib"
66+
5867
current=`date "+%Y-%m-%d %H:%M:%S"`
5968
timeStamp=`date -d "$current" +%s`
6069
echo $timeStamp > "${package_dir}/.build_time"

tools/push-docker.sh

100644100755
Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
#!/bin/bash
22
root_dir=$(cd `dirname $0`/.. && pwd -P)
3+
set -ex
4+
35
cd $root_dir/docker
4-
docker build . --name jiyecafe/wechat-devtools-build:latest
5-
# docker tag wechat-web-devtools-linux_wechat_devtools jiyecafe/wechat-devtools-build:latest
6+
docker build . -t jiyecafe/wechat-devtools-build:v1.0.4
7+
docker tag jiyecafe/wechat-devtools-build:v1.0.4 jiyecafe/wechat-devtools-build:latest
8+
docker push jiyecafe/wechat-devtools-build:v1.0.4
69
docker push jiyecafe/wechat-devtools-build:latest

0 commit comments

Comments
 (0)