Commits · cb24790b15b18a851766c48b617a6c808cd49c3f · huangzhicong / SmartCanteen

13 Mar, 2020 2 commits
- Merge branch 'develop' into uat · cb24790b
  pye52 committed Mar 13, 2020
  
  cb24790b Browse Files
- 更新readme文档 · 4c0691ea
  pye52 committed Mar 13, 2020
  
  4c0691ea Browse Files
08 Mar, 2020 3 commits
- 更新版本 · 6cc0667e
  pye52 committed Mar 08, 2020
  
  6cc0667e Browse Files
- Merge branch 'develop' into uat · 211936c0
```
# Conflicts:
#	app/build.gradle
```
  pye52 committed Mar 08, 2020
  211936c0 Browse Files
- 完善各机型的兼容方案 · 3a5092d1
  pye52 committed Mar 08, 2020
  
  3a5092d1 Browse Files
07 Mar, 2020 2 commits
- 增加android serialport库 · f0c21333
  pye52 committed Mar 07, 2020
  
  f0c21333 Browse Files
- 增加兼容不同机型设备的方案 · 01294ba9
  pye52 committed Mar 07, 2020
  
  01294ba9 Browse Files
06 Mar, 2020 2 commits
- 忽略IDE生成文件夹(不再参与版本管理) · 428558e1
  pye52 committed Mar 06, 2020
  
  428558e1 Browse Files
- 更新版本及测试版地址 · 0d5f2601
  pye52 committed Mar 06, 2020
  
  0d5f2601 Browse Files
05 Mar, 2020 5 commits
- Merge branch 'develop' into uat · 2e585391
  pye52 committed Mar 05, 2020
  
  2e585391 Browse Files
- 适配最新utilcode · e5889123
  pye52 committed Mar 05, 2020
  
  e5889123 Browse Files
- 更新第三方库版本 · 655e9bb0
  pye52 committed Mar 05, 2020
  
  655e9bb0 Browse Files
- 更新gradle版本 · cbc83b34
  pye52 committed Mar 05, 2020
  
  cbc83b34 Browse Files
- 更换为厂商最新的so库 · a40aa31b
  pye52 committed Mar 05, 2020
  
  a40aa31b Browse Files
27 Feb, 2020 1 commit
- 版本递增 · 3048f2b2
  pye52 committed Feb 27, 2020
  
  3048f2b2 Browse Files
08 Jan, 2020 4 commits
- 版本递增 · 4e0e8633
  pye52 committed Jan 08, 2020
  
  4e0e8633 Browse Files
- Merge branch 'develop' into uat · 1333e061
  pye52 committed Jan 08, 2020
  
  1333e061 Browse Files
- 1、避免loop重复生成 · 6cd22534
```
2、完善连接状态的日志输出

用于下一发版测试
```
  pye52 committed Jan 08, 2020
  6cd22534 Browse Files
- 回滚旧版本，以发布生产包 · 258bc0aa
  pye52 committed Jan 08, 2020
  
  258bc0aa Browse Files
06 Jan, 2020 3 commits
- 1、避免loop重复生成 · 94dcef0e
```
2、完善连接状态的日志输出
```
  pye52 committed Jan 06, 2020
  94dcef0e Browse Files
- 1、更新kotlin版本 · 04ec278b
```
            2、去除冗余import
```
  pye52 committed Jan 06, 2020
  04ec278b Browse Files
- 现在日志可以输出异常堆栈信息了 · 331d1adc
  pye52 committed Jan 06, 2020
  
  331d1adc Browse Files
03 Jan, 2020 1 commit
- 增加人员未在合适时间但支付成功的语音提示 · 18a50767
  pye52 committed Jan 03, 2020
  
  18a50767 Browse Files
19 Dec, 2019 4 commits
- Merge branch 'develop' into uat · e62d605e
  patpat committed Dec 19, 2019
  
  e62d605e Browse Files
- 修改uat和生产后台地址 · 85455d0c
  patpat committed Dec 19, 2019
  
  85455d0c Browse Files
- 版本递增 · 3532d60f
  patpat committed Dec 19, 2019
  
  3532d60f Browse Files
- Merge branch 'develop' into uat · 17b5cb20
  patpat committed Dec 19, 2019
  
  17b5cb20 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 uat · 550bfa34
```
# Conflicts:
#	app/build.gradle
#	app/src/main/java/com/bgycc/smartcanteen/AppConfig.kt
```
  patpat committed Dec 11, 2019
  550bfa34 Browse Files
- develop分支配置 · 260398db
  patpat committed Dec 11, 2019
  
  260398db Browse Files
- uat分支配置 · 58646385
  patpat committed Dec 11, 2019
  
  58646385 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