From 14c7a257fa2e2833a64d7c1ec2b670e9efeac50c Mon Sep 17 00:00:00 2001 From: taochunsheng Date: Fri, 3 Jul 2020 01:07:33 +0800 Subject: [PATCH 1/4] Hide dock icon when close Change-Id: Ided6c6b4107ccf0e14df60b857f8d0d89de226fd --- src/main/index.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/index.js b/src/main/index.js index 5201f221..2a1e20e1 100644 --- a/src/main/index.js +++ b/src/main/index.js @@ -44,6 +44,7 @@ app.on('ready', () => { { label: '打开软件', click () { + app.dock.show() mainWindow.show() } }, @@ -255,6 +256,7 @@ function createWindow () { e.preventDefault() if (mainWindow) { mainWindow.hide() + app.dock.hide() mainWindow.setSkipTaskbar(true) } } From 870112c673303947c3cdc537e3cf3c9e8d10516d Mon Sep 17 00:00:00 2001 From: taochunsheng Date: Fri, 3 Jul 2020 01:11:03 +0800 Subject: [PATCH 2/4] Bump app version to 1.9.5 Change-Id: I09701c752e397cd49f749d82ced1cd86839ef094 --- README.md | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 43da4116..fcd630f8 100644 --- a/README.md +++ b/README.md @@ -23,9 +23,9 @@ ### 最新版本下载 -| 平台 | Windows | Mac OS | Linux | -| :--- | :---: | :---: | :---: | -|下载链接| [![Windows 版本下载链接 v1.9.4](https://img.shields.io/badge/v1.9.4-Windows-limegreen.svg)](https://github.com/CS-Tao/whu-library-seat/releases/download/v1.9.4/whu-library-seat-1.9.4.exe) | [![Mac OS 版本下载链接 v1.9.4](https://img.shields.io/badge/v1.9.4-Mac%20OS-limegreen.svg)](https://github.com/CS-Tao/whu-library-seat/releases/download/v1.9.4/whu-library-seat-1.9.4.dmg) | [![Linux 版本下载链接 v1.9.4](https://img.shields.io/badge/v1.9.4-Linux-limegreen.svg)](https://github.com/CS-Tao/whu-library-seat/releases/download/v1.9.4/whu-library-seat-1.9.4-x86_64.AppImage) | +| 平台 | Windows | Mac OS | Linux | +| :------- | :-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | +| 下载链接 | [![Windows 版本下载链接 v1.9.5](https://img.shields.io/badge/v1.9.5-Windows-limegreen.svg)](https://github.com/CS-Tao/whu-library-seat/releases/download/v1.9.5/whu-library-seat-1.9.5.exe) | [![Mac OS 版本下载链接 v1.9.5](https://img.shields.io/badge/v1.9.5-Mac%20OS-limegreen.svg)](https://github.com/CS-Tao/whu-library-seat/releases/download/v1.9.5/whu-library-seat-1.9.5.dmg) | [![Linux 版本下载链接 v1.9.5](https://img.shields.io/badge/v1.9.5-Linux-limegreen.svg)](https://github.com/CS-Tao/whu-library-seat/releases/download/v1.9.5/whu-library-seat-1.9.5-x86_64.AppImage) | ### 申请软件使用权 @@ -43,7 +43,7 @@ 您可以通过以下步骤自行构建本软件，但请您务必注意，本仓库并未提供任何源码`许可证`，您没有权利将源码更改后继续传播，更没有权利将本软件或源码用于商业活动 -``` bash +```bash # 安装依赖 yarn diff --git a/package.json b/package.json index 8551cb08..9542625f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "whu-library-seat", - "version": "1.9.4", + "version": "1.9.5", "author": "CS-Tao ", "description": "武汉大学图书馆抢座软件", "license": null, From b5f7ea3781a0e9f2d267c285d8ee240c02342d5e Mon Sep 17 00:00:00 2001 From: taochunsheng Date: Fri, 3 Jul 2020 02:00:32 +0800 Subject: [PATCH 3/4] Try to fix ci --- .travis.yml | 49 +++++++++++++++++++++++-------------------------- 1 file changed, 23 insertions(+), 26 deletions(-) diff --git a/.travis.yml b/.travis.yml index 36cbbcb0..a4acf764 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,40 +6,37 @@ dist: trusty language: c matrix: include: - - os: osx - - os: linux - env: CC=clang CXX=clang++ npm_config_clang=1 - compiler: clang + - os: osx + - os: linux + env: CC=clang CXX=clang++ npm_config_clang=1 + compiler: clang cache: directories: - - node_modules - - "$HOME/.electron" - - "$HOME/.cache" + - node_modules + - '$HOME/.electron' + - '$HOME/.cache' addons: apt: packages: - - libgnome-keyring-dev - - icnsutils - #- xvfb + - libgnome-keyring-dev + - icnsutils + #- xvfb before_install: -- mkdir -p /tmp/git-lfs && curl -L https://github.com/github/git-lfs/releases/download/v1.2.1/git-lfs-$([ - "$TRAVIS_OS_NAME" == "linux" ] && echo "linux" || echo "darwin")-amd64-1.2.1.tar.gz - | tar -xz -C /tmp/git-lfs --strip-components 1 && /tmp/git-lfs/git-lfs pull -- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install --no-install-recommends -y icnsutils graphicsmagick xz-utils; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install --no-install-recommends -y icnsutils graphicsmagick xz-utils; fi install: -#- export DISPLAY=':99.0' -#- Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 & -- nvm install 8 -- curl -o- -L https://yarnpkg.com/install.sh | bash -- source ~/.bashrc -- npm install -g vuepress@0.14.0 -# - npm install -g xvfb-maybe -- yarn + #- export DISPLAY=':99.0' + #- Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 & + - nvm install 8 + - curl -o- -L https://yarnpkg.com/install.sh | bash + - source ~/.bashrc + - npm install -g vuepress@0.14.0 + # - npm install -g xvfb-maybe + - yarn script: -#- xvfb-maybe node_modules/.bin/karma start test/unit/karma.conf.js -#- yarn run pack && xvfb-maybe node_modules/.bin/mocha test/e2e -- yarn build:docs -- yarn build + #- xvfb-maybe node_modules/.bin/karma start test/unit/karma.conf.js + #- yarn run pack && xvfb-maybe node_modules/.bin/mocha test/e2e + - yarn build:docs + - yarn build deploy: provider: pages skip-cleanup: true From 23617ade805a11aacc8ebc777f1cbd1e84c59651 Mon Sep 17 00:00:00 2001 From: CS-Tao Date: Wed, 29 Jul 2020 00:53:04 +0800 Subject: [PATCH 4/4] Fix window bug --- src/main/index.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/index.js b/src/main/index.js index 2a1e20e1..1e6406e9 100644 --- a/src/main/index.js +++ b/src/main/index.js @@ -256,9 +256,11 @@ function createWindow () { e.preventDefault() if (mainWindow) { mainWindow.hide() - app.dock.hide() mainWindow.setSkipTaskbar(true) } + if (app.dock) { + app.dock.hide() + } } })