diff --git a/package.json b/package.json
index 7da2dba..8118f61 100644
--- a/package.json
+++ b/package.json
@@ -95,6 +95,7 @@
"eslint-plugin-promise": "^3.8.0",
"eslint-plugin-standard": "^3.1.0",
"file-loader": "^1.1.11",
+ "guacamole-common-js-jumpserver": "^1.1.0-c",
"html-webpack-plugin": "^3.2.0",
"inject-loader": "^4.0.1",
"karma": "^2.0.2",
diff --git a/src/renderer/components/mainPage.vue b/src/renderer/components/mainPage.vue
index 34d31fa..5985da0 100644
--- a/src/renderer/components/mainPage.vue
+++ b/src/renderer/components/mainPage.vue
@@ -17,6 +17,13 @@
只能上传录像文件,且不超过500mb
+
+ Linux录像
+ Windows录像
+
+
+ 播放
+
@@ -30,6 +37,8 @@ export default {
components: {},
data () {
return {
+ type: '1',
+ filename: '',
fullscreenLoading: false
}
},
@@ -41,16 +50,22 @@ export default {
},
uploadfile: function (data) {
const configDir = (electron.app || electron.remote.app).getPath('userData')
- let filename = data.file.name.substring(0, data.file.name.length - 3)
- compressing.gzip.uncompress(data.file.path, (configDir + '/' + filename))
+ this.filename = data.file.name.substring(0, data.file.name.length - 3)
+ compressing.gzip.uncompress(data.file.path, (configDir + '/' + this.filename))
.then(files => {
this.fullscreenLoading = true
return this.delay(5000).then(() => {
this.fullscreenLoading = false
- this.$router.push({ name: 'linuxplayer', params: {name: filename} })
}
)
})
+ },
+ play: function () {
+ if (this.type === '1') {
+ this.$router.push({ name: 'linuxplayer', params: {name: this.filename} })
+ } else {
+ this.$router.push({ name: 'guaplayer', params: {name: this.filename} })
+ }
}
}
}
diff --git a/src/renderer/components/player/guaPlayer.vue b/src/renderer/components/player/guaPlayer.vue
index e69de29..504aab9 100644
--- a/src/renderer/components/player/guaPlayer.vue
+++ b/src/renderer/components/player/guaPlayer.vue
@@ -0,0 +1,209 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/renderer/components/player/linuxPlayer.vue b/src/renderer/components/player/linuxPlayer.vue
index 3481912..e963def 100644
--- a/src/renderer/components/player/linuxPlayer.vue
+++ b/src/renderer/components/player/linuxPlayer.vue
@@ -6,13 +6,13 @@
返回
- 取消
+ 取消
播放/暂停
- 快进
+ 快进
重置
@@ -29,7 +29,6 @@
-
{{term}}
diff --git a/src/renderer/router/index.js b/src/renderer/router/index.js
index b72cf20..50d58ad 100644
--- a/src/renderer/router/index.js
+++ b/src/renderer/router/index.js
@@ -15,6 +15,11 @@ export default new Router({
name: 'linuxplayer',
component: require('@/components/player/linuxPlayer').default
},
+ {
+ path: '/guaplayer',
+ name: 'guaplayer',
+ component: require('@/components/player/guaPlayer').default
+ },
{
path: '*',
redirect: '/'
diff --git a/yarn.lock b/yarn.lock
index 6c4f373..92956a0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1859,6 +1859,14 @@ bitsyntax@~0.1.0:
debug "~2.6.9"
safe-buffer "~5.1.2"
+bl@^1.0.0:
+ version "1.2.2"
+ resolved "https://registry.yarnpkg.com/bl/-/bl-1.2.2.tgz#a160911717103c07410cef63ef51b397c025af9c"
+ integrity sha512-e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==
+ dependencies:
+ readable-stream "^2.3.5"
+ safe-buffer "^5.1.1"
+
bl@~1.1.2:
version "1.1.2"
resolved "https://registry.yarnpkg.com/bl/-/bl-1.1.2.tgz#fdca871a99713aa00d19e3bbba41c44787a65398"
@@ -2087,6 +2095,11 @@ buffer-alloc@^1.2.0:
buffer-alloc-unsafe "^1.1.0"
buffer-fill "^1.0.0"
+buffer-crc32@~0.2.3:
+ version "0.2.13"
+ resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
+ integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=
+
buffer-fill@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c"
@@ -2795,6 +2808,21 @@ compressible@~2.0.16:
dependencies:
mime-db ">= 1.43.0 < 2"
+compressing@^1.5.0:
+ version "1.5.0"
+ resolved "https://registry.yarnpkg.com/compressing/-/compressing-1.5.0.tgz#c6b04942f9923bce59561b8d04d7f09776423ebc"
+ integrity sha512-CPMzMd/MswJh7CPRo605FQhXQlP0JbwCjPteh9GZ0jYTQcDBrYJLEW7Fm1dpTdOHk0/2ZE2C8SO5EX4Dp7KZ8w==
+ dependencies:
+ flushwritable "^1.0.0"
+ get-ready "^1.0.0"
+ iconv-lite "^0.5.0"
+ mkdirp "^0.5.1"
+ pump "^3.0.0"
+ streamifier "^0.1.1"
+ tar-stream "^1.5.2"
+ yauzl "^2.7.0"
+ yazl "^2.4.2"
+
compression@^1.7.4:
version "1.7.4"
resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f"
@@ -4482,6 +4510,13 @@ fd-slicer@~1.0.1:
dependencies:
pend "~1.2.0"
+fd-slicer@~1.1.0:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e"
+ integrity sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=
+ dependencies:
+ pend "~1.2.0"
+
figgy-pudding@^3.5.1:
version "3.5.1"
resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.1.tgz#862470112901c727a0e495a80744bd5baa1d6790"
@@ -4644,6 +4679,11 @@ flush-write-stream@^1.0.0:
inherits "^2.0.3"
readable-stream "^2.3.6"
+flushwritable@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/flushwritable/-/flushwritable-1.0.0.tgz#3e328d8fde412ad47e738e3be750b4d290043498"
+ integrity sha1-PjKNj95BKtR+c44751C00pAENJg=
+
follow-redirects@1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.0.0.tgz#8e34298cbd2e176f254effec75a1c78cc849fd37"
@@ -4725,6 +4765,11 @@ from2@^2.1.0:
inherits "^2.0.1"
readable-stream "^2.0.0"
+fs-constants@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
+ integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==
+
fs-extra-p@^7.0.1:
version "7.0.1"
resolved "https://registry.yarnpkg.com/fs-extra-p/-/fs-extra-p-7.0.1.tgz#4eec0b6dfa150fa90f6ddd773b4fb1d55cad54e3"
@@ -4871,6 +4916,11 @@ get-func-name@^2.0.0:
resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.0.tgz#ead774abee72e20409433a066366023dd6887a41"
integrity sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=
+get-ready@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/get-ready/-/get-ready-1.0.0.tgz#f91817f1e9adecfea13a562adfc8de883ab34782"
+ integrity sha1-+RgX8emt7P6hOlYq38jeiDqzR4I=
+
get-stdin@^4.0.1:
version "4.0.1"
resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
@@ -5094,6 +5144,16 @@ growl@1.10.5:
resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e"
integrity sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==
+guacamole-common-js-jumpserver@^1.1.0-c:
+ version "1.1.0-c"
+ resolved "https://registry.yarnpkg.com/guacamole-common-js-jumpserver/-/guacamole-common-js-jumpserver-1.1.0-c.tgz#7d002f33097b4c52abc281a85dd5df14ad081a68"
+ integrity sha512-FKu9Cez9iy1xPy4GU+SaMDjqLR0+k1XsDO7dqi9JjJgz4pAoxQIdX2Thci8ZFGwTGdZzhVBpAqs7pebuktRSZQ==
+
+guacamole-common-js@^1.1.0-b:
+ version "1.1.0-b"
+ resolved "https://registry.yarnpkg.com/guacamole-common-js/-/guacamole-common-js-1.1.0-b.tgz#b67bd9c0342a124b26ef9d2b0f8e01d18e4b2a79"
+ integrity sha512-aU0AilOowlsw2QEb7F7a+L6+cdc40D38Pe7rRnbuKZ5KTqcwZK6dworQNrCbrSavKNH/+qvAcQkskMntVBmMaQ==
+
handle-thing@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.0.tgz#0e039695ff50c93fc288557d696f3c1dc6776754"
@@ -5535,6 +5595,13 @@ iconv-lite@0.4.24, iconv-lite@^0.4.17, iconv-lite@^0.4.24:
dependencies:
safer-buffer ">= 2.1.2 < 3"
+iconv-lite@^0.5.0:
+ version "0.5.1"
+ resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.5.1.tgz#b2425d3c7b18f7219f2ca663d103bddb91718d64"
+ integrity sha512-ONHr16SQvKZNSqjQT9gy5z24Jw+uqfO02/ngBSBoqChZ+W8qXX7GPRa1RoUnzGADw8K63R1BXUMzarCVQBpY8Q==
+ dependencies:
+ safer-buffer ">= 2.1.2 < 3"
+
icss-replace-symbols@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz#06ea6f83679a7749e386cfe1fe812ae5db223ded"
@@ -8865,7 +8932,7 @@ read-pkg@^2.0.0:
normalize-package-data "^2.3.2"
path-type "^2.0.0"
-"readable-stream@1 || 2", readable-stream@2, readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.0, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
+"readable-stream@1 || 2", readable-stream@2, readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.0, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.6:
version "2.3.7"
resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
@@ -9963,6 +10030,11 @@ stream-shift@^1.0.0:
resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d"
integrity sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==
+streamifier@^0.1.1:
+ version "0.1.1"
+ resolved "https://registry.yarnpkg.com/streamifier/-/streamifier-0.1.1.tgz#97e98d8fa4d105d62a2691d1dc07e820db8dfc4f"
+ integrity sha1-l+mNj6TRBdYqJpHR3AfoINuN/E8=
+
streamroller@0.7.0:
version "0.7.0"
resolved "https://registry.yarnpkg.com/streamroller/-/streamroller-0.7.0.tgz#a1d1b7cf83d39afb0d63049a5acbf93493bdf64b"
@@ -10188,6 +10260,19 @@ tapable@^1.0.0, tapable@^1.1.3:
resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
+tar-stream@^1.5.2:
+ version "1.6.2"
+ resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-1.6.2.tgz#8ea55dab37972253d9a9af90fdcd559ae435c555"
+ integrity sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==
+ dependencies:
+ bl "^1.0.0"
+ buffer-alloc "^1.2.0"
+ end-of-stream "^1.0.0"
+ fs-constants "^1.0.0"
+ readable-stream "^2.3.0"
+ to-buffer "^1.1.1"
+ xtend "^4.0.0"
+
tar@^2.0.0:
version "2.2.2"
resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.2.tgz#0ca8848562c7299b8b446ff6a4d60cdbb23edc40"
@@ -10330,6 +10415,11 @@ to-arraybuffer@^1.0.0:
resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
integrity sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=
+to-buffer@^1.1.1:
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/to-buffer/-/to-buffer-1.1.1.tgz#493bd48f62d7c43fcded313a03dcadb2e1213a80"
+ integrity sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg==
+
to-fast-properties@^1.0.3:
version "1.0.3"
resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47"
@@ -11339,6 +11429,21 @@ yauzl@2.4.1:
dependencies:
fd-slicer "~1.0.1"
+yauzl@^2.7.0:
+ version "2.10.0"
+ resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"
+ integrity sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=
+ dependencies:
+ buffer-crc32 "~0.2.3"
+ fd-slicer "~1.1.0"
+
+yazl@^2.4.2:
+ version "2.5.1"
+ resolved "https://registry.yarnpkg.com/yazl/-/yazl-2.5.1.tgz#a3d65d3dd659a5b0937850e8609f22fffa2b5c35"
+ integrity sha512-phENi2PLiHnHb6QBVot+dJnaAZ0xosj7p3fWl+znIjBDlnMI2PsZCJZ306BPTFOaHf5qdDEI8x5qFrSOBN5vrw==
+ dependencies:
+ buffer-crc32 "~0.2.3"
+
yeast@0.1.2:
version "0.1.2"
resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419"