Commits · 71eacc19757228cfd92d12b8ef4154eb7e0fedfc · huangzhicong / SmartCanteen · GitLab

18 Dec, 2019 2 commits
- 1.3.0 · 71eacc19
  patpat committed Dec 18, 2019
  
  71eacc19 Browse Files
- Merge branch 'develop' into production · 23662f9d
  patpat committed Dec 18, 2019
  
  23662f9d Browse Files
12 Dec, 2019 1 commit
- 修复拉取日志可能闪退的问题 · ec0b4fe8
  patpat committed Dec 12, 2019
  
  ec0b4fe8 Browse Files
11 Dec, 2019 9 commits
- 增加第三方离线支付失败提示 · ff4fa9c0
  patpat committed Dec 11, 2019
  
  ff4fa9c0 Browse Files
- 更新readme · ee03cefa
  patpat committed Dec 11, 2019
  
  ee03cefa Browse Files
- 调整语音 · 9c6295b7
  patpat committed Dec 11, 2019
  
  9c6295b7 Browse Files
- Merge branch 'develop' into production · 05c84cab
```
# Conflicts:
#	app/build.gradle
#	app/src/main/java/com/bgycc/smartcanteen/AppConfig.kt
```
  patpat committed Dec 11, 2019
  05c84cab Browse Files
- develop分支配置 · 260398db
  patpat committed Dec 11, 2019
  
  260398db Browse Files
- 生产分支配置 · 3333d450
  patpat committed Dec 11, 2019
  
  3333d450 Browse Files
- 修复bug · 1c471e67
  patpat committed Dec 11, 2019
  
  1c471e67 Browse Files
- 调整音量键按键 · fecd368b
  patpat committed Dec 11, 2019
  
  fecd368b Browse Files
- 更新readme · f2ebd2b5
  patpat committed Dec 11, 2019
  
  f2ebd2b5 Browse Files
10 Dec, 2019 3 commits
- 增加支付结果语音 · 873fc394
  patpat committed Dec 10, 2019
  
  873fc394 Browse Files
- 增加TTS，增加“请不要重复扫码”语音 · f5418204
  patpat committed Dec 10, 2019
  
  f5418204 Browse Files
- 增加每10分钟自动发送心跳包 · 409444ee
  patpat committed Dec 10, 2019
  
  409444ee Browse Files
05 Dec, 2019 1 commit
- 修改log压缩包名称格式 · 5a0b75db
  patpat committed Dec 05, 2019
  
  5a0b75db Browse Files
03 Dec, 2019 2 commits
- 删除测试代码 · db061a89
  patpat committed Dec 03, 2019
  
  db061a89 Browse Files
- 日志拉取 · ffeca9ea
  patpat committed Dec 03, 2019
  
  ffeca9ea Browse Files
29 Nov, 2019 2 commits
- 版本递增 · 3ea9b03b
  patpat committed Nov 29, 2019
  
  3ea9b03b Browse Files
- 修复websocket断线慢的问题、增加websocket连接传版本、增加更新下载超时和旧版本不允许安装限制、日志功能未完成 · 0d7bc81b
  patpat committed Nov 29, 2019
  
  0d7bc81b Browse Files
27 Nov, 2019 2 commits
- 增加ping判断网络状态 · a9b237f7
  patpat committed Nov 27, 2019
  
  a9b237f7 Browse Files
- 增加uat环境 · 8cfd9f4a
  patpat committed Nov 27, 2019
  
  8cfd9f4a Browse Files
26 Nov, 2019 1 commit
- 修复在线支付超时转离线支付时提示重复扫码的问题 · 2e3386be
  patpat committed Nov 26, 2019
  
  2e3386be Browse Files
19 Nov, 2019 2 commits
- 禁用网络切换功能 · a768d877
  patpat committed Nov 19, 2019
  
  a768d877 Browse Files
- 增加网络切换功能、增加以太网ip显示 · d1924aa9
  patpat committed Nov 19, 2019
  
  d1924aa9 Browse Files
15 Nov, 2019 4 commits
- 增加readme · 3fbc63fc
  patpat committed Nov 15, 2019
  
  3fbc63fc Browse Files
- 版本递增 · db273552
  patpat committed Nov 15, 2019
  
  db273552 Browse Files
- 修改生产环境地址 · 0e7623f1
  patpat committed Nov 15, 2019
  
  0e7623f1 Browse Files
- 取消跟踪misc.xml · 75b186f2
  patpat committed Nov 15, 2019
  
  75b186f2 Browse Files
08 Nov, 2019 4 commits
- 版本递增 · 9101f32a
  patpat committed Nov 08, 2019
  
  9101f32a Browse Files
- 离线支付防重复数量增加到2000 · 021601f0
  patpat committed Nov 08, 2019
  
  021601f0 Browse Files
- 增加清空离线支付记录二维码识别 · 361fa393
  patpat committed Nov 08, 2019
  
  361fa393 Browse Files
- 调整离线支付重复限制 · 4a26711b
  patpat committed Nov 08, 2019
  
  4a26711b Browse Files
07 Nov, 2019 2 commits
- gradle配置 · 22987824
  patpat committed Nov 07, 2019
  
  22987824 Browse Files
- 修复在线支付重试有可能导致逻辑卡机的bug · 7e8f219a
  patpat committed Nov 07, 2019
  
  7e8f219a Browse Files
06 Nov, 2019 1 commit
- 修复离线支付记录没有上传的问题 · 85933aca
  patpat committed Nov 06, 2019
  
  85933aca Browse Files
05 Nov, 2019 1 commit
- 调整超时逻辑，超时后自动转为离线支付 · 2683985d
  patpat committed Nov 05, 2019
  
  2683985d Browse Files
10 Oct, 2019 1 commit
- 增加扫码更新和远程更新功能 · 4a2f1ade
  patpat committed Oct 10, 2019
  
  4a2f1ade Browse Files
09 Oct, 2019 1 commit
- 增加本地日志、增加无效二维码提示 · 9b6dfd52
  patpat committed Oct 09, 2019
  
  9b6dfd52 Browse Files
08 Oct, 2019 1 commit
- 增大音量 · c27db7c8
  patpat committed Oct 08, 2019
  
  c27db7c8 Browse Files