Compare commits

..

17 Commits

Author SHA1 Message Date
hunlongyu
d1a3c404fa 🚲 全新版本,从心出发 2020-06-17 16:33:31 +08:00
hunlongyu
1dbd07faae 🎈 优化视频自适应大小 2020-06-13 10:24:11 +08:00
Hunlongyu
4dec62aa9c Merge pull request #101 from WinterSoHot/master
fix(Play.vue):播放界面自适应窗口
2020-06-13 10:19:41 +08:00
Dongxian Gu
1f781ae92d fix(Play.vue):播放界面自适应窗口 2020-06-12 23:17:56 +08:00
hunlongyu
4717299ae6 🤣 新增分享演示 2020-06-05 23:24:18 +08:00
hunlongyu
8d40cbd5fc 😶 移除测试代码 2020-06-05 11:14:49 +08:00
hunlongyu
4c8fa08166 🙄 解决 Mac 下 dock 栏不显示图标问题 2020-06-05 11:09:52 +08:00
hunlongyu
ac513fbce6 🙄 解决 Mac 下 dock 栏不显示图标问题 2020-06-05 11:09:19 +08:00
hunlongyu
9321d3a5d9 Merge branch 'master' of https://github.com/Hunlongyu/ZY-Player 2020-06-05 10:26:41 +08:00
hunlongyu
0f2776fb1c 😁 移除测试代码 2020-06-05 10:26:37 +08:00
Hunlongyu
b577ce12c1 Merge pull request #77 from zhangweiii/master
修复Mac下dock栏不显示图标
2020-06-05 10:25:16 +08:00
zhangweiii
fa4c4e22fd 修复Mac下dock栏不显示图标 2020-06-04 10:53:02 +08:00
hunlongyu
a93d4042ba 🎢 修复 Mac 电脑无法完全退出的BUG 2020-06-02 10:54:17 +08:00
hunlongyu
09bd9d8401 😊 成功测试打包32位安装包 2020-06-01 18:14:31 +08:00
hunlongyu
588e52c330 😌 尝试v1 2020-06-01 17:00:58 +08:00
hunlongyu
6c4e110bb8 😫 再次尝试x86 2020-06-01 16:59:38 +08:00
hunlongyu
54857b8501 🥱 尝试x86 2020-06-01 16:52:39 +08:00
6 changed files with 70 additions and 14 deletions

35
.github/workflows/x86.yml vendored Normal file
View File

@@ -0,0 +1,35 @@
name: release-build
on:
push:
tags:
- x86 *
jobs:
release:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [windows-latest]
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
with:
node-version: 12
- run: |
yarn
yarn dist
shell: pwsh
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Upload artifact
uses: actions/upload-artifact@v2
with:
name: dist_electron
path: dist_electron/*.exe
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

View File

@@ -43,6 +43,20 @@
> Tips: 资源加载不出来时, 点击列表下方链接, 浏览器打开一下网站. 原理是需要通过网站的人机检测.
### 全新版本,从心出发
新版本开发计划已写好, 由于功能很多,且还有其他平台, 个人精力终归有限, 所以招募小伙伴, 一起完成这个项目.
主要招募: 移动端(IOS, Android), 以及TV端(Android)
我会提供接口, 接口文档, 桌面端与移动端交互说明
欢迎各路大神参与开发维护项目. 也欢迎吃瓜群众入群尝鲜测试, 提出建议.
微信群:
![微信群](https://i.loli.net/2020/06/17/uhYeHUVOrkB8fxL.jpg)
#### 全局快捷键:
| 快捷键 | 说明 | 主界面 | 小窗口 |
@@ -56,11 +70,17 @@
#### 下载:
1. [Github -- 官方下载](https://github.com/Hunlongyu/ZY-Player/releases)
1. [Github -- 官方下载(最新版)](https://github.com/Hunlongyu/ZY-Player/releases)
2. [蓝奏云 -- 快速下载](https://www.lanzous.com/b04s6a3re) 密码:95px
2. [蓝奏云 -- 快速下载(老版本)](https://www.lanzous.com/b04s6a3re) 密码:95px
3. 适用于32位操作系统的x86软件,在蓝奏云网盘里, 后缀名: ZY Player * 32位.exe
#### 截图:
0. 分享 ⇣ ↓
![share.gif](https://i.loli.net/2020/06/05/hbJwBXlx194umcO.gif)
1. 浏览 ⇣ ↓
![01浏览.png](https://i.loli.net/2020/05/18/MshDLnXq2CTpoBy.png)
2. 搜索 ⇣ ↓

View File

@@ -1,6 +1,6 @@
{
"name": "zy",
"version": "1.0.16",
"version": "1.0.20",
"private": true,
"author": {
"name": "Hunlongyu",

View File

@@ -16,7 +16,7 @@ let mini
// Scheme must be registered before the app is ready
protocol.registerSchemesAsPrivileged([{ scheme: 'app', privileges: { secure: true, standard: true } }])
function createWindow () {
function createWindow() {
win = new BrowserWindow({
width: 1080,
height: 720,
@@ -44,7 +44,7 @@ function createWindow () {
})
}
function createMini () {
function createMini() {
mini = new BrowserWindow({
width: 550,
minWidth: 260,
@@ -74,6 +74,10 @@ function createMini () {
})
}
if (process.platform === 'darwin') {
app.dock.show()
}
app.allowRendererProcessReuse = true
app.commandLine.appendSwitch('disable-features', 'OutOfBlinkCors')
if (process.platform === 'Linux') {
@@ -81,9 +85,7 @@ if (process.platform === 'Linux') {
}
app.on('window-all-closed', () => {
if (process.platform !== 'darwin') {
app.quit()
}
app.quit()
})
app.on('activate', () => {

View File

@@ -125,8 +125,8 @@ export default {
id: 'xg',
lang: 'zh-cn',
url: '',
width: 900,
height: 500,
width: '100%',
height: '100%',
autoplay: false,
videoInit: true,
screenShot: true,
@@ -228,7 +228,6 @@ export default {
},
playVideo (index, time) {
tools.detail_get(this.video.site, this.video.detail).then(res => {
console.log(res, 'res paly video')
this.name = res.name
this.right.listData = res.m3u8_urls
@@ -238,7 +237,6 @@ export default {
arr.push(i.split('$')[1])
}
this.length = arr.length
console.log(index, 'play index')
this.xg.src = arr[index]
this.showNext = this.length > 1
@@ -503,8 +501,9 @@ export default {
align-items: center;
}
.xgBox{
width: 900px;
width: 100%;
height: 500px;
flex: 1;
}
.more{
width: 100%;

View File

@@ -32,7 +32,7 @@ export default {
name: '',
png: ''
},
value: 'https://www.baidu.com',
value: '',
loading: true
}
},