Merge branch 'master' into 2.0

wjc

3 天以前 8f4a21c13de88f6c34705f0660ec54ec5e032aa4

1
2
3
4
5
6
7
8
rootProject.name = "PhotovoltaicDebug"
include ':app'
include ':third-zxing'
include ':countrypicker'
include ':aa_chart_core'
include ':pickerview'
include ':wheelview'
include ':sdk'