fix appsocket
Merge branch 'master' into gps
alarm service