huangzhicong / SmartCanteen

2、增加离线支付完成的日志输出
3、延长离线支付的超时到30秒(给服务器预留更多的处理时间)

2、完善LogFileMonitor注释

2、增加数据库版本从1升级到2的迁移机制

# Conflicts:
#	app/src/main/java/com/bgycc/smartcanteen/data/dao/PayDataDao.java

2、现在在线支付超时改为10秒
3、更新文档

Merge branch 'fea-payoffline_split' of https://git.bgy.com.cn/bu00302/dining-android into fea-payoffline_split

# Conflicts:
#	app/src/main/java/com/bgycc/smartcanteen/data/dao/PayDataDao.java
#	app/src/main/java/com/bgycc/smartcanteen/viewModel/PayOfflineViewModel.java

2、现在只保留日志设置保留期限

# Conflicts:
#	app/build.gradle
#	app/src/main/java/com/bgycc/smartcanteen/RootApp.java
#	app/src/main/java/com/bgycc/smartcanteen/activity/MainActivity.java
#	app/src/main/java/com/bgycc/smartcanteen/entity/PayData.java
#	app/src/main/java/com/bgycc/smartcanteen/qrcode/DefaultQRCodeScan.java
#	app/src/main/java/com/bgycc/smartcanteen/socket/SCWebSocketClient.java
#	app/src/main/java/com/bgycc/smartcanteen/utils/DangerousUtils.java
#	app/src/main/java/com/bgycc/smartcanteen/viewModel/PayOfflineViewModel.java
#	app/src/main/java/com/bgycc/smartcanteen/viewModel/PayOnlineViewModel.java
#	app/src/main/java/com/bgycc/smartcanteen/viewModel/QRCodeViewModel.java
#	build.gradle
#	daemon/build.gradle
#	智慧食堂开发文档.docx

1、离线支付增加延时(留出播报beep的声音)
2、现在同一订单号不允许重复生成了