update
Signed-off-by: SmileYun <zhuyunsheng23@gmail.com>
commit
modify

Signed-off-by: SmileYun <zhuyunsheng23@gmail.com>
Merge branch 'master' of https://github.com/SmileYun/HMI
12-10
Signed-off-by: SmileYun <zhuyunsheng23@gmail.com>
developcc

Signed-off-by: SmileYun <zhuyunsheng23@gmail.com>
Merge branch 'develop_cc' into yangfd

Conflicts:
	bin/R.txt
	bin/classes/com/cqupt/core/util/util.class
	bin/classes/com/cqupt/entity/CanMsgInfo.class
	bin/classes/com/cqupt/hmi/R$id.class
	bin/classes/com/cqupt/hmi/R$integer.class
	bin/classes/com/cqupt/hmi/R$styleable.class
	bin/classes/com/cqupt/model/RecvThread$1.class
	bin/classes/com/cqupt/model/RecvThread$RawCanMsgHandler.class
	bin/classes/com/cqupt/model/RecvThread.class
	bin/classes/com/cqupt/model/threaten/BMHandler.class
	bin/classes/com/cqupt/model/threaten/CanMsgCache.class
	bin/classes/com/cqupt/model/threaten/SVHandler.class
	bin/classes/com/cqupt/persenter/Dispatcher$AbHandler.class
	bin/classes/com/cqupt/persenter/Dispatcher.class
	bin/classes/com/cqupt/ui/ActivityBluetoothDeviceList$1.class
	bin/classes/com/cqupt/ui/ActivityBluetoothDeviceList.class
	bin/classes/com/cqupt/ui/MainActivity.class
	bin/classes/com/cqupt/ui/base/HMIActivity.class
	bin/classes/com/cqupt/ui/base/IUI.class
	gen/com/cqupt/hmi/R.java
	src/com/cqupt/entity/CanMsgInfo.java
	src/com/cqupt/model/threaten/BMHandler.java
	src/com/cqupt/ui/MainActivity.java