add drawtool
resovle confilt

Signed-off-by: mandy <gaolx1@GAOLX1.lenovo.com>