add customalertView
fix bugs
merge