nothing
添加了 联网取数据的功能uploading 但是有Bug运行的时候会崩
nothing
看见了节能减
Merge branch 'master' of git@github.com:suntinghui/LYY4Android_SCAN.git

Conflicts:
	.settings/org.eclipse.core.resources.prefs
	bin/AndroidManifest.xml
	bin/classes/com/people/lyy/scan/R$drawable.class
	bin/classes/com/people/lyy/scan/R$string.class
	bin/classes/com/people/lyy/scan/R$style.class
	bin/classes/com/people/lyy/scan/R.class
	gen/com/people/lyy/scan/R.java