tittle gai

Signed-off-by: ElmerNing <ffxhina@gmail.com>
Merge branch 'master' of github.com:wangzhengwei/StripChart-V2

Conflicts:
	label/softkey.cpp