app/src/main/java/com/bgycc/smartcanteen/utils · 1b9fdb3bd43d23a24e62286f65b37f92ad2b3df7 · huangzhicong / SmartCanteen · GitLab

History Find file

Merge branch 'fea-ref_qrcode' into fea-phone · 3e83af96
```
# Conflicts:
#	app/src/main/java/com/bgycc/smartcanteen/activity/MainActivity.java
```
pye52 committed Mar 22, 2020
3e83af96

Name	Last commit	Last Update
..
DangerousUtils.java		Loading commit data...
DeviceProxy.java		Loading commit data...
InstallManager.java		Loading commit data...
NetworkUtils.java		Loading commit data...
SmartCanteenUtils.java		Loading commit data...
TTSHelper.java		Loading commit data...