Merge branch 'develop'

CS-Tao · Jul 28, 2020 · 4b09351 · 4b09351
2 parents 357017f + 23617ad
commit 4b09351
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 31 deletions.
diff --git 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 [email protected]
-# - 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 [email protected]
+  # - 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

diff --git 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
@@ -1,6 +1,6 @@
 {
   "name": "whu-library-seat",
-  "version": "1.9.4",
+  "version": "1.9.5",
   "author": "CS-Tao <[email protected]>",
   "description": "武汉大学图书馆抢座软件",
   "license": null,

diff --git a/src/main/index.js b/src/main/index.js
@@ -44,6 +44,7 @@ app.on('ready', () => {
     {
       label: '打开软件',
       click () {
+        app.dock.show()
         mainWindow.show()
       }
     },
@@ -257,6 +258,9 @@ function createWindow () {
         mainWindow.hide()
         mainWindow.setSkipTaskbar(true)
       }
+      if (app.dock) {
+       app.dock.hide()
+      }
     }
   })