Skip to content

Commit

Permalink
Merge pull request #37 from ZyqGitHub1/dev
Browse files Browse the repository at this point in the history
delete sexually obscene content
  • Loading branch information
ZyqGitHub1 authored Aug 8, 2019
2 parents b0bb5b1 + 6827acd commit fe85005
Show file tree
Hide file tree
Showing 14 changed files with 444 additions and 315 deletions.
8 changes: 0 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,6 @@ h-player-v2 是基于 Quasar Framework 开发应用程序,通过 electron 包
+ 支持分类浏览与搜索
+ 特色多窗口播放模式

## 预览🔞

<a target="_blank" href ="https://raw.githubusercontent.com/ZyqGitHub1/h-player-v2/master/screenshot/screenshot-list.png">🔞 首页截图</a>

<a target="_blank" href ="https://raw.githubusercontent.com/ZyqGitHub1/h-player-v2/master/screenshot/screenshot-video.png">🔞 播放页截图</a>

<a target="_blank" href ="https://raw.githubusercontent.com/ZyqGitHub1/h-player-v2/master/screenshot/screenshot-mini.png">🔞 多窗口播放截图</a>

## Get Started

```bash
Expand Down
9 changes: 3 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,12 @@
{
"name": "h-player",
"version": "0.6.0",
"version": "0.7.0",
"description": "A Quasar Framework app",
"productName": "h-player",
"cordovaId": "org.cordova.quasar.app",
"author": "zyq <qqdhsy@126.com>",
"private": true,
"scripts": {
"serve": "quasar dev",
"build": "quasar build",
"pwa:serve": "quasar dev -m pwa",
"pwa:build": "quasar build -m pwa",
"electron:serve": "quasar dev -m electron",
"electron:build": "quasar build -m electron",
"lint": "eslint --ext .js,.vue src",
Expand All @@ -21,16 +17,17 @@
"axios": "^0.18.1",
"electron-positioner": "^4.1.0",
"electron-store": "^4.0.0",
"electron-util": "^0.12.1",
"fs-extra": "^8.1.0",
"hls.js": "^0.12.4",
"lodash": "^4.17.15",
"normalize-url": "^4.3.0",
"plyr": "^3.5.6",
"quasar": "^1.0.0",
"query-string": "^6.8.1",
"semver": "^6.3.0",
"vue-i18n": "^8.0.0",
"vue-navigation": "^1.1.4",
"vue-plyr": "^5.1.3",
"xml2js": "^0.4.19"
},
"devDependencies": {
Expand Down
Binary file modified screenshot/import-source.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed screenshot/screenshot-list.png
Binary file not shown.
Binary file removed screenshot/screenshot-mini.png
Binary file not shown.
Binary file removed screenshot/screenshot-video.png
Binary file not shown.
8 changes: 8 additions & 0 deletions src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,14 @@
<script>
export default {
name: 'App',
created() {
this.$store.dispatch('getLatestVersion');
this.$store.dispatch('loadSiteList').then((storeSiteList) => {
if (!storeSiteList || storeSiteList.length === 0) {
this.$router.push('/import');
}
});
},
};
</script>

Expand Down
49 changes: 49 additions & 0 deletions src/components/footerContent.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
<template>
<q-toolbar>
<q-toolbar-title>
<q-avatar
square
size="24px"
color="orange"
>H</q-avatar>
</q-toolbar-title>
<q-space></q-space>
<q-btn
v-if="canUpdate"
color="orange"
icon="cloud_upload"
label="发现新版本,点击查看"
@click="visitRelease"
/>
</q-toolbar>
</template>

<script>
import { mapState } from 'vuex';
import semver from 'semver';
export default {
name: 'FooterContent',
computed: {
...mapState({
currentVersion: state => state.app.currentVersion,
latestVersion: state => state.app.latestVersion,
}),
canUpdate() {
return (
this.latestVersion !== '0.0.0'
&& semver.gt(this.latestVersion, this.currentVersion)
);
},
},
methods: {
visitRelease() {
const { shell } = this.$q.electron;
shell.openExternal('https://github.com/ZyqGitHub1/h-player-v2/releases');
},
},
};
</script>

<style>
</style>
Loading

0 comments on commit fe85005

Please sign in to comment.