From 7d2455d3659a8aad9c8271ca75b01d2d84e80e5d Mon Sep 17 00:00:00 2001 From: CS-Tao <990296951@qq.com> Date: Thu, 26 Dec 2019 09:32:48 +0800 Subject: [PATCH 1/5] Rename app --- package.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 02edbd02..003929bb 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "postinstall": "npm run lint:fix" }, "build": { - "productName": "whu-library-seat", + "productName": "图书馆助手", "appId": "cc.cs-tao.whu-library-seat", "directories": { "output": "build" @@ -36,6 +36,7 @@ "static" ], "dmg": { + "artifactName": "${name}-${version}.${ext}", "contents": [ { "x": 410, @@ -51,12 +52,15 @@ ] }, "mac": { + "artifactName": "${name}-${version}-${os}.${ext}", "icon": "build/icons/icon.icns" }, "win": { + "artifactName": "${name}-${version}.${ext}", "icon": "build/icons/icon.ico" }, "linux": { + "artifactName": "${name}-${version}-${arch}.${ext}", "icon": "build/icons" } }, From 82f03e0771893fbc123016333cfc7de2b1d5926b Mon Sep 17 00:00:00 2001 From: CS-Tao <990296951@qq.com> Date: Thu, 2 Jan 2020 18:24:14 +0800 Subject: [PATCH 2/5] Update docs --- README.md | 2 +- docs/README.md | 6 +++--- docs/project/README.md | 2 ++ docs/specification/README.md | 13 +++++-------- docs/specification/menu.md | 2 ++ docs/specification/monitor.md | 2 +- docs/specification/others.md | 2 ++ docs/specification/protect.md | 2 +- docs/specification/reservation.md | 2 ++ docs/specification/seatoperate.md | 2 ++ docs/specification/settings.md | 2 ++ 11 files changed, 23 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 68ce1433..070b2f62 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ > 武汉大学图书馆抢座软件 - 桌面端 -> Android 版本：[https://github.com/CS-Tao/whu-library-seat-mobile](https://github.com/CS-Tao/whu-library-seat-mobile) +> 移动端：[https://github.com/CS-Tao/whu-library-seat-mobile](https://github.com/CS-Tao/whu-library-seat-mobile) ## 使用说明 diff --git a/docs/README.md b/docs/README.md index 04907289..7ca1cbf7 100644 --- a/docs/README.md +++ b/docs/README.md @@ -29,15 +29,15 @@ footer: Copyright © since 2018 CS-Tao - 桌面端 - [![桌面端下载链接](https://img.shields.io/badge/下载链接-Windows%20/%20MacOS%20/%20Linux-limegreen.svg)](https://github.com/CS-Tao/whu-library-seat#最新版本下载) + [![桌面端下载链接](https://img.shields.io/badge/下载链接-Windows%20/%20MacOS%20/%20Linux-limegreen.svg)](https://github.com/CS-Tao/whu-library-seat/blob/master/README.md#最新版本下载) - 移动端 - [![移动端下载链接](https://img.shields.io/badge/下载链接-Android-limegreen.svg)](https://github.com/CS-Tao/whu-library-seat#最新版本下载) + [![移动端下载链接](https://img.shields.io/badge/下载链接-Android-limegreen.svg)](https://github.com/CS-Tao/whu-library-seat-mobile/blob/master/README.md#最新版本下载) 二维码： - ![安卓版本二维码](https://raw.githubusercontent.com/CS-Tao/whu-library-seat/user-validation/last-android-qr.jpg) + ![安卓版本二维码](https://home.cs-tao.cc/github-content/contents/github/whu-library-seat/user-validation/last-android-qr.jpg) #### 用户认证 diff --git a/docs/project/README.md b/docs/project/README.md index e0ab27c8..e974fd8a 100644 --- a/docs/project/README.md +++ b/docs/project/README.md @@ -1,6 +1,8 @@ --- next: false --- +# 项目说明 + :::tip 本页面针对开发者 ::: diff --git a/docs/specification/README.md b/docs/specification/README.md index 9c65c359..4f773f9b 100644 --- a/docs/specification/README.md +++ b/docs/specification/README.md @@ -1,22 +1,20 @@ +# 快速使用 + ## 下载软件 本软件是针对`武汉大学`图书馆预约系统开发的抢座软件，支持 Windows、Mac OS、Linux、Android 等操作系统 - 桌面端 - [![桌面端下载链接](https://img.shields.io/badge/下载链接-Windows%20/%20MacOS%20/%20Linux-limegreen.svg)](https://github.com/CS-Tao/whu-library-seat#最新版本下载) - - + [![桌面端下载链接](https://img.shields.io/badge/下载链接-Windows%20/%20MacOS%20/%20Linux-limegreen.svg)](https://github.com/CS-Tao/whu-library-seat/blob/master/README.md#最新版本下载) - 移动端 - [![移动端下载链接](https://img.shields.io/badge/下载链接-Android-limegreen.svg)](https://github.com/CS-Tao/whu-library-seat#最新版本下载) - - + [![移动端下载链接](https://img.shields.io/badge/下载链接-Android-limegreen.svg)](https://github.com/CS-Tao/whu-library-seat-mobile/blob/master/README.md#最新版本下载) 二维码： - ![安卓版本二维码](https://raw.githubusercontent.com/CS-Tao/whu-library-seat/user-validation/last-android-qr.jpg) + ![安卓版本二维码](https://home.cs-tao.cc/github-content/contents/github/whu-library-seat/user-validation/last-android-qr.jpg) ## 安装软件 @@ -26,7 +24,6 @@ > v1.8.0 已移除本功能，改为 GitHub Star 认证，具体请查看 [GitHub Star 认证](./auth.html) - ## 软件更新 ![图片加载失败](https://home.cs-tao.cc/github-content/contents/github/whu-library-seat/update.png) diff --git a/docs/specification/menu.md b/docs/specification/menu.md index b3eb0f99..6cf060fd 100644 --- a/docs/specification/menu.md +++ b/docs/specification/menu.md @@ -1,3 +1,5 @@ +# 菜单说明 + :::warning 注意 本页面针对桌面端 ::: diff --git a/docs/specification/monitor.md b/docs/specification/monitor.md index e094aaed..b9e67562 100644 --- a/docs/specification/monitor.md +++ b/docs/specification/monitor.md @@ -1,4 +1,4 @@ -### 座位监控 +# 座位监控 #### 功能说明 diff --git a/docs/specification/others.md b/docs/specification/others.md index 8eb1614c..437fb206 100644 --- a/docs/specification/others.md +++ b/docs/specification/others.md @@ -1,3 +1,5 @@ +# 其他功能 + ### 查看个人信息 登录成功后，点击软件下方的用户按钮，可以查看您的个人信息 diff --git a/docs/specification/protect.md b/docs/specification/protect.md index 1cdf347b..41262767 100644 --- a/docs/specification/protect.md +++ b/docs/specification/protect.md @@ -1,4 +1,4 @@ -### 座位保护 +# 座位保护 出馆前可设置一段时间后更改此座位的时间，即通过定时执行"座位更改"功能实现座位保护 diff --git a/docs/specification/reservation.md b/docs/specification/reservation.md index 32a7cca0..622c7825 100644 --- a/docs/specification/reservation.md +++ b/docs/specification/reservation.md @@ -1,3 +1,5 @@ +# 定时预约 + ## 登录到图书馆 启动软件，输入用户名和密码(点击输入框旁边的小锁图标可以保存用户名或密码)，点击`登录`按钮登录到图书馆 diff --git a/docs/specification/seatoperate.md b/docs/specification/seatoperate.md index 5e559166..d6a32d9e 100644 --- a/docs/specification/seatoperate.md +++ b/docs/specification/seatoperate.md @@ -1,3 +1,5 @@ +# 位置操作 + ## 取消预约 在`预约历史`界面，如果您有处于`预约`状态的座位，可以点击对应记录后面的`取消预约`的按钮取消预约 diff --git a/docs/specification/settings.md b/docs/specification/settings.md index 7ea5a314..0bf095a8 100644 --- a/docs/specification/settings.md +++ b/docs/specification/settings.md @@ -1,3 +1,5 @@ +# 软件设置 + ### 进入设置界面 启动程序，在未登录的状态下，点击软件右上角的设置按钮即可进入设置界面 From 2986f9fed165fa18966bdd8f7169919798f3d0c8 Mon Sep 17 00:00:00 2001 From: CS-Tao <990296951@qq.com> Date: Mon, 6 Jan 2020 19:42:13 +0800 Subject: [PATCH 3/5] Enable usage record --- src/renderer/api/usage.api.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/renderer/api/usage.api.js b/src/renderer/api/usage.api.js index 45316ec8..e15ebf1d 100644 --- a/src/renderer/api/usage.api.js +++ b/src/renderer/api/usage.api.js @@ -25,8 +25,7 @@ const appVersion = remote.app.getVersion() export default { // 登录状态 loginState: (account, state, code, message = null) => { - // let usageRecordEnable = store.get('usageRecordEnable', true) - var usageRecordEnable = false + let usageRecordEnable = store.get('usageRecordEnable', true) if (usageRecordEnable) { let githubUserInfo = store.get('authInfo_githubUserInfo', null) let githubid = (githubUserInfo && githubUserInfo.id) ? githubUserInfo.id : null @@ -47,8 +46,7 @@ export default { }, // 抢座状态 grabState: (account, state, code, message = null) => { - // let usageRecordEnable = store.get('usageRecordEnable', true) - var usageRecordEnable = false + let usageRecordEnable = store.get('usageRecordEnable', true) if (usageRecordEnable) { let githubUserInfo = store.get('authInfo_githubUserInfo', null) let githubid = (githubUserInfo && githubUserInfo.id) ? githubUserInfo.id : null From 7f22d8e665f93739937fef6064a6ab74aa12ca82 Mon Sep 17 00:00:00 2001 From: CS-Tao <990296951@qq.com> Date: Mon, 6 Jan 2020 19:43:49 +0800 Subject: [PATCH 4/5] Bump app version to 1.9.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 003929bb..c5de7d20 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "whu-library-seat", - "version": "1.9.2", + "version": "1.9.3", "author": "CS-Tao ", "description": "武汉大学图书馆抢座软件", "license": null, From 873a6d5bba7934dd2a0c40f2bc5136dd68989901 Mon Sep 17 00:00:00 2001 From: CS-Tao <990296951@qq.com> Date: Mon, 6 Jan 2020 19:45:52 +0800 Subject: [PATCH 5/5] Update README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 070b2f62..84979ecd 100644 --- a/README.md +++ b/README.md @@ -23,9 +23,9 @@ ### 最新版本下载 -[![Windows 版本下载链接 v1.9.2](https://img.shields.io/badge/v1.9.2-Windows-limegreen.svg)](https://github.com/CS-Tao/whu-library-seat/releases/download/v1.9.2/whu-library-seat-setup-1.9.2.exe) -[![Mac OS 版本下载链接 v1.9.2](https://img.shields.io/badge/v1.9.2-Mac%20OS-limegreen.svg)](https://github.com/CS-Tao/whu-library-seat/releases/download/v1.9.2/whu-library-seat-1.9.2.dmg) -[![Linux 版本下载链接 v1.9.2](https://img.shields.io/badge/v1.9.2-Linux-limegreen.svg)](https://github.com/CS-Tao/whu-library-seat/releases/download/v1.9.2/whu-library-seat-1.9.2-x86_64.AppImage) +[![Windows 版本下载链接 v1.9.3](https://img.shields.io/badge/v1.9.3-Windows-limegreen.svg)](https://github.com/CS-Tao/whu-library-seat/releases/download/v1.9.3/whu-library-seat-setup-1.9.3.exe) +[![Mac OS 版本下载链接 v1.9.3](https://img.shields.io/badge/v1.9.3-Mac%20OS-limegreen.svg)](https://github.com/CS-Tao/whu-library-seat/releases/download/v1.9.3/whu-library-seat-1.9.3.dmg) +[![Linux 版本下载链接 v1.9.3](https://img.shields.io/badge/v1.9.3-Linux-limegreen.svg)](https://github.com/CS-Tao/whu-library-seat/releases/download/v1.9.3/whu-library-seat-1.9.3-x86_64.AppImage) ### 安装软件