wangyb d456beb31a Merge remote-tracking branch 'origin/qrcode_20200724' into qrcode_20200724 ...

# Conflicts:
#	app/src/main/java/com/ydd/sportfaceid/MainActivity.java
#	app/src/main/res/layout/activity_main.xml
#	app/src/main/res/layout/activity_sdsetting.xml

2020-07-29 17:37:10 +08:00

..

libs

安卓代码初始化

2020-06-21 10:26:17 +08:00

product

安卓代码初始化

2020-06-21 10:26:17 +08:00

src

Merge remote-tracking branch 'origin/qrcode_20200724' into qrcode_20200724

2020-07-29 17:37:10 +08:00

.gitignore

安卓代码初始化

2020-06-21 10:26:17 +08:00

build.gradle

新增二维码扫描操作

2020-07-28 18:37:44 +08:00

proguard-rules.pro

安卓代码初始化

2020-06-21 10:26:17 +08:00

store

安卓代码初始化

2020-06-21 10:26:17 +08:00