sdgfhdfghd

Signed-off-by: wang <wang@wang-PC>
gfdgdfgdh

Signed-off-by: wang <wang@wang-PC>
Signed-off-by: honesty <371278698@qq.com>
meng:追踪
Signed-off-by: wang <wang@wang-PC>
Merge branch 'master' of https://git@github.com/wisegps/baba.git

Conflicts:
	AndroidManifest.xml
Signed-off-by: honesty <371278698@qq.com>
定时刷新

Signed-off-by: wang <wang@wang-PC>
Merge branch 'master' of https://git@github.com/wisegps/baba.git

Conflicts:
	AndroidManifest.xml
Signed-off-by: honesty <371278698@qq.com>
Merge branch 'master' of git@github.com:wisegps/baba.git
dingshi dadsff

Signed-off-by: wang <wang@wang-PC>
Signed-off-by: honesty <371278698@qq.com>
Merge branch 'master' of git@github.com:wisegps/baba.git
hdjgfjhkhjgfjhsdh

Signed-off-by: wang <wang@wang-PC>
dfgdhgtjkyujfyu

Signed-off-by: wang <wang@wang-PC>
Merge branch 'master' of git@github.com:wisegps/baba.git
Signed-off-by: honesty <371278698@qq.com>
Signed-off-by: honesty <371278698@qq.com>
Merge branch 'master' of git@github.com:wisegps/baba.git
dfhhjhdfsjhgftydr

Signed-off-by: wang <wang@wang-PC>